疯狂的狮子li
|
b15be7078c
|
同步ruoyi-vue更新
|
2020-05-06 11:57:51 +08:00 |
RuoYi
|
066d3f3f9f
|
修改定时任务详情下次执行时间日期显示错误
|
2020-04-30 12:11:53 +08:00 |
|
RuoYi
|
a3e97ed677
|
角色管理查询设置默认排序字段
|
2020-04-29 22:26:05 +08:00 |
|
RuoYi
|
2d93e7aeb3
|
swagger添加enable参数控制是否启用
|
2020-04-29 21:58:24 +08:00 |
|
RuoYi
|
1a079532e8
|
只对json类型请求构建可重复读取inputStream的request
|
2020-04-29 21:14:12 +08:00 |
|
RuoYi
|
eec5c58b4a
|
修改代码生成字典字段int类型没有自动选中问题
|
2020-04-29 16:06:49 +08:00 |
|
RuoYi
|
a34edef603
|
vuex用户名取值修正
|
2020-04-29 15:02:17 +08:00 |
|
疯狂的狮子li
|
42008124b6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-ui/src/assets/styles/ruoyi.scss
# ruoyi-ui/src/views/tool/gen/index.vue
|
2020-04-29 09:17:17 +08:00 |
|
疯狂的狮子li
|
1dae7c9bc9
|
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-29 09:16:29 +08:00 |
|
RuoYi
|
aa23ef1e99
|
添加新群号：104180207
|
2020-04-28 12:05:52 +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
|
e7ac78535d
|
表格树模板去掉多余的)
|
2020-04-24 10:49:12 +08:00 |
|
RuoYi
|
8448b2b993
|
代码生成序号修正
|
2020-04-21 18:31:11 +08:00 |
|
RuoYi
|
b5cacd5a3c
|
全屏情况下不调整上外边距
|
2020-04-21 17:28:39 +08:00 |
|
RuoYi
|
526c3867b4
|
代码生成Date字段添加默认格式
|
2020-04-21 17:13:02 +08:00 |
|
RuoYi
|
d452ddf5f0
|
用户管理角色选择权限控制
|
2020-04-21 16:00:06 +08:00 |
|
RuoYi
|
da5c1328be
|
修复路由懒加载报错问题
|
2020-04-21 14:48:34 +08:00 |
|
疯狂的狮子li
|
405ad4280c
|
Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
|
2020-04-21 09:09:43 +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 |
|
疯狂的狮子li
|
09918e338a
|
修复 undertow 未生效问题
|
2020-04-19 14:47:25 +08:00 |
|
RuoYi
|
aae1825697
|
模板sql.vm添加菜单状态
|
2020-04-18 11:50:47 +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
|
1dac24c9f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/pom.xml
|
2020-04-13 12:51:20 +08:00 |
|
疯狂的狮子li
|
76ea06748b
|
升级fastjson到最新版1.2.68 修复安全加固
|
2020-04-13 12:48:03 +08:00 |
|
RuoYi
|
5d20be2976
|
升级fastjson到最新版1.2.68 修复安全加固
|
2020-04-13 11:58:03 +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 |
|
RuoYi
|
48509d6488
|
添加新群号
|
2020-04-08 14:22:48 +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
|
ec65b1f7ec
|
登录请求params更换为data，防止暴露url
|
2020-04-01 14:01:31 +08:00 |
|
RuoYi
|
8a394f0363
|
日志返回时间格式处理
|
2020-04-01 13:09:27 +08:00 |
|
RuoYi
|
441da7ecd7
|
添加handle控制允许拖动的元素
|
2020-04-01 12:21:48 +08:00 |
|
RuoYi
|
992a63482c
|
布局设置点击扩大范围
|
2020-04-01 11:35:58 +08:00 |
|
RuoYi
|
8132ae0913
|
代码生成列属性排序查询
|
2020-04-01 10:15:29 +08:00 |
|
RuoYi
|
ed04c24eb3
|
代码生成列支持拖动排序
|
2020-04-01 09:52:49 +08:00 |
|
RuoYi
|
f9799cd444
|
修复时间格式不支持ios问题
|
2020-03-31 16:40:26 +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 |
|
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
|
51ae2d1a87
|
升级 v2.2
|
2020-03-19 09:13:07 +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 |