update 同步升级 ruoyi-vue 3.5.0

This commit is contained in:
疯狂的狮子li 2021-05-25 10:14:18 +08:00
parent 6c195af2a3
commit 5795958a18
5 changed files with 12 additions and 6 deletions

View File

@ -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/) * 单模块 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://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) 以下对多数据源事务做补充: 若依文档对事务注解的描述 [关于事务](https://doc.ruoyi.vip/ruoyi/document/htsc.html#%E4%BA%8B%E5%8A%A1%E7%AE%A1%E7%90%86) 以下对多数据源事务做补充:

View File

@ -27,7 +27,7 @@
<velocity.version>1.7</velocity.version> <velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version> <jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3</mybatis-plus.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.version>2.2.6.RELEASE</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version> <feign-okhttp.version>11.0</feign-okhttp.version>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version> <spring-boot-admin.version>2.3.1</spring-boot-admin.version>

View File

@ -1,6 +1,7 @@
package com.ruoyi.common.filter; package com.ruoyi.common.filter;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HtmlUtil; import cn.hutool.http.HtmlUtil;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@ -100,6 +101,6 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
public boolean isJsonRequest() public boolean isJsonRequest()
{ {
String header = super.getHeader(HttpHeaders.CONTENT_TYPE); String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); return StrUtil.startWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
} }
} }

View File

@ -1,5 +1,6 @@
package com.ruoyi.framework.aspectj; package com.ruoyi.framework.aspectj;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
@ -198,7 +199,7 @@ public class LogAspect
{ {
for (int i = 0; i < paramsArray.length; i++) 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]); Object jsonObj = JSON.toJSON(paramsArray[i]);
params += jsonObj.toString() + " "; params += jsonObj.toString() + " ";

View File

@ -80,7 +80,7 @@
<span>更新日志</span> <span>更新日志</span>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="v2.1.1 - 2021-5-21"> <el-collapse-item title="v2.1.2 - 2021-5-21">
<ol> <ol>
<li>update springboot 升级 2.3.11</li> <li>update springboot 升级 2.3.11</li>
<li>update mybatis-plus 升级 3.4.3 分页Plus对象适配更新</li> <li>update mybatis-plus 升级 3.4.3 分页Plus对象适配更新</li>
@ -166,7 +166,7 @@ export default {
data() { data() {
return { return {
// //
version: "2.1.0", version: "2.1.2",
}; };
}, },
methods: { methods: {