Commit Graph

2328 Commits (master)

Author SHA1 Message Date
YunaiV 916c16f468 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-24 09:30:34 +08:00
YunaiV 2aa7e6d32d fix:【PAY 支付】支付渠道配置的解析 2025-05-24 09:30:18 +08:00
YunaiV 73b78bf11e (〃'▽'〃) v2.6.0 发布:优化项目结构,希望你会喜欢 2025-05-23 13:42:27 +08:00
YunaiV ebd9791c70 【同步】BOOT 和 CLOUD 的功能 2025-05-23 13:42:13 +08:00
YunaiV 5b99956954 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-05-23 12:49:24 +08:00
YunaiV e895ab5565 (〃'▽'〃) v2.6.0 发布:优化项目结构,希望你会喜欢 2025-05-23 12:47:44 +08:00
YunaiV d883e08fdd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerSaveReqVO.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactService.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo02/Demo02CategoryService.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo02/Demo02CategoryServiceImpl.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpService.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpServiceImpl.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java
2025-05-23 12:41:51 +08:00
YunaiV 7a0d5bd29a 【同步】BOOT 和 CLOUD 的功能 2025-05-23 10:02:08 +08:00
YunaiV 70c2ddf66d feat:【INFRA 基础设施】代码生成时,支持配置 VO/DO 模式 2025-05-20 08:31:33 +08:00
YunaiV e9a26050b8 feat:【INFRA 基础设施】代码生成时,支持配置 VO/DO 模式 2025-05-19 19:01:57 +08:00
YunaiV 85b75b9c1c 【同步】BOOT 和 CLOUD 的功能 2025-05-17 14:45:04 +08:00
YunaiV 323396492e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-module-ai/yudao-module-ai-server/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
#	yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/event/BpmProcessInstanceEventPublisher.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppUpdateReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppUpdateStatusReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/channel/PayChannelController.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/channel/vo/PayChannelBaseVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/channel/vo/PayChannelCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/channel/vo/PayChannelUpdateReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/vo/order/PayDemoOrderCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderBaseVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderSubmitReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletRechargePackageController.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletTransactionController.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageBaseVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageUpdateReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/wallet/PayWalletBaseVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/wallet/PayWalletUserReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/vo/AppPayOrderSubmitReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletController.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletRechargeController.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletTransactionController.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/dal/redis/no/PayNoRedisDAO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/dal/redis/notify/PayNotifyLockRedisDAO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/dto/order/PayOrderUnifiedReqDTO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/dto/refund/PayRefundUnifiedReqDTO.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/NonePayClientConfig.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/WxPayClientConfig.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelService.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceImpl.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderService.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargePackageService.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargePackageServiceImpl.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionService.java
#	yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/bo/WalletTransactionCreateReqBO.java
#	yudao-module-pay/yudao-module-pay-server/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java
#	yudao-module-pay/yudao-module-pay-server/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java
#	yudao-module-pay/yudao-module-pay-server/src/test/resources/application-unit-test.yaml
2025-05-17 14:26:06 +08:00
芋道源码 aeb4136e9f
!195 yudao-cloud 微服务项目,将 biz 重命名为 server,定义更清晰
Merge pull request !195 from 芋道源码/develop
2025-05-17 05:55:29 +00:00
YunaiV 95f1410db3 reactor:【INFRA 基础设施】代码生成时,区分 boot 还是 cloud 项目
reactor:【INFRA 基础设施】代码生成时,更严格的区分 master 还是 master-jdk17 分支
2025-05-17 13:12:04 +08:00
YunaiV fbf76134bc reactor:trade 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-17 11:29:41 +08:00
YunaiV c43f5ec494 reactor:promotion 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-17 10:55:59 +08:00
YunaiV 7077cff50e reactor:statistics 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-17 10:48:36 +08:00
YunaiV 0421c81376 reactor:product 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-17 10:30:52 +08:00
YunaiV 4333c5d03c reactor:pay 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-17 09:48:50 +08:00
YunaiV 7a20979b6a reactor:ai 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-17 09:08:20 +08:00
YunaiV 857a6c7489 reactor:将 ai starter 融合到 ai-module 的 framework/ai 里 2025-05-17 08:12:31 +08:00
YunaiV 1d1ee4698e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-16 23:44:47 +08:00
YunaiV ad41ed2c2f reactor:将 pay starter 融合到 pay-module 的 framework/pay 里 2025-05-16 23:39:08 +08:00
YunaiV 5c432ac134 reactor:mp 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-16 20:35:53 +08:00
YunaiV 56363a3d6e reactor:erp 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-16 13:21:44 +08:00
YunaiV 939f75acc1 reactor:member 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-16 13:10:53 +08:00
YunaiV 4b99c76c58 reactor:crm 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-16 09:45:44 +08:00
YunaiV d4dc82c42a reactor:bpm 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-16 09:27:03 +08:00
YunaiV 9070f1f08a reactor:report 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-15 19:09:39 +08:00
YunaiV c251fcf698 reactor:system 和 infra 的 -biz 模块,重构成 -server 模块,意义更明确 2025-05-15 17:12:00 +08:00
YunaiV 9e067715cb reactor:移除 infra 对 system 的依赖 2025-05-15 15:56:57 +08:00
YunaiV d2de8f60ac fix:【AI 大模型】dictDataApi 未沉底移除干净 2025-05-15 10:34:32 +08:00
YunaiV 1d0aabe341 【同步】BOOT 和 CLOUD 的功能 2025-05-14 23:44:13 +08:00
YunaiV e74601594f reactor:yudao-common 增加 biz 包,将 framework 依赖的 api 统一迁移,方便后续 yudao-framework 独立仓库 2025-05-14 21:20:47 +08:00
YunaiV 53c36a01b4 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-14 21:19:36 +08:00
YunaiV ddefb342b8 reactor:framework 依赖的 api,交给 yudao-common 包下的 biz 维护 2025-05-14 19:59:11 +08:00
芋道源码 daaa23e86d
!192 reactor:framework 依赖的 api,交给 yudao-common 包下的 biz 维护
Merge pull request !192 from 芋道源码/develop
2025-05-14 11:31:40 +00: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 2a0b3945fe reactor:framework 依赖的 api,交给 yudao-common 包下的 biz 维护 2025-05-14 13:27:30 +08:00
YunaiV ad29b90a43 reactor:framework 依赖的 api,交给 yudao-common 包下的 biz 维护 2025-05-14 13:27:21 +08:00
YunaiV 9d104c1c33 (〃'▽'〃) v2.5.0 发布:又熬过 30 个夜,头发还在 2025-05-13 20:18:22 +08:00
YunaiV 9b61a09259 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-05-13 20:16:06 +08:00
YunaiV 8aacd619d4 (〃'▽'〃) v2.5.0 发布:又熬过 30 个夜,头发还在 2025-05-13 20:15:22 +08:00
YunaiV ab188daa00 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-13 19:30:52 +08:00
YunaiV 8781387065 【同步】BOOT 和 CLOUD 的功能 2025-05-13 19:24:42 +08:00
YunaiV 2a01d1a970 【同步】BOOT 和 CLOUD 的功能 2025-05-12 23:18:16 +08:00
YunaiV 282be0b4f0 Merge branch 'master-jdk17' of https://github.com/YunaiV/yudao-cloud into master-jdk17 2025-05-12 21:20:52 +08:00
芋道源码 6d1ac32343
Merge pull request #223 from fishSteak/master-jdk17-dev-fixMPJ
feat(mybatis): 增强MPJLambdaWrapperX 类,左连接后可以使用betweenIfPresent等
2025-05-12 21:17:55 +08:00
YunaiV 02a074590e perf:【SYSTEM 全局】优化 TenantApi 的使用 2025-05-12 21:02:53 +08:00
YunaiV 3bf58b0232 【同步】BOOT 和 CLOUD 的功能 2025-05-12 09:34:49 +08:00