疯狂的狮子li 6f6a3566ac Merge remote-tracking branch 'origin/dev' into satoken ... # Conflicts: # pom.xml # ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java # ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java		2021-09-26 17:15:40 +08:00
..
file	Excel注解支持Image图片导入	2021-08-11 10:13:34 +08:00
ip	update 优化空校验处理	2021-09-24 11:17:25 +08:00
poi	remove 移除无用合并	2021-09-22 12:38:52 +08:00
reflect	update 日常校验 统一重构到 StringUtils 便于维护扩展	2021-08-02 19:28:41 +08:00
spring	update 升级 hutool 5.7.1 适配工具类	2021-06-16 15:36:45 +08:00
sql	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-08-17 10:38:07 +08:00
BeanCopyUtils.java	update 优化copy工具增加空判断	2021-08-22 10:41:26 +08:00
DateUtils.java	同步升级3.0	2020-07-20 10:41:32 +08:00
DictUtils.java	update 所有业务适配 RedisUtils 新工具	2021-09-07 13:20:24 +08:00
JsonUtils.java	update 更新 jackson 配置 支持 LocalDateTime 全局格式化	2021-09-07 13:18:36 +08:00
MessageUtils.java	同步升级3.0	2020-07-20 10:41:32 +08:00
PageUtils.java	add PageUtils 增加构造无参 TableDataInfo 方法	2021-09-03 17:35:44 +08:00
RedisUtils.java	add 增加 获取redis客户端实例id工具	2021-09-17 17:22:25 +08:00
SecurityUtils.java	update 整合 satoken 权限、鉴权一体化框架	2021-09-23 19:13:58 +08:00
ServletUtils.java	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-09-02 10:49:56 +08:00
StringUtils.java	update 日常校验 统一重构到 StringUtils 便于维护扩展	2021-08-02 19:28:41 +08:00
Threads.java	同步升级3.0	2020-07-20 10:41:32 +08:00