疯狂的狮子li
|
d3abd6c96e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.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/components/Breadcrumb/index.vue
|
2021-08-17 10:38:07 +08:00 |
RuoYi
|
03cf98d3c9
|
优化异常信息
|
2021-08-16 16:25:25 +08:00 |
若依
|
6f51f729ba
|
!289 添加日期范围支持重复添加多组日期范围,请求参数中对象的属性为null、undefined不进行拼接
Merge pull request !289 from wangzhaoqiang/master
|
2021-08-16 08:23:27 +00:00 |
疯狂的狮子li
|
73d2ed4c02
|
update 更新批量演示demo代码
|
2021-08-16 16:18:36 +08:00 |
wangzhaoqiang
|
57b159eb98
|
添加日期范围支持重复添加多组日期范围,请求参数中对象的属性为null、undefined不进行拼接
|
2021-08-16 14:48:34 +08:00 |
若依
|
08da6834a5
|
!288 修正方法名单词拼写错误
Merge pull request !288 from 稚屿/N/A
|
2021-08-16 02:36:36 +00:00 |
若依
|
268468fb47
|
!287 更新到【默认首页使用keep-alive缓存】后报错
Merge pull request !287 from wangzhaoqiang/master
|
2021-08-16 02:36:29 +00:00 |
稚屿
|
333e19339c
|
修正方法名单词拼写错误
|
2021-08-15 10:26:05 +00:00 |
疯狂的狮子li
|
25b47db3cb
|
update 移除Spring注入 改为全局缓存 并使用更新时间确保集群配置最终一致性
|
2021-08-15 16:59:46 +08:00 |
wangzhaoqiang
|
7b6ccd9b22
|
解决登录后浏览器后台Breadcrumb组件报错
|
2021-08-14 20:16:48 +08:00 |
疯狂的狮子li
|
881edb3e62
|
update springboot admin 2.4.3 => 2.5.0 (新增 Quartz 专属监控页)
|
2021-08-14 14:53:25 +08:00 |
疯狂的狮子li
|
bb1d8d5796
|
remove 删除无用常量
|
2021-08-14 14:30:52 +08:00 |
疯狂的狮子li
|
cb13642e85
|
update 重写 OSS 模块相关实现 支持动态配置(页面配置)
|
2021-08-13 21:09:24 +08:00 |
疯狂的狮子li
|
6473d4d8be
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
bin/clean.bat
bin/run.bat
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/bin/run-web.bat
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/index.vue
|
2021-08-13 17:36:26 +08:00 |
RuoYi
|
5d6f134609
|
多图上传组件移除多余的api地址
|
2021-08-13 15:15:35 +08:00 |
RuoYi
|
f02743bde5
|
代码生成主子表多选行数据
|
2021-08-13 14:50:35 +08:00 |
疯狂的狮子li
|
8c09c30ca0
|
remove 删除OSS配置页面无用按钮
|
2021-08-13 14:32:24 +08:00 |
疯狂的狮子li
|
86fba4aed4
|
remove 删除配置文件 OSS存储相关配置
|
2021-08-13 14:10:16 +08:00 |
疯狂的狮子li
|
a5a71bf505
|
fix 修复代码生成 删除按钮报错 loading 不取消问题
|
2021-08-13 14:07:32 +08:00 |
疯狂的狮子li
|
652a39b11c
|
update 修正 PR 相关问题
|
2021-08-13 14:04:57 +08:00 |
疯狂的狮子li
|
824635df7f
|
update 修正 PR 相关问题
|
2021-08-13 12:37:34 +08:00 |
RuoYi
|
3003bb0f50
|
Excel注解图片导入兼容xls
|
2021-08-13 10:56:35 +08:00 |
RuoYi
|
5139265d32
|
默认首页使用keep-alive缓存
|
2021-08-13 10:10:29 +08:00 |
孤舟烟雨
|
c9f7314cd0
|
!77 update 对象存储配置 重构到数据库 动态配置
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
|
2021-08-13 02:03:46 +00:00 |
若依
|
8a67af6c26
|
!285 修复角色分配用户页面接收参数与传递参数类型不一致导致的错误
Merge pull request !285 from 稚屿/N/A
|
2021-08-13 01:55:58 +00:00 |
若依
|
8e4802505e
|
!284 添加SysConfigservice,SysDictTypeService的实现方法遗漏的@Override注解
Merge pull request !284 from Old丶x/master
|
2021-08-13 01:55:52 +00:00 |
稚屿
|
8ee641c1bc
|
修复角色分配用户页面接收参数与传递参数类型不一致导致的错误
|
2021-08-13 01:08:00 +00:00 |
mroldx
|
779508989f
|
添加加载字典数据,清空字典数据,重置字典数据方法上遗漏的@Override注解
|
2021-08-12 17:30:31 +08:00 |
mroldx
|
d9e805a6a5
|
添加获取验证码方法上遗漏的@Override注解
|
2021-08-12 17:19:56 +08:00 |
疯狂的狮子li
|
2b0c4acfa1
|
add 增加 admin 监控客户端开关
|
2021-08-12 13:53:58 +08:00 |
疯狂的狮子li
|
2915548bce
|
remove 移除无用配置
|
2021-08-12 11:41:43 +08:00 |
疯狂的狮子li
|
c9a9da7f49
|
remove 移除无用配置
|
2021-08-12 11:38:06 +08:00 |
疯狂的狮子li
|
8adbdee9d9
|
remove 移除无用配置
|
2021-08-12 11:37:12 +08:00 |
疯狂的狮子li
|
5645356fa9
|
fix 生产minio回显问题
|
2021-08-11 17:05:02 +08:00 |
疯狂的狮子li
|
6a66aaff47
|
update 注入器 insert 增加 update 字段处理
|
2021-08-11 16:47:38 +08:00 |
疯狂的狮子li
|
253f28bb2b
|
update 代码生成文档注解 增加必填判断配置
|
2021-08-11 15:43:58 +08:00 |
疯狂的狮子li
|
a48154a2ee
|
update 补全基础实体 文档注解
|
2021-08-11 15:43:23 +08:00 |
疯狂的狮子li
|
0883b9eff1
|
update hutool 5.7.6 => 5.7.7
|
2021-08-11 14:42:58 +08:00 |
疯狂的狮子li
|
2c2dad24d5
|
update 更新 阿里云 maven源 新地址
|
2021-08-11 14:28:05 +08:00 |
疯狂的狮子li
|
cec4e083ef
|
update 更改多数据源框架更清晰的依赖名
|
2021-08-11 14:27:40 +08:00 |
疯狂的狮子li
|
05316b08b4
|
update 统一镜像时区配置 移除主机时间映射
|
2021-08-11 13:09:48 +08:00 |
RuoYi
|
7be17ea89a
|
Excel注解支持Image图片导入
|
2021-08-11 10:13:34 +08:00 |
RuoYi
|
1f07641d9b
|
update bin
|
2021-08-11 10:11:13 +08:00 |
若依
|
c0f4f805d0
|
!281 补全注册用户方法上遗漏的@Override注解
Merge pull request !281 from 稚屿/N/A
|
2021-08-11 02:08:58 +00:00 |
疯狂的狮子li
|
c2de299834
|
update 同步ruoyi
|
2021-08-09 10:05:27 +08:00 |
疯狂的狮子li
|
9bfa420a76
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
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/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.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/web/service/UserDetailsServiceImpl.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-ui/package.json
ruoyi-ui/src/views/system/menu/index.vue
|
2021-08-09 09:55:50 +08:00 |
稚屿
|
b84224d7ba
|
补全注册用户方法上遗漏的@Override注解
|
2021-08-08 14:08:52 +00:00 |
RuoYi
|
98a143f1fe
|
添加新群号:101456076
|
2021-08-08 19:50:50 +08:00 |
RuoYi
|
3243428009
|
优化用户不能删除自己
|
2021-08-08 19:12:52 +08:00 |
RuoYi
|
7736097f6b
|
提取通用方法到基类控制器
|
2021-08-08 19:12:12 +08:00 |