调整框架，删除不必要的组件

tashow-framework/tashow-framework-websocket/pom.xml

@@ -42,21 +42,11 @@
             <groupId>com.tashow.cloud</groupId>
             <artifactId>tashow-framework-mq</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <optional>true</optional>
-        </dependency>
 
         <!-- 业务组件 -->
         <dependency>

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/config/WebSocketAutoConfiguration.java

@@ -1,33 +1,22 @@
 package com.tashow.cloud.websocket.config;
 
-import com.tashow.cloud.mq.redis.config.RedisMQConsumerAutoConfiguration;
-import com.tashow.cloud.mq.redis.core.RedisMQTemplate;
 import com.tashow.cloud.websocket.core.handler.JsonWebSocketMessageHandler;
 import com.tashow.cloud.websocket.core.listener.WebSocketMessageListener;
 import com.tashow.cloud.websocket.core.security.LoginUserHandshakeInterceptor;
 import com.tashow.cloud.websocket.core.security.WebSocketAuthorizeRequestsCustomizer;
-import com.tashow.cloud.websocket.core.sender.kafka.KafkaWebSocketMessageConsumer;
-import com.tashow.cloud.websocket.core.sender.kafka.KafkaWebSocketMessageSender;
 import com.tashow.cloud.websocket.core.sender.local.LocalWebSocketMessageSender;
 import com.tashow.cloud.websocket.core.sender.rabbitmq.RabbitMQWebSocketMessageConsumer;
 import com.tashow.cloud.websocket.core.sender.rabbitmq.RabbitMQWebSocketMessageSender;
-import com.tashow.cloud.websocket.core.sender.redis.RedisWebSocketMessageConsumer;
-import com.tashow.cloud.websocket.core.sender.redis.RedisWebSocketMessageSender;
-import com.tashow.cloud.websocket.core.sender.rocketmq.RocketMQWebSocketMessageConsumer;
-import com.tashow.cloud.websocket.core.sender.rocketmq.RocketMQWebSocketMessageSender;
 import com.tashow.cloud.websocket.core.session.WebSocketSessionHandlerDecorator;
 import com.tashow.cloud.websocket.core.session.WebSocketSessionManager;
 import com.tashow.cloud.websocket.core.session.WebSocketSessionManagerImpl;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.amqp.core.TopicExchange;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@@ -40,9 +29,8 @@ import java.util.List;
  *
  * @author xingyu4j
  */
-@AutoConfiguration(before = RedisMQConsumerAutoConfiguration.class) // before YudaoRedisMQConsumerAutoConfiguration 的原因是，需要保证 RedisWebSocketMessageConsumer 先创建，才能创建 RedisMessageListenerContainer
 @EnableWebSocket // 开启 websocket
-@ConditionalOnProperty(prefix = "yudao.websocket", value = "enable", matchIfMissing = true) // 允许使用 yudao.websocket.enable=false 禁用 websocket
+@ConditionalOnProperty(prefix = "tashow.websocket", value = "enable", matchIfMissing = true) // 允许使用 yudao.websocket.enable=false 禁用 websocket
 @EnableConfigurationProperties(WebSocketProperties.class)
 public class WebSocketAutoConfiguration {
 
@@ -96,44 +84,7 @@ public class WebSocketAutoConfiguration {
     }
 
     @Configuration
-    @ConditionalOnProperty(prefix = "tashow.websocket", name = "sender-type", havingValue = "redis")
-    public class RedisWebSocketMessageSenderConfiguration {
-
-        @Bean
-        public RedisWebSocketMessageSender redisWebSocketMessageSender(WebSocketSessionManager sessionManager,
-                                                                       RedisMQTemplate redisMQTemplate) {
-            return new RedisWebSocketMessageSender(sessionManager, redisMQTemplate);
-        }
-
-        @Bean
-        public RedisWebSocketMessageConsumer redisWebSocketMessageConsumer(
-                RedisWebSocketMessageSender redisWebSocketMessageSender) {
-            return new RedisWebSocketMessageConsumer(redisWebSocketMessageSender);
-        }
-
-    }
-
-    @Configuration
-    @ConditionalOnProperty(prefix = "tashow.websocket", name = "sender-type", havingValue = "rocketmq")
-    public class RocketMQWebSocketMessageSenderConfiguration {
-
-        @Bean
-        public RocketMQWebSocketMessageSender rocketMQWebSocketMessageSender(
-                WebSocketSessionManager sessionManager, RocketMQTemplate rocketMQTemplate,
-                @Value("${yudao.websocket.sender-rocketmq.topic}") String topic) {
-            return new RocketMQWebSocketMessageSender(sessionManager, rocketMQTemplate, topic);
-        }
-
-        @Bean
-        public RocketMQWebSocketMessageConsumer rocketMQWebSocketMessageConsumer(
-                RocketMQWebSocketMessageSender rocketMQWebSocketMessageSender) {
-            return new RocketMQWebSocketMessageConsumer(rocketMQWebSocketMessageSender);
-        }
-
-    }
-
-    @Configuration
-    @ConditionalOnProperty(prefix = "yudao.websocket", name = "sender-type", havingValue = "rabbitmq")
+    @ConditionalOnProperty(prefix = "tashow.websocket", name = "sender-type", havingValue = "rabbitmq")
     public class RabbitMQWebSocketMessageSenderConfiguration {
 
         @Bean
@@ -153,7 +104,7 @@ public class WebSocketAutoConfiguration {
          * 创建 Topic Exchange
          */
         @Bean
-        public TopicExchange websocketTopicExchange(@Value("${yudao.websocket.sender-rabbitmq.exchange}") String exchange) {
+        public TopicExchange websocketTopicExchange(@Value("${tashow.websocket.sender-rabbitmq.exchange}") String exchange) {
             return new TopicExchange(exchange,
                     true,  // durable: 是否持久化
                     false);  // exclusive: 是否排它
@@ -161,23 +112,4 @@ public class WebSocketAutoConfiguration {
 
     }
 
-    @Configuration
-    @ConditionalOnProperty(prefix = "tashow.websocket", name = "sender-type", havingValue = "kafka")
-    public class KafkaWebSocketMessageSenderConfiguration {
-
-        @Bean
-        public KafkaWebSocketMessageSender kafkaWebSocketMessageSender(
-                WebSocketSessionManager sessionManager, KafkaTemplate<Object, Object> kafkaTemplate,
-                @Value("${yudao.websocket.sender-kafka.topic}") String topic) {
-            return new KafkaWebSocketMessageSender(sessionManager, kafkaTemplate, topic);
-        }
-
-        @Bean
-        public KafkaWebSocketMessageConsumer kafkaWebSocketMessageConsumer(
-                KafkaWebSocketMessageSender kafkaWebSocketMessageSender) {
-            return new KafkaWebSocketMessageConsumer(kafkaWebSocketMessageSender);
-        }
-
-    }
-
 }

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessage.java

@@ -1,35 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.kafka;
-
-import lombok.Data;
-
-/**
- * Kafka 广播 WebSocket 的消息
- *
- * @author 芋道源码
- */
-@Data
-public class KafkaWebSocketMessage {
-
-    /**
-     * Session 编号
-     */
-    private String sessionId;
-    /**
-     * 用户类型
-     */
-    private Integer userType;
-    /**
-     * 用户编号
-     */
-    private Long userId;
-
-    /**
-     * 消息类型
-     */
-    private String messageType;
-    /**
-     * 消息内容
-     */
-    private String messageContent;
-
-}

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessageConsumer.java

@@ -1,28 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.kafka;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.kafka.annotation.KafkaListener;
-
-/**
- * {@link KafkaWebSocketMessage} 广播消息的消费者，真正把消息发送出去
- *
- * @author 芋道源码
- */
-@RequiredArgsConstructor
-public class KafkaWebSocketMessageConsumer {
-
-    private final KafkaWebSocketMessageSender kafkaWebSocketMessageSender;
-
-    @RabbitHandler
-    @KafkaListener(
-            topics = "${yudao.websocket.sender-kafka.topic}",
-            // 在 Group 上，使用 UUID 生成其后缀。这样，启动的 Consumer 的 Group 不同，以达到广播消费的目的
-            groupId = "${yudao.websocket.sender-kafka.consumer-group}" + "-" + "#{T(java.util.UUID).randomUUID()}")
-    public void onMessage(KafkaWebSocketMessage message) {
-        kafkaWebSocketMessageSender.send(message.getSessionId(),
-                message.getUserType(), message.getUserId(),
-                message.getMessageType(), message.getMessageContent());
-    }
-
-}

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessageSender.java

@@ -1,67 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.kafka;
-
-import com.tashow.cloud.websocket.core.sender.AbstractWebSocketMessageSender;
-import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender;
-import com.tashow.cloud.websocket.core.session.WebSocketSessionManager;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.kafka.core.KafkaTemplate;
-
-import java.util.concurrent.ExecutionException;
-
-/**
- * 基于 Kafka 的 {@link WebSocketMessageSender} 实现类
- *
- * @author 芋道源码
- */
-@Slf4j
-public class KafkaWebSocketMessageSender extends AbstractWebSocketMessageSender {
-
-    private final KafkaTemplate<Object, Object> kafkaTemplate;
-
-    private final String topic;
-
-    public KafkaWebSocketMessageSender(WebSocketSessionManager sessionManager,
-                                       KafkaTemplate<Object, Object> kafkaTemplate,
-                                       String topic) {
-        super(sessionManager);
-        this.kafkaTemplate = kafkaTemplate;
-        this.topic = topic;
-    }
-
-    @Override
-    public void send(Integer userType, Long userId, String messageType, String messageContent) {
-        sendKafkaMessage(null, userId, userType, messageType, messageContent);
-    }
-
-    @Override
-    public void send(Integer userType, String messageType, String messageContent) {
-        sendKafkaMessage(null, null, userType, messageType, messageContent);
-    }
-
-    @Override
-    public void send(String sessionId, String messageType, String messageContent) {
-        sendKafkaMessage(sessionId, null, null, messageType, messageContent);
-    }
-
-    /**
-     * 通过 Kafka 广播消息
-     *
-     * @param sessionId Session 编号
-     * @param userId 用户编号
-     * @param userType 用户类型
-     * @param messageType 消息类型
-     * @param messageContent 消息内容
-     */
-    private void sendKafkaMessage(String sessionId, Long userId, Integer userType,
-                                  String messageType, String messageContent) {
-        KafkaWebSocketMessage mqMessage = new KafkaWebSocketMessage()
-                .setSessionId(sessionId).setUserId(userId).setUserType(userType)
-                .setMessageType(messageType).setMessageContent(messageContent);
-        try {
-            kafkaTemplate.send(topic, mqMessage).get();
-        } catch (InterruptedException | ExecutionException e) {
-            log.error("[sendKafkaMessage][发送消息({}) 到 Kafka 失败]", mqMessage, e);
-        }
-    }
-
-}

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rabbitmq/RabbitMQWebSocketMessageConsumer.java

@@ -13,12 +13,12 @@ import org.springframework.amqp.rabbit.annotation.*;
         bindings = @QueueBinding(
                 value = @Queue(
                         // 在 Queue 的名字上，使用 UUID 生成其后缀。这样，启动的 Consumer 的 Queue 不同，以达到广播消费的目的
-                        name = "${yudao.websocket.sender-rabbitmq.queue}" + "-" + "#{T(java.util.UUID).randomUUID()}",
+                        name = "${tashow.websocket.sender-rabbitmq.queue}" + "-" + "#{T(java.util.UUID).randomUUID()}",
                         // Consumer 关闭时，该队列就可以被自动删除了
                         autoDelete = "true"
                 ),
                 exchange = @Exchange(
-                        name = "${yudao.websocket.sender-rabbitmq.exchange}",
+                        name = "${tashow.websocket.sender-rabbitmq.exchange}",
                         type = ExchangeTypes.TOPIC,
                         declare = "false"
                 )

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessage.java

@@ -1,34 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.redis;
-
-import com.tashow.cloud.mq.redis.core.pubsub.AbstractRedisChannelMessage;
-import lombok.Data;
-
-/**
- * Redis 广播 WebSocket 的消息
- */
-@Data
-public class RedisWebSocketMessage extends AbstractRedisChannelMessage {
-
-    /**
-     * Session 编号
-     */
-    private String sessionId;
-    /**
-     * 用户类型
-     */
-    private Integer userType;
-    /**
-     * 用户编号
-     */
-    private Long userId;
-
-    /**
-     * 消息类型
-     */
-    private String messageType;
-    /**
-     * 消息内容
-     */
-    private String messageContent;
-
-}

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java

@@ -1,23 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.redis;
-
-import com.tashow.cloud.mq.redis.core.pubsub.AbstractRedisChannelMessageListener;
-import lombok.RequiredArgsConstructor;
-
-/**
- * {@link RedisWebSocketMessage} 广播消息的消费者，真正把消息发送出去
- *
- * @author 芋道源码
- */
-@RequiredArgsConstructor
-public class RedisWebSocketMessageConsumer extends AbstractRedisChannelMessageListener<RedisWebSocketMessage> {
-
-    private final RedisWebSocketMessageSender redisWebSocketMessageSender;
-
-    @Override
-    public void onMessage(RedisWebSocketMessage message) {
-        redisWebSocketMessageSender.send(message.getSessionId(),
-                message.getUserType(), message.getUserId(),
-                message.getMessageType(), message.getMessageContent());
-    }
-
-}

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessageSender.java

@@ -1,57 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.redis;
-
-import com.tashow.cloud.mq.redis.core.RedisMQTemplate;
-import com.tashow.cloud.websocket.core.sender.AbstractWebSocketMessageSender;
-import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender;
-import com.tashow.cloud.websocket.core.session.WebSocketSessionManager;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 基于 Redis 的 {@link WebSocketMessageSender} 实现类
- *
- * @author 芋道源码
- */
-@Slf4j
-public class RedisWebSocketMessageSender extends AbstractWebSocketMessageSender {
-
-    private final RedisMQTemplate redisMQTemplate;
-
-    public RedisWebSocketMessageSender(WebSocketSessionManager sessionManager,
-                                       RedisMQTemplate redisMQTemplate) {
-        super(sessionManager);
-        this.redisMQTemplate = redisMQTemplate;
-    }
-
-    @Override
-    public void send(Integer userType, Long userId, String messageType, String messageContent) {
-        sendRedisMessage(null, userId, userType, messageType, messageContent);
-    }
-
-    @Override
-    public void send(Integer userType, String messageType, String messageContent) {
-        sendRedisMessage(null, null, userType, messageType, messageContent);
-    }
-
-    @Override
-    public void send(String sessionId, String messageType, String messageContent) {
-        sendRedisMessage(sessionId, null, null, messageType, messageContent);
-    }
-
-    /**
-     * 通过 Redis 广播消息
-     *
-     * @param sessionId Session 编号
-     * @param userId 用户编号
-     * @param userType 用户类型
-     * @param messageType 消息类型
-     * @param messageContent 消息内容
-     */
-    private void sendRedisMessage(String sessionId, Long userId, Integer userType,
-                                  String messageType, String messageContent) {
-        RedisWebSocketMessage mqMessage = new RedisWebSocketMessage()
-                .setSessionId(sessionId).setUserId(userId).setUserType(userType)
-                .setMessageType(messageType).setMessageContent(messageContent);
-        redisMQTemplate.send(mqMessage);
-    }
-
-}

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessage.java

@@ -1,35 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.rocketmq;
-
-import lombok.Data;
-
-/**
- * RocketMQ 广播 WebSocket 的消息
- *
- * @author 芋道源码
- */
-@Data
-public class RocketMQWebSocketMessage {
-
-    /**
-     * Session 编号
-     */
-    private String sessionId;
-    /**
-     * 用户类型
-     */
-    private Integer userType;
-    /**
-     * 用户编号
-     */
-    private Long userId;
-
-    /**
-     * 消息类型
-     */
-    private String messageType;
-    /**
-     * 消息内容
-     */
-    private String messageContent;
-
-}

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessageConsumer.java

@@ -1,30 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.rocketmq;
-
-import lombok.RequiredArgsConstructor;
-import org.apache.rocketmq.spring.annotation.MessageModel;
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
-import org.apache.rocketmq.spring.core.RocketMQListener;
-
-/**
- * {@link RocketMQWebSocketMessage} 广播消息的消费者，真正把消息发送出去
- *
- * @author 芋道源码
- */
-@RocketMQMessageListener( // 重点：添加 @RocketMQMessageListener 注解，声明消费的 topic
-        topic = "${yudao.websocket.sender-rocketmq.topic}",
-        consumerGroup = "${yudao.websocket.sender-rocketmq.consumer-group}",
-        messageModel = MessageModel.BROADCASTING // 设置为广播模式，保证每个实例都能收到消息
-)
-@RequiredArgsConstructor
-public class RocketMQWebSocketMessageConsumer implements RocketMQListener<RocketMQWebSocketMessage> {
-
-    private final RocketMQWebSocketMessageSender rocketMQWebSocketMessageSender;
-
-    @Override
-    public void onMessage(RocketMQWebSocketMessage message) {
-        rocketMQWebSocketMessageSender.send(message.getSessionId(),
-                message.getUserType(), message.getUserId(),
-                message.getMessageType(), message.getMessageContent());
-    }
-
-}

tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessageSender.java

@@ -1,64 +0,0 @@
-package com.tashow.cloud.websocket.core.sender.rocketmq;
-
-import com.tashow.cloud.websocket.core.sender.AbstractWebSocketMessageSender;
-import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender;
-import com.tashow.cloud.websocket.core.session.WebSocketSessionManager;
-import com.tashow.cloud.websocket.core.sender.AbstractWebSocketMessageSender;
-import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender;
-import com.tashow.cloud.websocket.core.session.WebSocketSessionManager;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
-
-/**
- * 基于 RocketMQ 的 {@link WebSocketMessageSender} 实现类
- *
- * @author 芋道源码
- */
-@Slf4j
-public class RocketMQWebSocketMessageSender extends AbstractWebSocketMessageSender {
-
-    private final RocketMQTemplate rocketMQTemplate;
-
-    private final String topic;
-
-    public RocketMQWebSocketMessageSender(WebSocketSessionManager sessionManager,
-                                          RocketMQTemplate rocketMQTemplate,
-                                          String topic) {
-        super(sessionManager);
-        this.rocketMQTemplate = rocketMQTemplate;
-        this.topic = topic;
-    }
-
-    @Override
-    public void send(Integer userType, Long userId, String messageType, String messageContent) {
-        sendRocketMQMessage(null, userId, userType, messageType, messageContent);
-    }
-
-    @Override
-    public void send(Integer userType, String messageType, String messageContent) {
-        sendRocketMQMessage(null, null, userType, messageType, messageContent);
-    }
-
-    @Override
-    public void send(String sessionId, String messageType, String messageContent) {
-        sendRocketMQMessage(sessionId, null, null, messageType, messageContent);
-    }
-
-    /**
-     * 通过 RocketMQ 广播消息
-     *
-     * @param sessionId Session 编号
-     * @param userId 用户编号
-     * @param userType 用户类型
-     * @param messageType 消息类型
-     * @param messageContent 消息内容
-     */
-    private void sendRocketMQMessage(String sessionId, Long userId, Integer userType,
-                                     String messageType, String messageContent) {
-        RocketMQWebSocketMessage mqMessage = new RocketMQWebSocketMessage()
-                .setSessionId(sessionId).setUserId(userId).setUserType(userType)
-                .setMessageType(messageType).setMessageContent(messageContent);
-        rocketMQTemplate.syncSend(topic, mqMessage);
-    }
-
-}