- move const config from globals2.go to app.conf.

conf/app.conf

@@ -5,5 +5,56 @@ autorender = false
 copyrequestbody = true
 EnableDocs = true
 RouterCaseSensitive = true
-
 filelinenum = true
+
+dadaAppKey    = "dada9623324449cd250"
+dadaAppSecret = "30c2abbfe8a8780ad5aace46300c64b9"
+
+[dev]
+freshFoodServerURL = "http://test.jxc4.com"
+
+jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
+jdAppKey = "06692746f7224695ad4788ce340bc854"
+jdSecret = "d6b42a35a7414a5490d811654d745c84"
+
+elmIsProd = false
+elmToken  = "2d2b583447b04b6bba5a6f3faed3559b"
+elmAppKey = "RwT214gAsS"
+elmSecret = "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db"
+
+mtpsAppKey = "25e816550bc9484480642f19a95f13fd"
+mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^"
+
+dadaIsProd      = false
+dadaCallbackURL = "http://callback.jxc4.com/dada/order"
+dadaSourceID    = "73753"
+
+weixinAppID  = "wxbf235770edaabc5c"
+weixinSecret = "ba32b269a068a5b72486a0beafd171e8"
+
+dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8&loc=Local"
+
+[prod]
+freshFoodServerURL = "http://portal.int.jxc4.com"
+
+jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
+jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
+jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
+
+elmIsProd = true
+elmToken  = ""
+elmAppKey = "KLRDcOZGrk"
+elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
+
+mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
+mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
+
+dadaIsProd      = true
+dadaCallbackURL = "http://portal.jingxicaishi.com/dada/order"
+dadaSourceID    = "6660"
+
+weixinAppID  = "wx2bb99eb5d2c9b82c"
+weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
+
+dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxd_dev_0?charset=utf8&loc=Local"
+

globals/globals2/globals2.go

@@ -11,81 +11,12 @@ import (
 	"git.rosy.net.cn/jx-callback/business/freshfood"
 	jdmodels "git.rosy.net.cn/jx-callback/business/jd/models"
 	"git.rosy.net.cn/jx-callback/business/models"
+	"github.com/astaxie/beego"
 
 	"github.com/astaxie/beego/orm"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 )
 
-const (
-	// freshFoodServerURL = "http://test.jxc4.com"
-	freshFoodServerURL = "http://portal.int.jxc4.com"
-)
-
-const (
-	// 京东西安账号
-	// jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
-	// jdAppKey = "06692746f7224695ad4788ce340bc854"
-	// jdSecret = "d6b42a35a7414a5490d811654d745c84"
-
-	// 京东全国账号
-	jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
-	jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
-	jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
-)
-
-const (
-	// elmIsProd = false
-	// elmToken  = "2d2b583447b04b6bba5a6f3faed3559b"
-	// elmAppKey = "RwT214gAsS"
-	// elmSecret = "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db"
-
-	// 饿了么生产
-	elmIsProd = true
-	elmToken  = "" //"bab2a27f99562f394b411dbb9a6214da"
-	elmAppKey = "KLRDcOZGrk"
-	elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
-)
-
-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"
-
-	// 达达生产
-	dadaIsProd      = true
-	dadaCallbackURL = "http://portal.jingxicaishi.com/dada/order"
-	dadaSourceID    = "6660"
-)
-
-const (
-	// test
-	// weixinAppID  = "wxbf235770edaabc5c"
-	// weixinSecret = "ba32b269a068a5b72486a0beafd171e8"
-
-	// prod
-	weixinAppID  = "wx2bb99eb5d2c9b82c"
-	weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
-)
-
-const (
-	// 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)/jxd_dev_0?charset=utf8&loc=Local"
-)
-
 const (
 	ErrStrAccessDB = "Error when access DB"
 )
@@ -102,16 +33,16 @@ var (
 
 func init() {
 	initDB()
-	FreshFoodAPI = freshfood.NewFreshFoodAPI(freshFoodServerURL)
+	FreshFoodAPI = freshfood.NewFreshFoodAPI(beego.AppConfig.String("freshFoodServerURL"))
-	Jdapi = jdapi.New(jdToken, jdAppKey, jdSecret)
+	Jdapi = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret"))
 	initElm()
-	MtpsAPI = mtpsapi.New(mtpsAppKey, mtpsSecret)
+	MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret"))
-	DadaAPI = dadaapi.New(dadaAppKey, dadaAppSecret, dadaSourceID, dadaCallbackURL, dadaIsProd)
+	DadaAPI = dadaapi.New(beego.AppConfig.String("dadaAppKey"), beego.AppConfig.String("dadaAppSecret"), beego.AppConfig.String("dadaSourceID"), beego.AppConfig.String("dadaCallbackURL"), beego.AppConfig.DefaultBool("dadaIsProd", false))
-	WeixinAPI = weixinapi.New(weixinAppID, weixinSecret)
+	WeixinAPI = weixinapi.New(beego.AppConfig.String("weixinAppID"), beego.AppConfig.String("weixinSecret"))
 }
 
 func initElm() {
-	token := elmToken
+	token := beego.AppConfig.String("elmToken")
 	if token == "" {
 		db := orm.NewOrm()
 		var tokenInfo []orm.Params
@@ -126,12 +57,12 @@ func initElm() {
 		}
 		token = tokenInfo2["accessToken"].(string)
 	}
-	ElmAPI = elmapi.New(token, elmAppKey, elmSecret, elmIsProd)
+	ElmAPI = elmapi.New(token, beego.AppConfig.String("elmAppKey"), beego.AppConfig.String("elmSecret"), beego.AppConfig.DefaultBool("elmIsProd", false))
 }
 
 func initDB() {
 	// set default database
-	orm.RegisterDataBase("default", "mysql", dbConnectStr, 30)
+	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30)
 
 	// register model
 	orm.RegisterModel(new(jdmodels.Jdorder))