疯狂的狮子li
|
c3b44e835d
|
update 同步 ruoyi 更新代码
|
2021-08-19 17:37:44 +08:00 |
|
疯狂的狮子li
|
c380b77617
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.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/Constants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-ui/src/layout/index.vue
|
2021-08-19 17:33:46 +08:00 |
|
疯狂的狮子li
|
aead560227
|
update 优化 使用权限工具 获取用户信息
|
2021-08-19 11:13:59 +08:00 |
|
疯狂的狮子li
|
5bfb2dae13
|
update 优化OSS异常判断
|
2021-08-17 11:43:14 +08:00 |
|
疯狂的狮子li
|
52d0d62c35
|
update 同步 ruoyi 适配改动
|
2021-08-17 10:45:01 +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 |
|
孤舟烟雨
|
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 |
|
疯狂的狮子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 |
|
RuoYi
|
3243428009
|
优化用户不能删除自己
|
2021-08-08 19:12:52 +08:00 |
|
RuoYi
|
7736097f6b
|
提取通用方法到基类控制器
|
2021-08-08 19:12:12 +08:00 |
|
疯狂的狮子li
|
08db4a5f53
|
update 更改所有业务excel导出
|
2021-08-04 19:03:25 +08:00 |
|
疯狂的狮子li
|
9cf4794146
|
update 更新 SysUser 导入导出
|
2021-08-04 18:29:38 +08:00 |
|
疯狂的狮子li
|
e1fcbc6476
|
update 移动文件存储 controller 到 admin 模块
|
2021-08-04 17:27:33 +08:00 |
|
疯狂的狮子li
|
0539c2f927
|
update 重写系统部分业务导出
|
2021-08-04 11:46:55 +08:00 |
|
疯狂的狮子li
|
80067d32fc
|
fix 头像上传 未走OSS存储问题
|
2021-08-04 11:15:16 +08:00 |
|
疯狂的狮子li
|
c813046594
|
update 日常校验 统一重构到 StringUtils 便于维护扩展
|
2021-08-02 19:28:41 +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 |
|
疯狂的狮子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 |
|
江强
|
3347ca4d74
|
fix:Issue #I42GRW 修复任意账户越权漏洞
|
2021-07-27 09:33:12 +08:00 |
|
疯狂的狮子li
|
8ddd71a818
|
update 使用hutool重构 判断是否url
|
2021-07-12 14:29:49 +08:00 |
|
疯狂的狮子li
|
cd34c87afa
|
fix 修复升级合并错误
|
2021-07-12 11:00:12 +08:00 |
|
疯狂的狮子li
|
599016a63a
|
update 同步ruoyi修正差异
|
2021-07-12 09:44:46 +08:00 |
|
疯狂的狮子li
|
8231953e29
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/index.vue
|
2021-07-12 09:37:23 +08:00 |
|
RuoYi
|
5879c2484a
|
菜单路由配置支持内链访问
|
2021-07-11 16:31:10 +08:00 |
|
RuoYi
|
c02dad2ca3
|
默认访问首页新增提示语
|
2021-07-11 15:28:11 +08:00 |
|
疯狂的狮子li
|
ea506de048
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/directive/permission/hasPermi.js
ruoyi-ui/src/directive/permission/hasRole.js
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/notice/index.vue
|
2021-07-09 18:07:32 +08:00 |
|
RuoYi
|
da1095e298
|
授权用户添加访问权限
|
2021-07-09 17:08:30 +08:00 |
|
疯狂的狮子li
|
59114a14ff
|
update 同步 ruoyi 对新业务进行修正
|
2021-07-06 13:05:47 +08:00 |
|
疯狂的狮子li
|
aa14085746
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
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/entity/SysUser.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.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/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-07-06 12:01:05 +08:00 |
|
RuoYi
|
90c41d498c
|
角色管理新增分配用户功能
|
2021-07-05 14:54:09 +08:00 |
|
RuoYi
|
9c7901f526
|
用户管理新增分配角色功能
|
2021-07-01 18:01:36 +08:00 |
|
疯狂的狮子li
|
a1717eac6d
|
update 升级 hutool 5.7.1 适配工具类
|
2021-06-16 15:39:19 +08:00 |
|
疯狂的狮子li
|
dcf125a08a
|
update 优化 redis锁pr 代码
|
2021-06-04 16:09:43 +08:00 |
|
sxq
|
ad6386a618
|
redis分布式锁（基于注解形势）。
|
2021-06-04 15:00:56 +08:00 |
|
疯狂的狮子li
|
d0b2166525
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.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-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/index.vue
|
2021-05-28 10:07:15 +08:00 |
|
RuoYi
|
af9cfb40a4
|
优化参数&字典缓存操作
|
2021-05-27 17:38:44 +08:00 |
|
疯狂的狮子li
|
7076deb2b6
|
update 请求响应对象 与 分页对象 结构修改 适配接口文档配置
|
2021-05-20 13:23:12 +08:00 |
|
疯狂的狮子li
|
f01bb5966a
|
update 使用 MP 分页工具 重构业务
|
2021-05-13 21:25:51 +08:00 |
|
疯狂的狮子li
|
5d1e977442
|
个人信息添加手机&邮箱重复验证
|
2021-03-22 09:30:12 +08:00 |
|
疯狂的狮子li
|
8434511e39
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
|
2021-03-22 09:29:25 +08:00 |
|
RuoYi
|
67371a9028
|
个人信息添加手机&邮箱重复验证
|
2021-03-21 08:53:11 +08:00 |
|
疯狂的狮子li
|
9b4b9e0c74
|
update 删除通用工具 改为使用hutool
|
2021-03-15 16:38:43 +08:00 |
|
疯狂的狮子li
|
f56f57a236
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.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/SysRoleMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/assets/styles/variables.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/components/Screenfull/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
|
2020-12-11 14:27:54 +08:00 |
|
RuoYi
|
9e387dc447
|
去除用户手机邮箱部门必填验证
|
2020-12-11 13:26:14 +08:00 |
|
RuoYi
|
474cca921e
|
回显数据字典防止空值报错
|
2020-12-08 16:12:00 +08:00 |
|