Commit Graph

78 Commits

Author SHA1 Message Date
疯狂的狮子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
RuoYi
9c5c6c6be7 优化获取缓存信息方式 2021-10-18 10:59:56 +08:00
RuoYi
a8eba6949e 角色列表返回类型保持一致 2021-10-15 17:30:30 +08:00
RuoYi
d20d4ffa16 菜单子项添加路由参数 2021-10-10 16:07:06 +08:00
RuoYi
a58c430858 菜单管理支持配置路由参数 2021-09-08 10:04:23 +08:00
RuoYi
67df97d5a7 修改时检查用户数据权限范围 2021-08-24 16:24:25 +08:00
RuoYi
1e4ed04a65 优化异常信息 2021-08-16 22:26:29 +08:00
RuoYi
132b23dc33 补充遗漏的@Override注解 2021-08-13 16:37:47 +08:00
RuoYi
aeeb0eb26b 字典工具类更换路径 2021-08-06 17:52:44 +08:00
RuoYi
329aa68644 新增是否开启用户注册功能 2021-07-30 20:03:59 +08:00
RuoYi
66e0f9a53d 启用部门状态排除顶级节点 2021-07-30 11:05:54 +08:00
RuoYi
883d89ee0b 内链设置meta信息 2021-07-26 10:08:42 +08:00
RuoYi
114c9f3af6 菜单路由配置支持内链访问 2021-07-11 19:30:24 +08:00