From e35f300cffd282e23be22b1a33f19c59e2763df4 Mon Sep 17 00:00:00 2001
From: Timer <@>
Date: Tue, 24 Feb 2026 00:13:36 +0800
Subject: [PATCH] =?UTF-8?q?mqtt=E5=88=9D=E5=A7=8B=E5=8C=96=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mqtt/impl/MqttConfigServiceImpl.java      |  6 +++++
 src/main/resources/application-dev.yml        | 27 +++++++++++--------
 src/main/resources/application.yml            |  4 +--
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/sipai/service/mqtt/impl/MqttConfigServiceImpl.java b/src/main/java/com/sipai/service/mqtt/impl/MqttConfigServiceImpl.java
index 57016ea..a5f097f 100644
--- a/src/main/java/com/sipai/service/mqtt/impl/MqttConfigServiceImpl.java
+++ b/src/main/java/com/sipai/service/mqtt/impl/MqttConfigServiceImpl.java
@@ -12,6 +12,7 @@ import com.sipai.entity.mqtt.MqttConfigTopic;
 import com.sipai.service.mqtt.MqttConfigService;
 import com.sipai.service.mqtt.MqttConfigTopicService;
 import com.sipai.tools.CommUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
@@ -37,6 +38,7 @@ import java.util.List;
  * @Date: 2021/03/24/16:45
  * @Description:
  */
+@Slf4j
 @Service
 public class MqttConfigServiceImpl implements MqttConfigService {
     private final MqttProperties mqttProperties;
@@ -152,6 +154,7 @@ public class MqttConfigServiceImpl implements MqttConfigService {
                     mqttClient1.setCallback(new PushCallback(mqttClient1, connOpts, topic, qos));
                     //订阅
                     mqttClient1.subscribe(topic, qos);
+                    System.out.println("已连接成功");
                 } else {
                     System.out.println("重新连接");
                     //连接
@@ -160,12 +163,15 @@ public class MqttConfigServiceImpl implements MqttConfigService {
                     mqttClient1.setCallback(new PushCallback(mqttClient1, connOpts, topic, qos));
                     //订阅
                     mqttClient1.subscribe(topic, qos);
+                    System.out.println("重新连接成功");
                 }
 
             } catch (MqttException me) {
+                log.error("MqttException:",me);
                 me.printStackTrace();
             }
         }
+        System.out.println(clientId);
         return clientId;
     }
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a8dae8d..af3094d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -19,19 +19,20 @@ spring:
     cluster:
       nodes: 172.16.242.44:6379,172.16.242.45:6379,172.16.242.46:6379,172.16.242.47:6379,172.16.242.48:6379,172.16.242.49:6379
       max-redirects: 3
-    password: zaqwsx
+    password: Aa112211
     timeout: 100000
 
   data:
     elasticsearch:
-      cluster-name: elasticsearch-sipaiis
-      cluster-nodes: 132.120.136.19:9200
+#      cluster-name: elasticsearch-sipaiis
+      cluster-name: my-application
+      cluster-nodes: 127.0.0.1:9300
 
   datasource:
     master:
       username: sa
       password: P76XB3nm36aMkN6n
-      jdbc-url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=SIPAIIS_WMS_HQAQ
+      jdbc-url: jdbc:sqlserver://122.51.194.184:1433;DatabaseName=SIPAIIS_WMS_HQAQ
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       type: com.alibaba.druid.pool.DruidDataSource
 
@@ -39,7 +40,7 @@ spring:
     js1:
       username: sa
       password: P76XB3nm36aMkN6n
-      jdbc-url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=EIP_PRD_HQWS
+      jdbc-url: jdbc:sqlserver://122.51.194.184:1433;DatabaseName=EIP_PRD_HQWS
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       type: com.alibaba.druid.pool.DruidDataSource
 
@@ -47,7 +48,7 @@ spring:
     js2:
       username: sa
       password: P76XB3nm36aMkN6n
-      jdbc-url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=EIP_PRD_HQWS
+      jdbc-url: jdbc:sqlserver://122.51.194.184:1433;DatabaseName=EIP_PRD_HQWS
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       type: com.alibaba.druid.pool.DruidDataSource
 
@@ -55,7 +56,7 @@ spring:
     js3:
       username: sa
       password: P76XB3nm36aMkN6n
-      jdbc-url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=EIP_PRD_HQWS
+      jdbc-url: jdbc:sqlserver://122.51.194.184:1433;DatabaseName=EIP_PRD_HQWS
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       type: com.alibaba.druid.pool.DruidDataSource
 
@@ -145,10 +146,14 @@ app:
   max-points: 200 #实时数据接口一次最多点位数
 
 mqtt:
-  broker-address: "tcp://192.168.10.17:1883"
-  dashboard-01: "http://192.168.10.17:18083"
-  username: "admin"
-  password: "sipai@64368180"
+#  broker-address: "tcp://192.168.10.17:1883"
+#  dashboard-01: "http://192.168.10.17:18083"
+#  username: "admin"
+#  password: "sipai@64368180"
+  broker-address: "tcp://121.5.164.6:1883"
+  dashboard-01: "http://121.5.164.6:18083"
+  username: "dmbroker"
+  password: "qwer1234"
 
 # udp服务
 udp:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1728aa5..f59b4e7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-#    active: dev
-    active: pro
+    active: dev
+#    active: pro