he2802 4 лет назад
Родитель
Сommit
784928dda6

+ 3 - 3
.drone-dev.yml

@@ -16,10 +16,10 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
       - mvn clean package # 应用打包命令
       - cp /drone/src/zhongzheng-api/target/zhongzheng-api.jar /app/build/zhongzheng-api.jar
       - cp /drone/src/zhongzheng-admin/target/zhongzheng-admin.jar /app/build/zhongzheng-admin.jar
-      - cp /drone/src/zhongzheng-certificate-admin/target/zhongzheng-certificate-admin.jar /app/build/zhongzheng-certificate-admin.jar
+      - cp /drone/src/zhongzheng-certificate-admin/target/zhongzheng-saas-admin.jar /app/build/zhongzheng-saas-admin.jar
       - cp Dockerfile /app/build/Dockerfile
       - cp Dockerfile-admi /app/build/Dockerfile-admi
-      - cp Dockerfile-certificate /app/build/Dockerfile-certificate
+      - cp Dockerfile-certificate /app/build/Dockerfile-saas
       - cp run-dev.sh /app/build/run-dev.sh
 
   - name: build-start
@@ -42,4 +42,4 @@ volumes: # 定义流水线挂载目录,用于共享数据
       path: /mydata/maven/build # 从宿主机中挂载的目录
   - name: maven-cache
     host:
-      path: /mydata/maven/cache
+      path: /mydata/maven/cache

+ 3 - 3
.drone.yml

@@ -17,10 +17,10 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
       - mvn clean package # 应用打包命令
       - cp /drone/src/zhongzheng-api/target/zhongzheng-api.jar /app/build/zhongzheng-api.jar
       - cp /drone/src/zhongzheng-admin/target/zhongzheng-admin.jar /app/build/zhongzheng-admin.jar
-      - cp /drone/src/zhongzheng-certificate-admin/target/zhongzheng-certificate-admin.jar /app/build/zhongzheng-certificate-admin.jar
+      - cp /drone/src/zhongzheng-certificate-admin/target/zhongzheng-saas-admin.jar /app/build/zhongzheng-saas-admin.jar
       - cp Dockerfile /app/build/Dockerfile
       - cp Dockerfile-admi /app/build/Dockerfile-admi
-      - cp Dockerfile-certificate /app/build/Dockerfile-certificate
+      - cp Dockerfile-top /app/build/Dockerfile-saas
       - cp run-prod.sh /app/build/run-prod.sh
 
   - name: build-start
@@ -43,4 +43,4 @@ volumes: # 定义流水线挂载目录,用于共享数据
       path: /mydata/maven/build # 从宿主机中挂载的目录
   - name: maven-cache
     host:
-      path: /mydata/maven/cache
+      path: /mydata/maven/cache

+ 0 - 0
Dockerfile-certificate → Dockerfile-saas


+ 1 - 1
pom.xml

@@ -217,7 +217,7 @@
         <module>zhongzheng-quartz</module>
         <module>zhongzheng-generator</module>
         <module>zhongzheng-common</module>
-        <module>zhongzheng-top-admin</module>
+        <module>zhongzheng-saas-admin</module>
     </modules>
     <packaging>pom</packaging>
 

+ 0 - 2
zhongzheng-framework/src/main/java/com/zhongzheng/framework/mybatisplus/CustomTenantLineHandler.java

@@ -34,8 +34,6 @@ public class CustomTenantLineHandler implements TenantLineHandler {
         add("tables");
     }};
 
-
-
     /**
      * 获取租户ID值表达式(可从cookie、token、缓存中取)
      *

+ 1 - 1
zhongzheng-top-admin/pom.xml → zhongzheng-saas-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>zhongzheng-top-admin</artifactId>
+    <artifactId>zhongzheng-saas-admin</artifactId>
 
     <dependencies>
         <!-- spring-boot-devtools -->

+ 2 - 2
zhongzheng-top-admin/src/main/java/com/zhongzheng/TopAdminApplication.java → zhongzheng-saas-admin/src/main/java/com/zhongzheng/SaasAdminApplication.java

@@ -6,12 +6,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class TopAdminApplication {
+public class SaasAdminApplication {
 
     public static void main(String[] args)
     {
         System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(TopAdminApplication.class, args);
+        SpringApplication.run(SaasAdminApplication.class, args);
         System.out.println("(♥◠‿◠)ノ゙  超级Admin启动成功   ლ(´ڡ`ლ)゙");
     }
 

+ 2 - 2
zhongzheng-top-admin/src/main/java/com/zhongzheng/TopAdminServletInitializer.java → zhongzheng-saas-admin/src/main/java/com/zhongzheng/SaasAdminServletInitializer.java

@@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  *
  * @author zhongzheng
  */
-public class TopAdminServletInitializer extends SpringBootServletInitializer
+public class SaasAdminServletInitializer extends SpringBootServletInitializer
 {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(TopAdminApplication.class);
+        return application.sources(SaasAdminApplication.class);
     }
 }

+ 0 - 0
zhongzheng-top-admin/src/main/java/com/zhongzheng/controller/common/CaptchaController.java → zhongzheng-saas-admin/src/main/java/com/zhongzheng/controller/common/CaptchaController.java


+ 0 - 0
zhongzheng-top-admin/src/main/java/com/zhongzheng/controller/top/SuperSysLoginController.java → zhongzheng-saas-admin/src/main/java/com/zhongzheng/controller/top/SuperSysLoginController.java


+ 0 - 0
zhongzheng-top-admin/src/main/java/com/zhongzheng/core/config/SwaggerConfig.java → zhongzheng-saas-admin/src/main/java/com/zhongzheng/core/config/SwaggerConfig.java


+ 0 - 0
zhongzheng-top-admin/src/main/resources/META-INF/spring-devtools.properties → zhongzheng-saas-admin/src/main/resources/META-INF/spring-devtools.properties


+ 0 - 0
zhongzheng-top-admin/src/main/resources/application-dev.yml → zhongzheng-saas-admin/src/main/resources/application-dev.yml


+ 0 - 0
zhongzheng-top-admin/src/main/resources/application-prod.yml → zhongzheng-saas-admin/src/main/resources/application-prod.yml


+ 1 - 1
zhongzheng-top-admin/src/main/resources/application.yml → zhongzheng-saas-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 zhongzheng:
   # 名称
-  name: zhongzheng-top-admin
+  name: zhongzheng-saas-admin
   # 版本
   version: 3.4.0
   # 版权年份

+ 0 - 0
zhongzheng-top-admin/src/main/resources/banner.txt → zhongzheng-saas-admin/src/main/resources/banner.txt


+ 0 - 0
zhongzheng-top-admin/src/main/resources/i18n/messages.properties → zhongzheng-saas-admin/src/main/resources/i18n/messages.properties


+ 0 - 0
zhongzheng-top-admin/src/main/resources/logback.xml → zhongzheng-saas-admin/src/main/resources/logback.xml


+ 0 - 0
zhongzheng-top-admin/src/main/resources/mybatis/mybatis-config.xml → zhongzheng-saas-admin/src/main/resources/mybatis/mybatis-config.xml