From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java | 102 +++++++++++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 47 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 ab9ebcf..1e1db37 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
@@ -1,101 +1,108 @@
package com.ruoyi.common.utils;
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.extra.servlet.ServletUtil;
+import cn.hutool.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
-import com.ruoyi.common.core.text.Convert;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
/**
* 瀹㈡埛绔伐鍏风被
- *
+ *
* @author ruoyi
*/
-public class ServletUtils
-{
+public class ServletUtils extends ServletUtil {
+
/**
* 鑾峰彇String鍙傛暟
*/
- public static String getParameter(String name)
- {
+ public static String getParameter(String name) {
return getRequest().getParameter(name);
}
/**
* 鑾峰彇String鍙傛暟
*/
- public static String getParameter(String name, String defaultValue)
- {
+ public static String getParameter(String name, String defaultValue) {
return Convert.toStr(getRequest().getParameter(name), defaultValue);
}
/**
* 鑾峰彇Integer鍙傛暟
*/
- public static Integer getParameterToInt(String name)
- {
+ public static Integer getParameterToInt(String name) {
return Convert.toInt(getRequest().getParameter(name));
}
/**
* 鑾峰彇Integer鍙傛暟
*/
- public static Integer getParameterToInt(String name, Integer defaultValue)
- {
+ public static Integer getParameterToInt(String name, Integer defaultValue) {
return Convert.toInt(getRequest().getParameter(name), defaultValue);
+ }
+
+ /**
+ * 鑾峰彇Boolean鍙傛暟
+ */
+ public static Boolean getParameterToBool(String name) {
+ return Convert.toBool(getRequest().getParameter(name));
+ }
+
+ /**
+ * 鑾峰彇Boolean鍙傛暟
+ */
+ public static Boolean getParameterToBool(String name, Boolean defaultValue) {
+ return Convert.toBool(getRequest().getParameter(name), defaultValue);
}
/**
* 鑾峰彇request
*/
- public static HttpServletRequest getRequest()
- {
+ public static HttpServletRequest getRequest() {
return getRequestAttributes().getRequest();
}
/**
* 鑾峰彇response
*/
- public static HttpServletResponse getResponse()
- {
+ public static HttpServletResponse getResponse() {
return getRequestAttributes().getResponse();
}
/**
* 鑾峰彇session
*/
- public static HttpSession getSession()
- {
+ public static HttpSession getSession() {
return getRequest().getSession();
}
- public static ServletRequestAttributes getRequestAttributes()
- {
+ public static ServletRequestAttributes getRequestAttributes() {
RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
return (ServletRequestAttributes) attributes;
}
/**
* 灏嗗瓧绗︿覆娓叉煋鍒板鎴风
- *
+ *
* @param response 娓叉煋瀵硅薄
- * @param string 寰呮覆鏌撶殑瀛楃涓�
+ * @param string 寰呮覆鏌撶殑瀛楃涓�
* @return null
*/
- public static String renderString(HttpServletResponse response, String string)
- {
- try
- {
- response.setStatus(200);
- response.setContentType("application/json");
- response.setCharacterEncoding("utf-8");
+ public static String renderString(HttpServletResponse response, String string) {
+ try {
+ response.setStatus(HttpStatus.HTTP_OK);
+ response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+ response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
response.getWriter().print(string);
- }
- catch (IOException e)
- {
+ } catch (IOException e) {
e.printStackTrace();
}
return null;
@@ -103,34 +110,35 @@
/**
* 鏄惁鏄疉jax寮傛璇锋眰
- *
+ *
* @param request
*/
- public static boolean isAjaxRequest(HttpServletRequest request)
- {
+ public static boolean isAjaxRequest(HttpServletRequest request) {
+
String accept = request.getHeader("accept");
- if (accept != null && accept.indexOf("application/json") != -1)
- {
+ if (accept != null && accept.indexOf("application/json") != -1) {
return true;
}
String xRequestedWith = request.getHeader("X-Requested-With");
- if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
- {
+ if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
return true;
}
String uri = request.getRequestURI();
- if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
- {
+ if (StringUtils.equalsAnyIgnoreCase(uri, ".json", ".xml")) {
return true;
}
String ajax = request.getParameter("__ajax");
- if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
- {
+ if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) {
return true;
}
return false;
}
+
+ public static String getClientIP() {
+ return getClientIP(getRequest());
+ }
+
}
--
Gitblit v1.9.3