Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamAddressesService.java

 package com.liquidnet.service.adam.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
+import com.liquidnet.service.adam.entity.AdamAddresses;
 
 /**
  * <p>
@@ -11,7 +13,7 @@ import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
  * @author liquidnet
  * @since 2021-05-11
  */
-public interface IAdamAddressesService {
+public interface IAdamAddressesService extends IService<AdamAddresses> {
 
     String add(AdamAddressesParam parameter);
 

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java

 package com.liquidnet.service.adam.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
+import com.liquidnet.service.adam.entity.AdamCollection;
 
 /**
  * <p>
@@ -12,7 +14,7 @@ import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
  * @author liquidnet
  * @since 2021-05-10
  */
-public interface IAdamCollectionService {
+public interface IAdamCollectionService extends IService<AdamCollection> {
 
     void add(AdamCollectBaseVo collectVo);
 

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamDisposedService.java

 package com.liquidnet.service.adam.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
+import com.liquidnet.service.adam.entity.AdamDisposed;
 
 /**
  * <p>
@@ -13,7 +15,7 @@ import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
  * @author liquidnet
  * @since 2021-05-18
  */
-public interface IAdamDisposedService {
+public interface IAdamDisposedService extends IService<AdamDisposed> {
 
     void add(AdamDisposedBaseVo disposedBaseVo);
 

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamEntersService.java

 package com.liquidnet.service.adam.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.adam.entity.AdamEnters;
 
 /**
  * <p>
@@ -11,7 +13,7 @@ import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
  * @author liquidnet
  * @since 2021-04-28
  */
-public interface IAdamEntersService {
+public interface IAdamEntersService extends IService<AdamEnters> {
     String add(AdamEntersParam parameter);
 
     void def(String uid, String entersId);

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamMemberCodeService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamMemberCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-06-23
+ */
+public interface IAdamMemberCodeService extends IService<AdamMemberCode> {
+
+}

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamMemberOrderService.java

@@ -7,12 +7,9 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderSimpleVo;
-import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 import com.liquidnet.service.base.ResponseDto;
 
-import java.util.List;
-
 /**
  * 对客户端API接口
  */

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamThirdPartyService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamThirdParty;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户第三方账号信息 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-06-23
+ */
+public interface IAdamThirdPartyService extends IService<AdamThirdParty> {
+
+}

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserService.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-10
  */
-public interface IAdamUserService {
+public interface IAdamUserService extends IService<AdamUser> {
 
     /**
      * 手机号注册

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -103,6 +103,7 @@ public class KylinOrderTicketVo implements Serializable {
 
     private Integer isTrueName;
     private String noticeImage;
+    private String notice;
     private Integer ticketType;
     private String fieldName;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ liquidnet:
     context:
     name: liquidnet-client-admin-web
   logfile:
-    path: ./logs
+    path: /data/logs
     name: client-admin-web
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ liquidnet:
     context:
     name: liquidnet-client-admin-web
   logfile:
-    path: ./logs
+    path: /data/logs
     name: client-admin-web
     config: classpath:logback-spring.xml
     file-max-size: 200MB
@@ -15,34 +15,46 @@ liquidnet:
     level-root: info
   mysql:
     master:
-      urlHostAndPort: 39.106.122.201:3308
-      username: testmall
-      password: zhengzai!mYT
+      urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306
+      username: zhengzai
+      password: $hAh4SGcDQ
       database-name: test_ln_scene
     slave:
-      urlHostAndPort: 39.106.122.201:3308
-      username: testmall
-      password: zhengzai!mYT
+      urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306
+      username: zhengzai
+      password: $hAh4SGcDQ
       database-name: test_ln_scene
+  mongodb:
+    host: s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
+    port: 3717
+    user: root
+    pwd: $hAh4SGcDQ
+    sslEnabled: false
+    database: test_ln_scene
+  redis:
+    host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+    #    host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
+    port: 6380
+    password: PO@B!Iud32
   url-refund:
-    apply: "http://pay.zhengzai.tv/refund/single"
-    notify: "https://kylin.zhengzai.tv/kylin/refund/callback"
+    apply: "http://testpay.zhengzai.tv/refund/single"
+    notify: "https://testkylin.zhengzai.tv/kylin/refund/callback"
   url-banner:
-    provinces: "https://service.zhengzai.tv/provinces" #省份
-    url1: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
-    url2: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
-    url5: "https://mall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
+    provinces: "https://testservice.zhengzai.tv/provinces" #省份
+    url1: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
+    url2: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
+    url5: "https://testmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
     url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
-    url7: "https://mall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
-    url8: "https://kylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
-    url13: "https://mall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
-    url14: "https://mall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
-    url20: "https://merchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
-    url21: "https://merchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
-    url22: "https://merchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
-    url23: "https://mediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
-    url24: "https://merchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
-    url26: "https://passport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
+    url7: "https://testmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
+    url8: "https://testkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
+    url13: "https://testmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
+    url14: "https://testmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
+    url20: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
+    url21: "https://testmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
+    url22: "https://testmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
+    url23: "https://testmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
+    url24: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
+    url26: "https://testpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
   al-oss:
     imgUrl: "https://img.zhengzai.tv/"
     endpoint: http://oss-cn-hangzhou.aliyuncs.com

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml

@@ -5,7 +5,7 @@ liquidnet:
     context:
     name: liquidnet-client-admin-web
   logfile:
-    path: ./logs
+    path: /data/logs
     name: client-admin-web
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 127.0.0.1:7001
+    host: 172.17.192.65:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
         context:
         name: liquidnet-client-admin-web
     logfile:
-        path: ./logs
+        path: /data/logs
         name: client-admin-web
         config: classpath:logback-spring.xml
         file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-dev.yml

@@ -5,6 +5,6 @@ liquidnet:
     port: 8090
   logfile:
     name: client-job
-    path: ./logs
+    path: /data/logs
   mysql:
     database-name: dev_ln_clijob
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-test.yml

@@ -5,6 +5,6 @@ liquidnet:
     port: 8090
   logfile:
     name: client-job
-    path: ./logs
+    path: /data/logs
   mysql:
     database-name: test_ln_clijob
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-account-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-account
     name: liquidnet-service-account
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-account
   mysql:
     database-name: liquidnet_wac

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -7,13 +7,10 @@ liquidnet:
     context: /adam
     name: liquidnet-service-adam
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-adam
     config: classpath:logback-spring.xml
     file-max-size: 200MB
-    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
   rabbitmq:
     connection-timeout: 5000

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -7,13 +7,10 @@ liquidnet:
     context: /adam
     name: liquidnet-service-adam
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-adam
     config: classpath:logback-spring.xml
     file-max-size: 200MB
-    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
   rabbitmq:
     connection-timeout: 3000

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -22,13 +22,13 @@ logging:
 #  config: ${liquidnet.logfile.config}
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: 200MB
+    max-size: ${liquidnet.logfile.file-max-size}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
-    root: info
+    root: ${liquidnet.logfile.level}
     #以下是为指定包设置日志级别
     com.liquidnet: ${liquidnet.logfile.level}
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-bank-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-bank
     name: liquidnet-service-bank
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-bank
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-dev.yml

@@ -8,7 +8,7 @@ liquidnet:
 #    context: /service-consumer
     name: liquidnet-service-consumer
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-consumer
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-test.yml

@@ -8,7 +8,7 @@ liquidnet:
 #    context: /service-consumer
     name: liquidnet-service-consumer
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-consumer
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-service-example-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-example
     name: liquidnet-service-example
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-example
   mysql:
     database-name: liquidnet_bus

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-executor-main
     name: liquidnet-service-executor-main
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-executor-main
   xxl:
     accessToken: qk52rqSejRBm9enf6BTTxw==
@@ -20,4 +20,4 @@ liquidnet:
       # Job执行器心跳注册分组依据，按需配置
       appname: liquidnet-service-executor
       # Job执行器运行日志，注意目录读写权限
-      logpath: ./logs/job
+      logpath: /data/logs/job

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-test.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-executor-main
     name: liquidnet-service-executor-main
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-executor-main
   xxl:
     accessToken: qk52rqSejRBm9enf6BTTxw==
@@ -20,4 +20,4 @@ liquidnet:
       # Job执行器心跳注册分组依据，按需配置
       appname: liquidnet-service-executor
       # Job执行器运行日志，注意目录读写权限
-      logpath: ./logs/job
+      logpath: /data/logs/job

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -7,14 +7,14 @@ liquidnet:
     context: /kylin
     name: liquidnet-service-kylin
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-kylin
     config: classpath:logback-spring.xml
     file-max-size: 200MB
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level-root: info
+    level: info
   rabbitmq:
     connection-timeout: 5000
   mysql:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -7,14 +7,14 @@ liquidnet:
     context: /kylin
     name: liquidnet-service-kylin
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-kylin
     config: classpath:logback-spring.xml
     file-max-size: 200MB
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level-root: info
+    level: info
   rabbitmq:
     connection-timeout: 3000
   mysql:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -22,16 +22,16 @@ logging:
 #  config: ${liquidnet.logfile.config}
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: 200MB
+    max-size: ${liquidnet.logfile.file-max-size}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
-    root: info
+    root: ${liquidnet.logfile.level}
     #以下是为指定包设置日志级别
     com:
-      liquidnet: debug
+      liquidnet: ${liquidnet.logfile.level}
 # -----------------------------------------------------------
 eureka:
 #  client:

liquidnet-bus-config/liquidnet-config/liquidnet-service-reconciliation-dev.yml

@@ -5,7 +5,7 @@ liquidnet:
     context: /service-reconciliation
     name: liquidnet-service-reconciliation
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-reconciliation
   mysql:
     main-db:

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul-dev.yml

@@ -3,6 +3,6 @@ liquidnet:
     port: 7003
     name: liquidnet-support-zuul
   logfile:
-    path: ./logs
+    path: /data/logs
     name: support-zuul
     level: debug

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul-test.yml

@@ -3,7 +3,7 @@ liquidnet:
     port: 80
     name: liquidnet-support-zuul
   logfile:
-    path: ./logs
+    path: /data/logs
     name: support-zuul
     level: debug
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -198,7 +198,7 @@
         FROM kylin_order_tickets AS ot
         LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
         LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
-        WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -pay_countdown_minute MINUTE)
+        WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -(pay_countdown_minute+1) MINUTE)
         <if test="userId!=''">
             AND user_id = #{userId}
         </if>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.common.mq.constant.MQConst;
-import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.commons.lang.util.BsonUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
-import com.liquidnet.service.adam.service.IAdamAddressesService;
+import com.liquidnet.service.adam.entity.AdamAddresses;
+import com.liquidnet.service.adam.mapper.AdamAddressesMapper;
 import com.liquidnet.service.adam.service.AdamRdmService;
+import com.liquidnet.service.adam.service.IAdamAddressesService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
@@ -39,7 +45,7 @@ import java.util.stream.IntStream;
  */
 @Slf4j
 @Service
-public class AdamAddressesServiceImpl implements IAdamAddressesService {
+public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, AdamAddresses> implements IAdamAddressesService {
     @Autowired
     MongoConverter mongoConverter;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
-import com.liquidnet.service.adam.service.IAdamCollectionService;
+import com.liquidnet.service.adam.entity.AdamCollection;
+import com.liquidnet.service.adam.mapper.AdamCollectionMapper;
 import com.liquidnet.service.adam.service.AdamRdmService;
-import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.adam.service.IAdamCollectionService;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
-import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -41,7 +40,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class AdamCollectionServiceImpl implements IAdamCollectionService {
+public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper, AdamCollection> implements IAdamCollectionService {
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.mq.constant.MQConst;
-import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
-import com.liquidnet.service.adam.service.IAdamDisposedService;
+import com.liquidnet.service.adam.entity.AdamDisposed;
+import com.liquidnet.service.adam.mapper.AdamDisposedMapper;
 import com.liquidnet.service.adam.service.AdamRdmService;
-import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.adam.service.IAdamDisposedService;
 import com.liquidnet.service.base.SqlMapping;
-import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
-import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -42,7 +39,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class AdamDisposedServiceImpl implements IAdamDisposedService {
+public class AdamDisposedServiceImpl extends ServiceImpl<AdamDisposedMapper, AdamDisposed> implements IAdamDisposedService {
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.adam.entity.AdamEnters;
+import com.liquidnet.service.adam.mapper.AdamEntersMapper;
 import com.liquidnet.service.adam.service.IAdamEntersService;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.base.ErrorMapping;
@@ -42,7 +45,7 @@ import java.util.stream.IntStream;
  */
 @Slf4j
 @Service
-public class AdamEntersServiceImpl implements IAdamEntersService {
+public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnters> implements IAdamEntersService {
     @Autowired
     Environment env;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberCodeServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamMemberCode;
+import com.liquidnet.service.adam.mapper.AdamMemberCodeMapper;
+import com.liquidnet.service.adam.service.IAdamMemberCodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-06-23
+ */
+@Service
+public class AdamMemberCodeServiceImpl extends ServiceImpl<AdamMemberCodeMapper, AdamMemberCode> implements IAdamMemberCodeService {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamThirdPartyServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamThirdParty;
+import com.liquidnet.service.adam.mapper.AdamThirdPartyMapper;
+import com.liquidnet.service.adam.service.IAdamThirdPartyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户第三方账号信息 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-06-23
+ */
+@Service
+public class AdamThirdPartyServiceImpl extends ServiceImpl<AdamThirdPartyMapper, AdamThirdParty> implements IAdamThirdPartyService {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.common.mq.constant.MQConst;
@@ -12,6 +13,8 @@ import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.entity.AdamRealName;
+import com.liquidnet.service.adam.entity.AdamUser;
+import com.liquidnet.service.adam.mapper.AdamUserMapper;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamEntersService;
 import com.liquidnet.service.adam.service.IAdamRealNameService;
@@ -55,7 +58,7 @@ import static com.liquidnet.service.adam.constant.AdamRedisConst.LOCK_KEY_UREGIS
  */
 @Slf4j
 @Service
-public class AdamUserServiceImpl implements IAdamUserService {
+public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> implements IAdamUserService {
     @Autowired
     Environment env;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMAddressesProcessor.java

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
-import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamAddresses;
-import com.liquidnet.service.adam.mapper.AdamAddressesMapper;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
+import com.liquidnet.service.adam.service.IAdamAddressesService;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Service
 public class DMAddressesProcessor extends DataMigrationProcessorService {
     @Autowired
-    MongoTemplate mongoTemplate;
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    AdamAddressesMapper addressesMapper;
+    IAdamAddressesService adamAddressesService;
 
     @SneakyThrows
     @Override
     protected void dataProcessing() {
         HttpServletRequest request = ServletUtils.getRequest();
-        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        String lS = request.getParameter(DM_LS), flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
 
-            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from addresses where 1=1";
@@ -55,16 +51,19 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
-        log.info("DM数据迁移总数:{}", ct);
-
+        int ct = row.getInt(1), pSize = 1000, num = 0;
+        log.info("DM.execute.counts:{}", ct);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            statement.setInt(1, pSize * num);
+            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
-            log.info("DM.execute.limit:[pNo:{},pSize:{}]", pSize * num, pSize);
+            log.info("DM.execute.limit {},{} ==> begin", ls, pSize);
+
+            List<AdamAddresses> addressesList = new ArrayList<>();
+            List<AdamAddressesVo> vos = new ArrayList<>();
             while (row.next()) {
                 String uid = row.getString(2);
 
@@ -84,11 +83,17 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
 
                     AdamAddressesVo vo = AdamAddressesVo.getNew().copy(addresses);
 
-                    addressesMapper.insert(addresses);
-                    mongoTemplate.insert(vo, AdamAddressesVo.class.getSimpleName());
+//                    addressesMapper.insert(addresses);
+//                    mongoTemplate.insert(vo, AdamAddressesVo.class.getSimpleName());
+                    addressesList.add(addresses);
+                    vos.add(vo);
                 }
             }
-            
+            log.info("DM.execute.limit {},{} ==> handle.counts:{}", ls, pSize, addressesList.size());
+            if (!CollectionUtils.isEmpty(addressesList)) {
+                mongoTemplate.insert(vos, AdamAddressesVo.class.getSimpleName());
+                log.info("DM.execute.result:{}", adamAddressesService.saveBatch(addressesList));
+            }
 
             num++;
             ct -= pSize;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMEntersProcessor.java

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
-import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.entity.AdamEnters;
-import com.liquidnet.service.adam.mapper.AdamEntersMapper;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
+import com.liquidnet.service.adam.service.IAdamEntersService;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Service
 public class DMEntersProcessor extends DataMigrationProcessorService {
     @Autowired
-    MongoTemplate mongoTemplate;
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    AdamEntersMapper entersMapper;
+    IAdamEntersService adamEntersService;
 
     @SneakyThrows
     @Override
     protected void dataProcessing() {
         HttpServletRequest request = ServletUtils.getRequest();
-        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        String lS = request.getParameter(DM_LS), flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
 
-            log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from enters where (type <> 1 or (type = 1 and is_certification = 'yes'))";
@@ -56,15 +52,19 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
         int ct = row.getInt(1), pSize = 1000, num = 0;
-        log.info("DM数据迁移总数:{}", ct);
+        log.info("DM.execute.counts:{}", ct);
 
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            statement.setInt(1, pSize * num);
+            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
-            log.info("DM.execute.limit:[pNo:{},pSize:{}]", pSize * num, pSize);
+            log.info("DM.execute.limit {},{} ==> begin", ls, pSize);
+
+            List<AdamEnters> entersList = new ArrayList<>();
+            List<AdamEntersVo> vos = new ArrayList<>();
             while (row.next()) {
                 String uid = row.getString(2);
 
@@ -82,11 +82,17 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 
                     AdamEntersVo vo = AdamEntersVo.getNew().copy(enters);
 
-                    entersMapper.insert(enters);
-                    mongoTemplate.insert(vo, AdamEntersVo.class.getSimpleName());
+//                    entersMapper.insert(enters);
+//                    mongoTemplate.insert(vo, AdamEntersVo.class.getSimpleName());
+                    entersList.add(enters);
+                    vos.add(vo);
                 }
             }
-            
+            log.info("DM.execute.limit {},{} ==> handle.counts:{}", ls, pSize, entersList.size());
+            if (!CollectionUtils.isEmpty(entersList)) {
+                mongoTemplate.insert(vos, AdamEntersVo.class.getSimpleName());
+                log.info("DM.execute.result:{}", adamEntersService.saveBatch(entersList));
+            }
 
             num++;
             ct -= pSize;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMMemberOrderProcessor.java

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
-import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
+import com.liquidnet.service.adam.service.IAdamMemberOrderService;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
 @Service
 public class DMMemberOrderProcessor extends DataMigrationProcessorService {
     @Autowired
-    MongoTemplate mongoTemplate;
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    AdamMemberOrderMapper memberOrderMapper;
+    IAdamMemberOrderService adamMemberOrderService;
 
     public static final String MEMBER_NAME = "摩登天空会员";
     public static final String MEMBER_ID = "1";
@@ -58,11 +55,11 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
     @Override
     protected void dataProcessing() {
         HttpServletRequest request = ServletUtils.getRequest();
-        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        String lS = request.getParameter(DM_LS), flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_member_order"));
 
-            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberOrder.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamMemberOrder.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_vip_card_orders where status in (1,5)";
@@ -82,15 +79,19 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
         int ct = row.getInt(1), pSize = 1000, num = 0;
-        log.info("DM数据迁移总数:{}", ct);
+        log.info("DM.execute.counts:{}", ct);
 
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            statement.setInt(1, pSize * num);
+            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
-            log.info("DM.execute.limit:[pNo:{},pSize:{}]", pSize * num, pSize);
+            log.info("DM.execute.limit {},{} ==> begin", ls, pSize);
+
+            List<AdamMemberOrder> memberOrderList = new ArrayList<>();
+            List<AdamMemberOrderVo> vos = new ArrayList<>();
             while (row.next()) {
                 String uid = row.getString(1);
 
@@ -121,12 +122,17 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
 
                     AdamMemberOrderVo vo = AdamMemberOrderVo.getNew().copy(memberOrder);
 
-                    memberOrderMapper.insert(memberOrder);
-
-                    mongoTemplate.insert(vo, AdamMemberOrderVo.class.getSimpleName());
+//                    memberOrderMapper.insert(memberOrder);
+//                    mongoTemplate.insert(vo, AdamMemberOrderVo.class.getSimpleName());
+                    memberOrderList.add(memberOrder);
+                    vos.add(vo);
                 }
             }
-
+            log.info("DM.execute.limit {},{} ==> handle.counts:{}", ls, pSize, memberOrderList.size());
+            if (!CollectionUtils.isEmpty(memberOrderList)) {
+                mongoTemplate.insert(vos, AdamMemberOrderVo.class.getSimpleName());
+                log.info("DM.execute.result:{}", adamMemberOrderService.saveBatch(memberOrderList));
+            }
 
             num++;
             ct -= pSize;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMRealNameProcessor.java

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.entity.AdamRealName;
-import com.liquidnet.service.adam.mapper.AdamRealNameMapper;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
+import com.liquidnet.service.adam.service.IAdamRealNameService;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Service
 public class DMRealNameProcessor extends DataMigrationProcessorService {
     @Autowired
-    MongoTemplate mongoTemplate;
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    AdamRealNameMapper realNameMapper;
+    IAdamRealNameService adamRealNameService;
 
     @SneakyThrows
     @Override
     protected void dataProcessing() {
         HttpServletRequest request = ServletUtils.getRequest();
-        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        String lS = request.getParameter(DM_LS), flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
 
-            log.info("DM.flush.AdamRealInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamRealInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_real_name where 1=1";
@@ -48,22 +45,24 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
             sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
             sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
         }
-
         sql += " limit ?,?";
 
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
         int ct = row.getInt(1), pSize = 1000, num = 0;
-        log.info("DM数据迁移总数:{}", ct);
-
+        log.info("DM.execute.counts:{}", ct);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            statement.setInt(1, pSize * num);
+            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
-            log.info("DM.execute.limit:[pNo:{},pSize:{}]", pSize * num, pSize);
+            log.info("DM.execute.limit {},{} ==> begin", ls, pSize);
+
+            List<AdamRealName> realNameList = new ArrayList<>();
+            List<AdamRealInfoVo> vos = new ArrayList<>();
             while (row.next()) {
                 String uid = row.getString(2);
 
@@ -85,11 +84,17 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                     vo.setIdCard(realName.getIdCard());
                     vo.setState(1);
 
-                    realNameMapper.insert(realName);
-                    mongoTemplate.insert(vo, AdamRealInfoVo.class.getSimpleName());
+//                    realNameMapper.insert(realName);
+//                    mongoTemplate.insert(vo, AdamRealInfoVo.class.getSimpleName());
+                    realNameList.add(realName);
+                    vos.add(vo);
                 }
             }
-
+            log.info("DM.execute.limit {},{} ==> handle.counts:{}", ls, pSize, realNameList.size());
+            if (!CollectionUtils.isEmpty(realNameList)) {
+                mongoTemplate.insert(vos, AdamRealInfoVo.class.getSimpleName());
+                log.info("DM.execute.result:{}", adamRealNameService.saveBatch(realNameList));
+            }
 
             num++;
             ct -= pSize;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMThirdPartsProcessor.java

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.entity.AdamThirdParty;
-import com.liquidnet.service.adam.mapper.AdamThirdPartyMapper;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
+import com.liquidnet.service.adam.service.IAdamThirdPartyService;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Service
 public class DMThirdPartsProcessor extends DataMigrationProcessorService {
     @Autowired
-    MongoTemplate mongoTemplate;
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    AdamThirdPartyMapper thirdPartyMapper;
+    IAdamThirdPartyService adamThirdPartyService;
 
     @SneakyThrows
     @Override
     protected void dataProcessing() {
         HttpServletRequest request = ServletUtils.getRequest();
-        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        String lS = request.getParameter(DM_LS), flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
 
-            log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_third_parts where `status`=1 and delete_tag=0";
@@ -55,16 +52,19 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
         int ct = row.getInt(1), pSize = 1000, num = 0;
-        log.info("DM数据迁移总数:{}", ct);
+        log.info("DM.execute.counts:{}", ct);
 
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            statement.setInt(1, pSize * num);
+            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
-            log.info("DM.execute.limit:[pNo:{},pSize:{}]", pSize * num, pSize);
+            log.info("DM.execute.limit {},{} ==> begin", ls, pSize);
 
+            List<AdamThirdParty> thirdPartyList = new ArrayList<>();
+            List<AdamThirdPartInfoVo> vos = new ArrayList<>();
             while (row.next()) {
                 String uid = row.getString(1);
 
@@ -89,11 +89,17 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
                     vo.setCreatedAt(thirdParty.getCreatedAt());
                     vo.setUpdatedAt(thirdParty.getUpdatedAt());
 
-                    thirdPartyMapper.insert(thirdParty);
-                    mongoTemplate.insert(vo, AdamThirdPartInfoVo.class.getSimpleName());
+//                    thirdPartyMapper.insert(thirdParty);
+//                    mongoTemplate.insert(vo, AdamThirdPartInfoVo.class.getSimpleName());
+                    thirdPartyList.add(thirdParty);
+                    vos.add(vo);
                 }
             }
-
+            log.info("DM.execute.limit {},{} ==> handle.counts:{}", ls, pSize, thirdPartyList.size());
+            if (!CollectionUtils.isEmpty(thirdPartyList)) {
+                mongoTemplate.insert(vos, AdamThirdPartInfoVo.class.getSimpleName());
+                log.info("DM.execute.result:{}", adamThirdPartyService.saveBatch(thirdPartyList));
+            }
 
             num++;
             ct -= pSize;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserMemberProcessor.java

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
-import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
-import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
+import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Service
 public class DMUserMemberProcessor extends DataMigrationProcessorService {
     @Autowired
-    MongoTemplate mongoTemplate;
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    AdamUserMemberMapper userMemberMapper;
+    IAdamUserMemberService adamUserMemberService;
 
     @SneakyThrows
     @Override
     protected void dataProcessing() {
         HttpServletRequest request = ServletUtils.getRequest();
-        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        String lS = request.getParameter(DM_LS), flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
 
-            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_cards where 1=1";
@@ -56,15 +52,18 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
         int ct = row.getInt(1), pSize = 1000, num = 0;
-        log.info("DM数据迁移总数:{}", ct);
-
+        log.info("DM.execute.counts:{}", ct);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            statement.setInt(1, pSize * num);
+            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
-            log.info("DM.execute.limit:[pNo:{},pSize:{}]", pSize * num, pSize);
+            log.info("DM.execute.limit {},{} ==> begin", ls, pSize);
+
+            List<AdamUserMember> userMemberList = new ArrayList<>();
+            List<AdamUserMemberVo> vos = new ArrayList<>();
             while (row.next()) {
                 String uid = row.getString(1);
 
@@ -87,11 +86,17 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                     vo.setCreatedAt(userMember.getCreatedAt());
                     vo.setUpdatedAt(userMember.getUpdatedAt());
 
-                    userMemberMapper.insert(userMember);
-                    mongoTemplate.insert(vo, AdamUserMemberVo.class.getSimpleName());
+//                    userMemberMapper.insert(userMember);
+//                    mongoTemplate.insert(vo, AdamUserMemberVo.class.getSimpleName());
+                    userMemberList.add(userMember);
+                    vos.add(vo);
                 }
             }
-
+            log.info("DM.execute.limit {},{} ==> handle.counts:{}", ls, pSize, userMemberList.size());
+            if (!CollectionUtils.isEmpty(userMemberList)) {
+                mongoTemplate.insert(vos, AdamUserMemberVo.class.getSimpleName());
+                log.info("DM.execute.result:{}", adamUserMemberService.saveBatch(userMemberList));
+            }
 
             num++;
             ct -= pSize;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 127.0.0.1:7001
+    host: 172.17.192.65:7001
 # end-prod-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-consumer/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 127.0.0.1:7001
+    host: 172.17.192.65:7001
 # end-prod-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 127.0.0.1:7001
+    host: 172.17.192.65:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/DataImpl.java

@@ -507,16 +507,18 @@ public class DataImpl {
                     }
 
                     //演出
-                    String performancedSql = "select time_start,img_poster,need_id_card from performances where id =" + orderData.getInt("performance_id");
+                    String performancedSql = "select time_start,img_poster,need_id_card,notice from performances where id =" + orderData.getInt("performance_id");
                     pstmt = con.prepareStatement(performancedSql);
                     ResultSet performanceData = pstmt.executeQuery();
                     String performanceTimeStart = "";
                     String performanceImg = "";
                     int isTrueName = 0;
+                    String notice = "";
                     while (performanceData.next()) {
                         performanceTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmssS.parse(performanceData.getTimestamp("time_start").toString()));
                         performanceImg=performanceData.getString("img_poster");
                         isTrueName=performanceData.getString("need_id_card").equals("yes")?1:0;
+                        notice=performanceData.getString("notice");
                     }
 
                     orderTickets.setOrderTicketsId(orderData.getInt("id") + "");
@@ -635,6 +637,7 @@ public class DataImpl {
                     orderTicketVo.setIsTrueName(isTrueName);
                     orderTicketVo.setOverdueAt(orderTickets.getCreatedAt().plusMinutes(orderTickets.getPayCountdownMinute()).plusSeconds(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     orderTicketVo.setNoticeImage("[{\"id\":1,\"sort\":1,\"message\":\"因演出票品非普通商品，其背后承载的文化服务具有时效性、稀缺性等特征，故不适用7天无理由退货政策。因“不可抗力”导致的演出取消或延期除外。\",\"title\":\"门票退换\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png\"},{\"id\":7,\"sort\":2,\"message\":\"凭订单二维码或手机号兑票入场，二维码或手机号请勿泄露，以免影响入场。个人原因导致的信息泄露，主办方/平台方不承担任何责任。\",\"title\":\"电子票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png\"},{\"id\":3,\"sort\":3,\"message\":\"本场演出不设座位，均为站席观演。\",\"title\":\"仅设站席\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e93db0b9.png\"},{\"id\":12,\"sort\":4,\"message\":\"每场现场票数量由场地方决定，具体请到现场询问。\",\"title\":\"现场票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d07647eaa55f.png\"}]");
+                    orderTicketVo.setNotice(notice);
                     orderTicketVo.setTicketType(ticketType);
                     orderTicketVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + orderTicketRelations.getPerformanceId(), "name"));
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -251,17 +251,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
             // 判断库存
 
-            int surplusGeneral = -1;
-//            if(redisLockUtil.tryLock("locak:"+ticketData.getTicketsId(),10,1)) {
             currentTime = System.currentTimeMillis();
-            surplusGeneral = dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), -payOrderParam.getNumber());
+            int surplusGeneral = dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), -payOrderParam.getNumber());
             currentTime = System.currentTimeMillis() - currentTime;
             log.debug("redis 获取库存 -> time:" + (currentTime) + "毫秒");
-//                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
-//            }else{
-//                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
-//                return ResponseDto.failure("下单超时");//乱七八糟异常
-//            }
 
             if (surplusGeneral < 0) {//库存回滚
                 currentTime = System.currentTimeMillis();
@@ -318,8 +311,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                 }
 
+                ResponseDto<PayResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData, currentTime);
                 redisLockUtil.unlock(lock);
-                return order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData, currentTime);
+                return resultData;
             }
         } catch (Exception e) {
             if (isDownGeneral) {
@@ -968,6 +962,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                 orderTicketVo.setIsTrueName(ticketVo.getIsTrueName());
                 orderTicketVo.setNoticeImage(performanceVo.getNoticeImage());
+                orderTicketVo.setNotice(performanceVo.getNotice());
                 orderTicketVo.setTicketType(ticketVo.getType());
                 orderTicketVo.setFieldName(performanceVo.getFieldName());
                 if (ticketVo.getIsShowCode() == 1) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -148,6 +148,10 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             performancesInfo = checkAppStatusInfo(performancesInfo);
             performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
         } catch (Exception e) {
+            e.printStackTrace();
+
+            log.debug(" ERROR PERFORMANCE DETAILS AGENT : " +  ServletUtils.getRequest().getHeader("User-Agent"));
+            log.debug(" ERROR PERFORMANCE DETAILS HOST : " +  ServletUtils.getRequest().getHeader("Host"));
             log.debug(" ERROR PERFORMANCE DETAILS PERFORMANCE_ID : " + performancesId);
         }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 127.0.0.1:7001
+    host: 172.17.192.65:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-prod.yml

@@ -8,10 +8,10 @@ liquidnet:
     username: user
     password: user123
   logfile:
-    path: ./logs
+    path: /data/logs
     name: support-config
   eureka:
-    host: 127.0.0.1:7001
+    host: 172.17.192.65:7001
   rabbitmq:
     host: 127.0.0.1
     port: 5672

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-test.yml

@@ -8,7 +8,7 @@ liquidnet:
     username: user
     password: user123
   logfile:
-    path: ./logs
+    path: /data/logs
     name: support-config
   eureka:
     host: 172.17.207.177:7001

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-prod-server1.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
+server:
+  port: 7001
+  servlet:
+    context-path: /eureka-server
+
+spring:
+  application:
+    name: liquidnet-support-eureka
+  security:
+    user:
+      name: user
+      password: user123
+
+eureka:
+  instance:
+    hostname: 172.17.192.65
+    preferIpAddress: true
+    health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
+    status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
+    home-page-url: http://localhost:${server.port}${server.servlet.context-path}
+    metadata-map:
+      configPath: ${server.servlet.context-path}
+      management.context-path: ${server.servlet.context-path}
+  server:
+    enable-self-preservation: false  # 设为false，关闭自我保护 #自我保护设置 解决Eureka Server不踢出已关停的节点的问题,同时客户端也需要配置
+    eviction-interval-timer-in-ms: 4000 # 清理间隔（单位毫秒，默认是60*1000）
+  client:
+    register-with-eureka: true #禁止自己当做服务注册
+    fetch-registry: true       #屏蔽注册信息
+    serviceUrl:
+      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@172.17.196.19:7001${server.servlet.context-path}/eureka
+#  instance:
+#    prefer-ip-address: true
+#    instance-id: ${spring.application.name}:${server.port}
+#     hostname: localhost
+
+logging:
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-prod-server2.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
+server:
+  port: 7001
+  servlet:
+    context-path: /eureka-server
+
+spring:
+  application:
+    name: liquidnet-support-eureka
+  security:
+    user:
+      name: user
+      password: user123
+
+eureka:
+  instance:
+    hostname: 172.17.196.19
+    preferIpAddress: true
+    health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
+    status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
+    home-page-url: http://localhost:${server.port}${server.servlet.context-path}
+    metadata-map:
+      configPath: ${server.servlet.context-path}
+      management.context-path: ${server.servlet.context-path}
+  server:
+    enable-self-preservation: false  # 设为false，关闭自我保护 #自我保护设置 解决Eureka Server不踢出已关停的节点的问题,同时客户端也需要配置
+    eviction-interval-timer-in-ms: 4000 # 清理间隔（单位毫秒，默认是60*1000）
+  client:
+    register-with-eureka: true #禁止自己当做服务注册
+    fetch-registry: true       #屏蔽注册信息
+    serviceUrl:
+      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@172.17.192.65:7001${server.servlet.context-path}/eureka
+#  instance:
+#    prefer-ip-address: true
+#    instance-id: ${spring.application.name}:${server.port}
+#     hostname: localhost
+
+logging:
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server1.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
 server:
   port: 7001
   servlet:
@@ -33,24 +43,16 @@ eureka:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}
 #     hostname: localhost
-liquidnet:
-  logfile:
-    path: /logfile
-    name: liquidnet-eureka-server.log
 
 logging:
-  config: classpath:logback-spring.xml
-  path: ${liquidnet.logfile.path}
-#logging:
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        stellar:
-#          controller: info
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file
-##  pattern:
-##    console: %d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n
-##    file: %d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server2.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
 server:
   port: 7001
   servlet:
@@ -33,24 +43,16 @@ eureka:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}
 #     hostname: localhost
-liquidnet:
-  logfile:
-    path: /logfile
-    name: liquidnet-eureka-server.log
 
 logging:
-  config: classpath:logback-spring.xml
-  path: ${liquidnet.logfile.path}
-#logging:
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        stellar:
-#          controller: info
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file
-##  pattern:
-##    console: %d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n
-##    file: %d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server3.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
 server:
   port: 7001
   servlet:
@@ -33,24 +43,16 @@ eureka:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}
 #     hostname: localhost
-liquidnet:
-  logfile:
-    path: /logfile
-    name: liquidnet-eureka-server.log
 
 logging:
-  config: classpath:logback-spring.xml
-  path: ${liquidnet.logfile.path}
-#logging:
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        stellar:
-#          controller: info
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file
-##  pattern:
-##    console: %d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n
-##    file: %d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application.yml

+liquidnet:
+  logfile:
+    path: /Users/anjiabin/data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
 server:
   port: 7001
   servlet:
@@ -33,24 +43,16 @@ eureka:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}
 #     hostname: localhost
-liquidnet:
-  logfile:
-    path: /logfile
-    name: liquidnet-eureka-server.log
 
 logging:
-  config: classpath:logback-spring.xml
-  path: ${liquidnet.logfile.path}
-#logging:
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        stellar:
-#          controller: info
-##  pattern:
-##    console: %d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n
-##    file: %d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}

liquidnet-bus-support/liquidnet-support-zuul/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 127.0.0.1:7001
+    host: 172.17.192.65:7001
 # end-prod-这里是配置信息基本值
 
 spring: