From 7d58744b2ebebf33418274f35ab91194726497fd Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 13 Jun 2018 11:12:28 +0800
Subject: [PATCH] - refactor globals.

---
 business/jd/controller/controller.go |  6 ++++--
 controllers/jd_order.go              | 15 ++++++++++++---
 globals/globals.go                   | 14 ++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 globals/globals.go

diff --git a/business/jd/controller/controller.go b/business/jd/controller/controller.go
index 6abe84bad..6ca1ebd01 100644
--- a/business/jd/controller/controller.go
+++ b/business/jd/controller/controller.go
@@ -3,6 +3,7 @@ package controller
 import (
 	"git.rosy.net.cn/baseapi/platform/jdapi"
 	"git.rosy.net.cn/jx-callback/business/jd/models"
+	"git.rosy.net.cn/jx-callback/globals"
 	"github.com/astaxie/beego/orm"
 	"go.uber.org/zap"
 )
@@ -14,8 +15,9 @@ var (
 )
 
 func init() {
-	logger, _ := zap.NewDevelopment()
-	sugarLogger = logger.Sugar()
+	sugarLogger = globals.SugarLogger
+	logger := sugarLogger.Desugar()
+
 	gJdapi = jdapi.NewJDAPI("91633f2a-c5f5-4982-a925-a220d19095c3", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4", logger)
 
 	// set default database
diff --git a/controllers/jd_order.go b/controllers/jd_order.go
index bb34d124b..fea3cde3e 100644
--- a/controllers/jd_order.go
+++ b/controllers/jd_order.go
@@ -2,11 +2,13 @@ package controllers
 
 import (
 	"encoding/json"
+	"net/url"
 
 	"github.com/astaxie/beego/logs"
 
 	"git.rosy.net.cn/baseapi/platform/jdapi"
 	"git.rosy.net.cn/jx-callback/business/jd/controller"
+	"git.rosy.net.cn/jx-callback/globals"
 	"github.com/astaxie/beego"
 )
 
@@ -21,8 +23,15 @@ func (c *JDOrderController) URLMapping() {
 	c.Mapping("NewOrder", c.NewOrder)
 }
 
-func (c *JDOrderController) handleJDCallback(obj interface{}, hanlder func() interface{}) {
+func (c *JDOrderController) handleJDCallback(obj interface{}, needUnescape bool, hanlder func() interface{}) {
 	jdParamJSON := c.GetString(JD_PARAM_JSON)
+	if needUnescape {
+		jdParamJSON2, err := url.QueryUnescape(jdParamJSON)
+		if err != nil {
+			globals.SugarLogger.Warnf("can not escape data:%v, error:%v", jdParamJSON, err)
+		}
+		jdParamJSON = jdParamJSON2
+	}
 	err := json.Unmarshal([]byte(jdParamJSON), obj)
 	if err != nil {
 		logs.Error(err)
@@ -35,7 +44,7 @@ func (c *JDOrderController) handleJDCallback(obj interface{}, hanlder func() int
 
 func (c *JDOrderController) orderStatus() {
 	var ob jdapi.JDOrderMsg
-	c.handleJDCallback(&ob, func() interface{} {
+	c.handleJDCallback(&ob, false, func() interface{} {
 		cc := controller.OrderControler{}
 		return cc.OrderStatus(&ob)
 	})
@@ -139,7 +148,7 @@ func (c *JDOrderController) ApplyCancelOrder() {
 // @router /pushDeliveryStatus [post]
 func (c *JDOrderController) PushDeliveryStatus() {
 	var ob jdapi.JDDeliveryStatusMsg
-	c.handleJDCallback(&ob, func() interface{} {
+	c.handleJDCallback(&ob, true, func() interface{} {
 		cc := controller.OrderControler{}
 		return cc.OrderDeliveryStatus(&ob)
 	})
diff --git a/globals/globals.go b/globals/globals.go
new file mode 100644
index 000000000..0fb005ff4
--- /dev/null
+++ b/globals/globals.go
@@ -0,0 +1,14 @@
+package globals
+
+import (
+	"go.uber.org/zap"
+)
+
+var (
+	SugarLogger *zap.SugaredLogger
+)
+
+func init() {
+	logger, _ := zap.NewDevelopment()
+	SugarLogger = logger.Sugar()
+}