Gallardo7761/miarma-ecosystem
1
0
Fork 0
Code Issues Pull Requests Packages Activity

fixed

Browse Source
This commit is contained in:
Jose
2025-10-31 03:12:50 +01:00
parent aa09b90896
commit 1104299e5b
27 changed files with 227 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
bootstrap/pom.xml
View File

@@ -1,108 +1,90 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.miarma.api</groupId>
<artifactId>miarma-ecosystem</artifactId>
<version>1.2.0</version>
</parent>
<artifactId>bootstrap</artifactId>
<packaging>jar</packaging>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>23</maven.compiler.source>
<maven.compiler.target>23</maven.compiler.target>
</properties>
<parent>
<groupId>net.miarma.api</groupId>
<artifactId>miarma-ecosystem</artifactId>
<version>1.2.0</version>
</parent>
<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>MiarmaGit</id>
<url>https://git.miarma.net/api/packages/Gallardo7761/maven</url>
</repository>
</repositories>
<artifactId>bootstrap</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>backlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>huertos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>huertosdecine</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>miarmacraft</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>mpaste</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<properties>
<maven.compiler.source>23</maven.compiler.source>
<maven.compiler.target>23</maven.compiler.target>
</properties>
<build>
<finalName>MiarmaEcosystem</finalName>
<plugins>
<!-- Maven Shade Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<artifactSet>
<excludes>
<exclude>io.vertx:*</exclude>
<exclude>io.netty:*</exclude>
<exclude>com.fasterxml.jackson.core:*</exclude>
<exclude>com.google.code.gson:gson</exclude>
</excludes>
</artifactSet>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>net.miarma.api.AppInitializer</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>MiarmaGit</id>
<url>https://git.miarma.net/api/packages/Gallardo7761/maven</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>backlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>huertos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>huertosdecine</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>miarmacraft</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>mpaste</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<finalName>MiarmaEcosystem</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>net.miarma.api.AppInitializer</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

17
microservices/core/.classpath
View File

@@ -36,5 +36,22 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

11
microservices/core/.project
View File

@@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1761871886719</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

2
microservices/core/.settings/org.eclipse.jdt.apt.core.prefs Normal file
View File

@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false

1
microservices/core/.settings/org.eclipse.jdt.core.prefs
View File

@@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=23
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=23

4
microservices/core/src/main/java/net/miarma/api/microservices/core/verticles/CoreDataVerticle.java
View File

@@ -34,10 +34,8 @@ public class CoreDataVerticle extends AbstractVerticle {
userService = new UserService(pool);
fileService = new FileService(pool);
Router router = Router.router(vertx);
CoreDataRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
CoreDataRouter.mount(router, vertx, pool);
registerLogicVerticleConsumer();
vertx.createHttpServer()

4
microservices/core/src/main/java/net/miarma/api/microservices/core/verticles/CoreLogicVerticle.java
View File

@@ -18,9 +18,9 @@ public class CoreLogicVerticle extends AbstractVerticle {
configManager = ConfigManager.getInstance();
Pool pool = DatabaseProvider.createPool(vertx, configManager);
Router router = Router.router(vertx);
CoreLogicRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
CoreLogicRouter.mount(router, vertx, pool);
vertx.createHttpServer()
.requestHandler(router)

4
microservices/huertos/src/main/java/net/miarma/api/microservices/huertos/verticles/HuertosDataVerticle.java
View File

@@ -48,8 +48,9 @@ public class HuertosDataVerticle extends AbstractVerticle {
profileService = new ProfileService(pool);
Router router = Router.router(vertx);
HuertosDataRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
HuertosDataRouter.mount(router, vertx, pool);
registerLogicVerticleConsumer();
vertx.createHttpServer()
@@ -63,7 +64,6 @@ public class HuertosDataVerticle extends AbstractVerticle {
private void registerLogicVerticleConsumer() {
vertx.eventBus().consumer(Constants.HUERTOS_EVENT_BUS, message -> {
JsonObject body = (JsonObject) message.body();
Constants.LOGGER.info(body.encodePrettily());
String action = body.getString("action");
switch (action) {

3
microservices/huertos/src/main/java/net/miarma/api/microservices/huertos/verticles/HuertosLogicVerticle.java
View File

@@ -18,8 +18,9 @@ public class HuertosLogicVerticle extends AbstractVerticle{
configManager = ConfigManager.getInstance();
Pool pool = DatabaseProvider.createPool(vertx, configManager);
Router router = Router.router(vertx);
HuertosLogicRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
HuertosLogicRouter.mount(router, vertx, pool);
vertx.createHttpServer()
.requestHandler(router)

17
microservices/huertosdecine/.classpath
View File

@@ -36,5 +36,22 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

11
microservices/huertosdecine/.project
View File

@@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1761871886721</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

2
microservices/huertosdecine/.settings/org.eclipse.jdt.apt.core.prefs Normal file
View File

@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false

1
microservices/huertosdecine/.settings/org.eclipse.jdt.core.prefs
View File

@@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=23
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=23

4
microservices/huertosdecine/src/main/java/net/miarma/api/microservices/huertosdecine/verticles/CineDataVerticle.java
View File

@@ -33,9 +33,9 @@ public class CineDataVerticle extends AbstractVerticle {
viewerService = new ViewerService(pool);
Router router = Router.router(vertx);
CineDataRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
CineDataRouter.mount(router, vertx, pool);
registerLogicVerticleConsumer();
vertx.createHttpServer()

4
microservices/huertosdecine/src/main/java/net/miarma/api/microservices/huertosdecine/verticles/CineLogicVerticle.java
View File

@@ -18,9 +18,9 @@ public class CineLogicVerticle extends AbstractVerticle {
configManager = ConfigManager.getInstance();
Pool pool = DatabaseProvider.createPool(vertx, configManager);
Router router = Router.router(vertx);
CineLogicRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
CineLogicRouter.mount(router, vertx, pool);
vertx.createHttpServer()
.requestHandler(router)

17
microservices/miarmacraft/.classpath
View File

@@ -36,5 +36,22 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

11
microservices/miarmacraft/.project
View File

@@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1761871886722</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

2
microservices/miarmacraft/.settings/org.eclipse.jdt.apt.core.prefs Normal file
View File

@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false

1
microservices/miarmacraft/.settings/org.eclipse.jdt.core.prefs
View File

@@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=23
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=23

6
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/verticles/MMCDataVerticle.java
View File

@@ -24,13 +24,13 @@ public class MMCDataVerticle extends AbstractVerticle {
public void start(Promise<Void> startPromise) {
configManager = ConfigManager.getInstance();
Pool pool = DatabaseProvider.createPool(vertx, configManager);
playerService = new PlayerService(pool);
Router router = Router.router(vertx);
MMCDataRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
MMCDataRouter.mount(router, vertx, pool);
registerLogicVerticleConsumer();
vertx.createHttpServer()

3
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/verticles/MMCLogicVerticle.java
View File

@@ -18,9 +18,8 @@ public class MMCLogicVerticle extends AbstractVerticle {
configManager = ConfigManager.getInstance();
Pool pool = DatabaseProvider.createPool(vertx, configManager);
Router router = Router.router(vertx);
MMCLogicRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
MMCLogicRouter.mount(router, vertx, pool);
vertx.createHttpServer()
.requestHandler(router)

17
microservices/mpaste/.classpath
View File

@@ -36,5 +36,22 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

11
microservices/mpaste/.project
View File

@@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1761871886723</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

2
microservices/mpaste/.settings/org.eclipse.jdt.apt.core.prefs Normal file
View File

@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false

1
microservices/mpaste/.settings/org.eclipse.jdt.core.prefs
View File

@@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=23
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=23

4
microservices/mpaste/src/main/java/net/miarma/api/microservices/mpaste/verticles/MPasteDataVerticle.java
View File

@@ -25,9 +25,9 @@ public class MPasteDataVerticle extends AbstractVerticle {
pasteService = new PasteService(pool);
Router router = Router.router(vertx);
MPasteDataRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
MPasteDataRouter.mount(router, vertx, pool);
registerLogicVerticleConsumer();
vertx.createHttpServer()

3
microservices/mpaste/src/main/java/net/miarma/api/microservices/mpaste/verticles/MPasteLogicVerticle.java
View File

@@ -17,9 +17,8 @@ public class MPasteLogicVerticle extends AbstractVerticle {
configManager = ConfigManager.getInstance();
Pool pool = DatabaseProvider.createPool(vertx, configManager);
Router router = Router.router(vertx);
MPasteLogicRouter.mount(router, vertx, pool);
RouterUtil.attachLogger(router);
MPasteLogicRouter.mount(router, vertx, pool);
vertx.createHttpServer()
.requestHandler(router)