Gallardo7761/contaminus
Archived
1
0
Fork 0
Code Pull Requests Activity

add things (there are bugs, this is unstable!)

Browse Source
This commit is contained in:
Jose
2025-03-13 22:04:22 +01:00
parent 2ce90c5720
commit 139e2d5961
8 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/pom.xml
View File

@@ -55,6 +55,13 @@
<version>2.12.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.quarkus/quarkus-agroal -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-agroal</artifactId>
<version>3.19.3</version>
</dependency>
</dependencies>
<build>

8
backend/src/main/java/net/miarma/contaminus/common/ConfigManager.java
View File

@@ -61,6 +61,14 @@ public class ConfigManager {
}
}
public String getJdbcUrl() {
return String.format("%s://%s:%s/%s",
config.getProperty("db.protocol"),
config.getProperty("db.host"),
config.getProperty("db.port"),
config.getProperty("db.name"));
}
public String getStringProperty(String key) {
return config.getProperty(key);
}

33
backend/src/main/java/net/miarma/contaminus/database/DatabaseManager.java
View File

@@ -18,22 +18,27 @@ import net.miarma.contaminus.common.Constants;
public class DatabaseManager {
private final JDBCPool pool;
private final Vertx vertx = Vertx.vertx();
public DatabaseManager(Vertx vertx) {
private static DatabaseManager instance;
public static DatabaseManager getInstance() {
if (instance == null) {
instance = new DatabaseManager();
}
return instance;
}
private DatabaseManager() {
ConfigManager config = ConfigManager.getInstance();
JDBCConnectOptions jdbcOptions = new JDBCConnectOptions()
.setJdbcUrl(config.getStringProperty("db.protocol") + "//" +
config.getStringProperty("db.host") + ":" +
config.getStringProperty("db.port") + "/" +
config.getStringProperty("db.name"))
.setUser(config.getStringProperty("db.user"))
.setPassword(config.getStringProperty("db.pwd"));
PoolOptions poolOptions = new PoolOptions()
.setMaxSize(Integer.parseInt(config.getStringProperty("db.poolSize")));
pool = JDBCPool.pool(vertx, jdbcOptions, poolOptions);
pool = JDBCPool.pool(vertx,
new JDBCConnectOptions()
.setJdbcUrl(config.getJdbcUrl())
.setUser(config.getStringProperty("db.user"))
.setPassword(config.getStringProperty("db.pwd")),
new PoolOptions()
.setMaxSize(5)
);
}
public Future<RowSet<Row>> testConnection() {

4
backend/src/main/java/net/miarma/contaminus/server/DataLayerAPIVerticle.java
View File

@@ -29,9 +29,9 @@ public class DataLayerAPIVerticle extends AbstractVerticle {
public void start(Promise<Void> startPromise) {
Constants.LOGGER.info("📡 Iniciando DataLayerAPIVerticle...");
configManager = ConfigManager.getInstance();
configManager = ConfigManager.getInstance();
gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
dbManager = new DatabaseManager(vertx);
dbManager = DatabaseManager.getInstance();
Router router = Router.router(vertx);
Set<HttpMethod> allowedMethods = new HashSet<>(

2
backend/src/main/java/net/miarma/contaminus/server/LogicLayerAPIVerticle.java
View File

@@ -32,7 +32,7 @@ public class LogicLayerAPIVerticle extends AbstractVerticle {
configManager = ConfigManager.getInstance();
gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
dbManager = new DatabaseManager(vertx);
dbManager = DatabaseManager.getInstance();
Router router = Router.router(vertx);
Set<HttpMethod> allowedMethods = new HashSet<>(

26
backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java
View File

@@ -8,32 +8,18 @@ import io.vertx.core.ThreadingModel;
public class MainVerticle extends AbstractVerticle {
@Override
public void start(Promise<Void> startPromise) {
public void start(Promise<Void> startPromise) {
final DeploymentOptions options = new DeploymentOptions();
options.setThreadingModel(ThreadingModel.WORKER);
String enabledVerticles = System.getProperty("vertx.options", "");
if (enabledVerticles.contains("data")) {
getVertx().deployVerticle(new DataLayerAPIVerticle(), options);
}
if (enabledVerticles.contains("business")) {
getVertx().deployVerticle(new LogicLayerAPIVerticle(), options);
}
if (enabledVerticles.contains("web")) {
getVertx().deployVerticle(new HttpServerVerticle());
}
getVertx().deployVerticle(new DataLayerAPIVerticle(), options);
//getVertx().deployVerticle(new LogicLayerAPIVerticle(), options);
//getVertx().deployVerticle(new HttpServerVerticle());
}
@Override
public void stop(Promise<Void> stopPromise) throws Exception {
getVertx().deploymentIDs()
.forEach(v -> getVertx().undeploy(v));
}
public static void main(String[] args) {
System.setProperty("vertx.options", String.join(",", args));
io.vertx.core.Launcher.executeCommand("run", MainVerticle.class.getName());
}
}
}

6
backend/src/main/java/net/miarma/contaminus/util/SystemUtil.java
View File

@@ -7,9 +7,9 @@ public class SystemUtil {
static ConfigManager configManager = ConfigManager.getInstance();
static String host = configManager.getStringProperty("inet.host");
static String origin = configManager.getStringProperty("inet.origin");
static int dataApiPort = configManager.getIntProperty("data-api.port");
static int logicApiPort = configManager.getIntProperty("logic-api.port");
static int webserverPort = configManager.getIntProperty("webserver.port");
static int dataApiPort = 8081;
static int logicApiPort = 8082;
static int webserverPort = 8080;
public static String getHost() {
return host;

2
backend/src/main/resources/webroot/config/settings.json
View File

@@ -7,7 +7,7 @@
},
"appConfig": {
"endpoints": {
"BASE_URL": "http://localhost:8081/api/v1",
"BASE_URL": "http://localhost:3001/api/v1",
"GET_GROUPS": "/groups",
"GET_GROUP_BY_ID": "/groups/{0}",
"GET_GROUP_DEVICES": "/groups/{0}/devices",