From d81de6b3cc02ce24b4918a1bdef2818c61eb8cce Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 14 三月 2026 23:00:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/AliPushUtil.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/AliPushUtil.java b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/AliPushUtil.java
index 5d52673..15a3784 100644
--- a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/AliPushUtil.java
+++ b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/AliPushUtil.java
@@ -6,6 +6,8 @@
import com.aliyun.sdk.service.push20160801.models.*;
import com.aliyun.sdk.service.push20160801.*;
import com.google.gson.Gson;
+import com.xiaopeng.common.core.constant.AliPushTypeConstant;
+import com.xiaopeng.common.core.enums.NotificationTypeEnum;
import darabonba.core.client.ClientOverrideConfiguration;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -89,7 +91,11 @@
if(deviceType == 2){
channelIds = iosChannelId;
}
-
+ String content = body;
+ if (pushType.equals(AliPushTypeConstant.NOTICE)) {
+ JSONObject jsonObject = JSONObject.parseObject(body);
+ content = jsonObject.getString("content");
+ }
PushRequest pushRequest = PushRequest.builder()
.appKey(appKeys)
.pushType(pushType)
@@ -97,8 +103,8 @@
.target(TARGET)
.targetValue(account)
.title(title)
- .body(body)
- .androidExtParameters(body)
+ .body(content)
+// .androidExtParameters(body)
.androidNotificationChannel(channelIds)
.build();
if(deviceType == 2){
@@ -109,7 +115,7 @@
.target(TARGET)
.targetValue(account)
.title(title)
- .body(body)
+ .body(content)
.iOSExtParameters(body)
.androidNotificationChannel(channelIds)
.build();
--
Gitblit v1.7.1