Browse Source

优化依赖

zhou-hao 7 years ago
parent
commit
aa43475047

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

@@ -19,12 +19,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.hswebframework.web</groupId>-->
-            <!--<artifactId>hsweb-message-memory</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.hswebframework.web</groupId>
+            <artifactId>hsweb-message-memory</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.hswebframework.web</groupId>

+ 16 - 14
hsweb-message/hsweb-message-websocket/src/test/java/org/hswebframework/web/socket/WebSocketServerTests.java

@@ -2,9 +2,11 @@ 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;
@@ -23,33 +25,33 @@ import org.springframework.jms.core.JmsTemplate;
  */
 @Configuration
 @EnableAutoConfiguration
-@EnableJms
+//@EnableJms
 public class WebSocketServerTests {
 
     static {
         System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "*");
     }
-
+//
     @Bean
-    public Messager messager(RedissonClient client) {
-        return new RedissonMessager(client);
+    public Messager messager() {
+        return new MemoryMessager();
     }
 
-    @Bean(destroyMethod = "shutdown")
-    public RedissonClient redissonClient(){
-        Config config = new Config();
-        config.useSingleServer().setAddress("redis://127.0.0.1:6379");
-        return Redisson.create(config);
-    }
+//    @Bean(destroyMethod = "shutdown")
+//    public RedissonClient redissonClient(){
+//        Config config = new Config();
+//        config.useSingleServer().setAddress("redis://127.0.0.1:6379");
+//        return Redisson.create(config);
+//    }
 
     @Bean
-    public TestProcessor testProcessor() {
-        return new TestProcessor();
+    public CounterManager counterManager() {
+        return new SimpleCounterManager();
     }
 
     @Bean
-    public CounterManager counterManager(RedissonClient client) {
-        return new RedissonCounterManager(client);
+    public TestProcessor testProcessor() {
+        return new TestProcessor();
     }
 
 //    // 使用redis