From 8ca058479424ee4333de43d1a01d6ebb12c6c7f8 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 26 Jun 2018 10:28:26 +0800
Subject: [PATCH] - change all setting to prod.

---
 business/freshfood/freshfood.go | 24 +++++++++-----
 globals/globals2/globals2.go    | 57 ++++++++++++++++++++-------------
 2 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/business/freshfood/freshfood.go b/business/freshfood/freshfood.go
index 807532f0c..fe71af91a 100644
--- a/business/freshfood/freshfood.go
+++ b/business/freshfood/freshfood.go
@@ -5,6 +5,7 @@ import (
 	"net/url"
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi"
 	"git.rosy.net.cn/baseapi/platformapi/dadaapi"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
@@ -98,20 +99,27 @@ func NewFreshFoodAPI(baseURL string) *FreshFoodAPI {
 
 func (f *FreshFoodAPI) AccessFreshFood(apiStr string, params url.Values) error {
 	var err error
+	var response *http.Response
 	fullURL := f.baseURL + "/" + apiStr
 	for i := 0; i < retryCount; i++ {
-		// _, err := f.client.PostForm(fullURL, params)
-		err = error(nil)
-		globals.SugarLogger.Debug(fullURL)
-		globals.SugarLogger.Debug(params)
-		if err == nil {
+		response, err = f.client.PostForm(fullURL, params)
+		// err = error(nil)
+		// globals.SugarLogger.Debug(fullURL)
+		// globals.SugarLogger.Debug(params)
+		if err == nil && response != nil && response.StatusCode == 200 {
 			break
+		} else {
+			globals.SugarLogger.Warnf("Call %s error:%v, response: %v", fullURL, err, response)
 		}
 	}
-	if err != nil {
-		globals.SugarLogger.Warnf("Call %s error:%v", fullURL, err)
+	if err != nil || response.StatusCode != 200 {
+		globals.SugarLogger.Errorf("Call %s error:%v, response: %v", fullURL, err, response)
+		if err != nil {
+			return err
+		}
+		return platformapi.ErrHTTPCodeIsNot200
 	}
-	return err
+	return nil
 }
 
 // jd api
diff --git a/globals/globals2/globals2.go b/globals/globals2/globals2.go
index 03d1124b2..52deed855 100644
--- a/globals/globals2/globals2.go
+++ b/globals/globals2/globals2.go
@@ -14,52 +14,63 @@ import (
 )
 
 const (
-	freshFoodServerURL = "http://test.jxc4.com"
-	// freshFoodServerURL = "http://portal.jingxicaishi.com"
+	// freshFoodServerURL = "http://test.jxc4.com"
+	freshFoodServerURL = "http://portal.int.jxc4.com"
 )
 
 const (
 	// 京东西安账号
-	jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
-	jdAppKey = "06692746f7224695ad4788ce340bc854"
-	jdSecret = "d6b42a35a7414a5490d811654d745c84"
+	// jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
+	// jdAppKey = "06692746f7224695ad4788ce340bc854"
+	// jdSecret = "d6b42a35a7414a5490d811654d745c84"
 
 	// 京东全国账号
-	// jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
-	// jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
-	// jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
+	jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
+	jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
+	jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
 )
 
 const (
 	// 饿了么生产
-	// elmIsProd = true
-	// elmToken  = "" //"bab2a27f99562f394b411dbb9a6214da"
-	// elmAppKey = "KLRDcOZGrk"
-	// elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
+	elmIsProd = true
+	elmToken  = "" //"bab2a27f99562f394b411dbb9a6214da"
+	elmAppKey = "KLRDcOZGrk"
+	elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
 
-	elmIsProd = false
-	elmToken  = "2d2b583447b04b6bba5a6f3faed3559b"
-	elmAppKey = "RwT214gAsS"
-	elmSecret = "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db"
+	// elmIsProd = false
+	// elmToken  = "2d2b583447b04b6bba5a6f3faed3559b"
+	// elmAppKey = "RwT214gAsS"
+	// elmSecret = "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db"
 )
 
 const (
+	// 美团外卖测试
 	// mtpsAppKey = "25e816550bc9484480642f19a95f13fd"
 	// mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^"
+
+	// 美团外卖生产
 	mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
 	mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
 )
 
 const (
-	dadaAppKey      = "dada9623324449cd250"
-	dadaAppSecret   = "30c2abbfe8a8780ad5aace46300c64b9"
-	dadaIsProd      = false
-	dadaCallbackURL = "http://callback.jxc4.com/dada/order"
-	dadaSourceId    = "73753"
+	dadaAppKey    = "dada9623324449cd250"
+	dadaAppSecret = "30c2abbfe8a8780ad5aace46300c64b9"
+
+	// 达达测试
+	// dadaIsProd      = false
+	// dadaCallbackURL = "http://callback.jxc4.com/dada/order"
+	// dadaSourceID    = "73753"
+
+	// 达达生产
+	dadaIsProd      = true
+	dadaCallbackURL = "http://portal.jingxicaishi.com/dada/order"
+	dadaSourceID    = "6660"
 )
 
 const (
-	dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jx-callback?charset=utf8&loc=Local"
+	// dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jx-callback?charset=utf8&loc=Local"
+	dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jx_dev_0?charset=utf8&loc=Local"
 )
 
 const (
@@ -81,7 +92,7 @@ func init() {
 	Jdapi = jdapi.New(jdToken, jdAppKey, jdSecret)
 	initElm()
 	MtpsAPI = mtpsapi.New(mtpsAppKey, mtpsSecret)
-	DadaAPI = dadaapi.New(dadaAppKey, dadaAppSecret, dadaSourceId, dadaCallbackURL, dadaIsProd)
+	DadaAPI = dadaapi.New(dadaAppKey, dadaAppSecret, dadaSourceID, dadaCallbackURL, dadaIsProd)
 }
 
 func initElm() {