Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-web/src/main/java/com/clx/performance/config/nbbank/NbBankConfig.java

@@ -11,8 +11,8 @@ import org.springframework.context.annotation.Configuration;
 @ConfigurationProperties(prefix = "nbbank")
 public class NbBankConfig {
 
-    private String appKey = "77667c76_3503_4c04_95f7_fc10938c7942";
-    private String merId = "EFT33021200556315";
+    private String appKey;
+    private String merId;
     private String configFilePath;
     private String publicKeyPath;
     private String privateKeyPath;

performance-web/src/main/java/com/clx/performance/controller/thirdparty/NbBankController.java

 package com.clx.performance.controller.thirdparty;
 
 import com.alibaba.fastjson.JSON;
+import com.clx.performance.config.nbbank.NbBankConfig;
 import com.clx.performance.service.thirdparty.nbbank.NbBankNotifyService;
 import com.nbopen.api.*;
 import io.swagger.annotations.Api;
@@ -21,6 +22,9 @@ import java.util.Map;
 @Api(tags = "宁波银行回调 (易付通)")
 public class NbBankController {
 
+    @Autowired
+    private NbBankConfig nbBankConfig;
+
     @Autowired
     private NbBankNotifyService nbBankNotifyService;
 
@@ -45,7 +49,7 @@ public class NbBankController {
         data.put("errorMsg", "成功");
 
         RequestApiData requestApiData = new RequestApiData();
-        requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
+        requestApiData.setAppkey(nbBankConfig.getAppKey());
         requestApiData.setData(data);
         requestApiData.setServiceId("notifyMerchant");
 
@@ -70,7 +74,7 @@ public class NbBankController {
         data.put("errorMsg", "失败");
 
         RequestApiData requestApiData = new RequestApiData();
-        requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
+        requestApiData.setAppkey(nbBankConfig.getAppKey());
         requestApiData.setData(data);
         requestApiData.setServiceId("notifyMerchant");