zhanghaijun vor 2 Jahren
Ursprung
Commit
b2bce137fa

+ 3 - 3
train-common/train-common-web/src/main/java/top/haijunit/web/interceptor/WebInvokeTimeInterceptor.java

@@ -37,14 +37,14 @@ public class WebInvokeTimeInterceptor implements HandlerInterceptor {
                     BufferedReader reader = request.getReader();
                     BufferedReader reader = request.getReader();
                     jsonParam = IoUtil.read(reader);
                     jsonParam = IoUtil.read(reader);
                 }
                 }
-                log.info("[TRAIN]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
+                log.debug("[TRAIN]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
             } else {
             } else {
                 Map<String, String[]> parameterMap = request.getParameterMap();
                 Map<String, String[]> parameterMap = request.getParameterMap();
                 if (MapUtil.isNotEmpty(parameterMap)) {
                 if (MapUtil.isNotEmpty(parameterMap)) {
                     String parameters = JsonUtils.toJsonString(parameterMap);
                     String parameters = JsonUtils.toJsonString(parameterMap);
-                    log.info("[TRAIN]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
+                    log.debug("[TRAIN]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
                 } else {
                 } else {
-                    log.info("[TRAIN]开始请求 => URL[{}],无参数", url);
+                    log.debug("[TRAIN]开始请求 => URL[{}],无参数", url);
                 }
                 }
             }
             }
         }
         }

+ 24 - 0
train-common/train-common-websocket/src/main/java/top/haijunit/websocket/domain/MessageDto.java

@@ -0,0 +1,24 @@
+package top.haijunit.websocket.domain;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/11/23 10:28
+ * @description 消息内容
+ */
+@Data
+public class MessageDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+
+    /** 需要发送的消息 */
+    private String messageText;
+
+
+}

+ 7 - 6
train-common/train-common-websocket/src/main/java/top/haijunit/websocket/handler/WebSocketHandler.java

@@ -8,6 +8,7 @@ import org.springframework.web.socket.PongMessage;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.handler.AbstractWebSocketHandler;
 import org.springframework.web.socket.handler.AbstractWebSocketHandler;
+import top.haijunit.websocket.utils.WebSocketUtils;
 
 
 /**
 /**
  * @author zhanghaijun
  * @author zhanghaijun
@@ -20,33 +21,33 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
     /** 连接成功后 */
     /** 连接成功后 */
     @Override
     @Override
     public void afterConnectionEstablished(WebSocketSession session) throws Exception {
     public void afterConnectionEstablished(WebSocketSession session) throws Exception {
-        WebSocketSessionHolder.addSession(IdUtil.simpleUUID(), session);
+        WebSocketSessionHolder.addSession(IdUtil.fastSimpleUUID(), session);
     }
     }
 
 
     /** 处理发送来的文本消息 */
     /** 处理发送来的文本消息 */
     @Override
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
-        log.info("WebSocketHandler, 连接:" + session.getId() + ",已收到消息:" + message.getPayload());
+        log.info("[websocket] 连接:" + session.getId() + ",已收到消息:" + message.getPayload());
         String sessionId = Convert.toStr(session.getAttributes().get("loginUser"), "");
         String sessionId = Convert.toStr(session.getAttributes().get("loginUser"), "");
-        top.haijunit.websocket.utils.WebSocketUtils.sendMessage(sessionId, message.getPayload());
+        WebSocketUtils.sendMessage(sessionId, message.getPayload());
     }
     }
 
 
     /** 心跳监测的回复 */
     /** 心跳监测的回复 */
     @Override
     @Override
     protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception {
     protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception {
-        top.haijunit.websocket.utils.WebSocketUtils.sendPongMessage(session);
+        WebSocketUtils.sendMessage(session, new PongMessage());
     }
     }
 
 
     /** 连接出错时 */
     /** 连接出错时 */
     @Override
     @Override
     public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
     public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
-        log.error("[transport error] sessionId: {} , exception:{}", session.getId(), exception.getMessage());
+        log.error("[websocket] sessionId: {} , exception:{}", session.getId(), exception.getMessage());
     }
     }
 
 
     /** 连接关闭后 */
     /** 连接关闭后 */
     @Override
     @Override
     public void afterConnectionClosed(WebSocketSession session, CloseStatus status) {
     public void afterConnectionClosed(WebSocketSession session, CloseStatus status) {
-        log.info("[disconnect] sessionId: {}", session.getId());
+        log.info("[websocket] sessionId: {}", session.getId());
     }
     }
 
 
     /** 是否支持分片消息 */
     /** 是否支持分片消息 */

+ 6 - 12
train-common/train-common-websocket/src/main/java/top/haijunit/websocket/utils/WebSocketUtils.java

@@ -1,9 +1,7 @@
 package top.haijunit.websocket.utils;
 package top.haijunit.websocket.utils;
 
 
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.socket.PongMessage;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketMessage;
 import org.springframework.web.socket.WebSocketMessage;
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.WebSocketSession;
@@ -17,7 +15,7 @@ import java.io.IOException;
  * @description 工具类
  * @description 工具类
  */
  */
 @Slf4j
 @Slf4j
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@UtilityClass
 public class WebSocketUtils {
 public class WebSocketUtils {
 
 
     /**
     /**
@@ -31,23 +29,19 @@ public class WebSocketUtils {
         sendMessage(session, message);
         sendMessage(session, message);
     }
     }
 
 
-    public static void sendPongMessage(WebSocketSession session) {
-        sendMessage(session, new PongMessage());
-    }
-
     public static void sendMessage(WebSocketSession session, String message) {
     public static void sendMessage(WebSocketSession session, String message) {
         sendMessage(session, new TextMessage(message));
         sendMessage(session, new TextMessage(message));
     }
     }
 
 
-    private static void sendMessage(WebSocketSession session, WebSocketMessage<?> message) {
+    public static void sendMessage(WebSocketSession session, WebSocketMessage<?> message) {
         if (session == null || !session.isOpen()) {
         if (session == null || !session.isOpen()) {
-            log.error("[send] session会话已经关闭");
+            log.error("[websocket] session会话失效");
         } else {
         } else {
             try {
             try {
                 session.sendMessage(message);
                 session.sendMessage(message);
-                log.info("[send] sessionId: {},message:{}", session.getId(), message);
+                log.info("[websocket] sessionId: {},message:{}", session.getId(), message);
             } catch (IOException e) {
             } catch (IOException e) {
-                log.error("[send] session({}) 发送消息({}) 异常", session, message, e);
+                log.error("[websocket] session({}) 发送消息({}) 异常", session, message, e);
             }
             }
         }
         }
     }
     }

+ 1 - 1
train-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ logging:
   level:
   level:
     top.haijunit: @logging.level@
     top.haijunit: @logging.level@
     top.haijunit.web: debug
     top.haijunit.web: debug
-    org.springframework: warn
+    org.springframework: info
     org.hibernate.validator: warn
     org.hibernate.validator: warn
     org.apache: warn
     org.apache: warn
   config: classpath:logback.xml
   config: classpath:logback.xml