From 76b02763ecb7ab185ded529591e24e8ab7a41120 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 29 Jun 2018 18:11:01 +0800
Subject: [PATCH] - fix elm setToken bug

---
 business/tasks/configrefresh.go       | 1 -
 globals/globals.go                    | 7 +++++++
 main.go                               | 9 +--------
 routers/commentsRouter_controllers.go | 8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/business/tasks/configrefresh.go b/business/tasks/configrefresh.go
index 5bf799aa5..1f6aa9878 100644
--- a/business/tasks/configrefresh.go
+++ b/business/tasks/configrefresh.go
@@ -117,7 +117,6 @@ func RefreshElmToken() {
 		var tokenInfo ElmTokenForCompatible
 		err := utils.UnmarshalUseNumber([]byte(value), &tokenInfo)
 		if err == nil {
-			var tokenInfo ElmTokenForCompatible
 			return globals2.ElmAPI.SetToken(tokenInfo.AccessToken)
 		}
 		return false
diff --git a/globals/globals.go b/globals/globals.go
index f6f76edea..6f0dfbe1a 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -1,6 +1,9 @@
 package globals
 
 import (
+	"git.rosy.net.cn/baseapi"
+	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/logs"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 	"go.uber.org/zap"
 )
@@ -10,6 +13,10 @@ var (
 )
 
 func init() {
+	logs.SetLogFuncCallDepth(3)
+	beego.BConfig.Log.AccessLogs = true
+
 	logger, _ := zap.NewDevelopment()
 	SugarLogger = logger.Sugar()
+	baseapi.Init(SugarLogger)
 }
diff --git a/main.go b/main.go
index 3cb9a8d08..fbb9532ab 100644
--- a/main.go
+++ b/main.go
@@ -1,22 +1,15 @@
 package main
 
 import (
-	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/jx-callback/business/jd/controller"
 	"git.rosy.net.cn/jx-callback/business/tasks"
-	"git.rosy.net.cn/jx-callback/globals"
 	_ "git.rosy.net.cn/jx-callback/routers"
 	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/logs"
 )
 
 func main() {
-	logs.SetLogFuncCallDepth(3)
-	beego.BConfig.Log.AccessLogs = true
-
-	baseapi.Init(globals.SugarLogger)
 	controller.InitOrder()
-	if beego.BConfig.RunMode == "prod" {
+	if true { //beego.BConfig.RunMode == "prod" {
 		tasks.RefreshWeixinToken()
 		tasks.RefreshElmToken()
 	}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index bac13b2cb..5e2004625 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -81,16 +81,16 @@ func init() {
 
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JDOrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JDOrderController"],
 		beego.ControllerComments{
-			Method: "OrderWaitOutStore",
-			Router: `/orderWaitOutStore`,
+			Method: "OrderComment",
+			Router: `/orderCommentPush`,
 			AllowHTTPMethods: []string{"post"},
 			MethodParams: param.Make(),
 			Params: nil})
 
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JDOrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JDOrderController"],
 		beego.ControllerComments{
-			Method: "OrderComment",
-			Router: `/ordercommentpush`,
+			Method: "OrderWaitOutStore",
+			Router: `/orderWaitOutStore`,
 			AllowHTTPMethods: []string{"post"},
 			MethodParams: param.Make(),
 			Params: nil})