From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java
index 0c7c5c6..3c43616 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java
@@ -3,7 +3,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.springframework.beans.factory.annotation.Value;
 
 /**
  * @author ZhuBaoMin
@@ -15,25 +14,15 @@
 @Slf4j
 public class MqttMsgSubscriber {
 
-    @Value("${spring.mqtt.broker}")
-    private String broker;
-
-    @Value("${spring.mqtt.username}")
-    private String username;
-
-    @Value("${spring.mqtt.password}")
-    private String password;
-
-    @Value("${spring.mqtt.topic}")
-    private String topic;
-
-    @Value("${spring.mqtt.qos}")
-    private Integer qos;
-
-    private String clientId = System.currentTimeMillis() + "";
-
     public void readSubscribeTopicMessage(){
         try {
+            String broker = "tcp://127.0.0.1:1883";
+            String username = "mqtt_u";
+            String password = "yjy";
+            String topic = "workOrder";
+            Integer qos = 2;
+            String clientId = System.currentTimeMillis() + "";
+
             MqttClient client = new MqttClient(broker, clientId, new MemoryPersistence());
 
             // 杩炴帴鍙傛暟

--
Gitblit v1.8.0