From 54937a1e7bcca0f4683b52318edf9ffda70e3d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 4 Mar 2021 11:34:12 +0800
Subject: [PATCH] aa

---
 globals/api/api.go                   | 21 +++++++++++++--------
 globals/api/apimanager/apimanager.go | 19 ++++++++++---------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/globals/api/api.go b/globals/api/api.go
index 843a0ce2b..bbfa8515b 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -112,29 +112,34 @@ func init() {
 // 这样写的原因是在测试时，可以重新读取配置文件
 func Init() {
 	if !beego.AppConfig.DefaultBool("disableJd", false) {
-		JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret"))
-		// cookieValue := beego.AppConfig.DefaultString("jdStorePageCookie", "")
-		// JdAPI.SetJdCookie(cookieValue)
+		//初始化京东api
+		// JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret"))
+		JdAPI = jdapi.New("", "", "")
+		cookieValue := beego.AppConfig.DefaultString("jdStorePageCookie", "")
+		JdAPI.SetJdCookie(cookieValue)
 
 		conf := platformapi.NewDefAPIConfig()
 		conf.MaxSleepSecondWhenExceedLimit = 60 * 30 // 最大重试间隙30分钟
 		JdPageAPI = jdapi.NewPageOnly("", conf)
 
 		if globals.Jd2OrgCode != "" {
-			Jd2API = jdapi.New(beego.AppConfig.String("jd2Token"), beego.AppConfig.String("jd2AppKey"), beego.AppConfig.String("jd2Secret"))
-			// Jd2API.SetJdCookie(beego.AppConfig.DefaultString("jd2StorePageCookie", ""))
+			// Jd2API = jdapi.New(beego.AppConfig.String("jd2Token"), beego.AppConfig.String("jd2AppKey"), beego.AppConfig.String("jd2Secret"))
+			Jd2API = jdapi.New("", "", "")
 		}
 
 		if globals.Jd3OrgCode != "" {
-			Jd3API = jdapi.New(beego.AppConfig.String("jd3Token"), beego.AppConfig.String("jd3AppKey"), beego.AppConfig.String("jd3Secret"))
+			// Jd3API = jdapi.New(beego.AppConfig.String("jd3Token"), beego.AppConfig.String("jd3AppKey"), beego.AppConfig.String("jd3Secret"))
+			Jd3API = jdapi.New("", "", "")
 		}
 
 		if globals.JdcsOrgCode != "" {
-			JdcsAPI = jdapi.New(beego.AppConfig.String("jdcsToken"), beego.AppConfig.String("jdcsAppKey"), beego.AppConfig.String("jdcsSecret"))
+			// JdcsAPI = jdapi.New(beego.AppConfig.String("jdcsToken"), beego.AppConfig.String("jdcsAppKey"), beego.AppConfig.String("jdcsSecret"))
+			JdAPI = jdapi.New("", "", "")
 		}
 
 		if globals.JdydOrgCode != "" {
-			JdydAPI = jdapi.New(beego.AppConfig.String("jdydToken"), beego.AppConfig.String("jdydAppKey"), beego.AppConfig.String("jdydSecret"))
+			// JdydAPI = jdapi.New(beego.AppConfig.String("jdydToken"), beego.AppConfig.String("jdydAppKey"), beego.AppConfig.String("jdydSecret"))
+			JdAPI = jdapi.New("", "", "")
 		}
 
 		fakeJdToken := beego.AppConfig.DefaultString("fakeJdToken", "")
diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go
index 21275ad6f..bce9f062e 100644
--- a/globals/api/apimanager/apimanager.go
+++ b/globals/api/apimanager/apimanager.go
@@ -1,9 +1,11 @@
 package apimanager
 
 import (
+	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -32,19 +34,18 @@ func init() {
 }
 
 func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) {
+	var (
+		db = dao.GetDB()
+	)
 	switch vendorID {
 	case model.VendorIDJD:
-		pfAPI = api.JdAPI
 		if appOrgCode == FakeJdOrgCode {
 			pfAPI = api.FakeJdAPI
-		} else if appOrgCode != "" && appOrgCode == globals.Jd2OrgCode {
-			pfAPI = api.Jd2API
-		} else if appOrgCode != "" && appOrgCode == globals.Jd3OrgCode {
-			pfAPI = api.Jd3API
-		} else if appOrgCode != "" && appOrgCode == globals.JdcsOrgCode {
-			pfAPI = api.JdcsAPI
-		} else if appOrgCode != "" && appOrgCode == globals.JdydOrgCode {
-			pfAPI = api.JdydAPI
+		} else {
+			codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform")
+			code := codes[0]
+			api.JdAPI = jdapi.New(code.Token, code.AppKey, code.AppSecret)
+			pfAPI = api.JdAPI
 		}
 	case model.VendorIDMTWM:
 		pfAPI = api.MtwmAPI