Merge branch 'pre' into 'master'

Pre

See merge request !23

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

@@ -53,12 +53,12 @@ public class MongoVoUtils {
             KylinPerformanceRelations p3 = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
             //场地相关数据
             KylinFields fields = new KylinFields();
-            String cityName = (String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
+            String cityName = (String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
             fields.setCityId(null);
-            fields.setLatitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
-            fields.setLongitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
-            fields.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
-            fields.setName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
+            fields.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
+            fields.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
+            fields.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
+            fields.setName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
 
             //相关状态时间初始变量
             LocalDateTime stopSellTime = null;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -33,7 +33,6 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -250,8 +249,8 @@ public class PerformanceVoUtils {
             KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
             BeanUtils.copyProperties(performanceUpdateMisVo, performanceRelations);
 
-            performances.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
-            performances.setCityId(Integer.parseInt((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
+            performances.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
+            performances.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
             performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getCreatedAt())));
             performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeStart())));
             performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeEnd())));

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/FilesUtils.java

 package com.liquidnet.commons.lang.util;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
@@ -11,6 +12,7 @@ import java.security.MessageDigest;
  * @author jiangxiulong
  * @since 2021-06-10
  */
+@Slf4j
 public class FilesUtils {
     /**
      * MultipartFile 转 File
@@ -45,7 +47,7 @@ public class FilesUtils {
             os.close();
             ins.close();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("inputStreamToFileError", e);
         }
     }
 
@@ -54,8 +56,12 @@ public class FilesUtils {
      * @param file
      */
     public static void delteTempFile(File file) {
-        if (file != null) {
-            file.delete();
+        try {
+            if (file != null) {
+                file.delete();
+            }
+        } catch (Exception e) {
+            log.error("delteTempFileError", e);
         }
     }
 
@@ -81,13 +87,13 @@ public class FilesUtils {
             BigInteger bigInt = new BigInteger(1, digest.digest());
             return bigInt.toString(16);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("getFileMD5CatchError", e);
             return null;
         } finally {
             try {
                 in.close();
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("getFileMD5FinallyError", e);
             }
         }
     }

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

@@ -32,6 +32,7 @@ liquidnet:
     disable: false
   redis:
     dbs: 0,16
+    database: 15
     host: 39.106.122.201
     port: 6379
     password: 3Xa%8p
@@ -39,6 +40,10 @@ liquidnet:
       host: 39.106.122.201
       port: 6379
       password: 3Xa%8p
+    sweet:
+      host: 39.106.122.201
+      port: 6379
+      password: 3Xa%8p
   mongodb:
     host: 39.106.122.201:27017
     port: 27017

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

@@ -31,6 +31,7 @@ liquidnet:
   knife4j:
     disable: false
   redis:
+    database: 255
     dbs: 0,256
     host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
     port: 6380
@@ -39,6 +40,10 @@ liquidnet:
       host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
       port: 6380
       password: PO@B!Iud32
+    sweet:
+      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: PO@B!Iud32
   mongodb:
     host: 39.106.122.201:27017
     port: 27017

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

@@ -122,6 +122,7 @@ spring:
       database: ${liquidnet.mongodb.database}
   redis:
     database: 15
+    dbs: ${liquidnet.redis.dbs}
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

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

@@ -75,6 +75,7 @@ spring:
       - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
   redis:
     database: 15
+    dbs: ${liquidnet.redis.dbs}
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

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

@@ -57,7 +57,8 @@ spring:
   profiles:
     include: common-service #这里加载management相关公共配置
   redis:
-    database: 15
+    database: ${liquidnet.redis.database}
+    dbs: ${liquidnet.redis.dbs}
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

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

@@ -20,6 +20,6 @@ liquidnet:
     database-name: test_ln_scene
   mongodb:
     sslEnabled: false
-    database: dev_ln_scene
+    database: test_ln_scene
 
 #以下为spring各环境个性配置

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

@@ -57,7 +57,8 @@ spring:
   profiles:
     include: common-service #这里加载management相关公共配置
   redis:
-    database: 15
+    database: ${liquidnet.redis.database}
+    dbs: ${liquidnet.redis.dbs}
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

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

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9996
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-sweet
+  logfile:
+    path: /data/logs
+    name: service-consumer-sweet
+    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
+  mysql:
+    database-name: dev_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: dev_ln_scene
+
+#以下为spring各环境个性配置
\ No newline at end of file

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

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9996
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-sweet
+  logfile:
+    path: /data/logs
+    name: service-consumer-sweet
+    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
+  mysql:
+    database-name: test_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test_ln_scene
+
+#以下为spring各环境个性配置

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

+server:
+  port: ${liquidnet.info.port}
+  tomcat:
+    uri-encoding: UTF-8
+  servlet:
+    context-path: ${liquidnet.info.context}
+# -----------------------------------------------------------
+knife4j:
+  production: ${liquidnet.knife4j.disable}
+  basic:
+    enable: true
+    username: ${liquidnet.security.username}
+    password: ${liquidnet.security.password}
+# -----------------------------------------------------------
+logging:
+#  config: ${liquidnet.logfile.config}
+  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{26}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%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-root}
+# -----------------------------------------------------------
+eureka:
+#  client:
+#    register-with-eureka: true
+#    fetch-registry: true
+#    serviceUrl:
+#      defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
+  instance:
+    hostname: ${spring.cloud.client.ip-address}
+    lease-expiration-duration-in-seconds: 15 #服务过期时间配置,超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除
+    lease-renewal-interval-in-seconds: 5 #服务刷新时间配置，每隔这个时间会主动心跳一次
+    prefer-ip-address: true
+    instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${server.port}}
+# -----------------------------------------------------------
+#actuator/info
+info:
+  app:
+    name: ${liquidnet.info.name}
+  company:
+    name: lightnet.io
+  build:
+    groupId: '@project.groupId@'
+    artifactId: '@project.artifactId@'
+    version: '@project.version@'
+# -----------------------------------------------------------
+spring:
+  application:
+    name: ${liquidnet.info.name}
+  profiles:
+    include: common-service #这里加载management相关公共配置
+  redis:
+    database: 15
+    port: ${liquidnet.redis.sweet.port}
+    host: ${liquidnet.redis.sweet.host}
+    password: ${liquidnet.redis.sweet.password}
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+    redisson:
+      singleServerConfig:
+        address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
+        password: ${liquidnet.redis.password}
+        clientName: null
+        database: 7 #选择使用哪个数据库0~15
+        idleConnectionTimeout: 10000
+        connectTimeout: 10000
+        timeout: 3000
+        retryAttempts: 3
+        retryInterval: 1500
+        subscriptionsPerConnection: 5
+        subscriptionConnectionMinimumIdleSize: 1
+        subscriptionConnectionPoolSize: 50
+        connectionMinimumIdleSize: 32
+        connectionPoolSize: 64
+        dnsMonitoringInterval: 5000
+      threads: 16
+      nettyThreads: 32
+      codec:
+        class: "org.redisson.codec.JsonJacksonCodec"
+      transportMode: "NIO"
+  data:
+    mongodb:
+      uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
+      sslEnabled: ${liquidnet.mongodb.sslEnabled}
+      database: ${liquidnet.mongodb.database}
+  datasource:
+    name: ${liquidnet.mysql.database-name}
+    url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=UTC&characterEncoding=utf-8&useSSL=false
+    username: ${liquidnet.mysql.username}
+    password: ${liquidnet.mysql.password}
+#    type: org.apache.tomcat.jdbc.pool.DataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 45
+      minimum-idle: 10
+      connection-test-query: SELECT 1
+# -----------------------------------------------------------
+
+# -----------------------------------------------------------

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

@@ -75,6 +75,7 @@ spring:
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
     database: 15
+    dbs: ${liquidnet.redis.dbs}
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

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

@@ -75,6 +75,7 @@ spring:
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
     database: 15
+    dbs: ${liquidnet.redis.dbs}
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

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

@@ -77,6 +77,7 @@ spring:
     connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
     database: 15
+    dbs: ${liquidnet.redis.dbs}
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

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

@@ -70,9 +70,9 @@ spring:
     include: common-service #这里加载management相关公共配置
   redis:
     database: 15
-    port: ${liquidnet.redis.port}
-    host: ${liquidnet.redis.host}
-    password: ${liquidnet.redis.password}
+    port: ${liquidnet.redis.sweet.port}
+    host: ${liquidnet.redis.sweet.host}
+    password: ${liquidnet.redis.sweet.password}
     lettuce:
       pool:
         max-active: 8

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/adam/receiver/AbstractSqlRedisReceiver.java

@@ -46,7 +46,11 @@ public abstract class AbstractSqlRedisReceiver implements StreamListener<String,
         Boolean aBoolean = false;
         try {
             SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
-            aBoolean = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            if (sqlMessage == null) {
+                aBoolean = true;
+            } else {
+                aBoolean = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            }
         } catch (Exception e) {
             log.error("CONSUMER SQL FAIL ==> {}", e.getMessage(), e);
         } finally {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/AbstractSqlRedisReceiver.java

 package com.liquidnet.service.consumer.kylin.receiver;
 
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.SqlMapping;
@@ -19,6 +20,8 @@ public abstract class AbstractSqlRedisReceiver implements StreamListener<String,
     private IBaseDao baseDao;
     @Autowired
     StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private RedisUtil redisUtil;
 
     @Override
     public void onMessage(MapRecord<String, String, String> message) {
@@ -46,7 +49,11 @@ public abstract class AbstractSqlRedisReceiver implements StreamListener<String,
         Boolean aBoolean = false;
         try {
             SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
-            aBoolean = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            if (sqlMessage == null) {
+                aBoolean = true;
+            } else {
+                aBoolean = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            }
         } catch (Exception e) {
             log.error("CONSUMER SQL FAIL ==> {}", e.getMessage(), e);
         } finally {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liquidnet-service-consumer-all</artifactId>
+        <groupId>com.liquidnet</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-service-consumer-sweet</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-cache-redisson</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-kylin-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-sms</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/ServiceConsumerSweetApplication.java

+package com.liquidnet.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+
+@Slf4j
+@SpringBootApplication(scanBasePackages = {"com.liquidnet"})
+public class ServiceConsumerSweetApplication implements CommandLineRunner {
+    @Autowired
+    private Environment environment;
+
+    public static void main(String[] args) {
+        SpringApplication.run(ServiceConsumerSweetApplication.class, args);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        try {
+            log.info("\n----------------------------------------------------------\n\t" +
+                            "Application '{}' is running! Access URLs:\n\t" +
+                            "Local: \t\thttp://127.0.0.1:{}\n\t" +
+                            "External: \thttp://{}:{}{}/doc.html\n\t" +
+                            "Profile(s): \t{}\n----------------------------------------------------------",
+                    environment.getProperty("spring.application.name"),
+                    environment.getProperty("server.port"),
+                    InetAddress.getLocalHost().getHostAddress(),
+                    environment.getProperty("server.port"),
+                    environment.getProperty("server.servlet.context-path"),
+                    Arrays.toString(environment.getActiveProfiles()));
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerSweetAnswerRedisStreamConfig.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetAnswerRedisStreamConfig.java

-package com.liquidnet.service.consumer.kylin.config;
+package com.liquidnet.service.consumer.sweet.config;
 
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetAnswerRdsReceiver;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetSqlUserRelationRdsReceiver;
+import com.liquidnet.service.consumer.sweet.receiver.ConsumerSweetAnswerRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerSweetRemindRedisStreamConfig.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetRemindRedisStreamConfig.java

-package com.liquidnet.service.consumer.kylin.config;
+package com.liquidnet.service.consumer.sweet.config;
 
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetRemindRdsReceiver;
+import com.liquidnet.service.consumer.sweet.receiver.ConsumerSweetRemindRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerSweetSqlLuckDrawRedisStreamConfig.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetSqlLuckDrawRedisStreamConfig.java

-package com.liquidnet.service.consumer.kylin.config;
+package com.liquidnet.service.consumer.sweet.config;
 
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetSqlLuckDrawRdsReceiver;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetSqlUserRelationMDSKRdsReceiver;
+import com.liquidnet.service.consumer.sweet.receiver.ConsumerSweetSqlLuckDrawRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -16,7 +15,6 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
-import static com.liquidnet.service.base.constant.MQConst.SweetQueue.ARTISTS_RELATION_MDSK;
 import static com.liquidnet.service.base.constant.MQConst.SweetQueue.LUCK_DRAW;
 
 @Configuration

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerSweetSqlUserRelationMDSKRedisStreamConfig.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetSqlUserRelationMDSKRedisStreamConfig.java

-package com.liquidnet.service.consumer.kylin.config;
+package com.liquidnet.service.consumer.sweet.config;
 
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetSqlUserRelationMDSKRdsReceiver;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetSqlUserRelationRdsReceiver;
+import com.liquidnet.service.consumer.sweet.receiver.ConsumerSweetSqlUserRelationMDSKRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -16,7 +15,6 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
-import static com.liquidnet.service.base.constant.MQConst.SweetQueue.ARTISTS_RELATION;
 import static com.liquidnet.service.base.constant.MQConst.SweetQueue.ARTISTS_RELATION_MDSK;
 
 @Configuration

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerSweetSqlUserRelationRedisStreamConfig.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetSqlUserRelationRedisStreamConfig.java

-package com.liquidnet.service.consumer.kylin.config;
+package com.liquidnet.service.consumer.sweet.config;
 
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetSqlUserRelationRdsReceiver;
+import com.liquidnet.service.consumer.sweet.receiver.ConsumerSweetSqlUserRelationRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerSweetUserRedisStreamConfig.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetUserRedisStreamConfig.java

-package com.liquidnet.service.consumer.kylin.config;
+package com.liquidnet.service.consumer.sweet.config;
 
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetUserRdsReceiver;
+import com.liquidnet.service.consumer.sweet.receiver.ConsumerSweetUserRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/AbstractSqlRedisReceiver.java

+package com.liquidnet.service.consumer.sweet.receiver;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.consumer.sweet.service.IBaseDao;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.stream.StreamListener;
+
+import java.util.HashMap;
+
+@Slf4j
+public abstract class AbstractSqlRedisReceiver implements StreamListener<String, MapRecord<String, String, String>> {
+    @Autowired
+    private IBaseDao baseDao;
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private RedisUtil redisUtil;
+
+    @Override
+    public void onMessage(MapRecord<String, String, String> message) {
+        log.debug("CONSUMER SQL[streamKey:{},messageId:{},stream:{},body:{}]",
+                this.getRedisStreamKey(), message.getId(), message.getStream(), message.getValue());
+
+        boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
+        log.info("CONSUMER SQL RESULT:{} ==> MESSAGE_ID:{}", result, message.getId());
+
+        try {
+            stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+            stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+        } catch (Exception e) {
+            log.error("#CONSUMER SQL RESULT:{} ==> DEL_REDIS_QUEUE_MSG_EXCEPTION[MESSAGE_ID:{},MSG:{}]", result, message.getId(), JsonUtils.toJson(message), e);
+        } finally {
+            try {
+                stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+                stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    private boolean consumerSqlDaoHandler(String msg) {
+        Boolean aBoolean = false;
+        try {
+            SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
+            if (sqlMessage == null) {
+                aBoolean = true;
+            } else {
+                aBoolean = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            }
+        } catch (Exception e) {
+            log.error("CONSUMER SQL FAIL ==> {}", e.getMessage(), e);
+        } finally {
+            if (!aBoolean) {
+                HashMap<String, String> map = CollectionUtil.mapStringString();
+                map.put("message", msg);
+                stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(this.getRedisStreamKey()));
+            }
+        }
+        return aBoolean;
+    }
+
+    protected abstract String getRedisStreamKey();
+
+    protected abstract String getRedisStreamGroup();
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerSweetAnswerRdsReceiver.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/ConsumerSweetAnswerRdsReceiver.java

-package com.liquidnet.service.consumer.kylin.receiver;
+package com.liquidnet.service.consumer.sweet.receiver;
 
 import com.liquidnet.service.base.constant.MQConst;
 import org.springframework.stereotype.Component;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerSweetRemindRdsReceiver.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/ConsumerSweetRemindRdsReceiver.java

-package com.liquidnet.service.consumer.kylin.receiver;
+package com.liquidnet.service.consumer.sweet.receiver;
 
 import com.liquidnet.service.base.constant.MQConst;
 import org.springframework.stereotype.Component;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerSweetSqlLuckDrawRdsReceiver.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/ConsumerSweetSqlLuckDrawRdsReceiver.java

-package com.liquidnet.service.consumer.kylin.receiver;
+package com.liquidnet.service.consumer.sweet.receiver;
 
 import com.liquidnet.service.base.constant.MQConst;
 import org.springframework.stereotype.Component;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerSweetSqlUserRelationMDSKRdsReceiver.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/ConsumerSweetSqlUserRelationMDSKRdsReceiver.java

-package com.liquidnet.service.consumer.kylin.receiver;
+package com.liquidnet.service.consumer.sweet.receiver;
 
 import com.liquidnet.service.base.constant.MQConst;
 import org.springframework.stereotype.Component;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerSweetSqlUserRelationRdsReceiver.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/ConsumerSweetSqlUserRelationRdsReceiver.java

-package com.liquidnet.service.consumer.kylin.receiver;
+package com.liquidnet.service.consumer.sweet.receiver;
 
 import com.liquidnet.service.base.constant.MQConst;
 import org.springframework.stereotype.Component;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerSweetUserRdsReceiver.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/ConsumerSweetUserRdsReceiver.java

-package com.liquidnet.service.consumer.kylin.receiver;
+package com.liquidnet.service.consumer.sweet.receiver;
 
 import com.liquidnet.service.base.constant.MQConst;
 import org.springframework.stereotype.Component;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/service/IBaseDao.java

+package com.liquidnet.service.consumer.sweet.service;
+
+import java.util.LinkedList;
+
+public interface IBaseDao {
+    /**
+     * 批量执行sql
+     *
+     * @param sql
+     * @param values
+     * @return
+     */
+    Boolean batchSql(String sql, LinkedList<Object[]> values);
+
+    /**
+     * 批量执行不定量sql
+     *
+     * @param sql
+     * @param values
+     * @return
+     */
+    Boolean batchSqls(LinkedList<String> sql, LinkedList<Object[]>... values);
+
+    /**
+     * 执行sql语句 无 参数
+     *
+     * @param sql
+     * @return
+     */
+    Boolean batchSqlNoArgs(LinkedList<String> sql);
+
+    /**
+     * xs 新增一条记录且返回主键Id
+     *
+     * @param sql   新增待执行sql
+     * @param param 参数
+     * @return 主键ID
+     */
+    int insertSqlAndReturnKeyId(final String sql, final Object[] param);
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/service/impl/BaseDao.java

+package com.liquidnet.service.consumer.sweet.service.impl;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.consumer.sweet.service.IBaseDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCreator;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.annotation.Resource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.LinkedList;
+
+@Service
+public class BaseDao implements IBaseDao {
+    private static final Logger log = LoggerFactory.getLogger(BaseDao.class);
+    @Resource
+    public JdbcTemplate jdbcTemplate;
+    @Resource(name = "transactionManager")
+    public DataSourceTransactionManager transactionManager;
+
+    @Override
+    public Boolean batchSql(final String sql, final LinkedList<Object[]> values) {
+        TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+            @Override
+            public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                if (values.size() > 0) {
+                    int[] ints = jdbcTemplate.batchUpdate(sql, values);
+                }
+                return true;
+            }
+        };
+        try {
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex);
+            return false;
+        }
+    }
+
+    @Override
+    public Boolean batchSqls(final LinkedList<String> sql,
+                             final LinkedList<Object[]>... values) {
+        try {
+            TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+                @Override
+                public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                    int i = 0;
+                    for (LinkedList<Object[]> o : values) {
+                        if (sql.size() < i + 1) {
+                            break;
+                        }
+                        if (!o.isEmpty()) {
+                            jdbcTemplate.batchUpdate(sql.get(i), o);
+                        }
+                        i++;
+                    }
+                    return true;
+                }
+            };
+
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+//            if (ex instanceof LiquidnetServiceException) {
+//                log.error("###Error.Code:{} - {}", ((LiquidnetServiceException) ex).getCode(), ex.getMessage());
+//            } else {
+            log.error("###Error.Sqls:{}\nParameters:{},Ex:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex.getMessage());
+//            }
+            return false;
+        }
+    }
+
+    @Override
+    public Boolean batchSqlNoArgs(final LinkedList<String> sql) {
+        try {
+            TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+                @Override
+                public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                    for (String o : sql) {
+                        jdbcTemplate.execute(o);
+                    }
+                    return true;
+                }
+            };
+
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+            log.error("###Error.Sqls:{}\nParameters:{},Ex:{}", sql);
+            return false;
+        }
+    }
+
+    /**
+     * xs 新增一条记录且返回主键Id
+     *
+     * @param sql   新增待执行sql
+     * @param param 参数
+     * @return 主键ID
+     */
+    public int insertSqlAndReturnKeyId(final String sql, final Object[] param) {
+        final String innersql = sql;
+        final Object[] innerO = param;
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        try {
+            jdbcTemplate.update(new PreparedStatementCreator() {
+                @Override
+                public PreparedStatement createPreparedStatement(final Connection con)
+                        throws SQLException {
+                    PreparedStatement ps = con.prepareStatement(innersql,
+                            Statement.RETURN_GENERATED_KEYS);
+                    for (int i = 0; i < innerO.length; i++) {
+                        ps.setObject(i + 1, innerO[i]);
+                    }
+
+                    return ps;
+                }
+            }, keyHolder);
+        } catch (Exception e) {
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", sql, JsonUtils.toJson(param), e);
+        }
+        return keyHolder.getKey().intValue();
+
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/service/processor/ConsumerKylinSmsProcessor.java

+//package com.liquidnet.service.consumer.kylin.service.processor;
+//
+//import com.liquidnet.common.mq.constant.MQConst;
+//import com.liquidnet.common.sms.processor.SmsProcessor;
+//import com.liquidnet.commons.lang.util.JsonUtils;
+//import com.liquidnet.service.base.SmsMessage;
+//import com.rabbitmq.client.Channel;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.amqp.core.Message;
+//import org.springframework.amqp.core.MessageProperties;
+//import org.springframework.amqp.rabbit.annotation.Exchange;
+//import org.springframework.amqp.rabbit.annotation.Queue;
+//import org.springframework.amqp.rabbit.annotation.QueueBinding;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.Resource;
+//import java.io.IOException;
+//
+///**
+// * ConsumerAdamSmsProcessor.class
+// *
+// * @author zhanggb
+// * Created by IntelliJ IDEA at 2021/7/13
+// */
+//@Slf4j
+//@Component
+//public class ConsumerKylinSmsProcessor {
+//    @Resource
+//    SmsProcessor smsProcessor;
+//
+//    private void consumerSmsSendHandler(Message msg, Channel channel) {
+//        MessageProperties properties = msg.getMessageProperties();
+//        String consumerQueue = properties.getConsumerQueue();
+//        long deliveryTag = properties.getDeliveryTag();
+//        log.info("CONSUMER SMS ==> [consumerQueue:{},deliveryTag:{}]", consumerQueue, deliveryTag);
+//        String msgBody = new String(msg.getBody());
+//        log.debug("CONSUMER SMS ==> Preparing:{}", msgBody);
+//        try {
+//            SmsMessage smsMessage = JsonUtils.fromJson(msgBody, SmsMessage.class);
+//            boolean result = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
+//            log.debug("CONSUMER SMS result of execution:{}", result);
+//            if (result) {
+//                channel.basicAck(deliveryTag, false);
+//            } else {
+//                log.warn("###CONSUMER SMS[consumerQueue:{},deliveryTag={},sqlMessage:{}]", consumerQueue, deliveryTag, msgBody);
+//                channel.basicAck(deliveryTag, false);
+//            }
+//        } catch (IOException e) {
+//            log.error("CONSUMER SMS[consumerQueue:{},deliveryTag:{},sqlMessage:{}]", consumerQueue, deliveryTag, msgBody, e);
+//        }
+//    }
+//
+//    /* ================================================================== ｜ 短信验证码 */
+//
+////    @RabbitListener(
+////            bindings = @QueueBinding(
+////                    exchange = @Exchange(MQConst.EX_LNS_SMS_SENDER),
+////                    key = MQConst.RK_SMS_CODE,
+////                    value = @Queue(MQConst.QUEUES_SMS_CODE)
+////            ),
+////            concurrency = "25"
+////    )
+////    public void consumerSqlForSmsCode(Message msg, Channel channel) {
+////        this.consumerSmsSendHandler(msg, channel);
+////    }
+//
+//    /* ================================================================== ｜ 短信通知 */
+//
+//    @RabbitListener(
+//            bindings = @QueueBinding(
+//                    exchange = @Exchange(MQConst.EX_LNS_SMS_SENDER),
+//                    key = MQConst.RK_SMS_NOTICE,
+//                    value = @Queue(MQConst.QUEUES_SMS_NOTICE)
+//            ),
+//            concurrency = "10"
+//    )
+//    public void consumerSqlForSmsNotice(Message msg, Channel channel) {
+//        this.consumerSmsSendHandler(msg, channel);
+//    }
+//
+//
+//    /* ================================================================== ｜  */
+//}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/resources/bootstrap-dev.yml

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: dev
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 127.0.0.1:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-sweet

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

+# begin-prod-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: prod
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.207.189:7001
+# end-prod-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-sweet
\ No newline at end of file

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

+#eurekaServer配置
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
+#configServer配置
+spring:
+  cloud:
+    config:
+#      uri: http://39.106.122.201:7002/support-config
+      profile: ${liquidnet.cloudConfig.profile}
+      name: ${spring.application.name} #默认为spring.application.name
+      discovery:
+        enabled: true
+        service-id: liquidnet-support-config

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/resources/bootstrap-test.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: test
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.207.177:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-sweet
\ No newline at end of file

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

+spring:
+  application:
+    name: liquidnet-service-consumer-sweet
+  profiles:
+    active: dev
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/pom.xml

@@ -14,6 +14,7 @@
         <module>liquidnet-service-consumer-kylin</module>
         <module>liquidnet-service-consumer-adam</module>
         <module>liquidnet-service-consumer-dragon</module>
+        <module>liquidnet-service-consumer-sweet</module>
     </modules>
 
     <dependencies>

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

@@ -57,7 +57,7 @@ public class FieldsServiceImpl  implements KylinFieldsService {
     public KylinFieldsVo fieldDetails(String fieldId) {
         KylinFieldsVo info = null;
         // 获取 redis数据
-        info = (KylinFieldsVo) redisUtil.hget(KylinRedisConst.FIELDS, fieldId + "");
+        info = (KylinFieldsVo) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS, fieldId + "");
         //不存在 获取 mongo数据
         if (null == info) {
             info = mongoTemplate.findOne(Query.query(Criteria.where("fieldsId").is(fieldId)), KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());

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

@@ -208,7 +208,7 @@ public class DataUtils {
      */
     public String getAgentInfoName(String agentId) {
         String redisKey = KylinRedisConst.PERFORMANCES_AGENT_INFO.concat(agentId);
-        String name = (String) redisUtil.hget(redisKey, "name");
+        String name = (String) redisUtil.getDB15RedisHGet(redisKey, "name");
 //        String name = "";
         return name;
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/pom.xml

@@ -68,6 +68,13 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
+
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.6.0</version>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

@@ -111,7 +111,6 @@ public class AlOssController {
             }
 
             ossClient.shutdown();
-            FilesUtils.delteTempFile(fileNew); // 删除临时文件
 
             // 入库
             PlatformOssFiles platformOssFilesDate = new PlatformOssFiles();
@@ -131,6 +130,9 @@ public class AlOssController {
             PlatformOssFiles platformOssFilesOne = platformOssFiles.get(0);
             BeanUtils.copyProperties(platformOssFilesOne, uploadVo);
         }
+
+        FilesUtils.delteTempFile(fileNew); // 删除临时文件
+
         return ResponseDto.success(uploadVo);
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/DataController.java

@@ -17,33 +17,38 @@ public class DataController {
 
     @Autowired
     private DataImpl data;
-
-    @PostMapping("performance")
-    @ApiOperation("演出数据迁移")
-    public ResponseDto<Boolean> performance() {
-        Boolean result = data.performance();
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("order")
-    @ApiOperation("订单数据迁移")
-    public ResponseDto<Boolean> order(String month) {
-        Boolean result = data.order(month);
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("roadShow")
-    @ApiOperation("巡演数据迁移")
-    public ResponseDto<Boolean> roadShow() {
-        Boolean result = data.roadShow();
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("childAccount")
-    @ApiOperation("验票子账号数据迁移")
-    public ResponseDto<Boolean> childAccount() {
-        Boolean result = data.childAccount();
-        return ResponseDto.success(result);
-    }
-
+//    @PostMapping("performance")
+//    @ApiOperation("演出数据迁移")
+//    public ResponseDto<Boolean> performance() {
+//        Boolean result = data.performance();
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("order")
+//    @ApiOperation("订单数据迁移")
+//    public ResponseDto<Boolean> order(String month) {
+//        Boolean result = data.order(month);
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("roadShow")
+//    @ApiOperation("巡演数据迁移")
+//    public ResponseDto<Boolean> roadShow() {
+//        Boolean result = data.roadShow();
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("childAccount")
+//    @ApiOperation("验票子账号数据迁移")
+//    public ResponseDto<Boolean> childAccount() {
+//        Boolean result = data.childAccount();
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("SurplusRedis")
+//    @ApiOperation("redis库存迁移")
+//    public ResponseDto<Boolean> SurplusRedis() {
+//        Boolean result = data.SurplusRedis();
+//        return ResponseDto.success(result);
+//    }
 }

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

 package com.liquidnet.service.platform.service.impl.kylin;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -15,13 +21,14 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
-import com.liquidnet.service.kylin.service.*;
 import com.liquidnet.service.platform.utils.DataUtils;
 import com.liquidnet.service.platform.utils.PerformanceVoTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
 
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -148,7 +155,7 @@ public class DataImpl {
                         performances.setDescribes(resultData.getString("describe"));
                         performances.setDetails(resultData.getString("detail"));
                         performances.setCityId(Integer.parseInt(resultData.getString("city_id")));
-                        performances.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + resultData.getInt("field_id"), "city_name"));
+                        performances.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + resultData.getInt("field_id"), "city_name"));
                         performances.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\"}]");
                         performances.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("time_start").toString()));
                         performances.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("time_end").toString()));
@@ -201,7 +208,7 @@ public class DataImpl {
                         performancePartnerVo.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getTimeStart()));
                         performancePartnerVo.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getTimeEnd()));
                         performancePartnerVo.setFieldId(performanceRelations.getFieldId());
-                        performancePartnerVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "name"));
+                        performancePartnerVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "name"));
                         performancePartnerVo.setNotice(performances.getNotice());
                         performancePartnerVo.setSponsorId(performances.getSponsorId());
                         performancePartnerVo.setSponsorType(performances.getSponsorType());
@@ -670,7 +677,7 @@ public class DataImpl {
                     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"));
+                    orderTicketVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + orderTicketRelations.getPerformanceId(), "name"));
 
                     //入场人
                     String enterSql = "select * from order_ticket_entities where order_id = " + orderTickets.getOrderTicketsId(); //设置的预编译语句格式
@@ -927,4 +934,49 @@ public class DataImpl {
             }
         }
     }
+
+//    // redis 库存迁移
+//    private static final JedisPool jedisPool;
+//    private static final ObjectMapper toObjMapper;
+//
+//    static {
+////        DefaultJedisClientConfig.Builder builder = DefaultJedisClientConfig.builder().password("NBs$%6hW").database(15);
+////        jedis = new Jedis(new HostAndPort("zhengzai.redis.rds.aliyuncs.com", 6380), builder.build());
+//
+//        jedisPool = new JedisPool("zhengzai.redis.rds.aliyuncs.com", 6380);
+//
+//        toObjMapper = new ObjectMapper();
+//        toObjMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+//        toObjMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+//        toObjMapper.registerModule(new JavaTimeModule());
+//        toObjMapper.activateDefaultTyping(toObjMapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL);
+//    }
+
+//    public boolean SurplusRedis() {
+//        Jedis jedis = null;
+//        try {
+//            jedis = jedisPool.getResource();
+//            jedis.auth("NBs$%6hW");
+//            jedis.select(15);
+//
+//            List<KylinTicketStatus> ticketStatus = ticketStatusMapper.selectList(Wrappers.lambdaQuery(KylinTicketStatus.class));
+//            for (KylinTicketStatus item : ticketStatus) {
+//                String ticketId = item.getTicketId();
+//                try {
+//                    dataUtils.setSurplusGeneral(ticketId, toObjMapper.readValue(jedis.get(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_GENERAL), Integer.class));
+//                    dataUtils.setSurplusExchange(ticketId, toObjMapper.readValue(jedis.get(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_EXCHANGE), Integer.class));
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//            return true;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return false;
+//        } finally {
+//            if (jedis != null) {
+//                jedis.close();
+//            }
+//        }
+//    }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

 package com.liquidnet.service.platform.service.impl.partner;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -143,7 +142,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performancePartnerVo.setRoadShowId("0");
             performancePartnerVo.setProjectId("0");
             performancePartnerVo.setIsShow(1);
-            performancePartnerVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
+            performancePartnerVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
             performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
 
             mongoTemplate.insert(
@@ -176,7 +175,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performancePartnerVo.setIsSubmit(0);
             performancePartnerVo.setStatus(0);
             performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
-            performancePartnerVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
+            performancePartnerVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
             performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
             if (data != null) { // 有修改记录
                 performancePartnerVo.setIsTrueName(data.getIsTrueName());

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/MongoVoUtils.java

@@ -53,12 +53,12 @@ public class MongoVoUtils {
             KylinPerformanceRelations p3 = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
             //场地相关数据
             KylinFields fields = new KylinFields();
-            String cityName = (String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
-            fields.setCityId(Integer.parseInt((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_id")));
-            fields.setLatitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
-            fields.setLongitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
-            fields.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
-            fields.setName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
+            String cityName = (String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
+            fields.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_id")));
+            fields.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
+            fields.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
+            fields.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
+            fields.setName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
 
             //相关状态时间初始变量
             LocalDateTime stopSellTime = null;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java

@@ -257,8 +257,8 @@ public class PerformanceVoTask {
             performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getCreatedAt())));
             performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getTimeStart())));
             performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getTimeEnd())));
-            performances.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
-            performances.setCityId(Integer.parseInt((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
+            performances.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
+            performances.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
             performances.setUpdatedAt(updatedAt);
 
             performanceStatus.setPerformanceId(performances.getPerformancesId());

liquidnet-bus-service/liquidnet-service-sweet/pom.xml

@@ -59,6 +59,16 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-adam-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/syncRedis/JxlDataController.java

+package com.liquidnet.service.sweet.controller.syncRedis;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.service.impl.syncRedis.JxlDataImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api(tags = "redis数据迁移-jxl")
+@RestController
+@RequestMapping("sync")
+public class JxlDataController {
+
+    @Autowired
+    private JxlDataImpl jxlData;
+
+    /**
+     * basicServices
+     * @return
+     */
+    @PostMapping("basicServices/versions")
+    @ApiOperation("basicServices版本控制数据迁移-可以通过后台编辑")
+    public ResponseDto<Boolean> basicServicesVersions() {
+        Boolean result = jxlData.basicServicesVersions();
+        return ResponseDto.success(result);
+    }
+
+    @PostMapping("basicServices/upush")
+    @ApiOperation("basicServices推送数据迁移")
+    public ResponseDto<Boolean> basicServicesUpush() {
+        Boolean result = jxlData.basicServicesUpush();
+        return ResponseDto.success(result);
+    }
+
+    /**
+     * kylin
+     * @return
+     */
+    @PostMapping("kylin/banner")
+    @ApiOperation("kylin-banner数据迁移-可以通过后台编辑")
+    public ResponseDto<Boolean> kylinBanner() {
+        Boolean result = jxlData.kylinBanner();
+        return ResponseDto.success(result);
+    }
+
+    /**
+     * sweet
+     * @return
+     */
+    @PostMapping("sweet/accessToken")
+    @ApiOperation("sweet-AccessToken数据迁移-可不迁可自动生成")
+    public ResponseDto<Boolean> sweetAccessToken() {
+        Boolean result = jxlData.sweetAccessToken();
+        return ResponseDto.success(result);
+    }
+
+    @PostMapping("sweet/answer")
+    @ApiOperation("sweet-answer数据迁移")
+    public ResponseDto<Boolean> sweetAnswer() {
+        Boolean result = jxlData.sweetAnswer();
+        return ResponseDto.success(result);
+    }
+
+    @PostMapping("sweet/wechatUser/openId")
+    @ApiOperation("sweet-wechatUser-openId数据迁移")
+    public ResponseDto<Boolean> sweetOpenId() {
+        Boolean result = jxlData.sweetOpenId();
+        return ResponseDto.success(result);
+    }
+
+    @PostMapping("sweet/wechatUser/unionId")
+    @ApiOperation("sweet-wechatUser-unionId数据迁移-这里也会同步unionIdStr会抛异常过滤掉")
+    public ResponseDto<Boolean> sweetUnionId() {
+        Boolean result = jxlData.sweetUnionId();
+        return ResponseDto.success(result);
+    }
+
+    @PostMapping("sweet/wechatUser/unionIdStr")
+    @ApiOperation("sweet-wechatUser-unionIdStr数据迁移")
+    public ResponseDto<Boolean> sweetUnionIdStr() {
+        Boolean result = jxlData.sweetUnionIdStr();
+        return ResponseDto.success(result);
+    }
+
+    /*kylin:order:ExpressStatus:id:138291855523471362201224 // 无数据暂时 一条是测试
+    // 下面会自动降级mongo
+    kylin:order:refund:orderId:1000651
+    kylin:order:refund:orderRefundsId:1381407542789734445377
+    kylin:performances:exclusive
+    kylin:performances:notice
+    kylin:performances:recommend
+    kylin:performances:systemRecommend
+    kylin:performances:cityName:七台河
+    kylin:performances:id:103866917946163208505924
+    kylin:performances:roadShowId:14301561753157632035424*/
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/JxlDataImpl.java

+package com.liquidnet.service.sweet.service.impl.syncRedis;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.vo.admin.ZhengzaiAppVersionsVo;
+import com.liquidnet.service.kylin.entity.KylinBanners;
+import com.liquidnet.service.sweet.entity.SweetWechatUser;
+import com.liquidnet.service.sweet.vo.SweetAnswerVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Set;
+
+@Service
+@Slf4j
+public class JxlDataImpl {
+
+    @Autowired
+    private RedisUtil redisUtil;
+
+    private static final JedisPool jedisPool;
+    private static final ObjectMapper toObjMapper;
+
+    static {
+        //        r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com test
+//        39.106.122.201 dev
+//        zhengzai.redis.rds.aliyuncs.com 线上
+        jedisPool = new JedisPool("zhengzai.redis.rds.aliyuncs.com", 6380);
+
+        toObjMapper = new ObjectMapper();
+        toObjMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        toObjMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        toObjMapper.registerModule(new JavaTimeModule());
+        toObjMapper.activateDefaultTyping(toObjMapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL);
+    }
+
+    private Jedis getRedis() {
+        Jedis resource = jedisPool.getResource();
+        resource.auth("NBs$%6hW"); // 线上
+//        resource.auth("PO@B!Iud32"); // test
+        resource.select(15);
+        return resource;
+    }
+
+    public Boolean basicServicesVersions() {
+        try {
+//        RedisTemplate<String, Object> redis = redisUtil.getRedisTemplateByDb(15);
+            Jedis redis = getRedis();
+
+            String appAndroid = KylinRedisConst.ZHENGZAI_APP_VERSIONS_ANDROID; // 81
+            String appIos = KylinRedisConst.ZHENGZAI_APP_VERSIONS_IOS; // 43
+            String checkAndroid = KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_ANDROID; // 244
+            String checkIos = KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_IOS; // 230
+
+            ZhengzaiAppVersionsVo appAndroidValue = toObjMapper.readValue(redis.get(appAndroid), ZhengzaiAppVersionsVo.class);
+            redisUtil.set(appAndroid, appAndroidValue);
+            ZhengzaiAppVersionsVo appIosValue = toObjMapper.readValue(redis.get(appIos), ZhengzaiAppVersionsVo.class);
+            redisUtil.set(appIos, appIosValue);
+            ZhengzaiAppVersionsVo checkAndroidValue = toObjMapper.readValue(redis.get(checkAndroid), ZhengzaiAppVersionsVo.class);
+            redisUtil.set(checkAndroid, checkAndroidValue);
+            ZhengzaiAppVersionsVo checkIosValue = toObjMapper.readValue(redis.get(checkIos), ZhengzaiAppVersionsVo.class);
+            redisUtil.set(checkIos, checkIosValue);
+
+            return true;
+        } catch (Exception e) {
+            log.error("basicServicesVersionsError", e);
+            return false;
+        }
+    }
+
+    public Boolean basicServicesUpush() {
+        try {
+//        RedisTemplate<String, Object> redis = redisUtil.getRedisTemplateByDb(15);
+            Jedis redis = getRedis();
+
+            String pushAndroid = KylinRedisConst.ADMIN_UPUSH_LIST_IOS; // 74
+            String pushIos = KylinRedisConst.ADMIN_UPUSH_LIST_ANDROID; // 123
+
+//            LinkedList<AdminUpushVo> pushAndroidList = (LinkedList<AdminUpushVo>) redis.get(pushAndroid);
+            LinkedList<AdminUpushVo> pushAndroidList = toObjMapper.readValue(redis.get(pushAndroid), new TypeReference<LinkedList<AdminUpushVo>>() {
+            });
+            redisUtil.set(pushAndroid, pushAndroidList);
+//            LinkedList<AdminUpushVo> pushIosList = (LinkedList<AdminUpushVo>) redis.get(pushIos);
+            LinkedList<AdminUpushVo> pushIosList = toObjMapper.readValue(redis.get(pushIos), new TypeReference<LinkedList<AdminUpushVo>>() {
+            });
+            redisUtil.set(pushIos, pushIosList);
+
+            return true;
+        } catch (Exception e) {
+            log.error("basicServicesUpushError", e);
+            return false;
+        }
+    }
+
+    public Boolean sweetAccessToken() {
+//        sweet:accessToken:applet:zhengzai:access_token:wx4732efeaa2b08086
+//        sweet:accessToken:applet:strawberry:access_token:wx08b852ade69f8019
+        return true;
+    }
+
+    public Boolean sweetAnswer() {
+        try {
+//        RedisTemplate<String, Object> redis = redisUtil.getRedisTemplateByDb(15);
+            Jedis redis = getRedis();
+
+            String redisKey = "sweet:answer:phone*";
+
+            Set<String> keys = redis.keys(redisKey);
+            for (String key : keys) {
+                SweetAnswerVo answer = toObjMapper.readValue(redis.get(key), SweetAnswerVo.class);
+                redisUtil.set(key, answer);
+            }
+
+            return true;
+        } catch (Exception e) {
+            log.error("sweetAnswerError", e);
+            return false;
+        }
+    }
+
+    public Boolean sweetOpenId() {
+        try {
+//        RedisTemplate<String, Object> redis = redisUtil.getRedisTemplateByDb(15);
+            Jedis redis = getRedis();
+
+            String redisKey = "sweet:wechatUser:openId*";
+
+            Set<String> keys = redis.keys(redisKey);
+            for (String key : keys) {
+                String value = redis.get(key);
+                redisUtil.set(key, value);
+            }
+
+            return true;
+        } catch (Exception e) {
+            log.error("sweetOpenIdError", e);
+            return false;
+        }
+    }
+
+    public Boolean sweetUnionId() {
+        try {
+//        RedisTemplate<String, Object> redis = redisUtil.getRedisTemplateByDb(15);
+            Jedis redis = getRedis();
+
+            String redisKey = "sweet:wechatUser:unionId*";
+
+            Set<String> keys = redis.keys(redisKey);
+            for (String key : keys) {
+                try {
+                    SweetWechatUser userInfo = toObjMapper.readValue(redis.get(key), SweetWechatUser.class);
+                    redisUtil.set(key, userInfo);
+                } catch (Exception e) {
+                    log.error("同步wechatUser失败" + key, e);
+                }
+            }
+
+            return true;
+        } catch (Exception e) {
+            log.error("sweetUnionIdError", e);
+            return false;
+        }
+    }
+
+    public Boolean sweetUnionIdStr() {
+        try {
+//        RedisTemplate<String, Object> redis = redisUtil.getRedisTemplateByDb(15);
+            Jedis redis = getRedis();
+
+            String redisKey = "sweet:wechatUser:unionIdStr*";
+
+            Set<String> keys = redis.keys(redisKey);
+            for (String key : keys) {
+                String value = redis.get(key);
+                redisUtil.set(key, value);
+            }
+
+            return true;
+        } catch (Exception e) {
+            log.error("sweetUnionIdStrError", e);
+            return false;
+        }
+    }
+
+    public Boolean kylinBanner() {
+        try {
+//        RedisTemplate<String, Object> redis = redisUtil.getRedisTemplateByDb(15);
+            Jedis redis = getRedis();
+
+            String bannerKey = KylinRedisConst.ADMIN_BANNER_LIST; // 112
+
+//            ArrayList<KylinBanners> bannerList = (ArrayList<KylinBanners>) redis.get(bannerKey);
+            ArrayList<KylinBanners> bannerList = toObjMapper.readValue(redis.get(bannerKey), new TypeReference<ArrayList<KylinBanners>>() {
+            });
+            redisUtil.set(bannerKey, bannerList);
+
+            return true;
+        } catch (Exception e) {
+            log.error("kylinBannerError", e);
+            return false;
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -5,7 +5,7 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
@@ -59,10 +59,10 @@ public class RedisDataUtils {
             if (!item.getIsMember().equals(1)) {
                 item.setTimeSell(DateUtil.format(DateUtil.addMin(DateUtil.parse(item.getTimeSell(), "yyyy-MM-dd HH:mm:ss"), item.getPayCountdownMinute()), DateUtil.Formatter.yyyyMMddHHmmss));
             }
-            item.setFieldName((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "name"));
-            item.setCityName((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "city_name"));
-            item.setLatitude((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "latitude"));
-            item.setLongitude((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "longitude"));
+            item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
+            item.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "city_name"));
+            item.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "latitude"));
+            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));
         }
         redisUtil.set(redisKey, data);
         return data;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisMDSKDataUtils.java

@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.entity.*;
@@ -48,10 +49,10 @@ public class RedisMDSKDataUtils {
             if(!item.getIsMember().equals(1)){
                 item.setTimeSell(DateUtil.format(DateUtil.addMin(DateUtil.parse(item.getTimeSell(),"yyyy-MM-dd HH:mm:ss"),-item.getPayCountdownMinute()),DateUtil.Formatter.yyyyMMddHHmmss));
             }
-            item.setFieldName((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "name"));
-            item.setCityName((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "city_name"));
-            item.setLatitude((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "latitude"));
-            item.setLongitude((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "longitude"));
+            item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
+            item.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "city_name"));
+            item.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "latitude"));
+            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));
         }
         redisUtil.set(redisKey, data);
         return data;