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

zt-module-base/pom.xml

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

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

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:

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