From 4615d6d790eac1e1767cddbe22fe83123b744a76 Mon Sep 17 00:00:00 2001
From: dinglezhang <polycplusplus@gmail.com>
Date: Sun, 25 Sep 2022 22:26:12 +0800
Subject: [PATCH] =?UTF-8?q?resolve=20issue=20"GUI=E8=BF=9E=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=8A=E6=9C=AC=E5=9C=B0TDengine=EF=BC=8C=E4=B8=80=E7=9B=B4?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5"=20https?=
 =?UTF-8?q?://github.com/skye0207/TDengineGUI/issues/12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renderer/taosrestful_.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/renderer/taosrestful_.js b/renderer/taosrestful_.js
index c0faa42..cf40b9b 100644
--- a/renderer/taosrestful_.js
+++ b/renderer/taosrestful_.js
@@ -3,7 +3,7 @@ const axios = require('axios')
 module.exports = {
    async sendRequest(sqlStr, payload){
     // console.log(sqlStr)
-    try {   
+    try {
         let res = await axios.post(`http://${payload.ip}:${payload.port}/rest/sql`, sqlStr, {
             auth: {
             username: payload.user,
@@ -11,11 +11,8 @@ module.exports = {
             },
             timeout: payload.timeout
         })
-        if (res.data.status == 'succ'){
-            // console.log(res.data.data)
-            // console.log(res.data.rows)
-            // console.log(res.data.head)
-            let head  = res.data.head
+        if (res.statusText == 'OK'){
+            let head  = res.data.column_meta.map(item => item[0])
             let resData = res.data.data.map(item => Object.fromEntries(head.map((a,b)=>[a,item[b]])))
             return  {'res':true,'count':res.data.rows,'data':resData}
         }else{
@@ -27,9 +24,7 @@ module.exports = {
         }else{
             return {'res':false,'msg':'连接错误','code':-1}
         }
-        
     }
-
    },
    showDatabases(payload){
         return this.sendRequest('SHOW DATABASES', payload)
@@ -206,9 +201,7 @@ module.exports = {
         }else{
             return this.sendRequest(sqlStr, payload)
         }
-
     })
-
    },
    countDataIn(tableName, dbName,primaryKey, payload, where='',startTime=null,endTime=null){
         where = this.timeWhere(primaryKey,where,startTime,endTime)
@@ -226,7 +219,7 @@ module.exports = {
                 return new Promise((resolve, reject)=>{resolve(0)})
             }
         })
-    },  
+    },
    rawSql(sqlStr,payload){
         return this.sendRequest(sqlStr,payload)
    },