From 689f206281dad5bf359108a0aa7816e65ce7f0d6 Mon Sep 17 00:00:00 2001
From: liwei <wei.li@le-it.com.cn>
Date: Thu, 5 Aug 2021 15:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/request.js    |  7 ++--
 src/views/etcd/index.vue | 80 ++++++++++++++++++++++++++--------------
 2 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/src/server/request.js b/src/server/request.js
index 69cdd18..2fdfd9a 100644
--- a/src/server/request.js
+++ b/src/server/request.js
@@ -18,14 +18,15 @@ service.interceptors.request.use(
 
 service.interceptors.response.use(
   (response) => {
-    console.log(response);
     const code = response.data.code
     if (code === 200) {
-      return response.data
+      return response.data;
+    }else{
+      return response.data;
     }
   },
   (error) => {
-    console.log(Promise.reject(error));
+    console.log(Promise.reject(error.response.data.msg));
 		// msgError(Promise.reject(error.response.data.msg))
 		return Promise.reject(error.response.data)
   }
diff --git a/src/views/etcd/index.vue b/src/views/etcd/index.vue
index 83228f9..48936a8 100644
--- a/src/views/etcd/index.vue
+++ b/src/views/etcd/index.vue
@@ -138,13 +138,19 @@ export default {
         get("/v1/keys/cmd", {
           cmd: "start",
           service_path: item.service_path,
-        }).then(({ code }) => {
-          this.loading = false;
-          if (code == 200) {
-            this.msgSuccess("启动成功,请稍后刷新列表数据");
-            this.getList();
-          }
-        });
+        })
+          .then(({ code, msg }) => {
+            this.loading = false;
+            if (code == 200) {
+              this.msgSuccess("启动成功,请稍后刷新列表数据");
+              this.getList();
+            } else {
+              this.msgError(msg);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
     },
     // 暂停服务
     cmdPause(item) {
@@ -152,13 +158,19 @@ export default {
         get("/v1/keys/cmd", {
           cmd: "pause",
           service_path: item.service_path,
-        }).then(({ code }) => {
-          this.loading = false;
-          if (code == 200) {
-            this.msgSuccess("暂停成功,请稍后刷新列表数据");
-            this.getList();
-          }
-        });
+        })
+          .then(({ code, msg }) => {
+            this.loading = false;
+            if (code == 200) {
+              this.msgSuccess("暂停成功,请稍后刷新列表数据");
+              this.getList();
+            } else {
+              this.msgError(msg);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
     },
     // 恢复服务
     cmdRecover(item) {
@@ -166,13 +178,19 @@ export default {
         get("/v1/keys/cmd", {
           cmd: "recover",
           service_path: item.service_path,
-        }).then(({ code }) => {
-          this.loading = false;
-          if (code == 200) {
-            this.msgSuccess("恢复成功,请稍后刷新列表数据");
-            this.getList();
-          }
-        });
+        })
+          .then(({ code, msg }) => {
+            this.loading = false;
+            if (code == 200) {
+              this.msgSuccess("恢复成功,请稍后刷新列表数据");
+              this.getList();
+            } else {
+              this.msgError(msg);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
     },
     // 停止服务
     cmdStop(item) {
@@ -180,13 +198,19 @@ export default {
         get("/v1/keys/cmd", {
           cmd: "stop",
           service_path: item.service_path,
-        }).then(({ code }) => {
-          this.loading = false;
-          if (code == 200) {
-            this.msgSuccess("停止成功,请稍后刷新列表数据");
-            this.getList();
-          }
-        });
+        })
+          .then(({ code, msg }) => {
+            this.loading = false;
+            if (code == 200) {
+              this.msgSuccess("停止成功,请稍后刷新列表数据");
+              this.getList();
+            } else {
+              this.msgError(msg);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
     },
     // 删除按钮操作
     handleDelete(row) {