From 175e3bc6f2adbf8bc29f5e695783c099bef214c3 Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Mon, 13 Dec 2021 17:06:45 +0800
Subject: [PATCH] adding wx-pay and Authentication Interceptor logic.

---
 .../smartadmin/module/system/wxpay/MyConfig.java      | 11 +++++++++--
 .../module/system/wxpay/WxpayController.java          |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
index 41570972..1c6acba4 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
@@ -1,19 +1,26 @@
 package net.lab1024.smartadmin.module.system.wxpay;
 
 
+import lombok.Data;
 import net.lab1024.smartadmin.module.system.wxpay.sdk.IWXPayDomain;
 import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConfig;
 import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConstants;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import java.io.*;
 
+@Component
 public class MyConfig implements WXPayConfig {
 
+//    private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/";
+    private String path ="/home/royalcanin-dev/cert/";
+
+
     private byte[] certData;
 
     public MyConfig() throws Exception {
-        String certPath = "C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/apiclient_cert.p12";
-        File file = new File(certPath);
+        File file = new File(path+"apiclient_cert.p12");
         InputStream certStream = new FileInputStream(file);
         this.certData = new byte[(int) file.length()];
         certStream.read(this.certData);
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayController.java
index 0d024323..16703f2d 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayController.java
@@ -8,6 +8,7 @@ import net.lab1024.smartadmin.constant.SwaggerTagConst;
 import net.lab1024.smartadmin.module.system.qrcode.QRCodeUtil;
 import net.lab1024.smartadmin.module.system.wxpay.wxPay.WxPayEntity;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,6 +27,8 @@ import java.util.Map;
 @RestController
 public class WxpayController {
 
+    @Autowired
+    private MyConfig config;
 
 
     @GetMapping("royalcanin/qrCode")
@@ -45,7 +48,6 @@ public class WxpayController {
 
     @PostMapping("royalcanin/unifiedOrder")
     public void unifiedOrder(@RequestBody WxPayEntity wxPayEntity, HttpServletResponse response) throws Exception {
-        MyConfig config = new MyConfig();
         WXPay wxpay = new WXPay(config);
         InetAddress ip4 = Inet4Address.getLocalHost();
         Map<String,String> data  = MapRemoveNullUtil.setConditionMap(wxPayEntity);
@@ -62,7 +64,6 @@ public class WxpayController {
 
     @PostMapping("royalcanin/orderQuery")
     public String orderQuery(@RequestBody WxPayEntity wxPayEntity, HttpServletResponse response) throws Exception {
-        MyConfig config = new MyConfig();
         WXPay wxpay = new WXPay(config);
 
         Map<String, String> data = MapRemoveNullUtil.setConditionMap(wxPayEntity);
@@ -77,7 +78,6 @@ public class WxpayController {
 
     @PostMapping("royalcanin/refundQuery")
     public String refundQuery(@RequestBody WxPayEntity wxPayEntity, HttpServletResponse response) throws Exception {
-        MyConfig config = new MyConfig();
         WXPay wxpay = new WXPay(config);
         Map<String, String> data = MapRemoveNullUtil.setConditionMap(wxPayEntity);
         try {