admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,729 Commits 3 Branches 0 Tags
Commit Graph

279 Commits

Author SHA1 Message Date
RuoYi
850b98337b 修正用户分配角色属性错误 2021-12-06 20:58:10 +08:00
若依
7f2921f26b !382 update 优化查询用户的角色组、岗位组代码 
Merge pull request !382 from 疯狂的狮子Li/update
 2021-12-06 12:35:59 +00:00
疯狂的狮子li
4de4763baf update 优化查询用户的角色组、岗位组代码 2021-12-06 18:32:51 +08:00
疯狂的狮子li
8362fe1b39 update 优化查询用户的角色组、岗位组代码 2021-12-06 14:48:04 +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
5ba39c0086 update 重构分页 基于 分页新方法 2021-12-03 15:57:58 +08:00
疯狂的狮子li
965ebd0f03 fix 修复主键溢出问题 将查询返回类型改为 Long 2021-12-03 11:11:43 +08:00
疯狂的狮子li
cb306b0793 remove 移除过期 用户导入 2021-12-03 10:45:31 +08:00
疯狂的狮子li
c5dc08e082 update 调整 角色查询部门 返回值类型 2021-12-03 10:45:04 +08:00
疯狂的狮子Li
b00c6dd89b !120 selectPostListByUserId方法出参调整为Long 
Merge pull request !120 from zendwang/dev
 2021-12-03 02:40:05 +00:00
疯狂的狮子Li
14a05ddaca !119 系统用户自定义导入时初始密码加密优化 
Merge pull request !119 from zendwang/dev
 2021-12-02 12:37:08 +00:00
zendwang
209654fdff fix selectPostListByUserId方法出参调整为Long 2021-12-02 20:13:47 +08:00
zendwang
f30aa02e7c fix 系统用户自定义导入时初始密码加密优化 2021-12-02 19:48:56 +08:00
疯狂的狮子li
7eedf37149 update 优化 pr !118 代码结构 2021-12-02 18:47:18 +08:00
zendwang
ac38f7b909 fix 为Transactional注解设置rollback属性 2021-12-02 18:34: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
RuoYi
a2d3f987c0 优化代码 2021-11-30 11:15:17 +08:00
疯狂的狮子li
4f0e73ba97 update 使用 hutool-jwt 替换老旧 jjwt 依赖 2021-11-30 10:33:35 +08:00
疯狂的狮子li
4238266ea3 fix 修复 count 语法异常 
(cherry picked from commit 3e2ddb3b25a99ba8a06096d88a78bbe97256d879)
 2021-11-29 17:08:06 +08:00
疯狂的狮子li
d2b7843d97 fix 修复 count 语法异常 2021-11-29 16:41:20 +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
7a4f36c00e update 优化时间查询语句 2021-11-24 11:24:15 +08:00
疯狂的狮子li
1f3ef4ffe1 update 初始化数据转移到 ApplicationRunner 统一处理 2021-11-24 10:59:18 +08:00
疯狂的狮子li
97a12075b1 update 初始化数据转移到 ApplicationRunner 统一处理 2021-11-24 10:58:10 +08:00
疯狂的狮子li
4cfbd8a9d2 update OSS 模块 整体重命名 消除歧义 2021-11-22 09:45:46 +08:00
疯狂的狮子Li
6d3f4f5a04 update 抽象 DictService 通用 字典服务 2021-11-22 02:43:22 +08:00
疯狂的狮子Li
20e782eb21 update 抽象 ConfigService 通用 参数配置服务 2021-11-22 02:42:59 +08:00
疯狂的狮子Li
019526fbe9 update 解耦 LoginUser 与 SysUser 强关联 2021-11-21 01:39:43 +08:00
疯狂的狮子Li
a4cd5bd424 update 统一接口命名 2021-11-21 01:33:31 +08:00
疯狂的狮子li
eb844e3260 fix 修复 OssFactory 在程序启动未调用api 没有初始化 导致无法订阅配置更改问题 2021-11-17 13:50:58 +08:00
phanes
984098abce fix: 修复返回参数的数据类型错误的问题 2021-11-16 20:47:26 +08:00
疯狂的狮子Li
149b136e0b fix 修复用户导入字典使用错误 2021-11-14 22:27:36 +08:00
phanes
8ea56d3b22 update 减少使用特定数据库函数 2021-11-07 11:58:35 +08:00
疯狂的狮子li
19b7f0747a update 补全通用用户服务接口注释 2021-11-04 19:00:49 +08:00
疯狂的狮子li
2f21f293c1 update 基于 hutool 封装树构建工具 重构部门与菜单树结构返回 2021-11-04 10:32:18 +08:00
疯狂的狮子Li
f3c9a4a81c fix 修复 SysOss、SysOssConfig 未继承 BaseEntity 基础实体问题 2021-10-31 21:30:36 +08:00
疯狂的狮子Li
cd0aad10b0 fix 修复 SysOss、SysOssConfig 未继承 BaseEntity 基础实体问题 2021-10-31 21:28:19 +08:00
疯狂的狮子li
f5f16aac96 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-common/pom.xml
 2021-10-28 10:56:21 +08:00
疯狂的狮子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
 2021-10-28 09:40:02 +08:00
Awen
13c770b6be 优化一些布尔判断语法 2021-10-27 19:03:29 +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
Remenber_Ray
0628dc9b2f update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java. 2021-10-26 08:02:48 +00:00
疯狂的狮子Li
42a3117e2a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/plugins/download.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ry.bat
 2021-10-25 18:24:55 +08:00
疯狂的狮子li
1ae369855b update 优化 多账号体系用户行为监听逻辑 2021-10-19 17:23:14 +08:00
RuoYi
e66d0e4f74 角色列表返回类型保持一致 2021-10-15 17:56:57 +08:00
疯狂的狮子li
a6fb88d74c update [重大更新]全业务 增加 接口文档注解 格式化代码 2021-10-15 15:19:42 +08:00
liyang
1eaea5c81c 修改oss配置删除时删除缓存bug 2021-10-14 21:26:03 +08:00