From 2773d5c9caee319c10cadb22048928eba791f351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 22 Feb 2021 14:52:10 +0800
Subject: [PATCH] aa

---
 conf/app.conf                        | 5 +++++
 globals/api/api.go                   | 5 +++++
 globals/api/apimanager/apimanager.go | 4 +++-
 globals/globals.go                   | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/conf/app.conf b/conf/app.conf
index af552a65b..0c0078087 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -211,6 +211,11 @@ jdcsToken  = "b3a64a71-90b0-4ee7-a572-80a2266a2a52"
 jdcsAppKey = "9e4ebe035ba74c8f913bf51e6af3974c"
 jdcsSecret = "8eb9778f1099416795c501b76dbb2e79"
 
+jdydOrgCode = "363179"
+jdydToken  = "5c4675f8-c635-4b78-a3a1-e2d91e33eff8"
+jdydAppKey = "420624b948d9436daddf6501200f2ebf"
+jdydSecret = "23064865bd3f49adaa5fc582daac1baf"
+
 jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
diff --git a/globals/api/api.go b/globals/api/api.go
index bbb2d3606..85e1235dc 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -52,6 +52,7 @@ var (
 	Jd2API     *jdapi.API
 	Jd3API     *jdapi.API
 	JdcsAPI    *jdapi.API
+	JdydAPI    *jdapi.API
 	FakeJdAPI  *jdapi.API
 	JdEclpAPI  *jdeclpapi.API
 	JdShopAPI  *jdshopapi.API
@@ -132,6 +133,10 @@ func Init() {
 			JdcsAPI = jdapi.New(beego.AppConfig.String("jdcsToken"), beego.AppConfig.String("jdcsAppKey"), beego.AppConfig.String("jdcsSecret"))
 		}
 
+		if globals.JdydOrgCode != "" {
+			JdydAPI = jdapi.New(beego.AppConfig.String("jdydToken"), beego.AppConfig.String("jdydAppKey"), beego.AppConfig.String("jdydSecret"))
+		}
+
 		fakeJdToken := beego.AppConfig.DefaultString("fakeJdToken", "")
 		if fakeJdToken != "" {
 			FakeJdAPI = jdapi.NewFakeJD(fakeJdToken, beego.AppConfig.String("fakeJdBaseURL"))
diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go
index c11a4dd20..21275ad6f 100644
--- a/globals/api/apimanager/apimanager.go
+++ b/globals/api/apimanager/apimanager.go
@@ -43,6 +43,8 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
 			pfAPI = api.Jd3API
 		} else if appOrgCode != "" && appOrgCode == globals.JdcsOrgCode {
 			pfAPI = api.JdcsAPI
+		} else if appOrgCode != "" && appOrgCode == globals.JdydOrgCode {
+			pfAPI = api.JdydAPI
 		}
 	case model.VendorIDMTWM:
 		pfAPI = api.MtwmAPI
@@ -65,7 +67,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
 func (a *APIManager) GetAppOrgCodeList(vendorID int) (appOrgCodeList []string) {
 	switch vendorID {
 	case model.VendorIDJD:
-		appOrgCodeList = jxutils.BatchString2Slice(globals.JdOrgCode, globals.Jd2OrgCode, globals.Jd3OrgCode, globals.JdcsOrgCode)
+		appOrgCodeList = jxutils.BatchString2Slice(globals.JdOrgCode, globals.Jd2OrgCode, globals.Jd3OrgCode, globals.JdcsOrgCode, globals.JdydOrgCode)
 	case model.VendorIDMTWM:
 		appOrgCodeList = []string{api.MtwmAPI.GetAppID(), api.Mtwm2API.GetAppID()}
 	case model.VendorIDEBAI:
diff --git a/globals/globals.go b/globals/globals.go
index 3a435c3e6..958eddba9 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -64,6 +64,7 @@ var (
 	Jd2OrgCode  string
 	Jd3OrgCode  string
 	JdcsOrgCode string
+	JdydOrgCode string
 	JdLoginName string
 
 	MtwmCode  string
@@ -144,6 +145,7 @@ func Init() {
 	Jd2OrgCode = beego.AppConfig.DefaultString("jd2OrgCode", "")
 	Jd3OrgCode = beego.AppConfig.DefaultString("jd3OrgCode", "")
 	JdcsOrgCode = beego.AppConfig.DefaultString("jdcsOrgCode", "")
+	JdydOrgCode = beego.AppConfig.DefaultString("jdydOrgCode", "")
 	JdLoginName = beego.AppConfig.DefaultString("jdLoginName", "")
 	IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false)
 	IsStoreSkuAct = !IsProductEnv()