Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -3,6 +3,7 @@ package de.srsoftware.umbrella.backend;
|
|||||||
|
|
||||||
import static de.srsoftware.umbrella.core.Constants.*;
|
import static de.srsoftware.umbrella.core.Constants.*;
|
||||||
import static de.srsoftware.umbrella.core.Util.mapLogLevel;
|
import static de.srsoftware.umbrella.core.Util.mapLogLevel;
|
||||||
|
import static java.lang.System.Logger.Level.ERROR;
|
||||||
import static java.lang.System.Logger.Level.INFO;
|
import static java.lang.System.Logger.Level.INFO;
|
||||||
|
|
||||||
import com.sun.net.httpserver.HttpServer;
|
import com.sun.net.httpserver.HttpServer;
|
||||||
@@ -59,7 +60,7 @@ public class Application {
|
|||||||
config.get("umbrella.plantuml").map(Object::toString).map(File::new).filter(File::exists).ifPresent(Util::setPlantUmlJar);
|
config.get("umbrella.plantuml").map(Object::toString).map(File::new).filter(File::exists).ifPresent(Util::setPlantUmlJar);
|
||||||
|
|
||||||
var server = HttpServer.create(new InetSocketAddress(port), 0);
|
var server = HttpServer.create(new InetSocketAddress(port), 0);
|
||||||
|
try {
|
||||||
new Translations().bindPath("/api/translations").on(server);
|
new Translations().bindPath("/api/translations").on(server);
|
||||||
new MessageSystem(config);
|
new MessageSystem(config);
|
||||||
new UserModule(config).bindPath("/api/user").on(server);
|
new UserModule(config).bindPath("/api/user").on(server);
|
||||||
@@ -81,7 +82,10 @@ public class Application {
|
|||||||
new WebHandler().bindPath("/").on(server);
|
new WebHandler().bindPath("/").on(server);
|
||||||
new WikiModule(config).bindPath("/api/wiki").on(server);
|
new WikiModule(config).bindPath("/api/wiki").on(server);
|
||||||
new FileModule(config).bindPath("/api/files").on(server);
|
new FileModule(config).bindPath("/api/files").on(server);
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOG.log(ERROR,"Startup failed",e);
|
||||||
|
System.exit(-1);
|
||||||
|
}
|
||||||
server.setExecutor(Executors.newFixedThreadPool(threads));
|
server.setExecutor(Executors.newFixedThreadPool(threads));
|
||||||
server.start();
|
server.start();
|
||||||
LOG.log(INFO,"Started web server at port {0}",port);
|
LOG.log(INFO,"Started web server at port {0}",port);
|
||||||
|
|||||||
@@ -154,6 +154,14 @@
|
|||||||
loadTasks();
|
loadTasks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function showFiles(e){
|
||||||
|
window.open(`/files/project/${id}`, '_blank').focus();
|
||||||
|
}
|
||||||
|
|
||||||
|
function showTimes(e){
|
||||||
|
window.open(`/time?project=${id}`, '_blank').focus();
|
||||||
|
}
|
||||||
|
|
||||||
onMount(loadProject);
|
onMount(loadProject);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -183,9 +191,9 @@
|
|||||||
{/if}
|
{/if}
|
||||||
<div>{t('context')}</div>
|
<div>{t('context')}</div>
|
||||||
<div>
|
<div>
|
||||||
<button>{t('files')}</button>
|
<button onclick={showFiles}>{t('files')}</button>
|
||||||
<button>{t('models')}</button>
|
<button>{t('models')}</button>
|
||||||
<button>{t('times')}</button>
|
<button onclick={showTimes}>{t('times')}</button>
|
||||||
</div>
|
</div>
|
||||||
{#if showSettings}
|
{#if showSettings}
|
||||||
<div>{t('extended_settings')}</div>
|
<div>{t('extended_settings')}</div>
|
||||||
|
|||||||
@@ -34,13 +34,10 @@ import java.util.*;
|
|||||||
public class SqliteDB extends BaseDb implements LoginServiceDb, UserDb {
|
public class SqliteDB extends BaseDb implements LoginServiceDb, UserDb {
|
||||||
private static final System.Logger LOG = System.getLogger(SqliteDB.class.getSimpleName());
|
private static final System.Logger LOG = System.getLogger(SqliteDB.class.getSimpleName());
|
||||||
|
|
||||||
private static final int INITIAL_DB_VERSION = 4;
|
|
||||||
|
|
||||||
public SqliteDB(Connection conn){
|
public SqliteDB(Connection conn){
|
||||||
super(conn);
|
super(conn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void createLoginServiceTables() {
|
private void createLoginServiceTables() {
|
||||||
var createTable = """
|
var createTable = """
|
||||||
CREATE TABLE IF NOT EXISTS {0} (
|
CREATE TABLE IF NOT EXISTS {0} (
|
||||||
|
|||||||
Reference in New Issue
Block a user