疯狂的狮子li
|
a43e6e06e0
|
update 优化多用户体系处理 更名 LoginUtils 为 LoginHelper 支持 LoginUser 多级缓存
|
4 years ago |
|
疯狂的狮子Li
|
dc0af0a419
|
fix 修复 banner 显示版本号不正确
|
4 years ago |
|
疯狂的狮子li
|
6ca8535166
|
Merge remote-tracking branch 'origin/satoken' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
# ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
4 years ago |
|
疯狂的狮子li
|
ff4a429136
|
update 升级 springboot 2.6.X 解决 springfox 兼容性问题
|
4 years ago |
|
疯狂的狮子li
|
a0bed51d96
|
update 格式化代码 统一间隔符
update 格式化代码 统一间隔符
|
4 years ago |
|
疯狂的狮子Li
|
29cc9da934
|
update hutool 引入改为 bom 依赖项引入
|
4 years ago |
|
疯狂的狮子Li
|
eaeb324c74
|
update 指定 maven 资源过滤为具体文件 防止错误过滤
|
4 years ago |
|
疯狂的狮子Li
|
09b03465d8
|
update mybatis-plus 3.4.3.4 => 3.5.0
|
4 years ago |
|
疯狂的狮子li
|
948ad86049
|
Merge remote-tracking branch 'origin/dev' into satoken
|
4 years ago |
|
疯狂的狮子li
|
ed659da488
|
发布 v3.5.0-release 正式版
|
4 years ago |
|
疯狂的狮子li
|
a8227453fc
|
update hutool 5.7.17 => 5.7.18 bugfix
update redisson 3.16.6 => 3.16.7 bugfix
|
4 years ago |
|
疯狂的狮子li
|
dd37247e65
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
# ruoyi-common/pom.xml
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
# ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
|
4 years ago |
|
疯狂的狮子li
|
619a80228f
|
update springboot 2.5.7 => 2.5.8 升级预防 log4j2 问题
update springboot-admin 2.5.4 => 2.5.5
update hutool 5.7.16 => 5.7.17
|
4 years ago |
|
疯狂的狮子Li
|
ffde310d30
|
update qiniu 7.8.0 => 7.9.0
update minio 8.3.3 => 8.3.4
|
4 years ago |
|
疯狂的狮子li
|
877a9d510b
|
update tlog 1.3.5 => 1.3.6 修复 jdk17 不兼容问题
|
4 years ago |
|
疯狂的狮子li
|
5e38e054a7
|
update hutool 工具 改为单包引入 减少无用依赖
|
4 years ago |
|
疯狂的狮子li
|
be13e3494a
|
update redisson 3.16.4 => 3.16.6
update dynamic-ds 3.4.1 => 3.5.0
|
4 years ago |
|
疯狂的狮子li
|
8f8e796c77
|
update tlog 1.3.4 => 1.3.5 启用 tlog 自动配置
|
4 years ago |
|
疯狂的狮子li
|
90ba39593a
|
update 声明 cglib 依赖 控制版本
|
4 years ago |
|
疯狂的狮子li
|
9036370d67
|
remove 删除 jjwt 无用依赖
|
4 years ago |
|
疯狂的狮子li
|
4f0e73ba97
|
update 使用 hutool-jwt 替换老旧 jjwt 依赖
|
4 years ago |
|
疯狂的狮子li
|
bf98ee3c93
|
Merge remote-tracking branch 'origin/dev' into satoken
|
4 years ago |
|
疯狂的狮子li
|
52673152cc
|
发布 v3.4.0
|
4 years ago |
|
疯狂的狮子li
|
42295ef2ac
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
# ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
# ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
|
4 years ago |
dawn9117
|
a9e21702aa
|
接口重复鉴权BUG修复: ResourceConfig中已经配置鉴权拦截器, 添加sa-token-spring-aop会导致重复鉴权BUG
|
4 years ago |
|
疯狂的狮子li
|
e2d370bd9d
|
update 移除 satoken 自带集成 redis 改为使用 框架自身 Redission 实现 统一方案 性能优异
|
4 years ago |
|
疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
# ruoyi-generator/src/main/resources/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.js
# ruoyi-ui/src/store/modules/permission.js
# ruoyi-ui/src/store/modules/settings.js
# ruoyi-ui/src/store/modules/tagsView.js
# ruoyi-ui/src/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.vue
# ruoyi-ui/src/views/system/user/index.vue
# ruoyi-ui/src/views/system/user/profile/resetPwd.vue
# ruoyi-ui/src/views/system/user/profile/userAvatar.vue
# ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
4 years ago |
|
疯狂的狮子li
|
7546ef649c
|
update springboot 2.5.6 => 2.5.7
|
4 years ago |
RuoYi
|
16734b1d88
|
升级velocity到最新版本2.3
|
4 years ago |
|
疯狂的狮子li
|
40c9559d9e
|
update springboot-admin 2.5.3 => 2.5.4
|
4 years ago |
|
疯狂的狮子li
|
53cb0826bc
|
update 升级 swagger 配置 使用 knife4j 增强模式
|
4 years ago |
|
疯狂的狮子li
|
7079a4e7e4
|
update satoken 1.27.0 => 1.28.0 使用 jwt 插件代理 token 生成逻辑
|
4 years ago |
|
疯狂的狮子li
|
3b574875cb
|
update hutool 5.7.15 => 5.7.16
update okhttp 4.9.1 => 4.9.2
update spring-boot-admin 2.5.2 => 2.5.3
update redisson 3.16.3 => 3.16.4
update tlog 1.3.3 => 1.3.4
|
4 years ago |
|
疯狂的狮子li
|
8a93371baa
|
remove 移除 feign 相关代码与依赖
|
4 years ago |
|
疯狂的狮子li
|
95dcae1a85
|
remove 移除 quartz 相关代码与依赖
|
4 years ago |
|
疯狂的狮子li
|
24ebc73ee5
|
Merge remote-tracking branch 'origin/dev' into satoken
|
4 years ago |
|
疯狂的狮子li
|
d6e080d546
|
发布 v3.3.0
|
4 years ago |
|
疯狂的狮子li
|
f5f16aac96
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-common/pom.xml
|
4 years ago |
|
疯狂的狮子li
|
e8e8ae9fd7
|
update minio 8.3.1 => 8.3.3
|
4 years ago |
|
疯狂的狮子li
|
160beb8e1c
|
update jdk11 适配依赖 调整到 common 包
|
4 years ago |
|
RuoYi
|
2eb55528ec
|
升级spring-boot到最新版本2.5.6
|
4 years ago |
|
疯狂的狮子li
|
695cb6d76b
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
# ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
|
4 years ago |
sxq
|
16d6e11e94
|
1:升级springboot版本到2.5.6。
2:升级hutool版本到5.7.15。
|
4 years ago |
|
疯狂的狮子li
|
336adbd056
|
update 统一格式化代码结构
|
4 years ago |
|
疯狂的狮子li
|
c1c4fb2ca4
|
update hutool 5.7.13 => 5.7.14
update qcloud.cos 5.6.55 => 5.6.58
update minio 8.3.0 => 8.3.1
|
4 years ago |
|
疯狂的狮子li
|
6c9dc9ae51
|
update 修正pr 不规范写法
|
4 years ago |
|
疯狂的狮子li
|
f4b619d1d1
|
update 修正注释错误
|
4 years ago |
|
疯狂的狮子li
|
b6443e0c01
|
update quartz改为保留一个版本
|
4 years ago |
|
疯狂的狮子li
|
aaa15b403a
|
add [重大更新]增加 ruoyi-job 任务调度模块(基于xxl-job)
|
4 years ago |
|
疯狂的狮子li
|
82f1f5d0cf
|
update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
|
4 years ago |
