From 6bc9c436abacdede1d84b8485c6360b8781edfd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 20 May 2020 14:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go | 8 ++++----
 conf/app.conf                 | 4 ++++
 globals/api/api.go            | 3 +++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 187bfbfb4..8a0e2348f 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -295,10 +295,10 @@ func Init() {
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "feiePageCookie", model.ConfigTypeCookie, ""); err == nil {
 		feiePageCookie = configs[0].Value
 	}
-	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
-		jdsCookie = configs[0].Value
-		api.JdShopAPI.SetCookieWithStr(jdsCookie)
-	}
+	// if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
+	// 	jdsCookie = configs[0].Value
+	// 	api.JdShopAPI.SetCookieWithStr(jdsCookie)
+	// }
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
 		api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
diff --git a/conf/app.conf b/conf/app.conf
index ab82ff91a..1a090e7a0 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -34,6 +34,8 @@ enableWscStoreWrite = false
 enableYbStoreWrite = false
 enableJdShopWrite = false
 
+jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
+
 aliKey = "LTAI4FwZN7pp4dACQHoapkZQ"
 aliSecret = "NTegceUFX0FdfMovqCDzqcIKmhcoOu"
 
@@ -186,6 +188,7 @@ jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
 jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
 jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
+jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
 
 elmIsProd = true
 elmToken  = ""
@@ -412,6 +415,7 @@ jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
 jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
 jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
+jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
 
 elmIsProd = true
 elmToken  = ""
diff --git a/globals/api/api.go b/globals/api/api.go
index 9fd4b40ec..1b876630e 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -123,6 +123,9 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
+		if jdsCookie := beego.AppConfig.DefaultString("jdsCookie", ""); jdsCookie != "" {
+			JdShopAPI.SetCookieWithStr(jdsCookie)
+		}
 	} else {
 		JdShopAPI = nil
 	}