疯狂的狮子li
|
948ad86049
|
Merge remote-tracking branch 'origin/dev' into satoken
|
4 years ago |
|
疯狂的狮子li
|
ed659da488
|
发布 v3.5.0-release 正式版
|
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
|
5ca038d888
|
update 调整监控依赖 从 common 迁移到 framework
|
4 years ago |
|
疯狂的狮子li
|
5e38e054a7
|
update hutool 工具 改为单包引入 减少无用依赖
|
4 years ago |
|
疯狂的狮子li
|
a9488ba3c9
|
update 多数据源切换标注过期 3.6.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
|
4f0e73ba97
|
update 使用 hutool-jwt 替换老旧 jjwt 依赖
|
4 years ago |
|
疯狂的狮子li
|
9351d47948
|
fix 修复 合并错误
|
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 |
|
疯狂的狮子li
|
9de0e9157a
|
fix 接口重复鉴权BUG修复
|
4 years ago |
|
疯狂的狮子li
|
e2d370bd9d
|
update 移除 satoken 自带集成 redis 改为使用 框架自身 Redission 实现 统一方案 性能优异
|
4 years ago |
|
疯狂的狮子li
|
2a3bf1d994
|
remove 删除无用 redis 依赖配置
|
4 years ago |
|
疯狂的狮子li
|
7079a4e7e4
|
update satoken 1.27.0 => 1.28.0 使用 jwt 插件代理 token 生成逻辑
|
4 years ago |
|
疯狂的狮子li
|
8a93371baa
|
remove 移除 feign 相关代码与依赖
|
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
|
160beb8e1c
|
update jdk11 适配依赖 调整到 common 包
|
4 years ago |
|
疯狂的狮子li
|
3f0d3ffb8a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
|
4 years ago |
RuoYi
|
839f631d6b
|
添加Jaxb依赖，防止jdk8以上出现的兼容错误
|
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 |
|
疯狂的狮子li
|
61375c4bbb
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/pom.xml
|
4 years ago |
Ricky
|
b6596d021b
|
替换自定义验证注解
|
4 years ago |
|
疯狂的狮子li
|
37a8addf52
|
update feign 标记过期
|
4 years ago |
|
疯狂的狮子li
|
cbb0c98f98
|
add [重磅更新] 增加分布式日志框架 TLog
|
4 years ago |
|
疯狂的狮子li
|
76a2e7f8e5
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.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
|
3f142dd0fa
|
发布 v3.2.0
|
4 years ago |
|
疯狂的狮子li
|
553c29ab8a
|
update 整合 satoken 权限、鉴权一体化框架
|
4 years ago |
|
疯狂的狮子li
|
f85bad3388
|
update 调整依赖结构 解决依赖冲突
|
4 years ago |
|
RuoYi
|
db193a46e8
|
若依 3.7.0
|
4 years ago |
|
疯狂的狮子li
|
ddf8d6ad6b
|
发布 v3.1.0
|
4 years ago |
|
疯狂的狮子li
|
a937e3f268
|
发布 v3.0.0
|
4 years ago |
|
疯狂的狮子li
|
8c912a8133
|
add 集成 性能分析插件 p6spy 更强劲的 SQL 分析
|
4 years ago |
|
疯狂的狮子li
|
70b77d9801
|
add 增加 easyexcel 依赖
|
4 years ago |
|
疯狂的狮子li
|
973471c63b
|
发布 v2.6.0
|
4 years ago |
|
疯狂的狮子li
|
eea8f33cf9
|
发布 v2.5.2 bug修复版
(cherry picked from commit b12bdd1f15)
|
4 years ago |
|
疯狂的狮子li
|
55546dfc80
|
发布 v2.5.1 针对 v2.5.0 版本新特性bug修复
|
5 years ago |
|
疯狂的狮子li
|
e085ec9418
|
发布 v2.5.0
|
5 years ago |
|
RuoYi
|
170cfb356c
|
若依 3.6.0
|
5 years ago |
|
疯狂的狮子li
|
1c11d7ccc1
|
update 转移 springboot-admin 到扩展模块项目
|
5 years ago |
|
疯狂的狮子li
|
5647cf7a7e
|
update 规范maven写法
|
5 years ago |
sxq
|
645c926bbd
|
集成lock4j框架，删除redisson锁，使用lock4j的锁。
|
5 years ago |
|
疯狂的狮子li
|
c950daf301
|
update 优化 多数据源集成 相关pr
|
5 years ago |
|
疯狂的狮子li
|
0140965a30
|
update 优化 jdk11 相关 pr
|
5 years ago |
|
疯狂的狮子li
|
d10099d9e9
|
update 适配 jdk11
|
5 years ago |
朱杰
|
ac3f9e5f33
|
【update】JDK11支持
|
5 years ago |
