From cc0bdfb33ef638dfafe3185c92c7076d815e1c9b Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期六, 18 五月 2024 21:42:19 +0800 Subject: [PATCH] 代码优化 --- smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDistributor.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageFilterHolder.java | 2 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/MessageDistributorTypeConstants.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketMessageSender.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PlanTextMessageHandler.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/SessionKeyGenerator.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDO.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/MapSessionWebSocketHandlerDecorator.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/WebSocketSessionHolder.java | 1 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/consumer/TelemetryDataRealTimeConsumer.java | 7 +++ smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/WebSocketMessageTypeEnum.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomPlanTextMessageHandler.java | 3 - smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/JsonMessageHandler.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketProperties.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketHandlerConfig.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisMessageDistributor.java | 5 +- smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PingJsonMessageHandler.java | 7 +-- smart-man-boot/src/main/java/com/qianwen/smartman/common/request/HeaderHttpServletRequestWrapper.java | 2 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/MasterlinkSessionKeyGenerator.java | 3 - smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java | 3 - smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/RedisMessageDistributorConfiguration.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PongJsonWebSocketMessage.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageSender.java | 2 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/DefaultTypeSessionFilter.java | 9 ++-- smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/UserAttributeHandshakeInterceptor.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/JsonWebSocketMessage.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/LocalMessageDistributor.java | 4 +- smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java | 2 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PingJsonWebSocketMessage.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisWebsocketMessageListener.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/SubscriptionSessionFilter.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/LocalMessageDistributorConfiguration.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketAutoConfiguration.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/ServerConfig.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomWebSocketHandler.java | 1 smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java | 1 36 files changed, 24 insertions(+), 49 deletions(-) diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/request/HeaderHttpServletRequestWrapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/request/HeaderHttpServletRequestWrapper.java index b828546..7290dcc 100644 --- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/request/HeaderHttpServletRequestWrapper.java +++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/request/HeaderHttpServletRequestWrapper.java @@ -13,7 +13,7 @@ public HeaderHttpServletRequestWrapper(HttpServletRequest request) { super(request); - this.headers = new HashMap(); + this.headers = new HashMap<>(); } public void addHeader(String name, String value) { diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java index 1dfcf47..10a62f8 100644 --- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java +++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java @@ -23,7 +23,7 @@ public void handle(WebSocketSession session, RealTimeDataRequestJsonWebSocketMessage message) { List<String> workstationIdList = message.getWorkstationIdList(); - List<OrderWorkstation> workstationInProcess = this.orderWorkstationService.getWorkstationInProcess((Set) workstationIdList.stream().map(Long::valueOf).collect(Collectors.toSet())); + List<OrderWorkstation> workstationInProcess = this.orderWorkstationService.getWorkstationInProcess(workstationIdList.stream().map(Long::valueOf).collect(Collectors.toSet())); Map<Long, String> orderWorkstationMap = (Map) workstationInProcess.stream().collect(Collectors.toMap((v0) -> { return v0.getWorkstationId(); }, (v0) -> { diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/consumer/TelemetryDataRealTimeConsumer.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/consumer/TelemetryDataRealTimeConsumer.java index 7980eb1..b39b484 100644 --- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/consumer/TelemetryDataRealTimeConsumer.java +++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/consumer/TelemetryDataRealTimeConsumer.java @@ -26,6 +26,9 @@ import com.qianwen.smartman.modules.cps.utils.TelemetryDataUtils; import org.springframework.stereotype.Component; +/** + * rockmq娑堟伅娑堣垂鑰� telemetry(閬ユ祴) + */ @RocketMQMessageListener(topic = "telemetry-data", consumerGroup = "telemetry-data-real-time-consumer", consumeMode = ConsumeMode.ORDERLY) @Component public class TelemetryDataRealTimeConsumer implements RocketMQListener<TelemetryDataMessage>, RocketMQPushConsumerLifecycleListener { @@ -60,10 +63,12 @@ }); } } - + @Override public void prepareStart(DefaultMQPushConsumer consumer) { consumer.setMaxReconsumeTimes(1); consumer.setInstanceName(CommonUtil.changeInstanceNameToPID(consumer)); consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_LAST_OFFSET); } + + } diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/LocalMessageDistributorConfiguration.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/LocalMessageDistributorConfiguration.java index c95b87d..b119fab 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/LocalMessageDistributorConfiguration.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/LocalMessageDistributorConfiguration.java @@ -9,7 +9,6 @@ @ConditionalOnProperty(prefix = WebSocketProperties.PREFIX, name = {"message-distributor"}, havingValue = MessageDistributorTypeConstants.LOCAL) @Configuration(proxyBeanMethods = false) -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/config/LocalMessageDistributorConfiguration.class */ public class LocalMessageDistributorConfiguration { @ConditionalOnMissingBean({MessageDistributor.class}) @Bean diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/MessageDistributorTypeConstants.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/MessageDistributorTypeConstants.java index 8b87f2e..e2a78fb 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/MessageDistributorTypeConstants.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/MessageDistributorTypeConstants.java @@ -1,6 +1,5 @@ package com.qianwen.core.websocket.config; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/config/MessageDistributorTypeConstants.class */ public final class MessageDistributorTypeConstants { public static final String LOCAL = "local"; public static final String REDIS = "redis"; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/RedisMessageDistributorConfiguration.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/RedisMessageDistributorConfiguration.java index 9ed4652..cdcdf8d 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/RedisMessageDistributorConfiguration.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/RedisMessageDistributorConfiguration.java @@ -19,7 +19,6 @@ @ConditionalOnClass({StringRedisTemplate.class}) @ConditionalOnProperty(prefix = WebSocketProperties.PREFIX, name = {"message-distributor"}, havingValue = MessageDistributorTypeConstants.REDIS, matchIfMissing = true) @Configuration(proxyBeanMethods = false) -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/config/RedisMessageDistributorConfiguration.class */ public class RedisMessageDistributorConfiguration { @ConditionalOnMissingBean({MessageDistributor.class}) @Bean diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/ServerConfig.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/ServerConfig.java index 4169f30..78ecabc 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/ServerConfig.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/ServerConfig.java @@ -7,7 +7,6 @@ import org.springframework.stereotype.Component; @Component -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/config/ServerConfig.class */ public class ServerConfig implements ApplicationListener<WebServerInitializedEvent> { private int serverPort; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketAutoConfiguration.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketAutoConfiguration.java index 4171f3b..9cfc033 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketAutoConfiguration.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketAutoConfiguration.java @@ -18,7 +18,6 @@ @Configuration @Import({WebSocketHandlerConfig.class}) @EnableWebSocket -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/config/WebSocketAutoConfiguration.class */ public class WebSocketAutoConfiguration { private final WebSocketProperties webSocketProperties; private final List<JsonMessageHandler> jsonMessageHandlerList; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketHandlerConfig.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketHandlerConfig.java index b437ea1..973424e 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketHandlerConfig.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketHandlerConfig.java @@ -19,7 +19,6 @@ import org.springframework.web.socket.server.HandshakeInterceptor; @EnableConfigurationProperties({WebSocketProperties.class}) -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/config/WebSocketHandlerConfig.class */ public class WebSocketHandlerConfig { private final WebSocketProperties webSocketProperties; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketMessageSender.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketMessageSender.java index 65c467b..7b39755 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketMessageSender.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketMessageSender.java @@ -12,7 +12,6 @@ import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/config/WebSocketMessageSender.class */ public class WebSocketMessageSender { private static final Logger log = LoggerFactory.getLogger(WebSocketMessageSender.class); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketProperties.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketProperties.java index 4ebd62f..3e5d539 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketProperties.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/config/WebSocketProperties.java @@ -3,7 +3,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties(WebSocketProperties.PREFIX) -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/config/WebSocketProperties.class */ public class WebSocketProperties { public static final String PREFIX = "blade.websocket"; private String path = "/ws/info"; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/DefaultTypeSessionFilter.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/DefaultTypeSessionFilter.java index 257671e..63e575c 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/DefaultTypeSessionFilter.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/DefaultTypeSessionFilter.java @@ -6,7 +6,6 @@ import com.qianwen.core.websocket.message.JsonWebSocketMessage; import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/custom/DefaultTypeSessionFilter.class */ public class DefaultTypeSessionFilter implements SubscriptionSessionFilter<JsonWebSocketMessage> { private final String type; @@ -14,19 +13,19 @@ this.type = type; } - @Override // com.qianwen.core.websocket.custom.SubscriptionSessionFilter + @Override public String type() { return this.type; } - @Override // com.qianwen.core.websocket.custom.SubscriptionSessionFilter + @Override public void onMessage(WebSocketSession session, JsonWebSocketMessage message) { session.getAttributes().put(JsonWebSocketMessage.TYPE_FIELD, this.type); } - @Override // com.qianwen.core.websocket.custom.SubscriptionSessionFilter + @Override public List<String> onResponse(String message) { - return (List) WebSocketSessionHolder.getSessions().stream().filter(item -> { + return WebSocketSessionHolder.getSessions().stream().filter(item -> { return this.type.equals(item.getAttributes().get(JsonWebSocketMessage.TYPE_FIELD)); }).map((v0) -> { return v0.getId(); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/MasterlinkSessionKeyGenerator.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/MasterlinkSessionKeyGenerator.java index c5b132a..40ccd4d 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/MasterlinkSessionKeyGenerator.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/MasterlinkSessionKeyGenerator.java @@ -11,14 +11,13 @@ import org.springframework.web.socket.WebSocketSession; @Configuration -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/custom/MasterlinkSessionKeyGenerator.class */ public class MasterlinkSessionKeyGenerator implements SessionKeyGenerator { @Autowired(required = false) private ServiceInstance instance; @Autowired private ServerConfig serverConfig; - @Override // com.qianwen.core.websocket.holder.SessionKeyGenerator + @Override public Object sessionKey(WebSocketSession webSocketSession) { String host; int port; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/SubscriptionSessionFilter.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/SubscriptionSessionFilter.java index 5cd68b1..70a0ca4 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/SubscriptionSessionFilter.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/SubscriptionSessionFilter.java @@ -4,7 +4,6 @@ import com.qianwen.core.websocket.message.JsonWebSocketMessage; import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/custom/SubscriptionSessionFilter.class */ public interface SubscriptionSessionFilter<R extends JsonWebSocketMessage> { String type(); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/UserAttributeHandshakeInterceptor.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/UserAttributeHandshakeInterceptor.java index 4186212..2d4df83 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/UserAttributeHandshakeInterceptor.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/custom/UserAttributeHandshakeInterceptor.java @@ -9,7 +9,6 @@ import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.server.HandshakeInterceptor; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/custom/UserAttributeHandshakeInterceptor.class */ public class UserAttributeHandshakeInterceptor implements HandshakeInterceptor { public boolean beforeHandshake(ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse, WebSocketHandler webSocketHandler, Map<String, Object> attributes) throws Exception { BladeUser user = AuthUtil.getUser(); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/LocalMessageDistributor.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/LocalMessageDistributor.java index d0561c1..fa7f5e9 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/LocalMessageDistributor.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/LocalMessageDistributor.java @@ -1,8 +1,8 @@ package com.qianwen.core.websocket.distribute; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/distribute/LocalMessageDistributor.class */ + public class LocalMessageDistributor implements MessageDistributor, MessageSender { - @Override // com.qianwen.core.websocket.distribute.MessageDistributor + @Override public void distribute(MessageDO messageDO) { doSend(messageDO); } diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDO.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDO.java index 8effab9..74c1084 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDO.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDO.java @@ -2,7 +2,6 @@ import java.util.List; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/distribute/MessageDO.class */ public class MessageDO { private Boolean needBroadcast; private List<Object> sessionKeys; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDistributor.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDistributor.java index 9cac6e0..f73e55a 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDistributor.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageDistributor.java @@ -1,6 +1,5 @@ package com.qianwen.core.websocket.distribute; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/distribute/MessageDistributor.class */ public interface MessageDistributor { void distribute(MessageDO messageDO); } diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageSender.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageSender.java index 676f60f..b46f093 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageSender.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/MessageSender.java @@ -5,7 +5,7 @@ import com.qianwen.core.websocket.config.WebSocketMessageSender; import com.qianwen.core.websocket.holder.WebSocketSessionHolder; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/distribute/MessageSender.class */ + public interface MessageSender { default void doSend(MessageDO messageDO) { Boolean needBroadcast = messageDO.getNeedBroadcast(); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisMessageDistributor.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisMessageDistributor.java index 74f2344..e8d783a 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisMessageDistributor.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisMessageDistributor.java @@ -10,7 +10,6 @@ import org.springframework.cloud.client.ServiceInstance; import org.springframework.data.redis.core.StringRedisTemplate; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/distribute/RedisMessageDistributor.class */ public class RedisMessageDistributor implements MessageDistributor { private final StringRedisTemplate stringRedisTemplate; @@ -18,7 +17,7 @@ this.stringRedisTemplate = stringRedisTemplate; } - @Override // com.qianwen.core.websocket.distribute.MessageDistributor + @Override public void distribute(MessageDO messageDO) { String host; int port; @@ -40,7 +39,7 @@ if (Func.isNotEmpty(messageDO.getSessionKeys())) { String str = host; int i = port; - List<Object> sessionKeyList = (List) messageDO.getSessionKeys().stream().map(key -> { + List<Object> sessionKeyList = messageDO.getSessionKeys().stream().map(key -> { return String.format("%s:%s:%s", str, Integer.valueOf(i), key); }).collect(Collectors.toList()); messageDO.setSessionKeys(sessionKeyList); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisWebsocketMessageListener.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisWebsocketMessageListener.java index 074d2a5..630d8b3 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisWebsocketMessageListener.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/distribute/RedisWebsocketMessageListener.java @@ -14,7 +14,6 @@ import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/distribute/RedisWebsocketMessageListener.class */ public class RedisWebsocketMessageListener implements MessageListener, MessageSender { public static final String CHANNEL = "websocket-send"; private final StringRedisTemplate stringRedisTemplate; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomPlanTextMessageHandler.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomPlanTextMessageHandler.java index 1ac609e..e8ddbf6 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomPlanTextMessageHandler.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomPlanTextMessageHandler.java @@ -4,11 +4,10 @@ import org.slf4j.LoggerFactory; import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/handler/CustomPlanTextMessageHandler.class */ public class CustomPlanTextMessageHandler implements PlanTextMessageHandler { private static final Logger log = LoggerFactory.getLogger(CustomPlanTextMessageHandler.class); - @Override // com.qianwen.core.websocket.handler.PlanTextMessageHandler + @Override public void handle(WebSocketSession session, String message) { log.info("sessionId {} ,msg {}", session.getId(), message); } diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomWebSocketHandler.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomWebSocketHandler.java index b950810..aa51400 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomWebSocketHandler.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/CustomWebSocketHandler.java @@ -16,7 +16,6 @@ import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.handler.TextWebSocketHandler; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/handler/CustomWebSocketHandler.class */ public class CustomWebSocketHandler extends TextWebSocketHandler { private static final Logger log = LoggerFactory.getLogger(CustomWebSocketHandler.class); private static final ObjectMapper MAPPER = new ObjectMapper(); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/JsonMessageHandler.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/JsonMessageHandler.java index 2a58c07..915fad9 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/JsonMessageHandler.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/JsonMessageHandler.java @@ -3,7 +3,6 @@ import com.qianwen.core.websocket.message.JsonWebSocketMessage; import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/handler/JsonMessageHandler.class */ public interface JsonMessageHandler<T extends JsonWebSocketMessage> { void handle(WebSocketSession session, T message); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PingJsonMessageHandler.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PingJsonMessageHandler.java index 4529fd2..0b200f8 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PingJsonMessageHandler.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PingJsonMessageHandler.java @@ -7,20 +7,19 @@ import com.qianwen.core.websocket.message.WebSocketMessageTypeEnum; import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/handler/PingJsonMessageHandler.class */ public class PingJsonMessageHandler implements JsonMessageHandler<PingJsonWebSocketMessage> { - @Override // com.qianwen.core.websocket.handler.JsonMessageHandler + @Override public void handle(WebSocketSession session, PingJsonWebSocketMessage message) { JsonWebSocketMessage pongJsonWebSocketMessage = new PongJsonWebSocketMessage(); WebSocketMessageSender.send(session, pongJsonWebSocketMessage); } - @Override // com.qianwen.core.websocket.handler.JsonMessageHandler + @Override public String type() { return WebSocketMessageTypeEnum.PING.getValue(); } - @Override // com.qianwen.core.websocket.handler.JsonMessageHandler + @Override public Class<PingJsonWebSocketMessage> getMessageClass() { return PingJsonWebSocketMessage.class; } diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PlanTextMessageHandler.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PlanTextMessageHandler.java index 7b55d1f..c06eb04 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PlanTextMessageHandler.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/handler/PlanTextMessageHandler.java @@ -2,7 +2,6 @@ import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/handler/PlanTextMessageHandler.class */ public interface PlanTextMessageHandler { void handle(WebSocketSession session, String message); } diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageFilterHolder.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageFilterHolder.java index bb25efc..80b82a9 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageFilterHolder.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageFilterHolder.java @@ -5,7 +5,7 @@ import com.qianwen.core.websocket.custom.SubscriptionSessionFilter; import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/holder/JsonMessageFilterHolder.class */ + public final class JsonMessageFilterHolder { private static final Map<String, SubscriptionSessionFilter> MESSAGE_HANDLER_MAP = new ConcurrentHashMap<>(); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java index 3452ee1..c8f35e9 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java @@ -4,7 +4,6 @@ import java.util.concurrent.ConcurrentHashMap; import com.qianwen.core.websocket.handler.JsonMessageHandler; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/holder/JsonMessageHandlerHolder.class */ public final class JsonMessageHandlerHolder { private static final Map<String, JsonMessageHandler> MESSAGE_HANDLER_MAP = new ConcurrentHashMap(); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/MapSessionWebSocketHandlerDecorator.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/MapSessionWebSocketHandlerDecorator.java index 6b7e6c9..ba01ce8 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/MapSessionWebSocketHandlerDecorator.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/MapSessionWebSocketHandlerDecorator.java @@ -5,7 +5,6 @@ import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.handler.WebSocketHandlerDecorator; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/holder/MapSessionWebSocketHandlerDecorator.class */ public class MapSessionWebSocketHandlerDecorator extends WebSocketHandlerDecorator { private final SessionKeyGenerator sessionKeyGenerator; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/SessionKeyGenerator.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/SessionKeyGenerator.java index e6aaf11..42b5568 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/SessionKeyGenerator.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/SessionKeyGenerator.java @@ -2,7 +2,6 @@ import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/holder/SessionKeyGenerator.class */ public interface SessionKeyGenerator { Object sessionKey(WebSocketSession webSocketSession); } diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/WebSocketSessionHolder.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/WebSocketSessionHolder.java index 39cedc3..20b5a03 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/WebSocketSessionHolder.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/WebSocketSessionHolder.java @@ -8,7 +8,6 @@ import java.util.stream.Collectors; import org.springframework.web.socket.WebSocketSession; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/holder/WebSocketSessionHolder.class */ public class WebSocketSessionHolder { private static final Map<Object, Set<WebSocketSession>> USER_SESSION_MAP = new ConcurrentHashMap(); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java index d00e10b..7021aef 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java @@ -1,6 +1,5 @@ package com.qianwen.core.websocket.message; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/message/AbstractJsonWebSocketMessage.class */ public abstract class AbstractJsonWebSocketMessage implements JsonWebSocketMessage { private final String type; @@ -9,7 +8,7 @@ this.type = type; } - @Override // com.qianwen.core.websocket.message.JsonWebSocketMessage + @Override public String getType() { return this.type; } diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/JsonWebSocketMessage.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/JsonWebSocketMessage.java index 56e82be..16ccd20 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/JsonWebSocketMessage.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/JsonWebSocketMessage.java @@ -1,6 +1,5 @@ package com.qianwen.core.websocket.message; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/message/JsonWebSocketMessage.class */ public interface JsonWebSocketMessage { public static final String TYPE_FIELD = "type"; diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PingJsonWebSocketMessage.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PingJsonWebSocketMessage.java index d9f9961..436e9de 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PingJsonWebSocketMessage.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PingJsonWebSocketMessage.java @@ -1,6 +1,5 @@ package com.qianwen.core.websocket.message; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/message/PingJsonWebSocketMessage.class */ public class PingJsonWebSocketMessage extends AbstractJsonWebSocketMessage { public PingJsonWebSocketMessage() { super(WebSocketMessageTypeEnum.PING.getValue()); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PongJsonWebSocketMessage.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PongJsonWebSocketMessage.java index 938f931..6e5d306 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PongJsonWebSocketMessage.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/PongJsonWebSocketMessage.java @@ -1,6 +1,5 @@ package com.qianwen.core.websocket.message; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/message/PongJsonWebSocketMessage.class */ public class PongJsonWebSocketMessage extends AbstractJsonWebSocketMessage { public PongJsonWebSocketMessage() { super(WebSocketMessageTypeEnum.PONG.getValue()); diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/WebSocketMessageTypeEnum.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/WebSocketMessageTypeEnum.java index eadba29..c4c2ee5 100644 --- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/WebSocketMessageTypeEnum.java +++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/WebSocketMessageTypeEnum.java @@ -1,6 +1,5 @@ package com.qianwen.core.websocket.message; -/* loaded from: blade-starter-websocket-9.3.0.0-SNAPSHOT.jar:org/springblade/core/websocket/message/WebSocketMessageTypeEnum.class */ public enum WebSocketMessageTypeEnum { PING("ping"), PONG("pong"); -- Gitblit v1.9.3