From 0fb22a2ee40e7c93dab5573729355b1e500ac091 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Tue, 23 Sep 2025 17:12:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-server/pom.xml | 16 ++++---- .../zt/plat/base/BaseServerApplication.java | 4 +- .../src/main/resources/application-local.yml | 2 +- .../src/main/resources/application.yml | 4 +- pom.xml | 4 +- zt-module-base/pom.xml | 2 +- zt-module-base/zt-module-base-api/pom.xml | 6 +-- zt-module-base/zt-module-base-server/pom.xml | 38 +++++++++---------- .../src/main/resources/application-local.yml | 2 +- .../src/main/resources/application.yml | 4 +- zt-module-contract-order/pom.xml | 2 +- .../zt-module-contract-order-api/pom.xml | 6 +-- .../zt-module-contract-order-server/pom.xml | 38 +++++++++---------- .../src/main/resources/application-local.yml | 2 +- .../src/main/resources/application.yml | 4 +- zt-module-erp/pom.xml | 2 +- zt-module-erp/zt-module-erp-api/pom.xml | 6 +-- zt-module-erp/zt-module-erp-server/pom.xml | 38 +++++++++---------- .../src/main/resources/application-local.yml | 2 +- .../src/main/resources/application.yml | 4 +- 20 files changed, 93 insertions(+), 93 deletions(-) diff --git a/base-server/pom.xml b/base-server/pom.xml index 424ef49..a4933a0 100644 --- a/base-server/pom.xml +++ b/base-server/pom.xml @@ -17,34 +17,34 @@ com.zt.plat - cloud-module-system-api + zt-module-system-api ${revision} com.zt.plat - cloud-module-infra-api + zt-module-infra-api ${revision} com.zt.plat - cloud-module-base-server + zt-module-base-server ${revision} com.zt.plat - cloud-module-contract-order-server + zt-module-contract-order-server ${revision} com.zt.plat - cloud-module-erp-server + zt-module-erp-server ${revision} com.zt.plat - cloud-spring-boot-starter-web + zt-spring-boot-starter-web @@ -56,7 +56,7 @@ com.zt.plat - cloud-spring-boot-starter-protection + zt-spring-boot-starter-protection @@ -74,7 +74,7 @@ com.zt.plat - cloud-spring-boot-starter-rpc + zt-spring-boot-starter-rpc diff --git a/base-server/src/main/java/com/zt/plat/base/BaseServerApplication.java b/base-server/src/main/java/com/zt/plat/base/BaseServerApplication.java index 08ecc04..c5dc56e 100644 --- a/base-server/src/main/java/com/zt/plat/base/BaseServerApplication.java +++ b/base-server/src/main/java/com/zt/plat/base/BaseServerApplication.java @@ -8,8 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * * @author ZT */ -@SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${cloud.info.base-package} -@SpringBootApplication(scanBasePackages = {"${cloud.info.base-package}.base", "${cloud.info.base-package}.module"}, +@SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${zt.info.base-package} +@SpringBootApplication(scanBasePackages = {"${zt.info.base-package}.base", "${zt.info.base-package}.module"}, excludeName = {}) public class BaseServerApplication { diff --git a/base-server/src/main/resources/application-local.yml b/base-server/src/main/resources/application-local.yml index 29618a7..3035e5d 100644 --- a/base-server/src/main/resources/application-local.yml +++ b/base-server/src/main/resources/application-local.yml @@ -87,7 +87,7 @@ mybatis-plus: # 芋道配置项,设置当前项目所有自定义的配置 -cloud: +zt: env: # 多环境的配置项 tag: ${HOSTNAME} security: diff --git a/base-server/src/main/resources/application.yml b/base-server/src/main/resources/application.yml index 5989207..adccaac 100644 --- a/base-server/src/main/resources/application.yml +++ b/base-server/src/main/resources/application.yml @@ -101,7 +101,7 @@ xxl: logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 accessToken: default_token # 执行器通讯TOKEN -cloud: +zt: info: version: 1.0.0 base-package: com.zt.plat @@ -116,7 +116,7 @@ cloud: swagger: title: 管理后台 description: 提供管理员管理的所有功能 - version: ${cloud.info.version} + version: ${zt.info.version} tenant: # 多租户相关配置项 enable: true diff --git a/pom.xml b/pom.xml index 11c333d..40fc228 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.34 + 3.0.35 17 ${java.version} @@ -38,7 +38,7 @@ com.zt.plat - cloud-dependencies + zt-dependencies ${revision} pom import diff --git a/zt-module-base/pom.xml b/zt-module-base/pom.xml index 5d765e4..16f8a36 100644 --- a/zt-module-base/pom.xml +++ b/zt-module-base/pom.xml @@ -13,7 +13,7 @@ 4.0.0 - cloud-module-base + zt-module-base pom ${project.artifactId} diff --git a/zt-module-base/zt-module-base-api/pom.xml b/zt-module-base/zt-module-base-api/pom.xml index c5686c9..1b7c523 100644 --- a/zt-module-base/zt-module-base-api/pom.xml +++ b/zt-module-base/zt-module-base-api/pom.xml @@ -3,12 +3,12 @@ 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"> - cloud-module-base + zt-module-base com.zt.plat ${revision} 4.0.0 - cloud-module-base-api + zt-module-base-api jar ${project.artifactId} @@ -19,7 +19,7 @@ com.zt.plat - cloud-common + zt-common diff --git a/zt-module-base/zt-module-base-server/pom.xml b/zt-module-base/zt-module-base-server/pom.xml index edc6e25..44d9d4e 100644 --- a/zt-module-base/zt-module-base-server/pom.xml +++ b/zt-module-base/zt-module-base-server/pom.xml @@ -3,14 +3,14 @@ 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"> - cloud-module-base + zt-module-base com.zt.plat ${revision} 4.0.0 jar - cloud-module-base-server + zt-module-base-server ${project.artifactId} @@ -21,63 +21,63 @@ com.zt.plat - cloud-spring-boot-starter-env + zt-spring-boot-starter-env com.zt.plat - cloud-module-system-api + zt-module-system-api ${revision} com.zt.plat - cloud-module-infra-api + zt-module-infra-api ${revision} com.zt.plat - cloud-module-base-api + zt-module-base-api ${revision} com.zt.plat - cloud-spring-boot-starter-biz-data-permission + zt-spring-boot-starter-biz-data-permission com.zt.plat - cloud-spring-boot-starter-biz-tenant + zt-spring-boot-starter-biz-tenant com.zt.plat - cloud-spring-boot-starter-web + zt-spring-boot-starter-web com.zt.plat - cloud-spring-boot-starter-security + zt-spring-boot-starter-security com.zt.plat - cloud-spring-boot-starter-mybatis + zt-spring-boot-starter-mybatis com.zt.plat - cloud-spring-boot-starter-redis + zt-spring-boot-starter-redis com.zt.plat - cloud-spring-boot-starter-rpc + zt-spring-boot-starter-rpc @@ -95,35 +95,35 @@ com.zt.plat - cloud-spring-boot-starter-job + zt-spring-boot-starter-job com.zt.plat - cloud-spring-boot-starter-mq + zt-spring-boot-starter-mq com.zt.plat - cloud-spring-boot-starter-test + zt-spring-boot-starter-test com.zt.plat - cloud-spring-boot-starter-excel + zt-spring-boot-starter-excel com.zt.plat - cloud-spring-boot-starter-monitor + zt-spring-boot-starter-monitor com.zt.plat - cloud-spring-boot-starter-biz-business + zt-spring-boot-starter-biz-business ${revision} diff --git a/zt-module-base/zt-module-base-server/src/main/resources/application-local.yml b/zt-module-base/zt-module-base-server/src/main/resources/application-local.yml index 29618a7..3035e5d 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/application-local.yml +++ b/zt-module-base/zt-module-base-server/src/main/resources/application-local.yml @@ -87,7 +87,7 @@ mybatis-plus: # 芋道配置项,设置当前项目所有自定义的配置 -cloud: +zt: env: # 多环境的配置项 tag: ${HOSTNAME} security: diff --git a/zt-module-base/zt-module-base-server/src/main/resources/application.yml b/zt-module-base/zt-module-base-server/src/main/resources/application.yml index 4cec056..68ec2ec 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/application.yml +++ b/zt-module-base/zt-module-base-server/src/main/resources/application.yml @@ -101,7 +101,7 @@ xxl: logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 accessToken: default_token # 执行器通讯TOKEN -cloud: +zt: info: version: 1.0.0 base-package: com.zt.plat.module.base @@ -116,7 +116,7 @@ cloud: swagger: title: 管理后台 description: 提供管理员管理的所有功能 - version: ${cloud.info.version} + version: ${zt.info.version} tenant: # 多租户相关配置项 enable: true diff --git a/zt-module-contract-order/pom.xml b/zt-module-contract-order/pom.xml index 6f93dab..ae1e03b 100644 --- a/zt-module-contract-order/pom.xml +++ b/zt-module-contract-order/pom.xml @@ -13,7 +13,7 @@ 4.0.0 - cloud-module-contract-order + zt-module-contract-order pom ${project.artifactId} diff --git a/zt-module-contract-order/zt-module-contract-order-api/pom.xml b/zt-module-contract-order/zt-module-contract-order-api/pom.xml index a646798..fe89600 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/pom.xml +++ b/zt-module-contract-order/zt-module-contract-order-api/pom.xml @@ -3,12 +3,12 @@ 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"> - cloud-module-contract-order + zt-module-contract-order com.zt.plat ${revision} 4.0.0 - cloud-module-contract-order-api + zt-module-contract-order-api jar ${project.artifactId} @@ -19,7 +19,7 @@ com.zt.plat - cloud-common + zt-common diff --git a/zt-module-contract-order/zt-module-contract-order-server/pom.xml b/zt-module-contract-order/zt-module-contract-order-server/pom.xml index 357dee3..90fd571 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/pom.xml +++ b/zt-module-contract-order/zt-module-contract-order-server/pom.xml @@ -3,14 +3,14 @@ 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"> - cloud-module-contract-order + zt-module-contract-order com.zt.plat ${revision} 4.0.0 jar - cloud-module-contract-order-server + zt-module-contract-order-server ${project.artifactId} @@ -21,63 +21,63 @@ com.zt.plat - cloud-spring-boot-starter-env + zt-spring-boot-starter-env com.zt.plat - cloud-module-system-api + zt-module-system-api ${revision} com.zt.plat - cloud-module-infra-api + zt-module-infra-api ${revision} com.zt.plat - cloud-module-contract-order-api + zt-module-contract-order-api ${revision} com.zt.plat - cloud-spring-boot-starter-biz-data-permission + zt-spring-boot-starter-biz-data-permission com.zt.plat - cloud-spring-boot-starter-biz-tenant + zt-spring-boot-starter-biz-tenant com.zt.plat - cloud-spring-boot-starter-web + zt-spring-boot-starter-web com.zt.plat - cloud-spring-boot-starter-security + zt-spring-boot-starter-security com.zt.plat - cloud-spring-boot-starter-mybatis + zt-spring-boot-starter-mybatis com.zt.plat - cloud-spring-boot-starter-redis + zt-spring-boot-starter-redis com.zt.plat - cloud-spring-boot-starter-rpc + zt-spring-boot-starter-rpc @@ -95,35 +95,35 @@ com.zt.plat - cloud-spring-boot-starter-job + zt-spring-boot-starter-job com.zt.plat - cloud-spring-boot-starter-mq + zt-spring-boot-starter-mq com.zt.plat - cloud-spring-boot-starter-test + zt-spring-boot-starter-test com.zt.plat - cloud-spring-boot-starter-excel + zt-spring-boot-starter-excel com.zt.plat - cloud-spring-boot-starter-monitor + zt-spring-boot-starter-monitor com.zt.plat - cloud-spring-boot-starter-biz-business + zt-spring-boot-starter-biz-business ${revision} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application-local.yml b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application-local.yml index 15d87ec..b47fe43 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application-local.yml +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application-local.yml @@ -87,7 +87,7 @@ mybatis-plus: # 芋道配置项,设置当前项目所有自定义的配置 -cloud: +zt: env: # 多环境的配置项 tag: ${HOSTNAME} security: diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application.yml b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application.yml index 16ec50e..ba3ad1b 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application.yml +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application.yml @@ -101,7 +101,7 @@ xxl: logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 accessToken: default_token # 执行器通讯TOKEN -cloud: +zt: info: version: 1.0.0 base-package: com.zt.plat.module.contractorder @@ -116,7 +116,7 @@ cloud: swagger: title: 管理后台 description: 提供管理员管理的所有功能 - version: ${cloud.info.version} + version: ${zt.info.version} tenant: # 多租户相关配置项 enable: true diff --git a/zt-module-erp/pom.xml b/zt-module-erp/pom.xml index a3795d2..c3e930d 100644 --- a/zt-module-erp/pom.xml +++ b/zt-module-erp/pom.xml @@ -13,7 +13,7 @@ 4.0.0 - cloud-module-erp + zt-module-erp pom ${project.artifactId} diff --git a/zt-module-erp/zt-module-erp-api/pom.xml b/zt-module-erp/zt-module-erp-api/pom.xml index 5002a20..9a5c336 100644 --- a/zt-module-erp/zt-module-erp-api/pom.xml +++ b/zt-module-erp/zt-module-erp-api/pom.xml @@ -3,12 +3,12 @@ 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"> - cloud-module-erp + zt-module-erp com.zt.plat ${revision} 4.0.0 - cloud-module-erp-api + zt-module-erp-api jar ${project.artifactId} @@ -19,7 +19,7 @@ com.zt.plat - cloud-common + zt-common diff --git a/zt-module-erp/zt-module-erp-server/pom.xml b/zt-module-erp/zt-module-erp-server/pom.xml index 85c14c6..0b13158 100644 --- a/zt-module-erp/zt-module-erp-server/pom.xml +++ b/zt-module-erp/zt-module-erp-server/pom.xml @@ -3,14 +3,14 @@ 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"> - cloud-module-erp + zt-module-erp com.zt.plat ${revision} 4.0.0 jar - cloud-module-erp-server + zt-module-erp-server ${project.artifactId} @@ -21,63 +21,63 @@ com.zt.plat - cloud-spring-boot-starter-env + zt-spring-boot-starter-env com.zt.plat - cloud-module-system-api + zt-module-system-api ${revision} com.zt.plat - cloud-module-infra-api + zt-module-infra-api ${revision} com.zt.plat - cloud-module-erp-api + zt-module-erp-api ${revision} com.zt.plat - cloud-spring-boot-starter-biz-data-permission + zt-spring-boot-starter-biz-data-permission com.zt.plat - cloud-spring-boot-starter-biz-tenant + zt-spring-boot-starter-biz-tenant com.zt.plat - cloud-spring-boot-starter-web + zt-spring-boot-starter-web com.zt.plat - cloud-spring-boot-starter-security + zt-spring-boot-starter-security com.zt.plat - cloud-spring-boot-starter-mybatis + zt-spring-boot-starter-mybatis com.zt.plat - cloud-spring-boot-starter-redis + zt-spring-boot-starter-redis com.zt.plat - cloud-spring-boot-starter-rpc + zt-spring-boot-starter-rpc @@ -95,35 +95,35 @@ com.zt.plat - cloud-spring-boot-starter-job + zt-spring-boot-starter-job com.zt.plat - cloud-spring-boot-starter-mq + zt-spring-boot-starter-mq com.zt.plat - cloud-spring-boot-starter-test + zt-spring-boot-starter-test com.zt.plat - cloud-spring-boot-starter-excel + zt-spring-boot-starter-excel com.zt.plat - cloud-spring-boot-starter-monitor + zt-spring-boot-starter-monitor com.zt.plat - cloud-spring-boot-starter-biz-business + zt-spring-boot-starter-biz-business ${revision} diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/application-local.yml b/zt-module-erp/zt-module-erp-server/src/main/resources/application-local.yml index 29618a7..3035e5d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/application-local.yml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/application-local.yml @@ -87,7 +87,7 @@ mybatis-plus: # 芋道配置项,设置当前项目所有自定义的配置 -cloud: +zt: env: # 多环境的配置项 tag: ${HOSTNAME} security: diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/application.yml b/zt-module-erp/zt-module-erp-server/src/main/resources/application.yml index 4cec056..68ec2ec 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/application.yml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/application.yml @@ -101,7 +101,7 @@ xxl: logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 accessToken: default_token # 执行器通讯TOKEN -cloud: +zt: info: version: 1.0.0 base-package: com.zt.plat.module.base @@ -116,7 +116,7 @@ cloud: swagger: title: 管理后台 description: 提供管理员管理的所有功能 - version: ${cloud.info.version} + version: ${zt.info.version} tenant: # 多租户相关配置项 enable: true