add exit terminal prompt text

Author: sanshengshui

toolkit-common/src/main/java/iot/technology/client/toolkit/common/utils/StringUtils.java

@@ -15,6 +15,8 @@
  */
 package iot.technology.client.toolkit.common.utils;
 
+import iot.technology.client.toolkit.common.constants.StorageConstants;
+
 /**
  * @author mushuwei
  */
@@ -26,6 +28,13 @@ public static String lineSeparator() {
 		return lineSeparator;
 	}
 
+	public static void toolkitPromptText() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("Welcome to Toolkit ").append(StorageConstants.TOOLKIT_VERSION).append(StringUtils.lineSeparator);
+		sb.append("Press Ctrl+C or `exit` to exit the REPL");
+		System.out.println(sb);
+	}
+
 	public static boolean hasText(String str) {
 		return (str != null && !str.isEmpty() && containsText(str));
 	}

toolkit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/command/sub/MqttPublishCommand.java

@@ -22,6 +22,7 @@
 import iot.technology.client.toolkit.common.rule.TkNode;
 import iot.technology.client.toolkit.common.utils.FileUtils;
 import iot.technology.client.toolkit.common.utils.ObjectUtils;
+import iot.technology.client.toolkit.common.utils.StringUtils;
 import iot.technology.client.toolkit.mqtt.service.MqttBizService;
 import iot.technology.client.toolkit.mqtt.service.MqttSettingsRuleChainProcessor;
 import iot.technology.client.toolkit.mqtt.service.domain.MqttConfigSettingsDomain;
@@ -79,7 +80,7 @@ public Integer call() throws Exception {
 		context.setPromptData(isNew ? null : bizService.getMqttConfigList());
 
 		String code = isNew ? ruleChain.getRootPublishNewConfigNode() : ruleChain.getRootPublishSelectConfigNode();
-
+		StringUtils.toolkitPromptText();
 		while (true) {
 			String data;
 			try {
@@ -91,6 +92,9 @@ public Integer call() throws Exception {
 				tkNode.prePrompt(context);
 				data = reader.readLine(tkNode.nodePrompt());
 				context.setData(data);
+				if (data.equals("exit")) {
+					break;
+				}
 				tkNode.check(context);
 				String codeData = tkNode.getValue(context);
 				bizService.printValueToConsole(code, codeData, context);

toolkit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/command/sub/MqttSettingsCommand.java

@@ -20,6 +20,7 @@
 import iot.technology.client.toolkit.common.constants.StorageConstants;
 import iot.technology.client.toolkit.common.rule.ProcessContext;
 import iot.technology.client.toolkit.common.rule.TkProcessor;
+import iot.technology.client.toolkit.common.utils.StringUtils;
 import iot.technology.client.toolkit.mqtt.service.processor.*;
 import org.jline.reader.*;
 import org.jline.reader.impl.DefaultParser;
@@ -90,12 +91,16 @@ public Integer call() throws Exception {
 				.build();
 
 		String prompt = bundle.getString("mqtt.settings.command.prompt") + GlobalConstants.promptSeparator;
+		StringUtils.toolkitPromptText();
 		while (true) {
 			String data;
 			try {
 				data = reader.readLine(prompt);
 				ProcessContext context = new ProcessContext();
 				context.setData(data);
+				if (data.equals("exit")) {
+					break;
+				}
 				for (TkProcessor processor : getTkProcessorList()) {
 					if (processor.supports(context)) {
 						processor.handle(context);
@@ -105,5 +110,6 @@ public Integer call() throws Exception {
 				return ExitCodeEnum.ERROR.getValue();
 			}
 		}
+		return ExitCodeEnum.SUCCESS.getValue();
 	}
 }

toolkit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/command/sub/MqttSubscribeCommand.java

@@ -22,6 +22,7 @@
 import iot.technology.client.toolkit.common.rule.TkNode;
 import iot.technology.client.toolkit.common.utils.FileUtils;
 import iot.technology.client.toolkit.common.utils.ObjectUtils;
+import iot.technology.client.toolkit.common.utils.StringUtils;
 import iot.technology.client.toolkit.mqtt.service.MqttBizService;
 import iot.technology.client.toolkit.mqtt.service.MqttSettingsRuleChainProcessor;
 import iot.technology.client.toolkit.mqtt.service.domain.MqttConfigSettingsDomain;
@@ -79,7 +80,7 @@ public Integer call() throws Exception {
 		context.setPromptData(isNew ? null : bizService.getMqttConfigList());
 
 		String code = isNew ? ruleChain.getRootPublishNewConfigNode() : ruleChain.getRootPublishSelectConfigNode();
-
+		StringUtils.toolkitPromptText();
 		while (true) {
 			String data;
 			try {
@@ -91,6 +92,9 @@ public Integer call() throws Exception {
 				tkNode.prePrompt(context);
 				data = reader.readLine(tkNode.nodePrompt());
 				context.setData(data);
+				if (data.equals("exit")) {
+					break;
+				}
 				tkNode.check(context);
 				bizService.printValueToConsole(code, tkNode.getValue(context), context);
 				ObjectUtils.setValue(domain, code, tkNode.getValue(context));

toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/command/sub/NbCallCommand.java

@@ -19,6 +19,7 @@
 import iot.technology.client.toolkit.common.rule.NodeContext;
 import iot.technology.client.toolkit.common.rule.TkNode;
 import iot.technology.client.toolkit.common.utils.ObjectUtils;
+import iot.technology.client.toolkit.common.utils.StringUtils;
 import iot.technology.client.toolkit.nb.service.NbBizService;
 import iot.technology.client.toolkit.nb.service.NbConfigSettingsDomain;
 import iot.technology.client.toolkit.nb.service.NbRuleChainProcessor;
@@ -64,7 +65,7 @@ public Integer call() throws Exception {
 		NodeContext context = new NodeContext();
 		NbConfigSettingsDomain domain = new NbConfigSettingsDomain();
 		String code = ruleChain.getNbTypeNode();
-
+		StringUtils.toolkitPromptText();
 		while (true) {
 			try {
 				String node = processor.get(code);
@@ -75,6 +76,9 @@ public Integer call() throws Exception {
 				tkNode.prePrompt(context);
 				String data = reader.readLine(tkNode.nodePrompt());
 				context.setData(data);
+				if (data.equals("exit")) {
+					break;
+				}
 				tkNode.check(context);
 				bizService.printValueToConsole(code, context);
 				ObjectUtils.setValue(domain, code, tkNode.getValue(context));

toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/command/sub/NbSettingsCommand.java

@@ -21,6 +21,7 @@
 import iot.technology.client.toolkit.common.rule.TkNode;
 import iot.technology.client.toolkit.common.rule.TkProcessor;
 import iot.technology.client.toolkit.common.utils.ObjectUtils;
+import iot.technology.client.toolkit.common.utils.StringUtils;
 import iot.technology.client.toolkit.nb.service.NbBizService;
 import iot.technology.client.toolkit.nb.service.NbConfigSettingsDomain;
 import iot.technology.client.toolkit.nb.service.NbRuleChainProcessor;
@@ -93,7 +94,7 @@ public Integer call() throws Exception {
 		context.setType("settings");
 		NbConfigSettingsDomain domain = new NbConfigSettingsDomain();
 		String code = ruleChain.getNbTypeNode();
-
+		StringUtils.toolkitPromptText();
 		while (true) {
 			boolean isNbSettings = code.equals(NbSettingsCodeEnum.NB_SETTINGS.getCode());
 			LineReader reader = isNbSettings ?
@@ -116,6 +117,9 @@ public Integer call() throws Exception {
 				tkNode.prePrompt(context);
 				String data = reader.readLine(tkNode.nodePrompt());
 				context.setData(data);
+				if (data.equals("exit")) {
+					break;
+				}
 				if (isNbSettings) {
 					NbSettingsContext nbSettingsContext = new NbSettingsContext();
 					nbSettingsContext.setNbType(domain.getNbType());

toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/node/NbTypeNode.java

@@ -21,10 +21,7 @@ public class NbTypeNode implements TkNode {
 
 	@Override
 	public void prePrompt(NodeContext context) {
-		StringBuilder sb = new StringBuilder();
-		sb.append("Welcome to Toolkit ").append(StorageConstants.TOOLKIT_VERSION).append(StringUtils.lineSeparator);
-		sb.append(StringUtils.lineSeparator());
-		
+		StringUtils.toolkitPromptText();
 		if (bundle.getLocale().equals(Locale.CHINESE)) {
 			System.out.format(ColorUtils.greenItalic("(1) 电信AEP * ") + "%n");
 			System.out.format(ColorUtils.greenItalic("(2) 移动OneNET") + "%n");