test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(消息通知): 修复站内通知弹框的问题 

--bug=1016011 --user=刘瑞斌 【消息通知】执行接口case时有时收到多条系统站内通知，有时不会弹出站内通知 https://www.tapd.cn/55049933/s/1233494
This commit is contained in:
CaptainB 2022-08-24 19:31:52 +08:00 committed by 刘瑞斌
parent 9d9e26aa56
commit e2a78debcf
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/websocket/NotificationWebSocket.java
View File

@ -17,7 +17,7 @@ import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ServerEndpoint("/notification/count/{userId}") @ServerEndpoint("/notification/count/{userId}/{random}")
@Component @Component
public class NotificationWebSocket { public class NotificationWebSocket {
private static NotificationService notificationService; private static NotificationService notificationService;
@ -32,7 +32,7 @@ public class NotificationWebSocket {
* 开启连接的操作 * 开启连接的操作
*/ */
@OnOpen @OnOpen
public void onOpen(@PathParam("userId") String userId, Session session) { public void onOpen(@PathParam("userId") String userId, @PathParam("random") double random, Session session) {
Timer timer = new Timer(true); Timer timer = new Timer(true);
NotificationCenter task = new NotificationCenter(session, userId); NotificationCenter task = new NotificationCenter(session, userId);
timer.schedule(task, 0, 10 * 1000); timer.schedule(task, 0, 10 * 1000);

4
frontend/src/business/components/notice/Notification.vue
View File

@ -99,7 +99,7 @@ export default {
if (window.location.protocol === 'https:') { if (window.location.protocol === 'https:') {
protocol = "wss://"; protocol = "wss://";
} }
const uri = protocol + window.location.host + "/notification/count/" + getCurrentUserId(); const uri = protocol + window.location.host + "/notification/count/" + getCurrentUserId() + "/" + Math.random();
this.websocket = new WebSocket(uri); this.websocket = new WebSocket(uri);
this.websocket.onmessage = this.onMessage; this.websocket.onmessage = this.onMessage;
this.websocket.onopen = this.onOpen; this.websocket.onopen = this.onOpen;
@ -163,8 +163,6 @@ export default {
type: 'info', type: 'info',
message: message, message: message,
}); });
// 弹出之后标记成已读
this.$get('/notification/read/' + d.id);
this.noticeShow = true; this.noticeShow = true;
}); });
}); });