Ver código fonte

exclude tomcat

zhou-hao 7 anos atrás
pai
commit
9746548aa5

+ 19 - 6
hsweb-message/hsweb-message-websocket/pom.xml

@@ -26,12 +26,12 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-message-jms</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.hswebframework.web</groupId>-->
+            <!--<artifactId>hsweb-message-jms</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.hswebframework.web</groupId>
             <artifactId>hsweb-concurrent-counter-redis</artifactId>
@@ -59,7 +59,20 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <!--使用undertow作为web容器-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.hswebframework.web</groupId>
             <artifactId>hsweb-authorization-api</artifactId>

+ 1 - 10
hsweb-message/hsweb-message-websocket/src/test/java/org/hswebframework/web/socket/WebSocketServerTests.java

@@ -1,22 +1,13 @@
 package org.hswebframework.web.socket;
 
-import org.hswebframework.web.concurrent.counter.Counter;
 import org.hswebframework.web.concurrent.counter.CounterManager;
 import org.hswebframework.web.concurrent.counter.SimpleCounterManager;
-import org.hswebframework.web.counter.redis.RedissonCounterManager;
 import org.hswebframework.web.message.Messager;
-import org.hswebframework.web.message.jms.JmsMessager;
 import org.hswebframework.web.message.memory.MemoryMessager;
-import org.hswebframework.web.message.redis.RedissonMessager;
-import org.redisson.Redisson;
-import org.redisson.api.RedissonClient;
-import org.redisson.config.Config;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.jms.annotation.EnableJms;
-import org.springframework.jms.core.JmsTemplate;
 
 /**
  * TODO 完成注释
@@ -29,7 +20,7 @@ import org.springframework.jms.core.JmsTemplate;
 public class WebSocketServerTests {
 
     static {
-        System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "*");
+       // System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "*");
     }
 //
     @Bean