From a2e68d038ec4d5bc62df909c2b220cd873d010c6 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 27 Jul 2026 23:28:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor(check):=20=E9=85=8D=E7=BD=AE=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E4=BD=93=E7=B3=BB=E4=BB=8E=20check/=20=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E5=88=B0=20common/check/,=20=E7=BB=9F=E4=B8=80=20admi?= =?UTF-8?q?n/merchant=20=E4=B8=A4=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 ConfigCheckCategoryEnum/ConfigCheckSeverityEnum/ConfigCheckItem/ConfigCheckResult 等共享模型, 以及 AdminConfigChecker/MerchantConfigChecker 抽象基类和商户级 Checker(ChannelMerchant/MchApp/MchCredential/MchNotifyConfig/PayRoute) 从 payment-core/check/ 迁移到 payment-core/common/check/, admin 端 Platform Checker 同步调整引用。 --- .../admin/check/checker/PlatformOssChecker.java | 6 +++--- .../admin/check/checker/PlatformUrlChecker.java | 6 +++--- .../admin/check/checker/PlatformWebsiteChecker.java | 6 +++--- .../admin/check/checker/SocialLoginChecker.java | 6 +++--- .../admin/check/service/AdminConfigCheckService.java | 6 +++--- .../controller/check/AdminConfigCheckController.java | 2 +- .../check/checker/AdminConfigChecker.java | 6 +++--- .../check/checker/MerchantConfigChecker.java | 7 ++++--- .../checker/merchant/ChannelMerchantChecker.java | 8 ++++---- .../check/checker/merchant/MchAppChecker.java | 8 ++++---- .../check/checker/merchant/MchCredentialChecker.java | 8 ++++---- .../checker/merchant/MchNotifyConfigChecker.java | 8 ++++---- .../check/checker/merchant/PayRouteChecker.java | 9 ++++----- .../check/enums/ConfigCheckCategoryEnum.java | 2 +- .../check/enums/ConfigCheckSeverityEnum.java | 2 +- .../{ => common}/check/model/ConfigCheckItem.java | 12 +++++++----- .../{ => common}/check/model/ConfigCheckResult.java | 3 +-- .../check/service/MerchantConfigCheckService.java | 10 +++++----- .../check/MerchantConfigCheckController.java | 4 ++-- 19 files changed, 60 insertions(+), 59 deletions(-) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/checker/AdminConfigChecker.java (79%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/checker/MerchantConfigChecker.java (74%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/checker/merchant/ChannelMerchantChecker.java (84%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/checker/merchant/MchAppChecker.java (84%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/checker/merchant/MchCredentialChecker.java (84%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/checker/merchant/MchNotifyConfigChecker.java (89%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/checker/merchant/PayRouteChecker.java (86%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/enums/ConfigCheckCategoryEnum.java (94%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/enums/ConfigCheckSeverityEnum.java (90%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/model/ConfigCheckItem.java (77%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/model/ConfigCheckResult.java (87%) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/{ => common}/check/service/MerchantConfigCheckService.java (87%) diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformOssChecker.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformOssChecker.java index 9495dcfee..82e06f764 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformOssChecker.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformOssChecker.java @@ -1,8 +1,8 @@ package cn.daxpay.open.payment.admin.check.checker; -import cn.daxpay.open.payment.check.checker.AdminConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.AdminConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.platform.system.enums.EncryptPlatformConfigTypeEnum; import cn.daxpay.open.platform.system.service.config.SystemPlatformEncryptConfigService; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformUrlChecker.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformUrlChecker.java index 74a05bc44..3893e5c90 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformUrlChecker.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformUrlChecker.java @@ -1,8 +1,8 @@ package cn.daxpay.open.payment.admin.check.checker; -import cn.daxpay.open.payment.check.checker.AdminConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.AdminConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.platform.system.entity.config.platform.infra.PlatformUrlConfig; import cn.daxpay.open.platform.system.enums.PlatformConfigTypeEnum; import cn.daxpay.open.platform.system.service.config.SystemPlatformConfigService; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformWebsiteChecker.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformWebsiteChecker.java index c6720af73..22b421822 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformWebsiteChecker.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformWebsiteChecker.java @@ -1,8 +1,8 @@ package cn.daxpay.open.payment.admin.check.checker; -import cn.daxpay.open.payment.check.checker.AdminConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.AdminConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.platform.system.entity.config.platform.infra.PlatformWebsiteConfig; import cn.daxpay.open.platform.system.enums.PlatformConfigTypeEnum; import cn.daxpay.open.platform.system.service.config.SystemPlatformConfigService; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/SocialLoginChecker.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/SocialLoginChecker.java index 4bf868fe6..0276d7e21 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/SocialLoginChecker.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/SocialLoginChecker.java @@ -1,8 +1,8 @@ package cn.daxpay.open.payment.admin.check.checker; -import cn.daxpay.open.payment.check.checker.AdminConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.AdminConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.platform.iam.dao.social.SocialLoginConfigManager; import cn.daxpay.open.platform.iam.entity.social.SocialLoginConfig; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/service/AdminConfigCheckService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/service/AdminConfigCheckService.java index 08cad9be6..40777405d 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/service/AdminConfigCheckService.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/service/AdminConfigCheckService.java @@ -1,8 +1,8 @@ package cn.daxpay.open.payment.admin.check.service; -import cn.daxpay.open.payment.check.checker.AdminConfigChecker; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; -import cn.daxpay.open.payment.check.model.ConfigCheckResult; +import cn.daxpay.open.payment.common.check.checker.AdminConfigChecker; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.model.ConfigCheckResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/check/AdminConfigCheckController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/check/AdminConfigCheckController.java index 72dbe97e6..d2eceee61 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/check/AdminConfigCheckController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/check/AdminConfigCheckController.java @@ -3,7 +3,7 @@ package cn.daxpay.open.payment.admin.controller.check; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; import cn.daxpay.open.payment.admin.check.service.AdminConfigCheckService; -import cn.daxpay.open.payment.check.model.ConfigCheckResult; +import cn.daxpay.open.payment.common.check.model.ConfigCheckResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/AdminConfigChecker.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/AdminConfigChecker.java similarity index 79% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/AdminConfigChecker.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/AdminConfigChecker.java index 4e667433e..54f5f9db7 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/AdminConfigChecker.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/AdminConfigChecker.java @@ -1,7 +1,7 @@ -package cn.daxpay.open.payment.check.checker; +package cn.daxpay.open.payment.common.check.checker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; /// # 运营端配置检查器接口 /// diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/MerchantConfigChecker.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/MerchantConfigChecker.java similarity index 74% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/MerchantConfigChecker.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/MerchantConfigChecker.java index 6383b2e87..49d2cc244 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/MerchantConfigChecker.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/MerchantConfigChecker.java @@ -1,7 +1,8 @@ -package cn.daxpay.open.payment.check.checker; +package cn.daxpay.open.payment.common.check.checker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.service.MerchantConfigCheckService; /// # 商户端配置检查器接口 /// diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/ChannelMerchantChecker.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/ChannelMerchantChecker.java similarity index 84% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/ChannelMerchantChecker.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/ChannelMerchantChecker.java index 93ccb7a49..6e06c034c 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/ChannelMerchantChecker.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/ChannelMerchantChecker.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.check.checker.merchant; +package cn.daxpay.open.payment.common.check.checker.merchant; -import cn.daxpay.open.payment.check.checker.MerchantConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.MerchantConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.payment.merchant.dao.channel.ChannelMerchantManager; import cn.daxpay.open.payment.merchant.entity.channel.ChannelMerchant; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchAppChecker.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchAppChecker.java similarity index 84% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchAppChecker.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchAppChecker.java index 56198de84..2f2e2846e 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchAppChecker.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchAppChecker.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.check.checker.merchant; +package cn.daxpay.open.payment.common.check.checker.merchant; -import cn.daxpay.open.payment.check.checker.MerchantConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.MerchantConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.payment.merchant.dao.appinfo.MchAppInfoManager; import cn.daxpay.open.payment.merchant.entity.appinfo.MchAppInfo; import cn.daxpay.open.platform.core.enums.merchant.MchAppStatusEnum; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchCredentialChecker.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchCredentialChecker.java similarity index 84% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchCredentialChecker.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchCredentialChecker.java index dea338c91..f8a6d5868 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchCredentialChecker.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchCredentialChecker.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.check.checker.merchant; +package cn.daxpay.open.payment.common.check.checker.merchant; -import cn.daxpay.open.payment.check.checker.MerchantConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.MerchantConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.payment.merchant.dao.config.MerchantCredentialManager; import cn.daxpay.open.payment.merchant.entity.config.MerchantCredential; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchNotifyConfigChecker.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchNotifyConfigChecker.java similarity index 89% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchNotifyConfigChecker.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchNotifyConfigChecker.java index f879ddddd..c8c765896 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchNotifyConfigChecker.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchNotifyConfigChecker.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.check.checker.merchant; +package cn.daxpay.open.payment.common.check.checker.merchant; -import cn.daxpay.open.payment.check.checker.MerchantConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.MerchantConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.payment.merchant.dao.appinfo.MchAppInfoManager; import cn.daxpay.open.payment.merchant.dao.config.MchAppNotifyConfigManager; import cn.daxpay.open.payment.merchant.entity.appinfo.MchAppInfo; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/PayRouteChecker.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/PayRouteChecker.java similarity index 86% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/PayRouteChecker.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/PayRouteChecker.java index 8f1ec6fec..13bdf75f7 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/PayRouteChecker.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/PayRouteChecker.java @@ -1,12 +1,11 @@ -package cn.daxpay.open.payment.check.checker.merchant; +package cn.daxpay.open.payment.common.check.checker.merchant; -import cn.daxpay.open.payment.check.checker.MerchantConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.checker.MerchantConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; import cn.daxpay.open.payment.merchant.dao.appinfo.MchAppInfoManager; import cn.daxpay.open.payment.merchant.entity.appinfo.MchAppInfo; import cn.daxpay.open.payment.route.dao.strategy.PayRouteStrategyManager; -import cn.daxpay.open.payment.route.entity.strategy.PayRouteStrategy; import cn.daxpay.open.platform.core.enums.merchant.MchAppStatusEnum; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/enums/ConfigCheckCategoryEnum.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/enums/ConfigCheckCategoryEnum.java similarity index 94% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/enums/ConfigCheckCategoryEnum.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/enums/ConfigCheckCategoryEnum.java index b28019db3..76dbedfad 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/enums/ConfigCheckCategoryEnum.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/enums/ConfigCheckCategoryEnum.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.check.enums; +package cn.daxpay.open.payment.common.check.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/enums/ConfigCheckSeverityEnum.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/enums/ConfigCheckSeverityEnum.java similarity index 90% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/enums/ConfigCheckSeverityEnum.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/enums/ConfigCheckSeverityEnum.java index 58900296c..25218edd2 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/enums/ConfigCheckSeverityEnum.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/enums/ConfigCheckSeverityEnum.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.check.enums; +package cn.daxpay.open.payment.common.check.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/model/ConfigCheckItem.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/model/ConfigCheckItem.java similarity index 77% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/model/ConfigCheckItem.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/model/ConfigCheckItem.java index e0746c00d..b2f7d3b7b 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/model/ConfigCheckItem.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/model/ConfigCheckItem.java @@ -1,5 +1,7 @@ -package cn.daxpay.open.payment.check.model; +package cn.daxpay.open.payment.common.check.model; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckSeverityEnum; import lombok.Data; import lombok.experimental.Accessors; @@ -12,7 +14,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class ConfigCheckItem { - /// 所属分类 code(对应 [cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum#getCode]) + /// 所属分类 code(对应 [ConfigCheckCategoryEnum#getCode]) private String category; /// 唯一键(用于前端去重/定位, 如 `pay_product:alipay`、`mch_app`) @@ -24,7 +26,7 @@ public class ConfigCheckItem { /// 描述 i18n key(前端 `$t(descriptionKey)` 解析) private String descriptionKey; - /// 严重程度 code(对应 [cn.daxpay.open.payment.check.enums.ConfigCheckSeverityEnum#getCode]) + /// 严重程度 code(对应 [ConfigCheckSeverityEnum#getCode]) private String severity; /// 前端路由 name, 点击该项时跳转 @@ -37,7 +39,7 @@ public class ConfigCheckItem { /// 前端用于显示"N 项待配置", 并在跳转列表后聚焦这些条目 private Integer count; - public static ConfigCheckItem of(cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum category, + public static ConfigCheckItem of(ConfigCheckCategoryEnum category, String itemKey, String titleKey, String descriptionKey, String routeName) { return new ConfigCheckItem() .setCategory(category.getCode()) @@ -45,6 +47,6 @@ public class ConfigCheckItem { .setTitleKey(titleKey) .setDescriptionKey(descriptionKey) .setRouteName(routeName) - .setSeverity(cn.daxpay.open.payment.check.enums.ConfigCheckSeverityEnum.SUGGEST.getCode()); + .setSeverity(ConfigCheckSeverityEnum.SUGGEST.getCode()); } } diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/model/ConfigCheckResult.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/model/ConfigCheckResult.java similarity index 87% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/model/ConfigCheckResult.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/model/ConfigCheckResult.java index 67db9db41..4968c5c54 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/model/ConfigCheckResult.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/model/ConfigCheckResult.java @@ -1,6 +1,5 @@ -package cn.daxpay.open.payment.check.model; +package cn.daxpay.open.payment.common.check.model; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/service/MerchantConfigCheckService.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/service/MerchantConfigCheckService.java similarity index 87% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/service/MerchantConfigCheckService.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/service/MerchantConfigCheckService.java index 167e081b8..5cb4c6c11 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/service/MerchantConfigCheckService.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/service/MerchantConfigCheckService.java @@ -1,9 +1,9 @@ -package cn.daxpay.open.payment.check.service; +package cn.daxpay.open.payment.common.check.service; -import cn.daxpay.open.payment.check.checker.MerchantConfigChecker; -import cn.daxpay.open.payment.check.enums.ConfigCheckCategoryEnum; -import cn.daxpay.open.payment.check.model.ConfigCheckItem; -import cn.daxpay.open.payment.check.model.ConfigCheckResult; +import cn.daxpay.open.payment.common.check.checker.MerchantConfigChecker; +import cn.daxpay.open.payment.common.check.enums.ConfigCheckCategoryEnum; +import cn.daxpay.open.payment.common.check.model.ConfigCheckItem; +import cn.daxpay.open.payment.common.check.model.ConfigCheckResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/check/MerchantConfigCheckController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/check/MerchantConfigCheckController.java index e8240572d..34ca40a7e 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/check/MerchantConfigCheckController.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/check/MerchantConfigCheckController.java @@ -2,8 +2,8 @@ package cn.daxpay.open.payment.merchant.controller.check; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; -import cn.daxpay.open.payment.check.model.ConfigCheckResult; -import cn.daxpay.open.payment.check.service.MerchantConfigCheckService; +import cn.daxpay.open.payment.common.check.model.ConfigCheckResult; +import cn.daxpay.open.payment.common.check.service.MerchantConfigCheckService; import cn.daxpay.open.payment.common.context.PaymentContext; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;