Merge branch 'master' into get-store

This commit is contained in:
gazebo
2019-06-24 10:17:56 +08:00
127 changed files with 9409 additions and 2126 deletions

14
main.go
View File

@@ -46,9 +46,10 @@ func Init() {
cms.InitServiceInfo(Version, buildTime, GitCommit)
promotion.Init()
if beego.BConfig.RunMode == "prod" {
if globals.IsProductEnv() {
misc.StartRefreshEbaiRealMobile()
ebai.CurPurchaseHandler.StartRefreshComment()
misc.StartDailyWork()
}
misc.StartGetCityStoreInfo()
}
@@ -109,10 +110,6 @@ func main() {
globals.SugarLogger.Errorf("RefreshWeimobToken failed with error:%s", err)
return
}
if err := tasks.RefreshDingDingToken(); err != nil {
globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err)
return
}
if err := tasks.RefreshYilianyunToken(); err != nil {
globals.SugarLogger.Errorf("RefreshYilianyunToken failed with error:%s", err)
return
@@ -121,9 +118,12 @@ func main() {
orderman.LoadPendingOrders()
// 延时的原因是等回调准备好
if beego.BConfig.RunMode == "prod" ||
beego.BConfig.RunMode == "jxgy" {
if globals.IsProductEnv() {
utils.AfterFuncWithRecover(2*time.Second, func() {
if err := tasks.RefreshDingDingToken(); err != nil {
globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err)
return
}
api.DingDingAPI.DeleteCallback()
if err := api.DingDingAPI.RegisterCallback([]string{dingdingapi.CBTagUserAddOrg, dingdingapi.CBTagUserModifyOrg, dingdingapi.CBTagUserLeaveOrg}, beego.AppConfig.DefaultString("dingdingCallbackToken", ""), beego.AppConfig.DefaultString("dingdingCallbackAESKey", ""), beego.AppConfig.DefaultString("dingdingCallbackURL", "")); err != nil {
globals.SugarLogger.Warnf("dingding RegisterCallback failed with error:%v", err)