From 4f89bc32d10a1f7e951b519895a6b2ff6f44d7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 9 Dec 2020 15:53:27 +0800 Subject: [PATCH] dingdingtoken --- .../eventhub/syseventhub/syseventhub.go | 2 -- main.go | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/business/jxutils/eventhub/syseventhub/syseventhub.go b/business/jxutils/eventhub/syseventhub/syseventhub.go index 1c2f75635..a1869442b 100644 --- a/business/jxutils/eventhub/syseventhub/syseventhub.go +++ b/business/jxutils/eventhub/syseventhub/syseventhub.go @@ -108,8 +108,6 @@ func (h *Hub) GetToken(tokenType, oldToken string, waitTime time.Duration) (toke } case EventTypePushToken: token = api.PushAPI.CBGetToken() - case EventTypeWX2Token: - token = api.WeixinMiniAPI2.CBGetToken() } if token != oldToken { diff --git a/main.go b/main.go index ef0996a5f..830fb1014 100644 --- a/main.go +++ b/main.go @@ -8,14 +8,18 @@ import ( "os" "time" + "git.rosy.net.cn/baseapi/platformapi/dingdingapi" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxstore/misc" + "git.rosy.net.cn/jx-callback/business/jxutils/tasks" "github.com/astaxie/beego" // 导入缺省订单调度器 "git.rosy.net.cn/jx-callback/globals" + "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/beegodb" _ "git.rosy.net.cn/jx-callback/business/auth2/authprovider/alipay" @@ -108,6 +112,21 @@ func main() { // globals.SugarLogger.Errorf("RefreshPushToken failed with error:%s", err) // return // } + // 延时的原因是等回调准备好 + if globals.IsProductEnv() || beego.BConfig.RunMode == "beta" { + utils.AfterFuncWithRecover(2*time.Second, func() { + if err := tasks.RefreshDingDingToken(); err != nil { + globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err) + return + } + 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 { + globals.SugarLogger.Warnf("dingding RegisterCallback failed with error:%v", err) + } + } + }) + } cms.ResetJobTimers() if beego.BConfig.RunMode != "prod" { beego.BConfig.WebConfig.DirectoryIndex = true