更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/paySetting/WxPayConfigModel.java

@@ -30,7 +30,10 @@ public class WxPayConfigModel {
     public String apiV3Key;
 
     @Schema(description = "认证类型")
-    public String AuthenticationType;
+    public String authenticationType;
+
+    @Schema(description = "key文件地址类型，oss、local")
+    private String privateKeyType = "";
 
     @Schema(description = "私钥地址")
     public String privateKeyPath;
@@ -38,6 +41,4 @@ public class WxPayConfigModel {
     @Schema(description = "支付成功回调地址")
     private String notifyUrl;
 
-    @Schema(description = "证书地址")
-    private String pemFileUrl;
 }

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/paySetting/WxPayConfigParam.java

@@ -30,14 +30,15 @@ public class WxPayConfigParam {
     public String apiV3Key;
 
     @Schema(description = "认证类型")
-    public String AuthenticationType;
+    public String authenticationType = "WECHATPAY2-SHA256-RSA2048";
 
-    @Schema(description = "私钥地址")
+    @Schema(description = "key文件地址类型，oss、local")
+    private String privateKeyType = "";
+
+    @Schema(description = "私钥文件地址")
     public String privateKeyPath;
 
     @Schema(description = "支付成功回调地址")
     private String notifyUrl;
 
-    @Schema(description = "证书地址")
-    private String pemFileUrl;
 }

FullCardClient/src/main/java/com/zhongshu/card/client/service/ProjectPaySettingFeignService.java

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.service;
+
+import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
+import com.zhongshu.card.client.model.payment.paySetting.*;
+import com.zhongshu.card.client.ret.ResultContent;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+
+@FeignClient(name = "fullcardserver-trx/project/paySetting")
+public interface ProjectPaySettingFeignService {
+
+    @Operation(summary = "项目关联的微信支付配置", description = "项目关联的微信支付配置")
+    @RequestMapping(value = "manager/getProjectWxPayConfig", method = RequestMethod.POST)
+    ResultContent<WxPayConfigModel> getProjectWxPayConfig(@RequestBody ProjectWxPayParam param);
+
+}

FullCardClient/src/main/java/com/zhongshu/card/client/service/ProjectPaySettingService.java

@@ -11,12 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 
-@FeignClient(name = "fullcardserver-trx/project/paySetting")
 public interface ProjectPaySettingService {
 
     @Operation(summary = "项目关联的微信支付配置", description = "项目关联的微信支付配置")
-    @RequestMapping(value = "manager/getProjectWxPayConfig", method = RequestMethod.POST)
-    ResultContent<WxPayConfigModel> getProjectWxPayConfig(@RequestBody ProjectWxPayParam param);
+    ResultContent<WxPayConfigModel> getProjectWxPayConfig(ProjectWxPayParam param);
 
     ResultContent setProjectPaySetting(ProjectPaySettingParam param);
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/WxPayConfig.java

@@ -37,7 +37,10 @@ public class WxPayConfig extends SuperMain {
     public String apiV3Key;
 
     @Schema(description = "认证类型")
-    public String AuthenticationType;
+    public String authenticationType;
+
+    @Schema(description = "key文件地址类型，oss、local")
+    private String privateKeyType = "";
 
     @Schema(description = "私钥地址")
     public String privateKeyPath;
@@ -45,6 +48,4 @@ public class WxPayConfig extends SuperMain {
     @Schema(description = "支付成功回调地址")
     private String notifyUrl;
 
-    @Schema(description = "证书地址")
-    private String pemFileUrl;
 }