YunaiV
|
e74601594f
|
reactor：yudao-common 增加 biz 包，将 framework 依赖的 api 统一迁移，方便后续 yudao-framework 独立仓库
|
2025-05-14 21:20:47 +08:00 |
|
YunaiV
|
49dbba9828
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/ApiAccessLogCommonApi.java
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/ApiErrorLogCommonApi.java
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/dto/ApiErrorLogCreateReqDTO.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/write/AiWriteServiceImpl.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
|
2025-05-14 13:51:16 +08:00 |
|
YunaiV
|
ad29b90a43
|
reactor：framework 依赖的 api，交给 yudao-common 包下的 biz 维护
|
2025-05-14 13:27:21 +08:00 |
|
YunaiV
|
1e0c4503aa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRejectReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersale/core/aop/AfterSaleLogAspect.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/dto/PayTransferNotifyReqDTO.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoTransferController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/vo/transfer/PayDemoTransferCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/transfer/PayTransferController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/transfer/vo/PayTransferCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletRechargeController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderService.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoTransferService.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoTransferServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
|
2025-05-12 09:29:58 +08:00 |
|
YunaiV
|
5e2138265f
|
【同步】BOOT 和 CLOUD 的功能（PAY 相关功能）
|
2025-05-11 18:08:17 +08:00 |
|
YunaiV
|
58c8a7dbc2
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
|
2025-05-06 21:05:46 +08:00 |
|
YunaiV
|
5b81612086
|
【同步】BOOT 和 CLOUD 的功能
|
2025-05-06 21:05:35 +08:00 |
|
YunaiV
|
0fa162876f
|
【同步】BOOT 和 CLOUD 的功能
|
2025-05-06 20:59:34 +08:00 |
|
YunaiV
|
829d200302
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/order/PayOrderUnifiedReqDTO.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/refund/PayRefundUnifiedReqDTO.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/NonePayClientConfig.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java
|
2025-05-06 20:56:21 +08:00 |
|
YunaiV
|
fdbda95984
|
feat：【MALL 商城】增加微信物流的对接（和社区同学，一起测试中。。。）
|
2025-05-06 20:49:23 +08:00 |
|
YunaiV
|
a079633355
|
feat：增加租户切换的能力
|
2025-05-05 17:27:48 +08:00 |
|
YunaiV
|
0d51d6c8b6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-05-05 11:19:38 +08:00 |
|
YunaiV
|
cbb239117d
|
reactor：@TenantIgnore 添加在 DO 实体类上，该表自动忽略租户
|
2025-05-05 11:18:15 +08:00 |
|
YunaiV
|
3d3bc3b25f
|
reactor：@TenantIgnore 添加在 Controller 时，自动添加到 TenantProperties 中
|
2025-05-05 10:29:01 +08:00 |
|
YunaiV
|
2084321637
|
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/api/oauth2/OAuth2TokenApiImpl.java
|
2025-05-05 10:26:58 +08:00 |
|
YunaiV
|
f92f9d2e17
|
reactor：@TenantIgnore 添加在 Controller 时，自动添加到 TenantProperties 中
|
2025-05-05 10:23:58 +08:00 |
|
YunaiV
|
9f7c9eff96
|
reactor：@TenantIgnore 添加在 Controller 时，自动添加到 TenantProperties 中
|
2025-05-05 10:14:35 +08:00 |
|
YunaiV
|
ff33a0dc22
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-05-04 18:29:22 +08:00 |
|
YunaiV
|
18e4b1f33e
|
feat：增加 yudao-server，用于单体启动！
|
2025-05-04 18:28:01 +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
|
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
|
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
|
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 |
|
YunaiV
|
cec3bfe4be
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
|
2025-03-30 11:11:18 +08:00 |
|
YunaiV
|
b4c0652dfa
|
【同步】BOOT 和 CLOUD 的功能（BPM）
|
2025-03-30 11:10:31 +08:00 |
|
YunaiV
|
7910b4c683
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java
|
2025-03-17 20:17:39 +08:00 |
|
YunaiV
|
278f4838d8
|
初始化 IoT 服务（模块）
|
2025-03-17 20:15:27 +08:00 |
|
YunaiV
|
0d57618030
|
【同步】BOOT 和 CLOUD 的功能
|
2025-03-16 17:33:43 +08:00 |
|
YunaiV
|
728e20ff23
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmHttpRequestUtils.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
|
2025-03-16 17:23:42 +08:00 |
|
YunaiV
|
9841450458
|
【同步】BOOT 和 CLOUD 的功能（BPM）
|
2025-03-16 17:22:19 +08:00 |
|
YunaiV
|
ee666cc387
|
【缺陷修复】BPM：使用 DataPermissionUtils 替代 DataPermission，避免 this 调用无法生效的问题
|
2025-03-16 15:26:00 +08:00 |
|
YunaiV
|
9d951bc2af
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-03-15 19:03:51 +08:00 |
|
YunaiV
|
b9ad9508e3
|
【缺陷修复】关闭 knife4j 增强，存在兼容性问题，悲伤
|
2025-03-15 19:03:39 +08:00 |
|
YunaiV
|
7547612bfb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
|
2025-02-09 11:44:50 +08:00 |
|
YunaiV
|
d27536ffc1
|
【同步】BOOT 和 CLOUD 的功能（BPM）
|
2025-02-09 11:34:58 +08:00 |
|
YunaiV
|
023bc70fd7
|
【同步】BOOT 和 CLOUD 的功能
|
2025-01-25 10:21:07 +08:00 |