1、结构调整

2、抽象工厂优化

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/config/MsgpushWebSocketAutoConfiguration.java

@@ -1,33 +1,17 @@
 package com.njcn.msgpush.framework.websocket.config;
 
-import com.njcn.msgpush.framework.mq.redis.config.MsgpushRedisMQConsumerAutoConfiguration;
-import com.njcn.msgpush.framework.mq.redis.core.RedisMQTemplate;
 import com.njcn.msgpush.framework.websocket.core.handler.JsonWebSocketMessageHandler;
 import com.njcn.msgpush.framework.websocket.core.listener.WebSocketMessageListener;
 import com.njcn.msgpush.framework.websocket.core.security.LoginUserHandshakeInterceptor;
 import com.njcn.msgpush.framework.websocket.core.security.WebSocketAuthorizeRequestsCustomizer;
-import com.njcn.msgpush.framework.websocket.core.sender.kafka.KafkaWebSocketMessageConsumer;
-import com.njcn.msgpush.framework.websocket.core.sender.kafka.KafkaWebSocketMessageSender;
 import com.njcn.msgpush.framework.websocket.core.sender.local.LocalWebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.sender.rabbitmq.RabbitMQWebSocketMessageConsumer;
-import com.njcn.msgpush.framework.websocket.core.sender.rabbitmq.RabbitMQWebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.sender.redis.RedisWebSocketMessageConsumer;
-import com.njcn.msgpush.framework.websocket.core.sender.redis.RedisWebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.sender.rocketmq.RocketMQWebSocketMessageConsumer;
-import com.njcn.msgpush.framework.websocket.core.sender.rocketmq.RocketMQWebSocketMessageSender;
 import com.njcn.msgpush.framework.websocket.core.session.WebSocketSessionHandlerDecorator;
 import com.njcn.msgpush.framework.websocket.core.session.WebSocketSessionManager;
 import com.njcn.msgpush.framework.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,7 +24,7 @@ import java.util.List;
  *
  * @author xingyu4j
  */
-@AutoConfiguration(before = MsgpushRedisMQConsumerAutoConfiguration.class) // before MsgpushRedisMQConsumerAutoConfiguration 的原因是，需要保证 RedisWebSocketMessageConsumer 先创建，才能创建 RedisMessageListenerContainer
+@AutoConfiguration
 @EnableWebSocket // 开启 websocket
 @ConditionalOnProperty(prefix = "msgpush.websocket", value = "enable", matchIfMissing = true) // 允许使用 msgpush.websocket.enable=false 禁用 websocket
 @EnableConfigurationProperties(WebSocketProperties.class)
@@ -77,107 +61,14 @@ public class MsgpushWebSocketAutoConfiguration {
         return new WebSocketSessionManagerImpl();
     }
 
+    @Bean
+    public LocalWebSocketMessageSender webSocketMessageSender(WebSocketSessionManager sessionManager) {
+        return new LocalWebSocketMessageSender(sessionManager);
+    }
+
     @Bean
     public WebSocketAuthorizeRequestsCustomizer webSocketAuthorizeRequestsCustomizer(WebSocketProperties webSocketProperties) {
         return new WebSocketAuthorizeRequestsCustomizer(webSocketProperties);
     }
 
-    // ==================== Sender 相关 ====================
-
-    @Configuration
-    @ConditionalOnProperty(prefix = "msgpush.websocket", name = "sender-type", havingValue = "local")
-    public class LocalWebSocketMessageSenderConfiguration {
-
-        @Bean
-        public LocalWebSocketMessageSender localWebSocketMessageSender(WebSocketSessionManager sessionManager) {
-            return new LocalWebSocketMessageSender(sessionManager);
-        }
-
-    }
-
-    @Configuration
-    @ConditionalOnProperty(prefix = "msgpush.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 = "msgpush.websocket", name = "sender-type", havingValue = "rocketmq")
-    public class RocketMQWebSocketMessageSenderConfiguration {
-
-        @Bean
-        public RocketMQWebSocketMessageSender rocketMQWebSocketMessageSender(
-                WebSocketSessionManager sessionManager, RocketMQTemplate rocketMQTemplate,
-                @Value("${msgpush.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 = "msgpush.websocket", name = "sender-type", havingValue = "rabbitmq")
-    public class RabbitMQWebSocketMessageSenderConfiguration {
-
-        @Bean
-        public RabbitMQWebSocketMessageSender rabbitMQWebSocketMessageSender(
-                WebSocketSessionManager sessionManager, RabbitTemplate rabbitTemplate,
-                TopicExchange websocketTopicExchange) {
-            return new RabbitMQWebSocketMessageSender(sessionManager, rabbitTemplate, websocketTopicExchange);
-        }
-
-        @Bean
-        public RabbitMQWebSocketMessageConsumer rabbitMQWebSocketMessageConsumer(
-                RabbitMQWebSocketMessageSender rabbitMQWebSocketMessageSender) {
-            return new RabbitMQWebSocketMessageConsumer(rabbitMQWebSocketMessageSender);
-        }
-
-        /**
-         * 创建 Topic Exchange
-         */
-        @Bean
-        public TopicExchange websocketTopicExchange(@Value("${msgpush.websocket.sender-rabbitmq.exchange}") String exchange) {
-            return new TopicExchange(exchange,
-                    true,  // durable: 是否持久化
-                    false);  // exclusive: 是否排它
-        }
-
-    }
-
-    @Configuration
-    @ConditionalOnProperty(prefix = "msgpush.websocket", name = "sender-type", havingValue = "kafka")
-    public class KafkaWebSocketMessageSenderConfiguration {
-
-        @Bean
-        public KafkaWebSocketMessageSender kafkaWebSocketMessageSender(
-                WebSocketSessionManager sessionManager, KafkaTemplate<Object, Object> kafkaTemplate,
-                @Value("${msgpush.websocket.sender-kafka.topic}") String topic) {
-            return new KafkaWebSocketMessageSender(sessionManager, kafkaTemplate, topic);
-        }
-
-        @Bean
-        public KafkaWebSocketMessageConsumer kafkaWebSocketMessageConsumer(
-                KafkaWebSocketMessageSender kafkaWebSocketMessageSender) {
-            return new KafkaWebSocketMessageConsumer(kafkaWebSocketMessageSender);
-        }
-
-    }
-
-}
+}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/config/WebSocketProperties.java

@@ -1,12 +1,10 @@
 package com.njcn.msgpush.framework.websocket.config;
 
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;
 
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-
 /**
  * WebSocket 配置项
  *
@@ -23,12 +21,4 @@ public class WebSocketProperties {
     @NotEmpty(message = "WebSocket 的连接路径不能为空")
     private String path = "/ws";
 
-    /**
-     * 消息发送器的类型
-     *
-     * 可选值：local、redis、rocketmq、kafka、rabbitmq
-     */
-    @NotNull(message = "WebSocket 的消息发送者不能为空")
-    private String senderType = "local";
-
 }

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/handler/JsonWebSocketMessageHandler.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.TypeUtil;
 import com.njcn.msgpush.framework.common.util.json.JsonUtils;
 import com.njcn.msgpush.framework.websocket.core.listener.WebSocketMessageListener;
 import com.njcn.msgpush.framework.websocket.core.message.JsonWebSocketMessage;
-import com.njcn.msgpush.framework.websocket.core.util.WebSocketFrameworkUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketHandler;

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/message/JsonWebSocketMessage.java

@@ -2,6 +2,7 @@ package com.njcn.msgpush.framework.websocket.core.message;
 
 import com.njcn.msgpush.framework.websocket.core.listener.WebSocketMessageListener;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/kafka/KafkaWebSocketMessage.java

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

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/kafka/KafkaWebSocketMessageConsumer.java

@@ -1,28 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.kafka;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.kafka.annotation.KafkaListener;
-
-/**
- * {@link KafkaWebSocketMessage} 广播消息的消费者，真正把消息发送出去
- *
- * @author hongawen
- */
-@RequiredArgsConstructor
-public class KafkaWebSocketMessageConsumer {
-
-    private final KafkaWebSocketMessageSender kafkaWebSocketMessageSender;
-
-    @RabbitHandler
-    @KafkaListener(
-            topics = "${msgpush.websocket.sender-kafka.topic}",
-            // 在 Group 上，使用 UUID 生成其后缀。这样，启动的 Consumer 的 Group 不同，以达到广播消费的目的
-            groupId = "${msgpush.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());
-    }
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/kafka/KafkaWebSocketMessageSender.java

@@ -1,67 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.kafka;
-
-import com.njcn.msgpush.framework.websocket.core.sender.AbstractWebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.sender.WebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.session.WebSocketSessionManager;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.kafka.core.KafkaTemplate;
-
-import java.util.concurrent.ExecutionException;
-
-/**
- * 基于 Kafka 的 {@link WebSocketMessageSender} 实现类
- *
- * @author hongawen
- */
-@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);
-        }
-    }
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/rabbitmq/RabbitMQWebSocketMessage.java

@@ -1,37 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.rabbitmq;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * RabbitMQ 广播 WebSocket 的消息
- *
- * @author hongawen
- */
-@Data
-public class RabbitMQWebSocketMessage implements Serializable {
-
-    /**
-     * Session 编号
-     */
-    private String sessionId;
-    /**
-     * 用户类型
-     */
-    private Integer userType;
-    /**
-     * 用户编号
-     */
-    private Long userId;
-
-    /**
-     * 消息类型
-     */
-    private String messageType;
-    /**
-     * 消息内容
-     */
-    private String messageContent;
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/rabbitmq/RabbitMQWebSocketMessageConsumer.java

@@ -1,39 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.rabbitmq;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.amqp.core.ExchangeTypes;
-import org.springframework.amqp.rabbit.annotation.*;
-
-/**
- * {@link RabbitMQWebSocketMessage} 广播消息的消费者，真正把消息发送出去
- *
- * @author hongawen
- */
-@RabbitListener(
-        bindings = @QueueBinding(
-                value = @Queue(
-                        // 在 Queue 的名字上，使用 UUID 生成其后缀。这样，启动的 Consumer 的 Queue 不同，以达到广播消费的目的
-                        name = "${msgpush.websocket.sender-rabbitmq.queue}" + "-" + "#{T(java.util.UUID).randomUUID()}",
-                        // Consumer 关闭时，该队列就可以被自动删除了
-                        autoDelete = "true"
-                ),
-                exchange = @Exchange(
-                        name = "${msgpush.websocket.sender-rabbitmq.exchange}",
-                        type = ExchangeTypes.TOPIC,
-                        declare = "false"
-                )
-        )
-)
-@RequiredArgsConstructor
-public class RabbitMQWebSocketMessageConsumer {
-
-    private final RabbitMQWebSocketMessageSender rabbitMQWebSocketMessageSender;
-
-    @RabbitHandler
-    public void onMessage(RabbitMQWebSocketMessage message) {
-        rabbitMQWebSocketMessageSender.send(message.getSessionId(),
-                message.getUserType(), message.getUserId(),
-                message.getMessageType(), message.getMessageContent());
-    }
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/rabbitmq/RabbitMQWebSocketMessageSender.java

@@ -1,62 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.rabbitmq;
-
-import com.njcn.msgpush.framework.websocket.core.sender.AbstractWebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.sender.WebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.session.WebSocketSessionManager;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.TopicExchange;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-
-/**
- * 基于 RabbitMQ 的 {@link WebSocketMessageSender} 实现类
- *
- * @author hongawen
- */
-@Slf4j
-public class RabbitMQWebSocketMessageSender extends AbstractWebSocketMessageSender {
-
-    private final RabbitTemplate rabbitTemplate;
-
-    private final TopicExchange topicExchange;
-
-    public RabbitMQWebSocketMessageSender(WebSocketSessionManager sessionManager,
-                                          RabbitTemplate rabbitTemplate,
-                                          TopicExchange topicExchange) {
-        super(sessionManager);
-        this.rabbitTemplate = rabbitTemplate;
-        this.topicExchange = topicExchange;
-    }
-
-    @Override
-    public void send(Integer userType, Long userId, String messageType, String messageContent) {
-        sendRabbitMQMessage(null, userId, userType, messageType, messageContent);
-    }
-
-    @Override
-    public void send(Integer userType, String messageType, String messageContent) {
-        sendRabbitMQMessage(null, null, userType, messageType, messageContent);
-    }
-
-    @Override
-    public void send(String sessionId, String messageType, String messageContent) {
-        sendRabbitMQMessage(sessionId, null, null, messageType, messageContent);
-    }
-
-    /**
-     * 通过 RabbitMQ 广播消息
-     *
-     * @param sessionId Session 编号
-     * @param userId 用户编号
-     * @param userType 用户类型
-     * @param messageType 消息类型
-     * @param messageContent 消息内容
-     */
-    private void sendRabbitMQMessage(String sessionId, Long userId, Integer userType,
-                                     String messageType, String messageContent) {
-        RabbitMQWebSocketMessage mqMessage = new RabbitMQWebSocketMessage()
-                .setSessionId(sessionId).setUserId(userId).setUserType(userType)
-                .setMessageType(messageType).setMessageContent(messageContent);
-        rabbitTemplate.convertAndSend(topicExchange.getName(), null, mqMessage);
-    }
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/redis/RedisWebSocketMessage.java

@@ -1,34 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.redis;
-
-import com.njcn.msgpush.framework.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;
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java

@@ -1,23 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.redis;
-
-import com.njcn.msgpush.framework.mq.redis.core.pubsub.AbstractRedisChannelMessageListener;
-import lombok.RequiredArgsConstructor;
-
-/**
- * {@link RedisWebSocketMessage} 广播消息的消费者，真正把消息发送出去
- *
- * @author hongawen
- */
-@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());
-    }
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/redis/RedisWebSocketMessageSender.java

@@ -1,57 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.redis;
-
-import com.njcn.msgpush.framework.mq.redis.core.RedisMQTemplate;
-import com.njcn.msgpush.framework.websocket.core.sender.AbstractWebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.sender.WebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.session.WebSocketSessionManager;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 基于 Redis 的 {@link WebSocketMessageSender} 实现类
- *
- * @author hongawen
- */
-@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);
-    }
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/rocketmq/RocketMQWebSocketMessage.java

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

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/rocketmq/RocketMQWebSocketMessageConsumer.java

@@ -1,30 +0,0 @@
-package com.njcn.msgpush.framework.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 hongawen
- */
-@RocketMQMessageListener( // 重点：添加 @RocketMQMessageListener 注解，声明消费的 topic
-        topic = "${msgpush.websocket.sender-rocketmq.topic}",
-        consumerGroup = "${msgpush.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());
-    }
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/sender/rocketmq/RocketMQWebSocketMessageSender.java

@@ -1,61 +0,0 @@
-package com.njcn.msgpush.framework.websocket.core.sender.rocketmq;
-
-import com.njcn.msgpush.framework.websocket.core.sender.AbstractWebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.sender.WebSocketMessageSender;
-import com.njcn.msgpush.framework.websocket.core.session.WebSocketSessionManager;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
-
-/**
- * 基于 RocketMQ 的 {@link WebSocketMessageSender} 实现类
- *
- * @author hongawen
- */
-@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);
-    }
-
-}

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/core/util/WebSocketFrameworkUtils.java

@@ -5,53 +5,26 @@ import org.springframework.web.socket.WebSocketSession;
 
 import java.util.Map;
 
-/**
- * 专属于 web 包的工具类
- *
- * @author hongawen
- */
 public class WebSocketFrameworkUtils {
 
     public static final String ATTRIBUTE_LOGIN_USER = "LOGIN_USER";
 
-    /**
-     * 设置当前用户
-     *
-     * @param loginUser 登录用户
-     * @param attributes Session
-     */
     public static void setLoginUser(LoginUser loginUser, Map<String, Object> attributes) {
         attributes.put(ATTRIBUTE_LOGIN_USER, loginUser);
     }
 
-    /**
-     * 获取当前用户
-     *
-     * @return 当前用户
-     */
     public static LoginUser getLoginUser(WebSocketSession session) {
         return (LoginUser) session.getAttributes().get(ATTRIBUTE_LOGIN_USER);
     }
 
-    /**
-     * 获得当前用户的编号
-     *
-     * @return 用户编号
-     */
     public static Long getLoginUserId(WebSocketSession session) {
         LoginUser loginUser = getLoginUser(session);
         return loginUser != null ? loginUser.getId() : null;
     }
 
-    /**
-     * 获得当前用户的类型
-     *
-     * @return 用户编号
-     */
     public static Integer getLoginUserType(WebSocketSession session) {
         LoginUser loginUser = getLoginUser(session);
         return loginUser != null ? loginUser.getUserType() : null;
     }
 
-
 }

msgpush-framework/msgpush-spring-boot-starter-websocket/src/main/java/com/njcn/msgpush/framework/websocket/package-info.java

@@ -1,4 +0,0 @@
-/**
- * WebSocket 框架，支持多节点的广播
- */
-package com.njcn.msgpush.framework.websocket;