Merge branch 'dev' into test

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:

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:

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/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/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/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/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>