Commit Graph

90 Commits (08b352f428f392ab4b86739ed2e3b7ca7e2928a5)

Author SHA1 Message Date
疯狂的狮子li b877ec0e62 update 优化 使用 StreamUtils 简化业务流操纵 2022-07-05 11:17:51 +08:00
疯狂的狮子Li cf20020b89 update 优化新增用户与角色信息、用户与岗位信息逻辑 2022-06-08 21:47:30 +08:00
疯狂的狮子li e1c789b947 update mybatis-plus 3.5.1 => 3.5.2 解决新版本兼容性问题 关键字冲突修改 2022-06-01 13:24:55 +08:00
疯狂的狮子Li 2f7f7c65da update 同步ruoyi最新修改 2022-05-28 22:22:15 +08:00
疯狂的狮子li e42b2963e3 fix 修复脱敏实现逻辑问题 2022-05-25 10:38:10 +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 5fbdeb1646 fix 修复 查询未分配用户角色列表 角色无绑定用户情况下 空列表问题 2022-04-28 10:16:26 +08:00
疯狂的狮子Li 73eb9cc7d7 update 修改角色适配 采用 get set 转换数据类型 2022-03-30 11:48:31 +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 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
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 901940b042 update 简化查询部门功能 2022-03-03 11:28:53 +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 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 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 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 2022-02-09 18:59:04 +08:00
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 2022-01-29 11:21:25 +08:00
疯狂的狮子li 5fb7886928 Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
2022-01-29 09:27:46 +08:00
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 2022-01-28 11:35:54 +00:00
疯狂的狮子li 268e141d5e update 修改用户注册报未登录警告 2022-01-28 10:14:56 +08:00
RuoYi 1a1d6562d2 用户访问控制时校验数据权限,防止越权 2022-01-27 12:21:02 +08:00
疯狂的狮子li 0e9ec77392 add 整合 mybatis-plus 重写所有业务 2022-01-26 20:33:39 +08:00
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
2022-01-21 18:19:22 +08:00
疯狂的狮子li c28d9c208e Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
#	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	sql/ry_config_20220114.sql
2022-01-17 15:58:59 +08:00
RuoYi d0a19e5b6f 定时任务屏蔽违规的字符 2022-01-14 10:53:03 +08:00
runphp 4a60f91994
优化加载字典缓存数据 2022-01-12 03:42:38 +00:00
疯狂的狮子li bccfe2c0b2 update 抽取公共模块 ruoyi-common-dict 实现字典多服务调用 2022-01-11 11:49:05 +08:00
疯狂的狮子li db9fd081e6 全项目代码格式化 2021-12-31 16:31:17 +08:00
月夜 0fc652d3e9 !7 使用redisson
Merge pull request !7 from 月夜/master
2021-12-28 10:35:07 +00:00
RuoYi f91f931c0b 自定义xss校验注解实现 2021-12-15 11:00:47 +08:00
RuoYi 9f21dbbc5c 修复长主键溢出问题 将查询返回类型改为 Long 2021-12-06 21:55:41 +08:00