From 3d9c4d0b0790c45ddf15a9e65e9cbcfef71c4bb4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 14 Aug 2023 15:04:59 +0800
Subject: [PATCH] uni-push 2.0推送修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
index 0b6379a..77d0cd8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
@@ -14,16 +14,13 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Service
@AllArgsConstructor
public class PushServiceImpl implements IPushService {
private static final String PUSH_CLIENT_ID = "push:client:id:";
- private static final String UNI_CLOUD_PUSH_URL = "https://fc-mp-ad1ed7e3-700e-4fca-abae-0d097cc222b5.next.bspapp.com/push";
+ private static final String UNI_CLOUD_PUSH_URL = "https://fc-mp-ff11cc4d-ca8e-4b47-a57f-e26804379530.next.bspapp.com/push";
private BladeRedis bladeRedis;
private IMessageClient messageClient;
@@ -47,11 +44,18 @@
String clientId = getClientIdByUserId(messageRecord.getRecipient());
cIdList.add(clientId);
});
+
+
pushVO.setCIds(cIdList);
pushVO.setTitle(messageRecordList.get(0).getTheme());
pushVO.setContent(messageRecordList.get(0).getContent());
- return geTuiUtils.pushMsg(pushVO.getCIds(),pushVO.getTitle(),pushVO.getContent());
+ HashMap<String,Object> payload = new HashMap<>();
+ payload.put("title",messageRecordList.get(0).getTheme());
+ payload.put("content",messageRecordList.get(0).getContent());
+ payload.put("payload","test");
+ pushVO.setPayload(payload);
+ return pushMessage(pushVO);
}
/**
@@ -110,15 +114,22 @@
cIdList.add(clientIdByUserId);
pushVO.setCIds(cIdList);
+ HashMap<String,Object> payload = new HashMap<>();
+ payload.put("title",pushVO.getTitle());
+ payload.put("content",pushVO.getContent());
+ payload.put("payload","test");
+ pushVO.setPayload(payload);
+
+
return pushMessage(pushVO);
}
@Override
public Boolean geTuiPushMessage(PushVO pushVO) {
-
List<String> cIdList = new ArrayList<>();
cIdList.add(getClientIdByUserId(pushVO.getUserId()));
- return geTuiUtils.pushMsg(cIdList, pushVO.getTitle(), pushVO.getContent());
+// return geTuiUtils.pushMsg(cIdList, pushVO.getTitle(), pushVO.getContent());
+ return geTuiUtils.myPushMessage(cIdList, pushVO.getTitle(), pushVO.getContent());
}
/**
@@ -128,34 +139,34 @@
* @return
*/
public String getClientIdByUserId(String userId) {
-
if (Func.isEmpty(userId)) {
throw new ServiceException("请填写用户id!");
}
-
-
return bladeRedis.get(PUSH_CLIENT_ID + userId);
}
/**
- * 消息推送
+ * 2.0云函数消息推送
*
* @param pushVO
* @return
*/
public Boolean pushMessage(PushVO pushVO) {
-
RestTemplate template = new RestTemplate();
Map<String, Object> params = new LinkedHashMap<>();
//用户cId，可数组，可字符串
- params.put("push_clientid", pushVO.getCIds());
+ params.put("pushClientid", pushVO.getCIds());
//标题
params.put("title", pushVO.getTitle());
//内容
params.put("content", pushVO.getContent());
+
+ params.put("requestId", UUID.randomUUID());
+
+ params.put("payload",pushVO.getPayload());
// UniCloudReturnRes uniCloudReturnRes = template.getForObject(UNI_CLOUD_PUSH_URL,UniCloudReturnRes.class,params);
UniCloudReturnRes uniCloudReturnRes = template.postForObject(UNI_CLOUD_PUSH_URL, params, UniCloudReturnRes.class);
- return uniCloudReturnRes.getErrCode().equals(0) ? true : false;
+ return uniCloudReturnRes.getErrCode().equals("0") ? true : false;
}
}
--
Gitblit v1.9.3