设备上报配置修改 gengdidi

pom.xml

@@ -113,6 +113,12 @@
 			<version>1.2.7</version>
 		</dependency>
 
+		<!-- pool 对象池 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
+		</dependency>
+
 
 	</dependencies>
 

src/main/java/com/zehong/gassdevicereport/netty/ServerHandler.java

@@ -74,6 +74,7 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
         //msg为接收到的客户端传递的数据   个人这边直接传的json 数据
         ByteBuf readMessage= (ByteBuf) msg;
         String msgStr = readMessage.toString(CharsetUtil.UTF_8);
+        logger.info("receiveMsgstr======="+msgStr);
         if(msgStr.length() != 124){
             return;
         }
@@ -87,7 +88,7 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
         SocketChannel channel=(SocketChannel)ctx.channel();
         int port = channel.localAddress().getPort();
         TDeviceReportData tDeviceReportData = new TDeviceReportData();
-        if(7397 == port){
+        if(2396 == port){
             DecryptReportedData  decryptReportedData = FlowmeterDecryReportedDataStrategy.getDecryptReportedData(msgStr);
             if(null == decryptReportedData){
                 logger.error("未获取到流量计类型");
@@ -95,7 +96,7 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
             }
             tDeviceReportData = decryptReportedData.getReportedData();
         }
-        if (7398 == port){
+        if (65011 == port){
             tDeviceReportData = new PressureDecryptReportedData(msgStr).getReportedData();
         }
         //缓存设备信息

src/main/resources/application.yml

@@ -13,16 +13,26 @@ server:
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
 
-# redis 配置
-redis:
+
+
+
+#mysql
+spring:
+  datasource:
+    username: root
+    password: root@123
+    url: jdbc:mysql://36.148.23.59:3306/gas_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    driver-class-name: com.mysql.jdbc.Driver
+  # redis 配置
+  redis:
     # 地址
-  host: localhost
+    host: 36.148.23.59
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 6
     # 密码
-  password:
+    password: 1qaz2wsx3edc
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -36,15 +46,6 @@ redis:
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
 
-
-#mysql
-spring:
-  datasource:
-    username: root
-    password: root@123
-    url: jdbc:mysql://36.148.23.59:3306/gas_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-    driver-class-name: com.mysql.jdbc.Driver
-
 #mybatis的相关配置
 mybatis:
   #mapper配置文件
@@ -61,7 +62,7 @@ logging:
     org.springframework: warn
 
 #webSocektUrl
-webSocektUrl: http://localhost:8903/gassafety/websocket/send
+webSocektUrl: http://36.148.23.59:8901/gassafety/websocket/send
 
 netty:
-  ports: 7397,7398
+  ports: 2396,65011