소스 검색

继续排查断连问题

lgy 3 년 전
부모
커밋
32ea757e54

+ 1 - 1
src/main/java/com/persagy/netty/client/CenterChannelInitializer.java

@@ -24,7 +24,7 @@ public class CenterChannelInitializer extends ChannelInitializer<SocketChannel>
 
     @Override
     protected void initChannel(SocketChannel channel) throws Exception {
-        channel.pipeline().addLast(new IdleStateHandler(0,60,0, TimeUnit.SECONDS));
+//        channel.pipeline().addLast(new IdleStateHandler(0,60,0, TimeUnit.SECONDS));
         //对象传输处理
         channel.pipeline().addLast(new ObjDecoder());
         // 在管道中添加我们自己的接收数据实现方法

+ 2 - 3
src/main/java/com/persagy/netty/client/CenterClientHandler.java

@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
-public class CenterClientHandler extends SimpleChannelInboundHandler<NettyMessage> {
+public class CenterClientHandler extends SimpleChannelInboundHandler<NettyMessage<JSONObject>> {
     // Sleep 5 seconds before a reconnection attempt.
     static final int RECONNECT_DELAY = Integer.parseInt(System.getProperty("reconnectDelay", "5"));
     // Reconnect when the server sends nothing for 10 seconds.
@@ -150,8 +150,7 @@ public class CenterClientHandler extends SimpleChannelInboundHandler<NettyMessag
             }
         } else if (msg.getOpCode() == 12) {
             //云端更新报警记录状态
-            NettyMessage<JSONObject> AlarmStateMessage = JSONObject.parseObject(msg.toString(), new TypeReference<NettyMessage<JSONObject>>() {
-            });
+            NettyMessage<JSONObject> AlarmStateMessage = JSONObject.parseObject(msg.toString(), new TypeReference<NettyMessage<JSONObject>>() {});
             List<JSONObject> stateList = AlarmStateMessage.getContent();
             alarmDefineService.updateAlarmDefine(stateList);
         }

+ 2 - 1
src/main/java/com/persagy/netty/client/NettyClient.java

@@ -1,6 +1,7 @@
 package com.persagy.netty.client;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.persagy.constant.CommonConst;
 import com.persagy.entity.NettyMessage;
 import com.persagy.job.NettyMessageQueue;
@@ -62,7 +63,7 @@ public class NettyClient {
             try {
                 //!!!!!!注意,NettyMessage<T>是有泛型的,如果把发送一个数据,接收方必须有一个和<T>的全限定类名完全一样的实体类,
                 //发送方不应该限制接收方,所有使用JSONObject.parseObject(msg.toString(), NettyMessage.class)操作让泛型擦除掉
-                channel.writeAndFlush(JSONObject.parseObject(msg.toString(), NettyMessage.class));
+                channel.writeAndFlush(JSONObject.parseObject(msg.toString(), new TypeReference<NettyMessage<JSONObject>>(){}));
             } catch (Exception e) {
                 log.error("发送数据异常,放入缓冲队列中", e);
                 NettyMessageQueue.getNettyMessageQueue().produce(msg);

+ 2 - 2
src/main/resources/application-39Pj5001120003.yml

@@ -3,9 +3,9 @@ group:
   code: XG   #标识哪个接团
   alarm:
     #需要更改
-    host: 127.0.0.1 #39.102.43.179  #netty IP
+    host: 39.102.43.179 #39.102.43.179  #netty IP
     #需要更改
-    port: 9986          #netty 端口8826
+    port: 9971          #netty 端口8826
     #需要更改
 terminal: #边缘端IOT采集程序地址
   alarm: # 拼接后的地址为ws://host:port/suffix

+ 28 - 0
src/main/resources/application-Pj3201110003.yml

@@ -0,0 +1,28 @@
+group:
+  #需要更改
+  code: HY   #标识哪个接团
+  alarm:
+    #需要更改
+    host: 39.102.43.179 #39.102.43.179  #netty IP
+    #需要更改
+    port: 9971          #netty 端口8826
+    #需要更改
+terminal: #边缘端IOT采集程序地址
+  alarm: # 拼接后的地址为ws://host:port/suffix
+    #需要更改
+    compress: false    #采用的是压缩方式还是不压缩方式  true-压缩 false-不压缩
+    #需要更改
+    host: 39.102.43.179
+    #需要更改
+    port: 9994 #9989
+    #需要更改
+    suffix: websocket   #websocker后缀
+project:
+  #需要更改
+  iotid: 3201110003 #iot使用项目ID,不包含PJ
+  #需要更改
+  id: Pj3201110003 #项目ID
+spring:
+  datasource:
+    #需要更改
+    url: jdbc:mysql://39.102.43.179:9934/alarm-quartz-hy?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false

+ 1 - 1
src/main/resources/application-Pj4403070003.yml

@@ -5,7 +5,7 @@ group:
     #需要更改
     host: 39.102.43.179 #netty IP   39.102.43.179
     #需要更改
-    port: 9986          #netty 端口8826
+    port: 9971          #netty 端口8826
     #需要更改
 terminal: #边缘端IOT采集程序地址
   alarm: # 拼接后的地址为ws://host:port/suffix

+ 1 - 1
src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
   application:
     name: zkt-project-alarm
   profiles:
-    active: Pj4403070003 #39Pj5001120003 #Pj4403070003
+    active: Pj3201110003 #39Pj5001120003 #Pj4403070003 #Pj3201110003
   datasource:
     #需要更改
     url: jdbc:mysql://39.102.43.179:9934/alarm-quartz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false