From ef1999eb2c2c9f60a91bc0cee273c283c65d1352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 16:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8Eapi?=
 =?UTF-8?q?=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf      | 7 ++++++-
 globals/api/api.go | 8 ++++++++
 globals/globals.go | 2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/conf/app.conf b/conf/app.conf
index aa1ba819b..b57561713 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -379,7 +379,8 @@ enableEbaiStoreWrite = false
 enableElmStoreWrite = false
 enableMtwmStoreWrite = false
 enableWscStoreWrite = false
-enableYbStoreWrite = true
+enableYbStoreWrite = false
+enableJdShopWrite = true
 
 jdOrgCode = "320406"
 jdLoginName = "jd_jxcs1223"
@@ -396,6 +397,10 @@ jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 
+jdShopAccessToken = "da8db492e20149e494afaf5607e1d6654zgi"
+jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
+jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
+
 elmIsProd = true
 elmToken  = ""
 elmAppKey = "KLRDcOZGrk"
diff --git a/globals/api/api.go b/globals/api/api.go
index befd77026..9fd4b40ec 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -3,6 +3,8 @@ package api
 import (
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+
 	"git.rosy.net.cn/baseapi/platformapi/aliupcapi"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdeclpapi"
@@ -46,6 +48,7 @@ var (
 	Jd2API    *jdapi.API
 	FakeJdAPI *jdapi.API
 	JdEclpAPI *jdeclpapi.API
+	JdShopAPI *jdshopapi.API
 
 	ElmAPI   *elmapi.API
 	EbaiAPI  *ebaiapi.API
@@ -118,6 +121,11 @@ func Init() {
 	} else {
 		JdEclpAPI = nil
 	}
+	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
+		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
+	} else {
+		JdShopAPI = nil
+	}
 	if !beego.AppConfig.DefaultBool("disableElm", false) {
 		ElmAPI = elmapi.New(beego.AppConfig.DefaultString("elmToken", ""), beego.AppConfig.String("elmAppKey"), beego.AppConfig.String("elmSecret"), beego.AppConfig.DefaultBool("elmIsProd", false))
 	} else {
diff --git a/globals/globals.go b/globals/globals.go
index b368ac083..6447c9fad 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -25,6 +25,7 @@ var (
 	EnableWscStoreWrite  bool
 	EnablePendingChange  bool
 	EnableYbStoreWrite   bool
+	EnableJdShopWrite    bool //京东商城
 
 	QiniuBucket       string
 	WeimobCallbackURL string
@@ -94,6 +95,7 @@ func Init() {
 	EnableWscStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableWscStoreWrite", false)
 	// EnablePendingChange = beego.AppConfig.DefaultBool("enablePendingChange", false)
 	EnableYbStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableYbStoreWrite", false)
+	EnableJdShopWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableJdShopWrite", false)
 
 	QiniuBucket = beego.AppConfig.String("qiniuBucket")