341 Commits

Author	SHA1	Message	Date
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	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	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
疯狂的狮子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
若依	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	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
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
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	1e79d6f56f	同步升级3.0	2020-07-20 10:41:32 +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	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	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
疯狂的狮子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