Commit Graph

47 Commits (f50df71567a84ef304f9c6abc72be9eef7d21635)

Author SHA1 Message Date
疯狂的狮子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 4a47063b57 update 删除无用测试配置 2022-01-26 15:34:52 +08:00
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
2022-01-21 18:19:22 +08:00
疯狂的狮子li 384a52e3e9 fix 修复 dubbo 自动配置优先级高于 nacos 导致配置不生效 循环依赖报错 2022-01-17 15:06:10 +08:00
yueye ac4005c9dd add 新增 ruoyi-doc 模块 集成 Knife4j 2022-01-12 16:32:19 +08:00
疯狂的狮子li e3cd9e30c3 add 新增 集成 Xxl-Job 定时任务管理 2022-01-10 11:46:56 +08:00
疯狂的狮子Li 6bf7371d89 update 更改整体配置策略 使用注册中心命名空间隔离 2022-01-10 00:48:27 +08:00
疯狂的狮子li 30f3fe7a26 update 更新动态日志开关与订阅服务配置 2022-01-06 15:26:17 +08:00
疯狂的狮子li d728d116e9 update 共享配置支持动态刷新 2022-01-06 15:08:20 +08:00
疯狂的狮子li 4a9929f307 add 增加监控中心 在线日志监控 优化日志文件格式 2021-12-31 15:00:59 +08:00
疯狂的狮子li e1ee9d467b update 合并配置文件 2021-12-31 13:56:26 +08:00
疯狂的狮子Li 42a196f875 update 项目细节调整 多环境配置文件调整 2021-12-30 23:12:38 +08:00
疯狂的狮子li 6b0070a437 update 抽取所有公用配置到 maven profile 管理 2021-12-01 14:57:58 +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 0dcc955ced 更换过期的共享配置属性 2021-01-27 18:00:50 +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
JuJu 24fb0b712a 删除无用代码 2020-10-26 15:39:36 +08:00
RuoYi d52f6673bc 调整日志路径到模块目录 2020-10-13 17:36:00 +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