同步到1.8.0

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

@@ -14,12 +14,12 @@
         </processorPath>
         <module name="common-sequence" />
         <module name="stats-api" />
-        <module name="upms-service" />
+        <module name="course-class-api" />
         <module name="stats-service" />
         <module name="upms-api" />
         <module name="common-swagger" />
         <module name="admin-monitor" />
-        <module name="course-class-api" />
+        <module name="upms-service" />
         <module name="common-redis" />
         <module name="common-core" />
         <module name="application-common" />

orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus:3.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-core:3.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-extension:3.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

orange-demo-multi-service/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_2_0_8.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5">
+  <library name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.8">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-annotations/2.0.5/knife4j-annotations-2.0.5.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-annotations/2.0.8/knife4j-annotations-2.0.8.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-annotations/2.0.5/knife4j-annotations-2.0.5-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-annotations/2.0.8/knife4j-annotations-2.0.8-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-annotations/2.0.5/knife4j-annotations-2.0.5-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-annotations/2.0.8/knife4j-annotations-2.0.8-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_2_0_8.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.github.xiaoymin:knife4j-core:2.0.5">
+  <library name="Maven: com.github.xiaoymin:knife4j-core:2.0.8">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-core/2.0.5/knife4j-core-2.0.5.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-core/2.0.8/knife4j-core-2.0.8.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-core/2.0.5/knife4j-core-2.0.5-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-core/2.0.8/knife4j-core-2.0.8-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-core/2.0.5/knife4j-core-2.0.5-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-core/2.0.8/knife4j-core-2.0.8-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__com_github_xiaoymin_knife4j_micro_spring_boot_starter_2_0_8.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5">
+  <library name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-micro-spring-boot-starter/2.0.5/knife4j-micro-spring-boot-starter-2.0.5.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-micro-spring-boot-starter/2.0.8/knife4j-micro-spring-boot-starter-2.0.8.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-micro-spring-boot-starter/2.0.5/knife4j-micro-spring-boot-starter-2.0.5-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-micro-spring-boot-starter/2.0.8/knife4j-micro-spring-boot-starter-2.0.8-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-micro-spring-boot-starter/2.0.5/knife4j-micro-spring-boot-starter-2.0.5-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-micro-spring-boot-starter/2.0.8/knife4j-micro-spring-boot-starter-2.0.8-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_2_0_8.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5">
+  <library name="Maven: com.github.xiaoymin:knife4j-spring:2.0.8">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring/2.0.5/knife4j-spring-2.0.5.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring/2.0.8/knife4j-spring-2.0.8.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring/2.0.5/knife4j-spring-2.0.5-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring/2.0.8/knife4j-spring-2.0.8-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring/2.0.5/knife4j-spring-2.0.5-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring/2.0.8/knife4j-spring-2.0.8-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_2_0_8.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5">
+  <library name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.8">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/2.0.5/knife4j-spring-boot-autoconfigure-2.0.5.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/2.0.8/knife4j-spring-boot-autoconfigure-2.0.8.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/2.0.5/knife4j-spring-boot-autoconfigure-2.0.5-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/2.0.8/knife4j-spring-boot-autoconfigure-2.0.8-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/2.0.5/knife4j-spring-boot-autoconfigure-2.0.5-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/2.0.8/knife4j-spring-boot-autoconfigure-2.0.8-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_2_0_8.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.5">
+  <library name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.8">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-ui/2.0.5/knife4j-spring-ui-2.0.5.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-ui/2.0.8/knife4j-spring-ui-2.0.8.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-ui/2.0.5/knife4j-spring-ui-2.0.5-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-ui/2.0.8/knife4j-spring-ui-2.0.8-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-ui/2.0.5/knife4j-spring-ui-2.0.5-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/knife4j-spring-ui/2.0.8/knife4j-spring-ui-2.0.8-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__io_github_classgraph_classgraph_4_1_7.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.classgraph:classgraph:4.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/classgraph/classgraph/4.1.7/classgraph-4.1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/classgraph/classgraph/4.1.7/classgraph-4.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/classgraph/classgraph/4.1.7/classgraph-4.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

orange-demo-multi-service/.idea/libraries/Maven__io_springfox_springfox_bean_validators_2_10_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-bean-validators:2.9.2">
+  <library name="Maven: io.springfox:springfox-bean-validators:2.10.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/2.9.2/springfox-bean-validators-2.9.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/2.9.2/springfox-bean-validators-2.9.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/2.9.2/springfox-bean-validators-2.9.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__io_springfox_springfox_core_2_10_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-core:2.9.2">
+  <library name="Maven: io.springfox:springfox-core:2.10.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.10.5/springfox-core-2.10.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.10.5/springfox-core-2.10.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.10.5/springfox-core-2.10.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__io_springfox_springfox_schema_2_10_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-schema:2.9.2">
+  <library name="Maven: io.springfox:springfox-schema:2.10.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.10.5/springfox-schema-2.10.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.10.5/springfox-schema-2.10.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.10.5/springfox-schema-2.10.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__io_springfox_springfox_spi_2_10_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-spi:2.9.2">
+  <library name="Maven: io.springfox:springfox-spi:2.10.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.10.5/springfox-spi-2.10.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.10.5/springfox-spi-2.10.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.10.5/springfox-spi-2.10.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_10_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-spring-web:2.9.2">
+  <library name="Maven: io.springfox:springfox-spring-web:2.10.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.10.5/springfox-spring-web-2.10.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.10.5/springfox-spring-web-2.10.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.10.5/springfox-spring-web-2.10.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_2_10_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-spring-webmvc:2.10.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

orange-demo-multi-service/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_10_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-swagger2:2.9.2">
+  <library name="Maven: io.springfox:springfox-swagger2:2.10.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.10.5/springfox-swagger2-2.10.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.10.5/springfox-swagger2-2.10.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.10.5/springfox-swagger2-2.10.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_10_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-swagger-common:2.9.2">
+  <library name="Maven: io.springfox:springfox-swagger-common:2.10.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.10.5/springfox-swagger-common-2.10.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.10.5/springfox-swagger-common-2.10.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.10.5/springfox-swagger-common-2.10.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.swagger:swagger-models:1.5.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.21/swagger-models-1.5.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.21/swagger-models-1.5.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.21/swagger-models-1.5.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

orange-demo-multi-service/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.persistence:persistence-api:1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/persistence/persistence-api/1.0/persistence-api-1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis:3.4.6">
+  <library name="Maven: org.mybatis:mybatis:3.5.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.5/mybatis-3.5.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.5/mybatis-3.5.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.5/mybatis-3.5.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-spring:1.3.2">
+  <library name="Maven: org.mybatis:mybatis-spring:2.0.5">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
+  <library name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE">
+  <library name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_base_1_1_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: tk.mybatis:mapper-base:1.1.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-base/1.1.5/mapper-base-1.1.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-base/1.1.5/mapper-base-1.1.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-base/1.1.5/mapper-base-1.1.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_core_1_1_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: tk.mybatis:mapper-core:1.1.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-core/1.1.5/mapper-core-1.1.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-core/1.1.5/mapper-core-1.1.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-core/1.1.5/mapper-core-1.1.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_1_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: tk.mybatis:mapper-extra:1.1.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-extra/1.1.5/mapper-extra-1.1.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-extra/1.1.5/mapper-extra-1.1.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-extra/1.1.5/mapper-extra-1.1.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_1_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: tk.mybatis:mapper-spring:1.1.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring/1.1.5/mapper-spring-1.1.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring/1.1.5/mapper-spring-1.1.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring/1.1.5/mapper-spring-1.1.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_1_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring-boot-autoconfigure/2.1.5/mapper-spring-boot-autoconfigure-2.1.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring-boot-autoconfigure/2.1.5/mapper-spring-boot-autoconfigure-2.1.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring-boot-autoconfigure/2.1.5/mapper-spring-boot-autoconfigure-2.1.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_1_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring-boot-starter/2.1.5/mapper-spring-boot-starter-2.1.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring-boot-starter/2.1.5/mapper-spring-boot-starter-2.1.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-spring-boot-starter/2.1.5/mapper-spring-boot-starter-2.1.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: tk.mybatis:mapper-weekend:1.1.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-weekend/1.1.5/mapper-weekend-1.1.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-weekend/1.1.5/mapper-weekend-1.1.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper-weekend/1.1.5/mapper-weekend-1.1.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="d28775da-807b-4be4-b3fb-7626d9bb6dce" name="Default Changelist" comment="" />
+    <list default="true" id="216743b9-524b-4922-b455-b0e9c8b485b9" 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="1tZuAGX7mvjZvXvQ1rbZBKty5Ln" />
+  <component name="ProjectId" id="1wfVMeoGKApld9UdILFEuYjLurI" />
   <component name="ProjectViewState">
     <option name="abbreviatePackageNames" value="true" />
     <option name="autoscrollFromSource" value="true" />
@@ -27,11 +27,16 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/zz-resource/db-scripts" />
     <property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
     <property name="settings.editor.selected.configurable" value="Errors" />
   </component>
-  <component name="RunManager" selected="Spring Boot.AdminMonitorApplication">
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/zz-resource/db-scripts" />
+    </key>
+  </component>
+  <component name="RunManager" selected="Spring Boot.UpmsApplication">
     <configuration name="AdminMonitorApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="admin-monitor" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.orange.demo.adminmonitor.AdminMonitorApplication" />
@@ -78,12 +83,12 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="d28775da-807b-4be4-b3fb-7626d9bb6dce" name="Default Changelist" comment="" />
+      <changelist id="216743b9-524b-4922-b455-b0e9c8b485b9" name="Default Changelist" comment="" />
-      <created>1622988787059</created>
+      <created>1628849582125</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1622988787059</updated>
+      <updated>1628849582125</updated>
-      <workItem from="1622988788767" duration="1292000" />
+      <workItem from="1628849584343" duration="407000" />
     </task>
     <servers />
   </component>
@@ -91,9 +96,9 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="383" y="212" width="833" height="476" key="find.popup" timestamp="1622990014452">
+    <state x="383" y="212" width="735" height="476" key="find.popup" timestamp="1628849897788">
       <screen x="0" y="0" width="1440" height="900" />
     </state>
-    <state x="383" y="212" width="833" height="476" key="find.popup/0.0.1440.900@0.0.1440.900" timestamp="1622990014452" />
+    <state x="383" y="212" width="735" height="476" key="find.popup/0.0.1440.900@0.0.1440.900" timestamp="1628849897788" />
   </component>
 </project>

orange-demo-multi-service/OrangeMultiDemo.iml

@@ -17,9 +17,6 @@
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -117,6 +114,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/application-common/application-common.iml

@@ -91,9 +91,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -168,6 +165,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/application.iml

@@ -85,9 +85,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -162,6 +159,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/course-class/course-class-api/course-class-api.iml

@@ -31,7 +31,6 @@
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.45" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" 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" />
@@ -66,44 +65,41 @@
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="module" module-name="common-swagger" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
@@ -167,8 +163,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -241,6 +235,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml

@@ -64,44 +64,41 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="module" module-name="common-swagger" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
     <orderEntry type="module" module-name="common-redis" />
     <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.4" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.63.Final" level="project" />
@@ -182,9 +179,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -257,6 +251,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import tk.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.annotation.MapperScan;
 
 import javax.sql.DataSource;
 

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

@@ -1,9 +1,8 @@
 package com.orange.demo.courseclassservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
-import javax.persistence.*;
-
 /**
  * 行政区划实体对象。
  *
@@ -11,31 +10,30 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_area_code")
+@TableName(value = "zz_area_code")
 public class AreaCode {
 
     /**
      * 行政区划主键Id
      */
-    @Id
+    @TableId(value = "area_id")
-    @Column(name = "area_id")
     private Long areaId;
 
     /**
      * 行政区划名称
      */
-    @Column(name = "area_name")
+    @TableField(value = "area_name")
     private String areaName;
 
     /**
      * 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
      */
-    @Column(name = "area_level")
+    @TableField(value = "area_level")
     private Integer areaLevel;
 
     /**
      * 父级行政区划Id
      */
-    @Column(name = "parent_id")
+    @TableField(value = "parent_id")
     private Long parentId;
 }

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

@@ -1,7 +1,7 @@
 package com.orange.demo.courseclassservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import javax.persistence.*;
 
 /**
  * ClassCourse实体对象。
@@ -10,26 +10,24 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_class_course")
+@TableName(value = "zz_class_course")
 public class ClassCourse {
 
     /**
      * 班级Id。
      */
-    @Id
+    @TableField(value = "class_id")
-    @Column(name = "class_id")
     private Long classId;
 
     /**
      * 课程Id。
      */
-    @Id
+    @TableField(value = "course_id")
-    @Column(name = "course_id")
     private Long courseId;
 
     /**
      * 课程顺序(数值越小越靠前)。
      */
-    @Column(name = "course_order")
+    @TableField(value = "course_order")
     private Integer courseOrder;
 }

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

@@ -1,7 +1,7 @@
 package com.orange.demo.courseclassservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import javax.persistence.*;
 
 /**
  * ClassStudent实体对象。
@@ -10,20 +10,18 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_class_student")
+@TableName(value = "zz_class_student")
 public class ClassStudent {
 
     /**
      * 班级Id。
      */
-    @Id
+    @TableField(value = "class_id")
-    @Column(name = "class_id")
     private Long classId;
 
     /**
      * 学生Id。
      */
-    @Id
+    @TableField(value = "student_id")
-    @Column(name = "student_id")
     private Long studentId;
 }

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

@@ -1,5 +1,6 @@
 package com.orange.demo.courseclassservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.courseclassapi.vo.CourseVo;
 import com.orange.demo.courseclassapi.constant.CourseDifficult;
 import com.orange.demo.application.common.constant.Subject;
@@ -11,7 +12,6 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import javax.persistence.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -24,20 +24,19 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_course")
+@TableName(value = "zz_course")
 public class Course {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "course_id")
-    @Column(name = "course_id")
     private Long courseId;
 
     /**
      * 课程名称。
      */
-    @Column(name = "course_name")
+    @TableField(value = "course_name")
     private String courseName;
 
     /**
@@ -58,86 +57,86 @@ public class Course {
     /**
      * 年级Id。
      */
-    @Column(name = "grade_id")
+    @TableField(value = "grade_id")
     private Integer gradeId;
 
     /**
      * 学科Id。
      */
-    @Column(name = "subject_id")
+    @TableField(value = "subject_id")
     private Integer subjectId;
 
     /**
      * 课时数量。
      */
-    @Column(name = "class_hour")
+    @TableField(value = "class_hour")
     private Integer classHour;
 
     /**
      * 多张课程图片地址。
      */
     @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
-    @Column(name = "picture_url")
+    @TableField(value = "picture_url")
     private String pictureUrl;
 
     /**
      * 创建用户Id。
      */
-    @Column(name = "create_user_id")
+    @TableField(value = "create_user_id")
     private Long createUserId;
 
     /**
      * 创建时间。
      */
-    @Column(name = "create_time")
+    @TableField(value = "create_time")
     private Date createTime;
 
     /**
      * 最后修改时间。
      */
-    @Column(name = "update_time")
+    @TableField(value = "update_time")
     private Date updateTime;
 
     /**
      * price 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private BigDecimal priceStart;
 
     /**
      * price 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private BigDecimal priceEnd;
 
     /**
      * classHour 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private Integer classHourStart;
 
     /**
      * classHour 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private Integer classHourEnd;
 
     /**
      * updateTime 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String updateTimeStart;
 
     /**
      * updateTime 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String updateTimeEnd;
 
     /**
      * courseId 的多对多关联表数据对象。
      */
-    @Transient
+    @TableField(exist = false)
     private ClassCourse classCourse;
 
     @RelationDict(
@@ -146,19 +145,19 @@ public class Course {
             slaveModelClass = Grade.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> gradeIdDictMap;
 
     @RelationConstDict(
             masterIdField = "difficulty",
             constantDictClass = CourseDifficult.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> difficultyDictMap;
 
     @RelationConstDict(
             masterIdField = "subjectId",
             constantDictClass = Subject.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> subjectIdDictMap;
 
     @Mapper

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

@@ -1,8 +1,7 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.orange.demo.common.core.annotation.DeletedFlagColumn;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import javax.persistence.*;
 
 /**
  * Grade实体对象。
@@ -11,26 +10,24 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_grade")
+@TableName(value = "zz_grade")
 public class Grade {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "grade_id", type = IdType.AUTO)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "grade_id")
     private Integer gradeId;
 
     /**
      * 年级名称。
      */
-    @Column(name = "grade_name")
+    @TableField(value = "grade_name")
     private String gradeName;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
     private Integer status;
 }

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

@@ -1,7 +1,7 @@
 package com.orange.demo.courseclassservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import javax.persistence.*;
 
 /**
  * MaterialEdition实体对象。
@@ -10,21 +10,19 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_material_edition")
+@TableName(value = "zz_material_edition")
 public class MaterialEdition {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "edition_id", type = IdType.AUTO)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "edition_id")
     private Integer editionId;
 
     /**
      * 教材版本名称。
      */
-    @Column(name = "edition_name")
+    @TableField(value = "edition_name")
     private String editionName;
 
     /**

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

@@ -1,12 +1,12 @@
 package com.orange.demo.courseclassservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.courseclassapi.vo.SchoolInfoVo;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import javax.persistence.*;
 
 import java.util.Map;
 
@@ -17,32 +17,31 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_school_info")
+@TableName(value = "zz_school_info")
 public class SchoolInfo {
 
     /**
      * 学校Id。
      */
-    @Id
+    @TableId(value = "school_id")
-    @Column(name = "school_id")
     private Long schoolId;
 
     /**
      * 学校名称。
      */
-    @Column(name = "school_name")
+    @TableField(value = "school_name")
     private String schoolName;
 
     /**
      * 所在省Id。
      */
-    @Column(name = "province_id")
+    @TableField(value = "province_id")
     private Long provinceId;
 
     /**
      * 所在城市Id。
      */
-    @Column(name = "city_id")
+    @TableField(value = "city_id")
     private Long cityId;
 
     @RelationDict(
@@ -51,7 +50,7 @@ public class SchoolInfo {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> provinceIdDictMap;
 
     @RelationDict(
@@ -60,7 +59,7 @@ public class SchoolInfo {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> cityIdDictMap;
 
     @Mapper

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

@@ -1,5 +1,6 @@
 package com.orange.demo.courseclassservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.courseclassapi.vo.StudentVo;
 import com.orange.demo.application.common.constant.Gender;
 import com.orange.demo.application.common.constant.ExpLevel;
@@ -11,7 +12,6 @@ import com.orange.demo.common.core.util.MyCommonUtil;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -23,44 +23,43 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_student")
+@TableName(value = "zz_student")
 public class Student {
 
     /**
      * 学生Id。
      */
-    @Id
+    @TableId(value = "student_id")
-    @Column(name = "student_id")
     private Long studentId;
 
     /**
      * 登录手机。
      */
-    @Column(name = "login_mobile")
+    @TableField(value = "login_mobile")
     private String loginMobile;
 
     /**
      * 学生姓名。
      */
-    @Column(name = "student_name")
+    @TableField(value = "student_name")
     private String studentName;
 
     /**
      * 所在省份Id。
      */
-    @Column(name = "province_id")
+    @TableField(value = "province_id")
     private Long provinceId;
 
     /**
      * 所在城市Id。
      */
-    @Column(name = "city_id")
+    @TableField(value = "city_id")
     private Long cityId;
 
     /**
      * 区县Id。
      */
-    @Column(name = "district_id")
+    @TableField(value = "district_id")
     private Long districtId;
 
     /**
@@ -76,37 +75,37 @@ public class Student {
     /**
      * 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
      */
-    @Column(name = "experience_level")
+    @TableField(value = "experience_level")
     private Integer experienceLevel;
 
     /**
      * 总共充值学币数量。
      */
-    @Column(name = "total_coin")
+    @TableField(value = "total_coin")
     private Integer totalCoin;
 
     /**
      * 可用学币数量。
      */
-    @Column(name = "left_coin")
+    @TableField(value = "left_coin")
     private Integer leftCoin;
 
     /**
      * 年级Id。
      */
-    @Column(name = "grade_id")
+    @TableField(value = "grade_id")
     private Integer gradeId;
 
     /**
      * 校区Id。
      */
-    @Column(name = "school_id")
+    @TableField(value = "school_id")
     private Long schoolId;
 
     /**
      * 注册时间。
      */
-    @Column(name = "register_time")
+    @TableField(value = "register_time")
     private Date registerTime;
 
     /**
@@ -117,31 +116,31 @@ public class Student {
     /**
      * birthday 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String birthdayStart;
 
     /**
      * birthday 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String birthdayEnd;
 
     /**
      * registerTime 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String registerTimeStart;
 
     /**
      * registerTime 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String registerTimeEnd;
 
     /**
      * true LIKE搜索字符串。
      */
-    @Transient
+    @TableField(exist = false)
     private String searchString;
 
     public void setSearchString(String searchString) {
@@ -154,7 +153,7 @@ public class Student {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> provinceIdDictMap;
 
     @RelationDict(
@@ -163,7 +162,7 @@ public class Student {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> cityIdDictMap;
 
     @RelationDict(
@@ -172,7 +171,7 @@ public class Student {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> districtIdDictMap;
 
     @RelationDict(
@@ -181,7 +180,7 @@ public class Student {
             slaveModelClass = Grade.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> gradeIdDictMap;
 
     @RelationDict(
@@ -190,25 +189,25 @@ public class Student {
             slaveModelClass = SchoolInfo.class,
             slaveIdField = "schoolId",
             slaveNameField = "schoolName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> schoolIdDictMap;
 
     @RelationConstDict(
             masterIdField = "gender",
             constantDictClass = Gender.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> genderDictMap;
 
     @RelationConstDict(
             masterIdField = "experienceLevel",
             constantDictClass = ExpLevel.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> experienceLevelDictMap;
 
     @RelationConstDict(
             masterIdField = "status",
             constantDictClass = StudentStatus.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> statusDictMap;
 
     @Mapper

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

@@ -1,15 +1,14 @@
 package com.orange.demo.courseclassservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.courseclassapi.vo.StudentClassVo;
 import com.orange.demo.courseclassapi.constant.ClassLevel;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.annotation.RelationConstDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
-import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -21,62 +20,61 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_class")
+@TableName(value = "zz_class")
 public class StudentClass {
 
     /**
      * 班级Id。
      */
-    @Id
+    @TableId(value = "class_id")
-    @Column(name = "class_id")
     private Long classId;
 
     /**
      * 班级名称。
      */
-    @Column(name = "class_name")
+    @TableField(value = "class_name")
     private String className;
 
     /**
      * 学校Id。
      */
-    @Column(name = "school_id")
+    @TableField(value = "school_id")
     private Long schoolId;
 
     /**
      * 学生班长Id。
      */
-    @Column(name = "leader_id")
+    @TableField(value = "leader_id")
     private Long leaderId;
 
     /**
      * 已完成课时数量。
      */
-    @Column(name = "finish_class_hour")
+    @TableField(value = "finish_class_hour")
     private Integer finishClassHour;
 
     /**
      * 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
      */
-    @Column(name = "class_level")
+    @TableField(value = "class_level")
     private Integer classLevel;
 
     /**
      * 创建用户。
      */
-    @Column(name = "create_user_id")
+    @TableField(value = "create_user_id")
     private Long createUserId;
 
     /**
      * 班级创建时间。
      */
-    @Column(name = "create_time")
+    @TableField(value = "create_time")
     private Date createTime;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
     private Integer status;
 
     @RelationDict(
@@ -85,7 +83,7 @@ public class StudentClass {
             slaveModelClass = SchoolInfo.class,
             slaveIdField = "schoolId",
             slaveNameField = "schoolName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> schoolIdDictMap;
 
     @RelationDict(
@@ -94,13 +92,13 @@ public class StudentClass {
             slaveModelClass = Student.class,
             slaveIdField = "studentId",
             slaveNameField = "studentName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> leaderIdDictMap;
 
     @RelationConstDict(
             masterIdField = "classLevel",
             constantDictClass = ClassLevel.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> classLevelDictMap;
 
     @Mapper

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

@@ -1,5 +1,7 @@
 package com.orange.demo.courseclassservice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassservice.dao.*;
 import com.orange.demo.courseclassservice.model.*;
@@ -80,7 +82,8 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
         course.setCreateTime(originalCourse.getCreateTime());
         course.setUpdateTime(new Date());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        return courseMapper.updateByPrimaryKey(course) == 1;
+        UpdateWrapper<Course> uw = this.createUpdateQueryForNullValue(course, course.getCourseId());
+        return courseMapper.update(course, uw) == 1;
     }
 
     /**
@@ -92,14 +95,13 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long courseId) {
-        // 这里先删除主数据
+        if (courseMapper.deleteById(courseId) == 0) {
-        if (!this.removeById(courseId)) {
             return false;
         }
         // 开始删除与本地多对多父表的关联
         ClassCourse classCourse = new ClassCourse();
         classCourse.setCourseId(courseId);
-        classCourseMapper.delete(classCourse);
+        classCourseMapper.delete(new QueryWrapper<>(classCourse));
         return true;
     }
 
@@ -167,8 +169,9 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
     @Override
     public <M> List<Course> getCourseListWithRelation(
             String inFilterField, Set<M> inFilterValues, Course filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, Course.class);
         List<Course> resultList =
-                courseMapper.getCourseList(inFilterField, inFilterValues, filter, orderBy);
+                courseMapper.getCourseList(inFilterColumn, inFilterValues, filter, orderBy);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;

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

@@ -1,5 +1,6 @@
 package com.orange.demo.courseclassservice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassservice.dao.*;
 import com.orange.demo.courseclassservice.model.*;
@@ -69,7 +70,8 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
     @Override
     public boolean update(SchoolInfo schoolInfo, SchoolInfo originalSchoolInfo) {
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        return schoolInfoMapper.updateByPrimaryKey(schoolInfo) == 1;
+        UpdateWrapper<SchoolInfo> uw = this.createUpdateQueryForNullValue(schoolInfo, schoolInfo.getSchoolId());
+        return schoolInfoMapper.update(schoolInfo, uw) == 1;
     }
 
     /**
@@ -81,8 +83,7 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long schoolId) {
-        // 这里先删除主数据
+        return schoolInfoMapper.deleteById(schoolId) == 1;
-        return this.removeById(schoolId);
     }
 
     /**
@@ -149,8 +150,9 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
     @Override
     public <M> List<SchoolInfo> getSchoolInfoListWithRelation(
             String inFilterField, Set<M> inFilterValues, SchoolInfo filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, SchoolInfo.class);
         List<SchoolInfo> resultList =
-                schoolInfoMapper.getSchoolInfoList(inFilterField, inFilterValues, filter, orderBy);
+                schoolInfoMapper.getSchoolInfoList(inFilterColumn, inFilterValues, filter, orderBy);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;

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

@@ -1,5 +1,7 @@
 package com.orange.demo.courseclassservice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassservice.dao.*;
 import com.orange.demo.courseclassservice.model.*;
@@ -16,7 +18,6 @@ import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 
@@ -83,9 +84,9 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     public boolean update(StudentClass studentClass, StudentClass originalStudentClass) {
         studentClass.setCreateUserId(originalStudentClass.getCreateUserId());
         studentClass.setCreateTime(originalStudentClass.getCreateTime());
-        studentClass.setStatus(GlobalDeletedFlag.NORMAL);
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        return studentClassMapper.updateByPrimaryKey(studentClass) == 1;
+        UpdateWrapper<StudentClass> uw = this.createUpdateQueryForNullValue(studentClass, studentClass.getClassId());
+        return studentClassMapper.update(studentClass, uw) == 1;
     }
 
     /**
@@ -97,17 +98,16 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long classId) {
-        // 这里先删除主数据
+        if (studentClassMapper.deleteById(classId) == 0) {
-        if (!this.removeById(classId)) {
             return false;
         }
         // 开始删除多对多中间表的关联
         ClassCourse classCourse = new ClassCourse();
         classCourse.setClassId(classId);
-        classCourseMapper.delete(classCourse);
+        classCourseMapper.delete(new QueryWrapper<>(classCourse));
         ClassStudent classStudent = new ClassStudent();
         classStudent.setClassId(classId);
-        classStudentMapper.delete(classStudent);
+        classStudentMapper.delete(new QueryWrapper<>(classStudent));
         return true;
     }
 
@@ -175,8 +175,9 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     @Override
     public <M> List<StudentClass> getStudentClassListWithRelation(
             String inFilterField, Set<M> inFilterValues, StudentClass filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, StudentClass.class);
         List<StudentClass> resultList =
-                studentClassMapper.getStudentClassList(inFilterField, inFilterValues, filter, orderBy);
+                studentClassMapper.getStudentClassList(inFilterColumn, inFilterValues, filter, orderBy);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
@@ -196,8 +197,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
         for (ClassCourse classCourse : classCourseList) {
             classCourse.setClassId(classId);
             MyModelUtil.setDefaultValue(classCourse, "courseOrder", 0);
+            classCourseMapper.insert(classCourse);
         }
-        classCourseMapper.insertList(classCourseList);
     }
 
     /**
@@ -209,11 +210,13 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateClassCourse(ClassCourse classCourse) {
-        Example e = new Example(ClassCourse.class);
+        ClassCourse filter = new ClassCourse();
-        e.createCriteria()
+        filter.setClassId(classCourse.getClassId());
-                .andEqualTo("classId", classCourse.getClassId())
+        filter.setCourseId(classCourse.getCourseId());
-                .andEqualTo("courseId", classCourse.getCourseId());
+        UpdateWrapper<ClassCourse> uw =
-        return classCourseMapper.updateByExample(classCourse, e) > 0;
+                BaseService.createUpdateQueryForNullValue(classCourse, ClassCourse.class);
+        uw.setEntity(filter);
+        return classCourseMapper.update(classCourse, uw) > 0;
     }
 
     /**
@@ -225,11 +228,10 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
      */
     @Override
     public ClassCourse getClassCourse(Long classId, Long courseId) {
-        Example e = new Example(ClassCourse.class);
+        ClassCourse filter = new ClassCourse();
-        e.createCriteria()
+        filter.setClassId(classId);
-                .andEqualTo("classId", classId)
+        filter.setCourseId(courseId);
-                .andEqualTo("courseId", courseId);
+        return classCourseMapper.selectOne(new QueryWrapper<>(filter));
-        return classCourseMapper.selectOneByExample(e);
     }
 
     /**
@@ -245,7 +247,7 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
         ClassCourse filter = new ClassCourse();
         filter.setClassId(classId);
         filter.setCourseId(courseId);
-        return classCourseMapper.delete(filter) > 0;
+        return classCourseMapper.delete(new QueryWrapper<>(filter)) > 0;
     }
 
     /**
@@ -259,8 +261,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     public void addClassStudentList(List<ClassStudent> classStudentList, Long classId) {
         for (ClassStudent classStudent : classStudentList) {
             classStudent.setClassId(classId);
+            classStudentMapper.insert(classStudent);
         }
-        classStudentMapper.insertList(classStudentList);
     }
 
     /**
@@ -276,7 +278,7 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
         ClassStudent filter = new ClassStudent();
         filter.setClassId(classId);
         filter.setStudentId(studentId);
-        return classStudentMapper.delete(filter) > 0;
+        return classStudentMapper.delete(new QueryWrapper<>(filter)) > 0;
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package com.orange.demo.courseclassservice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.application.common.constant.StudentStatus;
 import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassservice.dao.*;
@@ -79,7 +81,8 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Override
     public boolean update(Student student, Student originalStudent) {
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        return studentMapper.updateByPrimaryKey(student) == 1;
+        UpdateWrapper<Student> uw = this.createUpdateQueryForNullValue(student, student.getStudentId());
+        return studentMapper.update(student, uw) == 1;
     }
 
     /**
@@ -91,14 +94,13 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long studentId) {
-        // 这里先删除主数据
+        if (studentMapper.deleteById(studentId) == 0) {
-        if (!this.removeById(studentId)) {
             return false;
         }
         // 开始删除与本地多对多父表的关联
         ClassStudent classStudent = new ClassStudent();
         classStudent.setStudentId(studentId);
-        classStudentMapper.delete(classStudent);
+        classStudentMapper.delete(new QueryWrapper<>(classStudent));
         return true;
     }
 
@@ -166,8 +168,9 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Override
     public <M> List<Student> getStudentListWithRelation(
             String inFilterField, Set<M> inFilterValues, Student filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, Student.class);
         List<Student> resultList =
-                studentMapper.getStudentList(inFilterField, inFilterValues, filter, orderBy);
+                studentMapper.getStudentList(inFilterColumn, inFilterValues, filter, orderBy);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;

orange-demo-multi-service/application/course-class/course-class.iml

@@ -85,9 +85,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -162,6 +159,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/gateway/gateway.iml

@@ -16,31 +16,20 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" 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-qual:2.11.1" 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: com.fasterxml:classmate:1.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-gateway:2.2.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
@@ -92,6 +81,13 @@
     <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
     <orderEntry type="module" module-name="common-core" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" 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-qual:2.11.1" 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: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
@@ -114,23 +110,21 @@
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
@@ -184,7 +178,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
@@ -253,6 +246,11 @@
     <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" 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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/stats/stats-api/stats-api.iml

@@ -31,7 +31,6 @@
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.45" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" 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" />
@@ -66,44 +65,41 @@
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="module" module-name="common-swagger" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
@@ -167,8 +163,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -241,6 +235,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import tk.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.annotation.MapperScan;
 
 import javax.sql.DataSource;
 

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java

@@ -1,5 +1,6 @@
 package com.orange.demo.statsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.statsapi.vo.CourseTransStatsVo;
 import com.orange.demo.courseclassapi.vo.CourseVo;
 import com.orange.demo.courseclassapi.client.CourseClient;
@@ -12,7 +13,6 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -24,81 +24,79 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_course_trans_stats")
+@TableName(value = "zz_course_trans_stats")
 public class CourseTransStats {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "stats_id", type = IdType.AUTO)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "stats_id")
     private Long statsId;
 
     /**
      * 统计日期。
      */
-    @Column(name = "stats_date")
+    @TableField(value = "stats_date")
     private Date statsDate;
 
     /**
      * 科目Id。
      */
-    @Column(name = "subject_id")
+    @TableField(value = "subject_id")
     private Integer subjectId;
 
     /**
      * 年级Id。
      */
-    @Column(name = "grade_id")
+    @TableField(value = "grade_id")
     private Integer gradeId;
 
     /**
      * 年级名称。
      */
-    @Column(name = "grade_name")
+    @TableField(value = "grade_name")
     private String gradeName;
 
     /**
      * 课程Id。
      */
-    @Column(name = "course_id")
+    @TableField(value = "course_id")
     private Long courseId;
 
     /**
      * 课程名称。
      */
-    @Column(name = "course_name")
+    @TableField(value = "course_name")
     private String courseName;
 
     /**
      * 学生上课次数。
      */
-    @Column(name = "student_attend_count")
+    @TableField(value = "student_attend_count")
     private Integer studentAttendCount;
 
     /**
      * 学生献花数量。
      */
-    @Column(name = "student_flower_amount")
+    @TableField(value = "student_flower_amount")
     private Integer studentFlowerAmount;
 
     /**
      * 学生献花次数。
      */
-    @Column(name = "student_flower_count")
+    @TableField(value = "student_flower_count")
     private Integer studentFlowerCount;
 
     /**
      * statsDate 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String statsDateStart;
 
     /**
      * statsDate 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String statsDateEnd;
 
     @RelationDict(
@@ -107,7 +105,7 @@ public class CourseTransStats {
             slaveModelClass = GradeVo.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> gradeIdDictMap;
 
     @RelationDict(
@@ -116,13 +114,13 @@ public class CourseTransStats {
             slaveModelClass = CourseVo.class,
             slaveIdField = "courseId",
             slaveNameField = "courseName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> courseIdDictMap;
 
     @RelationConstDict(
             masterIdField = "subjectId",
             constantDictClass = Subject.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> subjectIdDictMap;
 
     @Mapper

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

@@ -1,8 +1,7 @@
 package com.orange.demo.statsservice.model;
 
-import com.orange.demo.common.core.annotation.DeletedFlagColumn;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import javax.persistence.*;
 
 /**
  * Grade实体对象。
@@ -11,26 +10,24 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_grade")
+@TableName(value = "zz_grade")
 public class Grade {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "grade_id", type = IdType.AUTO)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "grade_id")
     private Integer gradeId;
 
     /**
      * 年级名称。
      */
-    @Column(name = "grade_name")
+    @TableField(value = "grade_name")
     private String gradeName;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
     private Integer status;
 }

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java

@@ -1,7 +1,7 @@
 package com.orange.demo.statsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import javax.persistence.*;
 
 /**
  * SchoolInfo实体对象。
@@ -10,31 +10,30 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_school_info")
+@TableName(value = "zz_school_info")
 public class SchoolInfo {
 
     /**
      * 学校Id。
      */
-    @Id
+    @TableId(value = "school_id")
-    @Column(name = "school_id")
     private Long schoolId;
 
     /**
      * 学校名称。
      */
-    @Column(name = "school_name")
+    @TableField(value = "school_name")
     private String schoolName;
 
     /**
      * 所在省Id。
      */
-    @Column(name = "province_id")
+    @TableField(value = "province_id")
     private Long provinceId;
 
     /**
      * 所在城市Id。
      */
-    @Column(name = "city_id")
+    @TableField(value = "city_id")
     private Long cityId;
 }

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java

@@ -1,5 +1,6 @@
 package com.orange.demo.statsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.statsapi.vo.StudentActionStatsVo;
 import com.orange.demo.courseclassapi.vo.AreaCodeVo;
 import com.orange.demo.courseclassapi.vo.GradeVo;
@@ -10,7 +11,6 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -22,146 +22,145 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_student_action_stats")
+@TableName(value = "zz_student_action_stats")
 public class StudentActionStats {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "stats_id")
-    @Column(name = "stats_id")
     private Long statsId;
 
     /**
      * 统计日期。
      */
-    @Column(name = "stats_date")
+    @TableField(value = "stats_date")
     private Date statsDate;
 
     /**
      * 统计小时。
      */
-    @Column(name = "stats_month")
+    @TableField(value = "stats_month")
     private Date statsMonth;
 
     /**
      * 年级Id。
      */
-    @Column(name = "grade_id")
+    @TableField(value = "grade_id")
     private Integer gradeId;
 
     /**
      * 学生所在省Id。
      */
-    @Column(name = "province_id")
+    @TableField(value = "province_id")
     private Long provinceId;
 
     /**
      * 学生所在城市Id。
      */
-    @Column(name = "city_id")
+    @TableField(value = "city_id")
     private Long cityId;
 
     /**
      * 购课学币数量。
      */
-    @Column(name = "buy_course_amount")
+    @TableField(value = "buy_course_amount")
     private Integer buyCourseAmount;
 
     /**
      * 购买课程次数。
      */
-    @Column(name = "buy_course_count")
+    @TableField(value = "buy_course_count")
     private Integer buyCourseCount;
 
     /**
      * 购买视频学币数量。
      */
-    @Column(name = "buy_video_amount")
+    @TableField(value = "buy_video_amount")
     private Integer buyVideoAmount;
 
     /**
      * 购买视频次数。
      */
-    @Column(name = "buy_video_count")
+    @TableField(value = "buy_video_count")
     private Integer buyVideoCount;
 
     /**
      * 购买作业学币数量。
      */
-    @Column(name = "buy_paper_amount")
+    @TableField(value = "buy_paper_amount")
     private Integer buyPaperAmount;
 
     /**
      * 购买作业次数。
      */
-    @Column(name = "buy_paper_count")
+    @TableField(value = "buy_paper_count")
     private Integer buyPaperCount;
 
     /**
      * 购买献花数量。
      */
-    @Column(name = "buy_flower_amount")
+    @TableField(value = "buy_flower_amount")
     private Integer buyFlowerAmount;
 
     /**
      * 购买献花次数。
      */
-    @Column(name = "buy_flower_count")
+    @TableField(value = "buy_flower_count")
     private Integer buyFlowerCount;
 
     /**
      * 充值学币数量。
      */
-    @Column(name = "recharge_coin_amount")
+    @TableField(value = "recharge_coin_amount")
     private Integer rechargeCoinAmount;
 
     /**
      * 充值学币次数。
      */
-    @Column(name = "recharge_coin_count")
+    @TableField(value = "recharge_coin_count")
     private Integer rechargeCoinCount;
 
     /**
      * 线下课程上课次数。
      */
-    @Column(name = "do_course_count")
+    @TableField(value = "do_course_count")
     private Integer doCourseCount;
 
     /**
      * 观看视频次数。
      */
-    @Column(name = "watch_video_count")
+    @TableField(value = "watch_video_count")
     private Integer watchVideoCount;
 
     /**
      * 购买献花消费学币数量。
      */
-    @Column(name = "watch_video_total_second")
+    @TableField(value = "watch_video_total_second")
     private Integer watchVideoTotalSecond;
 
     /**
      * 做题数量。
      */
-    @Column(name = "do_exercise_count")
+    @TableField(value = "do_exercise_count")
     private Integer doExerciseCount;
 
     /**
      * 做题正确的数量。
      */
-    @Column(name = "do_exercise_correct_count")
+    @TableField(value = "do_exercise_correct_count")
     private Integer doExerciseCorrectCount;
 
     /**
      * statsDate 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String statsDateStart;
 
     /**
      * statsDate 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String statsDateEnd;
 
     @RelationDict(
@@ -170,7 +169,7 @@ public class StudentActionStats {
             slaveModelClass = GradeVo.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> gradeIdDictMap;
 
     @RelationDict(
@@ -179,7 +178,7 @@ public class StudentActionStats {
             slaveModelClass = AreaCodeVo.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> provinceIdDictMap;
 
     @RelationDict(
@@ -188,7 +187,7 @@ public class StudentActionStats {
             slaveModelClass = AreaCodeVo.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> cityIdDictMap;
 
     @Mapper

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java

@@ -1,5 +1,6 @@
 package com.orange.demo.statsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.statsapi.vo.StudentActionTransVo;
 import com.orange.demo.courseclassapi.client.SchoolInfoClient;
 import com.orange.demo.courseclassapi.vo.SchoolInfoVo;
@@ -13,7 +14,6 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -25,110 +25,109 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_student_action_trans")
+@TableName(value = "zz_student_action_trans")
 public class StudentActionTrans {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "trans_id")
-    @Column(name = "trans_id")
     private Long transId;
 
     /**
      * 学生Id。
      */
-    @Column(name = "student_id")
+    @TableField(value = "student_id")
     private Long studentId;
 
     /**
      * 学生名称。
      */
-    @Column(name = "student_name")
+    @TableField(value = "student_name")
     private String studentName;
 
     /**
      * 学生校区。
      */
-    @Column(name = "school_id")
+    @TableField(value = "school_id")
     private Long schoolId;
 
     /**
      * 年级Id。
      */
-    @Column(name = "grade_id")
+    @TableField(value = "grade_id")
     private Integer gradeId;
 
     /**
      * 行为类型(0: 充值  1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)。
      */
-    @Column(name = "action_type")
+    @TableField(value = "action_type")
     private Integer actionType;
 
     /**
      * 设备类型(0: iOS 1: Android 2: PC)。
      */
-    @Column(name = "device_type")
+    @TableField(value = "device_type")
     private Integer deviceType;
 
     /**
      * 看视频秒数。
      */
-    @Column(name = "watch_video_seconds")
+    @TableField(value = "watch_video_seconds")
     private Integer watchVideoSeconds;
 
     /**
      * 购买献花数量。
      */
-    @Column(name = "flower_count")
+    @TableField(value = "flower_count")
     private Integer flowerCount;
 
     /**
      * 购买作业数量。
      */
-    @Column(name = "paper_count")
+    @TableField(value = "paper_count")
     private Integer paperCount;
 
     /**
      * 购买视频数量。
      */
-    @Column(name = "video_count")
+    @TableField(value = "video_count")
     private Integer videoCount;
 
     /**
      * 购买课程数量。
      */
-    @Column(name = "course_count")
+    @TableField(value = "course_count")
     private Integer courseCount;
 
     /**
      * 充值学币数量。
      */
-    @Column(name = "coin_count")
+    @TableField(value = "coin_count")
     private Integer coinCount;
 
     /**
      * 做题是否正确标记。
      */
-    @Column(name = "exercise_correct_flag")
+    @TableField(value = "exercise_correct_flag")
     private Integer exerciseCorrectFlag;
 
     /**
      * 发生时间。
      */
-    @Column(name = "create_time")
+    @TableField(value = "create_time")
     private Date createTime;
 
     /**
      * createTime 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String createTimeStart;
 
     /**
      * createTime 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String createTimeEnd;
 
     @RelationDict(
@@ -137,7 +136,7 @@ public class StudentActionTrans {
             slaveModelClass = SchoolInfoVo.class,
             slaveIdField = "schoolId",
             slaveNameField = "schoolName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> schoolIdDictMap;
 
     @RelationDict(
@@ -146,19 +145,19 @@ public class StudentActionTrans {
             slaveModelClass = GradeVo.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> gradeIdDictMap;
 
     @RelationConstDict(
             masterIdField = "actionType",
             constantDictClass = StudentActionType.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> actionTypeDictMap;
 
     @RelationConstDict(
             masterIdField = "deviceType",
             constantDictClass = DeviceType.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> deviceTypeDictMap;
 
     @Mapper

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/CourseTransStatsServiceImpl.java

@@ -101,8 +101,9 @@ public class CourseTransStatsServiceImpl extends BaseService<CourseTransStats, L
     @Override
     public <M> List<CourseTransStats> getCourseTransStatsListWithRelation(
             String inFilterField, Set<M> inFilterValues, CourseTransStats filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, CourseTransStats.class);
         List<CourseTransStats> resultList =
-                courseTransStatsMapper.getCourseTransStatsList(inFilterField, inFilterValues, filter, orderBy);
+                courseTransStatsMapper.getCourseTransStatsList(inFilterColumn, inFilterValues, filter, orderBy);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/StudentActionStatsServiceImpl.java

@@ -101,8 +101,9 @@ public class StudentActionStatsServiceImpl extends BaseService<StudentActionStat
     @Override
     public <M> List<StudentActionStats> getStudentActionStatsListWithRelation(
             String inFilterField, Set<M> inFilterValues, StudentActionStats filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, StudentActionStats.class);
         List<StudentActionStats> resultList =
-                studentActionStatsMapper.getStudentActionStatsList(inFilterField, inFilterValues, filter, orderBy);
+                studentActionStatsMapper.getStudentActionStatsList(inFilterColumn, inFilterValues, filter, orderBy);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;

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

@@ -1,5 +1,6 @@
 package com.orange.demo.statsservice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.statsservice.service.*;
 import com.orange.demo.statsservice.dao.*;
 import com.orange.demo.statsservice.model.*;
@@ -75,7 +76,8 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
     public boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
         studentActionTrans.setCreateTime(originalStudentActionTrans.getCreateTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        return studentActionTransMapper.updateByPrimaryKey(studentActionTrans) == 1;
+        UpdateWrapper<StudentActionTrans> uw = this.createUpdateQueryForNullValue(studentActionTrans, studentActionTrans.getTransId());
+        return studentActionTransMapper.update(studentActionTrans, uw) == 1;
     }
 
     /**
@@ -87,8 +89,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long transId) {
-        // 这里先删除主数据
+        return studentActionTransMapper.deleteById(transId) == 1;
-        return this.removeById(transId);
     }
 
     /**
@@ -155,8 +156,9 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
     @Override
     public <M> List<StudentActionTrans> getStudentActionTransListWithRelation(
             String inFilterField, Set<M> inFilterValues, StudentActionTrans filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, StudentActionTrans.class);
         List<StudentActionTrans> resultList =
-                studentActionTransMapper.getStudentActionTransList(inFilterField, inFilterValues, filter, orderBy);
+                studentActionTransMapper.getStudentActionTransList(inFilterColumn, inFilterValues, filter, orderBy);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;

orange-demo-multi-service/application/stats/stats-service/stats-service.iml

@@ -64,44 +64,41 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="module" module-name="common-swagger" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
     <orderEntry type="module" module-name="course-class-api" />
     <orderEntry type="module" module-name="common-redis" />
     <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.4" level="project" />
@@ -183,9 +180,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -258,6 +252,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/stats/stats.iml

@@ -85,9 +85,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -162,6 +159,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/upms/upms-api/upms-api.iml

@@ -30,7 +30,6 @@
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.45" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" 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" />
@@ -65,45 +64,42 @@
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="module" module-name="application-common" />
     <orderEntry type="module" module-name="common-swagger" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
@@ -167,8 +163,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -241,6 +235,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import tk.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.annotation.MapperScan;
 
 import javax.sql.DataSource;
 

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginUserController.java

@@ -42,7 +42,6 @@ public class LoginUserController {
     @PostMapping("/list")
     public ResponseResult<MyPageData<LoginUserInfo>> list(
             @MyRequestBody String loginName, @MyRequestBody MyPageParam pageParam) {
-        List<LoginUserInfo> loginUserInfoList = new LinkedList<>();
         int queryCount = pageParam.getPageNum() * pageParam.getPageSize();
         int skipCount = (pageParam.getPageNum() - 1) * pageParam.getPageSize();
         String patternKey;
@@ -51,17 +50,15 @@ public class LoginUserController {
         } else {
             patternKey = RedisKeyUtil.getSessionIdPrefix(loginName) + "*";
         }
-        long totalCount = 0L;
+        List<LoginUserInfo> loginUserInfoList = new LinkedList<>();
-        int pos = 0;
         Iterable<String> keys = redissonClient.getKeys().getKeysByPattern(patternKey);
         for (String key : keys) {
-            totalCount++;
-            if (pos++ < skipCount) {
-                continue;
-            }
             loginUserInfoList.add(this.buildTokenDataByRedisKey(key));
         }
-        return ResponseResult.success(new MyPageData<>(loginUserInfoList, totalCount));
+        loginUserInfoList.sort((o1, o2) -> (int) (o2.getLoginTime().getTime() - o1.getLoginTime().getTime()));
+        int toIndex = Math.min(skipCount + pageParam.getPageSize(), loginUserInfoList.size());
+        List<LoginUserInfo> resultList = loginUserInfoList.subList(skipCount, toIndex);
+        return ResponseResult.success(new MyPageData<>(resultList, (long) loginUserInfoList.size()));
     }
 
     /**

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java

@@ -1,6 +1,6 @@
 package com.orange.demo.upmsservice.model;
 
-import com.orange.demo.common.core.annotation.DeletedFlagColumn;
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
@@ -11,7 +11,6 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
-import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -22,56 +21,55 @@ import java.util.*;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "zz_sys_menu")
+@TableName(value = "zz_sys_menu")
 public class SysMenu extends BaseModel {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "menu_id")
-    @Column(name = "menu_id")
     private Long menuId;
 
     /**
      * 父菜单Id，目录菜单的父菜单为null。
      */
-    @Column(name = "parent_id")
+    @TableField(value = "parent_id")
     private Long parentId;
 
     /**
      * 菜单显示名称。
      */
-    @Column(name = "menu_name")
+    @TableField(value = "menu_name")
     private String menuName;
 
     /**
      * 菜单类型(0: 目录 1: 菜单 2: 按钮 3: UI片段)。
      */
-    @Column(name = "menu_type")
+    @TableField(value = "menu_type")
     private Integer menuType;
 
     /**
      * 前端表单路由名称，仅用于menu_type为1的菜单类型。
      */
-    @Column(name = "form_router_name")
+    @TableField(value = "form_router_name")
     private String formRouterName;
 
     /**
      * 在线表单主键Id，仅用于在线表单绑定的菜单。
      */
-    @Column(name = "online_form_id")
+    @TableField(value = "online_form_id")
     private Long onlineFormId;
 
     /**
      * 在线表单菜单的权限控制类型，具体值可参考SysOnlineMenuPermType常量对象。
      */
-    @Column(name = "online_menu_perm_type")
+    @TableField(value = "online_menu_perm_type")
     private Integer onlineMenuPermType;
 
     /**
      * 菜单显示顺序 (值越小，排序越靠前)。
      */
-    @Column(name = "show_order")
+    @TableField(value = "show_order")
     private Integer showOrder;
 
     /**
@@ -82,15 +80,15 @@ public class SysMenu extends BaseModel {
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
-    @Column(name = "deleted_flag")
+    @TableField(value = "deleted_flag")
     private Integer deletedFlag;
 
     @RelationManyToMany(
             relationMapperName = "sysMenuPermCodeMapper",
             relationMasterIdField = "menuId",
             relationModelClass = SysMenuPermCode.class)
-    @Transient
+    @TableField(exist = false)
     private List<SysMenuPermCode> sysMenuPermCodeList;
 
     @Mapper

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java

@@ -1,9 +1,8 @@
 package com.orange.demo.upmsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
-import javax.persistence.*;
-
 /**
  * 菜单与权限字关联实体对象。
  *
@@ -11,20 +10,18 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_sys_menu_perm_code")
+@TableName(value = "zz_sys_menu_perm_code")
 public class SysMenuPermCode {
 
     /**
      * 关联菜单Id。
      */
-    @Id
+    @TableField(value = "menu_id")
-    @Column(name = "menu_id")
     private Long menuId;
 
     /**
      * 关联权限字Id。
      */
-    @Id
+    @TableField(value = "perm_code_id")
-    @Column(name = "perm_code_id")
     private Long permCodeId;
 }

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java

@@ -1,12 +1,11 @@
 package com.orange.demo.upmsservice.model;
 
-import com.orange.demo.common.core.annotation.DeletedFlagColumn;
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.annotation.RelationDict;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -17,26 +16,25 @@ import java.util.*;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "zz_sys_perm")
+@TableName(value = "zz_sys_perm")
 public class SysPerm extends BaseModel {
 
     /**
      * 权限Id。
      */
-    @Id
+    @TableId(value = "perm_id")
-    @Column(name = "perm_id")
     private Long permId;
 
     /**
      * 权限所在的权限模块Id。
      */
-    @Column(name = "module_id")
+    @TableField(value = "module_id")
     private Long moduleId;
 
     /**
      * 权限名称。
      */
-    @Column(name = "perm_name")
+    @TableField(value = "perm_name")
     private String permName;
 
     /**
@@ -47,14 +45,14 @@ public class SysPerm extends BaseModel {
     /**
      * 权限在当前模块下的顺序，由小到大。
      */
-    @Column(name = "show_order")
+    @TableField(value = "show_order")
     private Integer showOrder;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
-    @Column(name = "deleted_flag")
+    @TableField(value = "deleted_flag")
     private Integer deletedFlag;
 
     @RelationDict(
@@ -63,6 +61,6 @@ public class SysPerm extends BaseModel {
             slaveModelClass = SysPermModule.class,
             slaveIdField = "moduleId",
             slaveNameField = "moduleName")
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> moduleIdDictMap;
 }

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java

@@ -1,6 +1,6 @@
 package com.orange.demo.upmsservice.model;
 
-import com.orange.demo.common.core.annotation.DeletedFlagColumn;
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
@@ -11,7 +11,6 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
-import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -22,58 +21,57 @@ import java.util.*;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "zz_sys_perm_code")
+@TableName(value = "zz_sys_perm_code")
 public class SysPermCode extends BaseModel {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "perm_code_id")
-    @Column(name = "perm_code_id")
     private Long permCodeId;
 
     /**
      * 上级权限字Id。
      */
-    @Column(name = "parent_id")
+    @TableField(value = "parent_id")
     private Long parentId;
 
     /**
      * 权限字标识(一般为有含义的英文字符串)。
      */
-    @Column(name = "perm_code")
+    @TableField(value = "perm_code")
     private String permCode;
 
     /**
      * 权限类型(0: 表单 1: UI片段 2: 操作)。
      */
-    @Column(name = "perm_code_type")
+    @TableField(value = "perm_code_type")
     private Integer permCodeType;
 
     /**
      * 显示名称。
      */
-    @Column(name = "show_name")
+    @TableField(value = "show_name")
     private String showName;
 
     /**
      * 显示顺序(数值越小，越靠前)。
      */
-    @Column(name = "show_order")
+    @TableField(value = "show_order")
     private Integer showOrder;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
-    @Column(name = "deleted_flag")
+    @TableField(value = "deleted_flag")
     private Integer deletedFlag;
 
     @RelationManyToMany(
             relationMapperName = "sysPermCodePermMapper",
             relationMasterIdField = "permCodeId",
             relationModelClass = SysPermCodePerm.class)
-    @Transient
+    @TableField(exist = false)
     private List<SysPermCodePerm> sysPermCodePermList;
 
     @Mapper

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java

@@ -1,9 +1,8 @@
 package com.orange.demo.upmsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
-import javax.persistence.*;
-
 /**
  * 权限字与权限资源关联实体对象。
  *
@@ -11,20 +10,18 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_sys_perm_code_perm")
+@TableName(value = "zz_sys_perm_code_perm")
 public class SysPermCodePerm {
 
     /**
      * 权限字Id。
      */
-    @Id
+    @TableField(value = "perm_code_id")
-    @Column(name = "perm_code_id")
     private Long permCodeId;
 
     /**
      * 权限Id。
      */
-    @Id
+    @TableField(value = "perm_id")
-    @Column(name = "perm_id")
     private Long permId;
 }

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java

@@ -1,11 +1,10 @@
 package com.orange.demo.upmsservice.model;
 
-import com.orange.demo.common.core.annotation.DeletedFlagColumn;
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.common.core.base.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -16,47 +15,46 @@ import java.util.*;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "zz_sys_perm_module")
+@TableName(value = "zz_sys_perm_module")
 public class SysPermModule extends BaseModel {
 
     /**
      * 权限模块Id。
      */
-    @Id
+    @TableId(value = "module_id")
-    @Column(name = "module_id")
     private Long moduleId;
 
     /**
      * 上级权限模块Id。
      */
-    @Column(name = "parent_id")
+    @TableField(value = "parent_id")
     private Long parentId;
 
     /**
      * 权限模块名称。
      */
-    @Column(name = "module_name")
+    @TableField(value = "module_name")
     private String moduleName;
 
     /**
      * 权限模块类型(0: 普通模块 1: Controller模块)。
      */
-    @Column(name = "module_type")
+    @TableField(value = "module_type")
     private Integer moduleType;
 
     /**
      * 权限模块在当前层级下的顺序，由小到大。
      */
-    @Column(name = "show_order")
+    @TableField(value = "show_order")
     private Integer showOrder;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
-    @Column(name = "deleted_flag")
+    @TableField(value = "deleted_flag")
     private Integer deletedFlag;
 
-    @Transient
+    @TableField(exist = false)
     private List<SysPerm> sysPermList;
 }

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java

@@ -1,9 +1,8 @@
 package com.orange.demo.upmsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
-import javax.persistence.*;
-
 /**
  * 白名单实体对象。
  *
@@ -11,25 +10,24 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_sys_perm_whitelist")
+@TableName(value = "zz_sys_perm_whitelist")
 public class SysPermWhitelist {
 
     /**
      * 权限资源的URL。
      */
-    @Id
+    @TableId(value = "perm_url")
-    @Column(name = "perm_url")
     private String permUrl;
 
     /**
      * 权限资源所属模块名字(通常是Controller的名字)。
      */
-    @Column(name = "module_name")
+    @TableField(value = "module_name")
     private String moduleName;
 
     /**
      * 权限的名称。
      */
-    @Column(name = "perm_name")
+    @TableField(value = "perm_name")
     private String permName;
 }

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java

@@ -1,6 +1,6 @@
 package com.orange.demo.upmsservice.model;
 
-import com.orange.demo.common.core.annotation.DeletedFlagColumn;
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
@@ -11,7 +11,6 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
-import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -22,34 +21,33 @@ import java.util.*;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "zz_sys_role")
+@TableName(value = "zz_sys_role")
 public class SysRole extends BaseModel {
 
     /**
      * 主键Id。
      */
-    @Id
+    @TableId(value = "role_id")
-    @Column(name = "role_id")
     private Long roleId;
 
     /**
      * 角色名称。
      */
-    @Column(name = "role_name")
+    @TableField(value = "role_name")
     private String roleName;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
-    @Column(name = "deleted_flag")
+    @TableField(value = "deleted_flag")
     private Integer deletedFlag;
 
     @RelationManyToMany(
             relationMapperName = "sysRoleMenuMapper",
             relationMasterIdField = "roleId",
             relationModelClass = SysRoleMenu.class)
-    @Transient
+    @TableField(exist = false)
     private List<SysRoleMenu> sysRoleMenuList;
 
     @Mapper

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java

@@ -1,9 +1,8 @@
 package com.orange.demo.upmsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
-import javax.persistence.*;
-
 /**
  * 角色菜单实体对象。
  *
@@ -11,20 +10,18 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_sys_role_menu")
+@TableName(value = "zz_sys_role_menu")
 public class SysRoleMenu {
 
     /**
      * 角色Id。
      */
-    @Id
+    @TableField(value = "role_id")
-    @Column(name = "role_id")
     private Long roleId;
 
     /**
      * 菜单Id。
      */
-    @Id
+    @TableField(value = "menu_id")
-    @Column(name = "menu_id")
     private Long menuId;
 }

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

@@ -1,5 +1,6 @@
 package com.orange.demo.upmsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.upmsapi.vo.SysUserVo;
 import com.orange.demo.upmsapi.constant.SysUserType;
 import com.orange.demo.upmsapi.constant.SysUserStatus;
@@ -7,12 +8,10 @@ import com.orange.demo.common.core.annotation.RelationConstDict;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import javax.persistence.*;
 
 import java.util.Map;
 import java.util.List;
@@ -25,20 +24,19 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "zz_sys_user")
+@TableName(value = "zz_sys_user")
 public class SysUser extends BaseModel {
 
     /**
      * 用户Id。
      */
-    @Id
+    @TableId(value = "user_id")
-    @Column(name = "user_id")
     private Long userId;
 
     /**
      * 登录用户名。
      */
-    @Column(name = "login_name")
+    @TableField(value = "login_name")
     private String loginName;
 
     /**
@@ -49,44 +47,44 @@ public class SysUser extends BaseModel {
     /**
      * 用户显示名称。
      */
-    @Column(name = "show_name")
+    @TableField(value = "show_name")
     private String showName;
 
     /**
      * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
      */
-    @Column(name = "user_type")
+    @TableField(value = "user_type")
     private Integer userType;
 
     /**
      * 用户头像的Url。
      */
-    @Column(name = "head_image_url")
+    @TableField(value = "head_image_url")
     private String headImageUrl;
 
     /**
      * 用户状态(0: 正常 1: 锁定)。
      */
-    @Column(name = "user_status")
+    @TableField(value = "user_status")
     private Integer userStatus;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @DeletedFlagColumn
+    @TableLogic
-    @Column(name = "deleted_flag")
+    @TableField(value = "deleted_flag")
     private Integer deletedFlag;
 
     /**
      * createTime 范围过滤起始值(>=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String createTimeStart;
 
     /**
      * createTime 范围过滤结束值(<=)。
      */
-    @Transient
+    @TableField(exist = false)
     private String createTimeEnd;
 
     /**
@@ -96,19 +94,19 @@ public class SysUser extends BaseModel {
             relationMapperName = "sysUserRoleMapper",
             relationMasterIdField = "userId",
             relationModelClass = SysUserRole.class)
-    @Transient
+    @TableField(exist = false)
     private List<SysUserRole> sysUserRoleList;
 
     @RelationConstDict(
             masterIdField = "userType",
             constantDictClass = SysUserType.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> userTypeDictMap;
 
     @RelationConstDict(
             masterIdField = "userStatus",
             constantDictClass = SysUserStatus.class)
-    @Transient
+    @TableField(exist = false)
     private Map<String, Object> userStatusDictMap;
 
     @Mapper

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java

@@ -1,9 +1,8 @@
 package com.orange.demo.upmsservice.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
-import javax.persistence.*;
-
 /**
  * 用户角色实体对象。
  *
@@ -11,20 +10,18 @@ import javax.persistence.*;
  * @date 2020-08-08
  */
 @Data
-@Table(name = "zz_sys_user_role")
+@TableName(value = "zz_sys_user_role")
 public class SysUserRole {
 
     /**
      * 用户Id。
      */
-    @Id
+    @TableField(value = "user_id")
-    @Column(name = "user_id")
     private Long userId;
 
     /**
      * 角色Id。
      */
-    @Id
+    @TableField(value = "role_id")
-    @Column(name = "role_id")
     private Long roleId;
 }

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysMenuServiceImpl.java

@@ -2,6 +2,9 @@ package com.orange.demo.upmsservice.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
@@ -23,7 +26,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -74,14 +76,12 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
         MyModelUtil.fillCommonsForInsert(sysMenu);
         sysMenuMapper.insert(sysMenu);
         if (permCodeIdSet != null) {
-            List<SysMenuPermCode> sysMenuPermCodeList = new LinkedList<>();
             for (Long permCodeId : permCodeIdSet) {
                 SysMenuPermCode menuPermCode = new SysMenuPermCode();
                 menuPermCode.setMenuId(sysMenu.getMenuId());
                 menuPermCode.setPermCodeId(permCodeId);
-                sysMenuPermCodeList.add(menuPermCode);
+                sysMenuPermCodeMapper.insert(menuPermCode);
             }
-            sysMenuPermCodeMapper.insertList(sysMenuPermCodeList);
         }
         // 判断当前菜单是否为指向在线表单的菜单，并将根据约定，动态插入两个子菜单。
         if (sysMenu.getOnlineFormId() != null) {
@@ -93,6 +93,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
             viewSubMenu.setShowOrder(0);
             viewSubMenu.setOnlineFormId(sysMenu.getOnlineFormId());
             viewSubMenu.setOnlineMenuPermType(SysOnlineMenuPermType.TYPE_VIEW);
+            viewSubMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
             MyModelUtil.fillCommonsForInsert(viewSubMenu);
             sysMenuMapper.insert(viewSubMenu);
             SysMenu editSubMenu = new SysMenu();
@@ -103,6 +104,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
             editSubMenu.setShowOrder(1);
             editSubMenu.setOnlineFormId(sysMenu.getOnlineFormId());
             editSubMenu.setOnlineMenuPermType(SysOnlineMenuPermType.TYPE_EDIT);
+            editSubMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
             MyModelUtil.fillCommonsForInsert(editSubMenu);
             sysMenuMapper.insert(editSubMenu);
         }
@@ -122,30 +124,27 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
     public boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set<Long> permCodeIdSet) {
         MyModelUtil.fillCommonsForUpdate(sysMenu, originalSysMenu);
         sysMenu.setMenuType(originalSysMenu.getMenuType());
-        sysMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        UpdateWrapper<SysMenu> uw = this.createUpdateQueryForNullValue(sysMenu, sysMenu.getMenuId());
-        if (sysMenuMapper.updateByPrimaryKey(sysMenu) != 1) {
+        if (sysMenuMapper.update(sysMenu, uw) != 1) {
             return false;
         }
         SysMenuPermCode deletedMenuPermCode = new SysMenuPermCode();
         deletedMenuPermCode.setMenuId(sysMenu.getMenuId());
-        sysMenuPermCodeMapper.delete(deletedMenuPermCode);
+        sysMenuPermCodeMapper.delete(new QueryWrapper<>(deletedMenuPermCode));
         if (permCodeIdSet != null) {
-            List<SysMenuPermCode> sysMenuPermCodeList = new LinkedList<>();
             for (Long permCodeId : permCodeIdSet) {
                 SysMenuPermCode menuPermCode = new SysMenuPermCode();
                 menuPermCode.setMenuId(sysMenu.getMenuId());
                 menuPermCode.setPermCodeId(permCodeId);
-                sysMenuPermCodeList.add(menuPermCode);
+                sysMenuPermCodeMapper.insert(menuPermCode);
             }
-            sysMenuPermCodeMapper.insertList(sysMenuPermCodeList);
         }
         // 如果当前菜单的在线表单Id变化了，就需要同步更新他的内置子菜单也同步更新。
         if (ObjectUtil.notEqual(originalSysMenu.getOnlineFormId(), sysMenu.getOnlineFormId())) {
             SysMenu onlineSubMenu = new SysMenu();
             onlineSubMenu.setOnlineFormId(sysMenu.getOnlineFormId());
-            Example e = new Example(SysMenu.class);
+            sysMenuMapper.update(onlineSubMenu,
-            e.createCriteria().andEqualTo("parentId", sysMenu.getMenuId());
+                    new QueryWrapper<SysMenu>().lambda().eq(SysMenu::getParentId, sysMenu.getMenuId()));
-            sysMenuMapper.updateByExampleSelective(onlineSubMenu, e);
         }
         return true;
     }
@@ -160,20 +159,18 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
     @Override
     public boolean remove(SysMenu menu) {
         Long menuId = menu.getMenuId();
-        if (!this.removeById(menuId)) {
+        if (sysMenuMapper.deleteById(menuId) != 1) {
             return false;
         }
         SysRoleMenu roleMenu = new SysRoleMenu();
         roleMenu.setMenuId(menuId);
-        sysRoleMenuMapper.delete(roleMenu);
+        sysRoleMenuMapper.delete(new QueryWrapper<>(roleMenu));
         SysMenuPermCode menuPermCode = new SysMenuPermCode();
         menuPermCode.setMenuId(menuId);
-        sysMenuPermCodeMapper.delete(menuPermCode);
+        sysMenuPermCodeMapper.delete(new QueryWrapper<>(menuPermCode));
         // 如果为指向在线表单的菜单，则连同删除子菜单
         if (menu.getOnlineFormId() != null) {
-            Example e = new Example(SysMenu.class);
+            sysMenuMapper.delete(new QueryWrapper<SysMenu>().lambda().eq(SysMenu::getParentId, menuId));
-            e.createCriteria().andEqualTo("parentId", menuId);
-            sysMenuMapper.deleteByExample(e);
         }
         return true;
     }
@@ -185,12 +182,11 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
      */
     @Override
     public Collection<SysMenu> getAllMenuList() {
-        Example e = new Example(SysMenu.class);
+        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
-        e.orderBy("showOrder");
+        queryWrapper.orderByAsc(this.safeMapToColumnName("showOrder"));
-        Example.Criteria c = e.createCriteria();
+        queryWrapper.in(this.safeMapToColumnName("menuType"),
-        c.andIn("menuType", Arrays.asList(SysMenuType.TYPE_MENU, SysMenuType.TYPE_DIRECTORY));
+                Arrays.asList(SysMenuType.TYPE_MENU, SysMenuType.TYPE_DIRECTORY));
-        c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
+        return sysMenuMapper.selectList(queryWrapper);
-        return sysMenuMapper.selectByExample(e);
     }
 
     /**
@@ -289,12 +285,12 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
      */
     @Override
     public List<SysMenu> getAllOnlineMenuList(Integer menuType) {
-        Example e = new Example(SysMenu.class);
+        LambdaQueryWrapper<SysMenu> queryWrapper =
-        Example.Criteria c = e.createCriteria().andIsNotNull("onlineFormId");
+                new QueryWrapper<SysMenu>().lambda().isNotNull(SysMenu::getOnlineFormId);
         if (menuType != null) {
-            c.andEqualTo("menuType", menuType);
+            queryWrapper.eq(SysMenu::getMenuType, menuType);
         }
-        return sysMenuMapper.selectByExample(e);
+        return sysMenuMapper.selectList(queryWrapper);
     }
 
     /**

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermCodeServiceImpl.java

@@ -1,6 +1,8 @@
 package com.orange.demo.upmsservice.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
@@ -93,14 +95,12 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
         MyModelUtil.fillCommonsForInsert(sysPermCode);
         sysPermCodeMapper.insert(sysPermCode);
         if (permIdSet != null) {
-            List<SysPermCodePerm> sysPermCodePermList = new LinkedList<>();
             for (Long permId : permIdSet) {
                 SysPermCodePerm permCodePerm = new SysPermCodePerm();
                 permCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
                 permCodePerm.setPermId(permId);
-                sysPermCodePermList.add(permCodePerm);
+                sysPermCodePermMapper.insert(permCodePerm);
             }
-            sysPermCodePermMapper.insertList(sysPermCodePermList);
         }
         return sysPermCode;
     }
@@ -117,23 +117,22 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
     @Override
     public boolean update(SysPermCode sysPermCode, SysPermCode originalSysPermCode, Set<Long> permIdSet) {
         sysPermCode.setParentId(originalSysPermCode.getParentId());
-        sysPermCode.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         MyModelUtil.fillCommonsForUpdate(sysPermCode, originalSysPermCode);
-        if (sysPermCodeMapper.updateByPrimaryKey(sysPermCode) != 1) {
+        UpdateWrapper<SysPermCode> uw =
+                this.createUpdateQueryForNullValue(sysPermCode, sysPermCode.getPermCodeId());
+        if (sysPermCodeMapper.update(sysPermCode, uw) != 1) {
             return false;
         }
         SysPermCodePerm deletedPermCodePerm = new SysPermCodePerm();
         deletedPermCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
-        sysPermCodePermMapper.delete(deletedPermCodePerm);
+        sysPermCodePermMapper.delete(new QueryWrapper<>(deletedPermCodePerm));
         if (permIdSet != null) {
-            List<SysPermCodePerm> sysPermCodePermList = new LinkedList<>();
             for (Long permId : permIdSet) {
                 SysPermCodePerm permCodePerm = new SysPermCodePerm();
                 permCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
                 permCodePerm.setPermId(permId);
-                sysPermCodePermList.add(permCodePerm);
+                sysPermCodePermMapper.insert(permCodePerm);
             }
-            sysPermCodePermMapper.insertList(sysPermCodePermList);
         }
         return true;
     }
@@ -147,15 +146,15 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long permCodeId) {
-        if (!this.removeById(permCodeId)) {
+        if (sysPermCodeMapper.deleteById(permCodeId) != 1) {
             return false;
         }
         SysMenuPermCode menuPermCode = new SysMenuPermCode();
         menuPermCode.setPermCodeId(permCodeId);
-        sysMenuPermCodeMapper.delete(menuPermCode);
+        sysMenuPermCodeMapper.delete(new QueryWrapper<>(menuPermCode));
         SysPermCodePerm permCodePerm = new SysPermCodePerm();
         permCodePerm.setPermCodeId(permCodeId);
-        sysPermCodePermMapper.delete(permCodePerm);
+        sysPermCodePermMapper.delete(new QueryWrapper<>(permCodePerm));
         return true;
     }
 

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermModuleServiceImpl.java

@@ -71,8 +71,7 @@ public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> i
     @Override
     public boolean update(SysPermModule sysPermModule, SysPermModule originalSysPermModule) {
         MyModelUtil.fillCommonsForUpdate(sysPermModule, originalSysPermModule);
-        sysPermModule.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        return sysPermModuleMapper.updateById(sysPermModule) != 0;
-        return sysPermModuleMapper.updateByPrimaryKey(sysPermModule) != 0;
     }
 
     /**
@@ -84,7 +83,7 @@ public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> i
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long moduleId) {
-        return this.removeById(moduleId);
+        return sysPermModuleMapper.deleteById(moduleId) == 1;
     }
 
     /**

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermServiceImpl.java

@@ -1,5 +1,6 @@
 package com.orange.demo.upmsservice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import cn.hutool.core.util.ObjectUtil;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
@@ -18,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 
@@ -78,8 +78,7 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
     @Override
     public boolean update(SysPerm perm, SysPerm originalPerm) {
         MyModelUtil.fillCommonsForUpdate(perm, originalPerm);
-        perm.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        return sysPermMapper.updateById(perm) != 0;
-        return sysPermMapper.updateByPrimaryKeySelective(perm) != 0;
     }
 
     /**
@@ -91,12 +90,12 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long permId) {
-        if (!this.removeById(permId)) {
+        if (sysPermMapper.deleteById(permId) != 1) {
             return false;
         }
         SysPermCodePerm permCodePerm = new SysPermCodePerm();
         permCodePerm.setPermId(permId);
-        sysPermCodePermMapper.delete(permCodePerm);
+        sysPermCodePermMapper.delete(new QueryWrapper<>(permCodePerm));
         return true;
     }
 
@@ -108,17 +107,13 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
      */
     @Override
     public List<SysPerm> getPermListWithRelation(SysPerm sysPermFilter) {
-        Example e = new Example(SysPerm.class);
+        QueryWrapper<SysPerm> queryWrapper = new QueryWrapper<>();
-        e.orderBy("showOrder");
+        queryWrapper.orderByAsc(this.safeMapToColumnName("showOrder"));
-        Example.Criteria c = e.createCriteria();
+        queryWrapper.eq(ObjectUtil.isNotNull(sysPermFilter.getModuleId()),
-        if (ObjectUtil.isNotNull(sysPermFilter.getModuleId())) {
+        this.safeMapToColumnName("moduleId"), sysPermFilter.getModuleId());
-            c.andEqualTo("moduleId", sysPermFilter.getModuleId());
+        queryWrapper.like(ObjectUtil.isNotNull(sysPermFilter.getUrl()),
-        }
+        this.safeMapToColumnName("url"), "%" + sysPermFilter.getUrl() + "%");
-        if (ObjectUtil.isNotNull(sysPermFilter.getUrl())) {
+        List<SysPerm> permList = sysPermMapper.selectList(queryWrapper);
-            c.andLike("url", "%" + sysPermFilter.getUrl() + "%");
-        }
-        c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
-        List<SysPerm> permList = sysPermMapper.selectByExample(e);
         // 这里因为权限只有字典数据，所以仅仅做字典关联。
         this.buildRelationForDataList(permList, MyRelationParam.dictOnly());
         return permList;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysRoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.orange.demo.upmsservice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.alibaba.fastjson.JSONObject;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
@@ -70,14 +71,12 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
         MyModelUtil.fillCommonsForInsert(role);
         sysRoleMapper.insert(role);
         if (menuIdSet != null) {
-            List<SysRoleMenu> roleMenuList = new LinkedList<>();
             for (Long menuId : menuIdSet) {
                 SysRoleMenu roleMenu = new SysRoleMenu();
                 roleMenu.setRoleId(role.getRoleId());
                 roleMenu.setMenuId(menuId);
-                roleMenuList.add(roleMenu);
+                sysRoleMenuMapper.insert(roleMenu);
             }
-            sysRoleMenuMapper.insertList(roleMenuList);
         }
         return role;
     }
@@ -93,23 +92,20 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean update(SysRole role, SysRole originalRole, Set<Long> menuIdSet) {
-        role.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         MyModelUtil.fillCommonsForUpdate(role, originalRole);
-        if (sysRoleMapper.updateByPrimaryKey(role) != 1) {
+        if (sysRoleMapper.updateById(role) != 1) {
             return false;
         }
         SysRoleMenu deletedRoleMenu = new SysRoleMenu();
         deletedRoleMenu.setRoleId(role.getRoleId());
-        sysRoleMenuMapper.delete(deletedRoleMenu);
+        sysRoleMenuMapper.delete(new QueryWrapper<>(deletedRoleMenu));
         if (menuIdSet != null) {
-            List<SysRoleMenu> roleMenuList = new LinkedList<>();
             for (Long menuId : menuIdSet) {
                 SysRoleMenu roleMenu = new SysRoleMenu();
                 roleMenu.setRoleId(role.getRoleId());
                 roleMenu.setMenuId(menuId);
-                roleMenuList.add(roleMenu);
+                sysRoleMenuMapper.insert(roleMenu);
             }
-            sysRoleMenuMapper.insertList(roleMenuList);
         }
         return true;
     }
@@ -123,15 +119,15 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long roleId) {
-        if (!this.removeById(roleId)) {
+        if (sysRoleMapper.deleteById(roleId) != 1) {
             return false;
         }
         SysRoleMenu roleMenu = new SysRoleMenu();
         roleMenu.setRoleId(roleId);
-        sysRoleMenuMapper.delete(roleMenu);
+        sysRoleMenuMapper.delete(new QueryWrapper<>(roleMenu));
         SysUserRole userRole = new SysUserRole();
         userRole.setRoleId(roleId);
-        sysUserRoleMapper.delete(userRole);
+        sysUserRoleMapper.delete(new QueryWrapper<>(userRole));
         return true;
     }
 
@@ -155,7 +151,9 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void addUserRoleList(List<SysUserRole> userRoleList) {
-        sysUserRoleMapper.insertList(userRoleList);
+        for (SysUserRole userRole : userRoleList) {
+            sysUserRoleMapper.insert(userRole);
+        }
     }
 
     /**
@@ -171,7 +169,7 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
         SysUserRole userRole  = new SysUserRole();
         userRole.setRoleId(roleId);
         userRole.setUserId(userId);
-        return sysUserRoleMapper.delete(userRole) == 1;
+        return sysUserRoleMapper.delete(new QueryWrapper<>(userRole)) == 1;
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package com.orange.demo.upmsservice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.alibaba.fastjson.JSONObject;
 import com.orange.demo.upmsservice.service.*;
 import com.orange.demo.upmsservice.dao.*;
@@ -19,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -65,8 +66,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     public SysUser getSysUserByLoginName(String loginName) {
         SysUser filter = new SysUser();
         filter.setLoginName(loginName);
-        filter.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        return sysUserMapper.selectOne(new QueryWrapper<>(filter));
-        return sysUserMapper.selectOne(filter);
     }
 
     /**
@@ -86,14 +86,12 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
         MyModelUtil.fillCommonsForInsert(user);
         sysUserMapper.insert(user);
         if (CollectionUtils.isNotEmpty(roleIdSet)) {
-            List<SysUserRole> userRoleList = new LinkedList<>();
             for (Long roleId : roleIdSet) {
                 SysUserRole userRole = new SysUserRole();
                 userRole.setUserId(user.getUserId());
                 userRole.setRoleId(roleId);
-                userRoleList.add(userRole);
+                sysUserRoleMapper.insert(userRole);
             }
-            sysUserRoleMapper.insertList(userRoleList);
         }
         return user;
     }
@@ -112,23 +110,21 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
         user.setLoginName(originalUser.getLoginName());
         user.setPassword(originalUser.getPassword());
         MyModelUtil.fillCommonsForUpdate(user, originalUser);
-        user.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        UpdateWrapper<SysUser> uw = this.createUpdateQueryForNullValue(user, user.getUserId());
-        if (sysUserMapper.updateByPrimaryKey(user) != 1) {
+        if (sysUserMapper.update(user, uw) != 1) {
             return false;
         }
         // 先删除原有的User-Role关联关系，再重新插入新的关联关系
         SysUserRole deletedUserRole = new SysUserRole();
         deletedUserRole.setUserId(user.getUserId());
-        sysUserRoleMapper.delete(deletedUserRole);
+        sysUserRoleMapper.delete(new QueryWrapper<>(deletedUserRole));
         if (CollectionUtils.isNotEmpty(roleIdSet)) {
-            List<SysUserRole> userRoleList = new LinkedList<>();
             for (Long roleId : roleIdSet) {
                 SysUserRole userRole = new SysUserRole();
                 userRole.setUserId(user.getUserId());
                 userRole.setRoleId(roleId);
-                userRoleList.add(userRole);
+                sysUserRoleMapper.insert(userRole);
             }
-            sysUserRoleMapper.insertList(userRoleList);
         }
         return true;
     }
@@ -142,13 +138,10 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean changePassword(Long userId, String newPass) {
-        Example e = new Example(SysUser.class);
-        e.createCriteria()
-                .andEqualTo(super.idFieldName, userId)
-                .andEqualTo(super.deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
         SysUser updatedUser = new SysUser();
+        updatedUser.setUserId(userId);
         updatedUser.setPassword(passwordEncoder.encode(newPass));
-        return sysUserMapper.updateByExampleSelective(updatedUser, e) == 1;
+        return sysUserMapper.updateById(updatedUser) == 1;
     }
 
     /**
@@ -160,13 +153,12 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long userId) {
-        // 这里先删除主数据
+        if (sysUserMapper.deleteById(userId) == 0) {
-        if (!this.removeById(userId)) {
             return false;
         }
         SysUserRole userRole = new SysUserRole();
         userRole.setUserId(userId);
-        sysUserRoleMapper.delete(userRole);
+        sysUserRoleMapper.delete(new QueryWrapper<>(userRole));
         return true;
     }
 
@@ -234,8 +226,9 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     @Override
     public <M> List<SysUser> getSysUserListWithRelation(
             String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, SysUser.class);
         List<SysUser> resultList =
-                sysUserMapper.getSysUserList(inFilterField, inFilterValues, filter, orderBy);
+                sysUserMapper.getSysUserList(inFilterColumn, inFilterValues, filter, orderBy);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;

orange-demo-multi-service/application/upms/upms-service/upms-service.iml

@@ -63,45 +63,42 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="module" module-name="application-common" />
     <orderEntry type="module" module-name="common-swagger" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
     <orderEntry type="module" module-name="common-redis" />
     <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.4" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.63.Final" level="project" />
@@ -182,9 +179,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -257,6 +251,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/application/upms/upms.iml

@@ -85,9 +85,6 @@
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.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.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -162,6 +159,11 @@
     <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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/common/common-core/common-core.iml

@@ -38,9 +38,7 @@
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.45" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
@@ -79,23 +77,20 @@
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
@@ -182,6 +177,10 @@
     <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" 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.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

orange-demo-multi-service/common/common-core/pom.xml

@@ -97,9 +97,9 @@
             <version>${druid.version}</version>
         </dependency>
         <dependency>
-            <groupId>tk.mybatis</groupId>
+            <groupId>com.baomidou</groupId>
-            <artifactId>mapper-spring-boot-starter</artifactId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-mapper.version}</version>
+            <version>${mybatisplus.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>

orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java

@@ -1,16 +0,0 @@
-package com.orange.demo.common.core.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * 主要用于标记逻辑删除字段。
- *
- * @author Jerry
- * @date 2020-08-08
- */
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface DeletedFlagColumn {
-
-}

orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceAspect.java

@@ -36,13 +36,13 @@ public class DataSourceAspect {
         Class<?> clazz = point.getTarget().getClass();
         MyDataSource ds = clazz.getAnnotation(MyDataSource.class);
         // 通过判断 DataSource 中的值来判断当前方法应用哪个数据源
-        DataSourceContextHolder.setDataSourceType(ds.value());
+        Integer originalType = DataSourceContextHolder.setDataSourceType(ds.value());
         log.debug("set datasource is " + ds.value());
         try {
             return point.proceed();
         } finally {
-            DataSourceContextHolder.clear();
+            DataSourceContextHolder.unset(originalType);
-            log.debug("clean datasource");
+            log.debug("unset datasource is " + originalType);
         }
     }
 }

orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceResolveAspect.java

@@ -50,13 +50,13 @@ public class DataSourceResolveAspect {
         }
         int type = resolver.resolve(dsr.arg(), point.getArgs());
         // 通过判断 DataSource 中的值来判断当前方法应用哪个数据源
-        DataSourceContextHolder.setDataSourceType(type);
+        Integer originalType = DataSourceContextHolder.setDataSourceType(type);
         log.debug("set datasource is " + type);
         try {
             return point.proceed();
         } finally {
-            DataSourceContextHolder.clear();
+            DataSourceContextHolder.unset(originalType);
-            log.debug("clean datasource");
+            log.debug("unset datasource is " + originalType);
         }
     }
 }

orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DictCacheSyncAspect.java

@@ -10,6 +10,8 @@ import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
+import java.io.Serializable;
+
 /**
  * 字典缓存同步的AOP。该AOP的优先级必须比事务切面的优先级高，因此会在事务外执行该切面的代码。
  *
@@ -39,23 +41,23 @@ public class DictCacheSyncAspect {
         Object arg = joinPoint.getArgs()[0];
         if ("saveNew".equals(methodName)) {
             Object data = joinPoint.proceed();
-            BaseDictService<Object, Object> service =
+            BaseDictService<Object, Serializable> service =
-                    (BaseDictService<Object, Object>) joinPoint.getTarget();
+                    (BaseDictService<Object, Serializable>) joinPoint.getTarget();
             // 这里参数必须使用saveNew方法的返回对象，因为里面包含实际主键值。
             service.putDictionaryCache(data);
             return data;
         } else if ("update".equals(methodName)) {
             Object data = joinPoint.proceed();
-            BaseDictService<Object, Object> service =
+            BaseDictService<Object, Serializable> service =
-                    (BaseDictService<Object, Object>) joinPoint.getTarget();
+                    (BaseDictService<Object, Serializable>) joinPoint.getTarget();
             // update的方法返回的是boolean，因此这里的参数需要使用第一个参数即可。
             service.putDictionaryCache(arg);
             return data;
         } else {
             // remove
-            BaseDictService<Object, Object> service =
+            BaseDictService<Object, Serializable> service =
-                    (BaseDictService<Object, Object>) joinPoint.getTarget();
+                    (BaseDictService<Object, Serializable>) joinPoint.getTarget();
-            service.removeDictionaryCache(arg);
+            service.removeDictionaryCache((Serializable) arg);
             return joinPoint.proceed();
         }
     }

orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java

@@ -2,6 +2,7 @@ package com.orange.demo.common.core.base.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ReflectUtil;
+import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.common.core.base.service.IBaseService;
 import com.orange.demo.common.core.constant.AggregationKind;
@@ -18,7 +19,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.persistence.Id;
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.util.LinkedList;
@@ -37,7 +38,7 @@ import java.util.stream.Collectors;
  * @date 2020-08-08
  */
 @Slf4j
-public abstract class BaseController<M, V, K> {
+public abstract class BaseController<M, V, K extends Serializable> {
 
     /**
      * 当前Service关联的主Model实体对象的Class。
@@ -68,7 +69,7 @@ public abstract class BaseController<M, V, K> {
         domainVoClass = (Class<V>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[1];
         Field[] fields = ReflectUtil.getFields(modelClass);
         for (Field field : fields) {
-            if (null != field.getAnnotation(Id.class)) {
+            if (null != field.getAnnotation(TableId.class)) {
                 idFieldName = field.getName();
                 break;
             }

orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java

@@ -1,10 +1,8 @@
 package com.orange.demo.common.core.base.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import tk.mybatis.mapper.additional.insert.InsertListMapper;
-import tk.mybatis.mapper.annotation.RegisterMapper;
-import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
 import java.util.Map;
@@ -16,8 +14,7 @@ import java.util.Map;
  * @author Jerry
  * @date 2020-08-08
  */
-@RegisterMapper
+public interface BaseDaoMapper<M> extends BaseMapper<M> {
-public interface BaseDaoMapper<M> extends Mapper<M>, InsertListMapper<M> {
 
     /**
      * 根据指定的表名、显示字段列表、过滤条件字符串和分组字段，返回聚合计算后的查询结果。

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

@@ -1,8 +1,8 @@
 package com.orange.demo.common.core.base.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.util.Date;
 
 /**
@@ -17,24 +17,24 @@ public class BaseModel {
     /**
      * 创建者Id。
      */
-    @Column(name = "create_user_id")
+    @TableField(value = "create_user_id")
     private Long createUserId;
 
     /**
      * 创建时间。
      */
-    @Column(name = "create_time")
+    @TableField(value = "create_time")
     private Date createTime;
 
     /**
      * 更新者Id。
      */
-    @Column(name = "update_user_id")
+    @TableField(value = "update_user_id")
     private Long updateUserId;
 
     /**
      * 更新时间。
      */
-    @Column(name = "update_time")
+    @TableField(value = "update_time")
     private Date updateTime;
 }

orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java

@@ -1,6 +1,7 @@
 package com.orange.demo.common.core.base.service;
 
 import cn.hutool.core.util.ReflectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.orange.demo.common.core.constant.GlobalDeletedFlag;
 import com.orange.demo.common.core.exception.MyRuntimeException;
 import com.orange.demo.common.core.cache.DictionaryCache;
@@ -8,8 +9,8 @@ import com.orange.demo.common.core.object.TokenData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
+import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -22,7 +23,7 @@ import java.util.*;
  * @date 2020-08-08
  */
 @Slf4j
-public abstract class BaseDictService<M, K> extends BaseService<M, K> implements IBaseDictService<M, K> {
+public abstract class BaseDictService<M, K extends Serializable> extends BaseService<M, K> implements IBaseDictService<M, K> {
 
     /**
      * 缓存池对象。
@@ -89,15 +90,7 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
         if (tenantIdField != null) {
             ReflectUtil.setFieldValue(data, tenantIdField, TokenData.takeFromRequest().getTenantId());
         }
-        if (deletedFlagFieldName != null) {
+        return mapper().updateById(data) == 1;
-            try {
-                setDeletedFlagMethod.invoke(data, GlobalDeletedFlag.NORMAL);
-            } catch (Exception e) {
-                log.error("Failed to call reflection [setDeletedFlagMethod] in BaseDictService.update.", e);
-                throw new MyRuntimeException(e);
-            }
-        }
-        return mapper().updateByPrimaryKey(data) == 1;
     }
 
     /**
@@ -109,7 +102,7 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(K id) {
-        return this.removeById(id);
+        return mapper().deleteById(id) == 1;
     }
 
     /**
@@ -118,15 +111,16 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
      * @param id 主键Id。
      * @return 主键关联的数据，不存在返回null。
      */
+    @SuppressWarnings("unchecked")
     @Override
-    public M getById(K id) {
+    public M getById(Serializable id) {
-        M data = dictionaryCache.get(id);
+        M data = dictionaryCache.get((K) id);
         if (data != null) {
             return data;
         }
         data = super.getById(id);
         if (data != null) {
-            this.dictionaryCache.put(id, data);
+            this.dictionaryCache.put((K) id, data);
         }
         return data;
     }
@@ -188,7 +182,7 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
     }
 
     /**
-     * 返回符合 inFilterField in (inFilterValues) 条件的所有数据。蜀国property是主键，则从缓存中读取。
+     * 返回符合 inFilterField in (inFilterValues) 条件的所有数据。属性property是主键，则从缓存中读取。
      *
      * @param inFilterField  参与(In-list)过滤的Java对象字段。
      * @param inFilterValues 参与(In-list)过滤的Java字段值集合。
@@ -200,7 +194,7 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
         if (inFilterField.equals(this.idFieldName)) {
             return this.getInList((Set<K>) inFilterValues);
         }
-        return this.getInList(inFilterField, inFilterValues);
+        return super.getInList(inFilterField, inFilterValues);
     }
 
     /**
@@ -220,8 +214,10 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
             List<M> dataList = this.getInList((Set<K>) inFilterValues);
             return dataList.size() == inFilterValues.size();
         }
-        Example e = this.makeDefaultInListExample(inFilterField, inFilterValues, null);
+        String columnName = this.safeMapToColumnName(inFilterField);
-        return mapper().selectCountByExample(e) == inFilterValues.size();
+        QueryWrapper<M> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in(columnName, inFilterValues);
+        return mapper().selectCount(queryWrapper) == inFilterValues.size();
     }
 
     /**