Merge remote-tracking branch 'origin/main'

IoT-Technology · Oct 18, 2023 · 837426d · 837426d
2 parents 5fd2c2b + cfc0f9e
commit 837426d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/toolkit-common/src/main/java/iot/technology/client/toolkit/common/utils/FileUtils.java b/toolkit-common/src/main/java/iot/technology/client/toolkit/common/utils/FileUtils.java
@@ -75,7 +75,15 @@ public static boolean notExistOrContents(String fileName) {
 
 	public static void updateAllFileContents(String fileName, List<String> bodyList) {
 		try {
-			Files.write(Paths.get(fileName), bodyList, StandardCharsets.UTF_8);
+			StringBuilder content = new StringBuilder();
+			if (!bodyList.isEmpty()) {
+				bodyList.forEach(body -> {
+					content.append(body).append(System.lineSeparator());
+				});
+			}
+			//overlay update
+			Files.write(Path.of(fileName), content.toString().getBytes());
+
 		} catch (IOException e) {
 			System.out.format("fileName updateAllFileContents failed!!!");
 		}

diff --git a/toolkit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/service/MqttBizService.java b/toolkit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/service/MqttBizService.java
@@ -146,7 +146,7 @@ public boolean mqttProcessorAfterLogic(String code, MqttConfigSettingsDomain dom
 				domain.setClient(mqttClientService);
 				//write settings to file
 				MqttSettings settings = domain.convertMqttSettingsJsonString();
-				settings.setUsage(0);
+				settings.setUsage(1);
 				FileUtils.writeDataToFile(SystemConfigConst.MQTT_SETTINGS_FILE_NAME, JsonUtils.object2Json(settings));
 
 				// add settings config, not enter into sub terminal

diff --git a/...kit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/service/MqttSettingService.java b/...kit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/service/MqttSettingService.java
@@ -39,7 +39,7 @@ public void updateAllMqttConfigsByUsage(MqttSettings waitUpdateSettings, Integer
             waitUpdateSettings.setSettingTime(System.currentTimeMillis());
         }
         settingsList.add(waitUpdateSettings);
-        settingsList.stream().forEach(st -> {
+        settingsList.forEach(st -> {
             if (st.getSettingTime() == null) {
                 st.setSettingTime(System.currentTimeMillis());
             }

diff --git a/...t-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/service/MqttShellModeService.java b/...t-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/service/MqttShellModeService.java
@@ -92,8 +92,8 @@ public boolean call(MqttShellModeDomain domain, Terminal terminal) {
                 MqttClientCallback clientCallback = new MqttClientCallback() {
                     @Override
                     public void connectionLost(DisReason reason) {
-                        mqttSettingService.updateAllMqttConfigsByUsage(domain.getSettings(), 0);
                         if (reason.getActionType().equals(0)) {
+                            mqttSettingService.updateAllMqttConfigsByUsage(domain.getSettings(), 0);
                             StringBuilder sb = new StringBuilder();
                             sb.append(StringUtils.lineSeparator);
                             sb.append("Server Unavailable" + String.format(EmojiEnum.disconnectEmoji));
@@ -110,6 +110,7 @@ public void onSuccessfulReconnect() {
                 String data = reader.readLine(prompt);
                 context.setData(data);
                 if (data.equals("exit")) {
+                    isEnd = false;
                     mqttSettingService.updateAllMqttConfigsByUsage(domain.getSettings(), 0);
                     domain.getClient().disconnect(1);
                     return false;