From 2955d028efefda619e3015be91db3952fb2018cd Mon Sep 17 00:00:00 2001
From: liwq <122639653@qq.com>
Date: Fri, 23 May 2025 18:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A1=86=E6=9E=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0sdk=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdk/payment/client/PayClientFactory.java  |  3 +-
 .../client/impl/NonePayClientConfig.java      | 30 -------------------
 .../payment/enums/channel/PayChannelEnum.java |  5 +---
 3 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/impl/NonePayClientConfig.java

diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/PayClientFactory.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/PayClientFactory.java
index ec22796..57a1093 100644
--- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/PayClientFactory.java
+++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/PayClientFactory.java
@@ -25,8 +25,7 @@ public interface PayClientFactory {
      * @param config 支付配置
      * @return 支付客户端
      */
-    <Config extends PayClientConfig> PayClient createOrUpdatePayClient(Long channelId, String channelCode,
-                                                                       Config config);
+    <Config extends PayClientConfig> PayClient createOrUpdatePayClient(Long channelId, String channelCode, Config config);
 
     /**
      * 注册支付客户端 Class，用于模块中实现的 PayClient
diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/impl/NonePayClientConfig.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/impl/NonePayClientConfig.java
deleted file mode 100644
index 6396db0..0000000
--- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/impl/NonePayClientConfig.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.tashow.cloud.sdk.payment.client.impl;
-
-import com.tashow.cloud.sdk.payment.client.PayClientConfig;
-import jakarta.validation.Validator;
-import lombok.Data;
-
-/**
- * 无需任何配置 PayClientConfig 实现类
- *
- * @author jason
- */
-@Data
-public class NonePayClientConfig implements PayClientConfig {
-
-    /**
-     * 配置名称
-     * <p>
-     * 如果不加任何属性，JsonUtils.parseObject2 解析会报错，所以暂时加个名称
-     */
-    private String name;
-
-    public NonePayClientConfig(){
-        this.name = "none-config";
-    }
-
-    @Override
-    public void validate(Validator validator) {
-        // 无任何配置不需要校验
-    }
-}
diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/channel/PayChannelEnum.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/channel/PayChannelEnum.java
index 4b6dd75..efb0eff 100644
--- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/channel/PayChannelEnum.java
+++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/channel/PayChannelEnum.java
@@ -2,7 +2,6 @@ package com.tashow.cloud.sdk.payment.enums.channel;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.tashow.cloud.sdk.payment.client.PayClientConfig;
-import com.tashow.cloud.sdk.payment.client.impl.NonePayClientConfig;
 import com.tashow.cloud.sdk.payment.client.impl.alipay.AlipayPayClientConfig;
 import com.tashow.cloud.sdk.payment.client.impl.weixin.WxPayClientConfig;
 import lombok.AllArgsConstructor;
@@ -29,9 +28,7 @@ public enum PayChannelEnum {
     ALIPAY_APP("alipay_app", "支付宝App 支付", AlipayPayClientConfig.class),
     ALIPAY_QR("alipay_qr", "支付宝扫码支付", AlipayPayClientConfig.class),
     ALIPAY_BAR("alipay_bar", "支付宝条码支付", AlipayPayClientConfig.class),
-    MOCK("mock", "模拟支付", NonePayClientConfig.class),
-
-    WALLET("wallet", "钱包支付", NonePayClientConfig.class);
+    ;
 
     /**
      * 编码