diff --git a/.gitmodules b/.gitmodules index 8bfbfde..7a20a58 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,3 @@ [submodule "external-library/mywust"] path = external-library/mywust url = https://github.com/LingHangStudio/mywust.git - autocrlf = true - safecrlf = false \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 2c9b06b..b197bad 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,11 +1,15 @@ + + + diff --git a/external-library/.gitignore b/external-library/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/external-library/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/external-library/pom.xml b/external-library/pom.xml index 0dc7650..a926241 100644 --- a/external-library/pom.xml +++ b/external-library/pom.xml @@ -3,6 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + cn.wustlinghang.wusthelper wusthelper-backend @@ -14,11 +15,4 @@ mywust - - - 17 - 17 - UTF-8 - - \ No newline at end of file diff --git a/sub-services/pom.xml b/sub-services/pom.xml index 8f1f734..2c247b8 100644 --- a/sub-services/pom.xml +++ b/sub-services/pom.xml @@ -12,10 +12,10 @@ sub-services pom - undergrad graduate library physics + undergrad diff --git a/sub-services/undergrad/.flattened-pom.xml b/sub-services/undergrad/.flattened-pom.xml deleted file mode 100644 index aff758f..0000000 --- a/sub-services/undergrad/.flattened-pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - 4.0.0 - cn.wustlinghang.wusthelper - undergrad - 0.0.1-SNAPSHOT - - - io.quarkus - quarkus-resteasy-reactive - 3.1.3.Final - compile - - - io.quarkus - quarkus-resteasy-reactive-jackson - 3.1.3.Final - compile - - - io.quarkus - quarkus-resteasy-deployment - 3.1.3.Final - compile - - - io.quarkus - quarkus-core-deployment - 3.1.3.Final - compile - - - io.quarkus - quarkus-hibernate-validator - 3.1.3.Final - compile - - - org.hibernate.validator - hibernate-validator - 8.0.1.Final - compile - - - cn.hutool - hutool-core - 5.8.20 - compile - - - cn.wustlinghang - mywust-core - 0.0.2-SNAPSHOT - compile - - - cn.wustlinghang - mywust-network-okhttp - 0.0.2-SNAPSHOT - compile - - - cn.wustlinghang.wusthelper - common - 0.0.1-SNAPSHOT - compile - - - jakarta.annotation - jakarta.annotation-api - 2.1.1 - compile - - - javax.annotation - javax.annotation-api - 1.3.2 - compile - - - org.projectlombok - lombok - 1.18.26 - provided - - - - - central - https://repo1.maven.org/maven2 - - - - true - - github - https://maven.pkg.github.com/LingHangStudio/mywust - - - diff --git a/sub-services/undergrad/.gitignore b/sub-services/undergrad/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/sub-services/undergrad/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/sub-services/undergrad/pom.xml b/sub-services/undergrad/pom.xml index e8783ad..62a9b23 100644 --- a/sub-services/undergrad/pom.xml +++ b/sub-services/undergrad/pom.xml @@ -1,8 +1,9 @@ - - + + 4.0.0 + cn.wustlinghang.wusthelper sub-services @@ -10,27 +11,32 @@ undergrad + 0.0.1-SNAPSHOT - quarkus-bom - io.quarkus - 3.1.3.Final - 3.8.1 - 3.0.0-M7 + 3.11.0 + 17 UTF-8 + UTF-8 + quarkus-bom + io.quarkus.platform + 3.2.0.Final + + 3.1.3.Final + true + 3.0.0 17 17 true - - 8.0.1.Final + UTF-8 - io.quarkus - quarkus-bom + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} ${quarkus.platform.version} pom import @@ -39,34 +45,22 @@ - - io.quarkus - quarkus-resteasy-reactive - io.quarkus quarkus-resteasy-reactive-jackson io.quarkus - quarkus-resteasy-deployment + quarkus-hibernate-validator io.quarkus - quarkus-core-deployment + quarkus-resteasy-reactive - - io.quarkus - quarkus-hibernate-validator - - - org.hibernate.validator - hibernate-validator - ${hibernate-validator.version} + quarkus-arc - io.quarkus quarkus-junit5 @@ -77,18 +71,38 @@ rest-assured test - - - cn.hutool - hutool-core - + + ${quarkus.platform.group-id} + quarkus-maven-plugin + ${quarkus-maven-plugin.version} + true + + + UTF-8 + + + + + + build + generate-code + generate-code-tests + + + + maven-compiler-plugin ${compiler-plugin.version} + + + -parameters + + maven-surefire-plugin @@ -97,30 +111,32 @@ org.jboss.logmanager.LogManager ${maven.home} - UTF-8 - ${quarkus.platform.group-id} - quarkus-maven-plugin - ${quarkus.platform.version} - - - UTF-8 - - + maven-failsafe-plugin + ${surefire-plugin.version} - build + integration-test + verify + + + ${project.build.directory}/${project.build.finalName}-runner + + org.jboss.logmanager.LogManager + ${maven.home} + + + - native @@ -130,31 +146,9 @@ + false native - - - - maven-failsafe-plugin - ${surefire-plugin.version} - - - - integration-test - verify - - - - ${project.build.directory}/${project.build.finalName}-runner - org.jboss.logmanager.LogManager - ${maven.home} - - - - - - - - \ No newline at end of file + diff --git a/sub-services/undergrad/src/main/resources/application.properties b/sub-services/undergrad/src/main/resources/application.properties index 2c29c49..78cad02 100644 --- a/sub-services/undergrad/src/main/resources/application.properties +++ b/sub-services/undergrad/src/main/resources/application.properties @@ -1,5 +1,6 @@ -# Quarkus Configuration file -# key = value quarkus.http.port=22800 #quarkus.log.level=DEBUG quarkus.log.file.encoding=UTF-8 + +# 打包成jar时附带依赖 +quarkus.package.type=uber-jar