疯狂的狮子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 |
|
疯狂的狮子li
|
c9a3164a29
|
fix swagger 单接口缺少 Authorization 参数
|
2021-10-26 12:53:21 +08:00 |
|
疯狂的狮子Li
|
d254340b9b
|
fix 修正错别字
|
2021-10-25 18:33:26 +08:00 |
|
疯狂的狮子li
|
336adbd056
|
update 统一格式化代码结构
|
2021-10-22 10:04:15 +08:00 |
|
疯狂的狮子li
|
32bfe334c0
|
update 整理删除无用注释 保证代码整洁
|
2021-10-21 18:41:56 +08:00 |
|
疯狂的狮子li
|
6ab575cd49
|
update 优化处理过期方法 采用新写法
|
2021-10-21 15:59:34 +08:00 |
|
602003139@qq.com
|
2489c46a7f
|
修复在swagger配置类中无法读取到satoken配置文件的问题
|
2021-10-21 14:44:53 +08:00 |
|
抓蛙师
|
ce7097b498
|
更新时间和用户注入问题
|
2021-10-20 09:40:04 +08:00 |
|
疯狂的狮子li
|
1ae369855b
|
update 优化 多账号体系用户行为监听逻辑
|
2021-10-19 17:23:14 +08:00 |
|
疯狂的狮子li
|
36e501b457
|
update 通用数据注入改为适配通用实体类
|
2021-10-15 16:20:16 +08:00 |
|
疯狂的狮子li
|
37a8addf52
|
update feign 标记过期
|
2021-10-15 15:55:44 +08:00 |
|
疯狂的狮子li
|
14f6249031
|
update 包重命名 规范化
|
2021-10-15 11:30:39 +08:00 |
|
疯狂的狮子li
|
ea249c33fd
|
update 包重命名 规范化
|
2021-10-15 11:30:24 +08:00 |
|
疯狂的狮子li
|
91c4253f06
|
update satoken 1.26.0 => 1.27.0
|
2021-10-12 11:47:46 +08:00 |
|
疯狂的狮子li
|
cbb0c98f98
|
add [重磅更新] 增加分布式日志框架 TLog
|
2021-10-11 17:59:27 +08:00 |
|
疯狂的狮子li
|
aaf9f57459
|
update 去除登录警告
|
2021-10-11 16:49:21 +08:00 |
|
疯狂的狮子li
|
741a5b275b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/views/monitor/server/index.vue
|
2021-10-11 09:37:06 +08:00 |
|
RuoYi
|
ae5c68368b
|
升级SpringBoot到最新版本2.5.5
|
2021-10-10 11:24:16 +08:00 |
|
疯狂的狮子li
|
6e67e1a849
|
fix 修复 多数据源aop语法错误
|
2021-09-28 14:38:21 +08:00 |
|
疯狂的狮子li
|
3401f38edc
|
fix 修复 多数据源aop语法错误
|
2021-09-28 14:37:03 +08:00 |
|
疯狂的狮子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
|
2021-09-28 09:46:56 +08:00 |
|
疯狂的狮子li
|
3f142dd0fa
|
发布 v3.2.0
|
2021-09-28 09:41:37 +08:00 |
|
疯狂的狮子li
|
75b22e9a23
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/build/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-09-27 16:50:26 +08:00 |
|
RuoYi
|
ded99502ae
|
新增通用方法简化下载使用
|
2021-09-27 10:38:29 +08:00 |
|
疯狂的狮子li
|
6976c7f386
|
update security 路径配置抽取到配置文件
|
2021-09-26 17:26:45 +08:00 |
|