From 856f0767b4ada087e9e2cb33f373e23dbcf39b85 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 17:56:59 +0800
Subject: [PATCH] update 同步 ruoyi * update element-ui 2.15.10 => 2.15.12 * update 优化 tagsView右选框，首页不应该存在关闭左侧选项 * update copyright 2023 * update 优化 监控页面图标显示 * update 优化 日志注解支持排除指定的请求参数 * update 优化 业务校验优化代码 * fix 修复 优化文件下载出现的异常 * fix 修复 修改密码日志存储明文问题 * add 新增 操作日志消耗时间属性 * update 优化 日志管理使用索引提升查询性能 * update 优化 框架时间检索使用时间默认值 00:00:00 - 23:59:59
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
index 46475c7..99bb1da 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
@@ -3,7 +3,6 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.extra.servlet.JakartaServletUtil;
import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.constant.Constants;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -16,7 +15,6 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@@ -94,7 +92,7 @@
public static Map<String, String> getParamMap(ServletRequest request) {
Map<String, String> params = new HashMap<>();
for (Map.Entry<String, String[]> entry : getParams(request).entrySet()) {
- params.put(entry.getKey(), StringUtils.join(entry.getValue(), ","));
+ params.put(entry.getKey(), StringUtils.join(entry.getValue(), StringUtils.SEPARATOR));
}
return params;
}
@@ -179,11 +177,7 @@
* @return 缂栫爜鍚庣殑鍐呭
*/
public static String urlEncode(String str) {
- try {
- return URLEncoder.encode(str, Constants.UTF8);
- } catch (UnsupportedEncodingException e) {
- return StringUtils.EMPTY;
- }
+ return URLEncoder.encode(str, StandardCharsets.UTF_8);
}
/**
@@ -193,11 +187,7 @@
* @return 瑙ｇ爜鍚庣殑鍐呭
*/
public static String urlDecode(String str) {
- try {
- return URLDecoder.decode(str, Constants.UTF8);
- } catch (UnsupportedEncodingException e) {
- return StringUtils.EMPTY;
- }
+ return URLDecoder.decode(str, StandardCharsets.UTF_8);
}
}
--
Gitblit v1.9.3