Revert: mqtt重连

server-web/src/main/java/com/makeit/mqtt/MqttPushClient.java

@@ -42,12 +42,11 @@ public class MqttPushClient {
         try {
             client = new MqttClient(host, clientId, new MemoryPersistence());
             MqttConnectOptions options = new MqttConnectOptions();
-            options.setCleanSession(false);
+            options.setCleanSession(true);
             options.setUserName(username);
             options.setPassword(password.toCharArray());
             options.setConnectionTimeout(timeout);
             options.setKeepAliveInterval(keepalive);
-            options.setAutomaticReconnect(true);
             MqttPushClient.setMqttClient(client);
             if (!client.isConnected()) {
                 try {

server-web/src/main/java/com/makeit/mqtt/PushCallback.java

@@ -99,22 +99,25 @@ public class PushCallback implements MqttCallbackExtended {
     @Override
     public void connectionLost(Throwable cause) {
         logger.info("连接断开，可以重连");
-        int times = 1;
-        while (client == null || !client.isConnected()) {
-            logger.info("重新连接, 第" + (times++) + "次");
-            MqttPushClient mqttPushClient = mqttConfig.getMqttPushClient();
-            if (mqttPushClient != null && mqttPushClient.getMqttClient() != null && mqttPushClient.getMqttClient().isConnected()) {
-                logger.info("重连成功");
-                break;
-            }
-            logger.info("重连失败");
-            // 每隔10秒重试一次
-            try {
-                TimeUnit.SECONDS.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+        if (client == null || !client.isConnected()) {
+            mqttConfig.getMqttPushClient();
         }
+        // int times = 1;
+        // while (client == null || !client.isConnected()) {
+        //     logger.info("重新连接, 第" + (times++) + "次");
+        //     MqttPushClient mqttPushClient = mqttConfig.getMqttPushClient();
+        //     if (mqttPushClient != null && mqttPushClient.getMqttClient() != null && mqttPushClient.getMqttClient().isConnected()) {
+        //         logger.info("重连成功");
+        //         break;
+        //     }
+        //     logger.info("重连失败");
+        //     // 每隔10秒重试一次
+        //     try {
+        //         TimeUnit.SECONDS.sleep(10);
+        //     } catch (InterruptedException e) {
+        //         e.printStackTrace();
+        //     }
+        // }
     }
 
     @Override