diff --git a/internal/logic/domain/message/service/app_push.go b/internal/logic/domain/message/service/app_push.go index 98ff31d..54fe8be 100644 --- a/internal/logic/domain/message/service/app_push.go +++ b/internal/logic/domain/message/service/app_push.go @@ -4,7 +4,6 @@ import ( jg_push "code.fnuoos.com/go_rely_warehouse/zyos_go_jg_push.git/hdl" md2 "code.fnuoos.com/go_rely_warehouse/zyos_go_jg_push.git/md" "fmt" - "gim/internal/business/comm/db" svc "gim/internal/business/comm/service" md3 "gim/internal/logic/domain/message/md" "gim/pkg/logger" @@ -46,10 +45,11 @@ func CommAddPush(args md3.PushParams) { } func JgPush(args md3.PushParams) { - thirdJgPush := db.DbSysCfg.SysCfgFindWithDb(args.MasterId, "jg_push_app_key", "jg_push_app_secret") - fmt.Println(">>>>>>>>>>>>>>>>>>>>jg_push_app_key<<<<<<<<<<<<<<<<<<<<<<", thirdJgPush["jg_push_app_key"]) - fmt.Println(">>>>>>>>>>>>>>>>>>>>jg_push_app_key<<<<<<<<<<<<<<<<<<<<<<", thirdJgPush["jg_push_app_secret"]) - if thirdJgPush["jg_push_app_key"] == "" || thirdJgPush["jg_push_app_secret"] == "" { + jgPushAppKey := svc.SysCfgGet(args.MasterId, "jg_push_app_key") + jgPushAppSecret := svc.SysCfgGet(args.MasterId, "jg_push_app_secret") + fmt.Println(">>>>>>>>>>>>>>>>>>>>jg_push_app_key<<<<<<<<<<<<<<<<<<<<<<", jgPushAppKey) + fmt.Println(">>>>>>>>>>>>>>>>>>>>jg_push_app_key<<<<<<<<<<<<<<<<<<<<<<", jgPushAppSecret) + if jgPushAppKey == "" || jgPushAppSecret == "" { return } //alia := db.DbUserPushForJg.UserPushForJgGetWithDb(args.MasterId, args.Uid) @@ -62,13 +62,13 @@ func JgPush(args md3.PushParams) { Content: args.Content, Extras: extras, } - send, _, err := jg_push.Send(thirdJgPush["jg_push_app_key"], thirdJgPush["jg_push_app_secret"], param) + send, _, err := jg_push.Send(jgPushAppKey, jgPushAppSecret, param) logger.Logger.Debug("JgPush", zap.String("push_alia", args.PushAlia), zap.String("title", param.Title), zap.String("content", param.Content), - zap.String("jg_push_app_key", thirdJgPush["jg_push_app_key"]), - zap.String("jg_push_app_secret", thirdJgPush["jg_push_app_secret"]), + zap.String("jg_push_app_key", jgPushAppKey), + zap.String("jg_push_app_secret", jgPushAppSecret), zap.String("err", err.Error()), ) if err != nil {