严俊东
|
d04ec69df4
|
角色权限修改时已有权限未自动勾选异常修复
|
2020-07-10 12:52:45 +08:00 |
|
疯狂的狮子li
|
f0bee6af63
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
|
2020-06-29 09:08:18 +08:00 |
|
RuoYi
|
7a9564ced5
|
修复代码生成点击多次表修改数据不变化的问题
|
2020-06-24 17:17:22 +08:00 |
|
RuoYi
|
5d5f955a34
|
修复头像上传成功二次打开无法改变裁剪框大小和位置问题
|
2020-06-24 15:59:18 +08:00 |
|
RuoYi
|
eac9403ea4
|
修复布局为small者mini用户表单显示错位问题
|
2020-06-24 15:21:39 +08:00 |
|
疯狂的狮子li
|
827bbc2b17
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java
ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
|
2020-06-21 10:06:26 +08:00 |
|
abbfun
|
f6de03a009
|
update ruoyi-ui/src/views/monitor/job/log.vue.
data对象中属性【表单参数form】重复
|
2020-06-19 10:00:41 +08:00 |
|
疯狂的狮子li
|
8d318c222e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
|
2020-06-18 15:13:40 +08:00 |
|
RuoYi
|
a195df175f
|
修正定时任务日志权限字符
|
2020-06-18 15:07:56 +08:00 |
|
疯狂的狮子li
|
c53d5fd1f6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/vue.config.js
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
|
2020-06-12 15:14:19 +08:00 |
|
RuoYi
|
48ba7d5ed6
|
修改用户管理复选框宽度，防止部分浏览器出现省略号
|
2020-06-12 13:45:27 +08:00 |
|
疯狂的狮子li
|
6bb7db31aa
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/components/IconSelect/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
ruoyi/src/main/resources/vm/vue/index.vue.vm
ruoyi/src/main/resources/vm/xml/mapper.xml.vm
|
2020-06-08 12:01:19 +08:00 |
|
RuoYi
|
7afc5acc6f
|
定时任务调整label-width，防止部署出现错位
|
2020-06-07 17:52:14 +08:00 |
|
RuoYi
|
5123832cd7
|
用户管理部门分支节点不可检查&显示计数
|
2020-06-03 16:53:17 +08:00 |
|
疯狂的狮子li
|
5f866906d1
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/data.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/assets/styles/element-variables.scss
ruoyi-ui/src/components/SvgIcon/index.vue
ruoyi-ui/src/layout/components/Sidebar/Link.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/notice/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/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/vue.config.js
ruoyi/pom.xml
ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
ruoyi/src/main/resources/application.yml
ruoyi/src/main/resources/vm/sql/sql.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
2020-06-01 13:34:08 +08:00 |
|
RuoYi
|
b4b3ff8813
|
若依 2.3
|
2020-06-01 10:49:36 +08:00 |
|
RuoYi
|
1e2058bdfb
|
字典管理添加缓存读取
|
2020-05-30 14:29:19 +08:00 |
|
RuoYi
|
0d546e4ba4
|
参数管理支持缓存操作
|
2020-05-30 13:46:31 +08:00 |
|
疯狂的狮子li
|
98941acd2a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/api/system/dept.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/resources/application.yml
|
2020-05-20 09:15:19 +08:00 |
|
RuoYi
|
922f61e05b
|
登录地点设置内容过长则隐藏显示
|
2020-05-17 15:53:45 +08:00 |
|
RuoYi
|
9aeb0cc1f3
|
修复定时任务执行一次按钮后不提示消息问题
|
2020-05-17 15:47:29 +08:00 |
|
RuoYi
|
9f4918cc14
|
修改上级部门（选择项排除本身和下级）
|
2020-05-16 18:39:30 +08:00 |
|
疯狂的狮子li
|
1062da678f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
ruoyi/src/main/resources/vm/java/domain.java.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
2020-04-25 20:14:40 +08:00 |
|
疯狂的狮子li
|
4bee0d652a
|
修复前端页面报错 找不到模块问题
|
2020-04-25 20:09:39 +08:00 |
|
RuoYi
|
8448b2b993
|
代码生成序号修正
|
2020-04-21 18:31:11 +08:00 |
|
疯狂的狮子li
|
44e2618ee2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/notice/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/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/sql/ry_20200415.sql
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
ruoyi/src/main/resources/vm/sql/sql.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
2020-04-21 09:08:48 +08:00 |
|
RuoYi
|
5a4a0e7987
|
用户名称不能修改
|
2020-04-17 15:17:32 +08:00 |
|
RuoYi
|
14392d9764
|
dialog添加append-to-body属性，防止ie遮罩
|
2020-04-17 14:14:54 +08:00 |
|
RuoYi
|
ec98648e4d
|
菜单区分状态和显示隐藏功能
|
2020-04-15 18:04:41 +08:00 |
|
疯狂的狮子li
|
31a2713012
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/api/login.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/tool/build/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
|
2020-04-03 10:16:28 +08:00 |
|
RuoYi
|
441da7ecd7
|
添加handle控制允许拖动的元素
|
2020-04-01 12:21:48 +08:00 |
|
RuoYi
|
8132ae0913
|
代码生成列属性排序查询
|
2020-04-01 10:15:29 +08:00 |
|
RuoYi
|
ed04c24eb3
|
代码生成列支持拖动排序
|
2020-04-01 09:52:49 +08:00 |
|
RuoYi
|
6b147281ad
|
表单构建添加父级class，防止冲突
|
2020-03-31 16:03:06 +08:00 |
|
疯狂的狮子li
|
39d8723159
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
|
2020-03-24 15:29:45 +08:00 |
|
RuoYi
|
e07d4c18ee
|
定时任务并发属性修正
|
2020-03-22 18:02:33 +08:00 |
|
疯狂的狮子li
|
b1afb78ca2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/components/SvgIcon/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/tagsView.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi/pom.xml
ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
ruoyi/src/main/resources/application.yml
|
2020-03-19 09:10:03 +08:00 |
|
RuoYi
|
2cc14e5f56
|
若依 2.2
|
2020-03-18 09:43:17 +08:00 |
|
疯狂的狮子li
|
2e6bb454f4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/bin/package.bat
ruoyi-ui/package.json
ruoyi-ui/src/assets/styles/element-ui.scss
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/components/icons/element-icons.js
ruoyi-ui/src/views/dashboard/mixins/resize.js
ruoyi-ui/src/views/system/menu/index.vue
ruoyi/src/main/java/com/ruoyi/common/filter/XssFilter.java
ruoyi/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi/src/main/java/com/ruoyi/common/utils/text/CharsetKit.java
ruoyi/src/main/java/com/ruoyi/common/utils/text/Convert.java
ruoyi/src/main/java/com/ruoyi/common/utils/text/StrFormatter.java
ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
|
2020-03-16 09:58:40 +08:00 |
|
RuoYi
|
bc65e59fcb
|
修复charts切换侧边栏或者缩放窗口显示bug
|
2020-03-15 20:07:14 +08:00 |
|
RuoYi
|
56339214b6
|
升级element-ui版本到2.13.0
|
2020-03-15 20:00:01 +08:00 |
|
RuoYi
|
af7aa35884
|
路由地址添加必填限制
|
2020-03-14 10:58:51 +08:00 |
|
疯狂的狮子li
|
7507a3ed2a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/system/user/profile/index.vue
ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
|
2020-03-09 09:40:39 +08:00 |
|
RuoYi
|
103583a847
|
个人信息创建时间获取属性值
|
2020-03-08 21:16:16 +08:00 |
|
疯狂的狮子li
|
bed1fd98ff
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/login/auth-redirect.vue
ruoyi-ui/src/views/login/components/SocialSignin.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-03-02 16:15:24 +08:00 |
|
RuoYi
|
f18b3bc6be
|
代码生成字段描述可编辑
|
2020-02-28 20:29:19 +08:00 |
|
RuoYi
|
0c1a27769a
|
删除无用页面
|
2020-02-28 19:56:19 +08:00 |
|
疯狂的狮子li
|
f9b9156c8a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
ruoyi/src/main/resources/vm/java/mapper.java.vm
ruoyi/src/main/resources/vm/java/service.java.vm
|
2020-02-28 17:34:44 +08:00 |
|
RuoYi
|
bb1340ecc6
|
操作日志详细显示类型
|
2020-02-25 19:33:29 +08:00 |
|
RuoYi
|
759a0fcb32
|
导入表单击行数据时选中对应的复选框
|
2020-02-25 13:49:48 +08:00 |
|