From 32988d0ceee90b885a418da996caa4c8c709f22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 17 Nov 2020 10:32:18 +0800
Subject: [PATCH] aa

---
 globals/api/api.go | 7 +++----
 main.go            | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/globals/api/api.go b/globals/api/api.go
index 613c89d41..fee6212e1 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -1,7 +1,6 @@
 package api
 
 import (
-	"io/ioutil"
 	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/mtmemberapi"
@@ -230,10 +229,10 @@ func Init() {
 	}
 	// if globals.WxpayNotifyURL != "" {
 	// WxpayAPI = wxpayapi.New(beego.AppConfig.String("wxpayAppID"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID"))
-	certPEMBlock, _ := ioutil.ReadFile("conf/apiclient_cert.pem")
-	keyPEMBlock, _ := ioutil.ReadFile("conf/apiclient_key.pem")
+	// certPEMBlock, _ := ioutil.ReadFile("conf/apiclient_cert.pem")
+	// keyPEMBlock, _ := ioutil.ReadFile("conf/apiclient_key.pem")
 	WxpayAPI = wxpayapi.NewWithCertificate(beego.AppConfig.String("wxpayAppID"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID"),
-		certPEMBlock, keyPEMBlock)
+		"conf/apiclient_cert.pem", "conf/apiclient_key.pem")
 	// }
 
 	if globals.TLPayNotifyURL != "" {
diff --git a/main.go b/main.go
index 6e48707b2..ef0996a5f 100644
--- a/main.go
+++ b/main.go
@@ -23,6 +23,7 @@ import (
 	_ "git.rosy.net.cn/jx-callback/business/auth2/authprovider/mobile"
 	_ "git.rosy.net.cn/jx-callback/business/auth2/authprovider/password"
 	_ "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
+	_ "git.rosy.net.cn/jx-callback/globals/api"
 
 	_ "git.rosy.net.cn/jx-callback/routers"
 )