From 95f4c1e6d4f01a3bb5e9ab4c5c3c2e2c22804c14 Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Fri, 16 Jun 2023 09:26:45 +0800
Subject: [PATCH] fix httputils response error

---
 sdk/plugin/client/config.go  | 4 ++--
 sdk/plugin/client/event.go   | 8 ++++----
 sdk/plugin/client/machine.go | 4 ++--
 sdk/plugin/client/plugin.go  | 4 ++--
 sdk/plugin/client/script.go  | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sdk/plugin/client/config.go b/sdk/plugin/client/config.go
index 7dbbd624..8fd24eb2 100644
--- a/sdk/plugin/client/config.go
+++ b/sdk/plugin/client/config.go
@@ -10,7 +10,7 @@ import (
 
 func (c *Client) ApplyConfig(batch *common.Batch, path, content string) error {
 	url := c.Server + "/api/v1/pluginapi/apply_config"
-	data, err := httputils.Put(url, nil)
+	r, err := httputils.Put(url, nil)
 	if err != nil {
 		return err
 	}
@@ -19,7 +19,7 @@ func (c *Client) ApplyConfig(batch *common.Batch, path, content string) error {
 		Status string
 		Error  string
 	}{}
-	if err := json.Unmarshal(data, resp); err != nil {
+	if err := json.Unmarshal(r.Body, resp); err != nil {
 		return err
 	}
 	if resp.Status != "ok" {
diff --git a/sdk/plugin/client/event.go b/sdk/plugin/client/event.go
index 11328c0d..64b72381 100644
--- a/sdk/plugin/client/event.go
+++ b/sdk/plugin/client/event.go
@@ -17,7 +17,7 @@ type EventCallback func(e *Event)
 // 注册event事件监听
 func (c *Client) ListenEvent(event Event, callback EventCallback) error {
 	url := c.Server + "/api/v1/pluginapi/listener"
-	data, err := httputils.Put(url, nil)
+	r, err := httputils.Put(url, nil)
 	if err != nil {
 		return err
 	}
@@ -26,7 +26,7 @@ func (c *Client) ListenEvent(event Event, callback EventCallback) error {
 		Status string
 		Error  string
 	}{}
-	if err := json.Unmarshal(data, resp); err != nil {
+	if err := json.Unmarshal(r.Body, resp); err != nil {
 		return err
 	}
 	if resp.Status != "ok" {
@@ -40,7 +40,7 @@ func (c *Client) ListenEvent(event Event, callback EventCallback) error {
 // 取消注册event事件监听
 func (c *Client) UnListenEvent(listenerID string) error {
 	url := c.Server + "/api/v1/pluginapi/listener"
-	data, err := httputils.Delete(url, nil)
+	r, err := httputils.Delete(url, nil)
 	if err != nil {
 		return err
 	}
@@ -49,7 +49,7 @@ func (c *Client) UnListenEvent(listenerID string) error {
 		Status string
 		Error  string
 	}{}
-	if err := json.Unmarshal(data, resp); err != nil {
+	if err := json.Unmarshal(r.Body, resp); err != nil {
 		return err
 	}
 	if resp.Status != "ok" {
diff --git a/sdk/plugin/client/machine.go b/sdk/plugin/client/machine.go
index 7179ea70..9f5f8cbd 100644
--- a/sdk/plugin/client/machine.go
+++ b/sdk/plugin/client/machine.go
@@ -9,13 +9,13 @@ import (
 
 func (c *Client) MachineList() ([]*common.MachineNode, error) {
 	url := c.Server + "/api/v1/pluginapi/machine_list"
-	body, err := httputils.Get(url, nil)
+	r, err := httputils.Get(url, nil)
 	if err != nil {
 		return nil, err
 	}
 
 	result := []*common.MachineNode{}
-	if err := json.Unmarshal(body, &result); err != nil {
+	if err := json.Unmarshal(r.Body, &result); err != nil {
 		return nil, err
 	}
 	return result, nil
diff --git a/sdk/plugin/client/plugin.go b/sdk/plugin/client/plugin.go
index e3471926..1731542a 100644
--- a/sdk/plugin/client/plugin.go
+++ b/sdk/plugin/client/plugin.go
@@ -18,13 +18,13 @@ type PluginInfo struct {
 
 func (c *Client) GetPluginInfo(name string) (*PluginInfo, error) {
 	url := c.Server + "/api/v1/pluginapi/plugins"
-	data, err := httputils.Get(url, nil)
+	r, err := httputils.Get(url, nil)
 	if err != nil {
 		return nil, err
 	}
 
 	resp := &PluginInfo{}
-	if err := json.Unmarshal(data, resp); err != nil {
+	if err := json.Unmarshal(r.Body, resp); err != nil {
 		return nil, err
 	}
 
diff --git a/sdk/plugin/client/script.go b/sdk/plugin/client/script.go
index 51b0056e..194fe373 100644
--- a/sdk/plugin/client/script.go
+++ b/sdk/plugin/client/script.go
@@ -27,7 +27,7 @@ func (c *Client) RunCommand(batch *common.Batch, cmd string) ([]*CmdResult, erro
 		Command: base64.StdEncoding.EncodeToString([]byte(cmd)),
 	}
 
-	bs, err := httputils.Post(url, &httputils.Params{
+	r, err := httputils.Post(url, &httputils.Params{
 		Body: p,
 	})
 	if err != nil {
@@ -35,7 +35,7 @@ func (c *Client) RunCommand(batch *common.Batch, cmd string) ([]*CmdResult, erro
 	}
 
 	res := []*CmdResult{}
-	if err := json.Unmarshal(bs, &res); err != nil {
+	if err := json.Unmarshal(r.Body, &res); err != nil {
 		return nil, err
 	}
 
@@ -53,7 +53,7 @@ func (c *Client) RunScript(batch *common.Batch, script string) ([]*CmdResult, er
 		Script: base64.StdEncoding.EncodeToString([]byte(script)),
 	}
 
-	bs, err := httputils.Post(url, &httputils.Params{
+	r, err := httputils.Post(url, &httputils.Params{
 		Body: p,
 	})
 	if err != nil {
@@ -61,7 +61,7 @@ func (c *Client) RunScript(batch *common.Batch, script string) ([]*CmdResult, er
 	}
 
 	res := []*CmdResult{}
-	if err := json.Unmarshal(bs, &res); err != nil {
+	if err := json.Unmarshal(r.Body, &res); err != nil {
 		return nil, err
 	}
 
-- 
Gitee