- adjust package structure.

globals/globals.go

@@ -1,106 +1,15 @@
 package globals
 
 import (
-	"git.rosy.net.cn/baseapi/platform/elmapi"
-	"git.rosy.net.cn/baseapi/platform/jdapi"
-	"git.rosy.net.cn/baseapi/platform/mtpsapi"
-	"git.rosy.net.cn/baseapi/utils"
-	elmmodels "git.rosy.net.cn/jx-callback/business/elm/models"
-	"git.rosy.net.cn/jx-callback/business/freshfood"
-	"git.rosy.net.cn/jx-callback/business/jd/models"
-	"github.com/astaxie/beego/orm"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 	"go.uber.org/zap"
 )
 
-const (
-	freshFoodServerURL = "http://test.jxc4.com"
-	// freshFoodServerURL = "http://portal.jingxicaishi.com"
-)
-
-const (
-	// 京东西安账号
-	jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
-	jdAppKey = "06692746f7224695ad4788ce340bc854"
-	jdSecret = "d6b42a35a7414a5490d811654d745c84"
-
-	// 京东全国账号
-	// jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
-	// jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
-	// jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
-)
-
-const (
-	// 饿了么生产
-	// elmIsProd = true
-	// elmToken  = "" //"bab2a27f99562f394b411dbb9a6214da"
-	// elmAppKey = "KLRDcOZGrk"
-	// elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
-
-	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 (
-	ErrStrAccessDB = "Error when access DB"
-)
-
 var (
-	SugarLogger  *zap.SugaredLogger
-	FreshFoodAPI *freshfood.FreshFoodAPI
-
-	Jdapi   *jdapi.JDAPI
-	ElmAPI  *elmapi.ELMAPI
-	MtpsAPI *mtpsapi.MTPSAPI
+	SugarLogger *zap.SugaredLogger
 )
 
 func init() {
 	logger, _ := zap.NewDevelopment()
 	SugarLogger = logger.Sugar()
-	initDB()
-	FreshFoodAPI = freshfood.NewFreshFoodAPI(freshFoodServerURL, SugarLogger)
-
-	Jdapi = jdapi.NewJDAPI(jdToken, jdAppKey, jdSecret, SugarLogger)
-	initElm()
-	MtpsAPI = mtpsapi.NewMTPSAPI(mtpsAppKey, mtpsSecret, SugarLogger)
-}
-
-func initElm() {
-	token := elmToken
-	if token == "" {
-		db := orm.NewOrm()
-		var tokenInfo []orm.Params
-		num, err := db.Raw("SELECT * FROM thirdpartytoken WHERE thirdparty='eleme'").Values(&tokenInfo)
-		if err != nil || num != 1 {
-			panic(err.Error())
-		}
-
-		var tokenInfo2 map[string]interface{}
-		if err := utils.UnmarshalUseNumber([]byte(tokenInfo[0]["token"].(string)), &tokenInfo2); err != nil {
-			panic(err.Error())
-		}
-		token = tokenInfo2["accessToken"].(string)
-	}
-	ElmAPI = elmapi.NewELMAPI(token, elmAppKey, elmSecret, SugarLogger, elmIsProd)
-}
-
-func initDB() {
-	// set default database
-	orm.RegisterDataBase("default", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/jx-callback?charset=utf8&loc=Local", 30)
-
-	// register model
-	orm.RegisterModel(new(models.Jdorder))
-	orm.RegisterModel(new(elmmodels.ELMOrder))
-
-	// create table
-	orm.RunSyncdb("default", false, true)
 }

globals/globals2/globals2.go

@@ -0,0 +1,105 @@
+package globals2
+
+import (
+	"git.rosy.net.cn/baseapi/platform/elmapi"
+	"git.rosy.net.cn/baseapi/platform/jdapi"
+	"git.rosy.net.cn/baseapi/platform/mtpsapi"
+	"git.rosy.net.cn/baseapi/utils"
+	elmmodels "git.rosy.net.cn/jx-callback/business/elm/models"
+	"git.rosy.net.cn/jx-callback/business/freshfood"
+	"git.rosy.net.cn/jx-callback/business/jd/models"
+	"github.com/astaxie/beego/orm"
+	_ "github.com/go-sql-driver/mysql" // import your used driver
+)
+
+const (
+	freshFoodServerURL = "http://test.jxc4.com"
+	// freshFoodServerURL = "http://portal.jingxicaishi.com"
+)
+
+const (
+	// 京东西安账号
+	jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
+	jdAppKey = "06692746f7224695ad4788ce340bc854"
+	jdSecret = "d6b42a35a7414a5490d811654d745c84"
+
+	// 京东全国账号
+	// jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
+	// jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
+	// jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
+)
+
+const (
+	// 饿了么生产
+	// elmIsProd = true
+	// elmToken  = "" //"bab2a27f99562f394b411dbb9a6214da"
+	// elmAppKey = "KLRDcOZGrk"
+	// elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
+
+	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 (
+	dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jx-callback?charset=utf8&loc=Local"
+)
+
+const (
+	ErrStrAccessDB = "Error when access DB"
+)
+
+var (
+	FreshFoodAPI *freshfood.FreshFoodAPI
+
+	Jdapi   *jdapi.JDAPI
+	ElmAPI  *elmapi.ELMAPI
+	MtpsAPI *mtpsapi.MTPSAPI
+)
+
+func init() {
+	initDB()
+	FreshFoodAPI = freshfood.NewFreshFoodAPI(freshFoodServerURL)
+	Jdapi = jdapi.NewJDAPI(jdToken, jdAppKey, jdSecret)
+	initElm()
+	MtpsAPI = mtpsapi.NewMTPSAPI(mtpsAppKey, mtpsSecret)
+}
+
+func initElm() {
+	token := elmToken
+	if token == "" {
+		db := orm.NewOrm()
+		var tokenInfo []orm.Params
+		num, err := db.Raw("SELECT * FROM thirdpartytoken WHERE thirdparty='eleme'").Values(&tokenInfo)
+		if err != nil || num != 1 {
+			panic(err.Error())
+		}
+
+		var tokenInfo2 map[string]interface{}
+		if err := utils.UnmarshalUseNumber([]byte(tokenInfo[0]["token"].(string)), &tokenInfo2); err != nil {
+			panic(err.Error())
+		}
+		token = tokenInfo2["accessToken"].(string)
+	}
+	ElmAPI = elmapi.NewELMAPI(token, elmAppKey, elmSecret, elmIsProd)
+}
+
+func initDB() {
+	// set default database
+	orm.RegisterDataBase("default", "mysql", dbConnectStr, 30)
+
+	// register model
+	orm.RegisterModel(new(models.Jdorder))
+	orm.RegisterModel(new(elmmodels.ELMOrder))
+
+	// create table
+	orm.RunSyncdb("default", false, true)
+}