From b661e60687c58bf65b8f40ba75f1139ebaa4cae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 14 Oct 2022 17:12:27 +0800
Subject: [PATCH] 1

---
 globals/api/api.go |  4 +--
 main.go            | 72 +++++++++++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/globals/api/api.go b/globals/api/api.go
index 8f8c2e952..d5d209f47 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -292,9 +292,7 @@ func Init() {
 		AliPayAPI = alipayapi.New(alipayAppID, []byte(beego.AppConfig.DefaultString("alipayPrivateKey", "")))
 	}
 
-	// todo
-	//FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", ""))
-	FnAPI = fnpsapi.New("", "", "", "")
+	FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", ""))
 	FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", ""))
 	XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", ""))
 	YilianyunAPI = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID", ""), beego.AppConfig.DefaultString("yilianyunClientSecret", ""))
diff --git a/main.go b/main.go
index 987109b7c..56ccef697 100644
--- a/main.go
+++ b/main.go
@@ -134,44 +134,44 @@ func checkCmdFlags() bool {
 func main() {
 	if !checkCmdFlags() {
 		Init()
-		//if err := tasks.RefreshWeixinToken(); err != nil {
-		//	globals.SugarLogger.Errorf("RefreshWeixinToken failed with error:%s", err)
-		//	return
-		//}
-		//if err := tasks.RefreshWeixin2Token(); err != nil {
-		//	globals.SugarLogger.Errorf("RefreshWeixin2Token failed with error:%s", err)
-		//	return
-		//}
-		//if err := tasks.RefreshWeixin3Token(); err != nil {
-		//	globals.SugarLogger.Errorf("RefreshWeixin3Token failed with error:%s", err)
-		//	return
-		//}
-		//// if err := tasks.RefreshWeimobToken(); err != nil {
-		//// 	globals.SugarLogger.Errorf("RefreshWeimobToken failed with error:%s", err)
-		//// 	return
-		//// }
-		//if err := tasks.RefreshYilianyunToken(); err != nil {
-		//	globals.SugarLogger.Errorf("RefreshYilianyunToken failed with error:%s", err)
-		//	return
-		//}
-		//if err := tasks.RefreshPushToken(); err != nil {
-		//	globals.SugarLogger.Errorf("RefreshPushToken failed with error:%s", err)
-		//	return
-		//}
-		//if web.BConfig.RunMode != "jxgy" {
-		//	if err := tasks.RefreshFnToken(); err != nil {
-		//		globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err)
-		//		return
-		//	}
-		//}
-		////if err := tasks.RefreshTiktokToken(); err != nil {
-		////	globals.SugarLogger.Errorf("RefreshTiktokToken failed with error:%s", err)
-		////	return
-		////}
-		//if err := tasks.RefreshQywxToken(); err != nil {
-		//	globals.SugarLogger.Errorf("RefreshQywxToken failed with error:%s", err)
+		if err := tasks.RefreshWeixinToken(); err != nil {
+			globals.SugarLogger.Errorf("RefreshWeixinToken failed with error:%s", err)
+			return
+		}
+		if err := tasks.RefreshWeixin2Token(); err != nil {
+			globals.SugarLogger.Errorf("RefreshWeixin2Token failed with error:%s", err)
+			return
+		}
+		if err := tasks.RefreshWeixin3Token(); err != nil {
+			globals.SugarLogger.Errorf("RefreshWeixin3Token failed with error:%s", err)
+			return
+		}
+		// if err := tasks.RefreshWeimobToken(); err != nil {
+		// 	globals.SugarLogger.Errorf("RefreshWeimobToken failed with error:%s", err)
+		// 	return
+		// }
+		if err := tasks.RefreshYilianyunToken(); err != nil {
+			globals.SugarLogger.Errorf("RefreshYilianyunToken failed with error:%s", err)
+			return
+		}
+		if err := tasks.RefreshPushToken(); err != nil {
+			globals.SugarLogger.Errorf("RefreshPushToken failed with error:%s", err)
+			return
+		}
+		if web.BConfig.RunMode != "jxgy" {
+			if err := tasks.RefreshFnToken(); err != nil {
+				globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err)
+				return
+			}
+		}
+		//if err := tasks.RefreshTiktokToken(); err != nil {
+		//	globals.SugarLogger.Errorf("RefreshTiktokToken failed with error:%s", err)
 		//	return
 		//}
+		if err := tasks.RefreshQywxToken(); err != nil {
+			globals.SugarLogger.Errorf("RefreshQywxToken failed with error:%s", err)
+			return
+		}
 
 		// if globals.IsProductEnv() {
 		// 	orderman.SaveJdsOrders(nil, time.Now().Add(-2*time.Hour), time.Now())