配置修改

.flattened-pom.xml

@@ -15,12 +15,16 @@
     <module>cdm-server</module>
     <module>cdm-module-system</module>
     <module>cdm-module-infra</module>
+    <module>cdm-module-member</module>
+    <module>cdm-module-report</module>
+    <module>cdm-module-pay</module>
+    <module>cdm-module-mall</module>
   </modules>
   <properties>
     <lombok.version>1.18.30</lombok.version>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-    <java.version>1.8</java.version>
+    <java.version>17</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>

cdm-dependencies/.flattened-pom.xml

@@ -202,8 +202,8 @@
         <version>${redisson.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
+            <groupId>org.springframework.boot</groupId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -238,8 +238,8 @@
         <version>${lock4j.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
+            <groupId>org.redisson</groupId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -294,8 +294,8 @@
         <version>${spring-boot-admin.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-server-cloud</artifactId>
+            <groupId>de.codecentric</groupId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -321,12 +321,12 @@
         <version>${spring.boot.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
+            <groupId>org.ow2.asm</groupId>
           </exclusion>
           <exclusion>
-            <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <groupId>org.mockito</groupId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -421,12 +421,12 @@
         <version>${screw.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
+            <groupId>org.freemarker</groupId>
           </exclusion>
           <exclusion>
-            <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
+            <groupId>com.alibaba</groupId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -496,12 +496,12 @@
         <version>${aliyun-java-sdk-core.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>io.opentracing</groupId>
             <artifactId>opentracing-api</artifactId>
+            <groupId>io.opentracing</groupId>
           </exclusion>
           <exclusion>
-            <groupId>io.opentracing</groupId>
             <artifactId>opentracing-util</artifactId>
+            <groupId>io.opentracing</groupId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -521,8 +521,8 @@
         <version>${justauth.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
+            <groupId>cn.hutool</groupId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -547,8 +547,8 @@
         <version>${jimureport.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
+            <groupId>com.alibaba</groupId>
           </exclusion>
         </exclusions>
       </dependency>

cdm-framework/cdm-spring-boot-starter-biz-pay/.flattened-pom.xml

@@ -45,8 +45,8 @@
       <version>4.35.79.ALL</version>
       <exclusions>
         <exclusion>
-          <groupId>org.bouncycastle</groupId>
           <artifactId>bcprov-jdk15on</artifactId>
+          <groupId>org.bouncycastle</groupId>
         </exclusion>
       </exclusions>
     </dependency>

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/article/ArticleCategoryConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:55+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class ArticleCategoryConvertImpl implements ArticleCategoryConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/article/ArticleConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:31+0800",
+    date = "2023-12-26T00:29:55+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class ArticleConvertImpl implements ArticleConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/banner/BannerConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BannerConvertImpl implements BannerConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/bargain/BargainActivityConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BargainActivityConvertImpl implements BargainActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/bargain/BargainHelpConvertImpl.java

@@ -10,7 +10,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BargainHelpConvertImpl implements BargainHelpConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/bargain/BargainRecordConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:55+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BargainRecordConvertImpl implements BargainRecordConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/combination/CombinationActivityConvertImpl.java

@@ -21,7 +21,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:55+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class CombinationActivityConvertImpl implements CombinationActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/coupon/CouponConvertImpl.java

@@ -15,7 +15,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:31+0800",
+    date = "2023-12-26T00:29:55+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class CouponConvertImpl implements CouponConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/coupon/CouponTemplateConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:55+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class CouponTemplateConvertImpl implements CouponTemplateConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/decorate/DecorateComponentConvertImpl.java

@@ -10,7 +10,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DecorateComponentConvertImpl implements DecorateComponentConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/discount/DiscountActivityConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DiscountActivityConvertImpl implements DiscountActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/diy/DiyPageConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DiyPageConvertImpl implements DiyPageConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/diy/DiyTemplateConvertImpl.java

@@ -16,7 +16,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DiyTemplateConvertImpl implements DiyTemplateConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/reward/RewardActivityConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:31+0800",
+    date = "2023-12-26T00:29:55+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class RewardActivityConvertImpl implements RewardActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvertImpl.java

@@ -18,7 +18,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class SeckillActivityConvertImpl implements SeckillActivityConvert {

cdm-module-mall/cdm-module-promotion-biz/target/generated-sources/annotations/com/cdm/module/promotion/convert/seckill/seckillconfig/SeckillConfigConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:32+0800",
+    date = "2023-12-26T00:29:54+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class SeckillConfigConvertImpl implements SeckillConfigConvert {

cdm-module-mall/cdm-module-statistics-biz/target/generated-sources/annotations/com/cdm/module/statistics/convert/member/MemberStatisticsConvertImpl.java

@@ -9,7 +9,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:18+0800",
+    date = "2023-12-26T00:30:39+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class MemberStatisticsConvertImpl implements MemberStatisticsConvert {

cdm-module-mall/cdm-module-statistics-biz/target/generated-sources/annotations/com/cdm/module/statistics/convert/pay/PayStatisticsConvertImpl.java

@@ -5,7 +5,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:18+0800",
+    date = "2023-12-26T00:30:39+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class PayStatisticsConvertImpl implements PayStatisticsConvert {

cdm-module-mall/cdm-module-statistics-biz/target/generated-sources/annotations/com/cdm/module/statistics/convert/trade/TradeStatisticsConvertImpl.java

@@ -16,7 +16,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:18+0800",
+    date = "2023-12-26T00:30:39+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeStatisticsConvertImpl implements TradeStatisticsConvert {

cdm-module-mall/cdm-module-trade-biz/src/main/java/com/cdm/module/trade/service/aftersale/AfterSaleLogServiceImpl.java

@@ -4,6 +4,8 @@ import com.cdm.module.trade.convert.aftersale.AfterSaleLogConvert;
 import com.cdm.module.trade.dal.dataobject.aftersale.AfterSaleLogDO;
 import com.cdm.module.trade.dal.mysql.aftersale.AfterSaleLogMapper;
 import com.cdm.module.trade.service.aftersale.bo.AfterSaleLogCreateReqBO;
+import org.redisson.api.RedissonClient;
+import org.redisson.client.RedisClient;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -21,6 +23,8 @@ public class AfterSaleLogServiceImpl implements AfterSaleLogService {
 
     @Resource
     private AfterSaleLogMapper afterSaleLogMapper;
+    @Resource
+    private RedissonClient redisClient;
 
     @Override
     public void createAfterSaleLog(AfterSaleLogCreateReqBO createReqBO) {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/aftersale/AfterSaleConvertImpl.java

@@ -24,7 +24,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:57+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class AfterSaleConvertImpl implements AfterSaleConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/aftersale/AfterSaleLogConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:55+0800",
+    date = "2023-12-26T00:30:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class AfterSaleLogConvertImpl implements AfterSaleLogConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/brokerage/BrokerageRecordConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:56+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BrokerageRecordConvertImpl implements BrokerageRecordConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/brokerage/BrokerageUserConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:56+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BrokerageUserConvertImpl implements BrokerageUserConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/brokerage/BrokerageWithdrawConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:13+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class BrokerageWithdrawConvertImpl implements BrokerageWithdrawConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/cart/TradeCartConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:57+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeCartConvertImpl implements TradeCartConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/config/TradeConfigConvertImpl.java

@@ -10,7 +10,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:57+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeConfigConvertImpl implements TradeConfigConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/delivery/DeliveryExpressConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:57+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DeliveryExpressConvertImpl implements DeliveryExpressConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/delivery/DeliveryExpressTemplateConvertImpl.java

@@ -18,7 +18,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:57+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DeliveryExpressTemplateConvertImpl implements DeliveryExpressTemplateConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/delivery/DeliveryPickUpStoreConvertImpl.java

@@ -13,7 +13,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:57+0800",
+    date = "2023-12-26T00:30:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class DeliveryPickUpStoreConvertImpl implements DeliveryPickUpStoreConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/order/TradeOrderConvertImpl.java

@@ -34,7 +34,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:14+0800",
+    date = "2023-12-26T00:30:23+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeOrderConvertImpl implements TradeOrderConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/convert/order/TradeOrderLogConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:57+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TradeOrderLogConvertImpl implements TradeOrderLogConvert {

cdm-module-mall/cdm-module-trade-biz/target/generated-sources/annotations/com/cdm/module/trade/framework/delivery/core/client/convert/ExpressQueryConvertImpl.java

@@ -12,7 +12,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:56:56+0800",
+    date = "2023-12-26T00:30:24+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class ExpressQueryConvertImpl implements ExpressQueryConvert {

cdm-module-report/cdm-module-report-biz/target/generated-sources/annotations/com/cdm/module/report/convert/goview/GoViewProjectConvertImpl.java

@@ -11,7 +11,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:57:23+0800",
+    date = "2023-12-26T00:29:14+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class GoViewProjectConvertImpl implements GoViewProjectConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/auth/AuthConvertImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:51:32+0800",
+    date = "2023-12-26T00:28:16+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class AuthConvertImpl implements AuthConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/ip/AreaConvertImpl.java

@@ -9,7 +9,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:51:32+0800",
+    date = "2023-12-26T00:28:16+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class AreaConvertImpl implements AreaConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/logger/OperateLogConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:51:41+0800",
+    date = "2023-12-26T00:28:17+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class OperateLogConvertImpl implements OperateLogConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/mail/MailAccountConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:51:32+0800",
+    date = "2023-12-26T00:28:17+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class MailAccountConvertImpl implements MailAccountConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/oauth2/OAuth2OpenConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:51:41+0800",
+    date = "2023-12-26T00:28:17+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class OAuth2OpenConvertImpl implements OAuth2OpenConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/social/SocialUserConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:51:31+0800",
+    date = "2023-12-26T00:28:16+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class SocialUserConvertImpl implements SocialUserConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/tenant/TenantConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:51:32+0800",
+    date = "2023-12-26T00:28:16+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class TenantConvertImpl implements TenantConvert {

cdm-module-system/cdm-module-system-biz/target/generated-sources/annotations/com/cdm/module/system/convert/user/UserConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-21T17:51:41+0800",
+    date = "2023-12-26T00:28:17+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.3 (JetBrains s.r.o.)"
 )
 public class UserConvertImpl implements UserConvert {

cdm-server/src/main/resources/application-dev.yaml

@@ -48,7 +48,7 @@ spring:
       primary: master
       datasource:
         master:
-          name: crm
+          name: shop
           url: jdbc:mysql://${db.url}:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8&autoReconnect=true&nullCatalogMeansCurrent=true&zeroDateTimeBehavior=convertToNull # MySQL Connector/J 8.X 连接的示例
           username: ${db.username}
           password: ${db.password}

cdm-server/src/main/resources/application-local.yaml

@@ -52,7 +52,7 @@ spring:
       primary: master
       datasource:
         master:
-          name: crm
+          name: shop
           url: jdbc:mysql://${db.url}:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8&autoReconnect=true&nullCatalogMeansCurrent=true&zeroDateTimeBehavior=convertToNull # MySQL Connector/J 8.X 连接的示例
           username: ${db.username}
           password: ${db.password}

cdm-server/src/main/resources/application-prod.yaml

@@ -48,7 +48,7 @@ spring:
       primary: master
       datasource:
         master:
-          name: crm
+          name: shop
           url: jdbc:mysql://${db.url}:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8&autoReconnect=true&nullCatalogMeansCurrent=true&zeroDateTimeBehavior=convertToNull # MySQL Connector/J 8.X 连接的示例
           username: ${db.username}
           password: ${db.password}