From 1a36d72abab91ec24dae22850a7ccbde915a1b7d Mon Sep 17 00:00:00 2001
From: jaysunxiao <jaysunxiao@gmail.com>
Date: Thu, 1 Jul 2021 14:52:28 +0800
Subject: [PATCH] =?UTF-8?q?test[websocket]:=20=E7=AE=80=E5=8C=96websocket?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{controller => }/WebsocketPacketController.java    | 10 ++++++----
 .../net/core/websocket/server/WebsocketServerTest.java |  9 ++-------
 2 files changed, 8 insertions(+), 11 deletions(-)
 rename net/src/test/java/com/zfoo/net/core/websocket/server/{controller => }/WebsocketPacketController.java (78%)

diff --git a/net/src/test/java/com/zfoo/net/core/websocket/server/controller/WebsocketPacketController.java b/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketPacketController.java
similarity index 78%
rename from net/src/test/java/com/zfoo/net/core/websocket/server/controller/WebsocketPacketController.java
rename to net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketPacketController.java
index 7ea77fea..2a9071d1 100644
--- a/net/src/test/java/com/zfoo/net/core/websocket/server/controller/WebsocketPacketController.java
+++ b/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketPacketController.java
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2020 The zfoo Authors
- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  *
@@ -11,13 +10,15 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.zfoo.net.core.websocket.server.controller;
+package com.zfoo.net.core.websocket.server;
 
 import com.zfoo.net.NetContext;
 import com.zfoo.net.dispatcher.model.anno.PacketReceiver;
 import com.zfoo.net.packet.websocket.CM_WebSocketPacket;
 import com.zfoo.net.session.model.Session;
 import com.zfoo.protocol.util.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 /**
@@ -27,10 +28,11 @@ import org.springframework.stereotype.Component;
 @Component
 public class WebsocketPacketController {
 
+    private static final Logger logger = LoggerFactory.getLogger(WebsocketPacketController.class);
+
     @PacketReceiver
     public void atCM_WebSocketPacket(Session session, CM_WebSocketPacket cm) {
-        System.out.println("receive packet from client:");
-        System.out.println(JsonUtils.object2String(cm));
+        logger.info("websocket server receive [packet:{}] from browser", JsonUtils.object2String(cm));
 
 
         NetContext.getDispatcher().send(session, cm);
diff --git a/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java b/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java
index 5e4a2eb1..dc811cd1 100644
--- a/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java
+++ b/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java
@@ -21,9 +21,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 /**
  * @author jaysunxiao
  * @version 3.0
@@ -31,12 +28,10 @@ import java.util.concurrent.Executors;
 @Ignore
 public class WebsocketServerTest {
 
-    private static final ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("config.xml");
-    private static final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-
-
     @Test
     public void startServer() {
+        var context = new ClassPathXmlApplicationContext("config.xml");
+
         var server = new WebsocketServer(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHostConfig().getAddressMap().get("server0")));
         server.start();