From 5795958a18f16698066a1326e32d27f38cd48cd5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 25 五月 2021 10:14:18 +0800
Subject: [PATCH] update 同步升级 ruoyi-vue 3.5.0
---
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java | 3 ++-
ruoyi-ui/src/views/index.vue | 4 ++--
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 3 ++-
pom.xml | 2 +-
README.md | 6 +++++-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index a98bde5..07aaf33 100644
--- a/README.md
+++ b/README.md
@@ -41,13 +41,17 @@
### 鍏朵粬
-* 鍚屾鍗囩骇 RuoYi-Vue 3.4.0
+* 鍚屾鍗囩骇 RuoYi-Vue 3.5.0
* 鍗曟ā鍧� fast 鍒嗘敮 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/)
## 鍏虫敞浣滆��(鎵爜璇峰娉�: "鍔犵兢")
+## 鎹愮尞浣滆��
+浣滆�呬负鍏艰亴鍋氬紑婧�,骞虫椂杩橀渶瑕佸伐浣�,濡傛灉甯埌浜嗘偍鍙互璇蜂綔鑰呭悆涓洅楗�
+
+
## 閲嶇偣娉ㄦ剰浜嬮」
鑻ヤ緷鏂囨。瀵逛簨鍔℃敞瑙ｇ殑鎻忚堪 [鍏充簬浜嬪姟](https://doc.ruoyi.vip/ruoyi/document/htsc.html#%E4%BA%8B%E5%8A%A1%E7%AE%A1%E7%90%86) 浠ヤ笅瀵瑰鏁版嵁婧愪簨鍔″仛琛ュ厖:
diff --git a/pom.xml b/pom.xml
index 5a8ae12..8854353 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3</mybatis-plus.version>
- <hutool.version>5.5.8</hutool.version>
+ <hutool.version>5.6.5</hutool.version>
<feign.version>2.2.6.RELEASE</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
index 8561407..0170e1d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.filter;
import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HtmlUtil;
import org.apache.commons.io.IOUtils;
import org.springframework.http.HttpHeaders;
@@ -100,6 +101,6 @@
public boolean isJsonRequest()
{
String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
- return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
+ return StrUtil.startWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 57dc582..442d258 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -1,5 +1,6 @@
package com.ruoyi.framework.aspectj;
+import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
@@ -198,7 +199,7 @@
{
for (int i = 0; i < paramsArray.length; i++)
{
- if (StrUtil.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))
+ if (Validator.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))
{
Object jsonObj = JSON.toJSON(paramsArray[i]);
params += jsonObj.toString() + " ";
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 4ced4c2..cb5ae58 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -80,7 +80,7 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
- <el-collapse-item title="v2.1.1 - 2021-5-21">
+ <el-collapse-item title="v2.1.2 - 2021-5-21">
<ol>
<li>update springboot 鍗囩骇 2.3.11</li>
<li>update mybatis-plus 鍗囩骇 3.4.3 鍒嗛〉Plus瀵硅薄閫傞厤鏇存柊</li>
@@ -166,7 +166,7 @@
data() {
return {
// 鐗堟湰鍙�
- version: "2.1.0",
+ version: "2.1.2",
};
},
methods: {
--
Gitblit v1.9.3