疯狂的狮子li cfdeada3fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ...

 Conflicts:

	pom.xml

	ruoyi-admin/src/main/resources/application.yml

	ruoyi-admin/src/main/resources/i18n/messages.properties

	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

	ruoyi-generator/src/main/resources/vm/java/controller.java.vm

	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

	ruoyi-generator/src/main/resources/vm/java/service.java.vm

	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

	ruoyi-ui/src/api/login.js

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/utils/zipdownload.js

	ruoyi-ui/src/views/index.vue

	ruoyi-ui/src/views/login.vue

	ruoyi-ui/src/views/system/user/index.vue

2021-08-02 11:21:09 +08:00

..

file

升级commons.io到最新版本v2.10.0

2021-06-16 09:52:38 +08:00

ip

fix 修复地址ip地址特殊回环问题

2021-06-22 14:12:51 +08:00

poi

fix 修复 hutool StrUtil.containsAny 传入参数后返回结果不一致问题

2021-06-29 15:22:45 +08:00

reflect

update 升级 hutool 5.7.1 适配工具类

2021-06-16 15:36:45 +08:00

spring

update 升级 hutool 5.7.1 适配工具类

2021-06-16 15:36:45 +08:00

sql

update 删除通用工具 改为使用hutool

2021-03-15 16:38:43 +08:00

BeanCopyUtils.java

update 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具

2021-07-27 11:07:33 +08:00

DateUtils.java

同步升级3.0

2020-07-20 10:41:32 +08:00

DictUtils.java

update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java.

2021-06-29 07:04:25 +00:00

JsonUtils.java

fix 修复 JsonUtils 参数为空报错

2021-06-16 13:15:18 +08:00

MessageUtils.java

同步升级3.0

2020-07-20 10:41:32 +08:00

PageUtils.java

update 同步更新 ruoyi 适配新功能

2021-06-17 19:22:49 +08:00

SecurityUtils.java

update 删除通用工具 改为使用hutool

2021-03-15 16:38:43 +08:00

ServletUtils.java

update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题

2021-06-12 20:13:35 +08:00

StringUtils.java

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

2021-08-02 11:21:09 +08:00

Threads.java

同步升级3.0

2020-07-20 10:41:32 +08:00