瀏覽代碼

修改websocket连接

lixing 4 年之前
父節點
當前提交
5e361262eb
共有 2 個文件被更改,包括 9 次插入12 次删除
  1. 3 7
      src/main/java/com/persagy/client/WebSocketClientFactory.java
  2. 6 5
      src/main/resources/application.yml

+ 3 - 7
src/main/java/com/persagy/client/WebSocketClientFactory.java

@@ -65,11 +65,7 @@ public class WebSocketClientFactory {
      */
     @Value("${terminal.alarm.compress}")
     boolean compress;
-    /**
-     * 项目名称
-     */
-    @Value("${project.iotid}")
-    String iotProjectId;
+
     ExecutorService executor = ExecutorBuilder.create()
             .setCorePoolSize(5)
             .setMaxPoolSize(10)
@@ -105,8 +101,8 @@ public class WebSocketClientFactory {
         WebSocketClient webSocketClient = new WebSocketClient(new URI(outCallWebSockertUrl)) {
             @Override
             public void onOpen(ServerHandshake serverHandshake) {
-                String msg = iotProjectId;
-                sendMsg(getOutCallWebSocketClientHolder(), msg);
+//                String msg = iotProjectId;
+//                sendMsg(getOutCallWebSocketClientHolder(), msg);
             }
 
             @Override

+ 6 - 5
src/main/resources/application.yml

@@ -39,14 +39,15 @@ spring:
 group:
   code: WD   #标识哪个接团 比如万达使用WD
   alarm:
-    host: 39.102.43.179     #netty IP
+#    host: 39.102.43.179     #netty IP
+    host: localhost     #netty IP
     port: 9986          #netty 端口9986
 terminal:  #边缘端IOT采集程序地址
   alarm:  # 拼接后的地址为ws://host:port/suffix
-    compress: true    #采用的是压缩方式还是不压缩方式  true-压缩 false-不压缩
-    host: 39.96.55.242
-    port: 9982
-    suffix: websocket   #websocker后缀
+    compress: false    #采用的是压缩方式还是不压缩方式  true-压缩 false-不压缩
+    host: localhost
+    port: 8080
+    suffix: websocket/iot   #websocker后缀
 project:
   iotid: 1101050029  #iot使用项目ID,不包含PJ
   id: Pj1101050029   #项目ID