疯狂的狮子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
|
aae1825697
|
模板sql.vm添加菜单状态
|
2020-04-18 11:50:47 +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
|
29b131b107
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
2020-04-10 13:43:18 +08:00 |
|
RuoYi
|
5ded2569d0
|
修复代码生成如果选择字典类型缺失逗号问题
|
2020-04-10 11:49:08 +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
|
8132ae0913
|
代码生成列属性排序查询
|
2020-04-01 10:15:29 +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
|
9b0828be8e
|
角色禁用&菜单隐藏不查询权限
|
2020-03-22 16:41:30 +08:00 |
|
疯狂的狮子li
|
67657e9f02
|
升级 v2.2
|
2020-03-19 09:32:15 +08:00 |
|
疯狂的狮子li
|
2a922caf89
|
升级 v2.2
|
2020-03-19 09:22:46 +08:00 |
|
疯狂的狮子li
|
bd7371fb8b
|
升级 v2.2
|
2020-03-19 09:21:17 +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
|
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
|
09a3a971ff
|
操作日志排序调整
|
2020-03-07 10:11:22 +08:00 |
|
RuoYi
|
bb1340ecc6
|
操作日志详细显示类型
|
2020-02-25 19:33:29 +08:00 |
|
疯狂的狮子li
|
0ba48df61e
|
升级 v2.1
|
2020-02-24 10:19:17 +08:00 |
|
疯狂的狮子li
|
db20b4a3d3
|
升级 v2.1
|
2020-02-24 10:02:53 +08:00 |
|
疯狂的狮子li
|
6687efd887
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/components/RuoYi/Git/index.vue
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/utils/permission.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/tool/build/index.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi/pom.xml
ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
ruoyi/src/main/resources/application.yml
ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
ruoyi/src/main/resources/vm/java/controller.java.vm
ruoyi/src/main/resources/vm/java/domain.java.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
2020-02-24 09:56:22 +08:00 |
|
RuoYi
|
cb0a4b78ee
|
若依 2.1
|
2020-02-24 09:28:16 +08:00 |
|
疯狂的狮子li
|
fbba782f5c
|
增加彩色日志输出 调整优化日志格式
|
2020-02-14 13:58:35 +08:00 |
|
疯狂的狮子li
|
a108574387
|
增加彩色日志输出 调整优化日志格式
|
2020-02-14 13:40:39 +08:00 |
|
疯狂的狮子li
|
83c427c1bb
|
增加 代码生成与MybatisPlus测试案例 cstest
|
2020-02-14 13:36:52 +08:00 |
|
疯狂的狮子li
|
7c8d062d58
|
修改 代码生成器 适配 MybatisPlus
|
2020-02-14 13:27:55 +08:00 |
|
疯狂的狮子li
|
c7bc8e415f
|
集成 Lombok + MybatisPlus 3.3.0
|
2020-02-14 13:27:09 +08:00 |
|
疯狂的狮子li
|
2841620be6
|
初始化项目
|
2020-02-13 10:48:51 +08:00 |
|
疯狂的狮子li
|
b279aa391c
|
删除文件 ruoyi
|
2020-02-13 10:47:22 +08:00 |
|
RuoYi
|
891062a7de
|
配置文件增加redis属性password
|
2020-02-08 19:25:57 +08:00 |
|
RuoYi
|
554beaf6e7
|
修改在角色管理页修改菜单权限偶尔未选中问题
|
2020-02-08 18:30:09 +08:00 |
|
RuoYi
|
140be61003
|
根据用户权限加载菜单数据树形结构
|
2020-02-08 14:49:46 +08:00 |
|
RuoYi
|
a5dce6cccc
|
防止db字段名为一个字母导致出现生成异常
|
2020-02-02 15:43:43 +08:00 |
|
RuoYi
|
de870bd2fe
|
修改用户管理分页不正确的问题
|
2019-12-26 17:32:10 +08:00 |
|
RuoYi
|
d2854c73f0
|
代码生成vue文件修正
|
2019-12-04 10:23:48 +08:00 |
|
RuoYi
|
04289c6021
|
代码生成sql权限修正
|
2019-12-04 10:17:06 +08:00 |
|
RuoYi
|
80242d712b
|
代码生成vue文件修正
|
2019-12-04 10:08:42 +08:00 |
|
RuoYi
|
fee8a5955b
|
若依 2.0
|
2019-12-02 09:28:11 +08:00 |
|
RuoYi
|
bcee37b84b
|
若依 1.1
|
2019-11-11 08:59:15 +08:00 |
|
RuoYi
|
46444bd0fe
|
RuoYi-Vue 1.0
|
2019-10-08 09:14:38 +08:00 |
|