疯狂的狮子li
|
616fbc45ae
|
增加 校验框架配置与全局异常处理
|
2020-10-28 16:01:26 +08:00 |
疯狂的狮子li
|
cf44d1f213
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
ruoyi-ui/src/views/system/dept/index.vue
|
2020-10-28 11:54:52 +08:00 |
若依
|
7de2cf77b4
|
!111 update ruoyi-ui/src/views/system/dept/index.vue.
Merge pull request !111 from FlyFive/N/A
|
2020-10-26 16:57:58 +08:00 |
FlyFive
|
2b9d46439f
|
update ruoyi-ui/src/views/system/dept/index.vue.
验证的提示信息错了
|
2020-10-26 16:31:51 +08:00 |
若依
|
79265d59b7
|
!109 误修改,回退
Merge pull request !109 from tucke/master
|
2020-10-26 10:00:46 +08:00 |
tucke
|
093ba5b389
|
误修改,回退
|
2020-10-26 09:53:58 +08:00 |
疯狂的狮子li
|
30d15afd33
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-ui/src/views/login.vue
sql/ry_20201021.sql
|
2020-10-23 17:41:02 +08:00 |
RuoYi
|
3807b11290
|
权限调整
|
2020-10-23 17:27:20 +08:00 |
RuoYi
|
c9f25cb34e
|
调整sql默认时间
|
2020-10-21 11:30:37 +08:00 |
疯狂的狮子li
|
8747d36b2c
|
更改日志存储路径 使用项目变量
|
2020-10-20 16:38:39 +08:00 |
疯狂的狮子li
|
1a15c528a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
|
2020-10-16 10:27:13 +08:00 |
若依
|
203b54e5aa
|
!106 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java.
Merge pull request !106 from abbfun/N/A
|
2020-10-14 17:12:57 +08:00 |
RuoYi
|
403f5c5dcf
|
解决代码生成没有bit类型的问题
|
2020-10-14 17:08:20 +08:00 |
abbfun
|
c6d0b9a9ae
|
update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java.
权限字符串修正
|
2020-10-14 16:21:43 +08:00 |
疯狂的狮子li
|
f4876422a9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
|
2020-10-14 09:22:01 +08:00 |
RuoYi
|
08df2c93a9
|
删除不必要的代码
|
2020-10-13 14:41:26 +08:00 |
若依
|
fbbdd94999
|
!105 update ruoyi-ui/src/views/system/role/index.vue.
Merge pull request !105 from FlyFive/N/A
|
2020-10-13 14:38:02 +08:00 |
FlyFive
|
0cae7d0058
|
update ruoyi-ui/src/views/system/role/index.vue.
getMenuAllCheckedKeys()方法中选中节点和半选节点获取的方法反了。
|
2020-10-12 13:50:25 +08:00 |
疯狂的狮子li
|
8ca53c7666
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/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/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-10-12 09:54:59 +08:00 |
RuoYi
|
b0965653bf
|
删除不必要的代码
|
2020-10-10 17:54:30 +08:00 |
RuoYi
|
e472f62523
|
升级pagehelper到最新版1.3.0
|
2020-10-10 16:39:14 +08:00 |
RuoYi
|
69256940df
|
若依 3.2
|
2020-10-10 09:38:21 +08:00 |
疯狂的狮子li
|
bd39b971cf
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/monitor/job/index.vue
|
2020-10-10 09:19:20 +08:00 |
RuoYi
|
b9f686be53
|
升级druid到最新版本v1.2.1
|
2020-10-09 11:45:33 +08:00 |
RuoYi
|
521ff51238
|
升级fastjson到最新版1.2.74
|
2020-10-09 11:45:06 +08:00 |
若依
|
f67c97e095
|
!102 rouyi.js中添加日期范围方法dateRange获取bug修复
Merge pull request !102 from zora/master
|
2020-10-09 11:37:18 +08:00 |
RuoYi
|
dd721ff894
|
修正定时任务执行一次权限标识
|
2020-10-07 13:36:55 +08:00 |
疯狂的狮子li
|
cb92e41b76
|
修复生成树结构报错
|
2020-10-07 12:27:29 +08:00 |
疯狂的狮子li
|
cddaf4b088
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2020-10-07 12:25:38 +08:00 |
RuoYi
|
ae4290bdda
|
修复页签关闭所有固定标签路由不刷新问题
|
2020-10-03 20:05:24 +08:00 |
RuoYi
|
c19fec2cf8
|
格式化代码
|
2020-10-03 20:05:06 +08:00 |
RuoYi
|
669c42795a
|
表单构建布局型组件新增按钮
|
2020-10-03 17:47:24 +08:00 |
疯狂的狮子li
|
cc59e5ad89
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
|
2020-10-03 11:57:41 +08:00 |
RuoYi
|
0d79f10c2f
|
jna指定版本
|
2020-10-03 11:43:23 +08:00 |
RuoYi
|
d3595cd930
|
修正菜单提示信息错误
|
2020-10-03 11:15:18 +08:00 |
shizhenwei
|
5b0525d05c
|
[修改]此工具类应使用参数dateRange而非bind在model上的dateRange
|
2020-09-27 13:22:23 +08:00 |
疯狂的狮子li
|
3c703e4189
|
解决 druid 请求已响应bug
|
2020-09-25 12:05:41 +08:00 |
疯狂的狮子li
|
ef4731e3ff
|
删除无用js
|
2020-09-25 12:05:01 +08:00 |
疯狂的狮子li
|
6101a3bf0d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
ruoyi-ui/src/assets/styles/sidebar.scss
|
2020-09-25 11:15:57 +08:00 |
RuoYi
|
fb07677c32
|
左侧菜单文字过长显示省略号
|
2020-09-24 19:21:55 +08:00 |
RuoYi
|
a82a3d9465
|
升级oshi到最新版本v5.2.5
|
2020-09-22 18:25:58 +08:00 |
疯狂的狮子li
|
aefa2095f0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
sql/ry_20200920.sql
|
2020-09-22 13:22:30 +08:00 |
RuoYi
|
28bceda630
|
修正文字错误
|
2020-09-22 11:09:18 +08:00 |
RuoYi
|
69829827fe
|
菜单&数据权限新增(展开/折叠 全选/全不选 父子联动)
|
2020-09-21 14:10:01 +08:00 |
若依
|
89607fb028
|
!100 解决添加用户角色时报错问题
Merge pull request !100 from wensanpi/master
|
2020-09-21 10:31:59 +08:00 |
wensanpi
|
1aa18c523d
|
update ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml.
|
2020-09-20 17:38:21 +08:00 |
RuoYi
|
abeb8d7fd8
|
菜单新增是否缓存keep-alive
|
2020-09-20 10:34:03 +08:00 |
RuoYi
|
478fae0d28
|
菜单&数据权限新增(展开/折叠 全选/全不选 父子联动)
|
2020-09-19 13:42:37 +08:00 |
疯狂的狮子li
|
298fabfdec
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-09-18 17:38:23 +08:00 |
RuoYi
|
0ecf27f8d6
|
去除多余的空格
|
2020-09-18 17:09:27 +08:00 |