Merge branch 'dev' into test

liquidnet-bus-config/liquidnet-config/application-prod.yml

-config-server-git: prod
-#application-prod-begin
-#这里后续添加公共参数值
-liquidnet:
-  security:
-    username: user
-    password: user123
-  jwt:
-    secret: qZHglvNP0n0aOOckHiQXq5JMD468J4eG
-    expire-ttl: 43200
-    refresh-ttl: 525600
-    blacklist_grace_period: 5
-  mysql:
-    urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306
-    username: zhengzai
-    password: $hAh4SGcDQ
-  rabbitmq:
-    host: amqp-cn-7pp26mhtn001.mq-amqp.cn-beijing-327844-a-internal.aliyuncs.com
-    port: 5672
-    username: MjphbXFwLWNuLTdwcDI2bWh0bjAwMTpMVEFJNXRGajR0UWplbW82NjRCcmtxS1o=
-    password: MzlENTBFRDE0NEE4MkM1RUE2MTc1RDhBMTVFNzhDQTNDQTQ3NEY4RDoxNjIyODE1ODU3ODEz
-    virtual-host: liquidnet
-  knife4j:
-    disable: false
-  redis:
-    host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
-    #    host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
-    port: 6380
-    password: PO@B!Iud32
-  #    host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
-  #    port: 6380
-  #    password: PO@B!Iud32
-  mongodb:
-    host: s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
-    port: 3717
-    user: root
-    pwd: $hAh4SGcDQ
-  service:
-    adam:
-      url-pay:
-        pay: http://pay.zhengzai.tv
-        check: http://pay.zhengzai.tv/order/verify
-        callback: http://adam.zhengzai.tv/adam/member/order/callback
-      url-service:
-        url: http://service.zhengzai.tv
-    kylin:
-      url-pay:
-        pay: http://pay.zhengzai.tv/
-        check: http://pay.zhengzai.tv/order/verify
-        localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder
-      url-service:
-        url: http://service.zhengzai.tv/
-    executor-main:
-      xxl:
-        admin:
-          addresses: 172.17.121.166:8090

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

-liquidnet:
-  info:
-    context: /
-    name: liquidnet-client-job
-    port: 8090
-  logfile:
-    name: client-job
-    path: ./logs
-  mysql:
-    database-name: prod_ln_clijob
\ No newline at end of file

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

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9001
-    context: /adam
-    name: liquidnet-service-adam
-  logfile:
-    path: ./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
-  mysql:
-    database-name: prod_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: prod_ln_scene
-  url-pay:
-    pay: ${liquidnet.service.adam.url-pay.pay}
-    check: ${liquidnet.service.adam.url-pay.check}
-    callback: ${liquidnet.service.adam.url-pay.callback}
-  url-service:
-    url: ${liquidnet.service.adam.url-service.url}
-  aliyun:
-    accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
-    accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
-
-#以下为spring各环境个性配置

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

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9999
-    context:
-#    context: /service-consumer
-    name: liquidnet-service-consumer
-  logfile:
-    path: ./logs
-    name: service-consumer
-    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: debug
-  rabbitmq:
-    connection-timeout: 3000
-  mysql:
-    database-name: prod_ln_scene
-
-#以下为spring各环境个性配置

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

-liquidnet:
-  info:
-    port: 8190
-    context: /service-executor-main
-    name: liquidnet-service-executor-main
-  logfile:
-    path: ./logs
-    name: service-executor-main
-  xxl:
-    accessToken: qk52rqSejRBm9enf6BTTxw==
-    admin:
-      # Job执行器注册地址，多个地址则用逗号分隔
-#      addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
-      addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
-    executor:
-      # Job执行器IP，默认为空表示自动获取IP，多网卡时手动指定
-      ip:
-      # Job执行器端口，单机多个执行器端口号不能相同
-      port: 8191
-      # Job执行器心跳注册分组依据，按需配置
-      appname: liquidnet-service-executor
-      # Job执行器运行日志，注意目录读写权限
-      logpath: ./logs/job

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

-liquidnet:
-  system:
-    updating:
-      switch: false
-  info:
-    port: 9002
-    context: /kylin
-    name: liquidnet-service-kylin
-  logfile:
-    path: ./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
-  rabbitmq:
-    connection-timeout: 3000
-  mysql:
-    database-name: prod_ln_scene
-  mongodb:
-    sslEnabled: false
-    database: prod_ln_scene
-  url-pay:
-    pay: ${liquidnet.service.kylin.url-pay.pay}
-    check: ${liquidnet.service.kylin.url-pay.check}
-    localUrl: ${liquidnet.service.kylin.url-pay.callback}
-  url-service:
-    url: ${liquidnet.service.kylin.url-service.url}
-  al-oss:
-    imgUrl: "https://img.zhengzai.tv/"

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

@@ -46,8 +46,8 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
 
         if ("1".equals(flg)) {
-            sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406')";
-            sql += " and user_id in ('2026628','544327','1997335','773650','809406')";
+            sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sql += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
         }
 
         sql += " limit ?,?";

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

@@ -46,8 +46,8 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
 
         if ("1".equals(flg)) {
-            sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406')";
-            sql += " and user_id in ('2026628','544327','1997335','773650','809406')";
+            sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sql += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
         }
 
         sql += " limit ?,?";

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

@@ -72,8 +72,8 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
 
         if ("1".equals(flg)) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406')";
+            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 ?,?";

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

@@ -45,8 +45,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
 
         if ("1".equals(flg)) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406')";
+            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 ?,?";

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

@@ -45,8 +45,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
 
         if ("1".equals(flg)) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406')";
+            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 ?,?";

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

@@ -65,8 +65,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
 
         if ("1".equals(flg)) {
-            sqlCount += "and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014')";
-            sql += " and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014')";
+            sqlCount += "and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014','17382319723','13631444097','13671737873')";
+            sql += " and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014','17382319723','13631444097','13671737873')";
         }
 
         sql += " limit ?,?";

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

@@ -46,8 +46,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
 
         if ("1".equals(flg)) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406')";
+            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 ?,?";