From e169216f08b376276fdd99965cbfacba8b9c7152 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, 25 Jan 2021 10:42:04 +0800
Subject: [PATCH] aa

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

diff --git a/conf/app.conf b/conf/app.conf
index 2437fa4d7..c5ae11883 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -158,6 +158,11 @@ jd3Token  = "5e2c0a60-4450-40c0-a1da-b560051251ea"
 jd3AppKey = "21b627c23ea04c69b64b48d0b361213e"
 jd3Secret = "51cd27a748e64c829b4b7f83f4844610"
 
+jdcsOrgCode = "362665"
+jdcsToken  = "b3a64a71-90b0-4ee7-a572-80a2266a2a52"
+jdcsAppKey = "9e4ebe035ba74c8f913bf51e6af3974c"
+jdcsSecret = "8eb9778f1099416795c501b76dbb2e79"
+
 elmIsProd = false
 elmToken  = "2d2b583447b04b6bba5a6f3faed3559b"
 elmAppKey = "RwT214gAsS"
@@ -201,6 +206,11 @@ jd3Token  = "5e2c0a60-4450-40c0-a1da-b560051251ea"
 jd3AppKey = "21b627c23ea04c69b64b48d0b361213e"
 jd3Secret = "51cd27a748e64c829b4b7f83f4844610"
 
+jdcsOrgCode = "362665"
+jdcsToken  = "b3a64a71-90b0-4ee7-a572-80a2266a2a52"
+jdcsAppKey = "9e4ebe035ba74c8f913bf51e6af3974c"
+jdcsSecret = "8eb9778f1099416795c501b76dbb2e79"
+
 jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
diff --git a/globals/api/api.go b/globals/api/api.go
index 64c1a4f5b..f8e53885f 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -51,6 +51,7 @@ var (
 
 	Jd2API     *jdapi.API
 	Jd3API     *jdapi.API
+	JdcsAPI    *jdapi.API
 	FakeJdAPI  *jdapi.API
 	JdEclpAPI  *jdeclpapi.API
 	JdShopAPI  *jdshopapi.API
@@ -127,6 +128,10 @@ func Init() {
 			Jd3API = jdapi.New(beego.AppConfig.String("jd3Token"), beego.AppConfig.String("jd3AppKey"), beego.AppConfig.String("jd3Secret"))
 		}
 
+		if globals.JdcsOrgCode != "" {
+			JdcsAPI = jdapi.New(beego.AppConfig.String("jdcsToken"), beego.AppConfig.String("jdcsAppKey"), beego.AppConfig.String("jdcsSecret"))
+		}
+
 		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 901ca5c2d..13f1f721f 100644
--- a/globals/api/apimanager/apimanager.go
+++ b/globals/api/apimanager/apimanager.go
@@ -41,6 +41,8 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
 			pfAPI = api.Jd2API
 		} else if appOrgCode != "" && appOrgCode == globals.Jd3OrgCode {
 			pfAPI = api.Jd3API
+		} else if appOrgCode != "" && appOrgCode == globals.JdcsOrgCode {
+			pfAPI = api.JdcsAPI
 		}
 	case model.VendorIDMTWM:
 		pfAPI = api.MtwmAPI
@@ -63,7 +65,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)
+		appOrgCodeList = jxutils.BatchString2Slice(globals.JdOrgCode, globals.Jd2OrgCode, globals.Jd3OrgCode, globals.JdcsOrgCode)
 	case model.VendorIDMTWM:
 		appOrgCodeList = []string{api.MtwmAPI.GetAppID()}
 	case model.VendorIDEBAI:
diff --git a/globals/globals.go b/globals/globals.go
index a052b07f5..3a435c3e6 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -63,6 +63,7 @@ var (
 	JdOrgCode   string
 	Jd2OrgCode  string
 	Jd3OrgCode  string
+	JdcsOrgCode string
 	JdLoginName string
 
 	MtwmCode  string
@@ -142,6 +143,7 @@ func Init() {
 	JdOrgCode = beego.AppConfig.DefaultString("jdOrgCode", "")
 	Jd2OrgCode = beego.AppConfig.DefaultString("jd2OrgCode", "")
 	Jd3OrgCode = beego.AppConfig.DefaultString("jd3OrgCode", "")
+	JdcsOrgCode = beego.AppConfig.DefaultString("jdcsOrgCode", "")
 	JdLoginName = beego.AppConfig.DefaultString("jdLoginName", "")
 	IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false)
 	IsStoreSkuAct = !IsProductEnv()