疯狂的狮子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
|
2021-12-27 09:50:42 +08:00 |
|
疯狂的狮子li
|
5ca038d888
|
update 调整监控依赖 从 common 迁移到 framework
|
2021-12-24 11:36:02 +08:00 |
|
疯狂的狮子li
|
89de1beb6f
|
update 优化web拦截器 使用原生接口处理 默认非生产环境开启
|
2021-12-22 10:19:57 +08:00 |
|
疯狂的狮子Li
|
5d2b162bea
|
add 增加 DataPermissionHelper 类 便于操作数据权限变量
|
2021-12-17 21:52:11 +08:00 |
|
疯狂的狮子Li
|
3fce90dbb9
|
update 优化数据权限缓存合并为一个 标注版本注释
|
2021-12-17 21:50:14 +08:00 |
|
疯狂的狮子li
|
6875935d37
|
fix 修复 集群雪花id重复问题 使用网卡信息绑定生成
|
2021-12-17 13:47:24 +08:00 |
|
疯狂的狮子li
|
3546ac2854
|
fix 修复 redisson 集群模式 路径未匹配协议头问题
|
2021-12-16 15:37:31 +08:00 |
|
疯狂的狮子li
|
8041ced02d
|
update 数据权限增加全局缓存 提高处理性能 减少重复处理
|
2021-12-16 13:58:52 +08:00 |
|
疯狂的狮子li
|
e6b45d4cdb
|
update 数据权限注解支持类标注
|
2021-12-16 10:54:44 +08:00 |
|
疯狂的狮子Li
|
2599073f56
|
fix 修复数据权限 兜底sql处理逻辑问题
|
2021-12-15 23:33:51 +08:00 |
|
疯狂的狮子li
|
c876776a25
|
update 更正包名书写错误
|
2021-12-14 18:00:38 +08:00 |
|
疯狂的狮子li
|
c5dbd04c9c
|
fix 修复数据权限 仅自己 相关问题
|
2021-12-14 10:11:16 +08:00 |
|
疯狂的狮子Li
|
aae3fe5305
|
update [重大更新] 重写数据权限实现
|
2021-12-13 03:49:05 +00:00 |
|
疯狂的狮子Li
|
da247c61b7
|
update 过滤离线用户
|
2021-12-09 16:32:32 +08:00 |
|
疯狂的狮子Li
|
2cd2e6dd19
|
update 删除异常用户token
|
2021-12-09 16:22:10 +08:00 |
|
疯狂的狮子Li
|
e442bce607
|
update 删除异常用户token
|
2021-12-09 16:21:26 +08:00 |
|
疯狂的狮子li
|
a9488ba3c9
|
update 多数据源切换标注过期 3.6.0 移除 推荐使用原生注解
|
2021-12-09 11:50:25 +08:00 |
|
疯狂的狮子li
|
df6759b033
|
remove 删除无用注入
|
2021-12-07 17:41:50 +08:00 |
|
疯狂的狮子li
|
1445d6d24a
|
update 更新 RedisUtils 返回客户端实例
|
2021-12-06 19:52:27 +08:00 |
|
疯狂的狮子li
|
8f8e796c77
|
update tlog 1.3.4 => 1.3.5 启用 tlog 自动配置
|
2021-12-06 14:36:38 +08:00 |
|
疯狂的狮子li
|
8b9d3541dd
|
update LoginUser 增加角色缓存 优化角色权限代码
|
2021-12-03 19:25:38 +08:00 |
|
疯狂的狮子li
|
e763381186
|
update [重磅更新] 登录流程升级 支持缓存
|
2021-12-03 18:46:49 +08:00 |
|
疯狂的狮子li
|
e8ee5ad691
|
update 用户登录 支持校验错误次数锁定登录
|
2021-12-02 16:04:45 +08:00 |
|
疯狂的狮子li
|
408f5055a9
|
update 通用权限服务 迁移回 ruoyi-framework 模块
|
2021-12-02 14:02:00 +08:00 |
|
疯狂的狮子li
|
9351d47948
|
fix 修复 合并错误
|
2021-11-29 14:10:53 +08:00 |
|
疯狂的狮子li
|
bf98ee3c93
|
Merge remote-tracking branch 'origin/dev' into satoken
|
2021-11-29 14:03:25 +08:00 |
|
疯狂的狮子li
|
52673152cc
|
发布 v3.4.0
|
2021-11-29 13:58:42 +08:00 |
|
疯狂的狮子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
|
2021-11-29 13:56:25 +08:00 |
|
dawn9117
|
f517dc05ef
|
fix: 修复Object剩余存活时间BUG
|
2021-11-28 13:16:35 +00:00 |
|
疯狂的狮子Li
|
a94a0589dd
|
update [重磅更新] Validator 校验框架支持国际化
|
2021-11-28 21:03:48 +08:00 |
|
疯狂的狮子li
|
a2a2640d29
|
update 调整校验异常 返回完整信息
|
2021-11-26 18:05:47 +08:00 |
|
疯狂的狮子li
|
7892ec5a59
|
fix 修复重复提交不生效问题 由于概念不同 使用 RedisUtils 重构
|
2021-11-26 16:32:56 +08:00 |
|
疯狂的狮子li
|
554ebebb92
|
fix 修复 获取剩余时间单位错误
|
2021-11-26 15:50:01 +08:00 |
|
疯狂的狮子li
|
c1b0e176e5
|
update 在线用户管理 改为使用 satoken 工具实现 消除差异化
|
2021-11-26 13:42:52 +08:00 |
|
疯狂的狮子li
|
e2d370bd9d
|
update 移除 satoken 自带集成 redis 改为使用 框架自身 Redission 实现 统一方案 性能优异
|
2021-11-26 13:42:20 +08:00 |
|
疯狂的狮子li
|
450657f871
|
update 迁移 satoken 路由拦截到单独配置类
|
2021-11-25 16:24:16 +08:00 |
|
疯狂的狮子Li
|
ef0b07d5c4
|
update 更新 RepeatSubmit 注解 aop 处理 针对特殊参数进行过滤
|
2021-11-22 00:57:49 +08:00 |
|
疯狂的狮子Li
|
b9b1ec8f41
|
Merge remote-tracking branch 'origin/dev' into dev
|
2021-11-21 01:39:50 +08:00 |
|
疯狂的狮子Li
|
019526fbe9
|
update 解耦 LoginUser 与 SysUser 强关联
|
2021-11-21 01:39:43 +08:00 |
|
疯狂的狮子li
|
5e1d4f215d
|
fix 修复关闭 xss 功能导致可重复读 RepeatableFilter 失效
|
2021-11-19 13:06:51 +08:00 |
|
疯狂的狮子li
|
2dd0add3e7
|
remove 删除无用日志配置
|
2021-11-18 18:49:10 +08:00 |
|
疯狂的狮子li
|
53cb0826bc
|
update 升级 swagger 配置 使用 knife4j 增强模式
|
2021-11-12 13:15:32 +08:00 |
|
疯狂的狮子li
|
6904f38ea2
|
update 调整代码格式化
|
2021-11-11 15:31:49 +08:00 |
|
疯狂的狮子li
|
7079a4e7e4
|
update satoken 1.27.0 => 1.28.0 使用 jwt 插件代理 token 生成逻辑
|
2021-11-10 13:31:54 +08:00 |
|
疯狂的狮子li
|
8a93371baa
|
remove 移除 feign 相关代码与依赖
|
2021-11-03 15:02:29 +08:00 |
|
疯狂的狮子li
|
24ebc73ee5
|
Merge remote-tracking branch 'origin/dev' into satoken
|
2021-10-29 09:15:31 +08:00 |
|
疯狂的狮子li
|
d6e080d546
|
发布 v3.3.0
|
2021-10-29 09:14:49 +08:00 |
|
疯狂的狮子li
|
6e73d8b3ab
|
update 同步 dev 分支 更新最新改动
|
2021-10-27 13:28:26 +08:00 |
|
疯狂的狮子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
|
2021-10-27 13:16:19 +08:00 |
|
疯狂的狮子li
|
3bf96c6cd7
|
update 删除重复依赖 补全演示demo注解参数
|
2021-10-26 19:09:50 +08:00 |
|