From ab83e7293c8e3bcc9e778ebc3ef7b39183146339 Mon Sep 17 00:00:00 2001
From: DengBiao <2319963317@qq.com>
Date: Tue, 28 Feb 2023 21:22:47 +0800
Subject: [PATCH] update

---
 internal/logic/domain/message/service/app_push.go        | 2 +-
 internal/logic/domain/message/service/message_service.go | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/internal/logic/domain/message/service/app_push.go b/internal/logic/domain/message/service/app_push.go
index 9a4de3a..e0a50ca 100644
--- a/internal/logic/domain/message/service/app_push.go
+++ b/internal/logic/domain/message/service/app_push.go
@@ -40,7 +40,7 @@ func CommAddPush(args md3.PushParams) {
 	)
 	pushPlatform := svc.SysCfgGet(args.MasterId, "app_push_platform")
 	if pushPlatform == "JgPush" { //极光
-		args.Content = getChangeContent(args, args.Content)
+		//args.Content = getChangeContent(args, args.Content)
 		JgPush(args)
 		return
 	}
diff --git a/internal/logic/domain/message/service/message_service.go b/internal/logic/domain/message/service/message_service.go
index 1fcd618..70ec00f 100644
--- a/internal/logic/domain/message/service/message_service.go
+++ b/internal/logic/domain/message/service/message_service.go
@@ -195,8 +195,9 @@ func (*messageService) SendToUser(ctx context.Context, sender *pb.Sender, toUser
 					MasterId: masterId,
 					Uid:      uid,
 					PushAlia: alia,
-					Title:    "新消息提醒",
-					Content:  "您收到一条新消息，来自会员\"[消息发送者-会员昵称]\",发送时间\"[时间]\"",
+					Title:    sender.Nickname,
+					Content:  string(req.MessageContent),
+					//Content:  "您收到一条新消息，来自会员\"[消息发送者-会员昵称]\",发送时间\"[时间]\"",
 					//Content:           "您收到一条新消息，来自会员\"[消息发送者-会员昵称]\",发送时间\"[时间]\",消息类型\"[消息类型]\",备注\"[备注]\"",
 					PushType:          "zhi_ying_gim",
 					MessageType:       req.MessageType.String(),