280 Commits (feb069560e117ced1fe69dcd33690feac0458f2c)

Author SHA1 Message Date
疯狂的狮子li 8c4091af01 Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-api/pom.xml
#	ruoyi-api/ruoyi-api-system/pom.xml
#	ruoyi-auth/pom.xml
#	ruoyi-common/pom.xml
#	ruoyi-common/ruoyi-common-core/pom.xml
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
#	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/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
#	ruoyi-common/ruoyi-common-excel/pom.xml
#	ruoyi-common/ruoyi-common-job/pom.xml
#	ruoyi-common/ruoyi-common-log/pom.xml
#	ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-mybatis/pom.xml
#	ruoyi-common/ruoyi-common-redis/pom.xml
#	ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-security/pom.xml
#	ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-example/ruoyi-stream-mq/pom.xml
#	ruoyi-gateway/pom.xml
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
#	ruoyi-modules/pom.xml
#	ruoyi-modules/ruoyi-gen/pom.xml
#	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-modules/ruoyi-job/pom.xml
#	ruoyi-modules/ruoyi-system/pom.xml
#	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/register.vue
#	ruoyi-visual/pom.xml
#	ruoyi-visual/ruoyi-monitor/pom.xml
3 years ago
RuoYi d4930f6a88 自定义数据权限不排除重复 3 years ago
疯狂的狮子li 9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc 3 years ago
疯狂的狮子li 03e1d25afb update 升级 springboot 2.7.2 重构使用最新自动配置方式 3 years ago
RuoYi fb35360f81 支持自定义隐藏Excel属性列 3 years ago
RuoYi 9ebd484f46 Excel注解支持backgroundColor属性设置背景色 3 years ago
疯狂的狮子Li a28f0a28e1 update 优化 StreamUtils 分组返回有序 Map 性能不变 3 years ago
疯狂的狮子Li a19a59697f update 更改魔法值 3 years ago
RuoYi ef28473992 升级Spring Cloud相关组件到最新版 3 years ago
RuoYi f12baad00c 优化代码 3 years ago
疯狂的狮子li 0b7b8fd986 fix 修复 hutool 工具返回不可操纵类型 导致报错问题 3 years ago
疯狂的狮子li b877ec0e62 update 优化 使用 StreamUtils 简化业务流操纵 3 years ago
疯狂的狮子li f1d102916a add 增加 StreamUtils 流工具 简化 stream 流操纵 3 years ago
疯狂的狮子Li 0d58ecb09c
删除重复注释 3 years ago
疯狂的狮子li c4f7c32605 fix 修复 获取 SensitiveService 空问题 增加空兼容 3 years ago
疯狂的狮子li 23d7fb11a0 update 规范化 自动装配 注解使用 3 years ago
疯狂的狮子li 86d4101fa6 fix 修复 补全缺失导包 3 years ago
疯狂的狮子li 8607b39228 update 同步 ruoyi 3 years ago
疯狂的狮子li 646423a394 reset 回滚 InnerExclude 注解相关提交 错误的理解了功能 3 years ago
疯狂的狮子li 28f1d15e2e add 增加 dubbo 内网鉴权放行 InnerExclude 注解 用于放行 dubbo 服务之间的内网调用 3 years ago
RuoYi 2051819d2d 删除多余的工具类 3 years ago
RuoYi 570d468814 optimized code 3 years ago
若依 6d404a1f3b
!198 去除多余的逗号
Merge pull request !198 from runphp/N/A
3 years ago
runphp d28f81dc68
去除多余的逗号 3 years ago
疯狂的狮子li d3ded4162e update 使用全局国际化过滤器 GlobalI18nFilter 优化 Gateway 国际化处理 3 years ago
我以为 d6e6b99316
修正OpenFeign部分情况下传递header认证信息为空问题 #https://gitee.com/y_project/RuoYi-Cloud/issues/I5AGRR 3 years ago
疯狂的狮子Li b59095b897 update 用户头像上传限制只能为图片格式 3 years ago
疯狂的狮子Li 2f7f7c65da update 同步ruoyi最新修改 3 years ago
RuoYi cdcc466300 升级fastjson到最新版2.0.4 3 years ago
疯狂的狮子li e42b2963e3 fix 修复脱敏实现逻辑问题 3 years ago
疯狂的狮子Li 5d17811487 update 优化 redis 与 jackson 使用自动装配定制器简化配置 3 years ago
RuoYi 1d1b9501b7 用户头像上传限制只能为图片格式 3 years ago
RuoYi 24376681b8 优化switch case条件 3 years ago
疯狂的狮子Li 406e337d30 update 优化 编译警告 3 years ago
RuoYi 5dbed46552 优化excel创建表格样式 3 years ago
疯狂的狮子li 42f1c95b32 update 优化 redis 序列化 使用系统自带json工具 全局统一 3 years ago
RuoYi 54d1c58338 Excel注解支持color字体颜色 3 years ago
疯狂的狮子li 30bc36f5bf update 使用 spring cglib 替换 停止维护的 cglib 3 years ago
疯狂的狮子Li fa3b642d63 update 优化登录失败相关部分代码结构 3 years ago
RuoYi 1ec806ae80 设置分页参数默认值 3 years ago
RuoYi 723583a3b8 修复Excel注解prompt/combo同时使用不生效问题 3 years ago
RuoYi 5d44d2b5a6 新增清理分页的线程变量方法 3 years ago
疯狂的狮子Li 3e7dd75f6d update 优化代码与注释 3 years ago
RuoYi e5c938c64a 优化IP地址获取到多个的问题 3 years ago
RuoYi ccf84377f8 优化导出excel单元格验证,包含变更为开头.防止正常内容被替换 3 years ago
疯狂的狮子Li bb479c436a add 增加 短信登录 与 小程序登录 示例 3 years ago
RuoYi 0b08933a8c 优化导出数据LocalDateTime类型无数据问题 3 years ago
疯狂的狮子li e908329cc0 update 优化 TreeEntity 树实体 去除未知泛型 3 years ago
疯狂的狮子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
3 years ago
YangHuang 66f5f11069 登录信息状态枚举值更正 3 years ago