105 Commits

Author	SHA1	Message	Date
疯狂的狮子li	599016a63a	update 同步ruoyi修正差异	2021-07-12 09:44: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
疯狂的狮子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
RuoYi	da1095e298	授权用户添加访问权限	2021-07-09 17:08:30 +08:00
疯狂的狮子li	61e2a60438	update 同步 ruoyi 对新业务进行修正	2021-07-06 13:19:53 +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
RuoYi	90c41d498c	角色管理新增分配用户功能	2021-07-05 14:54:09 +08:00
RuoYi	9c7901f526	用户管理新增分配角色功能	2021-07-01 18:01:36 +08:00
疯狂的狮子li	5647cf7a7e	update 规范maven写法	2021-07-01 10:42:24 +08:00
疯狂的狮子li	85ae3a9420	update 对相关代码改动 进行调整	2021-06-18 15:31:38 +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
RuoYi	7ab14ff293	定时任务屏蔽rmi远程调用	2021-06-15 10:26:02 +08:00
RuoYi	a3116cd27d	优化部门父级启用状态	2021-06-10 15:34:38 +08:00
朱杰	90063ad03c	update 修改框架中批量接口，改为原生mybatis执行foreach，改善性能	2021-05-31 17:37:34 +08:00
疯狂的狮子li	079dc12fe1	update 优化 system 模块 删除性能	2021-05-31 16:55:26 +08:00
疯狂的狮子li	6d5a0d8a7e	update 完美修复 数据权限功能(支持单表多表过滤)	2021-05-30 02:20:21 +08:00
疯狂的狮子li	0860934888	update 优化数据权限sql 解决MP apply注入附带 AND 语法问题	2021-05-29 21:52:15 +08:00
疯狂的狮子li	06513446a0	update 还原数据权限修改	2021-05-29 19:44:33 +08:00
疯狂的狮子li	8d761fa60c	update 优化数据权限sql 解决MP apply注入附带 AND 语法问题	2021-05-29 18:54:35 +08:00
疯狂的狮子li	b7bd67b4cb	update 优化数据权限sql 解决MP apply注入附带 AND 语法问题	2021-05-29 18:41:32 +08:00
疯狂的狮子li	7779cbca4d	update 优化参数&字典缓存操作	2021-05-28 10:30:11 +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
RuoYi	6fa3bfe051	修复两处存在SQL注入漏洞问题	2021-05-27 17:38:27 +08:00
疯狂的狮子li	d2f0ea6fa0	fix 修复sql符号错误	2021-05-26 09:23:56 +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
疯狂的狮子li	6067cb1797	add 增加增强Mapper 重写业务适配	2021-05-14 13:01:18 +08:00
疯狂的狮子li	9c95c93630	fix 修复系统配置表 sql符号错误问题	2021-05-13 22:44:30 +08:00
疯狂的狮子li	f01bb5966a	update 使用 MP 分页工具 重构业务	2021-05-13 21:25:51 +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
RuoYi	be5c19b764	树级结构更新子节点使用replaceFirst	2021-05-11 14:25:25 +08:00
疯狂的狮子li	98624e66e5	正式发布 1.0.0	2021-05-10 15:34:17 +08:00
疯狂的狮子li	a181c09786	fix 修复数据权限问题	2021-05-08 23:35:39 +08:00
疯狂的狮子li	0b6952d0fe	fix 日志时间sql符号转换问题	2021-05-08 17:05:18 +08:00
疯狂的狮子li	6ce4c93b3c	fix 日志时间sql符号转换问题	2021-05-08 16:55:50 +08:00
疯狂的狮子li	73db99398f	fix 部门权限问题	2021-04-28 15:58:08 +08:00
疯狂的狮子li	bc182f1392	fix 日志时间问题	2021-04-28 11:52:21 +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	1bef814c51	update 补全实体类 注入注解	2021-04-22 21:07:18 +08:00
RuoYi	3f07632cd4	修复一级菜单包屑显示重复问题	2021-04-21 15:14:36 +08:00
疯狂的狮子li	a1c44b4987	fix 表名上传错误	2021-04-16 11:30:51 +08:00
疯狂的狮子li	adeaa77864	update mp化	2021-04-14 12:01:26 +08:00
疯狂的狮子li	48d61a3cdf	update mp化	2021-04-14 11:19:46 +08:00
疯狂的狮子li	876a06a9cd	update mp化	2021-04-13 17:14:50 +08:00
疯狂的狮子li	20d40ea691	update mp化	2021-04-13 15:29:05 +08:00