zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
潘荣晟
2025-09-23 18:09:49 +08:00
parent 9cd63f144a 0fb22a2ee4
commit 4b629100de
28 changed files with 197 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
base-server/pom.xml
View File

@@ -17,34 +17,34 @@
<dependencies>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-module-system-api</artifactId>
<artifactId>zt-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-module-infra-api</artifactId>
<artifactId>zt-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-module-base-server</artifactId>
<artifactId>zt-module-base-server</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-module-contract-order-server</artifactId>
<artifactId>zt-module-contract-order-server</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-module-erp-server</artifactId>
<artifactId>zt-module-erp-server</artifactId>
<version>${revision}</version>
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-web</artifactId>
<artifactId>zt-spring-boot-starter-web</artifactId>
</dependency>
<dependency>
@@ -56,7 +56,7 @@
<!-- 服务保障相关 -->
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-protection</artifactId>
<artifactId>zt-spring-boot-starter-protection</artifactId>
</dependency>
<!-- Registry 注册中心相关 -->
@@ -74,7 +74,7 @@
<!-- RPC 远程调用相关 -->
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-rpc</artifactId>
<artifactId>zt-spring-boot-starter-rpc</artifactId>
<!-- 目的：zt-server 单体启动，禁用 openfeign -->
<exclusions>
<exclusion>

4
base-server/src/main/java/com/zt/plat/base/BaseServerApplication.java
View File

@@ -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 {

2
base-server/src/main/resources/application-local.yml
View File

@@ -87,7 +87,7 @@ mybatis-plus:
# 芋道配置项，设置当前项目所有自定义的配置
cloud:
zt:
env: # 多环境的配置项
tag: ${HOSTNAME}
security:

4
base-server/src/main/resources/application.yml
View File

@@ -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

4
pom.xml
View File

@@ -19,7 +19,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
<revision>3.0.34</revision>
<revision>3.0.35</revision>
<!-- Maven 相关 -->
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-dependencies</artifactId>
<artifactId>zt-dependencies</artifactId>
<version>${revision}</version>
<type>pom</type>
<scope>import</scope>

2
zt-module-base/pom.xml
View File

@@ -13,7 +13,7 @@
</modules>
<modelVersion>4.0.0</modelVersion>
<artifactId>cloud-module-base</artifactId>
<artifactId>zt-module-base</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>

6
zt-module-base/zt-module-base-api/pom.xml
View File

@@ -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">
<parent>
<artifactId>cloud-module-base</artifactId>
<artifactId>zt-module-base</artifactId>
<groupId>com.zt.plat</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cloud-module-base-api</artifactId>
<artifactId>zt-module-base-api</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>cloud-common</artifactId>
<artifactId>zt-common</artifactId>
</dependency>
<!-- Web 相关 -->
<dependency>

38
zt-module-base/zt-module-base-server/pom.xml
View File

File diff suppressed because it is too large Load Diff

2
zt-module-base/zt-module-base-server/src/main/resources/application-local.yml
View File

@@ -87,7 +87,7 @@ mybatis-plus:
# 芋道配置项，设置当前项目所有自定义的配置
cloud:
zt:
env: # 多环境的配置项
tag: ${HOSTNAME}
security:

4
zt-module-base/zt-module-base-server/src/main/resources/application.yml
View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More