fix;

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

@@ -35,11 +35,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </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-service-kylin-api</artifactId>

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

@@ -16,6 +16,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_ORDER_CLOSE;
+
 @Configuration
 public class ConsumerKylinSqlOptOrderCloseRedisStreamConfig {
     @Autowired
@@ -39,8 +41,8 @@ public class ConsumerKylinSqlOptOrderCloseRedisStreamConfig {
      */
     private Subscription receiveSqlOptOrderClose(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOptOrderCloseRedisReceiver
+                Consumer.from(SQL_ORDER_CLOSE.getGroup(), SQL_ORDER_CLOSE.name() + t),
+                StreamOffset.create(SQL_ORDER_CLOSE.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOptOrderCloseRedisReceiver
         );
     }
 

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

 package com.liquidnet.service.consumer.kylin.config;
 
-import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderAgainRdsReceiver;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlPerformanceLackRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -17,6 +15,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_ORDER_AGAIN;
+
 @Configuration
 public class ConsumerKylinSqlOrderAgainRedisStreamConfig {
     @Autowired
@@ -40,8 +40,8 @@ public class ConsumerKylinSqlOrderAgainRedisStreamConfig {
      */
     private Subscription receiveSqlOrderAgain(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderAgainRdsReceiver
+                Consumer.from(SQL_ORDER_AGAIN.getGroup(), SQL_ORDER_AGAIN.name() + t),
+                StreamOffset.create(SQL_ORDER_AGAIN.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderAgainRdsReceiver
         );
     }
 

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

 package com.liquidnet.service.consumer.kylin.config;
 
-import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderAgainRdsReceiver;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderCreateRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +15,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_ORDER_CREATE;
+
 @Configuration
 public class ConsumerKylinSqlOrderCreateRedisStreamConfig {
     @Autowired
@@ -40,8 +40,8 @@ public class ConsumerKylinSqlOrderCreateRedisStreamConfig {
      */
     private Subscription receiveSqlOrderCreate(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderCreateRdsReceiver
+                Consumer.from(SQL_ORDER_CREATE.getGroup(), SQL_ORDER_CREATE.name() + t),
+                StreamOffset.create(SQL_ORDER_CREATE.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderCreateRdsReceiver
         );
     }
 

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

 package com.liquidnet.service.consumer.kylin.config;
 
-import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderOvertimeRefundRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +15,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_ORDER_OVERTIME_REFUND;
+
 @Configuration
 public class ConsumerKylinSqlOrderOvertimeRefundRedisStreamConfig {
     @Autowired
@@ -39,8 +40,8 @@ public class ConsumerKylinSqlOrderOvertimeRefundRedisStreamConfig {
      */
     private Subscription receiveSqlOrderOvertimeRefund(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderOvertimeRefundRdsReceiver
+                Consumer.from(SQL_ORDER_OVERTIME_REFUND.getGroup(), SQL_ORDER_OVERTIME_REFUND.name() + t),
+                StreamOffset.create(SQL_ORDER_OVERTIME_REFUND.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderOvertimeRefundRdsReceiver
         );
     }
 

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

 package com.liquidnet.service.consumer.kylin.config;
 
-import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderAgainRdsReceiver;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderPayRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +15,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_ORDER_PAY;
+
 @Configuration
 public class ConsumerKylinSqlOrderPayRedisStreamConfig {
     @Autowired
@@ -40,8 +40,8 @@ public class ConsumerKylinSqlOrderPayRedisStreamConfig {
      */
     private Subscription receiveSqlOrderPay(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderPayRdsReceiver
+                Consumer.from(SQL_ORDER_PAY.getGroup(), SQL_ORDER_PAY.name() + t),
+                StreamOffset.create(SQL_ORDER_PAY.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderPayRdsReceiver
         );
     }
 

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

 package com.liquidnet.service.consumer.kylin.config;
 
-import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderAgainRdsReceiver;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderRefundRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +15,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_ORDER_REFUND;
+
 @Configuration
 public class ConsumerKylinSqlOrderRefundRedisStreamConfig {
     @Autowired
@@ -40,8 +40,8 @@ public class ConsumerKylinSqlOrderRefundRedisStreamConfig {
      */
     private Subscription receiveSqlOrderRefund(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderRefundRdsReceiver
+                Consumer.from(SQL_ORDER_REFUND.getGroup(), SQL_ORDER_REFUND.name() + t),
+                StreamOffset.create(SQL_ORDER_REFUND.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderRefundRdsReceiver
         );
     }
 

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

 package com.liquidnet.service.consumer.kylin.config;
 
-import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderAgainRdsReceiver;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderWithdrawRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +15,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_ORDER_WITHDRAW;
+
 @Configuration
 public class ConsumerKylinSqlOrderWithdrawRedisStreamConfig {
     @Autowired
@@ -40,8 +40,8 @@ public class ConsumerKylinSqlOrderWithdrawRedisStreamConfig {
      */
     private Subscription receiveSqlOrderWithdraw(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderWithdrawRdsReceiver
+                Consumer.from(SQL_ORDER_WITHDRAW.getGroup(), SQL_ORDER_WITHDRAW.name() + t),
+                StreamOffset.create(SQL_ORDER_WITHDRAW.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlOrderWithdrawRdsReceiver
         );
     }
 

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

 package com.liquidnet.service.consumer.kylin.config;
 
-import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlPerformanceLackRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +15,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_PERFORMANCE_LACK;
+
 @Configuration
 public class ConsumerKylinSqlPerformanceLackRedisStreamConfig {
     @Autowired
@@ -39,8 +40,8 @@ public class ConsumerKylinSqlPerformanceLackRedisStreamConfig {
      */
     private Subscription receiveSqlPerformanceLack(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlPerformanceLackRdsReceiver
+                Consumer.from(SQL_PERFORMANCE_LACK.getGroup(), SQL_PERFORMANCE_LACK.name() + t),
+                StreamOffset.create(SQL_PERFORMANCE_LACK.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlPerformanceLackRdsReceiver
         );
     }
 

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

 package com.liquidnet.service.consumer.kylin.config;
 
-import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlOrderAgainRdsReceiver;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlStationRdsReceiver;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +15,8 @@ import org.springframework.data.redis.stream.Subscription;
 
 import java.time.Duration;
 
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_STATION;
+
 @Configuration
 public class ConsumerKylinSqlStationRedisStreamConfig {
     @Autowired
@@ -40,8 +40,8 @@ public class ConsumerKylinSqlStationRedisStreamConfig {
      */
     private Subscription receiveSqlStation(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
         return listenerContainer.receiveAutoAck(
-                Consumer.from(MQConst.AdamQueue.SQL_UREGISTER.getGroup(), MQConst.AdamQueue.SQL_UREGISTER.name() + t),
-                StreamOffset.create(MQConst.AdamQueue.SQL_UREGISTER.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlStationRdsReceiver
+                Consumer.from(SQL_STATION.getGroup(), SQL_STATION.name() + t),
+                StreamOffset.create(SQL_STATION.getKey(), ReadOffset.lastConsumed()), consumerKylinSqlStationRdsReceiver
         );
     }