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
							
						 | 
						
							
							
							
							
								
							
								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
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								8523bdfbab
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumCollectionValidator.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessListenerServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeSeckillActivityPriceCalculator.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.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-01-25 10:14:47 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								554ee6f02b
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能(所有)
							
							
							
							
							
						 | 
						
							2025-01-24 20:42:23 +08:00 | 
						
					
				
					
						
							
							
								 
								CK
							
						 | 
						
							
							
							
							
								
							
								3a9eeb1d43
								
							
								
							
						 | 
						
							
							
								
								【功能修复】访问日志:当显式声明@ApiAccessLog注解但未指定operateModule等属性时,系统未能正确获取默认属性值,导致日志记录中部分属性缺失。
							
							
							
							
							
						 | 
						
							2025-01-10 14:20:11 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								4d5983bf11
								
							
								
							
						 | 
						
							
							
								
								【升级】knife4j from 4.5.0 to 4.6.0(社区版)
							
							
							
							
							
						 | 
						
							2024-12-28 12:44:09 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								14c49629b7
								
							
								
							
						 | 
						
							
							
								
								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/controller/admin/definition/BpmModelController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmFormFieldsPermissionReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityBaseVO.java 
							
						 | 
						
							2024-11-23 11:13:01 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								90d006b4c9
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能(所有)
							
							
							
							
							
						 | 
						
							2024-11-23 11:12:04 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								d97f76cd8b
								
							
								
							
						 | 
						
							
							
								
								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/knowledge/AiKnowledgeDocumentServiceImpl.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeSegmentServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptLeaderStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptMemberStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateGroupStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidatePostStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserSelectStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java 
							
						 | 
						
							2024-10-04 17:48:02 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								a4ff54c148
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能(CRM 数据权限)
							
							
							
							
							
						 | 
						
							2024-10-02 14:32:41 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								edcb29d4c6
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能
							
							
							
							
							
						 | 
						
							2024-09-07 21:05:27 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								7d9785ad79
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/dto/CombinationRecordCreateReqDTO.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java 
							
						 | 
						
							2024-09-07 20:57:15 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								561edb80ac
								
							
								
							
						 | 
						
							
							
								
								【代码优化】框架:简化 api 访问日志、错误日志的记录逻辑
							
							
							
							
							
						 | 
						
							2024-09-06 22:36:22 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								1a5755b03a
								
							
								
							
						 | 
						
							
							
								
								【代码优化】框架:简化 api 访问日志、错误日志的记录逻辑
							
							
							
							
							
						 | 
						
							2024-09-06 22:03:08 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b35799b593
								
							
								
							
						 | 
						
							
							
								
								【功能修复】API 调用时,相关的 checkData 补充
							
							
							
							
							
						 | 
						
							2024-09-03 11:37:47 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								ad59c54fdb
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能
							
							
							
							
							
						 | 
						
							2024-08-31 10:01:47 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								d97e54b5cd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java 
							
						 | 
						
							2024-08-31 09:57:59 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e893caf3ad
								
									
								
							
								
							
						 | 
						
							
							
								
								!131 bugfix
							
							
							
							
							
							
							
							Merge pull request !131 from 尹先生/master-jdk17 
							
						 | 
						
							2024-08-31 01:56:00 +00:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b160d409f3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
#	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java 
							
						 | 
						
							2024-08-31 09:51:54 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								daef8d3b03
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能
							
							
							
							
							
						 | 
						
							2024-08-31 09:51:21 +08:00 | 
						
					
				
					
						
							
							
								 
								yinyilong
							
						 | 
						
							
							
							
							
								
							
								35f5ee4677
								
							
								
							
						 | 
						
							
							
								
								bugfix-调整GlobalExceptionHandler,增加InvalidFormatException处理对应RequestBody实体中 xx 属性类型为 Integer,结果传递 xx 参数类型为 String
							
							
							
							
							
						 | 
						
							2024-08-12 14:33:01 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								cef4c14286
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java 
							
						 | 
						
							2024-08-09 22:13:34 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								a042a4c366
								
							
								
							
						 | 
						
							
							
								
								【优化】数据脱敏支持 Spring el 表达式,支持根据权限控制脱敏
							
							
							
							
							
						 | 
						
							2024-08-03 19:13:11 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								edefc6cedb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
						 | 
						
							2024-07-27 15:41:44 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								c9a64030da
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能
							
							
							
							
							
						 | 
						
							2024-07-27 15:41:35 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b026d186a6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPayClientConfig.java 
							
						 | 
						
							2024-07-26 09:25:01 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								f717c0f9c6
								
							
								
							
						 | 
						
							
							
								
								【代码优化】PAY:移除 PayClient 缓存,减少复杂性,性能足够(非高频读取)
							
							
							
							
							
						 | 
						
							2024-07-24 23:03:59 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								61ebfc79a1
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能
							
							
							
							
							
						 | 
						
							2024-07-24 19:09:45 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								0536fa3957
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java 
							
						 | 
						
							2024-07-24 19:05:47 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								c0df6eab4e
								
							
								
							
						 | 
						
							
							
								
								【同步】BOOT 和 CLOUD 的功能
							
							
							
							
							
						 | 
						
							2024-07-24 19:05:11 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								be67194cfb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
						 | 
						
							2024-07-20 22:36:42 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b0c2f75a3f
								
							
								
							
						 | 
						
							
							
								
								【功能优化】全局:LoginUser 新增过期时间,方便判断 token 过期
							
							
							
							
							
						 | 
						
							2024-07-20 18:42:26 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								3d29a981f7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
						 | 
						
							2024-07-19 23:37:09 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								825be64d6d
								
							
								
							
						 | 
						
							
							
								
								【功能优化】全局:简化 GlobalExceptionHandler 对 ServiceException 的打印
							
							
							
							
							
						 | 
						
							2024-07-19 23:37:00 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								1bc91e3ddf
								
							
								
							
						 | 
						
							
							
								
								【功能优化】全局:处理 HttpRequestMethodNotSupportedException 异常
							
							
							
							
							
						 | 
						
							2024-07-19 23:15:31 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								0af36c40a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
						 | 
						
							2024-07-19 23:15:03 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								f6ff5086be
								
							
								
							
						 | 
						
							
							
								
								【功能优化】全局:处理 HttpRequestMethodNotSupportedException 异常
							
							
							
							
							
						 | 
						
							2024-07-19 23:14:54 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								84379445dd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
						 | 
						
							2024-07-19 23:02:49 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								24eaa68269
								
							
								
							
						 | 
						
							
							
								
								【功能修复】全局:请求租户不存在时,记录访问日志、操作日志异常的问题
							
							
							
							
							
						 | 
						
							2024-07-19 22:54:25 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								700a0996c4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	pom.xml 
							
						 | 
						
							2024-07-13 11:28:47 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								c6937cf199
								
							
								
							
						 | 
						
							
							
								
								【模块新增】AI:支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力
							
							
							
							
							
						 | 
						
							2024-07-13 11:26:17 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								2bd9fd97bb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java 
							
						 | 
						
							2024-05-04 09:48:50 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								1e106844e8
								
							
								
							
						 | 
						
							
							
								
								【同步】boot 和 cloud 版本
							
							
							
							
							
						 | 
						
							2024-05-04 09:45:51 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								6fc6fb1bc8
								
							
								
							
						 | 
						
							
							
								
								【优化】GlobalExceptionHandler 新增 IGNORE_ERROR_MESSAGES,用于忽略“无效的刷新令牌”等非关键提示
							
							
							
							
							
						 | 
						
							2024-05-03 09:53:00 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b1c11f8dd8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
							
							
							
							
							
							
							
							# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java 
							
						 | 
						
							2024-04-29 12:50:00 +08:00 |