Commit Graph

2251 Commits (1be8227324c89dd057c1a098196bd6b473f30145)

Author SHA1 Message Date
haoran1009 1be8227324
Pre Merge pull request !180 from haoran1009/master 2025-05-04 02:11:26 +00:00
YunaiV e181529b05 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 10:11:17 +08:00
YunaiV 5511a6e063 chore:mybatis from 3.5.11 -> 3.5.19 2025-05-04 10:11:08 +08:00
YunaiV a1fcfbd7b6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 09:59:56 +08:00
YunaiV ee660465ba chore:guava from 33.4.0-jre => 33.4.8-jre 2025-05-04 09:59:32 +08:00
YunaiV 8dd21005d5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java
2025-05-04 09:54:48 +08:00
YunaiV f02685a11c fix:justauth-spring-boot-starter 引入的 hutool-core 冲突 2025-05-04 09:54:32 +08:00
YunaiV 9b54e313f8 【同步】BOOT 和 CLOUD 的功能(AI) 2025-05-04 09:45:07 +08:00
YunaiV b70c0908b4 feat:集成积木仪表盘 2025-05-03 10:29:45 +08:00
YunaiV d3f22f8b15 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-03 10:27:19 +08:00
YunaiV e16a1e60fe feat:集成积木仪表盘 2025-05-03 10:27:10 +08:00
YunaiV d1c684428d feat:集成积木仪表盘 2025-05-03 10:26:04 +08:00
YunaiV 0d2a6dca2c chore:jimureport 1.8.1 to 1.9.4 2025-05-03 09:14:57 +08:00
YunaiV f27d0cd97f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
2025-05-03 09:12:15 +08:00
YunaiV 01d4c1c749 chore:jimureport 1.8.1 to 1.9.4 2025-05-03 09:11:49 +08:00
YunaiV bb04abc4d9 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-03 08:48:35 +08:00
YunaiV 6629ca0906 chore:mybatis 相关依赖升级 2025-05-03 08:48:28 +08:00
YunaiV b9bead5dba Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml
2025-05-03 08:36:40 +08:00
YunaiV 22436c2703 chore:spring 相关依赖升级 2025-05-03 08:35:45 +08:00
YunaiV 7645107d27 【同步】BOOT 和 CLOUD 的功能 2025-05-02 21:18:07 +08:00
YunaiV 393d7b728c Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
#	yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApi.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteBatchReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/template/AppCouponTemplateRespVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
2025-05-02 21:11:08 +08:00
YunaiV 8c7331873e reactor:【INFRA】文件上传 api,增加 directory 参数,去除 path 参数,并支持按照日期分目录、文件名不再使用 sha256 而是时间戳 2025-05-02 20:45:53 +08:00
YunaiV 103685269e 【同步】BOOT 和 CLOUD 的功能 2025-05-02 20:25:24 +08:00
YunaiV 04bd6bff04 fix:网关传递 login-user 可能存在 usertype 不正确的问题 2025-04-30 16:03:50 +08:00
YunaiV 8c579951f8 reactor:使用 aj-captcha 官方 1.4.0 2025-04-30 15:25:38 +08:00
YunaiV e392888032 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
2025-04-30 15:19:18 +08:00
YunaiV 10c520bf00 reactor:使用 aj-captcha 官方 1.4.0 2025-04-30 15:17:36 +08:00
YunaiV eaa4ab7fa1 reactor:使用 justauth 官方 1.16.7(jdk8 特殊适配,等 1.4.1) 2025-04-30 13:48:50 +08:00
YunaiV d4f1971acd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
2025-04-30 11:27:57 +08:00
YunaiV d796af2040 reactor:使用 justauth 官方 1.16.7 2025-04-30 11:11:09 +08:00
YunaiV a1fbbe35fa feat:使用 aws s3 2.0 客户端 2025-04-26 10:07:07 +08:00
YunaiV e3090523ec Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
2025-04-26 10:05:24 +08:00
YunaiV fd34572c48 feat:使用 aws s3 2.0 客户端 2025-04-26 10:05:03 +08:00
YunaiV 7b9ea9f717 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-04-24 12:27:41 +08:00
YunaiV f3a65a8a54 【功能优化】VBEN5.0 接入的 SQL 同步 2025-04-24 12:27:24 +08:00
YunaiV 6b53d3bbd8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
2025-04-23 23:21:11 +08:00
YunaiV ef82f01242 【功能优化】VBEN5.0 接入的 SQL 同步 2025-04-23 23:20:29 +08:00
ethan be7d37ab3e
!7 refactor(sk-module-data): 重构认证逻辑,使用拦截器��
Merge pull request !7 from haoran1009/auto-9270061-master-b94092a6-1
2025-04-22 02:25:38 +00:00
haoran f3d0835d82 refactor(sk-module-data): 重构认证逻辑,使用拦截器替代过滤器
- 移除 AuthFilter 类,改用 AuthInterceptor拦截器实现认证逻辑
- 新增 AuthInterceptor 类,用于拦截请求并进行身份验证
- 在 FinanceController 中添加 RequiresAuth 注解,标识需要认证的方法
- 新增 RequiresAuth 注解,用于标记需要认证的方法或类
- 新增 WebConfig 配置类,注册 AuthInterceptor 拦截器
2025-04-17 15:19:36 +08:00
ethan 10164b4112
!6 Merge remote-tracking branch 'origin/master'
Merge pull request !6 from haoran1009/auto-9270061-master-9540b0aa-1
2025-04-16 01:40:40 +00:00
haoran 4ad6130549 Merge remote-tracking branch 'origin/master' 2025-04-15 19:04:12 +08:00
haoran b411c4f45e 移除 FinanceController 中的多余注解和导入
- 删除了未使用的 ObjectUtils 导入
- 删除了未使用的 PreAuthorize 导入
- 在 getIncomeAndTax 方法上添加了 PermitAll 注解,允许所有用户访问
- SecurityConfiguration 代码优化
2025-04-15 19:03:51 +08:00
ethan 95eaf89c0d
!5 接口采用客户端授权模式 相关yudao代码更改
Merge pull request !5 from haoran1009/auto-9270061-master-9a4010a5-1
2025-04-15 06:23:36 +00:00
haoran bbbf0ba950 getway添加sk模块 2025-04-15 10:53:41 +08:00
haoran 064babee99 添加全局过滤器,访问接口前验证id和密钥 2025-04-15 08:51:24 +08:00
haoran caa163ed6b 接口采用客户端授权模式 相关yudao代码更改 2025-04-14 14:54:29 +08:00
ethan 5be41793ed
!4 类转换赋值bug更新
Merge pull request !4 from haoran1009/auto-9270061-master-17482f94-1
2025-04-14 01:17:14 +00:00
YunaiV c18760b9f4 V2.4.2 发布~ 2025-04-12 12:27:59 +08:00
YunaiV 09565cc72c Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-04-12 12:27:37 +08:00
YunaiV 3f9de11f11 2.4.2 版本发布 2025-04-12 12:27:19 +08:00