疯狂的狮子li
|
a3a3d62034
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/views/system/role/index.vue
|
6 years ago |
若依
|
dd7a9850e3
|
!39 角色权限修改时已有权限未自动勾选异常修复
Merge pull request !39 from 严俊东/N/A
|
6 years ago |
|
RuoYi
|
a691da0c97
|
防止切换权限用户后登录出现404
|
6 years ago |
严俊东
|
d04ec69df4
|
角色权限修改时已有权限未自动勾选异常修复
|
6 years ago |
|
疯狂的狮子li
|
eef65b449d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/README.md
ruoyi/src/main/resources/application.yml
|
6 years ago |
|
RuoYi
|
1e2a2026c6
|
修改文件编码格式
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
7a9564ced5
|
修复代码生成点击多次表修改数据不变化的问题
|
6 years ago |
|
RuoYi
|
5d5f955a34
|
修复头像上传成功二次打开无法改变裁剪框大小和位置问题
|
6 years ago |
|
RuoYi
|
eac9403ea4
|
修复布局为small者mini用户表单显示错位问题
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
abbfun
|
f6de03a009
|
update ruoyi-ui/src/views/monitor/job/log.vue.
data对象中属性【表单参数form】重复
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
a195df175f
|
修正定时任务日志权限字符
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
48ba7d5ed6
|
修改用户管理复选框宽度，防止部分浏览器出现省略号
|
6 years ago |
Live
|
a2d1160205
|
add ruoyi-ui/public/robots.txt.
项目添加robots.txt 防止后台管理系统被搜索引擎收录
|
6 years ago |
|
Live
|
0c069a57cc
|
项目添加robots.txt 防止后台管理系统被搜索引擎收录
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
7afc5acc6f
|
定时任务调整label-width，防止部署出现错位
|
6 years ago |
|
RuoYi
|
8a7f33807b
|
调整表头固定列默认样式
|
6 years ago |
Elune
|
ef5adf2e2a
|
update ruoyi-ui/src/permission.js.
修复退出登录重定向到登录页，登录后参数丢失。/article?id=6
https://github.com/elunez/eladmin-web/pull/94
|
6 years ago |
|
RuoYi
|
4cb4de86db
|
修复首页搜索菜单外链无法点击跳转问题
|
6 years ago |
|
RuoYi
|
c861b78f80
|
修复菜单管理选择图标，backspace删除时不过滤数据
|
6 years ago |
|
RuoYi
|
5123832cd7
|
用户管理部门分支节点不可检查&显示计数
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
b4b3ff8813
|
若依 2.3
|
6 years ago |
|
RuoYi
|
d48475c585
|
dev启动默认打开浏览器
|
6 years ago |
|
RuoYi
|
f26f90fa23
|
使用vue-cli默认source-map
|
6 years ago |
|
RuoYi
|
8a61b9fe99
|
slidebar eslint报错优化
|
6 years ago |
|
RuoYi
|
bb5520a7d1
|
当tags-view滚动关闭右键菜单
|
6 years ago |
|
RuoYi
|
1e2058bdfb
|
字典管理添加缓存读取
|
6 years ago |
|
RuoYi
|
0d546e4ba4
|
参数管理支持缓存操作
|
6 years ago |
|
RuoYi
|
b16b860b63
|
侧边栏key调整
|
6 years ago |
|
疯狂的狮子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 |
