From f30f3ac37bac4d170e1fe6d87fdf57adb3b783d3 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: 星期五, 18 三月 2022 01:37:04 +0800
Subject: [PATCH] fix 修复执行"查询当前数据库类型"后未关闭数据库链接，导致当前连接池中活跃连接数达到最大连接数的bug
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index 1e1db37..6408c89 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -3,6 +3,8 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.http.HttpStatus;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
@@ -19,6 +21,7 @@
*
* @author ruoyi
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ServletUtils extends ServletUtil {
/**
@@ -94,9 +97,8 @@
*
* @param response 娓叉煋瀵硅薄
* @param string 寰呮覆鏌撶殑瀛楃涓�
- * @return null
*/
- public static String renderString(HttpServletResponse response, String string) {
+ public static void renderString(HttpServletResponse response, String string) {
try {
response.setStatus(HttpStatus.HTTP_OK);
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
@@ -105,7 +107,6 @@
} catch (IOException e) {
e.printStackTrace();
}
- return null;
}
/**
@@ -116,12 +117,12 @@
public static boolean isAjaxRequest(HttpServletRequest request) {
String accept = request.getHeader("accept");
- if (accept != null && accept.indexOf("application/json") != -1) {
+ if (accept != null && accept.contains("application/json")) {
return true;
}
String xRequestedWith = request.getHeader("X-Requested-With");
- if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
+ if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
return true;
}
@@ -131,10 +132,7 @@
}
String ajax = request.getParameter("__ajax");
- if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) {
- return true;
- }
- return false;
+ return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
}
public static String getClientIP() {
--
Gitblit v1.9.3