Commit Graph

365 Commits (eaf6fdc445f756dea7c7aed1f7c3adc79abda776)

Author SHA1 Message Date
疯狂的狮子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
YangHuang 66f5f11069 登录信息状态枚举值更正
疯狂的狮子Li 6612a8b5e0 fix 修复 WebMvc自动配置 优先于 国际化配置 Bean覆盖问题
疯狂的狮子li bd3acc63ed fix 修复 Undertow 的启动警告问题
YangHuang 34487865f3 记录登录信息状态值改为常量
疯狂的狮子li 6b1aa1ec1d update 删除无用依赖 dubbo 3.0 不需要了
疯狂的狮子Li c31d52d8b4 [重磅更新] 升级 dubbo 3.0 使用原生 starter 整合 减少与 feign 的无用兼容配置
RuoYi 82535c82d3 修复导入Excel时字典字段类型为Long转义为空问题
疯狂的狮子li 1ec6263399 update 简化用户与角色功能
疯狂的狮子li fe43c94810 update 简化查询角色功能
疯狂的狮子li d1832352de 发布 0.9.0
疯狂的狮子Li 53b4e0b0be remove 去除 maven 无用 作用域限制
疯狂的狮子Li 6afbf8734e add 增加 ruoyi-common-idempotent 分布式幂等模块
疯狂的狮子Li 42dd74f196 remove 删除无用常量
疯狂的狮子li 58981b5b3d update 简化查询菜单功能
疯狂的狮子Li 0798f5340b update 更新数据权限Service的使用说明
疯狂的狮子li 3f682fc80c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	docker/copy.sh
	pom.xml
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.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/uuid/IdUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.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-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/system/user/index.vue
疯狂的狮子Li f50df71567 fix 修复升级 sa-token 导致 hutool-jwt 依赖找不到问题
疯狂的狮子Li 5531514325 update 增加 @Async 异步注解 自定义线程池配置
疯狂的狮子Li e167ba5539 update 移除自定义注解 改为框架统一配置
RuoYi a30622b460 升级spring-boot到最新版本2.6.4
duandazhi 105c9d99c8 poi ExcelUtil 增加对java8 日志类型的支持
疯狂的狮子li ac8d14aed1 update 更新 多用户多设备的注释说明
疯狂的狮子li 6678ec6b7b update 调整dubbo自定义负载均衡配置注入 使用spring自动注入
RuoYi 04706403d3 组件fileUpload支持多文件同时选择上传
疯狂的狮子li 1a34da9625 fix 修复 解决dubbo获取元数据satoken优先级过低 内网鉴权报错问题
RuoYi 089ebaf9c5 代码生成子表支持日期/字典配置
疯狂的狮子li 4ed3aa1a88 update 优化 R 默认返回 msg
疯狂的狮子li 7726fa9773 fix 修复 gateway webflux 国际化不生效问题
疯狂的狮子li 1fc833d876 发布 0.8.0 完成 国际化 功能, sentinel控制台 对接 nacos
疯狂的狮子li dc6f7cd691 add 完成 国际化 功能
疯狂的狮子Li 2ccf189139 update 优化 是否为管理员的判断
疯狂的狮子li d20921838e 发布 0.7.0 完成 代码生成 与 docker 部署 集成 sentinel 控制台
疯狂的狮子li c061408267 fix 修复 insertOrUpdateBatch 获取模板错误
疯狂的狮子li e01e64881b update 独立 bom 工程管理 alibaba 相关依赖
疯狂的狮子li f1c3e5d1ea update 优化代码生成 使用新 JsonUtils.parseMap 方法
疯狂的狮子li c994e2c97b update 使用 hutool Dict 优化 JsonUtils 防止类型解析异常
疯狂的狮子li 5be893f980 update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id
yueye 1e22d7ce70 update 修改 代码生成 适配所有新功能
疯狂的狮子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
疯狂的狮子li 24a8719d4c update 优化xss注解处理逻辑
RuoYi 0e13296752 代码生成同步保留必填/类型选项
runphp b0b16e1fc5
fix Value 'baos' is always 'null'
RuoYi dbca691746 优化代码
疯狂的狮子li 1b7cde73f3 update 返回体 统一
疯狂的狮子li 2b4de7c5ea fix 修复 R 参数位置错误
疯狂的狮子li bf019b405e add 增加 数据脱敏 功能
疯狂的狮子li b12b98ab1c update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖
RuoYi 27d46fc0a4 修复Xss注解字段值为空时的异常问题
疯狂的狮子li d6a93184c4 发布 0.6.0 完成 分布式存储 支持 Minio、七牛、阿里、腾讯