From 11f607481fbee4fa918c5ef07abab4dd30ec8150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 1 Apr 2021 09:35:06 +0800 Subject: [PATCH] aa --- main.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.go b/main.go index 148464dc9..5a37d04d5 100644 --- a/main.go +++ b/main.go @@ -12,7 +12,7 @@ import ( "git.rosy.net.cn/jx-callback/business/partner/purchase/yb" - beego "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web" "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/utils" @@ -162,7 +162,7 @@ func main() { orderman.LoadPendingOrders() // 延时的原因是等回调准备好 - if globals.IsProductEnv() || beego.BConfig.RunMode == "beta" { + if globals.IsProductEnv() || web.BConfig.RunMode == "beta" { utils.AfterFuncWithRecover(2*time.Second, func() { if err := tasks.RefreshDingDingToken(); err != nil { globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err) @@ -170,16 +170,16 @@ func main() { } if globals.IsProductEnv() { 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 { + if err := api.DingDingAPI.RegisterCallback([]string{dingdingapi.CBTagUserAddOrg, dingdingapi.CBTagUserModifyOrg, dingdingapi.CBTagUserLeaveOrg}, web.AppConfig.DefaultString("dingdingCallbackToken", ""), web.AppConfig.DefaultString("dingdingCallbackAESKey", ""), web.AppConfig.DefaultString("dingdingCallbackURL", "")); err != nil { globals.SugarLogger.Warnf("dingding RegisterCallback failed with error:%v", err) } } }) } - if beego.BConfig.RunMode != "prod" { - beego.BConfig.WebConfig.DirectoryIndex = true - beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" + if web.BConfig.RunMode != "prod" { + web.BConfig.WebConfig.DirectoryIndex = true + web.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" } go func() { if globals.IsMainProductEnv() { @@ -188,6 +188,6 @@ func main() { http.ListenAndServe("0.0.0.0:6060", nil) } }() - beego.Run() + web.Run() } }