commit：1.5多应用版本

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

@@ -6,19 +6,20 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="common-redis" />
-        <module name="stats-interface" />
+        <module name="upms-service" />
         <module name="application-common" />
         <module name="gateway" />
+        <module name="stats-api" />
         <module name="common-swagger" />
         <module name="common-sequence" />
+        <module name="upms-api" />
+        <module name="common-datafilter" />
         <module name="course-class-service" />
         <module name="common-core" />
-        <module name="upms-interface" />
+        <module name="common-redis" />
         <module name="admin-monitor" />
+        <module name="course-class-api" />
         <module name="stats-service" />
-        <module name="course-class-interface" />
-        <module name="upms-service" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
@@ -29,20 +30,21 @@
       <module name="common" target="1.8" />
       <module name="common-core" target="1.8" />
       <module name="common-datafilter" target="1.8" />
+      <module name="common-log" target="1.8" />
       <module name="common-redis" target="1.8" />
       <module name="common-sequence" target="1.8" />
       <module name="common-swagger" target="1.8" />
       <module name="course-class" target="1.8" />
-      <module name="course-class-interface" target="1.8" />
+      <module name="course-class-api" target="1.8" />
       <module name="course-class-service" target="1.8" />
       <module name="framework" target="1.8" />
       <module name="gateway" target="1.8" />
       <module name="OrangeMultiDemo" target="1.8" />
       <module name="stats" target="1.8" />
-      <module name="stats-interface" target="1.8" />
+      <module name="stats-api" target="1.8" />
       <module name="stats-service" target="1.8" />
       <module name="upms" target="1.8" />
-      <module name="upms-interface" target="1.8" />
+      <module name="upms-api" target="1.8" />
       <module name="upms-service" target="1.8" />
     </bytecodeTargetLevel>
   </component>

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

@@ -2,18 +2,20 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/application/application-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/application/course-class/course-class-interface/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/application/course-class/course-class-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/application/course-class/course-class-service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/application/course-class/course-class-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/application/gateway/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/application/gateway/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/application/stats/stats-interface/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/application/stats/stats-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/application/stats/stats-service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/application/stats/stats-service/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/application/upms/upms-interface/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/application/upms/upms-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/application/upms/upms-service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/application/upms/upms-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/common-core/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/common/common-datafilter/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/common/common-datafilter/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/common-redis/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/common-redis/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/common-sequence/src/main/java" charset="UTF-8" />

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

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

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

@@ -8,19 +8,20 @@
       <module fileurl="file://$PROJECT_DIR$/application/application-common/application-common.iml" filepath="$PROJECT_DIR$/application/application-common/application-common.iml" />
       <module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" />
       <module fileurl="file://$PROJECT_DIR$/common/common-core/common-core.iml" filepath="$PROJECT_DIR$/common/common-core/common-core.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common/common-datafilter/common-datafilter.iml" filepath="$PROJECT_DIR$/common/common-datafilter/common-datafilter.iml" />
       <module fileurl="file://$PROJECT_DIR$/common/common-redis/common-redis.iml" filepath="$PROJECT_DIR$/common/common-redis/common-redis.iml" />
       <module fileurl="file://$PROJECT_DIR$/common/common-sequence/common-sequence.iml" filepath="$PROJECT_DIR$/common/common-sequence/common-sequence.iml" />
       <module fileurl="file://$PROJECT_DIR$/common/common-swagger/common-swagger.iml" filepath="$PROJECT_DIR$/common/common-swagger/common-swagger.iml" />
       <module fileurl="file://$PROJECT_DIR$/application/course-class/course-class.iml" filepath="$PROJECT_DIR$/application/course-class/course-class.iml" />
-      <module fileurl="file://$PROJECT_DIR$/application/course-class/course-class-interface/course-class-interface.iml" filepath="$PROJECT_DIR$/application/course-class/course-class-interface/course-class-interface.iml" />
+      <module fileurl="file://$PROJECT_DIR$/application/course-class/course-class-api/course-class-api.iml" filepath="$PROJECT_DIR$/application/course-class/course-class-api/course-class-api.iml" />
       <module fileurl="file://$PROJECT_DIR$/application/course-class/course-class-service/course-class-service.iml" filepath="$PROJECT_DIR$/application/course-class/course-class-service/course-class-service.iml" />
       <module fileurl="file://$PROJECT_DIR$/framework/framework.iml" filepath="$PROJECT_DIR$/framework/framework.iml" />
       <module fileurl="file://$PROJECT_DIR$/application/gateway/gateway.iml" filepath="$PROJECT_DIR$/application/gateway/gateway.iml" />
       <module fileurl="file://$PROJECT_DIR$/application/stats/stats.iml" filepath="$PROJECT_DIR$/application/stats/stats.iml" />
-      <module fileurl="file://$PROJECT_DIR$/application/stats/stats-interface/stats-interface.iml" filepath="$PROJECT_DIR$/application/stats/stats-interface/stats-interface.iml" />
+      <module fileurl="file://$PROJECT_DIR$/application/stats/stats-api/stats-api.iml" filepath="$PROJECT_DIR$/application/stats/stats-api/stats-api.iml" />
       <module fileurl="file://$PROJECT_DIR$/application/stats/stats-service/stats-service.iml" filepath="$PROJECT_DIR$/application/stats/stats-service/stats-service.iml" />
       <module fileurl="file://$PROJECT_DIR$/application/upms/upms.iml" filepath="$PROJECT_DIR$/application/upms/upms.iml" />
-      <module fileurl="file://$PROJECT_DIR$/application/upms/upms-interface/upms-interface.iml" filepath="$PROJECT_DIR$/application/upms/upms-interface/upms-interface.iml" />
+      <module fileurl="file://$PROJECT_DIR$/application/upms/upms-api/upms-api.iml" filepath="$PROJECT_DIR$/application/upms/upms-api/upms-api.iml" />
       <module fileurl="file://$PROJECT_DIR$/application/upms/upms-service/upms-service.iml" filepath="$PROJECT_DIR$/application/upms/upms-service/upms-service.iml" />
     </modules>
   </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="9db040c5-2354-4004-86ef-274b09107239" name="Default Changelist" comment="" />
+    <list default="true" id="03a5281b-25b1-47eb-9d2b-a05e68843595" 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="1nyIuGiSDcaF7eYaBPxmK1McmDc" />
+  <component name="ProjectId" id="1qTqJ7jXIGQz6yKNsUD15pNs70Q" />
   <component name="ProjectViewState">
     <option name="abbreviatePackageNames" value="true" />
     <option name="autoscrollFromSource" value="true" />
@@ -83,16 +83,22 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="9db040c5-2354-4004-86ef-274b09107239" name="Default Changelist" comment="" />
-      <created>1612356124376</created>
+      <changelist id="03a5281b-25b1-47eb-9d2b-a05e68843595" name="Default Changelist" comment="" />
+      <created>1617113852056</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1612356124376</updated>
-      <workItem from="1612356127414" duration="189000" />
+      <updated>1617113852056</updated>
+      <workItem from="1617113855390" duration="234000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="WindowStateProjectService">
+    <state x="383" y="212" width="674" height="476" key="find.popup" timestamp="1617114016095">
+      <screen x="0" y="0" width="1440" height="900" />
+    </state>
+    <state x="383" y="212" width="674" height="476" key="find.popup/0.0.1440.900@0.0.1440.900" timestamp="1617114016095" />
+  </component>
 </project>

orange-demo-multi-service/OrangeMultiDemo.iml

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

orange-demo-multi-service/README.md

@@ -71,7 +71,7 @@
   - 查看启动日志命令 docker-compose logs
 - docker-compose-full.yml (可选)
   - 包含全部服务的启动项，基础服务 + elk + gp。
-  - 启动方式为 docker-compose up -f docker-compose-full.yml -d
+  - 启动方式为 docker-compose -f docker-compose-full.yml up -d
   - 停止方式和数据错误处理方式，请参考上面docker-compose.yml的说明。
 - Pinpoint服务启动 (可选)
   - 进入zz-resource/pinpoint-docker-master目录。

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

@@ -4,11 +4,6 @@
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
@@ -19,22 +14,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common-core" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.31" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.31" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.31" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
@@ -42,59 +27,9 @@
     <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" />
     <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
     <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.5" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
-    <orderEntry type="library" name="Maven: com.github.ben-manes.caffeine:caffeine:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: cn.jimmyshi:bean-query:1.1.5" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <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" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.4.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: 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="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
@@ -111,6 +46,7 @@
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
@@ -152,11 +88,13 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />
@@ -187,6 +125,7 @@
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.7.4" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.7.4" level="project" />
@@ -206,6 +145,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
     <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />

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

@@ -13,12 +13,4 @@
     <version>1.0.0</version>
     <name>application-common</name>
     <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.orange.demo</groupId>
-            <artifactId>common-core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-    </dependencies>
 </project>

orange-demo-multi-service/application/course-class/course-class-api/pom.xml

@@ -8,9 +8,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>course-class-interface</artifactId>
+    <artifactId>course-class-api</artifactId>
     <version>1.0.0</version>
-    <name>course-class-interface</name>
+    <name>course-class-api</name>
     <packaging>jar</packaging>
 
     <dependencies>

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/client/AreaCodeClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.courseclassinterface.client;
+package com.orange.demo.courseclassapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.constant.ErrorCodeEnum;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.courseclassinterface.dto.AreaCodeDto;
-import com.orange.demo.courseclassinterface.vo.AreaCodeVo;
+import com.orange.demo.courseclassapi.dto.AreaCodeDto;
+import com.orange.demo.courseclassapi.vo.AreaCodeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -19,7 +19,7 @@ import java.util.*;
  * @author Jerry
  * @date 2020-08-08
  */
-@FeignClient(name = "system-service", fallbackFactory = AreaCodeClient.AreaCodeClientFallbackFactory.class)
+@FeignClient(name = "course-class", fallbackFactory = AreaCodeClient.AreaCodeClientFallbackFactory.class)
 public interface AreaCodeClient extends BaseClient<AreaCodeDto, AreaCodeVo, Long> {
 
     /**

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/client/CourseClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.courseclassinterface.client;
+package com.orange.demo.courseclassapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.courseclassinterface.dto.CourseDto;
-import com.orange.demo.courseclassinterface.vo.CourseVo;
+import com.orange.demo.courseclassapi.dto.CourseDto;
+import com.orange.demo.courseclassapi.vo.CourseVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface CourseClient extends BaseClient<CourseDto, CourseVo, Long> {
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/course/delete")
-    ResponseResult<Void> delete(@RequestParam("courseId") Long courseId);
+    @PostMapping("/course/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("courseId") Long courseId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/client/GradeClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.courseclassinterface.client;
+package com.orange.demo.courseclassapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.courseclassinterface.dto.GradeDto;
-import com.orange.demo.courseclassinterface.vo.GradeVo;
+import com.orange.demo.courseclassapi.dto.GradeDto;
+import com.orange.demo.courseclassapi.vo.GradeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface GradeClient extends BaseClient<GradeDto, GradeVo, Integer> {
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/grade/delete")
-    ResponseResult<Void> delete(@RequestParam("gradeId") Integer gradeId);
+    @PostMapping("/grade/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("gradeId") Integer gradeId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/client/SchoolInfoClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.courseclassinterface.client;
+package com.orange.demo.courseclassapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.courseclassinterface.dto.SchoolInfoDto;
-import com.orange.demo.courseclassinterface.vo.SchoolInfoVo;
+import com.orange.demo.courseclassapi.dto.SchoolInfoDto;
+import com.orange.demo.courseclassapi.vo.SchoolInfoVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface SchoolInfoClient extends BaseClient<SchoolInfoDto, SchoolInfoVo
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/schoolInfo/delete")
-    ResponseResult<Void> delete(@RequestParam("schoolId") Long schoolId);
+    @PostMapping("/schoolInfo/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("schoolId") Long schoolId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/client/StudentClassClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.courseclassinterface.client;
+package com.orange.demo.courseclassapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.courseclassinterface.dto.StudentClassDto;
-import com.orange.demo.courseclassinterface.vo.StudentClassVo;
+import com.orange.demo.courseclassapi.dto.StudentClassDto;
+import com.orange.demo.courseclassapi.vo.StudentClassVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface StudentClassClient extends BaseClient<StudentClassDto, StudentC
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/studentClass/delete")
-    ResponseResult<Void> delete(@RequestParam("classId") Long classId);
+    @PostMapping("/studentClass/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("classId") Long classId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/client/StudentClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.courseclassinterface.client;
+package com.orange.demo.courseclassapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.courseclassinterface.dto.StudentDto;
-import com.orange.demo.courseclassinterface.vo.StudentVo;
+import com.orange.demo.courseclassapi.dto.StudentDto;
+import com.orange.demo.courseclassapi.vo.StudentVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface StudentClient extends BaseClient<StudentDto, StudentVo, Long> {
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/student/delete")
-    ResponseResult<Void> delete(@RequestParam("studentId") Long studentId);
+    @PostMapping("/student/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("studentId") Long studentId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/constant/ClassLevel.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.constant;
+package com.orange.demo.courseclassapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/constant/ClassStatus.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.constant;
+package com.orange.demo.courseclassapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/constant/CourseDifficult.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.constant;
+package com.orange.demo.courseclassapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/dto/AreaCodeDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.dto;
+package com.orange.demo.courseclassapi.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/dto/ClassCourseDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.dto;
+package com.orange.demo.courseclassapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/dto/ClassStudentDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.dto;
+package com.orange.demo.courseclassapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/dto/CourseDto.java

@@ -1,8 +1,8 @@
-package com.orange.demo.courseclassinterface.dto;
+package com.orange.demo.courseclassapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.validator.ConstDictRef;
-import com.orange.demo.courseclassinterface.constant.CourseDifficult;
+import com.orange.demo.courseclassapi.constant.CourseDifficult;
 import com.orange.demo.application.common.constant.Subject;
 
 import io.swagger.annotations.ApiModel;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/dto/GradeDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.dto;
+package com.orange.demo.courseclassapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/dto/SchoolInfoDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.dto;
+package com.orange.demo.courseclassapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/dto/StudentClassDto.java

@@ -1,8 +1,8 @@
-package com.orange.demo.courseclassinterface.dto;
+package com.orange.demo.courseclassapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.validator.ConstDictRef;
-import com.orange.demo.courseclassinterface.constant.ClassLevel;
+import com.orange.demo.courseclassapi.constant.ClassLevel;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/dto/StudentDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.dto;
+package com.orange.demo.courseclassapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.validator.ConstDictRef;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/vo/AreaCodeVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.vo;
+package com.orange.demo.courseclassapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/vo/ClassCourseVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.vo;
+package com.orange.demo.courseclassapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/vo/ClassStudentVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.vo;
+package com.orange.demo.courseclassapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/vo/CourseVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.vo;
+package com.orange.demo.courseclassapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/vo/GradeVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.vo;
+package com.orange.demo.courseclassapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/vo/SchoolInfoVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.vo;
+package com.orange.demo.courseclassapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/vo/StudentClassVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.vo;
+package com.orange.demo.courseclassapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/course-class/course-class-api/src/main/java/com/orange/demo/courseclassapi/vo/StudentVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.courseclassinterface.vo;
+package com.orange.demo.courseclassapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -20,8 +20,25 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="course-class-interface" />
+    <orderEntry type="module" module-name="course-class-api" />
     <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-spring-boot-autoconfigure:2.0.5" 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-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" 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-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" 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-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.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.springfox:springfox-bean-validators:2.9.2" level="project" />
     <orderEntry type="module" module-name="common-core" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.5.RELEASE" level="project" />
@@ -37,6 +54,7 @@
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
@@ -53,12 +71,14 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.5" level="project" />
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
     <orderEntry type="library" name="Maven: com.github.ben-manes.caffeine:caffeine:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: cn.jimmyshi:bean-query:1.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
@@ -69,6 +89,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
@@ -89,23 +110,6 @@
     <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-spring-boot-autoconfigure:2.0.5" 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-annotations:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" 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-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" 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-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.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.springfox:springfox-bean-validators:2.9.2" level="project" />
     <orderEntry type="module" module-name="common-redis" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.7.0" level="project" />
@@ -126,7 +130,6 @@
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
@@ -150,7 +153,6 @@
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
@@ -186,13 +188,11 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />

orange-demo-multi-service/application/course-class/course-class-service/pom.xml

@@ -17,7 +17,12 @@
         <!-- 业务组件依赖 -->
         <dependency>
             <groupId>com.orange.demo</groupId>
-            <artifactId>course-class-interface</artifactId>
+            <artifactId>course-class-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.orange.demo</groupId>
+            <artifactId>common-core</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>

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

@@ -18,7 +18,7 @@ import javax.sql.DataSource;
  */
 @Configuration
 @EnableTransactionManagement
-@MapperScan(value = {"com.orange.demo.*.dao"})
+@MapperScan(value = {"com.orange.demo.*.dao", "com.orange.demo.common.*.dao"})
 public class DataSourceConfig {
 
     @Bean(initMethod = "init", destroyMethod = "close")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java

@@ -6,7 +6,7 @@ import com.orange.demo.common.core.base.controller.BaseController;
 import com.orange.demo.common.core.base.service.IBaseDictService;
 import com.orange.demo.common.core.util.MyModelUtil;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.courseclassinterface.vo.AreaCodeVo;
+import com.orange.demo.courseclassapi.vo.AreaCodeVo;
 import com.orange.demo.courseclassservice.model.AreaCode;
 import com.orange.demo.courseclassservice.service.AreaCodeService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -41,7 +41,7 @@ public class AreaCodeController extends BaseController<AreaCode, AreaCodeVo, Lon
      */
     @GetMapping("/listDict")
     public ResponseResult<List<Map<String, Object>>> listDict() {
-        List<AreaCode> resultList = areaCodeService.getAllList();
+        List<AreaCode> resultList = areaCodeService.getAllListFromCache();
         return ResponseResult.success(BeanQuery.select(
                 "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
     }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java

@@ -9,8 +9,8 @@ import com.orange.demo.common.core.upload.UploadStoreInfo;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.courseclassservice.model.*;
 import com.orange.demo.courseclassservice.service.*;
-import com.orange.demo.courseclassinterface.dto.*;
-import com.orange.demo.courseclassinterface.vo.*;
+import com.orange.demo.courseclassapi.dto.*;
+import com.orange.demo.courseclassapi.vo.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
@@ -277,7 +277,7 @@ public class CourseController extends BaseController<Course, CourseVo, Long> {
         }
         // 根据字段注解中的存储类型，通过工厂方法获取匹配的上传下载实现类，从而解耦。
         BaseUpDownloader upDownloader = upDownloaderFactory.get(storeInfo.getStoreType());
-        UploadResponseInfo responseInfo = upDownloader.doUpload(appConfig.getServiceContextPath(),
+        UploadResponseInfo responseInfo = upDownloader.doUpload(appConfig.getServiceContextPath(), 
                 appConfig.getUploadFileBaseDir(), Course.class.getSimpleName(), fieldName, asImage, uploadFile);
         if (responseInfo.getUploadFailed()) {
             ResponseResult.output(HttpServletResponse.SC_FORBIDDEN,
@@ -354,6 +354,20 @@ public class CourseController extends BaseController<Course, CourseVo, Long> {
         return super.baseExistId(courseId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param courseId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Long courseId) throws Exception {
+        Course filter = new Course();
+        filter.setCourseId(courseId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java

@@ -8,16 +8,17 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import com.orange.demo.common.core.base.controller.BaseController;
 import com.orange.demo.common.core.base.service.IBaseDictService;
-import com.orange.demo.common.core.constant.ErrorCodeEnum;
 import com.orange.demo.common.core.object.*;
+import com.orange.demo.common.core.constant.ErrorCodeEnum;
 import com.orange.demo.common.core.util.MyModelUtil;
 import com.orange.demo.common.core.util.MyCommonUtil;
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.annotation.MyRequestBody;
-import com.orange.demo.courseclassinterface.dto.GradeDto;
-import com.orange.demo.courseclassinterface.vo.GradeVo;
+import com.orange.demo.courseclassapi.dto.GradeDto;
+import com.orange.demo.courseclassapi.vo.GradeVo;
 import com.orange.demo.courseclassservice.model.Grade;
 import com.orange.demo.courseclassservice.service.GradeService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -130,6 +131,10 @@ public class GradeController extends BaseController<Grade, GradeVo, Integer> {
     @GetMapping("/listDict")
     public ResponseResult<List<Map<String, Object>>> listDict() {
         List<Grade> resultList = gradeService.getAllListFromCache();
+        if (CollectionUtils.isEmpty(resultList)) {
+            gradeService.reloadCachedData(true);
+            resultList = gradeService.getAllList();
+        }
         return ResponseResult.success(BeanQuery.select(
                 "gradeId as id", "gradeName as name").executeFrom(resultList));
     }
@@ -202,6 +207,20 @@ public class GradeController extends BaseController<Grade, GradeVo, Integer> {
         return super.baseExistId(gradeId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param gradeId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Integer gradeId) throws Exception {
+        Grade filter = new Grade();
+        filter.setGradeId(gradeId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java

@@ -4,8 +4,8 @@ import cn.jimmyshi.beanquery.BeanQuery;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.courseclassservice.model.*;
 import com.orange.demo.courseclassservice.service.*;
-import com.orange.demo.courseclassinterface.dto.*;
-import com.orange.demo.courseclassinterface.vo.*;
+import com.orange.demo.courseclassapi.dto.*;
+import com.orange.demo.courseclassapi.vo.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
@@ -232,6 +232,20 @@ public class SchoolInfoController extends BaseController<SchoolInfo, SchoolInfoV
         return super.baseExistId(schoolId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param schoolId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Long schoolId) throws Exception {
+        SchoolInfo filter = new SchoolInfo();
+        filter.setSchoolId(schoolId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java

@@ -3,8 +3,8 @@ package com.orange.demo.courseclassservice.controller;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.courseclassservice.model.*;
 import com.orange.demo.courseclassservice.service.*;
-import com.orange.demo.courseclassinterface.dto.*;
-import com.orange.demo.courseclassinterface.vo.*;
+import com.orange.demo.courseclassapi.dto.*;
+import com.orange.demo.courseclassapi.vo.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
@@ -503,6 +503,20 @@ public class StudentClassController extends BaseController<StudentClass, Student
         return super.baseExistId(classId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param classId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Long classId) throws Exception {
+        StudentClass filter = new StudentClass();
+        filter.setClassId(classId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java

@@ -4,8 +4,8 @@ import cn.jimmyshi.beanquery.BeanQuery;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.courseclassservice.model.*;
 import com.orange.demo.courseclassservice.service.*;
-import com.orange.demo.courseclassinterface.dto.*;
-import com.orange.demo.courseclassinterface.vo.*;
+import com.orange.demo.courseclassapi.dto.*;
+import com.orange.demo.courseclassapi.vo.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
@@ -244,6 +244,20 @@ public class StudentController extends BaseController<Student, StudentVo, Long>
         return super.baseExistId(studentId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param studentId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Long studentId) throws Exception {
+        Student filter = new Student();
+        filter.setStudentId(studentId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

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

@@ -20,11 +20,13 @@
         <association property="classCourse" column="course_id" foreignColumn="course_id"
                      notNullColumn="course_id" resultMap="com.orange.demo.courseclassservice.dao.ClassCourseMapper.BaseResultMap" />
     </resultMap>
+
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
         <include refid="com.orange.demo.courseclassservice.dao.CourseMapper.inputFilterRef"/>
     </sql>
+
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="courseFilter != null">

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

@@ -7,11 +7,13 @@
         <result column="province_id" jdbcType="BIGINT" property="provinceId"/>
         <result column="city_id" jdbcType="BIGINT" property="cityId"/>
     </resultMap>
+
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
         <include refid="com.orange.demo.courseclassservice.dao.SchoolInfoMapper.inputFilterRef"/>
     </sql>
+
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="schoolInfoFilter != null">

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

@@ -12,12 +12,14 @@
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="status" jdbcType="TINYINT" property="status"/>
     </resultMap>
+
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
         <include refid="com.orange.demo.courseclassservice.dao.StudentClassMapper.inputFilterRef"/>
         AND zz_class.status = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
+
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="studentClassFilter != null">

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

@@ -18,11 +18,13 @@
         <result column="register_time" jdbcType="TIMESTAMP" property="registerTime"/>
         <result column="status" jdbcType="TINYINT" property="status"/>
     </resultMap>
+
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
         <include refid="com.orange.demo.courseclassservice.dao.StudentMapper.inputFilterRef"/>
     </sql>
+
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="studentFilter != null">

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

@@ -1,13 +1,13 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.orange.demo.courseclassinterface.constant.CourseDifficult;
+import com.orange.demo.courseclassapi.vo.CourseVo;
+import com.orange.demo.courseclassapi.constant.CourseDifficult;
 import com.orange.demo.application.common.constant.Subject;
 import com.orange.demo.common.core.upload.UploadStoreTypeEnum;
 import com.orange.demo.common.core.annotation.UploadFlagColumn;
 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.courseclassinterface.vo.CourseVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;

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

@@ -1,8 +1,8 @@
 package com.orange.demo.courseclassservice.model;
 
+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 com.orange.demo.courseclassinterface.vo.SchoolInfoVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;

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.orange.demo.courseclassapi.vo.StudentVo;
 import com.orange.demo.application.common.constant.Gender;
 import com.orange.demo.application.common.constant.ExpLevel;
 import com.orange.demo.application.common.constant.StudentStatus;
@@ -7,7 +8,6 @@ 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.util.MyCommonUtil;
-import com.orange.demo.courseclassinterface.vo.StudentVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;

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

@@ -1,11 +1,11 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.orange.demo.courseclassinterface.constant.ClassLevel;
+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 com.orange.demo.courseclassinterface.vo.StudentClassVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;

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

@@ -8,10 +8,9 @@ import com.orange.demo.common.core.base.service.BaseDictService;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.entity.Example;
 
+import javax.annotation.PostConstruct;
 import java.util.Collection;
-import java.util.List;
 
 /**
  * 行政区划的Service类。
@@ -30,22 +29,16 @@ public class AreaCodeServiceImpl extends BaseDictService<AreaCode, Long> impleme
         this.dictionaryCache = MapTreeDictionaryCache.create(AreaCode::getAreaId, AreaCode::getParentId);
     }
 
+    @PostConstruct
+    public void init() {
+        this.reloadCachedData(true);
+    }
+
     @Override
     protected BaseDaoMapper<AreaCode> mapper() {
         return areaCodeMapper;
     }
 
-    /**
-     * 加载数据库数据到内存缓存。
-     */
-    @Override
-    public void loadCachedData() {
-        Example e = new Example(AreaCode.class);
-        e.orderBy("areaLevel");
-        List<AreaCode> areaCodeList = areaCodeMapper.selectByExample(e);
-        dictionaryCache.putAll(areaCodeList);
-    }
-
     /**
      * 根据上级行政区划Id，获取其下级行政区划列表。
      *

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

@@ -10,6 +10,7 @@ import com.orange.demo.common.core.object.TokenData;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -143,7 +144,8 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
     @Override
     public List<Course> getCourseListWithRelation(Course filter, String orderBy) {
         List<Course> resultList = courseMapper.getCourseList(null, null, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 
@@ -163,7 +165,8 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
             String inFilterField, Set<M> inFilterValues, Course filter, String orderBy) {
         List<Course> resultList =
                 courseMapper.getCourseList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
     }
 

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

@@ -9,6 +9,7 @@ import com.orange.demo.common.core.object.CallResult;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -125,7 +126,8 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
     @Override
     public List<SchoolInfo> getSchoolInfoListWithRelation(SchoolInfo filter, String orderBy) {
         List<SchoolInfo> resultList = schoolInfoMapper.getSchoolInfoList(null, null, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 
@@ -145,7 +147,8 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
             String inFilterField, Set<M> inFilterValues, SchoolInfo filter, String orderBy) {
         List<SchoolInfo> resultList =
                 schoolInfoMapper.getSchoolInfoList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
     }
 

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

@@ -11,6 +11,7 @@ import com.orange.demo.common.core.constant.GlobalDeletedFlag;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -151,7 +152,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     @Override
     public List<StudentClass> getStudentClassListWithRelation(StudentClass filter, String orderBy) {
         List<StudentClass> resultList = studentClassMapper.getStudentClassList(null, null, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 
@@ -171,7 +173,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
             String inFilterField, Set<M> inFilterValues, StudentClass filter, String orderBy) {
         List<StudentClass> resultList =
                 studentClassMapper.getStudentClassList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
     }
 

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

@@ -10,6 +10,7 @@ import com.orange.demo.common.core.object.CallResult;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -142,7 +143,8 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Override
     public List<Student> getStudentListWithRelation(Student filter, String orderBy) {
         List<Student> resultList = studentMapper.getStudentList(null, null, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 
@@ -162,7 +164,8 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
             String inFilterField, Set<M> inFilterValues, Student filter, String orderBy) {
         List<Student> resultList =
                 studentMapper.getStudentList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
     }
 

orange-demo-multi-service/application/course-class/course-class-service/src/main/resources/log4j2.xml

@@ -23,7 +23,7 @@
         </property>
         <property name="LOG_PATTERN_EX">
             <!-- 下面注释中 %X{PtxId}, SpanId: %X{PspanId} 为PinPoint 中的traceid -->
-            [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] 请求Id[%X{traceId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
+            [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] T:[%X{traceId}] S:[%X{sessionId}] U:[%X{userId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
         </property>
         <!-- 日志保留天数 -->
         <property name="EVERY_FILE_COUNT">31</property>

orange-demo-multi-service/application/course-class/pom.xml

@@ -12,7 +12,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>course-class-interface</module>
+        <module>course-class-api</module>
         <module>course-class-service</module>
     </modules>
 </project>

orange-demo-multi-service/application/gateway/src/main/resources/log4j2.xml

@@ -23,7 +23,7 @@
         </property>
         <property name="LOG_PATTERN_EX">
                         <!-- 下面注释中 %X{PtxId}, SpanId: %X{PspanId} 为PinPoint 中的traceid -->
-            [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] 请求Id[%X{traceId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
+            [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] T:[%X{traceId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
         </property>
         <!-- 日志保留天数 -->
         <property name="EVERY_FILE_COUNT">31</property>

orange-demo-multi-service/application/stats/pom.xml

@@ -12,7 +12,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>stats-interface</module>
+        <module>stats-api</module>
         <module>stats-service</module>
     </modules>
 </project>

orange-demo-multi-service/application/stats/stats-api/pom.xml

@@ -8,9 +8,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>stats-interface</artifactId>
+    <artifactId>stats-api</artifactId>
     <version>1.0.0</version>
-    <name>stats-interface</name>
+    <name>stats-api</name>
     <packaging>jar</packaging>
 
     <dependencies>

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/client/CourseTransStatsClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.statsinterface.client;
+package com.orange.demo.statsapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.statsinterface.dto.CourseTransStatsDto;
-import com.orange.demo.statsinterface.vo.CourseTransStatsVo;
+import com.orange.demo.statsapi.dto.CourseTransStatsDto;
+import com.orange.demo.statsapi.vo.CourseTransStatsVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface CourseTransStatsClient extends BaseClient<CourseTransStatsDto,
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/courseTransStats/delete")
-    ResponseResult<Void> delete(@RequestParam("statsId") Long statsId);
+    @PostMapping("/courseTransStats/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("statsId") Long statsId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/client/StudentActionStatsClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.statsinterface.client;
+package com.orange.demo.statsapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.statsinterface.dto.StudentActionStatsDto;
-import com.orange.demo.statsinterface.vo.StudentActionStatsVo;
+import com.orange.demo.statsapi.dto.StudentActionStatsDto;
+import com.orange.demo.statsapi.vo.StudentActionStatsVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface StudentActionStatsClient extends BaseClient<StudentActionStatsD
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/studentActionStats/delete")
-    ResponseResult<Void> delete(@RequestParam("statsId") Long statsId);
+    @PostMapping("/studentActionStats/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("statsId") Long statsId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/client/StudentActionTransClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.statsinterface.client;
+package com.orange.demo.statsapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.statsinterface.dto.StudentActionTransDto;
-import com.orange.demo.statsinterface.vo.StudentActionTransVo;
+import com.orange.demo.statsapi.dto.StudentActionTransDto;
+import com.orange.demo.statsapi.vo.StudentActionTransVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface StudentActionTransClient extends BaseClient<StudentActionTransD
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/studentActionTrans/delete")
-    ResponseResult<Void> delete(@RequestParam("transId") Long transId);
+    @PostMapping("/studentActionTrans/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("transId") Long transId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/dto/CourseTransStatsDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.statsinterface.dto;
+package com.orange.demo.statsapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.validator.ConstDictRef;

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/dto/StudentActionStatsDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.statsinterface.dto;
+package com.orange.demo.statsapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/dto/StudentActionTransDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.statsinterface.dto;
+package com.orange.demo.statsapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.validator.ConstDictRef;

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/vo/CourseTransStatsVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.statsinterface.vo;
+package com.orange.demo.statsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/vo/StudentActionStatsVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.statsinterface.vo;
+package com.orange.demo.statsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/stats/stats-api/src/main/java/com/orange/demo/statsapi/vo/StudentActionTransVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.statsinterface.vo;
+package com.orange.demo.statsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/stats/stats-service/pom.xml

@@ -17,12 +17,17 @@
         <!-- 业务组件依赖 -->
         <dependency>
             <groupId>com.orange.demo</groupId>
-            <artifactId>stats-interface</artifactId>
+            <artifactId>stats-api</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.orange.demo</groupId>
-            <artifactId>course-class-interface</artifactId>
+            <artifactId>course-class-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.orange.demo</groupId>
+            <artifactId>common-core</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>

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

@@ -18,7 +18,7 @@ import javax.sql.DataSource;
  */
 @Configuration
 @EnableTransactionManagement
-@MapperScan(value = {"com.orange.demo.*.dao"})
+@MapperScan(value = {"com.orange.demo.*.dao", "com.orange.demo.common.*.dao"})
 public class DataSourceConfig {
 
     @Bean(initMethod = "init", destroyMethod = "close")

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/CourseTransStatsController.java

@@ -3,8 +3,8 @@ package com.orange.demo.statsservice.controller;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.statsservice.model.*;
 import com.orange.demo.statsservice.service.*;
-import com.orange.demo.statsinterface.dto.*;
-import com.orange.demo.statsinterface.vo.*;
+import com.orange.demo.statsapi.dto.*;
+import com.orange.demo.statsapi.vo.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
@@ -165,6 +165,20 @@ public class CourseTransStatsController extends BaseController<CourseTransStats,
         return super.baseExistId(statsId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param statsId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Long statsId) throws Exception {
+        CourseTransStats filter = new CourseTransStats();
+        filter.setStatsId(statsId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionStatsController.java

@@ -3,8 +3,8 @@ package com.orange.demo.statsservice.controller;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.statsservice.model.*;
 import com.orange.demo.statsservice.service.*;
-import com.orange.demo.statsinterface.dto.*;
-import com.orange.demo.statsinterface.vo.*;
+import com.orange.demo.statsapi.dto.*;
+import com.orange.demo.statsapi.vo.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
@@ -165,6 +165,20 @@ public class StudentActionStatsController extends BaseController<StudentActionSt
         return super.baseExistId(statsId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param statsId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Long statsId) throws Exception {
+        StudentActionStats filter = new StudentActionStats();
+        filter.setStatsId(statsId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionTransController.java

@@ -3,8 +3,8 @@ package com.orange.demo.statsservice.controller;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.statsservice.model.*;
 import com.orange.demo.statsservice.service.*;
-import com.orange.demo.statsinterface.dto.*;
-import com.orange.demo.statsinterface.vo.*;
+import com.orange.demo.statsapi.dto.*;
+import com.orange.demo.statsapi.vo.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
@@ -223,6 +223,20 @@ public class StudentActionTransController extends BaseController<StudentActionTr
         return super.baseExistId(transId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param transId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Long transId) throws Exception {
+        StudentActionTrans filter = new StudentActionTrans();
+        filter.setTransId(transId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/CourseTransStatsMapper.xml

@@ -13,11 +13,13 @@
         <result column="student_flower_amount" jdbcType="INTEGER" property="studentFlowerAmount"/>
         <result column="student_flower_count" jdbcType="INTEGER" property="studentFlowerCount"/>
     </resultMap>
+
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
         <include refid="com.orange.demo.statsservice.dao.CourseTransStatsMapper.inputFilterRef"/>
     </sql>
+
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="courseTransStatsFilter != null">

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/StudentActionStatsMapper.xml

@@ -24,11 +24,13 @@
         <result column="do_exercise_count" jdbcType="INTEGER" property="doExerciseCount"/>
         <result column="do_exercise_correct_count" jdbcType="INTEGER" property="doExerciseCorrectCount"/>
     </resultMap>
+
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
         <include refid="com.orange.demo.statsservice.dao.StudentActionStatsMapper.inputFilterRef"/>
     </sql>
+
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="studentActionStatsFilter != null">

orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/StudentActionTransMapper.xml

@@ -18,11 +18,13 @@
         <result column="exercise_correct_flag" jdbcType="TINYINT" property="exerciseCorrectFlag"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
     </resultMap>
+
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
         <include refid="com.orange.demo.statsservice.dao.StudentActionTransMapper.inputFilterRef"/>
     </sql>
+
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="studentActionTransFilter != null">

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

@@ -1,14 +1,14 @@
 package com.orange.demo.statsservice.model;
 
-import com.orange.demo.courseclassinterface.client.GradeClient;
-import com.orange.demo.courseclassinterface.client.CourseClient;
-import com.orange.demo.courseclassinterface.vo.CourseVo;
-import com.orange.demo.courseclassinterface.vo.GradeVo;
+import com.orange.demo.statsapi.vo.CourseTransStatsVo;
+import com.orange.demo.courseclassapi.vo.CourseVo;
+import com.orange.demo.courseclassapi.client.CourseClient;
+import com.orange.demo.courseclassapi.vo.GradeVo;
+import com.orange.demo.courseclassapi.client.GradeClient;
 import com.orange.demo.application.common.constant.Subject;
 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.statsinterface.vo.CourseTransStatsVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;

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

@@ -1,12 +1,12 @@
 package com.orange.demo.statsservice.model;
 
-import com.orange.demo.courseclassinterface.vo.AreaCodeVo;
-import com.orange.demo.courseclassinterface.client.GradeClient;
-import com.orange.demo.courseclassinterface.client.AreaCodeClient;
-import com.orange.demo.courseclassinterface.vo.GradeVo;
+import com.orange.demo.statsapi.vo.StudentActionStatsVo;
+import com.orange.demo.courseclassapi.vo.AreaCodeVo;
+import com.orange.demo.courseclassapi.vo.GradeVo;
+import com.orange.demo.courseclassapi.client.AreaCodeClient;
+import com.orange.demo.courseclassapi.client.GradeClient;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
-import com.orange.demo.statsinterface.vo.StudentActionStatsVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;

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

@@ -1,15 +1,15 @@
 package com.orange.demo.statsservice.model;
 
-import com.orange.demo.courseclassinterface.client.GradeClient;
-import com.orange.demo.courseclassinterface.client.SchoolInfoClient;
-import com.orange.demo.courseclassinterface.vo.SchoolInfoVo;
-import com.orange.demo.courseclassinterface.vo.GradeVo;
+import com.orange.demo.statsapi.vo.StudentActionTransVo;
+import com.orange.demo.courseclassapi.client.SchoolInfoClient;
+import com.orange.demo.courseclassapi.vo.SchoolInfoVo;
+import com.orange.demo.courseclassapi.vo.GradeVo;
+import com.orange.demo.courseclassapi.client.GradeClient;
 import com.orange.demo.application.common.constant.StudentActionType;
 import com.orange.demo.application.common.constant.DeviceType;
 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.statsinterface.vo.StudentActionTransVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;

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

@@ -7,6 +7,7 @@ import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.object.MyRelationParam;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -77,7 +78,8 @@ public class CourseTransStatsServiceImpl extends BaseService<CourseTransStats, L
     @Override
     public List<CourseTransStats> getCourseTransStatsListWithRelation(CourseTransStats filter, String orderBy) {
         List<CourseTransStats> resultList = courseTransStatsMapper.getCourseTransStatsList(null, null, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 
@@ -97,7 +99,8 @@ public class CourseTransStatsServiceImpl extends BaseService<CourseTransStats, L
             String inFilterField, Set<M> inFilterValues, CourseTransStats filter, String orderBy) {
         List<CourseTransStats> resultList =
                 courseTransStatsMapper.getCourseTransStatsList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
     }
 
@@ -115,9 +118,10 @@ public class CourseTransStatsServiceImpl extends BaseService<CourseTransStats, L
             CourseTransStats filter, String groupSelect, String groupBy, String orderBy) {
         List<CourseTransStats> resultList =
                 courseTransStatsMapper.getGroupedCourseTransStatsList(filter, groupSelect, groupBy, orderBy);
+        int batchSize = resultList instanceof Page ? 0 : 1000;
         // NOTE: 这里只是包含了本地关联数据和远程关联数据，本地聚合计算数据和远程聚合计算数据没有包含。
         // 主要原因是，由于聚合字段通常被视为普通字段使用，不会在group by的从句中出现，语义上也不会在此关联。
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 }

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

@@ -7,6 +7,7 @@ import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.object.MyRelationParam;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -77,7 +78,8 @@ public class StudentActionStatsServiceImpl extends BaseService<StudentActionStat
     @Override
     public List<StudentActionStats> getStudentActionStatsListWithRelation(StudentActionStats filter, String orderBy) {
         List<StudentActionStats> resultList = studentActionStatsMapper.getStudentActionStatsList(null, null, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 
@@ -97,7 +99,8 @@ public class StudentActionStatsServiceImpl extends BaseService<StudentActionStat
             String inFilterField, Set<M> inFilterValues, StudentActionStats filter, String orderBy) {
         List<StudentActionStats> resultList =
                 studentActionStatsMapper.getStudentActionStatsList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
     }
 
@@ -115,9 +118,10 @@ public class StudentActionStatsServiceImpl extends BaseService<StudentActionStat
             StudentActionStats filter, String groupSelect, String groupBy, String orderBy) {
         List<StudentActionStats> resultList =
                 studentActionStatsMapper.getGroupedStudentActionStatsList(filter, groupSelect, groupBy, orderBy);
+        int batchSize = resultList instanceof Page ? 0 : 1000;
         // NOTE: 这里只是包含了本地关联数据和远程关联数据，本地聚合计算数据和远程聚合计算数据没有包含。
         // 主要原因是，由于聚合字段通常被视为普通字段使用，不会在group by的从句中出现，语义上也不会在此关联。
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 }

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

@@ -3,7 +3,7 @@ package com.orange.demo.statsservice.service.impl;
 import com.orange.demo.statsservice.service.*;
 import com.orange.demo.statsservice.dao.*;
 import com.orange.demo.statsservice.model.*;
-import com.orange.demo.courseclassinterface.client.*;
+import com.orange.demo.courseclassapi.client.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.object.MyRelationParam;
 import com.orange.demo.common.core.object.ResponseResult;
@@ -11,6 +11,7 @@ import com.orange.demo.common.core.object.CallResult;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -131,7 +132,8 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
     @Override
     public List<StudentActionTrans> getStudentActionTransListWithRelation(StudentActionTrans filter, String orderBy) {
         List<StudentActionTrans> resultList = studentActionTransMapper.getStudentActionTransList(null, null, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 
@@ -151,7 +153,8 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
             String inFilterField, Set<M> inFilterValues, StudentActionTrans filter, String orderBy) {
         List<StudentActionTrans> resultList =
                 studentActionTransMapper.getStudentActionTransList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
     }
 

orange-demo-multi-service/application/stats/stats-service/src/main/resources/log4j2.xml

@@ -23,7 +23,7 @@
         </property>
         <property name="LOG_PATTERN_EX">
             <!-- 下面注释中 %X{PtxId}, SpanId: %X{PspanId} 为PinPoint 中的traceid -->
-            [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] 请求Id[%X{traceId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
+            [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] T:[%X{traceId}] S:[%X{sessionId}] U:[%X{userId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
         </property>
         <!-- 日志保留天数 -->
         <property name="EVERY_FILE_COUNT">31</property>

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

@@ -20,8 +20,26 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="stats-interface" />
+    <orderEntry type="module" module-name="stats-api" />
     <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-spring-boot-autoconfigure:2.0.5" 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-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" 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-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" 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-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.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.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="module" module-name="course-class-api" />
     <orderEntry type="module" module-name="common-core" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.5.RELEASE" level="project" />
@@ -37,6 +55,7 @@
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
@@ -53,12 +72,14 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.5" level="project" />
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
     <orderEntry type="library" name="Maven: com.github.ben-manes.caffeine:caffeine:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: cn.jimmyshi:bean-query:1.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
@@ -69,6 +90,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
@@ -89,24 +111,6 @@
     <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-spring-boot-autoconfigure:2.0.5" 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-annotations:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" 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-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" 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-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.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.springfox:springfox-bean-validators:2.9.2" level="project" />
-    <orderEntry type="module" module-name="course-class-interface" />
     <orderEntry type="module" module-name="common-redis" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.7.0" level="project" />
@@ -127,7 +131,6 @@
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
@@ -151,7 +154,6 @@
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
@@ -187,13 +189,11 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />

orange-demo-multi-service/application/upms/pom.xml

@@ -12,7 +12,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>upms-interface</module>
+        <module>upms-api</module>
         <module>upms-service</module>
     </modules>
 </project>

orange-demo-multi-service/application/upms/upms-api/pom.xml

@@ -8,9 +8,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>upms-interface</artifactId>
+    <artifactId>upms-api</artifactId>
     <version>1.0.0</version>
-    <name>upms-interface</name>
+    <name>upms-api</name>
     <packaging>jar</packaging>
 
     <dependencies>

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/client/SysUserClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.upmsinterface.client;
+package com.orange.demo.upmsapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.upmsinterface.dto.SysUserDto;
-import com.orange.demo.upmsinterface.vo.SysUserVo;
+import com.orange.demo.upmsapi.dto.SysUserDto;
+import com.orange.demo.upmsapi.vo.SysUserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface SysUserClient extends BaseClient<SysUserDto, SysUserVo, Long> {
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/sysUser/delete")
-    ResponseResult<Void> delete(@RequestParam("userId") Long userId);
+    @PostMapping("/sysUser/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("userId") Long userId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysMenuType.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysPermCodeType.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysPermModuleType.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysUserStatus.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysUserType.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysMenuDto.java

@@ -1,8 +1,8 @@
-package com.orange.demo.upmsinterface.dto;
+package com.orange.demo.upmsapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.validator.ConstDictRef;
-import com.orange.demo.upmsinterface.constant.SysMenuType;
+import com.orange.demo.upmsapi.constant.SysMenuType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysPermCodeDto.java

@@ -1,8 +1,8 @@
-package com.orange.demo.upmsinterface.dto;
+package com.orange.demo.upmsapi.dto;
 
 import com.orange.demo.common.core.validator.ConstDictRef;
 import com.orange.demo.common.core.validator.UpdateGroup;
-import com.orange.demo.upmsinterface.constant.SysPermCodeType;
+import com.orange.demo.upmsapi.constant.SysPermCodeType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;