From 97a237bbdc97b6ccf7be9011be6f9992eadb9462 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 五月 2021 11:50:47 +0800
Subject: [PATCH] update springboot 升级 2.3.11 update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..0535cf2 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,13 +1,15 @@
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.core.util.StrUtil;
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;
/**
* 瀹㈡埛绔伐鍏风被
@@ -121,13 +123,13 @@
}
String uri = request.getRequestURI();
- if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
+ if (StrUtil.equalsAnyIgnoreCase(uri, ".json", ".xml"))
{
return true;
}
String ajax = request.getParameter("__ajax");
- if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
+ if (StrUtil.equalsAnyIgnoreCase(ajax, "json", "xml"))
{
return true;
}
--
Gitblit v1.9.3