疯狂的狮子li
|
35e940f0b5
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
|
6 years ago |
RuoYi
|
b5c789a267
|
防止空路由出现的警告，设置默认path=/
|
6 years ago |
|
RuoYi
|
bb1324a70a
|
支持一级菜单（和主页同级）在main区域显示
|
6 years ago |
北风
|
98bb78a9d6
|
调整空格同步格式
|
6 years ago |
|
北风
|
ff0749984d
|
tagview & sidebar 主题颜色与element ui(全局)同步
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
25b114aae7
|
支持是否需要设置token属性，自定义返回码消息。
|
6 years ago |
|
RuoYi
|
922f61e05b
|
登录地点设置内容过长则隐藏显示
|
6 years ago |
|
RuoYi
|
9aeb0cc1f3
|
修复定时任务执行一次按钮后不提示消息问题
|
6 years ago |
|
RuoYi
|
9f4918cc14
|
修改上级部门（选择项排除本身和下级）
|
6 years ago |
|
疯狂的狮子li
|
d350c048b8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/store/modules/tagsView.js
ruoyi/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
|
6 years ago |
|
RuoYi
|
9d0309489c
|
修复页签变量undefined
|
6 years ago |
|
疯狂的狮子li
|
b15be7078c
|
同步ruoyi-vue更新
|
6 years ago |
|
RuoYi
|
a34edef603
|
vuex用户名取值修正
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
疯狂的狮子li
|
4bee0d652a
|
修复前端页面报错 找不到模块问题
|
6 years ago |
|
RuoYi
|
8448b2b993
|
代码生成序号修正
|
6 years ago |
|
RuoYi
|
b5cacd5a3c
|
全屏情况下不调整上外边距
|
6 years ago |
|
RuoYi
|
da5c1328be
|
修复路由懒加载报错问题
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
5a4a0e7987
|
用户名称不能修改
|
6 years ago |
|
RuoYi
|
14392d9764
|
dialog添加append-to-body属性，防止ie遮罩
|
6 years ago |
|
RuoYi
|
ec98648e4d
|
菜单区分状态和显示隐藏功能
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
ec65b1f7ec
|
登录请求params更换为data，防止暴露url
|
6 years ago |
|
RuoYi
|
441da7ecd7
|
添加handle控制允许拖动的元素
|
6 years ago |
|
RuoYi
|
992a63482c
|
布局设置点击扩大范围
|
6 years ago |
|
RuoYi
|
8132ae0913
|
代码生成列属性排序查询
|
6 years ago |
|
RuoYi
|
ed04c24eb3
|
代码生成列支持拖动排序
|
6 years ago |
|
RuoYi
|
f9799cd444
|
修复时间格式不支持ios问题
|
6 years ago |
|
RuoYi
|
6b147281ad
|
表单构建添加父级class，防止冲突
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
e07d4c18ee
|
定时任务并发属性修正
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
2cc14e5f56
|
若依 2.2
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
505ee1d63e
|
添加一个打包Web工程bat
|
6 years ago |
|
RuoYi
|
4bbdc1e87b
|
修复TagsView组件中，鼠标滚轮按下的时候，可以关闭不可关闭的tag
|
6 years ago |
|
RuoYi
|
3b87128461
|
修复点击退出登录有时会无效问题
|
6 years ago |
|
RuoYi
|
bc65e59fcb
|
修复charts切换侧边栏或者缩放窗口显示bug
|
6 years ago |
|
RuoYi
|
56339214b6
|
升级element-ui版本到2.13.0
|
6 years ago |
|
RuoYi
|
61142595c4
|
固定重定向路径表达式
|
6 years ago |
|
RuoYi
|
af7aa35884
|
路由地址添加必填限制
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
103583a847
|
个人信息创建时间获取属性值
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
f18b3bc6be
|
代码生成字段描述可编辑
|
6 years ago |
|
RuoYi
|
0c1a27769a
|
删除无用页面
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
bb1340ecc6
|
操作日志详细显示类型
|
6 years ago |
