From e78aae2d51812c78acc89ce7223836e3d68691c0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 31 Jul 2023 18:32:54 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java | 26 +++++++++++---------------
1 files changed, 11 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..decc007 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;
@@ -38,7 +35,7 @@
@Override
public Boolean pushMessageList(List<MessageRecord> messageRecordList) {
// 加入测试人员
- addSendMsgTest(messageRecordList);
+// addSendMsgTest(messageRecordList);
PushVO pushVO = new PushVO();
List<String> cIdList = new ArrayList<>();
//相同的消息推送给多用户
@@ -51,7 +48,7 @@
pushVO.setTitle(messageRecordList.get(0).getTheme());
pushVO.setContent(messageRecordList.get(0).getContent());
- return geTuiUtils.pushMsg(pushVO.getCIds(),pushVO.getTitle(),pushVO.getContent());
+ return pushMessage(pushVO);
}
/**
@@ -115,10 +112,10 @@
@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,17 +125,14 @@
* @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
@@ -148,14 +142,16 @@
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());
// 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