 疯狂的狮子li
|
9351d47948
|
fix 修复 合并错误
|
2021-11-29 14:10:53 +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
|
daf660e66d
|
update 更改 excel 方法注释 更清晰明显用法
|
2021-11-27 13:20:50 +08:00 |
|
|
疯狂的狮子li
|
fa2bdcd5ac
|
update 抽象 Excel 导入支持自定义监听器
|
2021-11-26 18:11:41 +08:00 |
|
|
疯狂的狮子li
|
c00e397405
|
update 抽象 Excel 导入支持自定义监听器
|
2021-11-26 18:06:44 +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
|
e2d370bd9d
|
update 移除 satoken 自带集成 redis 改为使用 框架自身 Redission 实现 统一方案 性能优异
|
2021-11-26 13:42:20 +08:00 |
|
|
疯狂的狮子li
|
1010ccca4d
|
update 更新 RedisUtils set保留ttl 兼容 5.X redis版本
|
2021-11-26 13:34:18 +08:00 |
|
|
zhujie
|
c3bb4d2a61
|
add 新增导入支持开启Validator数据验证，支持开启导入异常行继续读取，支持返回导入回执
|
2021-11-26 13:01:00 +08:00 |
|
|
疯狂的狮子li
|
d0c4b5bc76
|
add 增加 RedisUtils set 保留 TTL 有效期方法
|
2021-11-23 10:20:44 +08:00 |
|
|
疯狂的狮子Li
|
20eea9914e
|
update 基于 DictService 重构 Excel 内字典查询功能
|
2021-11-22 02:44:46 +08:00 |
|
|
疯狂的狮子Li
|
e30fa57ab4
|
update DictUtils 字典工具类 标记过期 3.5.0 版本移除 使用 DictService 代替
|
2021-11-22 02:42:14 +08:00 |
|
|
疯狂的狮子Li
|
a4cd5bd424
|
update 统一接口命名
|
2021-11-21 01:33:31 +08:00 |
|
|
疯狂的狮子li
|
b374ff4d6d
|
update 优化字典工具写法
|
2021-11-15 16:54:34 +08:00 |
|
|
疯狂的狮子li
|
223ff4ebff
|
fix 分页工具 排序字段 null 处理
|
2021-11-11 12:47:26 +08:00 |
|
|
疯狂的狮子li
|
2f21f293c1
|
update 基于 hutool 封装树构建工具 重构部门与菜单树结构返回
|
2021-11-04 10:32:18 +08:00 |
|
|
疯狂的狮子li
|
03e2ff587e
|
同步 ruoyi
|
2021-11-03 13:58:59 +08:00 |
|
|
疯狂的狮子li
|
1d32420a27
|
add 增加 ValidatorUtils 校验框架工具 用于在非 Controller 的地方校验对象
|
2021-11-03 13:50:51 +08:00 |
|
|
疯狂的狮子li
|
24ebc73ee5
|
Merge remote-tracking branch 'origin/dev' into satoken
|
2021-10-29 09:15:31 +08:00 |
|
|
疯狂的狮子li
|
5c6f30a8a9
|
update RedisUtils 更新删除 hash 数据方法
|
2021-10-28 10:43:46 +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
|
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 |
|
|
若依
|
0c30ffa11f
|
!354 update ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java.
Merge pull request !354 from Remenber_Ray/N/A
|
2021-10-25 01:55:51 +00:00 |
|
|
疯狂的狮子Li
|
4583787759
|
fix 跨域访问之后 下载无法获取 download-filename
|
2021-10-24 17:13:04 +08:00 |
|
|
Remenber_Ray
|
17550a5f4b
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java.
修复描述错误
|
2021-10-24 02:34:25 +00:00 |
|
|
疯狂的狮子li
|
b8a8b76c38
|
fix 修复跨域访问无权限获取请求头 download-filename 导致文件名为空问题
|
2021-10-22 12:38:33 +08:00 |
|
|
疯狂的狮子li
|
336adbd056
|
update 统一格式化代码结构
|
2021-10-22 10:04:15 +08:00 |
|
|
RuoYi
|
eb4376b649
|
Excel导入支持@Excels注解
|
2021-10-10 14:30:08 +08:00 |
|
|
RuoYi
|
7ae47b50b8
|
导入模板添加默认参数
|
2021-10-09 12:22:55 +08:00 |
|
|
RuoYi
|
0b14155a75
|
增加 sendGet 无参判断
|
2021-10-09 12:22:54 +08:00 |
|
|
疯狂的狮子li
|
0a9d4ea17b
|
update 适配单体系与多体系用户权限
|
2021-09-28 17:56:19 +08:00 |
|
|
疯狂的狮子li
|
f05138df62
|
update 适配单体系与多体系用户权限
|
2021-09-28 17:55:01 +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
|
49fc74be5d
|
fix 修复更新问题 导出文件名乱码
|
2021-09-27 21:30:07 +08:00 |
|
|
疯狂的狮子li
|
b082da73a1
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
|
2021-09-27 17:27:32 +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
|
6f6a3566ac
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# pom.xml
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
|
2021-09-26 17:15:40 +08:00 |
|
|
RuoYi
|
30c89b33fe
|
Excel注解支持导入导出标题信息
|
2021-09-26 09:03:01 +08:00 |
|
|
RuoYi
|
7479ff4b06
|
修复xss过滤后格式出现的异常
|
2021-09-25 17:12:37 +08:00 |
|
|
疯狂的狮子li
|
6f870e11ff
|
update 优化空校验处理
|
2021-09-24 11:17:25 +08:00 |
|
|
疯狂的狮子li
|
553c29ab8a
|
update 整合 satoken 权限、鉴权一体化框架
|
2021-09-23 19:13:58 +08:00 |
|
|
疯狂的狮子li
|
bdebca94b3
|
remove 移除无用合并
|
2021-09-22 12:38:52 +08:00 |
|
|
疯狂的狮子li
|
76bf987203
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
|
2021-09-22 10:09:15 +08:00 |
|
|
RuoYi
|
3b42abef44
|
Excel注解支持自定义数据处理器
|
2021-09-22 09:03:01 +08:00 |
|
|
RuoYi
|
54bfa627f0
|
防止Excel导入图片可能出现的异常
|
2021-09-20 19:04:57 +08:00 |
|
|
疯狂的狮子li
|
30fe14c0ff
|
add 增加 获取redis客户端实例id工具
|
2021-09-17 17:22:25 +08:00 |
|
|
疯狂的狮子li
|
900867df02
|
add RedisUtils 增加限流工具
|
2021-09-17 16:19:12 +08:00 |
|
|
疯狂的狮子li
|
182edef28a
|
update 所有业务适配 RedisUtils 新工具
|
2021-09-07 13:20:24 +08:00 |
|
|
疯狂的狮子li
|
97cffa048e
|
add 过期 RedisCache 新增 RedisUtils 工具类 更灵巧便于使用
|
2021-09-07 13:19:34 +08:00 |
|