aa
This commit is contained in:
14
main.go
14
main.go
@@ -12,7 +12,7 @@ import (
|
|||||||
|
|
||||||
"git.rosy.net.cn/jx-callback/business/partner/purchase/yb"
|
"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/platformapi/dingdingapi"
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
@@ -162,7 +162,7 @@ func main() {
|
|||||||
orderman.LoadPendingOrders()
|
orderman.LoadPendingOrders()
|
||||||
|
|
||||||
// 延时的原因是等回调准备好
|
// 延时的原因是等回调准备好
|
||||||
if globals.IsProductEnv() || beego.BConfig.RunMode == "beta" {
|
if globals.IsProductEnv() || web.BConfig.RunMode == "beta" {
|
||||||
utils.AfterFuncWithRecover(2*time.Second, func() {
|
utils.AfterFuncWithRecover(2*time.Second, func() {
|
||||||
if err := tasks.RefreshDingDingToken(); err != nil {
|
if err := tasks.RefreshDingDingToken(); err != nil {
|
||||||
globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err)
|
globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err)
|
||||||
@@ -170,16 +170,16 @@ func main() {
|
|||||||
}
|
}
|
||||||
if globals.IsProductEnv() {
|
if globals.IsProductEnv() {
|
||||||
api.DingDingAPI.DeleteCallback()
|
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)
|
globals.SugarLogger.Warnf("dingding RegisterCallback failed with error:%v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if beego.BConfig.RunMode != "prod" {
|
if web.BConfig.RunMode != "prod" {
|
||||||
beego.BConfig.WebConfig.DirectoryIndex = true
|
web.BConfig.WebConfig.DirectoryIndex = true
|
||||||
beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
|
web.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
|
||||||
}
|
}
|
||||||
go func() {
|
go func() {
|
||||||
if globals.IsMainProductEnv() {
|
if globals.IsMainProductEnv() {
|
||||||
@@ -188,6 +188,6 @@ func main() {
|
|||||||
http.ListenAndServe("0.0.0.0:6060", nil)
|
http.ListenAndServe("0.0.0.0:6060", nil)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
beego.Run()
|
web.Run()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user