diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f5b784d2..5312704f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,7 +28,7 @@ jobs: distribution: 'temurin' cache: maven - name: Build with Maven - # run: mvn -B package --file pom.xml + run: mvn -B package --file pom.xml # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive # - name: Update dependency graph diff --git a/README.md b/README.md index e26a3698..0879f21a 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ Next generation intelligent ERP system -We will conduct secondary development based on [jshERP](https://github.com/jishenghua/jshERP), and this warehouse will use brand new technology, We will refer to SpringCloud technology in the future +We will refer to SpringCloud technology in the future diff --git a/api/pom.xml b/api/pom.xml index 86a62c80..027109bc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,6 +24,18 @@ 1.0-SNAPSHOT + + com.wansensoft + plugins + 1.0-SNAPSHOT + + + + com.wansensoft + middleware + 1.0-SNAPSHOT + + com.wansensoft service @@ -44,33 +56,4 @@ - - - - src/main/java - - **/*.xml - - - - src/main/resources - - - - - org.springframework.boot - spring-boot-maven-plugin - - wansenerp - - - org.projectlombok - lombok - - - - - - - \ No newline at end of file diff --git a/dao/pom.xml b/dao/pom.xml index 8c73cf93..ed3d9971 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -12,8 +12,8 @@ dao - 20 - 20 + 17 + 17 UTF-8 @@ -31,4 +31,17 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + + exec + + + + + + \ No newline at end of file diff --git a/domain/pom.xml b/domain/pom.xml index 5a700f02..8c94f097 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -12,8 +12,8 @@ domain - 20 - 20 + 17 + 17 UTF-8 @@ -24,5 +24,15 @@ 1.0-SNAPSHOT - + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + \ No newline at end of file diff --git a/plugins/pom.xml b/plugins/pom.xml index 05c6319d..4efaf8d6 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -12,8 +12,8 @@ plugins - 20 - 20 + 17 + 17 UTF-8 @@ -25,4 +25,17 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + + exec + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6bc3af7f..6a0dbb52 100644 --- a/pom.xml +++ b/pom.xml @@ -10,13 +10,13 @@ 万森ERP - api - service - dao - plugins utils - middleware domain + plugins + middleware + service + dao + api @@ -65,40 +65,42 @@ WanSenERP + + + src/main/java + + **/*.xml + + + + src/main/resources + + org.springframework.boot spring-boot-maven-plugin - - - build-info - generate-sources - - build-info - - - - repackage - package - - repackage - - - com.wansensoft.api.ErpApplication - - - - - - org.mybatis.generator - mybatis-generator-maven-plugin - 1.4.0 - ${basedir}/src/test/resources/generatorConfig.xml - true - true + wansenerp + com.wansensoft.api.ErpApplication + + + org.projectlombok + lombok + + + + + + + + + + + + diff --git a/service/pom.xml b/service/pom.xml index 94429e15..62a227a6 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -43,4 +43,17 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + + exec + + + + + + \ No newline at end of file diff --git a/utils/pom.xml b/utils/pom.xml index 56e4bf7f..897b2be7 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -12,8 +12,8 @@ utils - 20 - 20 + 17 + 17 UTF-8 @@ -74,4 +74,16 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + + exec + + + + + \ No newline at end of file