xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-18 17:26:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,151 Commits 2 Branches 34 Tags 38 MiB
9ed5b521d6
Commit Graph

805 Commits

Author SHA1 Message Date
RuoYi
5139265d32 默认首页使用keep-alive缓存 2021-08-13 10:10:29 +08:00
孤舟烟雨
c9f7314cd0 !77 update 对象存储配置 重构到数据库 动态配置 
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
 2021-08-13 02:03:46 +00:00
稚屿
8ee641c1bc 修复角色分配用户页面接收参数与传递参数类型不一致导致的错误 2021-08-13 01:08:00 +00:00
RuoYi
1f07641d9b update bin 2021-08-11 10:11:13 +08:00
疯狂的狮子li
9bfa420a76 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	README.md
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
 2021-08-09 09:55:50 +08:00
RuoYi
fc60c003c3 升级element-ui到最新版本2.15.5 2021-08-06 14:31:39 +08:00
疯狂的狮子li
79bf332c53 remove 移除通用上传下载接口与配置 2021-08-04 19:11:39 +08:00
疯狂的狮子li
08db4a5f53 update 更改所有业务excel导出 2021-08-04 19:03:25 +08:00
疯狂的狮子li
5ca4478540 update 更新 SysJob 导入导出 补全 SysUser 试图对象 2021-08-04 18:52:09 +08:00
疯狂的狮子li
9cf4794146 update 更新 SysUser 导入导出 2021-08-04 18:29:38 +08:00
疯狂的狮子li
01e8fe5ddb fix 头像上传 未走OSS存储问题 2021-08-04 13:10:28 +08:00
疯狂的狮子li
0ec756cf58 fix oss列表 jpeg 不回显问题 2021-08-04 13:09:43 +08:00
疯狂的狮子li
0539c2f927 update 重写系统部分业务导出 2021-08-04 11:46:55 +08:00
疯狂的狮子li
19d5f2dd78 update 下载工具更名为通用下载 2021-08-04 09:28:31 +08:00
疯狂的狮子li
13dde63463 update 修改 下载工具类 删除无用代码 2021-08-04 09:27:16 +08:00
疯狂的狮子li
da4e080656 update 修改 操作日志导出 适配easyexcel工具 2021-08-03 19:29:59 +08:00
疯狂的狮子li
89cca8af07 update 重构 统一使用 zip 工具下载 2021-08-03 19:29:15 +08:00
疯狂的狮子li
28073ef2fe update 适配新业务 接口返回值 2021-08-02 13:08:36 +08:00
疯狂的狮子li
f8ab5663ef update 日常字符串校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 12:15:14 +08:00
疯狂的狮子li
cfdeada3fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-admin/src/main/resources/i18n/messages.properties
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/service.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/utils/zipdownload.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-08-02 11:21:09 +08:00
RuoYi
5397e345ca 新增是否开启用户注册功能 2021-07-30 21:23:35 +08:00
RuoYi
f6bc28000e 防止错误token导致的解析异常 2021-07-29 17:32:55 +08:00
RuoYi
e6becb9337 BLOB下载时清除URL对象引用 2021-07-28 13:13:28 +08:00
疯狂的狮子li
973471c63b 发布 v2.6.0 2021-07-28 10:45:01 +08:00
RuoYi
8da55fb72a 添加新群号：101456076 2021-07-28 09:51:19 +08:00
疯狂的狮子li
06944747fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/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/tool/gen/index.vue
 2021-07-27 12:42:41 +08:00
RuoYi
6a5c86541a 跳转路由高亮相对应的菜单栏 2021-07-27 11:54:20 +08:00
疯狂的狮子li
48817519a9 update 修改页面文档与源码地址 2021-07-26 13:08:54 +08:00
RuoYi
9b1883988b 升级element-ui到最新版本2.15.3 2021-07-26 09:50:58 +08:00
RuoYi
49c8a007cc 修复定时任务日志执行状态显示 2021-07-26 09:50:33 +08:00
RuoYi
64f6d28441 角色&菜单新增字段属性提示信息 2021-07-25 20:08:55 +08:00
RuoYi
97ae0eb7c7 密码框新增显示切换密码图标 2021-07-25 19:13:56 +08:00
RuoYi
6c1cccd031 导入用户样式调整 2021-07-25 19:08:00 +08:00
RuoYi
856d1ceba8 顶部菜单样式调整 2021-07-25 19:06:57 +08:00
RuoYi
0a516e3001 更多操作按钮添加权限控制 2021-07-25 10:20:52 +08:00
RuoYi
bb87f35797 富文本新增上传文件大小限制 2021-07-25 08:57:01 +08:00
疯狂的狮子li
fbe9ad2392 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-ui/src/router/index.js
 2021-07-24 19:03:36 +08:00
RuoYi
c43f9bc3c2 顶部菜单排除隐藏的默认路由 2021-07-24 18:20:55 +08:00
疯狂的狮子li
c92ae6a9d2 update 更新除图片外显示URL文本 2021-07-23 19:50:08 +08:00
疯狂的狮子li
dd9340090b add OSS模块 增加预览图片开关 2021-07-23 19:14:37 +08:00
疯狂的狮子li
bb67924233 update OSS下载文件名改为后端传输 2021-07-23 10:48:28 +08:00
疯狂的狮子li
1f2cf719da Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-ui/src/views/monitor/job/index.vue
 2021-07-21 14:00:07 +08:00
疯狂的狮子li
85376e8d6e add 演示Demo增加自定义分页接口案例 2021-07-21 12:07:12 +08:00
疯狂的狮子li
ed197ce7ac update 完成OSS模块页面功能 2021-07-20 17:26:20 +08:00
严俊东
cdace51197 code=401时request方法没有返回Promise.reject 修复 2021-07-20 04:49:22 +00:00
疯狂的狮子li
eea8f33cf9 发布 v2.5.2 bug修复版 
(cherry picked from commit b12bdd1f15)
 2021-07-19 19:44:18 +08:00
疯狂的狮子li
0a128e454c update 编写 Minio 实现 调整OSS模块结构 2021-07-19 19:40:18 +08:00
疯狂的狮子li
00b9043915 add 增加 OSS 模块业务代码 2021-07-18 20:27:37 +08:00
疯狂的狮子li
d7fde6fe0d fix 代码生成器 queryType >= <= 标识符错误问题 2021-07-17 18:07:08 +08:00
RuoYi
b616a2f2e7 定时任务新增更多操作 2021-07-15 17:35:33 +08:00
疯狂的狮子li
55546dfc80 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复 2021-07-13 13:49:47 +08:00
疯狂的狮子li
fd5414f82e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/login.vue
	sql/ry_20210713.sql
 2021-07-13 13:34:10 +08:00
RuoYi
7b894da43c 参数管理支持配置验证码开关 2021-07-13 10:30:40 +08:00
RuoYi
c8b66f9b04 删除富文本video事件 2021-07-13 10:28:55 +08:00
严俊东
77a21d098f 图片上传 - 多图时无法删除相应图片修复 2021-07-12 03:01:50 +00:00
疯狂的狮子li
e085ec9418 发布 v2.5.0 2021-07-12 09:53:46 +08:00
疯狂的狮子li
8231953e29 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
 2021-07-12 09:37:23 +08:00
RuoYi
170cfb356c 若依 3.6.0 2021-07-12 08:42:11 +08:00
RuoYi
5879c2484a 菜单路由配置支持内链访问 2021-07-11 16:31:10 +08:00
RuoYi
1bfa14e3c6 富文本默认上传返回url类型 2021-07-10 12:17:32 +08:00
疯狂的狮子li
ea506de048 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/directive/index.js
	ruoyi-ui/src/directive/permission/hasPermi.js
	ruoyi-ui/src/directive/permission/hasRole.js
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/notice/index.vue
 2021-07-09 18:07:32 +08:00
疯狂的狮子li
43486f2f41 update 配置 monitor-admin docker编排 2021-07-09 17:15:09 +08:00
RuoYi
5dec58e7f5 自定义弹窗拖拽指令 2021-07-09 17:12:29 +08:00
RuoYi
8321f92d2c 全局注册通用组件 2021-07-09 17:09:57 +08:00
疯狂的狮子li
1c11d7ccc1 update 转移 springboot-admin 到扩展模块项目 2021-07-09 15:30:40 +08:00
疯狂的狮子li
821f54f1ab update 富文本接口返回值修正 2021-07-08 20:05:37 +08:00
疯狂的狮子li
e30079d656 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/components/ImageUpload/index.vue
 2021-07-08 19:58:28 +08:00
RuoYi
f56da498ab ImageUpload组件支持多图片上传 2021-07-08 19:17:09 +08:00
RuoYi
e259093e01 文件上传组件添加数量限制属性 2021-07-08 15:49:04 +08:00
RuoYi
e963a86b15 富文本编辑组件添加类型属性 2021-07-08 15:48:11 +08:00
RuoYi
e447fb806b FileUpload组件支持多文件上传 2021-07-08 12:36:02 +08:00
疯狂的狮子li
59114a14ff update 同步 ruoyi 对新业务进行修正 2021-07-06 13:05:47 +08:00
疯狂的狮子li
aa14085746 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/api/system/role.js
	ruoyi-ui/src/api/system/user.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-07-06 12:01:05 +08:00
疯狂的狮子li
2fc3dcfc74 update 更改演示案例 2021-07-05 16:35:15 +08:00
RuoYi
90c41d498c 角色管理新增分配用户功能 2021-07-05 14:54:09 +08:00
RuoYi
ce6bea4ba0 限制超级管理员不允许操作 2021-07-05 09:57:15 +08:00
RuoYi
9c7901f526 用户管理新增分配角色功能 2021-07-01 18:01:36 +08:00
疯狂的狮子li
efd1fc017b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-ui/vue.config.js
 2021-06-28 13:52:19 +08:00
RuoYi
04f5a93aa8 升级pagehelper到最新版1.3.1 2021-06-25 17:25:49 +08:00
疯狂的狮子li
8195e948a1 发布 v2.4.0 2021-06-24 09:34:06 +08:00
疯狂的狮子li
d05458aa3a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
 2021-06-23 09:38:53 +08:00
RuoYi
1ed60c79c0 用户信息长度校验限制 2021-06-22 20:45:19 +08:00
RuoYi
aee1e53140 全局挂载字典标签组件 2021-06-22 20:44:40 +08:00
疯狂的狮子li
c822e2f6cc Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/views/monitor/druid/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
 2021-06-22 16:56:38 +08:00
Ricky
253e2b2de1 增加字典标签样式回显 2021-06-22 14:24:26 +08:00
Ricky
b1413f021e 增加字典标签样式回显 2021-06-22 14:04:14 +08:00
疯狂的狮子li
ff5edc44ed update 注释主子表选项 不推荐使用 2021-06-21 12:52:21 +08:00
RuoYi
3f05ed6ffa 封装iframe组件 2021-06-17 20:17:42 +08:00
疯狂的狮子li
44bbe8b307 update 同步更新 ruoyi 适配新功能 2021-06-17 19:22:49 +08:00
疯狂的狮子li
a8c1d02ee1 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/.env.development
	ruoyi-ui/.env.production
	ruoyi-ui/.env.staging
	ruoyi-ui/package.json
	ruoyi-ui/src/App.vue
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/Pagination/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/vue.config.js
 2021-06-17 18:15:34 +08:00
疯狂的狮子li
7dd18c75b0 update 更新 jackson 相关文档 2021-06-17 12:43:00 +08:00
RuoYi
090ad5323a 日志列表支持排序操作 2021-06-17 12:30:43 +08:00
RuoYi
7601a72faf 升级element-ui到最新版本2.15.2 2021-06-15 10:26:19 +08:00
疯狂的狮子li
5311937b69 update 增加 jackson 配置 默认序列化时间格式 2021-06-12 23:41:56 +08:00
疯狂的狮子li
bf3a88ff1a 发版 v2.3.2 2021-06-11 09:23:34 +08:00
RuoYi
ea66e20282 修复用户搜索分页变量错误 2021-06-10 22:36:22 +08:00
RuoYi
a209b39552 分页组件新增pagerCount属性 2021-06-10 22:29:13 +08:00
RuoYi
557672ba9f 系统布局配置支持动态标题开关 2021-06-10 18:05:27 +08:00
疯狂的狮子li
c5c8afe147 update 还原错误提交 2021-06-10 15:44:14 +08:00
疯狂的狮子li
9d05d2bac5 remove 移除无用配置文件 2021-06-10 15:42:46 +08:00
疯狂的狮子li
2103731f10 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/Navbar.vue
	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/tool/gen/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
 2021-06-10 09:44:56 +08:00
RuoYi
c16ee7fc2c 升级swagger到最新版本v3.0.0 2021-06-08 16:34:36 +08:00
疯狂的狮子li
450c6759eb 发布 2.3.1 2021-06-04 16:11:17 +08:00
RuoYi
b7446f8d0f 富文本工具栏配置视频 2021-06-03 13:26:09 +08:00
RuoYi
19924cd184 修复关闭confirm提示框控制台报错问题 2021-06-03 13:24:29 +08:00
疯狂的狮子li
01c34b837d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/views/system/menu/index.vue
 2021-06-03 09:46:33 +08:00
RuoYi
85470a1549 修复表单构建选择下拉选择控制台报错问题 2021-06-02 20:43:34 +08:00
kdyzm
6b789e2eb0 优化新增、修改页面的按钮动作loading从页面loading到按钮loading 2021-06-02 18:13:34 +08:00
疯狂的狮子li
329c95196e update 更新测试案例 2021-06-02 17:15:20 +08:00
疯狂的狮子li
d9dd76f2ae 发布 v2.3.0 2021-06-01 10:54:59 +08:00
疯狂的狮子li
d815317d7c 发布 v2.3.0 2021-06-01 10:21:56 +08:00
xx2yy
01fef0b9e1 同步菜单新增、修改界面“功能权限”maxlength为100（保持与数据库字段长度一致），避免因超过50后不能录入问题 2021-05-31 10:31:50 +08:00
疯狂的狮子li
a02aeb468e add 增加demo模块 树表演示案例(包含数据权限) 2021-05-30 02:25:14 +08:00
疯狂的狮子li
a3a682eeb1 add 增加demo模块 单表演示案例(包含数据权限) 2021-05-30 02:24:10 +08:00
疯狂的狮子li
06513446a0 update 还原数据权限修改 2021-05-29 19:44:33 +08:00
疯狂的狮子li
57e071fe6b 发布 2.2.1 2021-05-29 18:57:56 +08:00
疯狂的狮子li
d0b2166525 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
 2021-05-28 10:07:15 +08:00
RuoYi
af9cfb40a4 优化参数&字典缓存操作 2021-05-27 17:38:44 +08:00
疯狂的狮子li
a570589dcc 发布 v2.2.0 2021-05-25 14:11:32 +08:00
朱杰
5dc873209e add 增加验证码开关 2021-05-25 14:02:34 +08:00
疯狂的狮子li
5795958a18 update 同步升级 ruoyi-vue 3.5.0 2021-05-25 10:14:18 +08:00
疯狂的狮子li
6c195af2a3 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-generator/pom.xml
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-quartz/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
	ruoyi-system/pom.xml
	ruoyi-ui/package.json
	ruoyi-ui/public/index.html
	ruoyi-ui/src/views/index.vue
	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/config/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/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
 2021-05-25 10:00:36 +08:00
RuoYi
5e64a93d11 若依 3.5.0 2021-05-25 09:37:55 +08:00
RuoYi
883cff5de9 新增IE浏览器版本过低提示页面 2021-05-24 14:15:41 +08:00
疯狂的狮子li
dc7eeaa45d 发布 2.1.2 2021-05-21 17:57:13 +08:00
疯狂的狮子li
7076deb2b6 update 请求响应对象 与 分页对象 结构修改 适配接口文档配置 2021-05-20 13:23:12 +08:00
疯狂的狮子li
72de8f57a7 发布 v2.1.1 2021-05-18 11:37:24 +08:00
RuoYi
b431703262 导出按钮点击之后添加遮罩 2021-05-17 15:37:58 +08:00
疯狂的狮子li
b366f8b053 update 修正更新说明错误 2021-05-15 14:55:21 +08:00
疯狂的狮子li
b885e1eeff 发布 v2.1.0 2021-05-15 14:33:53 +08:00
疯狂的狮子li
b5064021e6 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:23:43 +08:00
疯狂的狮子li
e071b4315a 正式发布 v2.0.0 2021-05-14 21:07:20 +08:00
疯狂的狮子li
d2c745d3fd add 代码生成器 增加校验注解 2021-05-14 15:12:40 +08:00
疯狂的狮子li
6067cb1797 add 增加增强Mapper 重写业务适配 2021-05-14 13:01:18 +08:00
疯狂的狮子li
685504e1d0 版本更新 v1.0.2 2021-05-13 09:20:02 +08:00
疯狂的狮子li
3b73bbe0ac 版本更新 v1.0.1 2021-05-11 17:36:52 +08:00
疯狂的狮子li
c33c3de43a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	README.md
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/views/index.vue
 2021-05-11 17:14:53 +08:00
疯狂的狮子li
98624e66e5 正式发布 1.0.0 2021-05-10 15:34:17 +08:00
RuoYi
50034301ac 添加新群号：201396349 2021-05-06 20:40:25 +08:00
leizhuogogo
3f1427eef9 update ruoyi-ui/src/assets/styles/element-ui.scss. 2021-05-06 17:50:28 +08:00
疯狂的狮子li
4e723f4936 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
 2021-04-25 09:27:07 +08:00
疯狂的狮子li
5fcef39a2e add 集成 spring-boot-admin 全方位监控 2021-04-22 15:04:35 +08:00
RuoYi
62081aebb9 修复开启TopNav后，左侧打开外链问题 2021-04-21 16:34:44 +08:00
疯狂的狮子li
97873a7b2b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/store/modules/settings.js
 2021-04-19 17:43:32 +08:00
RuoYi
2575c17f47 主题颜色保存配置 2021-04-19 16:59:56 +08:00
RuoYi
e60a69b670 兼容顶部栏一级菜单内部跳转 2021-04-18 18:33:13 +08:00
疯狂的狮子li
f093da99ec Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/monitor/druid/index.vue
 2021-04-14 13:22:31 +08:00
RuoYi
cc50224d90 固定顶部导航栏&窗口大小改变实时更新栏数 2021-04-14 11:01:16 +08:00
RuoYi
ff09e1cf55 数据监控默认地址修改 2021-04-13 18:15:11 +08:00
RuoYi
fe2ccbdc1b 优化代码生成导出模板名称 2021-04-13 14:49:42 +08:00
RuoYi
c8df1f5e1f 布局设置支持保存&重置配置 2021-04-13 09:47:28 +08:00
RuoYi
e71c00e6fa 富文本编辑器支持自定义上传地址 2021-04-13 09:38:32 +08:00
若依
f13b6d92d2 !205 富文本编辑器自定义上传地址 
Merge pull request !205 from hechieh/N/A
 2021-04-13 09:36:42 +08:00
RuoYi
9aac65ff32 新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单） 2021-04-12 09:54:08 +08:00
RuoYi
5f2350569a 页签新增关闭右侧 2021-04-10 21:15:45 +08:00
hechieh
ccf05b697d 富文本编辑器自定义上传地址 2021-04-10 17:08:49 +08:00
RuoYi
6810243ab7 修复树表数据显示不全&加载慢问题 2021-04-09 08:31:13 +08:00
疯狂的狮子li
8b37eca241 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/zipdownload.js
 2021-04-08 17:12:13 +08:00
RuoYi
b56b8846d9 修改主题后mini类型按钮无效问题 2021-04-08 13:54:48 +08:00
RuoYi
8e1e4cd8fe 通用下载完成后删除节点 2021-04-08 13:46:22 +08:00
疯狂的狮子li
b16fe5e263 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/tool/build/index.vue
 2021-03-31 16:49:45 +08:00
RuoYi
30f330f4a0 修复firefox下表单构建拖拽会新打卡一个选项卡 2021-03-30 17:45:35 +08:00
疯狂的狮子li
06e9feadee Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
 2021-03-26 14:07:53 +08:00
RuoYi
090e258bf9 显隐列初始默认隐藏列 2021-03-24 15:46:37 +08:00
若依
505fa06dc3 !192 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 
Merge pull request !192 from 谢凯/N/A
 2021-03-24 15:32:24 +08:00
谢凯
881dc3fcf0 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 2021-03-22 17:52:34 +08:00
allworldg
b65c8d4512 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 2021-03-21 21:20:23 +08:00
疯狂的狮子li
63a582404b update swagger 模板修改为 swagger-bootstrap-ui 2021-03-15 17:51:00 +08:00
疯狂的狮子li
5494ec36e5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
 2021-03-09 09:32:49 +08:00
RuoYi
61432480c8 删除多余的代码 2021-03-07 11:06:47 +08:00
若依
78deee063d !180 富文本编辑组件支持只读 
Merge pull request !180 from JOSWAY/master
 2021-03-07 10:44:04 +08:00
若依
616f5a6aca !185 update ruoyi-ui/src/views/monitor/logininfor/index.vue. 
Merge pull request !185 from asher/N/A
 2021-03-07 10:39:30 +08:00
asher
f938a24df0 update ruoyi-ui/src/views/monitor/logininfor/index.vue. 2021-03-04 17:00:07 +08:00
asher
45fa686a64 update ruoyi-ui/src/views/monitor/operlog/index.vue. 2021-03-04 16:58:18 +08:00
疯狂的狮子li
0638f3c1fe Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
	ruoyi-ui/src/views/index.vue
 2021-02-28 14:39:53 +08:00
RuoYi
64e807f27b 添加新群号：186866453 2021-02-24 13:45:24 +08:00
Josway
339b932a3d 富文本编辑组件支持只读 2021-02-22 17:49:17 +08:00
疯狂的狮子li
ac99fddfe6 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/views/index.vue
 2021-02-22 10:04:43 +08:00
RuoYi
0b5c7f4c96 若依 3.4.0 2021-02-22 09:40:28 +08:00
疯狂的狮子li
2c40a892f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/role/index.vue
 2021-02-07 09:18:17 +08:00
RuoYi
3a51c53823 角色非自定义权限范围清空选择值 2021-02-06 10:34:12 +08:00
RuoYi
df504c5c14 修复四级菜单无法显示问题 2021-02-06 09:29:50 +08:00
疯狂的狮子li
6f0dfa850a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/role/index.vue
 2021-02-03 13:38:43 +08:00
RuoYi
baeed2e8d3 修复角色管理-编辑角色-功能权限显示异常 2021-02-02 16:25:37 +08:00
疯狂的狮子li
2925f28255 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
 2021-01-25 09:54:49 +08:00
RuoYi
2903de1561 升级element-ui到最新版本2.15.0 2021-01-24 12:06:19 +08:00
疯狂的狮子li
684eadbcc6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.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/java/com/ruoyi/generator/util/VelocityInitializer.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/domain.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210108.sql
 2021-01-11 09:58:41 +08:00
RuoYi
14a859899c 代码生成模板支持主子表 2021-01-08 10:47:36 +08:00
RuoYi
7d0eb3b8c7 用户显隐列添加不同key防止被复用 2021-01-07 13:28:16 +08:00
RuoYi
654aa6b30c 表格右侧工具栏组件支持显隐列 2021-01-06 17:30:39 +08:00
疯狂的狮子li
b368745380 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-01-06 09:35:00 +08:00
RuoYi
edd090a098 代码生成支持文件上传组件 2021-01-05 20:59:14 +08:00
RuoYi
3cd886785b 图片组件添加预览功能 2021-01-05 20:33:41 +08:00
RuoYi
ae5a0f9774 新增文件上传组件 2021-01-05 20:11:09 +08:00
RuoYi
a118738d0f 单图上传组件添加移除 2021-01-05 16:13:22 +08:00
RuoYi
56fa3912ae 修复IE11浏览器报错问题 2021-01-05 09:44:08 +08:00
疯狂的狮子li
d73994f05d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/views/login.vue
	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/tool/gen/index.vue
 2021-01-05 09:22:36 +08:00
RuoYi
2116ee1822 Update copyright 2021-01-04 17:49:52 +08:00
RuoYi
57a2eb4217 操作按钮组调整为朴素按钮样式 2021-01-04 17:48:46 +08:00
疯狂的狮子li
c24b912b50 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/store/modules/permission.js
 2020-12-25 09:59:24 +08:00
RuoYi
a9c6ba12e6 代码生成日期控件区分范围 2020-12-25 09:35:20 +08:00
RuoYi
ba068eae65 修正侧边栏静态路由丢失问题 2020-12-24 19:32:18 +08:00
疯狂的狮子li
476df3117b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/utils/permission.js
	ruoyi-ui/src/utils/request.js
 2020-12-24 10:04:54 +08:00
若依
1a87ee7c19 防止get请求参数值为false或0等特殊值会导致无法正确的传参 
Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
 2020-12-22 16:19:51 +08:00
DokiYoloo
3c4b01ab83 权限工具类增加admin判断 2020-12-21 19:43:57 +08:00
wugh
886ce995af [bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参 2020-12-21 11:58:15 +08:00
疯狂的狮子li
78ef398257 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/src/store/modules/permission.js
 2020-12-21 11:55:32 +08:00
RuoYi
52264b6e2a 优化多级菜单之间切换无法缓存的问题 2020-12-21 10:50:48 +08:00
疯狂的狮子li
6c8497f632 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Breadcrumb/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-12-18 09:45:54 +08:00
RuoYi
c86dc20743 移除path-to-regexp正则匹配插件 2020-12-17 12:05:29 +08:00
RuoYi
ecc7a8be46 优化多级菜单之间切换无法缓存的问题 2020-12-16 20:57:48 +08:00
疯狂的狮子li
1249c7ca26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/views/login.vue
 2020-12-15 10:25:00 +08:00
RuoYi
4f33da2a3f 登录后push添加catch防止出现检查错误 2020-12-15 10:04:09 +08:00
疯狂的狮子li
7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2020-12-14 09:27:27 +08:00
RuoYi
8988d0b4ab 若依 3.3.0 2020-12-14 09:02:10 +08:00
RuoYi
ceefa20aa2 调整代码生成页列宽 2020-12-13 16:05:49 +08:00
RuoYi
ecfe7006e2 代码生成预览支持高亮显示 2020-12-11 17:04:54 +08:00
疯狂的狮子li
f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.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/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
 2020-12-11 14:27:54 +08:00
RuoYi
9e387dc447 去除用户手机邮箱部门必填验证 2020-12-11 13:26:14 +08:00
RuoYi
d6eac2dc8d 前端更新插件版本 2020-12-11 09:27:12 +08:00
RuoYi
b368ad764f 升级core-js到最新版本3.8.1 2020-12-10 12:08:18 +08:00
RuoYi
ffd5f0ce5d 升级vue-router到最新版本3.4.9 2020-12-10 11:14:44 +08:00
RuoYi
a50beae599 代码生成预览提供滚动机制 2020-12-10 11:13:39 +08:00
RuoYi
4d46f4c1b5 删除用户和角色解绑关联 2020-12-09 10:32:53 +08:00
〝走走停停
d6b6151aea update ruoyi-ui/src/assets/styles/ruoyi.scss. 2020-12-08 17:49:51 +08:00
RuoYi
fbc071a573 关闭页签清理缓存数据 2020-12-08 16:43:26 +08:00
RuoYi
6cfff90b4a 缓存仪表图设置默认大小 2020-12-08 16:13:21 +08:00
RuoYi
f90899d72a 支持主题风格配置 2020-12-07 14:13:02 +08:00
疯狂的狮子li
69f30760f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
 2020-12-07 12:59:35 +08:00
RuoYi
7e78a9167f 修改用户头像预览宽高 2020-12-06 16:22:45 +08:00
RuoYi
563e11d9c1 get请求params添加null值判断 2020-12-06 11:05:02 +08:00
疯狂的狮子li
e80349c343 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/utils/request.js
 2020-12-04 11:46:29 +08:00
RuoYi
ef92ad4d8c 支持get请求映射params参数 2020-12-04 10:52:20 +08:00
疯狂的狮子li
5ebd0a971f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-12-03 11:20:50 +08:00
RuoYi
23868c4fad 防止安全扫描YUI出现的风险提示 2020-12-03 10:26:22 +08:00
疯狂的狮子li
b36b413a69 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-12-01 09:23:55 +08:00
RuoYi
3b2669d148 修改缓存监控内存单位 2020-11-30 19:27:03 +08:00
疯狂的狮子li
ce438f182a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	sql/ry_20201128.sql
 2020-11-30 12:41:39 +08:00
RuoYi
1147ea5f8a 设置用户头像悬停高度 2020-11-30 11:10:27 +08:00
RuoYi
a1bf5aaf8e 升级element-ui版本到2.14.1 2020-11-30 10:37:48 +08:00
RuoYi
a69cc94f35 三级菜单自动配置组件 2020-11-28 20:39:03 +08:00
RuoYi
c666faed66 修复三级菜单之间切换页面无法缓存的问题 2020-11-28 20:31:45 +08:00
RuoYi
6072239a40 修改缓存监控内存单位 2020-11-28 13:57:19 +08:00
疯狂的狮子li
20d7c90515 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	sql/ry_20201123.sql
 2020-11-24 10:03:59 +08:00
RuoYi
90ac416e02 新增缓存监控功能 2020-11-23 10:02:50 +08:00
RuoYi
5b63f0cab9 优化头像样式，鼠标移入悬停遮罩 2020-11-19 09:33:10 +08:00
疯狂的狮子li
ff563c44e2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-11-18 10:41:13 +08:00
RuoYi
8f145bba3a 若依 v3.2.1 2020-11-18 09:32:15 +08:00
RuoYi
823e95667e 代码生成支持上传控件 2020-11-16 16:20:17 +08:00
RuoYi
566053da0c 新增图片上传组件 2020-11-16 15:52:58 +08:00
疯狂的狮子li
60dda6c7eb Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/index.vue
 2020-11-12 09:24:40 +08:00
RuoYi
0ef007240d 调整默认首页 2020-11-07 10:38:35 +08:00
疯狂的狮子li
efb938c370 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2020-11-03 09:56:18 +08:00
FlyFive
212012dc62 未选择时，点击“确认”，出现必填验证提示。使用blur的话，选择之后验证消息不会自动消失，使用change会自动消失。 2020-11-02 11:49:25 +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
FlyFive
2b9d46439f update ruoyi-ui/src/views/system/dept/index.vue. 
验证的提示信息错了
 2020-10-26 16:31:51 +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
c9f25cb34e 调整sql默认时间 2020-10-21 11:30:37 +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
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
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
若依
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
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
shizhenwei
5b0525d05c [修改]此工具类应使用参数dateRange而非bind在model上的dateRange 2020-09-27 13:22:23 +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
疯狂的狮子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
69829827fe 菜单&数据权限新增（展开/折叠 全选/全不选 父子联动） 2020-09-21 14:10:01 +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
9e38c7de2e 代码生成支持同步数据库 2020-09-18 10:24:21 +08:00
RuoYi
9ca28d6dbf 表格操作列间距调整 2020-09-18 10:23:31 +08:00
疯狂的狮子li
b111cbeedd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-09-16 09:23:02 +08:00
RuoYi
a948affb2d 代码生成支持富文本控件 2020-09-15 15:53:27 +08:00
疯狂的狮子li
06c4d4d01b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/router/index.js
 2020-09-11 09:17:43 +08:00
RuoYi
70ab18052c 富文本工具栏样式对齐 2020-09-10 16:56:33 +08:00
RuoYi
aeb02c79d8 修正注释图标路径 2020-09-10 16:53:58 +08:00
疯狂的狮子li
ef95cec77f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-ui/src/components/Editor/index.vue
 2020-09-07 11:31:40 +08:00
HaoRan
a65c287075 修复Editor组件无法对响应式更新null值问题 2020-08-31 02:10:01 +08:00
疯狂的狮子li
184bb04bc2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	sql/ry_20200822.sql
 2020-08-24 10:26:44 +08:00
RuoYi
fa5596bb20 Editor组件优化，支持自定义高度&图片冲突问题 2020-08-22 13:18:41 +08:00
疯狂的狮子li
5aeac1a8ae Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/utils/ruoyi.js
 2020-08-19 17:01:43 +08:00
RuoYi
5fcf342f5a 修改sass为node-sass，避免el-icon图标乱码 2020-08-18 17:36:20 +08:00
若依
c6912ca1d5 !64 修改sass为node-sass，避免el-icon图标乱码 
Merge pull request !64 from 心悦李国楠/dev-心悦
 2020-08-18 17:27:19 +08:00
若依
5c4f0c5503 !65 根节点为子部门时，树状结构显示问题 
Merge pull request !65 from GSTong/master
 2020-08-18 17:21:51 +08:00
疯狂的狮子li
def4377226 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/utils/ruoyi.js
 2020-08-17 12:57:06 +08:00
RuoYi
d596d5bb8e 还原 addDateRange js 函数 2020-08-13 12:08:24 +08:00
疯狂的狮子li
088bc98a43 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
 2020-08-13 11:24:04 +08:00
RuoYi
8f9f0c04cc 若依 3.1 2020-08-13 10:27:56 +08:00
RuoYi
1bad003fe3 修改公私钥 2020-08-12 11:55:26 +08:00
疯狂的狮子li
3aaff7b776 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/main.js
	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/tool/gen/index.vue
 2020-08-12 10:16:29 +08:00
gst
0070297fe1 根节点为子部门时，树状结构显示问题 2020-08-11 10:59:02 +08:00
liguonan
650359c357 修改sass为node-sass，避免el-icon图标乱码 2020-08-10 16:28:50 +08:00
RuoYi
74f52677be 表格右侧工具栏组件 2020-08-10 10:12:39 +08:00
疯狂的狮子li
4044ed23ea Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-ui/src/components/Editor/index.vue
 2020-08-10 09:38:28 +08:00
平凡
5b04f388e9 重写表格工具栏右侧添加刷新&显隐查询栏 2020-08-09 11:07:10 +08:00
RuoYi
d0b315f4a5 删除重复的placeholder 2020-08-07 16:03:45 +08:00
RuoYi
7c39f92538 修复富文本空格和缩进保存后不生效问题 2020-08-07 12:26:15 +08:00
疯狂的狮子li
a9f4a4e111 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	.gitignore
	ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/utils/ruoyi.js
 2020-08-07 09:22:36 +08:00
RuoYi
3b61ed56b0 添加获取当前的环境配置方法 2020-08-05 12:56:32 +08:00
fungleo
d78f642201 Merge remote-tracking branch 'upstream/master' 2020-08-05 10:26:05 +08:00
fungleo
26dfee2ce8 彻底重写回显数据字典方法 2020-08-05 10:24:54 +08:00
RuoYi
b56898858d 超时登录后页面跳转到首页 2020-08-05 10:04:43 +08:00
疯狂的狮子li
c7785d1dbc Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-ui/src/utils/request.js
 2020-08-05 09:42:03 +08:00
fungleo
503dd64e3f 优化 addDateRange js 函数 2020-08-04 14:32:29 +08:00
fungleo
876ecf21c7 优化构建树形数据JS方法 2020-08-04 14:11:02 +08:00
fungleo
107672419e Merge remote-tracking branch 'upstream/master' 2020-08-04 11:59:42 +08:00
fungleo
d8d636fdbd 优化 回显数据字典（字符串数组）JS 函数 2020-08-04 11:39:43 +08:00
RuoYi
8b5d254242 全局异常状态汉化拦截处理 2020-08-03 09:11:49 +08:00
疯狂的狮子li
c966d9bada Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.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/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/babel.config.js
	ruoyi-ui/package.json
	ruoyi-ui/src/api/tool/gen.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/login.vue
	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/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
	sql/ry_20200724.sql
 2020-08-02 18:31:47 +08:00
RuoYi
4dcf737db0 表格工具栏右侧添加刷新&显隐查询栏 2020-08-01 15:45:38 +08:00
RuoYi
b32d0724b7 升级vue-cli版本到4.4.4 2020-07-31 22:35:30 +08:00
abbfun
f3976c0792 update ruoyi-ui/src/views/system/role/index.vue. 
权限修正（角色导出权限）
 2020-07-29 21:16:53 +08:00
RuoYi
fe030cc022 修改 node-sass 为 dart-sass 2020-07-27 16:55:51 +08:00
RuoYi
6e7d7aba93 代码生成支持自定义路径 2020-07-24 15:37:57 +08:00
RuoYi
5c6adb25fc 代码生成支持复选框 2020-07-23 17:02:55 +08:00
RuoYi
df3ef54b41 验证码类型支持（数组计算、字符验证） 2020-07-23 11:17:04 +08:00
疯狂的狮子li
e19e2fd9cc Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-ui/src/utils/index.js
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
 2020-07-23 09:54:57 +08:00
若依
133a10ecf2 !47 修复和优化前端 utils 工具函数 
Merge pull request !47 from FungLeo/master
 2020-07-22 13:00:51 +08:00
RuoYi
b2d79b62d1 代码生成支持选择上级菜单 2020-07-21 11:21:20 +08:00
fungleo
a09a342f58 优化 uitls/ruoyi.js 中 selectDictLabel 方法，数组迭代器换为 some 
提高性能
 2020-07-21 10:22:07 +08:00
fungleo
3e1bd8e3bc 修复 utils/index.js 中不包含 parseTime 函数的 bug 2020-07-21 10:18:56 +08:00
疯狂的狮子li
6f47310c24 同步升级3.0 端口提交错误 改回8080 2020-07-20 10:47:00 +08:00
疯狂的狮子li
1e79d6f56f 同步升级3.0 2020-07-20 10:41:32 +08:00
RuoYi
cee572f237 若依 3.0 2020-07-19 10:25:40 +08:00
RuoYi
d5cc95fefb 升级element-ui版本到2.13.2 2020-07-17 16:56:03 +08:00
疯狂的狮子li
a53a3b3119 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
 2020-07-17 16:43:47 +08:00
RuoYi
d29fe10b93 删除babel，提高编译速度。 2020-07-17 16:20:31 +08:00
RuoYi
086b9cdc23 新增菜单默认主类目 2020-07-17 15:19:06 +08:00
疯狂的狮子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
 2020-07-13 09:27:49 +08:00
若依
dd7a9850e3 !39 角色权限修改时已有权限未自动勾选异常修复 
Merge pull request !39 from 严俊东/N/A
 2020-07-10 18:28:20 +08:00
RuoYi
a691da0c97 防止切换权限用户后登录出现404 2020-07-10 16:36:25 +08:00
严俊东
d04ec69df4 角色权限修改时已有权限未自动勾选异常修复 2020-07-10 12:52:45 +08:00
疯狂的狮子li
eef65b449d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/README.md
	ruoyi/src/main/resources/application.yml
 2020-07-06 09:16:44 +08:00
RuoYi
1e2a2026c6 修改文件编码格式 2020-07-04 16:04:30 +08:00
疯狂的狮子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
 2020-06-29 09:08:18 +08:00
RuoYi
7a9564ced5 修复代码生成点击多次表修改数据不变化的问题 2020-06-24 17:17:22 +08:00
RuoYi
5d5f955a34 修复头像上传成功二次打开无法改变裁剪框大小和位置问题 2020-06-24 15:59:18 +08:00
RuoYi
eac9403ea4 修复布局为small者mini用户表单显示错位问题 2020-06-24 15:21:39 +08:00
疯狂的狮子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
 2020-06-21 10:06:26 +08:00
abbfun
f6de03a009 update ruoyi-ui/src/views/monitor/job/log.vue. 
data对象中属性【表单参数form】重复
 2020-06-19 10:00:41 +08:00
疯狂的狮子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
 2020-06-18 15:13:40 +08:00
RuoYi
a195df175f 修正定时任务日志权限字符 2020-06-18 15:07:56 +08:00
疯狂的狮子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
 2020-06-12 15:14:19 +08:00
RuoYi
48ba7d5ed6 修改用户管理复选框宽度，防止部分浏览器出现省略号 2020-06-12 13:45:27 +08:00
Live
a2d1160205 add ruoyi-ui/public/robots.txt. 
项目添加robots.txt 防止后台管理系统被搜索引擎收录
 2020-06-09 11:38:16 +08:00
Live
0c069a57cc 项目添加robots.txt 防止后台管理系统被搜索引擎收录 2020-06-09 11:37:39 +08:00
疯狂的狮子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
 2020-06-08 12:01:19 +08:00
RuoYi
7afc5acc6f 定时任务调整label-width，防止部署出现错位 2020-06-07 17:52:14 +08:00
RuoYi
8a7f33807b 调整表头固定列默认样式 2020-06-07 17:20:35 +08:00
Elune
ef5adf2e2a update ruoyi-ui/src/permission.js. 
修复退出登录重定向到登录页，登录后参数丢失。/article?id=6

https://github.com/elunez/eladmin-web/pull/94
 2020-06-04 14:53:24 +08:00
RuoYi
4cb4de86db 修复首页搜索菜单外链无法点击跳转问题 2020-06-04 09:48:05 +08:00
RuoYi
c861b78f80 修复菜单管理选择图标，backspace删除时不过滤数据 2020-06-03 17:59:32 +08:00
RuoYi
5123832cd7 用户管理部门分支节点不可检查&显示计数 2020-06-03 16:53:17 +08:00
疯狂的狮子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
 2020-06-01 13:34:08 +08:00
RuoYi
b4b3ff8813 若依 2.3 2020-06-01 10:49:36 +08:00
RuoYi
d48475c585 dev启动默认打开浏览器 2020-05-31 09:56:11 +08:00
RuoYi
f26f90fa23 使用vue-cli默认source-map 2020-05-30 15:08:36 +08:00
RuoYi
8a61b9fe99 slidebar eslint报错优化 2020-05-30 15:04:11 +08:00
RuoYi
bb5520a7d1 当tags-view滚动关闭右键菜单 2020-05-30 14:54:58 +08:00
RuoYi
1e2058bdfb 字典管理添加缓存读取 2020-05-30 14:29:19 +08:00
RuoYi
0d546e4ba4 参数管理支持缓存操作 2020-05-30 13:46:31 +08:00
RuoYi
b16b860b63 侧边栏key调整 2020-05-30 12:13:12 +08:00
疯狂的狮子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
 2020-05-27 09:05:31 +08:00
RuoYi
b5c789a267 防止空路由出现的警告，设置默认path=/ 2020-05-26 18:22:53 +08:00
RuoYi
bb1324a70a 支持一级菜单（和主页同级）在main区域显示 2020-05-26 14:33:45 +08:00
北风
98bb78a9d6 调整空格同步格式 2020-05-22 19:06:37 +08:00
北风
ff0749984d tagview & sidebar 主题颜色与element ui(全局)同步 2020-05-22 19:02:38 +08:00
疯狂的狮子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
 2020-05-20 09:15:19 +08:00
RuoYi
25b114aae7 支持是否需要设置token属性，自定义返回码消息。 2020-05-18 14:27:15 +08:00
RuoYi
922f61e05b 登录地点设置内容过长则隐藏显示 2020-05-17 15:53:45 +08:00
RuoYi
9aeb0cc1f3 修复定时任务执行一次按钮后不提示消息问题 2020-05-17 15:47:29 +08:00
RuoYi
9f4918cc14 修改上级部门（选择项排除本身和下级） 2020-05-16 18:39:30 +08:00
疯狂的狮子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
 2020-05-07 17:44:08 +08:00
RuoYi
9d0309489c 修复页签变量undefined 2020-05-07 12:28:59 +08:00
疯狂的狮子li
b15be7078c 同步ruoyi-vue更新 2020-05-06 11:57:51 +08:00
RuoYi
a34edef603 vuex用户名取值修正 2020-04-29 15:02:17 +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
8448b2b993 代码生成序号修正 2020-04-21 18:31:11 +08:00
RuoYi
b5cacd5a3c 全屏情况下不调整上外边距 2020-04-21 17:28:39 +08:00
RuoYi
da5c1328be 修复路由懒加载报错问题 2020-04-21 14:48:34 +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
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
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
441da7ecd7 添加handle控制允许拖动的元素 2020-04-01 12:21:48 +08:00
RuoYi
992a63482c 布局设置点击扩大范围 2020-04-01 11:35:58 +08:00