Merge branch 'dev/v1.2.7_dx' of moapp/MessageCenter into feature/v1.2.7

rpc/internal/logic/appletterpushlogic.go

@@ -35,6 +35,7 @@ func NewAppLetterPushLogic(ctx context.Context, svcCtx *svc.ServiceContext) *App
 // 发送剑鱼微信模版消息
 func (l *AppLetterPushLogic) AppLetterPush(in *message.WxTmplMsgRequest) (*message.SendMsgResponse, error) {
 	var userArr []string
+	log.Println("app私信push推送内容===", in)
 	userArr = strings.Split(in.PositionIds, ",")
 	pushConfig, err := common.GetWxTmplConfig(in.MessageClass)
 	if err != nil {
@@ -62,7 +63,6 @@ func (l *AppLetterPushLogic) AppLetterPush(in *message.WxTmplMsgRequest) (*messa
 				userData = *rData
 			}
 		}
-
 		AppPushMsg(userData, pushConfig.Switch, in.Url, in.Title, in.Detail)
 	}
 	return &message.SendMsgResponse{
@@ -127,6 +127,7 @@ func AppGrpcPush(pushData map[string]interface{}, otherPushId, jgPushId, phoneTy
 		"menuName":    menuName,                  //在哪个webview打开链接，search：搜索 subscribe：订阅 box：百宝箱 me：我的 other：新的webview  消息中心 message
 		"redDot":      "",                        //在哪个底部菜单显示小红点，空值则不显示小红点，search：搜索 subscribe：订阅 box：百宝箱 me：我的
 	}
+	log.Println("push推送内容====", push)
 	b, _ := json.Marshal(push)
 	err = client.Call("Rpc.Push", b, &repl)
 	if err != nil {
@@ -136,7 +137,7 @@ func AppGrpcPush(pushData map[string]interface{}, otherPushId, jgPushId, phoneTy
 	if repl == "y" {
 		log.Println("推送成功！", pushData["receiveUserId"])
 	} else {
-		log.Println("推送失败！", pushData["receiveUserId"])
+		log.Println("推送失败！", repl, pushData["receiveUserId"])
 	}
 
 }