From 712a73114593e64ae3126f9bb531d968f3581394 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jun 2020 10:31:23 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/webSocketServer/WebSocketServer.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/webSocketServer/WebSocketServer.java b/src/main/java/com/moral/webSocketServer/WebSocketServer.java
index 38ef281..e119744 100644
--- a/src/main/java/com/moral/webSocketServer/WebSocketServer.java
+++ b/src/main/java/com/moral/webSocketServer/WebSocketServer.java
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.TimeoutException;
import javax.websocket.OnClose;
import javax.websocket.OnError;
@@ -36,7 +37,11 @@
private String orgId;
- private String regionCode;
+ private String accountId;
+
+ private Connection connection;
+
+ private Channel channel;
// ������session���������������������������
private static CopyOnWriteArraySet<WebSocketServer> webSocketSet = new CopyOnWriteArraySet<WebSocketServer>();
@@ -53,19 +58,19 @@
webSocketSet.add(this);
int flag = param.indexOf("&");
orgId = param.substring(0, flag);
- regionCode = param.substring(flag + 1);
- String QUEUE_NAME = "deviceInfo";
+ accountId = param.substring(flag + 1);
+ String QUEUE_NAME = "deviceInfo_"+accountId;
try {
//������������������������������������������������
ConnectionFactory factory = new ConnectionFactory();
//������MabbitMQ������������ip���������������
- factory.setHost("172.16.206.8");
+ factory.setHost("47.96.15.25");
factory.setPort(5672);
factory.setUsername("guest");
factory.setPassword("guest_pass");
String routingKey = orgId+".*";
- Connection connection = factory.newConnection();
- Channel channel = connection.createChannel();
+ connection = factory.newConnection();
+ channel = connection.createChannel();
//���������������������������������������������������������������������������������������������������������
channel.queueDeclare(QUEUE_NAME, false, false, true, null);
channel.queueBind(QUEUE_NAME,"screens_data",routingKey);
@@ -93,6 +98,12 @@
public void onClose() {
/**���������Set��� ������������������������*/
webSocketSet.remove(this);
+ try {
+ channel.close();
+ connection.close();
+ }catch (IOException | TimeoutException e){
+ log.error(e.getMessage());
+ }
}
@OnMessage
--
Gitblit v1.8.0