fix

.drone-dev.yml

@@ -16,7 +16,7 @@ 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-saas-admin/target/zhongzheng-saas-admin.jar /app/build/zhongzheng-saas-admin.jar
+      - cp /drone/src/zhongzheng-admin-saas/target/zhongzheng-admin-saas.jar /app/build/zhongzheng-admin-saas.jar
       - cp Dockerfile /app/build/Dockerfile
       - cp Dockerfile-admi /app/build/Dockerfile-admi
       - cp Dockerfile-saas /app/build/Dockerfile-saas

.drone.yml

@@ -17,7 +17,7 @@ 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-saas-admin/target/zhongzheng-saas-admin.jar /app/build/zhongzheng-saas-admin.jar
+      - cp /drone/src/zhongzheng-admin-saas/target/zhongzheng-admin-saas.jar /app/build/zhongzheng-admin-saas.jar
       - cp Dockerfile /app/build/Dockerfile
       - cp Dockerfile-admi /app/build/Dockerfile-admi
       - cp Dockerfile-top /app/build/Dockerfile-saas

Dockerfile-saas

@@ -2,7 +2,7 @@
 # 该镜像需要依赖的基础镜像
 FROM java:8
 # 将当前目录下的jar包复制到docker容器的/目录下
-ADD zhongzheng-saas-admin.jar /app-saas-admin.jar
+ADD zhongzheng-admin-saas.jar /app-saas-admin.jar
 # 声明服务运行在9099端口
 EXPOSE 7077
 # 指定docker容器启动时运行jar包

pom.xml

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

run-dev.sh

@@ -132,7 +132,7 @@ echo '----start container admin----'
 # 定义应用组名
 group_saas_name='zhongzheng'
 # 定义应用名称
-app_saas_name='zhongzheng-saas-admin'
+app_saas_name='zhongzheng-admin-saas'
 # 定义应用版本
 app_saas_version='1.0-SNAPSHOT'
 # 定义应用环境

run-prod.sh

@@ -127,7 +127,7 @@ echo '----start container admin----'
 # 定义应用组名
 group_saas_name='zhongzheng'
 # 定义应用名称
-app_saas_name='zhongzheng-saas-admin'
+app_saas_name='zhongzheng-admin-saas'
 # 定义应用版本
 app_saas_version='1.0-SNAPSHOT'
 # 定义应用环境

zhongzheng-saas-admin/pom.xml → zhongzheng-admin-saas/pom.xml

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

zhongzheng-saas-admin/src/main/java/com/zhongzheng/SaasAdminApplication.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/AdminSaasApplication.java

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

zhongzheng-saas-admin/src/main/java/com/zhongzheng/SaasAdminServletInitializer.java → zhongzheng-admin-saas/src/main/java/com/zhongzheng/AdminSaasServletInitializer.java

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

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

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

zhongzheng-system/src/main/resources/mapper/modules/system/SysTenantMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.SysTenantMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysTenantMapper">
 
-    <resultMap type="com.zhongzheng.system.domain.SysTenant" id="SysTenantResult">
+    <resultMap type="com.zhongzheng.modules.system.domain.SysTenant" id="SysTenantResult">
         <result property="tenantId" column="tenant_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -13,4 +13,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
-</mapper>
+</mapper>