Merge branch 'master' of https://github.com/tywo45/t-io

zhaoleoboy · Jul 8, 2019 · a81e8a0 · a81e8a0
2 parents eb48b52 + 778c3eb
commit a81e8a0
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 42 deletions.
diff --git a/src/zoo/spring-boot/tio-common/pom.xml b/src/zoo/spring-boot/tio-common/pom.xml
@@ -27,7 +27,6 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/zoo/spring-boot/tio-core/src/main/java/org/tio/core/starter/TioServerDefaultUuid.java b/src/zoo/spring-boot/tio-core/src/main/java/org/tio/core/starter/TioServerDefaultUuid.java
diff --git a/...ain/java/org/tio/websocket/starter/configuration/TioWebSocketServerClusterProperties.java b/...ain/java/org/tio/websocket/starter/configuration/TioWebSocketServerClusterProperties.java
@@ -1,15 +1,12 @@
 package org.tio.websocket.starter.configuration;
 
-import static org.tio.websocket.starter.configuration.TioWebSocketServerClusterProperties.PREFIX;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.tio.common.starter.configuration.TioClusterProperties;
 
 /**
  * @author fanpan26
  * @author kuangyoubo
  * */
-@ConfigurationProperties(PREFIX)
+@ConfigurationProperties("tio.websocket.cluster")
 public class TioWebSocketServerClusterProperties extends TioClusterProperties {
-    public static final String PREFIX = "tio.websocket.cluster";
 }
diff --git a/...t/src/main/java/org/tio/websocket/starter/configuration/TioWebSocketServerProperties.java b/...t/src/main/java/org/tio/websocket/starter/configuration/TioWebSocketServerProperties.java
@@ -4,14 +4,11 @@
 import org.tio.common.starter.configuration.TioProperties;
 import org.tio.websocket.starter.TioWebSocketClassScanner;
 
-import static org.tio.websocket.starter.configuration.TioWebSocketServerProperties.PREFIX;
-
 /**
  * @author fanpan26
  * */
-@ConfigurationProperties(PREFIX)
+@ConfigurationProperties("tio.websocket.server")
 public class TioWebSocketServerProperties extends TioProperties {
-    public static final String PREFIX = "tio.websocket.server";
 
     public boolean isUseScanner() {
         return useScanner;

diff --git a/...ava/org/tio/websocket/starter/configuration/TioWebSocketServerRedisClusterProperties.java b/...ava/org/tio/websocket/starter/configuration/TioWebSocketServerRedisClusterProperties.java
@@ -3,14 +3,11 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.tio.common.starter.configuration.TioRedisClusterProperties;
 
-import static org.tio.websocket.starter.configuration.TioWebSocketServerRedisClusterProperties.PREFIX;
-
 /**
  * @author fyp
  * @crate 2019/6/24 21:33
  * @project tio-starters
  */
-@ConfigurationProperties(PREFIX)
+@ConfigurationProperties("tio.websocket.cluster.redis")
 public class TioWebSocketServerRedisClusterProperties extends TioRedisClusterProperties {
-    public static final String PREFIX = "tio.websocket.cluster.redis";
 }
diff --git a/...rc/main/java/org/tio/websocket/starter/configuration/TioWebSocketServerSslProperties.java b/...rc/main/java/org/tio/websocket/starter/configuration/TioWebSocketServerSslProperties.java
@@ -3,12 +3,9 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.tio.common.starter.configuration.TioSslProperties;
 
-import static org.tio.websocket.starter.configuration.TioWebSocketServerSslProperties.PREFIX;
-
 /**
  * @author fyp
  */
-@ConfigurationProperties(PREFIX)
+@ConfigurationProperties("tio.websocket.ssl")
 public class TioWebSocketServerSslProperties extends TioSslProperties{
-    public static final String PREFIX = "tio.websocket.ssl";
 }