Commit Graph

202 Commits (b59095b8975d515026dca8883fa20a088a798271)

Author SHA1 Message Date
疯狂的狮子Li b59095b897 update 用户头像上传限制只能为图片格式 2022-05-28 23:47:27 +08:00
疯狂的狮子Li 2f7f7c65da update 同步ruoyi最新修改 2022-05-28 22:22:15 +08:00
疯狂的狮子Li 4e0648171c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-common/ruoyi-common-core/pom.xml
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.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/FileTypeUtils.java
	ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
	ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.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/controller/SysProfileController.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	sql/ry_config_20220510.sql
2022-05-28 22:17:33 +08:00
疯狂的狮子li 4bbf58d56d fix 修复 登录未选部门报空问题 2022-05-27 09:34:59 +08:00
疯狂的狮子li e42b2963e3 fix 修复脱敏实现逻辑问题 2022-05-25 10:38:10 +08:00
RuoYi 1d1b9501b7 用户头像上传限制只能为图片格式 2022-05-22 19:16:52 +08:00
疯狂的狮子Li ceb1825316 reset 重置错误修改 2022-05-19 21:49:05 +08:00
疯狂的狮子Li f0af90dd3f fix 修复 菜单部分字段 类型与数据库不匹配问题 2022-05-19 21:30:18 +08:00
疯狂的狮子li 8fab5ac32d add 新增 startup trace 监控 2022-05-05 13:52:29 +08:00
疯狂的狮子li 5fbdeb1646 fix 修复 查询未分配用户角色列表 角色无绑定用户情况下 空列表问题 2022-04-28 10:16:26 +08:00
shawn 9da3b34b9c 简化返回值逻辑判断 2022-04-20 21:37:59 +08:00
疯狂的狮子Li 73eb9cc7d7 update 修改角色适配 采用 get set 转换数据类型 2022-03-30 11:48:31 +08:00
疯狂的狮子Li 33683d4bb1 update 更新小程序登录 单独的结构体 2022-03-24 10:37:31 +08:00
疯狂的狮子Li 487f18a930 fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误 2022-03-23 22:17:05 +08:00
疯狂的狮子li ab884114be fix 修复 构建 loginUser 遗漏密码 导致无法登录 2022-03-23 12:56:42 +08:00
疯狂的狮子Li bb479c436a add 增加 短信登录 与 小程序登录 示例 2022-03-23 01:02:07 +08:00
疯狂的狮子li a546c8ceaa update 调整排序字段与数据库类型对应 2022-03-17 12:43:07 +08:00
疯狂的狮子li 794c902773 update 优化 SysRole 部分字段类型 防止数据库类型映射异常 2022-03-16 12:59:09 +08:00
疯狂的狮子li e908329cc0 update 优化 TreeEntity 树实体 去除未知泛型 2022-03-15 13:22:00 +08:00
疯狂的狮子li e2417b433a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/job/log.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
2022-03-15 10:24:40 +08:00
疯狂的狮子li f4b16090db update 使用 in 优化 or 提升索引命中率 2022-03-14 16:01:30 +08:00
疯狂的狮子li e418c2efe4 update 重命名 菜单字段 query -> query_param 解决系统关键字问题 2022-03-11 13:40:01 +08:00
疯狂的狮子li 6c84640e1e update 处理 find_in_set 函数多类型数据库兼容性问题 2022-03-09 12:12:53 +08:00
疯狂的狮子li 34da4a696b update 使用全局字段格式化处理 mysql关键字问题 去除不推荐使用的配置 2022-03-07 13:16:37 +08:00
RuoYi 8b3d75a6a0 开启TopNav没有子菜单情况隐藏侧边栏 2022-03-06 09:05:56 +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 99476ad708 fix 修复 数据权限 从 aop 切换到 拦截器 导致获取代理失败问题 2022-03-03 14:34:26 +08:00
疯狂的狮子li 58981b5b3d update 简化查询菜单功能 2022-03-03 11:28:53 +08:00
疯狂的狮子li 901940b042 update 简化查询部门功能 2022-03-03 11:28:53 +08:00
疯狂的狮子Li 0798f5340b update 更新数据权限Service的使用说明 2022-03-03 01:57:10 +08:00
疯狂的狮子Li e167ba5539 update 移除自定义注解 改为框架统一配置 2022-02-27 22:58:56 +08:00
疯狂的狮子li a90cb2b6b3 update 优化远程调用异常处理 2022-02-21 18:30:32 +08:00
疯狂的狮子li dc6f7cd691 add 完成 国际化 功能 2022-02-21 13:34:58 +08:00
疯狂的狮子Li 2ccf189139 update 优化 是否为管理员的判断 2022-02-19 16:34:30 +08:00
疯狂的狮子Li 14c412113f
update 补全事务注解异常 2022-02-17 11:15:34 +00:00
疯狂的狮子li ec2e829e69 update 补全事务注解异常 2022-02-17 19:10:31 +08:00
疯狂的狮子li ba635272fe update 完善auth服务 重构用户注册流程 补全接口文档 2022-02-17 18:50:23 +08:00
疯狂的狮子li 27087e5d1e update 任务调度 独立 ruoyi-job 服务 统一远程处理任务 规范用法 2022-02-17 14:03:16 +08:00
疯狂的狮子li 5be893f980 update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id 2022-02-15 10:48:19 +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 0e13296752 代码生成同步保留必填/类型选项 2022-02-13 21:09:16 +08:00
RuoYi dbca691746 优化代码 2022-02-12 14:23:11 +08:00
疯狂的狮子li 1b7cde73f3 update 返回体 统一 2022-02-11 17:53:15 +08:00
疯狂的狮子li bf019b405e add 增加 数据脱敏 功能 2022-02-11 15:04:49 +08:00
疯狂的狮子li b12b98ab1c update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖 2022-02-11 15:04:25 +08:00
caohong 9cb15ec2ae 方法结果没有返回值时,去掉方法注释 @Return 2022-02-11 09:23:24 +08:00
疯狂的狮子li 16b1f02705 fix 修复 接口文档 上传文件问题 2022-02-09 19:48:29 +08:00