1949 Commits

Author SHA1 Message Date
疯狂的狮子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
f7664a2d7e update 查询在线用户检查是否已经离线 如果离线则清除token 2021-12-09 16:08:18 +08:00
疯狂的狮子li
dff7d70f0a update 更改角色刷新缓存 2021-12-03 19:13:15 +08:00
疯狂的狮子li
e763381186 update [重磅更新] 登录流程升级 支持缓存 2021-12-03 18:46:49 +08:00
疯狂的狮子li
5a271b8fde update 更改前端工程文件版本号 2021-11-30 11:11:32 +08:00
疯狂的狮子li
c8720b1524 update 调整 OSS 表字段内容长度
(cherry picked from commit c6fe27b0404301194f15894ff94ac512a13fb309)
2021-11-29 17:08:06 +08:00
疯狂的狮子li
4238266ea3 fix 修复 count 语法异常
(cherry picked from commit 3e2ddb3b25a99ba8a06096d88a78bbe97256d879)
2021-11-29 17:08:06 +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
dbba894544 发布 v3.4.0 2021-11-29 14:01:28 +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
疯狂的狮子li
a8a4f2101d add 增加 mapper 目录下 package-info 防止建错目录 2021-11-29 09:59:53 +08:00
疯狂的狮子Li
f46bd8b6ba update 更新 Validation 框架国际化说明 2021-11-28 21:47:08 +08:00
疯狂的狮子Li
d4e1d4ec38 !117 fix: 修复Object剩余存活时间BUG
Merge pull request !117 from dawn9117/N/A
2021-11-28 13:22:26 +00:00
dawn9117
f517dc05ef fix: 修复Object剩余存活时间BUG 2021-11-28 13:16:35 +00:00
疯狂的狮子Li
a627de02c7 Merge remote-tracking branch 'origin/dev' into dev 2021-11-28 21:04:13 +08:00
疯狂的狮子Li
a94a0589dd update [重磅更新] Validator 校验框架支持国际化 2021-11-28 21:03:48 +08:00
疯狂的狮子li
81755a280d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-ui/src/utils/index.js
	ruoyi-ui/src/views/register.vue
2021-11-28 15:10:05 +08:00
疯狂的狮子Li
89d776acb5 fix 修复 OSS 工厂 未实例化服务更新加载问题 2021-11-27 16:36:11 +08:00
疯狂的狮子Li
daf660e66d update 更改 excel 方法注释 更清晰明显用法 2021-11-27 13:20:50 +08:00
疯狂的狮子Li
e4020faff3 update 使用导入新写法 重构系统用户导入 2021-11-27 12:57:21 +08:00
疯狂的狮子Li
e11b727584 update 修改移除无用回执信息 2021-11-27 12:43:34 +08:00
疯狂的狮子Li
0a36a94b73 update 报错增加 excel 表头信息 2021-11-27 11:18:41 +08:00
RuoYi
89e7cb19b9 注册成功提示类型success 2021-11-26 18:11:57 +08:00
疯狂的狮子li
fa2bdcd5ac update 抽象 Excel 导入支持自定义监听器 2021-11-26 18:11:41 +08:00
若依
ea71c9b214 !376 camelCase中应该转换下划线,而不是横杠
Merge pull request !376 from khejing/master
2021-11-26 10:07:58 +00:00
疯狂的狮子li
c00e397405 update 抽象 Excel 导入支持自定义监听器 2021-11-26 18:06:44 +08:00
疯狂的狮子li
a2a2640d29 update 调整校验异常 返回完整信息 2021-11-26 18:05:47 +08:00
疯狂的狮子Li
7c4a104823 !113 add 新增 excel 导入支持开启 Validator 数据验证
Merge pull request !113 from Yjoioooo/auto-5403234-dev-1637903026810
2021-11-26 08:40:42 +00:00
疯狂的狮子li
7892ec5a59 fix 修复重复提交不生效问题 由于概念不同 使用 RedisUtils 重构 2021-11-26 16:32:56 +08:00
khejing
e5fd1f76db camelCase中应该是下划线,而不是横杠 2021-11-26 08:26:45 +00:00
疯狂的狮子li
554ebebb92 fix 修复 获取剩余时间单位错误 2021-11-26 15:50:01 +08:00
疯狂的狮子li
f604cf4988 fix 修复提交错误 2021-11-26 15:18:11 +08:00
疯狂的狮子li
9de0e9157a fix 接口重复鉴权BUG修复 2021-11-26 15:07:35 +08:00
疯狂的狮子Li
b1be47f0a0 !114 接口重复鉴权BUG修复: ResourceConfig中已经配置鉴权拦截器, 添加sa-token-spring-aop会导致重复鉴权BUG
Merge pull request !114 from dawn9117/N/A
2021-11-26 07:06:54 +00:00
疯狂的狮子Li
6502f21072 update 修改不规范命名 2021-11-26 05:57:28 +00:00
dawn9117
a9e21702aa 接口重复鉴权BUG修复: ResourceConfig中已经配置鉴权拦截器, 添加sa-token-spring-aop会导致重复鉴权BUG 2021-11-26 05:55:32 +00:00
疯狂的狮子li
48fd65d7f8 update satoken 标注为公测 2021-11-26 13:45:12 +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
2fe8291f1d update 修改 LOGIN_TOKEN_KEY 内容 对应 satoken 的 key 2021-11-26 13:40:52 +08:00
疯狂的狮子li
1d1732ab4a update 常住token有效期改为一天 2021-11-26 13:40:21 +08:00
疯狂的狮子li
1010ccca4d update 更新 RedisUtils set保留ttl 兼容 5.X redis版本 2021-11-26 13:34:18 +08:00
zhujie
c21ff85b57 update 增加excel导入样例 2021-11-26 13:02:59 +08:00
zhujie
c3bb4d2a61 add 新增导入支持开启Validator数据验证,支持开启导入异常行继续读取,支持返回导入回执 2021-11-26 13:01:00 +08:00
疯狂的狮子li
d2b7f8ef0f remove 删除无用 js 文件 2021-11-25 19:47:34 +08:00
疯狂的狮子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
2021-11-25 19:39:53 +08:00