diff --git a/backend/src/main/java/net/miarma/contaminus/common/Constants.java b/backend/src/main/java/net/miarma/contaminus/common/Constants.java index 6636313..9da4d47 100644 --- a/backend/src/main/java/net/miarma/contaminus/common/Constants.java +++ b/backend/src/main/java/net/miarma/contaminus/common/Constants.java @@ -8,7 +8,8 @@ public class Constants { public static final String API_PREFIX = "/api/v1"; public static final String HOME_DIR = SystemInfo.getOS() == OSType.WINDOWS ? "C:/Users/" + System.getProperty("user.name") + "/" : - System.getProperty("user.home") + "/"; + System.getProperty("user.home").contains("root") ? "/root/" : + "/home/" + System.getProperty("user.name") + "/"; public static final String BASE_DIR = HOME_DIR + (SystemInfo.getOS() == OSType.WINDOWS ? ".contaminus" : SystemInfo.getOS() == OSType.LINUX ? ".config" + "/" + diff --git a/backend/src/main/java/net/miarma/contaminus/common/Host.java b/backend/src/main/java/net/miarma/contaminus/common/Host.java index dd95c14..61780db 100644 --- a/backend/src/main/java/net/miarma/contaminus/common/Host.java +++ b/backend/src/main/java/net/miarma/contaminus/common/Host.java @@ -1,8 +1,11 @@ package net.miarma.contaminus.common; +import java.util.Set; + public class Host { static ConfigManager configManager = ConfigManager.getInstance(); static String host = configManager.getStringProperty("inet.host"); + static String origin = configManager.getStringProperty("inet.origin"); static int apiPort = configManager.getIntProperty("api.port"); static int webserverPort = configManager.getIntProperty("webserver.port"); @@ -18,8 +21,10 @@ public class Host { return webserverPort; } - public static String getOrigin() { - return "http://" + host + ":" + webserverPort; + public static Set getOrigins() { + return Set.of("http://" + origin + ":" + webserverPort, + "https://" + origin + ":" + webserverPort); } + } diff --git a/backend/src/main/java/net/miarma/contaminus/server/ApiVerticle.java b/backend/src/main/java/net/miarma/contaminus/server/ApiVerticle.java index 1a7b1a8..0ccb541 100644 --- a/backend/src/main/java/net/miarma/contaminus/server/ApiVerticle.java +++ b/backend/src/main/java/net/miarma/contaminus/server/ApiVerticle.java @@ -25,11 +25,12 @@ public class ApiVerticle extends AbstractVerticle { Constants.LOGGER.info("🟢 Iniciando ApiVerticle..."); Router router = Router.router(vertx); - Set allowedMethods = new HashSet<>(Arrays.asList(HttpMethod.GET, HttpMethod.POST, HttpMethod.PUT)); // Por ejemplo + Set allowedMethods = new HashSet<>( + Arrays.asList(HttpMethod.GET, HttpMethod.POST, HttpMethod.PUT, HttpMethod.OPTIONS)); // Por ejemplo Set allowedHeaders = new HashSet<>(Arrays.asList("Content-Type", "Authorization")); router.route().handler(CorsHandler.create() - .addOrigin(Host.getOrigin()) + .addOrigin("*") .allowCredentials(true) .allowedHeaders(allowedHeaders) .allowedMethods(allowedMethods)); diff --git a/backend/src/main/java/net/miarma/contaminus/server/HttpServerVerticle.java b/backend/src/main/java/net/miarma/contaminus/server/HttpServerVerticle.java index a8b0125..e3c373b 100644 --- a/backend/src/main/java/net/miarma/contaminus/server/HttpServerVerticle.java +++ b/backend/src/main/java/net/miarma/contaminus/server/HttpServerVerticle.java @@ -11,6 +11,7 @@ public class HttpServerVerticle extends AbstractVerticle { @Override public void start() { Constants.LOGGER.info("🟢 Iniciando HttpServerVerticle..."); + Router router = Router.router(vertx); router.route("/*").handler(StaticHandler.create(Constants.BASE_DIR + "/webroot") diff --git a/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java b/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java index ed96d17..a520ae6 100644 --- a/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java +++ b/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java @@ -9,12 +9,20 @@ public class MainVerticle extends AbstractVerticle { @Override public void start(Promise startPromise) { - final DeploymentOptions options = new DeploymentOptions(); - options.setThreadingModel(ThreadingModel.WORKER); - - getVertx().deployVerticle(new DatabaseVerticle(), options); - getVertx().deployVerticle(new ApiVerticle(), options); - getVertx().deployVerticle(new HttpServerVerticle()); + final DeploymentOptions options = new DeploymentOptions(); + options.setThreadingModel(ThreadingModel.WORKER); + + String enabledVerticles = System.getProperty("vertx.options", ""); + + if (enabledVerticles.contains("db")) { + getVertx().deployVerticle(new DatabaseVerticle(), options); + } + if (enabledVerticles.contains("api")) { + getVertx().deployVerticle(new ApiVerticle(), options); + } + if (enabledVerticles.contains("http")) { + getVertx().deployVerticle(new HttpServerVerticle()); + } } @Override @@ -24,7 +32,8 @@ public class MainVerticle extends AbstractVerticle { } public static void main(String[] args) { - io.vertx.core.Launcher.executeCommand("run", MainVerticle.class.getName()); + System.setProperty("vertx.options", String.join(",", args)); + io.vertx.core.Launcher.executeCommand("run", MainVerticle.class.getName()); } } \ No newline at end of file diff --git a/backend/src/main/resources/default.properties b/backend/src/main/resources/default.properties index 0b63564..e2fec19 100644 --- a/backend/src/main/resources/default.properties +++ b/backend/src/main/resources/default.properties @@ -9,5 +9,6 @@ dp.poolSize=5 # Server Configuration inet.host=localhost +inet.origin=localhost webserver.port=8080 api.port=8081