疯狂的狮子li
|
d99dd4b875
|
update 调整oss预览开关 使用前端直接调用更改配置参数
|
2022-02-09 14:52:33 +08:00 |
|
疯狂的狮子li
|
53da7140c2
|
update 调整返回类型为 R
|
2022-01-29 11:48:41 +08:00 |
|
疯狂的狮子li
|
0b852faf00
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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/utils/poi/ExcelUtil.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-ui/src/assets/styles/ruoyi.scss
# ry.bat
|
2022-01-29 09:23:11 +08:00 |
|
RuoYi
|
612c4293d1
|
用户访问控制时校验数据权限，防止越权
|
2022-01-27 12:05:04 +08:00 |
|
疯狂的狮子li
|
0da30f4623
|
update 优化 查询登录用户数据 统一走缓存
|
2022-01-26 20:58:05 +08:00 |
|
疯狂的狮子Li
|
3706d2e1db
|
update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题
|
2022-01-25 21:50:54 +08:00 |
|
hewenqiang
|
cd510b43b1
|
fix 优化登录、注册校验方式，在接口通过@Validated进行数据基础校验，以及服务执行到异常后，抛出异常结束方法执行（减少if-else嵌套）。
|
2022-01-25 17:17:06 +08:00 |
|
疯狂的狮子li
|
b87aeb9b95
|
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
|
2022-01-21 10:30:39 +08:00 |
|
疯狂的狮子li
|
a43e6e06e0
|
update 优化多用户体系处理 更名 LoginUtils 为 LoginHelper 支持 LoginUser 多级缓存
|
2022-01-17 12:03:15 +08:00 |
|
phanes
|
868942e202
|
update 格式化代码结构 统一编码格式
|
2022-01-16 17:46:24 +08:00 |
|
疯狂的狮子li
|
c0f3dff0f6
|
update 合并 satoken 解决不兼容不分
|
2022-01-13 11:27:09 +08:00 |
|
疯狂的狮子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
|
2022-01-13 11:14:33 +08:00 |
|
疯狂的狮子li
|
a0bed51d96
|
update 格式化代码 统一间隔符
update 格式化代码 统一间隔符
|
2022-01-13 09:58:16 +08:00 |
|
疯狂的狮子li
|
8f6484e470
|
[重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖
|
2022-01-12 21:22:26 +08:00 |
|
疯狂的狮子li
|
1c7d840ff6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2022-01-04 09:45:33 +08:00 |
|
RuoYi
|
8ba91fc9dd
|
优化查询用户详细信息
|
2022-01-04 09:10:49 +08:00 |
|
RuoYi
|
10ae0bce65
|
用户修改减少一次角色列表关联查询
|
2022-01-01 09:50:35 +08:00 |
|
疯狂的狮子li
|
c82afc8c46
|
update RedisUtils 迁移到 utils/redis 包下
|
2021-12-28 11:23:33 +08:00 |
|
疯狂的狮子li
|
261d9f8ebc
|
update 合并 dev 处理差异
|
2021-12-28 10:38:25 +08:00 |
|
疯狂的狮子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
|
44bc7dd9a5
|
update 修改已过期方法 调整编译警告
|
2021-12-16 00:11:38 +08:00 |
|
疯狂的狮子Li
|
c9e9341b4a
|
fix 修复 在线用户key错误
|
2021-12-09 17:53:36 +08:00 |
|
疯狂的狮子Li
|
da247c61b7
|
update 过滤离线用户
|
2021-12-09 16:32:32 +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
|
8b9d3541dd
|
update LoginUser 增加角色缓存 优化角色权限代码
|
2021-12-03 19:25:38 +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
|
5ba39c0086
|
update 重构分页 基于 分页新方法
|
2021-12-03 15:57:58 +08:00 |
|
疯狂的狮子li
|
dd4374229b
|
fix 修复更改密码问题 由于移除redis上存储的密码 导致找不到缓存内的旧密码
|
2021-12-02 19:11:36 +08:00 |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
2021-11-30 11:15:17 +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
|
e4020faff3
|
update 使用导入新写法 重构系统用户导入
|
2021-11-27 12:57:21 +08:00 |
|
疯狂的狮子li
|
c1b0e176e5
|
update 在线用户管理 改为使用 satoken 工具实现 消除差异化
|
2021-11-26 13:42:52 +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 |
|
Ricky
|
9fc3e220a7
|
防止修改用户个人信息接口修改用户名
|
2021-11-25 14:00:27 +08:00 |
|
疯狂的狮子li
|
65a1245a03
|
update OSS 模块 整体重命名 消除歧义
|
2021-11-22 09:48:22 +08:00 |
|
疯狂的狮子Li
|
019526fbe9
|
update 解耦 LoginUser 与 SysUser 强关联
|
2021-11-21 01:39:43 +08:00 |
|
疯狂的狮子li
|
321bb010cb
|
update 更新注解参数类型 去除多余警告
|
2021-11-18 19:28:39 +08:00 |
|
疯狂的狮子li
|
f8487f581b
|
update 补全所有接口 单参数接口文档
|
2021-11-18 17:01:23 +08:00 |
|
疯狂的狮子li
|
2781655b0a
|
update 适配 ruoyi 关于优化导出数据操作
|
2021-11-17 19:42:14 +08:00 |
|
疯狂的狮子li
|
64add90edd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.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/system/SysConfigController.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/SysPostController.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/config/RuoYiConfig.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-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-ui/package.json
ruoyi-ui/src/api/monitor/logininfor.js
ruoyi-ui/src/api/monitor/operlog.js
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/data.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/api/system/post.js
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/request.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
|
2021-11-17 19:14:03 +08:00 |
|
RuoYi
|
cedd2d1daf
|
优化导出数据操作
|
2021-11-17 11:57:17 +08:00 |
|
XTvLi
|
b00171366f
|
统一全局配置内容, 删除临时调用配置文件
|
2021-11-10 18:17:43 +08:00 |
|
疯狂的狮子li
|
b132f04f71
|
fix 修复 SysLoginController 接口文档书写错误问题
|
2021-11-04 14:18:38 +08:00 |
|
疯狂的狮子li
|
2f21f293c1
|
update 基于 hutool 封装树构建工具 重构部门与菜单树结构返回
|
2021-11-04 10:32:18 +08:00 |
|
疯狂的狮子li
|
da2cb61cae
|
update 调整 pr !107 代码格式
|
2021-10-29 17:37:15 +08:00 |
|
sxq
|
ea2e560bd9
|
去掉jfr相关类。
|
2021-10-29 17:28:33 +08:00 |
|
sxq
|
25321984fa
|
新增startup trace监控。
|
2021-10-29 16:55:42 +08:00 |
|
疯狂的狮子li
|
6e73d8b3ab
|
update 同步 dev 分支 更新最新改动
|
2021-10-27 13:28:26 +08:00 |
|