Merge pull request #35 from fanpan26/master

修复若干BUG
tywo45 · Sep 19, 2019 · 4bf52dd · 4bf52dd
2 parents d65c1b4 + 7e2e3af
commit 4bf52dd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 26 deletions.
diff --git a/...o/spring-boot/tio-core/src/main/java/org/tio/core/starter/TioServerAutoConfiguration.java b/...o/spring-boot/tio-core/src/main/java/org/tio/core/starter/TioServerAutoConfiguration.java
@@ -261,20 +261,25 @@ public class TioServerAutoConfiguration {
     @Autowired(required = false)
     private RedissonTioClusterTopic redissonTioClusterTopic;
 
+
+    private static TioServerBootstrap tioServerBootstrap;
     /**
      * Tio Server bootstrap
      * */
     @Bean
     public TioServerBootstrap webSocketServerBootstrap() {
-        return new TioServerBootstrap(
-                serverProperties,
-                clusterProperties,
-                serverSslProperties,
-                redissonTioClusterTopic,
-                ipStatListener,
-                groupListener,
-                serverAioHandler,
-                serverAioListener);
+        if(tioServerBootstrap == null) {
+            tioServerBootstrap = new TioServerBootstrap(
+                    serverProperties,
+                    clusterProperties,
+                    serverSslProperties,
+                    redissonTioClusterTopic,
+                    ipStatListener,
+                    groupListener,
+                    serverAioHandler,
+                    serverAioListener);
+        }
+        return tioServerBootstrap;
     }
 
     @Bean

diff --git a/...spring-boot/tio-core/src/main/java/org/tio/core/starter/TioServerMarkerConfiguration.java b/...spring-boot/tio-core/src/main/java/org/tio/core/starter/TioServerMarkerConfiguration.java
@@ -206,7 +206,7 @@ recommend that a file or class name and description of purpose be included on
 public class TioServerMarkerConfiguration {
 
     @Bean
-    public Marker tioWebSocketServerMarkBean() {
+    public Marker tioServerMarkBean() {
         return new Marker();
     }
 

diff --git a/...ebsocket/src/main/java/org/tio/websocket/starter/TioWebSocketServerAutoConfiguration.java b/...ebsocket/src/main/java/org/tio/websocket/starter/TioWebSocketServerAutoConfiguration.java
@@ -196,6 +196,7 @@ recommend that a file or class name and description of purpose be included on
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
@@ -262,30 +263,36 @@ public class TioWebSocketServerAutoConfiguration {
     @Autowired(required = false)
     private TioWebSocketClassScanner tioWebSocketClassScanner;
 
+
+    private static TioWebSocketServerBootstrap tioWebSocketServerBootstrap;
     /**
      * Tio WebSocket Server bootstrap
      * */
     @Bean
-    public TioWebSocketServerBootstrap webSocketServerBootstrap() {
-        return new TioWebSocketServerBootstrap(serverProperties,
-                clusterProperties,
-                serverSslProperties,
-                redissonTioClusterTopic,
-                tioWebSocketMsgHandler,
-                tioWebSocketIpStatListener,
-                tioWebSocketGroupListener,
-                tioWebSocketServerAioListener,
-                tioWebSocketClassScanner);
+    public TioWebSocketServerBootstrap wsServerBootstrap() {
+        if (tioWebSocketServerBootstrap == null) {
+            tioWebSocketServerBootstrap = new TioWebSocketServerBootstrap(serverProperties,
+                    clusterProperties,
+                    serverSslProperties,
+                    redissonTioClusterTopic,
+                    tioWebSocketMsgHandler,
+                    tioWebSocketIpStatListener,
+                    tioWebSocketGroupListener,
+                    tioWebSocketServerAioListener,
+                    tioWebSocketClassScanner);
+        }
+        return tioWebSocketServerBootstrap;
+
     }
 
     @Bean
-    public ServerTioConfig serverTioConfig(TioWebSocketServerBootstrap bootstrap){
+    public ServerTioConfig wsServerTioConfig(TioWebSocketServerBootstrap bootstrap){
         return bootstrap.getServerTioConfig();
     }
 
     @Bean(destroyMethod="shutdown")
     @ConditionalOnProperty(value = "tio.websocket.cluster.enabled",havingValue = "true",matchIfMissing = true)
-    public RedisInitializer redisInitializer(ApplicationContext applicationContext) {
+    public RedisInitializer wsRedisInitializer(ApplicationContext applicationContext) {
         return new RedisInitializer(redisConfig, applicationContext);
     }
 
@@ -295,7 +302,7 @@ public RedisInitializer redisInitializer(ApplicationContext applicationContext)
      * */
     @Bean
     @ConditionalOnBean(RedisInitializer.class)
-    public RedissonTioClusterTopic redissonTioClusterTopic(RedisInitializer redisInitializer) {
+    public RedissonTioClusterTopic wsRedissonTioClusterTopic(RedisInitializer redisInitializer) {
         return new RedissonTioClusterTopic(CLUSTER_TOPIC_CHANNEL,redisInitializer.getRedissonClient());
     }
 

diff --git a/...ot/tio-websocket/src/main/java/org/tio/websocket/starter/TioWebSocketServerBootstrap.java b/...ot/tio-websocket/src/main/java/org/tio/websocket/starter/TioWebSocketServerBootstrap.java
@@ -222,6 +222,8 @@ public final class TioWebSocketServerBootstrap {
 
     private static final String GROUP_CONTEXT_NAME = "tio-websocket-spring-boot-starter";
 
+    private static final boolean started = false;
+
     private TioWebSocketServerProperties serverProperties;
     private TioWebSocketServerClusterProperties clusterProperties;
     private TioWebSocketServerSslProperties serverSslProperties;
@@ -249,9 +251,6 @@ public TioWebSocketServerBootstrap(TioWebSocketServerProperties serverProperties
         this.serverSslProperties = serverSslProperties;
 
         logger.debug(serverSslProperties.toString());
-        if (redissonTioClusterTopic == null) {
-            logger.info("cluster mod closed");
-        }
         this.redissonTioClusterTopic = redissonTioClusterTopic;
 
         // IWsMsgHandler bean not found