pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-08 06:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(check): 配置检查体系从 check/ 迁移到 common/check/, 统一 admin/merchant 两端

Browse Source 
将 ConfigCheckCategoryEnum/ConfigCheckSeverityEnum/ConfigCheckItem/ConfigCheckResult 等共享模型,
以及 AdminConfigChecker/MerchantConfigChecker 抽象基类和商户级 Checker(ChannelMerchant/MchApp/MchCredential/MchNotifyConfig/PayRoute)
从 payment-core/check/ 迁移到 payment-core/common/check/, admin 端 Platform Checker 同步调整引用。
This commit is contained in:
DaxPay Dev
2026-07-27 23:28:16 +08:00
parent 44fd38b046
commit a2e68d038e
19 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformOssChecker.java
View File

@@ -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;

6
daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformUrlChecker.java
View File

@@ -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;

6
daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/PlatformWebsiteChecker.java
View File

@@ -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;

6
daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/checker/SocialLoginChecker.java
View File

@@ -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;

6
daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/check/service/AdminConfigCheckService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/check/AdminConfigCheckController.java
View File

@@ -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;

6
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/AdminConfigChecker.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/AdminConfigChecker.java
View File

@@ -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;
/// # 运营端配置检查器接口
///

7
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/MerchantConfigChecker.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/MerchantConfigChecker.java
View File

@@ -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;
/// # 商户端配置检查器接口
///

8
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/ChannelMerchantChecker.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/ChannelMerchantChecker.java
View File

@@ -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;

8
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchAppChecker.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchAppChecker.java
View File

@@ -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;

8
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchCredentialChecker.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchCredentialChecker.java
View File

@@ -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;

8
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/MchNotifyConfigChecker.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/MchNotifyConfigChecker.java
View File

@@ -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;

9
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/checker/merchant/PayRouteChecker.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/checker/merchant/PayRouteChecker.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/enums/ConfigCheckCategoryEnum.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/enums/ConfigCheckCategoryEnum.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/enums/ConfigCheckSeverityEnum.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/enums/ConfigCheckSeverityEnum.java
View File

@@ -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;

12
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/model/ConfigCheckItem.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/model/ConfigCheckItem.java
View File

@@ -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());
}
}

3
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/model/ConfigCheckResult.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/model/ConfigCheckResult.java
View File

@@ -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;

10
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/check/service/MerchantConfigCheckService.java → daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/check/service/MerchantConfigCheckService.java
View File

@@ -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;

4
daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/check/MerchantConfigCheckController.java
View File

@@ -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;