~queue:adam/kylin.SMS_NOTICE合并;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/adam/config/ConsumerAdamSmsSenderRedisStreamConfig.java

-package com.liquidnet.service.consumer.adam.config;
-
-import com.liquidnet.common.cache.redis.config.RedisStreamConfig;
-import com.liquidnet.service.consumer.adam.receiver.ConsumerAdamSmsNoticeRdsReceiver;
-import lombok.var;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.stream.Consumer;
-import org.springframework.data.redis.connection.stream.MapRecord;
-import org.springframework.data.redis.connection.stream.ReadOffset;
-import org.springframework.data.redis.connection.stream.StreamOffset;
-import org.springframework.data.redis.stream.StreamMessageListenerContainer;
-import org.springframework.data.redis.stream.Subscription;
-
-import static com.liquidnet.service.base.constant.MQConst.AdamQueue;
-
-@Configuration
-public class ConsumerAdamSmsSenderRedisStreamConfig extends RedisStreamConfig {
-    @Autowired
-    ConsumerAdamSmsNoticeRdsReceiver consumerAdamSmsNoticeRdsReceiver;
-
-    /**
-     * 短信通知
-     *
-     * @param listenerContainer
-     * @param t
-     * @return
-     */
-    private Subscription receiveSqlURegister(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
-        return listenerContainer.receiveAutoAck(Consumer.from(AdamQueue.SMS_NOTICE.getGroup(), getConsumerName(AdamQueue.SMS_NOTICE.name() + t)),
-                StreamOffset.create(AdamQueue.SMS_NOTICE.getKey(), ReadOffset.lastConsumed()), consumerAdamSmsNoticeRdsReceiver);
-    }
-
-    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
-
-    /* -------------------------------------------------------- ｜ 短信通知 */
-
-    @Bean
-    public Subscription subscriptionSmsNotice0(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 0);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice1(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 1);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice2(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 2);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice3(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 3);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice4(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 4);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice5(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 5);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice6(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 6);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice7(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 7);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice8(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 8);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionSmsNotice9(RedisConnectionFactory factory) {
-        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-        var subscription = receiveSqlURegister(listenerContainer, 9);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    /* -------------------------------------------------------- ｜  */
-}
+//package com.liquidnet.service.consumer.adam.config;
+//
+//import com.liquidnet.common.cache.redis.config.RedisStreamConfig;
+//import com.liquidnet.service.consumer.adam.receiver.ConsumerAdamSmsNoticeRdsReceiver;
+//import lombok.var;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.data.redis.connection.RedisConnectionFactory;
+//import org.springframework.data.redis.connection.stream.Consumer;
+//import org.springframework.data.redis.connection.stream.MapRecord;
+//import org.springframework.data.redis.connection.stream.ReadOffset;
+//import org.springframework.data.redis.connection.stream.StreamOffset;
+//import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+//import org.springframework.data.redis.stream.Subscription;
+//
+//import static com.liquidnet.service.base.constant.MQConst.AdamQueue;
+//
+//@Configuration
+//public class ConsumerAdamSmsSenderRedisStreamConfig extends RedisStreamConfig {
+//    @Autowired
+//    ConsumerAdamSmsNoticeRdsReceiver consumerAdamSmsNoticeRdsReceiver;
+//
+//    /**
+//     * 短信通知
+//     *
+//     * @param listenerContainer
+//     * @param t
+//     * @return
+//     */
+//    private Subscription receiveSqlURegister(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+//        return listenerContainer.receiveAutoAck(Consumer.from(AdamQueue.SMS_NOTICE.getGroup(), getConsumerName(AdamQueue.SMS_NOTICE.name() + t)),
+//                StreamOffset.create(AdamQueue.SMS_NOTICE.getKey(), ReadOffset.lastConsumed()), consumerAdamSmsNoticeRdsReceiver);
+//    }
+//
+//    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+//
+//    /* -------------------------------------------------------- ｜ 短信通知 */
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice0(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 0);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice1(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 1);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice2(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 2);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice3(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 3);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice4(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 4);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice5(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 5);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice6(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 6);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice7(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 7);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice8(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 8);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionSmsNotice9(RedisConnectionFactory factory) {
+//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//        var subscription = receiveSqlURegister(listenerContainer, 9);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    /* -------------------------------------------------------- ｜  */
+//}

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

-package com.liquidnet.service.consumer.adam.receiver;
-
-import com.liquidnet.service.base.constant.MQConst;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ConsumerAdamSmsNoticeRdsReceiver extends AbstractSmsRedisReceiver {
-    @Override
-    protected String getRedisStreamKey() {
-        return MQConst.AdamQueue.SMS_NOTICE.getKey();
-    }
-
-    @Override
-    protected String getRedisStreamGroup() {
-        return MQConst.AdamQueue.SMS_NOTICE.getGroup();
-    }
-}
+//package com.liquidnet.service.consumer.adam.receiver;
+//
+//import com.liquidnet.service.base.constant.MQConst;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//public class ConsumerAdamSmsNoticeRdsReceiver extends AbstractSmsRedisReceiver {
+//    @Override
+//    protected String getRedisStreamKey() {
+//        return MQConst.AdamQueue.SMS_NOTICE.getKey();
+//    }
+//
+//    @Override
+//    protected String getRedisStreamGroup() {
+//        return MQConst.AdamQueue.SMS_NOTICE.getGroup();
+//    }
+//}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-base/src/main/java/com/liquidnet/service/consumer/base/config/ConsumerCommonBizRedisStreamConfig.java

@@ -29,7 +29,7 @@ public class ConsumerCommonBizRedisStreamConfig extends RedisStreamConfig {
     @Autowired
     StringRedisTemplate stringRedisTemplate;
     @Autowired
-    ConsumerKylinSmsNoticeReceiver consumerKylinSmsNoticeReceiver;
+    ConsumerCommonSmsNoticeReceiver consumerCommonSmsNoticeReceiver;
     @Autowired
     ConsumerGoblinBizArtworkUplReceiver consumerGoblinBizArtworkUplReceiver;
     @Autowired
@@ -42,15 +42,15 @@ public class ConsumerCommonBizRedisStreamConfig extends RedisStreamConfig {
     ConsumerGoblinBizIntegralReceiver consumerGoblinBizIntegralReceiver;
 
     @Bean// 短信通知
-    public List<Subscription> subscriptionKylinSmsNotice(RedisConnectionFactory factory) {
+    public List<Subscription> subscriptionCommonSmsNotice(RedisConnectionFactory factory) {
         List<Subscription> subscriptionList = new ArrayList<>();
         MQConst.KylinQueue stream = MQConst.KylinQueue.SMS_NOTICE;
         this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < 5; i++) {
             StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
             subscriptionList.add(listenerContainer.receiveAutoAck(
                     Consumer.from(stream.getGroup(), getConsumerName(stream.name() + i)),
-                    StreamOffset.create(stream.getKey(), ReadOffset.lastConsumed()), consumerKylinSmsNoticeReceiver
+                    StreamOffset.create(stream.getKey(), ReadOffset.lastConsumed()), consumerCommonSmsNoticeReceiver
             ));
             listenerContainer.start();
         }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-base/src/main/java/com/liquidnet/service/consumer/base/receiver/ConsumerKylinSmsNoticeReceiver.java → liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-base/src/main/java/com/liquidnet/service/consumer/base/receiver/ConsumerCommonSmsNoticeReceiver.java

@@ -15,7 +15,7 @@ import java.util.HashMap;
 
 @Slf4j
 @Component
-public class ConsumerKylinSmsNoticeReceiver extends AbstractBizRedisReceiver {
+public class ConsumerCommonSmsNoticeReceiver extends AbstractBizRedisReceiver {
     @Resource
     private SmsProcessor smsProcessor;
 

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

-package com.liquidnet.service.consumer.kylin.receiver;
-
-import com.liquidnet.service.base.constant.MQConst;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ConsumerKylinSmsNoticeRdsReceiver extends AbstractSmsRedisReceiver {
-    @Override
-    protected String getRedisStreamKey() {
-        return MQConst.KylinQueue.SMS_NOTICE.getKey();
-    }
-
-    @Override
-    protected String getRedisStreamGroup() {
-        return MQConst.KylinQueue.SMS_NOTICE.getGroup();
-    }
-}
+//package com.liquidnet.service.consumer.kylin.receiver;
+//
+//import com.liquidnet.service.base.constant.MQConst;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//public class ConsumerKylinSmsNoticeRdsReceiver extends AbstractSmsRedisReceiver {
+//    @Override
+//    protected String getRedisStreamKey() {
+//        return MQConst.KylinQueue.SMS_NOTICE.getKey();
+//    }
+//
+//    @Override
+//    protected String getRedisStreamGroup() {
+//        return MQConst.KylinQueue.SMS_NOTICE.getGroup();
+//    }
+//}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/receiver/ConsumerKylinSmsNoticeRdsReceiver.java

-package com.liquidnet.service.consumer.slowly.receiver;
-
-import com.liquidnet.service.base.constant.MQConst;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ConsumerKylinSmsNoticeRdsReceiver extends AbstractSmsRedisReceiver {
-    @Override
-    protected String getRedisStreamKey() {
-        return MQConst.KylinQueue.SMS_NOTICE.getKey();
-    }
-
-    @Override
-    protected String getRedisStreamGroup() {
-        return MQConst.KylinQueue.SMS_NOTICE.getGroup();
-    }
-}
+//package com.liquidnet.service.consumer.slowly.receiver;
+//
+//import com.liquidnet.service.base.constant.MQConst;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//public class ConsumerKylinSmsNoticeRdsReceiver extends AbstractSmsRedisReceiver {
+//    @Override
+//    protected String getRedisStreamKey() {
+//        return MQConst.KylinQueue.SMS_NOTICE.getKey();
+//    }
+//
+//    @Override
+//    protected String getRedisStreamGroup() {
+//        return MQConst.KylinQueue.SMS_NOTICE.getGroup();
+//    }
+//}