diff --git a/config/config.go b/config/config.go index d8d9f06..573161c 100644 --- a/config/config.go +++ b/config/config.go @@ -62,6 +62,7 @@ type config struct { //LotteryHost string //LotteryPort int + XianMaiBaseUrl string } var AppConfig config @@ -148,10 +149,11 @@ func initConfig() { SmsSignName: viper.GetString("sms.sign_name"), SmsTemplateCode: viper.GetString("sms.template_code"), - RedisHost: viper.GetString("redis.host"), - RedisPort: viper.GetInt("redis.port"), - RedisPassword: viper.GetString("redis.password"), - RedisDB: viper.GetInt("redis.db"), + RedisHost: viper.GetString("redis.host"), + RedisPort: viper.GetInt("redis.port"), + RedisPassword: viper.GetString("redis.password"), + RedisDB: viper.GetInt("redis.db"), + XianMaiBaseUrl: viper.GetString("xianmai_base_url"), } //fmt.Printf("%+v", AppConfig) diff --git a/lib/xianmai/xian.go b/lib/xianmai/xian.go index 122da56..b4239fd 100644 --- a/lib/xianmai/xian.go +++ b/lib/xianmai/xian.go @@ -2,6 +2,7 @@ package xianmai import ( "github.com/codinl/go-logger" + "mh-server/config" "strconv" ) @@ -270,7 +271,7 @@ func (m *SmExternal) EoPulling(resp interface{}) error { } sanMaiClient = &SanMaiClient{ Authentication: maiToken, - BaseURL: SmBaseURL, + BaseURL: config.AppConfig.XianMaiBaseUrl, } err = sanMaiClient.post(m.ApiRoute, m.ParaMap, resp) diff --git a/lib/xianmai/xian_http.go b/lib/xianmai/xian_http.go index 9401050..9e1803c 100644 --- a/lib/xianmai/xian_http.go +++ b/lib/xianmai/xian_http.go @@ -8,6 +8,7 @@ import ( "github.com/codinl/go-logger" "io" "io/ioutil" + "mh-server/config" "net/http" "strings" "time" @@ -187,7 +188,7 @@ type SanMaiClient struct { const ( SmBaseURL = "https://testh5.xianmai.net.cn" - //SmBaseURL = "https://xianmai.net.cn/" + //SmBaseURL = "https://www.xianmai.net.cn" ) var sanMaiClient *SanMaiClient @@ -199,7 +200,7 @@ func GetSanMaiClient() *SanMaiClient { fmt.Println("初始化数据") sanMaiClient = &SanMaiClient{ Authentication: SanMaiToken(), - BaseURL: SmBaseURL, + BaseURL: config.AppConfig.XianMaiBaseUrl, ExpireTime: nowTime.AddDate(0, 0, 1), } return sanMaiClient @@ -217,7 +218,7 @@ func SanMaiToken() string { } sanMaiClient = &SanMaiClient{ Authentication: "", - BaseURL: SmBaseURL, + BaseURL: config.AppConfig.XianMaiBaseUrl, } resp := &SubmitLoginApiResp{} @@ -245,7 +246,7 @@ func EoSanMaiToken(wechatId, wechatMobile, requestType string) (string, error) { } sanMaiClient = &SanMaiClient{ Authentication: "", - BaseURL: SmBaseURL, + BaseURL: config.AppConfig.XianMaiBaseUrl, } resp := &SubmitLoginApiResp{}