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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -32,7 +32,7 @@ public class KylinRedisConst {
     public static final String USE_TIME = "useTime";
     public static final String BUY_COUNT = "buyCount";
 
-    public static final String ENTER_INFO = "kylin:enter:info:id:";//入场须知
+    public static final String ENTER_INFO = "kylin:enter:info";//入场须知
 
     public static final String CHECK_USER = "kylin:checkUser:id:";
     public static final String CHECK_USER_RELATION = "kylin:checkUser:relation:id:";

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -68,4 +68,33 @@ public class MQConst {
             return desc;
         }
     }
+
+
+    public enum SweetQueue {
+        artists_watch("sweet:stream:rk.artists.watch", "group.artists.watch", "艺人-想看"),
+        artists_signature("sweet:stream:rk.artists.signature", "group.artists.signature", "艺人-签售通知"),
+        ;
+
+        private final String key;
+        private final String group;
+        private final String desc;
+
+        SweetQueue(String key, String group, String desc) {
+            this.key = key;
+            this.group = group;
+            this.desc = desc;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public String getGroup() {
+            return group;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+    }
 }

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

@@ -47,8 +47,6 @@ liquidnet:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
         callback: http://devadam.zhengzai.tv/adam/member/order/callback
-      url-service:
-        url: http://devservice.zhengzai.tv
     kylin:
       url-pay:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
@@ -69,13 +67,8 @@ liquidnet:
           addresses: 127.0.0.1:8090
   client:
     admin:
-      phpPayUrl: https://devdragon.zhengzai.tv
-      kylinApiUrl: https://devkylin.zhengzai.tv
-      phpServiceUrl: https://devservice.zhengzai.tv
-      phpoMediaApiUrl: https://devmediaapi.zhengzai.tv
+      phpPayUrl: http://devdragon.zhengzai.tv
       phpMallUrl: https://devmall.zhengzai.tv
-      phpMerchantApiUrl: https://devmerchantapi.zhengzai.tv
-      phpPassportUrl: https://devpassport.zhengzai.tv
       platformUrl: https://devplatform.zhengzai.tv
       shunfeng:
         url: "https://butler-dev-ms.sf-express.com"

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

@@ -47,8 +47,6 @@ liquidnet:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
         callback: http://testadam.zhengzai.tv/adam/member/order/callback
-      url-service:
-        url: http://testservice.zhengzai.tv
     kylin:
       url-pay:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
@@ -69,13 +67,8 @@ liquidnet:
           addresses: 172.17.121.166:8090
   client:
     admin:
-      phpPayUrl: https://testdragon.zhengzai.tv/
-      kylinApiUrl: https://testkylin.zhengzai.tv
-      phpServiceUrl: https://testservice.zhengzai.tv
-      phpoMediaApiUrl: https://testmediaapi.zhengzai.tv
+      phpPayUrl: http://testdragon.zhengzai.tv
         phpMallUrl: https://testmall.zhengzai.tv
-      phpMerchantApiUrl: https://testmerchantapi.zhengzai.tv
-      phpPassportUrl: https://testpassport.zhengzai.tv
         platformUrl: https://testplatform.zhengzai.tv
       shunfeng:
         url: "https://butler-dev-ms.sf-express.com"

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

@@ -12,9 +12,6 @@ liquidnet:
     config: classpath:logback-spring.xml
     file-max-size: 200MB
     level: debug
-  rabbitmq:
-    adam:
-      connection-timeout: 5000
   mysql:
     database-name: dev_ln_scene
   mongodb:
@@ -24,8 +21,6 @@ liquidnet:
     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}
   reviewer:
     app-login:
       mobile: 13724286255

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

@@ -12,9 +12,6 @@ liquidnet:
     config: classpath:logback-spring.xml
     file-max-size: 200MB
     level: debug
-  rabbitmq:
-    adam:
-      connection-timeout: 5000
   mysql:
     database-name: test_ln_scene
   mongodb:
@@ -24,8 +21,6 @@ liquidnet:
     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}
   reviewer:
     app-login:
       mobile: 13724286255

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

@@ -69,14 +69,10 @@ spring:
   profiles:
     include: common-service #这里加载management相关公共配置
   autoconfigure:
-    exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.adam.host}
-    port: ${liquidnet.rabbitmq.adam.port}
-    username: ${liquidnet.rabbitmq.adam.username}
-    password: ${liquidnet.rabbitmq.adam.password}
-    virtual-host: ${liquidnet.rabbitmq.adam.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.adam.connection-timeout}
+    exclude:
+      - org.springframework.cloud.bus.BusAutoConfiguration
+      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+      - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
   redis:
     database: 15
     port: ${liquidnet.redis.port}

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

@@ -16,9 +16,6 @@ liquidnet:
     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:
-    adam:
-      connection-timeout: 5000
   mysql:
     database-name: dev_ln_scene
 

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

@@ -16,9 +16,6 @@ liquidnet:
     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:
-    adam:
-      connection-timeout: 5000
   mysql:
     database-name: test_ln_scene
 

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

@@ -56,18 +56,6 @@ spring:
     name: ${liquidnet.info.name}
   profiles:
     include: common-service #这里加载management相关公共配置
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.adam.host}
-    port: ${liquidnet.rabbitmq.adam.port}
-    username: ${liquidnet.rabbitmq.adam.username}
-    password: ${liquidnet.rabbitmq.adam.password}
-    virtual-host: ${liquidnet.rabbitmq.adam.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.adam.connection-timeout}
-    publisher-confirms: true
-    publisher-returns: true
-    listener:
-      simple:
-        acknowledge-mode: manual
   redis:
     database: 15
     port: ${liquidnet.redis.port}

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

@@ -16,8 +16,6 @@ liquidnet:
     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: 5000
   mysql:
     database-name: dev_ln_scene
   mongodb:

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

@@ -16,8 +16,6 @@ liquidnet:
     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: test_ln_scene
   mongodb:

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

@@ -56,18 +56,6 @@ spring:
     name: ${liquidnet.info.name}
   profiles:
     include: common-service #这里加载management相关公共配置
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-    virtual-host: ${liquidnet.rabbitmq.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
-    publisher-confirms: true
-    publisher-returns: true
-    listener:
-      simple:
-        acknowledge-mode: manual
   redis:
     database: 0
     port: ${liquidnet.redis.dragon.port}

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

@@ -16,8 +16,6 @@ liquidnet:
     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: 5000
   mysql:
     database-name: dev_ln_scene
   mongodb:

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

@@ -16,8 +16,6 @@ liquidnet:
     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: test_ln_scene
   mongodb:

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

@@ -56,18 +56,6 @@ spring:
     name: ${liquidnet.info.name}
   profiles:
     include: common-service #这里加载management相关公共配置
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-    virtual-host: ${liquidnet.rabbitmq.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
-    publisher-confirms: true
-    publisher-returns: true
-    listener:
-      simple:
-        acknowledge-mode: manual
   redis:
     database: 15
     port: ${liquidnet.redis.port}

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

@@ -15,8 +15,6 @@ liquidnet:
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
-  rabbitmq:
-    connection-timeout: 5000
   mysql:
     database-name: dev_ln_scene
   mongodb:

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

@@ -15,8 +15,6 @@ liquidnet:
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
-  rabbitmq:
-    connection-timeout: 5000
   mysql:
     database-name: test_ln_scene
   mongodb:

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

@@ -71,13 +71,6 @@ spring:
     include: common-service #这里加载management相关公共配置
   autoconfigure:
     exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-    virtual-host: ${liquidnet.rabbitmq.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
     database: 0
     port: ${liquidnet.redis.dragon.port}

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

@@ -68,7 +68,10 @@ spring:
     refresh:
       refreshable: none
   autoconfigure:
-    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
+    exclude:
+      - org.springframework.cloud.bus.BusAutoConfiguration
+      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+      - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
 #  rabbitmq:
 #    addresses: ${liquidnet.rabbitmq.host}
 #    port: ${liquidnet.rabbitmq.port}

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

@@ -15,8 +15,6 @@ liquidnet:
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
-  rabbitmq:
-    connection-timeout: 5000
   mysql:
     database-name: dev_ln_scene
   mongodb:

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

@@ -15,8 +15,6 @@ liquidnet:
     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: test_ln_scene
   mongodb:

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

@@ -71,14 +71,6 @@ spring:
     include: common-service #这里加载management相关公共配置
   autoconfigure:
     exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-    virtual-host: ${liquidnet.rabbitmq.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
     database: 15
     port: ${liquidnet.redis.port}

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

@@ -15,8 +15,6 @@ liquidnet:
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
-  rabbitmq:
-    connection-timeout: 5000
   mysql:
     database-name: dev_ln_scene
   mongodb:

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

@@ -15,8 +15,6 @@ liquidnet:
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
-  rabbitmq:
-    connection-timeout: 5000
   mysql:
     database-name: test_ln_scene
   mongodb:

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

@@ -71,13 +71,6 @@ spring:
     include: common-service #这里加载management相关公共配置
   autoconfigure:
     exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-    virtual-host: ${liquidnet.rabbitmq.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
     database: 15
     port: ${liquidnet.redis.port}

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

@@ -21,5 +21,16 @@ liquidnet:
     database: dev_ln_scene
   shunfeng:
     sk: ${liquidnet.client.admin.shunfeng.sk}
-
+  al-oss:
+    imgUrl: "https://img.zhengzai.tv/"
+    appUrl: "https://app.zhengzai.tv/"
+    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
+    accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
+  zhengzai-wechat:
+    appid: wx3498304dda39c5a1
+    secret: a1307fab0a5f2380086a7c636f7339ea
+  modernsky-wechat:
+    appid: wx769aa9167bef9ce2
+    secret: bebccc204b9472ba41661372b197eb81
 #以下为spring各环境个性配置

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

@@ -21,5 +21,17 @@ liquidnet:
     database: test_ln_scene
   shunfeng:
     sk: ${liquidnet.client.admin.shunfeng.sk}
+  al-oss:
+    imgUrl: "https://img.zhengzai.tv/"
+    appUrl: "https://app.zhengzai.tv/"
+    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
+    accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
+  zhengzai-wechat:
+    appid: wx3498304dda39c5a1
+    secret: a1307fab0a5f2380086a7c636f7339ea
+  modernsky-wechat:
+    appid: wx769aa9167bef9ce2
+    secret: bebccc204b9472ba41661372b197eb81
 
 #以下为spring各环境个性配置

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

@@ -146,18 +146,3 @@ global-auth:
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------
-
-# -----------------------------------------------------------
-liquidnet:
-  al-oss:
-    imgUrl: "https://img.zhengzai.tv/"
-    appUrl: "https://app.zhengzai.tv/"
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
-    accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
-    accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
-  zhengzai-wechat:
-    appid: wx3498304dda39c5a1
-    secret: a1307fab0a5f2380086a7c636f7339ea
-  modernsky-wechat:
-    appid: wx769aa9167bef9ce2
-    secret: bebccc204b9472ba41661372b197eb81
\ No newline at end of file

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

@@ -12,8 +12,6 @@ liquidnet:
     config: classpath:logback-spring.xml
     file-max-size: 200MB
     level: debug
-  rabbitmq:
-    connection-timeout: 5000
   mysql:
     database-name: dev_ln_scene
   mongodb:

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

@@ -12,8 +12,6 @@ liquidnet:
     config: classpath:logback-spring.xml
     file-max-size: 200MB
     level: debug
-  rabbitmq:
-    connection-timeout: 5000
   mysql:
     database-name: test_ln_scene
   mongodb:

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

@@ -68,13 +68,6 @@ spring:
       max-request-size: 100MB
   profiles:
     include: common-service #这里加载management相关公共配置
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-    virtual-host: ${liquidnet.rabbitmq.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
     database: 9
     port: ${liquidnet.redis.port}

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

@@ -23,11 +23,6 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-mq</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-cache-redis</artifactId>

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

 package com.liquidnet.service;
 
 import lombok.extern.slf4j.Slf4j;
-import org.mybatis.spring.annotation.MapperScan;
 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.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.MongoTransactionManager;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Arrays;
 
 @Slf4j

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

@@ -32,7 +32,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
@@ -47,7 +46,6 @@ import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 

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

 package com.liquidnet.service.adam.util;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -12,8 +11,8 @@ import java.util.HashMap;
 @Component
 public class QueueUtils {
 
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
     @Autowired
     StringRedisTemplate stringRedisTemplate;
 
@@ -24,9 +23,9 @@ public class QueueUtils {
      * @param routeKey 路径
      * @param jsonMsg  Json字符串
      */
-    public void sendMsgByRabbit(String exchange, String routeKey, String jsonMsg) {
-        rabbitTemplate.convertAndSend(exchange, routeKey, jsonMsg);
-    }
+//    public void sendMsgByRabbit(String exchange, String routeKey, String jsonMsg) {
+//        rabbitTemplate.convertAndSend(exchange, routeKey, jsonMsg);
+//    }
 
     /**
      * 发送消息 - REDIS

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/test/java/com/liquidnet/service/adam/test/TestRabbitMq.java

 package com.liquidnet.service.adam.test;
 
-import com.liquidnet.common.mq.constant.MQConst;
-import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
-import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
-import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
-import com.liquidnet.service.base.SqlMapping;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.CollectionUtils;
-
-import java.time.LocalDateTime;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -33,29 +19,29 @@ import java.util.List;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
 public class TestRabbitMq {
-    @Autowired
-    RabbitTemplate rabbitTemplate;
+//    @Autowired
+//    RabbitTemplate rabbitTemplate;
 
     @Test
     public void testRibbitMqConn(){
-        LocalDateTime now = LocalDateTime.now();
-        LinkedList<String> toMqSqls = new LinkedList<>();
-        toMqSqls.add(SqlMapping.get("adam_user.close"));
-        LinkedList<Object[]> objsUser = new LinkedList<>();
-        objsUser.add(new Object[]{now, now, "0001"});
-        objsUser.add(new Object[]{now, now, "0002"});
-        objsUser.add(new Object[]{now, now, "0003"});
-        for(int i=0;i<100000;i++){
-            try {
-                Thread.sleep(200l);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            objsUser.add(new Object[]{now, now, "000"+i});
-        }
-        long s = System.currentTimeMillis();
-        rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
-                SqlMapping.gets(toMqSqls, objsUser));
-        log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
+//        LocalDateTime now = LocalDateTime.now();
+//        LinkedList<String> toMqSqls = new LinkedList<>();
+//        toMqSqls.add(SqlMapping.get("adam_user.close"));
+//        LinkedList<Object[]> objsUser = new LinkedList<>();
+//        objsUser.add(new Object[]{now, now, "0001"});
+//        objsUser.add(new Object[]{now, now, "0002"});
+//        objsUser.add(new Object[]{now, now, "0003"});
+//        for(int i=0;i<100000;i++){
+//            try {
+//                Thread.sleep(200l);
+//            } catch (InterruptedException e) {
+//                e.printStackTrace();
+//            }
+//            objsUser.add(new Object[]{now, now, "000"+i});
+//        }
+//        long s = System.currentTimeMillis();
+//        rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
+//                SqlMapping.gets(toMqSqls, objsUser));
+//        log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
     }
 }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/service/processor/ConsumerPayProcessor.java

-package com.liquidnet.service.consumer.dragon.service.processor;
-
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.base.SqlMapping;
-import com.liquidnet.service.consumer.dragon.service.IBaseDao;
-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.data.redis.connection.stream.MapRecord;
-import org.springframework.data.redis.stream.StreamListener;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-
-/**
- * @author AnJiabin <anjiabin@zhengzai.tv>
- * @version V1.0
- * @Description: TODO
- * @class: ConsumerPayProcessor
- * @Package com.liquidnet.service.consumer.dragon.service.processor
- * @Copyright: LightNet @ Copyright (c) 2021
- * @date 2021/7/8 10:59
- */
-@Slf4j
-@Component
-public class ConsumerPayProcessor implements StreamListener<String, MapRecord<String, String, String>> {
-    @Resource
-    IBaseDao baseDao;
-    @Override
-    public void onMessage(MapRecord<String, String, String> message) {
-        log.info("接受到来自redis PAY 的消息");
-        System.out.println("message id "+message.getId());
-        System.out.println("stream "+message.getStream());
-        System.out.println("body "+message.getValue());
-    }
-
-
-    private void consumerSqlDaoHandler(Message msg, Channel channel) {
-        MessageProperties properties = msg.getMessageProperties();
-        String consumerQueue = properties.getConsumerQueue();
-        long deliveryTag = properties.getDeliveryTag();
-        log.info("CONSUMER SQL ==> [consumerQueue:{},deliveryTag:{}]", consumerQueue, deliveryTag);
-        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
-        log.debug("CONSUMER SQL ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
-        log.debug("CONSUMER SQL ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
-        try {
-            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
-            log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls);
-            if (rstBatchSqls) {
-                channel.basicAck(deliveryTag, false);
-            } else {
-                log.warn("###CONSUMER SQL[consumerQueue:{},deliveryTag={},sqlMessage:{}]", consumerQueue, deliveryTag, JsonUtils.toJson(sqlMessage));
-                channel.basicAck(deliveryTag, false);
-            }
-        } catch (IOException e) {
-            log.error("CONSUMER SQL[consumerQueue:{},deliveryTag:{},sqlMessage:{}]", consumerQueue, deliveryTag, JsonUtils.toJson(sqlMessage), e);
-        }
-    }
-}
+//package com.liquidnet.service.consumer.dragon.service.processor;
+//
+//import com.liquidnet.commons.lang.util.JsonUtils;
+//import com.liquidnet.service.base.SqlMapping;
+//import com.liquidnet.service.consumer.dragon.service.IBaseDao;
+//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.data.redis.connection.stream.MapRecord;
+//import org.springframework.data.redis.stream.StreamListener;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.Resource;
+//import java.io.IOException;
+//
+///**
+// * @author AnJiabin <anjiabin@zhengzai.tv>
+// * @version V1.0
+// * @Description: TODO
+// * @class: ConsumerPayProcessor
+// * @Package com.liquidnet.service.consumer.dragon.service.processor
+// * @Copyright: LightNet @ Copyright (c) 2021
+// * @date 2021/7/8 10:59
+// */
+//@Slf4j
+//@Component
+//public class ConsumerPayProcessor implements StreamListener<String, MapRecord<String, String, String>> {
+//    @Resource
+//    IBaseDao baseDao;
+//    @Override
+//    public void onMessage(MapRecord<String, String, String> message) {
+//        log.info("接受到来自redis PAY 的消息");
+//        System.out.println("message id "+message.getId());
+//        System.out.println("stream "+message.getStream());
+//        System.out.println("body "+message.getValue());
+//    }
+//
+//
+//    private void consumerSqlDaoHandler(Message msg, Channel channel) {
+//        MessageProperties properties = msg.getMessageProperties();
+//        String consumerQueue = properties.getConsumerQueue();
+//        long deliveryTag = properties.getDeliveryTag();
+//        log.info("CONSUMER SQL ==> [consumerQueue:{},deliveryTag:{}]", consumerQueue, deliveryTag);
+//        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
+//        log.debug("CONSUMER SQL ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
+//        log.debug("CONSUMER SQL ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
+//        try {
+//            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+//            log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls);
+//            if (rstBatchSqls) {
+//                channel.basicAck(deliveryTag, false);
+//            } else {
+//                log.warn("###CONSUMER SQL[consumerQueue:{},deliveryTag={},sqlMessage:{}]", consumerQueue, deliveryTag, JsonUtils.toJson(sqlMessage));
+//                channel.basicAck(deliveryTag, false);
+//            }
+//        } catch (IOException e) {
+//            log.error("CONSUMER SQL[consumerQueue:{},deliveryTag:{},sqlMessage:{}]", consumerQueue, deliveryTag, JsonUtils.toJson(sqlMessage), e);
+//        }
+//    }
+//}

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

@@ -17,11 +17,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-mq</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-web</artifactId>

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

@@ -4,17 +4,9 @@ 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.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
-import org.springframework.cloud.bus.BusAutoConfiguration;
 import org.springframework.core.env.Environment;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.PlatformTransactionManager;
 
-import javax.sql.DataSource;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/ServiceExecutorMainApplication.java

@@ -4,13 +4,7 @@ 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.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.bus.BusAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.core.env.Environment;
 
@@ -23,7 +17,6 @@ import java.util.Arrays;
 @SpringBootApplication(
         scanBasePackages = {"com.liquidnet"}
 )
-@EnableAutoConfiguration(exclude = {BusAutoConfiguration.class,RabbitAutoConfiguration.class})
 public class ServiceExecutorMainApplication implements CommandLineRunner {
     @Autowired
     private Environment environment;

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

@@ -17,11 +17,6 @@
             <artifactId>liquidnet-common-cache-redis</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-mq</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-cache-redisson</artifactId>

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

@@ -239,7 +239,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 orderTicketVo.setOrderRefundListVos(orderRefundListVos);
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
                 vo.setOrderTicketVo(orderTicketVo);
-                vo.setEnterDescribe(dataUtils.getEnterInfo("1"));
+                vo.setEnterDescribe(dataUtils.getEnterInfo(performanceVo.getType(),orderTicketVo.getGetTicketType(),orderTicketVo.getIsStudent(),ticketVo.getIsTrueName()));
             }
             log.info(UserPathDto.setData("订单详情", orderId, vo));
             return vo;

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

@@ -123,16 +123,52 @@ public class DataUtils {
 
     /**
      * 获取入场须知
+     * 11：音乐节电子票实名 12：音乐节快递票实名 13音乐节电子票非实名 14音乐节快递票非实名 15：音乐节电子学生票实名 16：音乐节快递学生票实名 17音乐节电子学生票非实名 18音乐节快递学生票非实名
+     * 21：巡演电子票实名 22：巡演快递票实名 23巡演电子票非实名 24巡演快递票非实名 25：巡演电子学生票实名 26：巡演快递学生票实名 27巡演电子学生票非实名 28巡演快递学生票非实名
      *
-     * @param enterInfoId
+     * @param type       类型：101音乐节 102小型演出(livehouse演出) 103巡演
+     * @param ticketType 票种类型：电子票electronic快递票express
+     * @param isStudent  是否学生票：0否1是
+     * @param isTrueName 是否实名：0否1是
      * @return
      */
-    public String getEnterInfo(String enterInfoId) {
-        Object obj = redisUtil.get(KylinRedisConst.ENTER_INFO + enterInfoId);
+    public String getEnterInfo(int type, String ticketType, Integer isStudent, Integer isTrueName) {
+        String redisKey = KylinRedisConst.ENTER_INFO.concat(":type:" + type).concat(":ticketType:" + ticketType).concat(":isStudent:" + isStudent).concat(":isTrueName:" + isTrueName);
+        Object obj = redisUtil.get(redisKey);
         if (obj != null) {
             return (String) obj;
         } else {
-            return "入场须知";
+            String content = "";
+            if (type == 101) {
+                content = content.concat("音乐节");
+            } else if (type == 102) {
+                content = content.concat("巡演");
+            } else if (type == 103) {
+                content = content.concat("巡演");
+            }
+
+            if (isStudent == 0) {
+                if (ticketType.equalsIgnoreCase("electronic")) {
+                    content = content.concat("电子票");
+                } else if (ticketType.equalsIgnoreCase("express")) {
+                    content = content.concat("快递票");
+                }
+            } else if (isStudent == 1) {
+                if (ticketType.equalsIgnoreCase("electronic")) {
+                    content = content.concat("电子学生票");
+                } else if (ticketType.equalsIgnoreCase("express")) {
+                    content = content.concat("快递学生票");
+                }
+            }
+
+            if (isTrueName == 0) {
+                content = content.concat("非实名");
+            } else if (isTrueName == 1) {
+                content = content.concat("实名");
+            }
+
+            redisUtil.set(redisKey, content);
+            return content;
         }
     }
 
@@ -468,7 +504,7 @@ public class DataUtils {
     public List<KylinOrderExpressRouteVo> getOrderExpressRoute(String orderTicketsId) { // 获取
         String redisKey = KylinRedisConst.ORDER_ROUTE_INFO.concat(orderTicketsId);
         Object obj = redisUtil.get(redisKey);
-        if (obj==null) {
+        if (obj == null) {
             List<KylinOrderExpressRouteVo> routeVoList = mongoTemplate.find(
                     Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)),
                     KylinOrderExpressRouteVo.class, KylinOrderExpressRouteVo.class.getSimpleName()
@@ -476,7 +512,7 @@ public class DataUtils {
             redisUtil.set(redisKey, routeVoList);
             return routeVoList;
         }
-        return (List<KylinOrderExpressRouteVo>)obj;
+        return (List<KylinOrderExpressRouteVo>) obj;
     }
 
     public KylinOrderExpressVo getOrderExpressInfos(String orderId) {

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

 package com.liquidnet.service.kylin.utils;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -12,8 +11,8 @@ import java.util.HashMap;
 @Component
 public class QueueUtils {
 
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
     @Autowired
     StringRedisTemplate stringRedisTemplate;
 
@@ -24,9 +23,9 @@ public class QueueUtils {
      * @param routeKey 路径
      * @param jsonMsg  Json字符串
      */
-    public void sendSqlRabbit(String exchange, String routeKey, String jsonMsg) {
-        rabbitTemplate.convertAndSend(exchange, routeKey, jsonMsg);
-    }
+//    public void sendSqlRabbit(String exchange, String routeKey, String jsonMsg) {
+//        rabbitTemplate.convertAndSend(exchange, routeKey, jsonMsg);
+//    }
 
     /**
      * 发送消息 - REDIS

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

@@ -17,11 +17,6 @@
             <artifactId>liquidnet-common-cache-redis</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-mq</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-cache-redisson</artifactId>

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/QueueUtils.java

 package com.liquidnet.service.order.utils;
 
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 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.stereotype.Component;
@@ -12,8 +10,8 @@ import java.util.HashMap;
 @Component
 public class QueueUtils {
 
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
     @Autowired
     StringRedisTemplate stringRedisTemplate;
 
@@ -24,9 +22,9 @@ public class QueueUtils {
      * @param route    路径
      * @param sqlStr   Json字符串
      */
-    public void sendSqlRabbit(String exchange, String route, String sqlStr) {
-            rabbitTemplate.convertAndSend(exchange, route, sqlStr);
-    }
+//    public void sendSqlRabbit(String exchange, String route, String sqlStr) {
+//            rabbitTemplate.convertAndSend(exchange, route, sqlStr);
+//    }
 
     /**
      * 发送消息 - REDIS

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

@@ -23,16 +23,6 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-mq</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redis</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-cache-redisson</artifactId>

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

@@ -39,4 +39,11 @@ public class DataController {
         return ResponseDto.success(result);
     }
 
+    @PostMapping("childAccount")
+    @ApiOperation("验票子账号数据迁移")
+    public ResponseDto<Boolean> childAccount() {
+        Boolean result = data.childAccount();
+        return ResponseDto.success(result);
+    }
+
 }

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

+package com.liquidnet.service.platform.service.impl.kylin;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.kylin.entity.KylinCheckUser;
+import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
+import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
+import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 巡演 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Service
+public class DMCheckUserPerformanceServiceImpl extends ServiceImpl<KylinCheckUserPerformancesMapper, KylinCheckUserPerformances> {
+
+}

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

+package com.liquidnet.service.platform.service.impl.kylin;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.kylin.entity.KylinCheckUser;
+import com.liquidnet.service.kylin.entity.KylinRoadShows;
+import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
+import com.liquidnet.service.kylin.mapper.KylinRoadShowsMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 巡演 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Service
+public class DMCheckUserServiceImpl extends ServiceImpl<KylinCheckUserMapper, KylinCheckUser> {
+
+}

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

 package com.liquidnet.service.platform.service.impl.kylin;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.common.mq.constant.MQConst;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.base.SqlMapping;
-import com.liquidnet.service.kylin.dto.param.KylinStationUploadParam;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
-import com.liquidnet.service.kylin.service.IKylinOrderTicketEntitiesService;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.client.model.UpdateOneModel;
-import com.mongodb.client.model.WriteModel;
 import lombok.extern.slf4j.Slf4j;
-import org.bson.Document;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * <p>
  * 订单详情 服务实现类

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

@@ -3,8 +3,12 @@ package com.liquidnet.service.platform.service.impl.kylin;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
@@ -17,6 +21,7 @@ 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 java.math.BigDecimal;
 import java.sql.Connection;
@@ -26,6 +31,7 @@ import java.sql.ResultSet;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 @Service
 public class DataImpl {
@@ -63,6 +69,11 @@ public class DataImpl {
     @Autowired
     private DMRoadShowsServiceImpl dmRoadShowsService;
 
+    @Autowired
+    private DMCheckUserServiceImpl dmCheckUserService;
+    @Autowired
+    private DMCheckUserPerformanceServiceImpl dmCheckUserPerformanceService;
+
     @Autowired
     private DataUtils dataUtils;
     @Autowired
@@ -791,7 +802,7 @@ public class DataImpl {
             //演出数据
             while (resultData.next()) {
                 KylinRoadShows roadShows = new KylinRoadShows();
-                roadShows.setRoadShowsId(resultData.getInt("id")+"");
+                roadShows.setRoadShowsId(resultData.getInt("id") + "");
                 roadShows.setTitle(resultData.getString("title"));
                 roadShows.setImgPoster(resultData.getString("img_poster"));
                 roadShows.setStatus(1);
@@ -818,4 +829,98 @@ public class DataImpl {
             }
         }
     }
+
+    public boolean childAccount() {
+        String driverClassName = "com.mysql.cj.jdbc.Driver";    //启动驱动
+        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/mall";    //设置连接路径
+        String username = "readonly";    //数据库用户名
+        String password = "ZWDsf8Fy";    //数据库连接密码
+        Connection con = null;        //连接
+        PreparedStatement pstmt = null;    //使用预编译语句
+        ResultSet rs = null;    //获取的结果集
+
+        try {
+            ArrayList<KylinCheckUser> checkUserList = new ArrayList();
+            ArrayList<KylinCheckUserVo> checkUserVoArrayList = new ArrayList();
+
+            Class.forName(driverClassName); //执行驱动
+            con = DriverManager.getConnection(url, username, password); //获取连接
+            String sql = "select m.id,name,mobile,father_id,m.created_at,m.updated_at from merchants as m left join merchant_relation as mr on m.id = mr.child_id where is_own = 'no' and mobile not like '%&%' group by mobile";
+            pstmt = con.prepareStatement(sql);
+            ResultSet resultData = pstmt.executeQuery();
+            //演出数据
+            while (resultData.next()) {
+                KylinCheckUser checkUser = new KylinCheckUser();
+                checkUser.setCheckUserId(resultData.getInt("id") + "");
+                checkUser.setMerchantId(resultData.getInt("father_id") + "");
+                checkUser.setMobile(resultData.getString("mobile"));
+                checkUser.setName(resultData.getString("name"));
+                checkUser.setPwd(StringUtil.right(checkUser.getMobile(), 8));
+                checkUser.setStatus(1);
+                if (null != resultData.getTimestamp("created_at")) {
+                    checkUser.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("created_at").toString()));
+                }
+                if (null != resultData.getTimestamp("updated_at")) {
+                    checkUser.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("updated_at").toString()));
+                }
+
+                KylinCheckUserVo checkUserVo = new KylinCheckUserVo();
+                checkUserVo.setCheckUserId(checkUser.getCheckUserId());
+                checkUserVo.setMerchantId(checkUser.getMerchantId());
+                checkUserVo.setMobile(checkUser.getMobile());
+                checkUserVo.setName(checkUser.getName());
+                checkUserVo.setPwd(DigestUtils.md5DigestAsHex(StringUtil.right(checkUser.getMobile(), 8).getBytes()));
+                checkUserVo.setStatus("1");
+
+                checkUserList.add(checkUser);
+                checkUserVoArrayList.add(checkUserVo);
+
+                //关系
+                ArrayList<KylinCheckUserPerformances> checkUserPerformancesArrayList = new ArrayList();
+                List<CheckPerformanceRelationParam> voList = new ArrayList();
+                KylinCheckUserPerformanceVo checkUserPerformanceVo = new KylinCheckUserPerformanceVo();
+                checkUserPerformanceVo.setCheckUserId(checkUser.getCheckUserId());
+                String relationSql = "select * from performance_visit_children where performance_id > 5721 and merchant_id = " + checkUser.getCheckUserId(); //设置的预编译语句格式
+                pstmt = con.prepareStatement(relationSql);
+                ResultSet relationData = pstmt.executeQuery();
+                while (relationData.next()) {
+                    KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances();
+                    checkUserPerformances.setCheckUserId(relationData.getInt("merchant_id") + "");
+                    checkUserPerformances.setPerformanceId(relationData.getInt("performance_id") + "");
+                    checkUserPerformances.setCheckUserPerformanceId(relationData.getInt("id") + "");
+                    checkUserPerformances.setStatus(1);
+                    checkUserPerformances.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(relationData.getTimestamp("created_at").toString()));
+                    checkUserPerformances.setCanDownTime(checkUserPerformances.getCreatedAt());
+                    if (null != relationData.getTimestamp("updated_at")) {
+                        checkUserPerformances.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(relationData.getTimestamp("updated_at").toString()));
+                    }
+                    checkUserPerformancesArrayList.add(checkUserPerformances);
+
+                    CheckPerformanceRelationParam voData = new CheckPerformanceRelationParam();
+                    voData.setPerformanceId(checkUserPerformances.getPerformanceId());
+                    voData.setCanDownTime(DateUtil.Formatter.yyyyMMddHHmmss.format(checkUserPerformances.getCreatedAt()));
+                    voList.add(voData);
+                }
+                checkUserPerformanceVo.setRelationParams(voList);
+
+                dmCheckUserPerformanceService.saveBatch(checkUserPerformancesArrayList);
+                mongoTemplate.insert(checkUserPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
+            }
+            dmCheckUserService.saveBatch(checkUserList);
+            mongoTemplate.insert(checkUserVoArrayList, KylinCheckUserVo.class.getSimpleName());
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        } finally {
+            //关闭资源,倒关
+            try {
+                if (rs != null) rs.close();
+                if (pstmt != null) pstmt.close();
+                if (con != null) con.close();  //必须要关
+            } catch (Exception e) {
+            }
+        }
+    }
 }

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

 package com.liquidnet.service.platform.utils;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -12,8 +11,8 @@ import java.util.HashMap;
 @Component
 public class QueueUtils {
 
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
     @Autowired
     StringRedisTemplate stringRedisTemplate;
 
@@ -24,9 +23,9 @@ public class QueueUtils {
      * @param route    路径
      * @param sqlStr   Json字符串
      */
-    public void sendSqlRabbit(String exchange, String route, String sqlStr) {
-        rabbitTemplate.convertAndSend(exchange, route, sqlStr);
-    }
+//    public void sendSqlRabbit(String exchange, String route, String sqlStr) {
+//        rabbitTemplate.convertAndSend(exchange, route, sqlStr);
+//    }
 
 
     /**

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/ServiceSweetApplication.java

-package com.liquidnet.service.sweet;
+package com.liquidnet.service;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -5,11 +5,14 @@ package com.liquidnet.service.sweet.constant;
  */
 public class SweetConstant {
 
-    public final static String REDIS_KEY_SWEET_MANUAL_PUSH_LIST="sweet:manual:pushList";
-    public final static String REDIS_KEY_SWEET_MANUAL_TIME_LIST="sweet:manual:timeList:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_NOTIFY_LIST="sweet:manual:notify:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_RICH_TEXT="sweet:manual:richText:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_SORT="sweet:manual:sort:manual:";
+    public final static String REDIS_KEY_SWEET_MANUAL_PUSH_LIST = "sweet:manual:pushList";
+    public final static String REDIS_KEY_SWEET_MANUAL_TIME_LIST = "sweet:manual:timeList:manual:";
+    public final static String REDIS_KEY_SWEET_MANUAL_NOTIFY_LIST = "sweet:manual:notify:manual:";
+    public final static String REDIS_KEY_SWEET_MANUAL_RICH_TEXT = "sweet:manual:richText:manual:";
+    public final static String REDIS_KEY_SWEET_MANUAL_SORT = "sweet:manual:sort:manual:";
+
+    public final static String REDIS_KEY_SWEET_ARTISTS_WATCH = "sweet:artists:watch:uid:";
+    public final static String REDIS_KEY_SWEET_ARTISTS_SIGN = "sweet:artists:sign:uid:";
 
     public enum ManualPosition {
         POSITION_1("艺人"),

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

+package com.liquidnet.service.sweet.utils;
+
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+
+@Component
+public class QueueUtils {
+
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+
+//    /**
+//     * 发送消息 - RABBIT
+//     *
+//     * @param exchange 交换机
+//     * @param routeKey 路径
+//     * @param jsonMsg  Json字符串
+//     */
+//    public void sendMsgByRabbit(String exchange, String routeKey, String jsonMsg) {
+//        rabbitTemplate.convertAndSend(exchange, routeKey, jsonMsg);
+//    }
+
+    /**
+     * 发送消息 - REDIS
+     *
+     * @param streamKey Redis消费Key
+     * @param jsonMsg   Json字符串
+     */
+    public void sendMsgByRedis(String streamKey, String jsonMsg) {
+        HashMap<String, String> map = CollectionUtil.mapStringString();
+        map.put("message", jsonMsg);
+        stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
+    }
+}

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

@@ -13,6 +13,8 @@ import com.liquidnet.service.sweet.entity.SweetManualNotify;
 import com.liquidnet.service.sweet.entity.SweetManualSort;
 import com.liquidnet.service.sweet.entity.SweetRichtext;
 import com.liquidnet.service.sweet.mapper.*;
+import com.liquidnet.service.sweet.vo.SweetArtistsSignVo;
+import com.liquidnet.service.sweet.vo.SweetArtistsWatchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -75,7 +77,7 @@ public class RedisDataUtils {
         return returnData;
     }
 
-    public SweetManualArtistList2Dto setTimeList(String manualId,String content) {
+    public SweetManualArtistList2Dto setTimeList(String manualId, String content) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_TIME_LIST.concat(manualId);
         HashMap<String, Object> map = CollectionUtil.mapStringObject();
         map.put("manualId", manualId);
@@ -107,18 +109,18 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_TIME_LIST.concat(manualId);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
-            return setTimeList(manualId,null);
+            return setTimeList(manualId, null);
         } else {
             return (SweetManualArtistList2Dto) obj;
         }
     }
 
-    public SweetRichtext setRichTextRedisData(String manualId, String type,SweetRichtext content) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_RICH_TEXT.concat(manualId).concat(":type:"+type);
+    public SweetRichtext setRichTextRedisData(String manualId, String type, SweetRichtext content) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_RICH_TEXT.concat(manualId).concat(":type:" + type);
         SweetRichtext sweetRichtext;
-        if(content!=null){
+        if (content != null) {
             sweetRichtext = content;
-        }else{
+        } else {
             sweetRichtext = sweetRichtextMapper.selectOne(Wrappers.lambdaQuery(SweetRichtext.class).eq(SweetRichtext::getManualId, manualId).eq(SweetRichtext::getType, type));
         }
         redisUtil.set(redisKey, sweetRichtext);
@@ -127,10 +129,10 @@ public class RedisDataUtils {
 
     //获取富文本详情
     public SweetRichtext getRichTextRedisData(String manualId, String type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_RICH_TEXT.concat(manualId).concat(":type:"+type);
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_RICH_TEXT.concat(manualId).concat(":type:" + type);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
-            return setRichTextRedisData(manualId, type,null);
+            return setRichTextRedisData(manualId, type, null);
         } else {
             return (SweetRichtext) obj;
         }
@@ -193,4 +195,42 @@ public class RedisDataUtils {
     public void deleteSortRedisData(String manualId) {
         redisUtil.del(SweetConstant.REDIS_KEY_SWEET_MANUAL_SORT.concat(manualId));//列表
     }
+
+    public void setArtistsWatchRedisVo(String uid, String artistsId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_WATCH.concat(uid);
+        SweetArtistsWatchVo vo = getArtistsWatchRedisVo(uid);
+        vo.setUid(uid);
+        vo.getArtistsIdList().add(artistsId);
+        redisUtil.set(redisKey, vo);
+    }
+
+    //获取想看
+    public SweetArtistsWatchVo getArtistsWatchRedisVo(String uid) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_WATCH.concat(uid);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return SweetArtistsWatchVo.getNew();
+        } else {
+            return (SweetArtistsWatchVo) obj;
+        }
+    }
+
+    public void setArtistsSignRedisVo(String uid, String artistsId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_SIGN.concat(uid);
+        SweetArtistsSignVo vo = getArtistsSignRedisVo(uid);
+        vo.setUid(uid);
+        vo.getArtistsIdList().add(artistsId);
+        redisUtil.set(redisKey, vo);
+    }
+
+    //获取 签售
+    public SweetArtistsSignVo getArtistsSignRedisVo(String uid) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_SIGN.concat(uid);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return SweetArtistsSignVo.getNew();
+        } else {
+            return (SweetArtistsSignVo) obj;
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetArtistsSignVo.java

+package com.liquidnet.service.sweet.vo;
+
+import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
+import lombok.Data;
+
+import java.util.ArrayList;
+
+@Data
+public class SweetArtistsSignVo implements Cloneable{
+    private String uid;
+    private ArrayList<String> artistsIdList;
+
+    private static final SweetArtistsSignVo obj = new SweetArtistsSignVo();
+    public static SweetArtistsSignVo getNew() {
+        try {
+            return (SweetArtistsSignVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetArtistsSignVo();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetArtistsWatchVo.java

+package com.liquidnet.service.sweet.vo;
+
+import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
+import lombok.Data;
+
+import java.util.ArrayList;
+
+@Data
+public class SweetArtistsWatchVo implements Cloneable {
+    private String uid;
+    private ArrayList<String> artistsIdList;
+
+    private static final SweetArtistsWatchVo obj = new SweetArtistsWatchVo();
+    public static SweetArtistsWatchVo getNew() {
+        try {
+            return (SweetArtistsWatchVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetArtistsWatchVo();
+        }
+    }
+}

liquidnet-bus-service/pom.xml

@@ -153,10 +153,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>