疯狂的狮子li
|
f9129bd54e
|
update 代码生成调整 删除无用导报与逻辑
|
4 years ago |
|
疯狂的狮子li
|
c0f3dff0f6
|
update 合并 satoken 解决不兼容不分
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子li
|
cd1a68f15e
|
update 防止 MP 无主键警告
|
4 years ago |
|
疯狂的狮子li
|
8f6484e470
|
[重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖
|
4 years ago |
|
疯狂的狮子li
|
26fc652d33
|
update 统一代码间隔符
|
4 years ago |
|
疯狂的狮子li
|
51b19fcff4
|
update 优化 数据脱敏pr 使用接口提高扩展性
|
4 years ago |
|
疯狂的狮子li
|
c82afc8c46
|
update RedisUtils 迁移到 utils/redis 包下
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子li
|
2455d0b859
|
add 增加 自定义 Xss 校验注解 用户导入增加 Bean 校验
|
4 years ago |
|
疯狂的狮子li
|
b3c3afc2b4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
|
4 years ago |
|
疯狂的狮子li
|
3f97d19381
|
update [重磅更新] 重构分页 简化使用
|
4 years ago |
RuoYi
|
d365a52cd6
|
自定义xss校验注解实现
|
4 years ago |
|
疯狂的狮子li
|
29c46a15f9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
|
4 years ago |
|
疯狂的狮子Li
|
aae3fe5305
|
update [重大更新] 重写数据权限实现
|
4 years ago |
|
疯狂的狮子li
|
8a5c8d0db5
|
update 补全缺失导包
|
4 years ago |
|
疯狂的狮子li
|
bcd5b713f8
|
fix 修复 SysOssConfig 主键类型错误
|
4 years ago |
|
疯狂的狮子li
|
a9488ba3c9
|
update 多数据源切换标注过期 3.6.0 移除 推荐使用原生注解
|
4 years ago |
|
疯狂的狮子li
|
a62d65a9b8
|
fix 修复 TreeBuildUtils 顶节点不为 0 问题
|
4 years ago |
|
RuoYi
|
850b98337b
|
修正用户分配角色属性错误
|
4 years ago |
|
若依
|
7f2921f26b
|
!382 update 优化查询用户的角色组、岗位组代码
Merge pull request !382 from 疯狂的狮子Li/update
|
4 years ago |
|
疯狂的狮子li
|
4de4763baf
|
update 优化查询用户的角色组、岗位组代码
|
4 years ago |
|
疯狂的狮子li
|
8362fe1b39
|
update 优化查询用户的角色组、岗位组代码
|
4 years ago |
|
疯狂的狮子li
|
8b9d3541dd
|
update LoginUser 增加角色缓存 优化角色权限代码
|
4 years ago |
|
疯狂的狮子li
|
e763381186
|
update [重磅更新] 登录流程升级 支持缓存
|
4 years ago |
|
疯狂的狮子li
|
5ba39c0086
|
update 重构分页 基于 分页新方法
|
4 years ago |
|
疯狂的狮子li
|
965ebd0f03
|
fix 修复主键溢出问题 将查询返回类型改为 Long
|
4 years ago |
|
疯狂的狮子li
|
cb306b0793
|
remove 移除过期 用户导入
|
4 years ago |
|
疯狂的狮子li
|
c5dc08e082
|
update 调整 角色查询部门 返回值类型
|
4 years ago |
|
疯狂的狮子Li
|
b00c6dd89b
|
!120 selectPostListByUserId方法出参调整为Long
Merge pull request !120 from zendwang/dev
|
4 years ago |
|
疯狂的狮子Li
|
14a05ddaca
|
!119 系统用户自定义导入时初始密码加密优化
Merge pull request !119 from zendwang/dev
|
4 years ago |
zendwang
|
209654fdff
|
fix selectPostListByUserId方法出参调整为Long
|
4 years ago |
|
zendwang
|
f30aa02e7c
|
fix 系统用户自定义导入时初始密码加密优化
|
4 years ago |
|
疯狂的狮子li
|
7eedf37149
|
update 优化 pr !118 代码结构
|
4 years ago |
|
zendwang
|
ac38f7b909
|
fix 为Transactional注解设置rollback属性
|
4 years ago |
|
疯狂的狮子li
|
e8ee5ad691
|
update 用户登录 支持校验错误次数锁定登录
|
4 years ago |
|
疯狂的狮子li
|
408f5055a9
|
update 通用权限服务 迁移回 ruoyi-framework 模块
|
4 years ago |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
4 years ago |
|
疯狂的狮子li
|
4f0e73ba97
|
update 使用 hutool-jwt 替换老旧 jjwt 依赖
|
4 years ago |
|
疯狂的狮子li
|
4238266ea3
|
fix 修复 count 语法异常
(cherry picked from commit 3e2ddb3b25a99ba8a06096d88a78bbe97256d879)
|
4 years ago |
|
疯狂的狮子li
|
d2b7843d97
|
fix 修复 count 语法异常
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子Li
|
e4020faff3
|
update 使用导入新写法 重构系统用户导入
|
4 years ago |
|
疯狂的狮子li
|
7a4f36c00e
|
update 优化时间查询语句
|
4 years ago |
|
疯狂的狮子li
|
1f3ef4ffe1
|
update 初始化数据转移到 ApplicationRunner 统一处理
|
4 years ago |
|
疯狂的狮子li
|
97a12075b1
|
update 初始化数据转移到 ApplicationRunner 统一处理
|
4 years ago |
|
疯狂的狮子li
|
4cfbd8a9d2
|
update OSS 模块 整体重命名 消除歧义
|
4 years ago |
|
疯狂的狮子Li
|
6d3f4f5a04
|
update 抽象 DictService 通用 字典服务
|
4 years ago |
|
疯狂的狮子Li
|
20e782eb21
|
update 抽象 ConfigService 通用 参数配置服务
|
4 years ago |
|
疯狂的狮子Li
|
019526fbe9
|
update 解耦 LoginUser 与 SysUser 强关联
|
4 years ago |
