From 8b94c462ae127795cfa4a0495c723ca9b7041e10 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 九月 2024 20:16:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
index d498093..1da5038 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
@@ -34,9 +34,9 @@
public class GlobalExceptionHandler {
private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
- @Value("${spring.servlet.multipart.max-file-size:50MB}")
+ @Value("${spring.servlet.multipart.max-file-size}")
private String maxFileSize;
- @Value("${spring.servlet.multipart.max-request-size:100MB}")
+ @Value("${spring.servlet.multipart.max-request-size}")
private String maxRequestSize;
@@ -88,7 +88,7 @@
public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("请求地址'{}',发生未知异常.", requestURI, e);
- throw new RuntimeException(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
/**
--
Gitblit v1.7.1