!813 紧急修复Ip2Region InputStream读取函数导致的OOM问题

Merge pull request !813 from 疯狂的狮子Li/dev
!812 发布 5.5.2 版本 2025年最后一版
2026-01-28 01:56:11 +08:00 · 2025-12-23 06:44:24 +00:00 · 2025-12-23 01:38:19 +00:00 · 2025-10-28 03:21:27 +00:00 · 2025-09-22 03:17:27 +00:00 · 2025-07-04 01:10:49 +00:00
3 changed files with 2 additions and 15 deletions
--- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java
@@ -14,7 +14,6 @@ import org.dromara.common.core.exception.SseException;
 import org.dromara.common.core.exception.base.BaseException;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.json.utils.JsonUtils;
-import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.expression.ExpressionException;
 import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.context.request.async.AsyncRequestTimeoutException;
-import org.springframework.web.method.annotation.HandlerMethodValidationException;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 import org.springframework.web.servlet.NoHandlerFoundException;

@@ -193,16 +191,6 @@ public class GlobalExceptionHandler {
        return R.fail(message);
    }

-    /**
-     * 方法参数校验异常 用于处理 @Validated 注解
-     */
-    @ExceptionHandler(HandlerMethodValidationException.class)
-    public R<Void> handlerMethodValidationException(HandlerMethodValidationException e) {
-        log.error(e.getMessage());
-        String message = StreamUtils.join(e.getAllErrors(), MessageSourceResolvable::getDefaultMessage, ", ");
-        return R.fail(message);
-    }
-
    /**
     * JSON 解析异常（Jackson 在处理 JSON 格式出错时抛出）
     * 可能是请求体格式非法，也可能是服务端反序列化失败
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
@@ -8,7 +8,6 @@ import org.dromara.common.websocket.holder.WebSocketSessionHolder;
 import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.springframework.web.socket.*;
 import org.springframework.web.socket.handler.AbstractWebSocketHandler;
-import org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator;

 import java.io.IOException;
 import java.util.List;
@@ -34,7 +33,7 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
            log.info("[connect] invalid token received. sessionId: {}", session.getId());
            return;
        }
-        WebSocketSessionHolder.addSession(loginUser.getUserId(), new ConcurrentWebSocketSessionDecorator(session, 10 * 1000, 64000));
+        WebSocketSessionHolder.addSession(loginUser.getUserId(), session);
        log.info("[connect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType());
    }

--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
@@ -113,7 +113,7 @@ public class WebSocketUtils {
     * @param session WebSocket会话
     * @param message 要发送的WebSocket消息对象
     */
-    private static void sendMessage(WebSocketSession session, WebSocketMessage<?> message) {
+    private synchronized static void sendMessage(WebSocketSession session, WebSocketMessage<?> message) {
        if (session == null || !session.isOpen()) {
            log.warn("[send] session会话已经关闭");
        } else {
Author	SHA1	Message	Date
疯狂的狮子Li	b6eacfa5a8	!813 紧急修复Ip2Region InputStream读取函数导致的OOM问题 Merge pull request !813 from 疯狂的狮子Li/dev	2025-12-23 06:44:24 +00:00
疯狂的狮子Li	da4dffcfce	!812 发布 5.5.2 版本 2025年最后一版 Merge pull request !812 from 疯狂的狮子Li/dev	2025-12-23 01:38:19 +00:00
疯狂的狮子Li	b58085fde1	!779 发布 5.5.1 正式版日常依赖升级bug修复 Merge pull request !779 from 疯狂的狮子Li/dev	2025-10-28 03:21:27 +00:00
疯狂的狮子Li	b30ffa952f	!766 发布 5.5.0 喜迎国庆 Merge pull request !766 from 疯狂的狮子Li/dev	2025-09-22 03:17:27 +00:00
疯狂的狮子Li	fd5d028e95	fix 修复有某些无聊人士对一个demo案例提漏洞 CVE-2025-6925 Signed-off-by: 疯狂的狮子Li <15040126243@163.com>	2025-07-04 01:10:49 +00:00
疯狂的狮子Li	64100cf1ff	!712 发布 5.4.1 小步迭代修复问题 Merge pull request !712 from 疯狂的狮子Li/dev	2025-07-01 01:12:39 +00:00
疯狂的狮子Li	7e7d857ba5	Merge remote-tracking branch 'origin/dev' into 5.X	2025-05-29 18:18:20 +08:00
疯狂的狮子Li	d22b2a10df	update 优化 PermissionService 无实现类也可以启动服务	2025-05-29 16:28:56 +08:00
疯狂的狮子Li	957a4d1fcd	fix 修复监听器 flowParams 为null报错问题	2025-05-29 16:28:56 +08:00
疯狂的狮子Li	49ef8378fe	!691 发布 5.4.0 正式版 Merge pull request !691 from 疯狂的狮子Li/dev	2025-05-29 03:14:59 +00:00
疯狂的狮子Li	57dd6831d3	!664 发布 5.3.1 正式版 Merge pull request !664 from 疯狂的狮子Li/dev	2025-03-27 02:54:00 +00:00
疯狂的狮子Li	8aa60abb1f	!663 回退 'Pull Request !662 : 发布 5.3.1 正式版' * 回退 'Pull Request !662 : 发布 5.3.1 正式版'	2025-03-27 02:53:23 +00:00
疯狂的狮子Li	7a9f51fc7a	!662 发布 5.3.1 正式版 * 🐳发布 5.3.1 正式版 * update 优化删除无用配置 * fix 修复 excel模板导出数据被覆盖的问题 * update 优化统一用户密码校验长度 * update mybatis-plus 3.5.10.1 => 3.5.11 * fix 修复跨域未设置请求头问题(cloud版本不需要 vue版本需要)	2025-03-27 02:51:57 +00:00
疯狂的狮子Li	159e30c982	!661 发布 5.3.1-BETA2 公测版本 Merge pull request !661 from 疯狂的狮子Li/dev	2025-03-21 07:25:25 +00:00
疯狂的狮子Li	7334d91d6b	!652 发布 5.3.1-BETA 公测版本 Merge pull request !652 from 疯狂的狮子Li/dev	2025-03-13 05:27:36 +00:00
疯狂的狮子Li	95c01301f6	!644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev	2025-02-07 06:19:28 +00:00
疯狂的狮子Li	296466fa13	!640 发布 5.3.0 新春版祝大家新年快乐 Merge pull request !640 from 疯狂的狮子Li/dev	2025-01-24 05:08:28 +00:00
疯狂的狮子Li	3c8d864b5f	!639 发布 5.3.0-BETA 公测版本 Merge pull request !639 from 疯狂的狮子Li/dev	2025-01-20 03:35:45 +00:00
疯狂的狮子Li	ea50a57602	update 优化 xss包装器 Parameter 处理兼容某些容器不允许改参数的情况	2024-11-21 10:17:34 +08:00
疯狂的狮子Li	7e14b98676	reset 回滚错误修改 Signed-off-by: 疯狂的狮子Li <15040126243@163.com>	2024-10-28 09:46:28 +00:00
疯狂的狮子Li	015b406001	!591 发布 5.2.3 正式版 Merge pull request !591 from 疯狂的狮子Li/dev	2024-10-25 03:09:23 +00:00
疯狂的狮子Li	098d3347a0	!577 发布 5.2.2 正式版安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev	2024-08-26 03:43:59 +00:00
疯狂的狮子Li	08d4493994	update 优化 bug 模板	2024-07-15 15:19:22 +08:00
疯狂的狮子Li	367d739e2d	Merge remote-tracking branch 'origin/5.X' into 5.X	2024-07-09 16:38:43 +08:00
疯狂的狮子Li	d6688a367d	!562 ♥️发布 5.2.1 正式版本 Merge pull request !562 from 疯狂的狮子Li/dev	2024-07-09 02:42:40 +00:00
疯狂的狮子Li	0b331796e2	!551 ♥️发布 5.2.0 正式版本 Merge pull request !551 from 疯狂的狮子Li/dev	2024-06-20 02:10:15 +00:00
疯狂的狮子Li	456620b638	!549 ♥️发布 5.2.0-BETA2 公测版本 Merge pull request !549 from 疯狂的狮子Li/dev	2024-06-06 03:13:46 +00:00