From 5795958a18f16698066a1326e32d27f38cd48cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 25 May 2021 10:14:18 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8C=E6=AD=A5=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=20ruoyi-vue=203.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++++- pom.xml | 2 +- .../ruoyi/common/filter/XssHttpServletRequestWrapper.java | 3 ++- .../main/java/com/ruoyi/framework/aspectj/LogAspect.java | 3 ++- ruoyi-ui/src/views/index.vue | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a98bde53..07aaf33b 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://images.gitee.com/uploads/images/2021/0508/235345_5503356a_1766278.jpeg) +## 捐献作者 +作者为兼职做开源,平时还需要工作,如果帮到了您可以请作者吃个盒饭 + + ## 重点注意事项 若依文档对事务注解的描述 [关于事务](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 5a8ae127..88543535 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 1.7 0.9.1 3.4.3 - 5.5.8 + 5.6.5 2.2.6.RELEASE 11.0 2.3.1 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 85614073..0170e1d7 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 class XssHttpServletRequestWrapper extends HttpServletRequestWrapper 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 57dc582b..442d2589 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 @@ public class LogAspect { 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 4ced4c26..cb5ae582 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -80,7 +80,7 @@ 更新日志 - +
  1. update springboot 升级 2.3.11
  2. update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
    3. @@ -166,7 +166,7 @@ export default { data() { return { // 版本号 - version: "2.1.0", + version: "2.1.2", }; }, methods: {