commit：同步1.4版本

orange-demo-multi-service-for-app/.idea/.name

@@ -0,0 +1 @@
+OrangeMultiDemo

orange-demo-multi-service-for-app/.idea/compiler.xml

@@ -6,19 +6,19 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="common-redis" />
+        <module name="upms-service" />
         <module name="stats-interface" />
         <module name="application-common" />
         <module name="gateway" />
         <module name="common-swagger" />
         <module name="common-sequence" />
+        <module name="common-redis" />
         <module name="course-class-service" />
         <module name="common-core" />
         <module name="upms-interface" />
         <module name="admin-monitor" />
         <module name="stats-service" />
         <module name="course-class-interface" />
-        <module name="upms-service" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
@@ -28,6 +28,7 @@
       <module name="application-common" target="1.8" />
       <module name="common" target="1.8" />
       <module name="common-core" target="1.8" />
+      <module name="common-datafilter" target="1.8" />
       <module name="common-redis" target="1.8" />
       <module name="common-sequence" target="1.8" />
       <module name="common-swagger" target="1.8" />

orange-demo-multi-service-for-app/.idea/misc.xml

@@ -8,6 +8,7 @@
     </option>
     <option name="ignoredFiles">
       <set>
+        <option value="$PROJECT_DIR$/common/common-datafilter/pom.xml" />
         <option value="$PROJECT_DIR$/framework/apidoc-tools/pom.xml" />
       </set>
     </option>

orange-demo-multi-service-for-app/.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="8e833a26-fdef-45f6-a8c9-69c22611e94c" name="Default Changelist" comment="" />
+    <list default="true" id="be2ffe74-d2e3-4651-9b2b-9383f02a6ecc" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -13,7 +13,7 @@
   <component name="ProjectCodeStyleSettingsMigration">
     <option name="version" value="1" />
   </component>
-  <component name="ProjectId" id="1mYqHJvsDmC9tqOlQivdAjKUGzi" />
+  <component name="ProjectId" id="1nyJS1Tf4x77OAvHc5z1TqP813w" />
   <component name="ProjectViewState">
     <option name="abbreviatePackageNames" value="true" />
     <option name="autoscrollFromSource" value="true" />
@@ -36,7 +36,7 @@
       <recent name="$PROJECT_DIR$/zz-resource/db-scripts" />
     </key>
   </component>
-  <component name="RunManager" selected="Spring Boot.CourseClassApplication">
+  <component name="RunManager" selected="Spring Boot.StatsApplication">
     <configuration name="AdminMonitorApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="admin-monitor" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.orange.demo.adminmonitor.AdminMonitorApplication" />
@@ -83,12 +83,12 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="8e833a26-fdef-45f6-a8c9-69c22611e94c" name="Default Changelist" comment="" />
-      <created>1609680782670</created>
+      <changelist id="be2ffe74-d2e3-4651-9b2b-9383f02a6ecc" name="Default Changelist" comment="" />
+      <created>1612356392884</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1609680782670</updated>
-      <workItem from="1609680784203" duration="256000" />
+      <updated>1612356392884</updated>
+      <workItem from="1612356394589" duration="241000" />
     </task>
     <servers />
   </component>

orange-demo-multi-service-for-app/OrangeMultiDemo.iml

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-client:2.2.3" level="project" />
-    <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-client:2.2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.2.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.7.4" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.7.4" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.7.4" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.7.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:4.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.curator:curator-client:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.5.3-beta" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.3-1" level="project" />
-    <orderEntry type="library" name="Maven: org.lz4:lz4-java:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
-    <orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-  </component>
-</module>

orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java

@@ -117,6 +117,12 @@ public class StudentDto {
     @NotNull(message = "数据验证失败，所属校区不能为空！")
     private Long schoolId;
 
+    /**
+     * 注册时间。
+     */
+    @ApiModelProperty(value = "注册时间")
+    private Date registerTime;
+
     /**
      * 学生状态 (0: 正常 1: 锁定 2: 注销)。
      */

orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/mapper/StudentClassMapper.xml

@@ -31,7 +31,6 @@
                 AND zz_class.class_level = #{studentClassFilter.classLevel}
             </if>
         </if>
-        AND zz_class.status = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
 
     <select id="getStudentClassList" resultMap="BaseResultMap" parameterType="com.orange.demo.courseclassservice.model.StudentClass">

orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java

@@ -1,6 +1,5 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import lombok.Data;
 import javax.persistence.*;
@@ -32,7 +31,6 @@ public class Grade {
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @JSONField(serialize = false)
     @DeletedFlagColumn
     private Integer status;
 }

orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java

@@ -1,6 +1,5 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.orange.demo.courseclassinterface.constant.ClassLevel;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.annotation.RelationConstDict;
@@ -77,7 +76,6 @@ public class StudentClass {
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @JSONField(serialize = false)
     @DeletedFlagColumn
     private Integer status;
 

orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentServiceImpl.java

@@ -58,7 +58,6 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Override
     public Student saveNew(Student student) {
         student.setStudentId(idGenerator.nextLongId());
-        student.setRegisterTime(new Date());
         MyModelUtil.setDefaultValue(student, "totalCoin", 0);
         MyModelUtil.setDefaultValue(student, "leftCoin", 0);
         MyModelUtil.setDefaultValue(student, "status", StudentStatus.NORMAL);
@@ -76,7 +75,6 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean update(Student student, Student originalStudent) {
-        student.setRegisterTime(originalStudent.getRegisterTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
         return studentMapper.updateByPrimaryKey(student) == 1;
     }

orange-demo-multi-service-for-app/application/gateway/pom.xml

@@ -34,7 +34,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>${swagger.version}</version>
+            <version>${zz-swagger.version}</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>

orange-demo-multi-service-for-app/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPostFilter.java

@@ -184,7 +184,7 @@ public class AuthenticationPostFilter implements GlobalFilter, Ordered {
         if (tokenData == null) {
             return ResponseResult.error(errorCode, "内部错误，用户登录令牌对象没有正确返回！");
         }
-        Integer userId = tokenData.getInteger("userId");
+        Long userId = tokenData.getLong("userId");
         if (MyCommonUtil.isBlankOrNull(userId)) {
             return ResponseResult.error(errorCode, "内部错误，用户Id没有正确返回！");
         }
@@ -204,10 +204,10 @@ public class AuthenticationPostFilter implements GlobalFilter, Ordered {
         Map<String, Object> claims = new HashMap<>(1);
         claims.put(GatewayConstant.SESSION_ID_KEY_NAME, sessionId);
         String token = JwtUtil.generateToken(claims, appConfig.getExpiration(), appConfig.getTokenSigningKey());
-        // 3. 更新缓存
-        // 3.1 sessionId -> userId 是hash结构的缓存
-        String sessionIdKey = RedisKeyUtil.makeSessionIdKeyForRedis(sessionId);
         try (Jedis jedis = jedisPool.getResource()) {
+            // 3. 更新缓存
+            // 3.1 sessionId -> userId 是hash结构的缓存
+            String sessionIdKey = RedisKeyUtil.makeSessionIdKeyForRedis(sessionId);
             Transaction t = jedis.multi();
             for (String tokenKey : tokenData.keySet()) {
                 t.hset(sessionIdKey, tokenKey, tokenData.getString(tokenKey));

orange-demo-multi-service-for-app/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionTransDto.java

@@ -11,8 +11,6 @@ import lombok.Data;
 
 import javax.validation.constraints.*;
 
-import java.util.Date;
-
 /**
  * StudentActionTransDto对象。
  *
@@ -116,13 +114,6 @@ public class StudentActionTransDto {
     @ApiModelProperty(value = "做题是否正确标记")
     private Integer exerciseCorrectFlag;
 
-    /**
-     * 发生时间。
-     */
-    @ApiModelProperty(value = "发生时间", required = true)
-    @NotNull(message = "数据验证失败，发生时间不能为空！")
-    private Date createTime;
-
     /**
      * createTime 范围过滤起始值(>=)。
      */

orange-demo-multi-service-for-app/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java

@@ -1,6 +1,5 @@
 package com.orange.demo.statsservice.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import lombok.Data;
 import javax.persistence.*;
@@ -32,7 +31,6 @@ public class Grade {
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @JSONField(serialize = false)
     @DeletedFlagColumn
     private Integer status;
 }

orange-demo-multi-service-for-app/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/StudentActionTransServiceImpl.java

@@ -55,6 +55,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
     @Override
     public StudentActionTrans saveNew(StudentActionTrans studentActionTrans) {
         studentActionTrans.setTransId(idGenerator.nextLongId());
+        studentActionTrans.setCreateTime(new Date());
         studentActionTransMapper.insert(studentActionTrans);
         return studentActionTrans;
     }
@@ -69,6 +70,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
+        studentActionTrans.setCreateTime(originalStudentActionTrans.getCreateTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
         return studentActionTransMapper.updateByPrimaryKey(studentActionTrans) == 1;
     }

orange-demo-multi-service-for-app/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/vo/SysUserVo.java

@@ -29,12 +29,6 @@ public class SysUserVo {
     @ApiModelProperty(value = "登录用户名")
     private String loginName;
 
-    /**
-     * 用户密码。
-     */
-    @ApiModelProperty(value = "用户密码")
-    private String password;
-
     /**
      * 用户显示名称。
      */

orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java

@@ -16,7 +16,6 @@ import com.orange.demo.common.core.util.RsaUtil;
 import com.orange.demo.common.redis.cache.SessionCacheHelper;
 import com.orange.demo.upmsinterface.constant.SysUserStatus;
 import com.orange.demo.upmsinterface.constant.SysUserType;
-import com.orange.demo.upmsservice.config.ApplicationConfig;
 import com.orange.demo.upmsservice.model.SysUser;
 import com.orange.demo.upmsservice.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +41,6 @@ public class LoginController {
     @Autowired
     private SysUserService sysUserService;
     @Autowired
-    private ApplicationConfig appConfig;
-    @Autowired
     private SessionCacheHelper cacheHelper;
     @Autowired
     private PasswordEncoder passwordEncoder;
@@ -68,11 +65,14 @@ public class LoginController {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
         SysUser user = sysUserService.getSysUserByLoginName(loginName);
+        if (user == null) {
+            return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
+        }
         password = URLDecoder.decode(password, StandardCharsets.UTF_8.name());
         // NOTE: 第一次使用时，请务必阅读ApplicationConstant.PRIVATE_KEY的代码注释。
         // 执行RsaUtil工具类中的main函数，可以生成新的公钥和私钥。
         password = RsaUtil.decrypt(password, ApplicationConstant.PRIVATE_KEY);
-        if (user == null || !passwordEncoder.matches(password, user.getPassword())) {
+        if (!passwordEncoder.matches(password, user.getPassword())) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
         }
         String errorMessage;

orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml

@@ -42,7 +42,6 @@
                 AND zz_sys_user.create_time <= #{sysUserFilter.createTimeEnd}
             </if>
         </if>
-        AND zz_sys_user.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
 
     <select id="getSysUserList" resultMap="BaseResultMap" parameterType="com.orange.demo.upmsservice.model.SysUser">

orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java

@@ -1,18 +1,18 @@
 package com.orange.demo.upmsservice.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.orange.demo.upmsinterface.constant.SysUserType;
 import com.orange.demo.upmsinterface.constant.SysUserStatus;
 import com.orange.demo.common.core.annotation.RelationConstDict;
+import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.upmsinterface.vo.SysUserVo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
 import javax.persistence.*;
 
-import java.util.Date;
 import java.util.Map;
 
 /**
@@ -22,8 +22,9 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Table(name = "zz_sys_user")
-public class SysUser {
+public class SysUser extends BaseModel {
 
     /**
      * 用户Id。
@@ -70,35 +71,10 @@ public class SysUser {
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @JSONField(serialize = false)
     @DeletedFlagColumn
     @Column(name = "deleted_flag")
     private Integer deletedFlag;
 
-    /**
-     * 创建用户Id。
-     */
-    @Column(name = "create_user_id")
-    private Long createUserId;
-
-    /**
-     * 更新者Id。
-     */
-    @Column(name = "update_user_id")
-    private Long updateUserId;
-
-    /**
-     * 创建时间。
-     */
-    @Column(name = "create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间。
-     */
-    @Column(name = "update_time")
-    private Date updateTime;
-
     /**
      * createTime 范围过滤起始值(>=)。
      */

orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java

@@ -53,11 +53,10 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
      */
     @Override
     public SysUser getSysUserByLoginName(String loginName) {
-        Example e = new Example(SysUser.class);
-        Example.Criteria c = e.createCriteria();
-        c.andEqualTo("loginName", loginName);
-        c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
-        return sysUserMapper.selectOneByExample(e);
+        SysUser filter = new SysUser();
+        filter.setLoginName(loginName);
+        filter.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        return sysUserMapper.selectOne(filter);
     }
 
     /**

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java

@@ -0,0 +1,16 @@
+package com.orange.demo.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 主要用于标记数据权限中基于DeptId进行过滤的字段。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DeptFilterColumn {
+
+}

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java

@@ -0,0 +1,17 @@
+package com.orange.demo.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 作为DisableDataFilterAspect的切点。
+ * 该注解仅能标记在方法上，方法内所有的查询语句，均不会被Mybatis插件进行数据过滤。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DisableDataFilter {
+
+}

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java

@@ -0,0 +1,28 @@
+package com.orange.demo.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 仅用于微服务的多租户项目。
+ * 用于注解DAO层Mapper对象的租户过滤规则。被包含的方法将不会进行租户Id的过滤。
+ * 对于tk mapper和mybatis plus中的内置方法，可以直接指定方法名即可，如：selectOne。
+ * 需要说明的是，在大多数场景下，只要在实体对象中指定了租户Id字段，基于该主表的绝大部分增删改操作，
+ * 都需要经过租户Id过滤，仅当查询非常复杂，或者主表不在SQL语句之中的时候，可以通过该注解禁用该SQL，
+ * 并根据需求通过手动的方式实现租户过滤。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DisableTenantFilter {
+
+    /**
+     * 包含的方法名称数组。该值不能为空，因为如想取消所有方法的租户过滤，
+     * 可以通过在实体对象中不指定租户Id字段注解的方式实现。
+     *
+     * @return 被包括的方法名称数组。
+     */
+    String[] includeMethodName();
+}

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java

@@ -0,0 +1,27 @@
+package com.orange.demo.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 用于注解DAO层Mapper对象的数据权限规则。
+ * 由于框架使用了tk.mapper，所以并非所有的Mapper接口均在当前Mapper对象中定义，有一部分被tk.mapper封装，如selectAll等。
+ * 如果需要排除tk.mapper中的方法，可以直接使用tk.mapper基类所声明的方法名称即可。
+ * 另外，比较特殊的场景是，因为tk.mapper是通用框架，所以同样的selectAll方法，可以获取不同的数据集合，因此在service中如果
+ * 出现两个不同的方法调用Mapper的selectAll方法，但是一个需要参与过滤，另外一个不需要参与，那么就需要修改当前类的Mapper方法，
+ * 将其中一个方法重新定义一个具体的接口方法，并重新设定其是否参与数据过滤。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface EnableDataPerm {
+
+    /**
+     * 排除的方法名称数组。如果为空，所有的方法均会被Mybaits拦截注入权限过滤条件。
+     *
+     * @return 被排序的方法名称数据。
+     */
+    String[] excluseMethodName() default {};
+}

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java

@@ -0,0 +1,16 @@
+package com.orange.demo.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 主要用于标记通过租户Id进行过滤的字段。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface TenantFilterColumn {
+
+}

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java

@@ -0,0 +1,16 @@
+package com.orange.demo.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 主要用于标记数据权限中基于UserId进行过滤的字段。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface UserFilterColumn {
+
+}

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java

@@ -0,0 +1,40 @@
+package com.orange.demo.common.core.base.model;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.util.Date;
+
+/**
+ * 实体对象的公共基类，所有子类均必须包含基类定义的数据表字段和实体对象字段。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class BaseModel {
+
+    /**
+     * 创建者Id。
+     */
+    @Column(name = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建时间。
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新者Id。
+     */
+    @Column(name = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 更新时间。
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+}

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/config/FeignConfig.java

@@ -5,6 +5,7 @@ import com.orange.demo.common.core.object.TokenData;
 import com.orange.demo.common.core.util.ContextUtil;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -18,9 +19,18 @@ public class FeignConfig implements RequestInterceptor {
 
     @Override
     public void apply(RequestTemplate requestTemplate) {
-        requestTemplate.header(TokenData.REQUEST_ATTRIBUTE_NAME,
-                ContextUtil.getHttpRequest().getHeader(TokenData.REQUEST_ATTRIBUTE_NAME));
-        requestTemplate.header(ApplicationConstant.HTTP_HEADER_TRACE_ID,
-                ContextUtil.getHttpRequest().getHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID));
+        // 对于非servlet请求发起的远程调用，由于无法获取到标识用户身份的TokenData，因此需要略过下面的HEADER注入。
+        // 如：由消息队列consumer发起的远程调用请求。
+        if (!ContextUtil.hasRequestContext()) {
+            return;
+        }
+        String tokenData = ContextUtil.getHttpRequest().getHeader(TokenData.REQUEST_ATTRIBUTE_NAME);
+        if (StringUtils.isNotBlank(tokenData)) {
+            requestTemplate.header(TokenData.REQUEST_ATTRIBUTE_NAME, tokenData);
+        }
+        String traceId = ContextUtil.getHttpRequest().getHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID);
+        if (StringUtils.isNotBlank(traceId)) {
+            requestTemplate.header(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId);
+        }
     }
 }

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java

@@ -206,7 +206,7 @@ public class MyRequestArgumentResolver implements HandlerMethodArgumentResolver
                 }
             }
         } else if (parameterType == Boolean.class) {
-            return value.toString();
+            return value;
         } else if (parameterType == Character.class) {
             return value.toString().charAt(0);
         }

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java

@@ -0,0 +1,52 @@
+package com.orange.demo.common.core.object;
+
+import cn.hutool.core.util.BooleanUtil;
+
+/**
+ * 线程本地化数据管理的工具类。可根据需求自行添加更多的线程本地化变量及其操作方法。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+public class GlobalThreadLocal {
+
+    /**
+     * 存储数据权限过滤是否启用的线程本地化对象。
+     * 目前的过滤条件，包括数据权限和租户过滤。
+     */
+    private static final ThreadLocal<Boolean> DATA_FILTER_ENABLE = ThreadLocal.withInitial(() -> Boolean.TRUE);
+
+    /**
+     * 设置数据过滤是否打开。如果打开，当前Servlet线程所执行的SQL操作，均会进行数据过滤。
+     *
+     * @param enable 打开为true，否则false。
+     * @return 返回之前的状态，便于恢复。
+     */
+    public static boolean setDataFilter(boolean enable) {
+        boolean oldValue = DATA_FILTER_ENABLE.get();
+        DATA_FILTER_ENABLE.set(enable);
+        return oldValue;
+    }
+
+    /**
+     * 判断当前Servlet线程所执行的SQL操作，是否进行数据过滤。
+     *
+     * @return true 进行数据权限过滤，否则false。
+     */
+    public static boolean enabledDataFilter() {
+        return BooleanUtil.isTrue(DATA_FILTER_ENABLE.get());
+    }
+
+    /**
+     * 清空该存储数据，主动释放线程本地化存储资源。
+     */
+    public static void clearDataFilter() {
+        DATA_FILTER_ENABLE.remove();
+    }
+
+    /**
+     * 私有构造函数，明确标识该常量类的作用。
+     */
+    private GlobalThreadLocal() {
+    }
+}

orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java

@@ -31,6 +31,16 @@ public class TokenData {
      * 用户Id。
      */
     private Long userId;
+    /**
+     * 用户所在部门Id。
+     * 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
+     */
+    private Long deptId;
+    /**
+     * 租户Id。
+     * 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
+     */
+    private Long tenantId;
     /**
      * 是否为超级管理员。
      */
@@ -43,6 +53,11 @@ public class TokenData {
      * 标识不同登录的会话Id。
      */
     private String sessionId;
+    /**
+     * 访问uaa的授权token。
+     * 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
+     */
+    private String uaaAccessToken;
 
     /**
      * 将令牌对象添加到Http请求对象。

orange-demo-multi-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java

@@ -30,7 +30,11 @@ public class RedissonCacheConfig {
         /**
          * session下上传文件名的缓存(时间是24小时)。
          */
-        UPLOAD_FILENAME_CACHE(86400000);
+        UPLOAD_FILENAME_CACHE(86400000),
+        /**
+         * 缺省全局缓存(时间是24小时)。
+         */
+        GLOBAL_CACHE(86400000);
 
         /**
          * 缓存的时长(单位：毫秒)

orange-demo-multi-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java

@@ -1,5 +1,7 @@
 package com.orange.demo.common.redis.cache;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.orange.demo.common.core.object.TokenData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
@@ -71,4 +73,30 @@ public class SessionCacheHelper {
             cacheManager.getCache(c.name()).evict(sessionId);
         }
     }
+
+    /**
+     * 存放session的Token数据。仅仅单体服务使用。
+     *
+     * @param sessionId 当前会话的SessionId。
+     * @param tokenData 当前会话的JWT Token对象。
+     */
+    public void putTokenData(String sessionId, TokenData tokenData) {
+        if (sessionId == null || tokenData == null) {
+            return;
+        }
+        Cache cache = cacheManager.getCache(RedissonCacheConfig.CacheEnum.GLOBAL_CACHE.name());
+        cache.put(sessionId, JSON.toJSONString(tokenData));
+    }
+
+    /**
+     * 获取session的JWT Token对象。
+     *
+     * @param sessionId 当前会话的SessionId。
+     * @return 当前会话的JWT Token对象。
+     */
+    public TokenData getTokenData(String sessionId) {
+        Cache cache = cacheManager.getCache(RedissonCacheConfig.CacheEnum.GLOBAL_CACHE.name());
+        String tokenString = cache.get(sessionId, String.class);
+        return JSONObject.parseObject(tokenString, TokenData.class);
+    }
 }

orange-demo-multi-service-for-app/pom.xml

@@ -46,7 +46,7 @@
         <qdox.version>2.0.0</qdox.version>
         <knife4j.version>2.0.5</knife4j.version>
         <springfox.version>2.9.2</springfox.version>
-        <swagger.version>1.5.21</swagger.version>
+        <zz-swagger.version>1.5.21</zz-swagger.version>
     </properties>
 
     <modules>

orange-demo-multi-service-for-app/zz-resource/config-data/application-dev.yaml

@@ -94,7 +94,7 @@ swagger:
 management:
   metrics:
     tags:
-      application: 
+      application: ${spring.application.name}
   endpoints:
     web:
       exposure:

orange-demo-multi-service-for-app/zz-resource/config-data/upms-dev.yaml

@@ -28,8 +28,8 @@ sequence:
   zkPath: com/orange/demo
 
 mybatis:
-  mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml
-  typeAliasesPackage: com.orange.demo.*.model
+  mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml,com/orange/demo/common/datasync/dao/mapper/*Mapper.xml
+  typeAliasesPackage: com.orange.demo.*.model,com.orange.demo.common.datasync.model
 
 mapper:
   mappers: tk.mybatis.mapper.common.Mapper,tk.mybatis.mapper.additional.insert.InsertListMapper

orange-demo-multi-service-for-app/zz-resource/docker-files/docker-compose.yml

@@ -59,7 +59,7 @@ services:
       - zz-test
     depends_on:
       - zookeeper
-  
+
   sentinel:
     image: bladex/sentinel-dashboard
     ports: