Commit Graph

48 Commits (406e337d30fab573ec039d5022c26d261e728835)

Author SHA1 Message Date
疯狂的狮子Li db46e5a8b0 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	README.md
	pom.xml
	ruoyi-api/pom.xml
	ruoyi-api/ruoyi-api-resource/pom.xml
	ruoyi-api/ruoyi-api-system/pom.xml
	ruoyi-auth/pom.xml
	ruoyi-common/pom.xml
	ruoyi-common/ruoyi-common-core/pom.xml
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
	ruoyi-common/ruoyi-common-log/pom.xml
	ruoyi-common/ruoyi-common-mybatis/pom.xml
	ruoyi-common/ruoyi-common-redis/pom.xml
	ruoyi-common/ruoyi-common-security/pom.xml
	ruoyi-common/ruoyi-common-swagger/pom.xml
	ruoyi-gateway/pom.xml
	ruoyi-modules/pom.xml
	ruoyi-modules/ruoyi-gen/pom.xml
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-modules/ruoyi-job/pom.xml
	ruoyi-modules/ruoyi-resource/pom.xml
	ruoyi-modules/ruoyi-system/pom.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-visual/pom.xml
	ruoyi-visual/ruoyi-monitor/pom.xml
2022-04-11 12:15:49 +08:00
RuoYi 0b6166663c 用户缓存信息添加部门ancestors祖级列表 2022-04-07 09:52:00 +08:00
疯狂的狮子Li 487f18a930 fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误 2022-03-23 22:17:05 +08:00
疯狂的狮子Li bb479c436a add 增加 短信登录 与 小程序登录 示例 2022-03-23 01:02:07 +08:00
疯狂的狮子li f60befce9c update 优化 查询条件与字段类型不匹配 可能出现问题 2022-03-16 18:08:32 +08:00
疯狂的狮子li e418c2efe4 update 重命名 菜单字段 query -> query_param 解决系统关键字问题 2022-03-11 13:40:01 +08:00
疯狂的狮子li 34da4a696b update 使用全局字段格式化处理 mysql关键字问题 去除不推荐使用的配置 2022-03-07 13:16:37 +08:00
疯狂的狮子li 1ec6263399 update 简化用户与角色功能 2022-03-04 13:36:13 +08:00
疯狂的狮子li 12acc1e7e6 update 简化查询菜单功能 2022-03-04 13:25:10 +08:00
疯狂的狮子li fe43c94810 update 简化查询角色功能 2022-03-04 13:23:11 +08:00
疯狂的狮子li 04a5001fc8 update 优化 部门修改子元素关系 使用批量更新 2022-03-04 13:21:07 +08:00
疯狂的狮子li a941caf3bd update 优化去除sql差异化 时间范围统一使用 between 处理 2022-03-03 11:28:53 +08:00
疯狂的狮子li 58981b5b3d update 简化查询菜单功能 2022-03-03 11:28:53 +08:00
疯狂的狮子li 901940b042 update 简化查询部门功能 2022-03-03 11:28:53 +08:00
RuoYi 9460acd91b 优化菜单关键字导致的插件报错问题 2022-02-22 19:44:24 +08:00
疯狂的狮子li 4827f9217b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/router/index.js
2022-02-14 14:55:55 +08:00
RuoYi dbca691746 优化代码 2022-02-12 14:23:11 +08:00
runphp 4191f5ca5c
Result type not match for select id="selectMenuListByRoleId" 2022-02-11 10:35:57 +00:00
疯狂的狮子li 5870045c35 fix 修复xml参数未对应问题 2022-02-09 15:30:12 +08:00
疯狂的狮子li e35767b9cf fix 修复xml参数未对应问题 2022-02-09 15:28:24 +08:00
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 2022-01-28 11:35:54 +00:00
疯狂的狮子li 0e9ec77392 add 整合 mybatis-plus 重写所有业务 2022-01-26 20:33:39 +08:00
疯狂的狮子li e3cd9e30c3 add 新增 集成 Xxl-Job 定时任务管理 2022-01-10 11:46:56 +08:00
RuoYi a8eba6949e 角色列表返回类型保持一致 2021-10-15 17:30:30 +08:00
RuoYi a58c430858 菜单管理支持配置路由参数 2021-09-08 10:04:23 +08:00
RuoYi 0e51d1e7b1 根据用户ID查询菜单条件加别名 2021-08-30 17:08:55 +08:00
RuoYi 67df97d5a7 修改时检查用户数据权限范围 2021-08-24 16:24:25 +08:00
RuoYi 0b0da91139 角色管理新增分配用户功能 2021-07-06 14:02:37 +08:00
RuoYi 41b7e62b02 优化部门父级启用状态 2021-06-11 10:49:26 +08:00
RuoYi af479c7838 修复两处存在SQL注入漏洞问题 2021-05-27 21:13:01 +08:00
RuoYi 89a9188dd4 用户&角色单条删除时使其逻辑删除 2021-04-08 22:18:18 +08:00
RuoYi 6d0b4f5d16 用户手机邮箱&菜单组件修改允许空字符串 2020-12-29 17:29:22 +08:00
RuoYi 10de0df04e 删除用户和角色解绑关联 2020-12-08 19:37:07 +08:00
RuoYi 6beb5cadb2 支持get请求映射params参数 2020-12-04 10:53:25 +08:00
RuoYi 2115edcfb4 菜单新增是否缓存keep-alive 2020-09-21 18:29:44 +08:00
RuoYi 8acb322d49 菜单&数据权限新增(展开/折叠 全选/全不选 父子联动) 2020-09-21 18:10:26 +08:00
RuoYi f4f89f9de6 代码生成支持同步数据库 2020-09-21 13:25:51 +08:00
RuoYi eda2ec10f4 修复通知公告longblob类型乱码问题 2020-09-13 12:06:59 +08:00
RuoYi 6704db8108 移除 OAuth2 改为 Redis 2020-09-01 13:31:00 +08:00
RuoYi 1305507bf4 终端设置新增明文安全码 2020-08-22 22:00:50 +08:00
RuoYi 8d99adceb2 唯一限制条件只返回单条数据 2020-08-07 17:32:33 +08:00
RuoYi f1bc33e80d 唯一限制条件只返回单条数据 2020-08-07 16:42:36 +08:00
RuoYi bf544deeaa 表格工具栏右侧添加刷新&显隐查询栏 2020-08-01 19:25:18 +08:00
RuoYi 3603582c88 若依 2.0 2020-06-10 11:31:13 +08:00
RuoYi 4301f2022b 数据范围过滤属性调整 2020-06-08 07:42:41 +08:00
RuoYi 5c51cbc07c 格式化代码 2020-06-04 15:46:24 +08:00
小驴 0edebc83a0 1、修复dict_sort不可update为0的问题;
2、查询返回增加dict_sort升序排序
2020-05-25 17:46:37 +08:00
RuoYi 3da7aea540 若依 1.0 2020-05-24 20:40:55 +08:00