疯狂的狮子li
|
2af534eea4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/components/ThemePicker/index.vue
ruoyi-ui/src/layout/components/Sidebar/Link.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
sql/ry_20210908.sql
|
2021-09-13 13:03:58 +08:00 |
|
RuoYi
|
db193a46e8
|
若依 3.7.0
|
2021-09-13 09:36:38 +08:00 |
|
疯狂的狮子li
|
c1c6c1cf30
|
update 将所有 云存储字样 改为 对象存储 避免误解
|
2021-09-10 10:51:40 +08:00 |
|
RuoYi
|
a5e38f6f99
|
菜单管理支持配置路由参数
|
2021-09-08 09:28:23 +08:00 |
|
疯狂的狮子Li
|
3b5fb07c3d
|
Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev
|
2021-09-07 05:49:53 +00:00 |
|
疯狂的狮子li
|
ddf8d6ad6b
|
发布 v3.1.0
|
2021-09-07 13:48:22 +08:00 |
|
疯狂的狮子li
|
182edef28a
|
update 所有业务适配 RedisUtils 新工具
|
2021-09-07 13:20:24 +08:00 |
|
疯狂的狮子li
|
e7f83fb695
|
update mybatis-plus 3.4.3 => 3.4.3.3 适配升级 (包含不兼容升级) 请详细阅读 mybatis-plus 官方升级文档
|
2021-09-06 10:19:58 +08:00 |
|
疯狂的狮子li
|
2d6c306ae1
|
update 优化 oss配置 使用发布订阅工具 刷新配置
|
2021-09-03 17:42:58 +08:00 |
|
疯狂的狮子li
|
ab9bc35f9f
|
update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理
|
2021-09-02 15:45:57 +08:00 |
|
疯狂的狮子li
|
52ca1e7d06
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
|
2021-08-31 09:42:55 +08:00 |
|
Gold_Fish
|
b036e78d85
|
修改根据userId获取菜单sql
|
2021-08-30 02:42:49 +00:00 |
|
疯狂的狮子li
|
0c438ad8e9
|
update 修改时检查用户数据权限范围
|
2021-08-26 11:15:07 +08:00 |
|
疯狂的狮子li
|
31c2cfa53c
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
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-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.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/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
2021-08-26 11:10:42 +08:00 |
|
RuoYi
|
e52092c6d4
|
修改时检查用户数据权限范围
|
2021-08-24 16:00:39 +08:00 |
|
疯狂的狮子li
|
a33a919169
|
fix 修复 OSS配置清空被过滤问题
|
2021-08-18 18:24:24 +08:00 |
|
疯狂的狮子li
|
88e3805ff9
|
fix 修复 OSS配置清空被过滤问题
|
2021-08-18 18:24:05 +08:00 |
|
疯狂的狮子li
|
a937e3f268
|
发布 v3.0.0
|
2021-08-18 11:09:14 +08:00 |
|
疯狂的狮子li
|
52d0d62c35
|
update 同步 ruoyi 适配改动
|
2021-08-17 10:45:01 +08:00 |
|
疯狂的狮子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 |
|
疯狂的狮子li
|
25b47db3cb
|
update 移除Spring注入 改为全局缓存 并使用更新时间确保集群配置最终一致性
|
2021-08-15 16:59:46 +08:00 |
|
疯狂的狮子li
|
cb13642e85
|
update 重写 OSS 模块相关实现 支持动态配置(页面配置)
|
2021-08-13 21:09:24 +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
|
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 |
|
mroldx
|
779508989f
|
添加加载字典数据,清空字典数据,重置字典数据方法上遗漏的@Override注解
|
2021-08-12 17:30:31 +08:00 |
|
mroldx
|
d9e805a6a5
|
添加获取验证码方法上遗漏的@Override注解
|
2021-08-12 17:19:56 +08:00 |
|
稚屿
|
b84224d7ba
|
补全注册用户方法上遗漏的@Override注解
|
2021-08-08 14:08:52 +00:00 |
|
疯狂的狮子li
|
4d15ab766f
|
fix 修复操作日志根据状态查询异常问题
|
2021-08-06 12:43:21 +08:00 |
|
疯狂的狮子li
|
5ca4478540
|
update 更新 SysJob 导入导出 补全 SysUser 试图对象
|
2021-08-04 18:52:09 +08:00 |
|
疯狂的狮子li
|
e1fcbc6476
|
update 移动文件存储 controller 到 admin 模块
|
2021-08-04 17:27:33 +08:00 |
|
疯狂的狮子li
|
0e8a8fca31
|
update 移动文件存储业务到 system 模块
|
2021-08-04 17:26:14 +08:00 |
|
疯狂的狮子li
|
0539c2f927
|
update 重写系统部分业务导出
|
2021-08-04 11:46:55 +08:00 |
|
疯狂的狮子li
|
da4e080656
|
update 修改 操作日志导出 适配easyexcel工具
|
2021-08-03 19:29:59 +08:00 |
|
疯狂的狮子li
|
c813046594
|
update 日常校验 统一重构到 StringUtils 便于维护扩展
|
2021-08-02 19:28:41 +08:00 |
|
疯狂的狮子li
|
28073ef2fe
|
update 适配新业务 接口返回值
|
2021-08-02 13:08:36 +08:00 |
|
疯狂的狮子li
|
f8ab5663ef
|
update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
|
2021-08-02 12:15:14 +08:00 |
|
疯狂的狮子li
|
cfdeada3fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/i18n/messages.properties
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/service.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/utils/zipdownload.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-08-02 11:21:09 +08:00 |
|
RuoYi
|
5397e345ca
|
新增是否开启用户注册功能
|
2021-07-30 21:23:35 +08:00 |
|
RuoYi
|
2de5cc52d1
|
启用父部门状态排除顶级节点
|
2021-07-30 11:28:04 +08:00 |
|
疯狂的狮子li
|
5dbf39beee
|
update service 统一使用 ServicePlusImpl
|
2021-07-28 14:22:58 +08:00 |
|
疯狂的狮子li
|
973471c63b
|
发布 v2.6.0
|
2021-07-28 10:45:01 +08:00 |
|
疯狂的狮子li
|
6e75e88d71
|
update 同步ruoyi修正
|
2021-07-27 12:48:28 +08:00 |
|
疯狂的狮子li
|
06944747fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-07-27 12:42:41 +08:00 |
|
疯狂的狮子Li
|
2e1761423d
|
fix 修复 DictData 删除逻辑问题
|
2021-07-26 12:05:15 +00:00 |
|
疯狂的狮子li
|
b7f6f73342
|
fix 修复 授权角色空数据问题
|
2021-07-26 10:52:31 +08:00 |
|
RuoYi
|
c26d87c677
|
内链设置meta信息
|
2021-07-25 20:05:18 +08:00 |
|
疯狂的狮子li
|
90d4fd8cf1
|
update [重大改动] 重写VO转换 支持深拷贝 将VO类抽象到 ServicePlus 泛型处理
|
2021-07-24 21:19:05 +08:00 |
|