wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,343 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

1343 Commits

Author SHA1 Message Date
疯狂的狮子li 8b88d91312 update README.md 2020-12-11 14:44:07 +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
若依 231bbf6928 !135 增加日志记录过滤对象类型（解决多文件场景报错） 
Merge pull request !135 from geruishi/master
 2020-12-11 13:24:03 +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
疯狂的狮子li 4e56f30381 修改 生成器controller模板缺导包 与 index页面兼容性 
Merge pull request !2 from dragonwzj/master
 2020-12-09 16:49:24 +08:00
wangzhijun fe39a7bc7b 模板controller导入；模板vue列表页当有查询条件时报错 2020-12-09 16:16:53 +08:00
葛瑞士 cf7f51a633 解决多文件上传Log报错 2020-12-09 16:05:09 +08:00
疯狂的狮子li 5109eb0e7e 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下 2020-12-09 13:37:04 +08:00
疯狂的狮子li 583738fa65 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下 2020-12-09 13:33:41 +08:00
RuoYi 4d46f4c1b5 删除用户和角色解绑关联 2020-12-09 10:32:53 +08:00
若依 a941c1b488 !134 修改 代码生成 预览无法左右滑动 
Merge pull request !134 from 〝走走停停/master
 2020-12-09 10:27:34 +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
疯狂的狮子li 5a62019cdd 更新 如何修改为Tomcat相关注释配置与说明 2020-12-08 16:21:30 +08:00
RuoYi 6cfff90b4a 缓存仪表图设置默认大小 2020-12-08 16:13:21 +08:00
RuoYi 474cca921e 回显数据字典防止空值报错 2020-12-08 16:12:00 +08:00
若依 1657e06be6 !132 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. 
Merge pull request !132 from abbfun/N/A
 2020-12-08 16:03:51 +08:00
abbfun c01eeb8521 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. 2020-12-08 11:11:34 +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
RuoYi d8b006c15f 升级bitwalker到最新版本1.21 2020-12-04 10:51:20 +08:00
RuoYi 0e2b97a886 升级poi到最新版本4.1.2 2020-12-03 13:28:04 +08:00
RuoYi 1c7a5faae8 Excel支持注解align对齐方式 2020-12-03 13:26:46 +08:00
疯狂的狮子li d2cef9c40d 新增 关于多数据源事务 2020-12-03 11:32:29 +08:00
疯狂的狮子li b346036cca 增加 多数据源事务描述 2020-12-03 11:30:48 +08:00
疯狂的狮子li 5ebd0a971f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-12-03 11:20:50 +08:00
疯狂的狮子li c50e058953 为所有MP插件增加官方链接 2020-12-03 11:15:54 +08:00
疯狂的狮子li a3dfa843af 增加 多数据源使用注意事项 2020-12-03 11:13:58 +08:00
RuoYi 23868c4fad 防止安全扫描YUI出现的风险提示 2020-12-03 10:26:22 +08:00
疯狂的狮子li 2afb109bff 增加 maven多环境配置注释 2020-12-01 11:53:55 +08:00
疯狂的狮子li f7f7557d4d 项目修改为 maven多环境配置 2020-12-01 11:44:29 +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 2797c1eb3a 修正转换字符串的目标字符集属性 2020-11-30 10:31:11 +08:00
若依 1791d7cf40 !126 update pom.xml. 
Merge pull request !126 from abbfun/N/A
 2020-11-30 10:07:08 +08:00
abbfun 01861f0aae update pom.xml. 2020-11-29 16:16:54 +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