From d0c91261c433eb4cadc93f7d8f5457c0731aa951 Mon Sep 17 00:00:00 2001
From: gc87 <sfme@qq.com>
Date: Thu, 21 Apr 2022 15:14:07 +0800
Subject: [PATCH] fix(mqtt): set values format to default

---
 plugins/mqtt/command/read_write.c | 8 ++++----
 plugins/mqtt/mqtt.json            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/mqtt/command/read_write.c b/plugins/mqtt/command/read_write.c
index d85c2528..794104c3 100644
--- a/plugins/mqtt/command/read_write.c
+++ b/plugins/mqtt/command/read_write.c
@@ -277,12 +277,12 @@ char *command_rw_read_periodic_response(neu_plugin_t *plugin, uint64_t sender,
     neu_json_read_resp_t json = { 0 };
     wrap_read_response_json_object(array, &json, plugin, (uint32_t) sender);
 
-    if (0 == upload_format) {
-        neu_json_encode_with_mqtt(&json, neu_json_encode_read_resp, &header,
+    if (0 == upload_format) { // values
+        neu_json_encode_with_mqtt(&json, neu_json_encode_read_resp1, &header,
                                   neu_json_encode_read_periodic_resp,
                                   &json_str);
-    } else if (1 == upload_format) {
-        neu_json_encode_with_mqtt(&json, neu_json_encode_read_resp1, &header,
+    } else if (1 == upload_format) { // tags
+        neu_json_encode_with_mqtt(&json, neu_json_encode_read_resp, &header,
                                   neu_json_encode_read_periodic_resp,
                                   &json_str);
     } else {
diff --git a/plugins/mqtt/mqtt.json b/plugins/mqtt/mqtt.json
index 7c1f2aa8..af26f6ac 100644
--- a/plugins/mqtt/mqtt.json
+++ b/plugins/mqtt/mqtt.json
@@ -18,11 +18,11 @@
 		"valid": {
 			"map": [
 				{
-					"key": "format-tags",
+					"key": "format-values",
 					"value": 0
 				},
 				{
-					"key": "format-values",
+					"key": "format-tags",
 					"value": 1
 				}
 			]