From d95a718f6e0557b549b2249d9fe3749f987c7d04 Mon Sep 17 00:00:00 2001 From: zhanghan2021 Date: Tue, 23 Jul 2024 15:50:05 +0800 Subject: [PATCH] fix get plugins null and update vendor --- sdk/common/common.go | 17 +++++++++++++++++ sdk/common/event.go | 5 ----- sdk/common/service.go | 12 ------------ sdk/plugin/client/plugin.go | 2 +- src/go.mod | 2 +- .../openeuler/PilotGo/sdk/common/common.go | 17 +++++++++++++++++ .../openeuler/PilotGo/sdk/common/event.go | 5 ----- .../openeuler/PilotGo/sdk/common/service.go | 12 ------------ .../PilotGo/sdk/plugin/client/plugin.go | 13 ++++++++----- src/vendor/modules.txt | 2 +- 10 files changed, 45 insertions(+), 42 deletions(-) create mode 100644 sdk/common/common.go create mode 100644 src/vendor/gitee.com/openeuler/PilotGo/sdk/common/common.go diff --git a/sdk/common/common.go b/sdk/common/common.go new file mode 100644 index 00000000..40d57d70 --- /dev/null +++ b/sdk/common/common.go @@ -0,0 +1,17 @@ +package common + +import "encoding/json" + +type EventMessage struct { + MessageType int + MessageData string +} +type CommonResult struct { + Code int `json:"code"` + Message string `json:"msg"` + Data json.RawMessage `json:"data"` +} + +func (r *CommonResult) ParseData(d interface{}) error { + return json.Unmarshal(r.Data, d) +} diff --git a/sdk/common/event.go b/sdk/common/event.go index df2eca2c..21968b54 100644 --- a/sdk/common/event.go +++ b/sdk/common/event.go @@ -24,11 +24,6 @@ const ( MsgPluginRemove = 21 ) -type EventMessage struct { - MessageType int - MessageData string -} - // 将 MessageData json字符串转换成指定结构体的message消息数据 func ToMessage(d string, s interface{}) error { return json.Unmarshal([]byte(d), s) diff --git a/sdk/common/service.go b/sdk/common/service.go index 2e9dde09..c5a8df85 100644 --- a/sdk/common/service.go +++ b/sdk/common/service.go @@ -1,7 +1,5 @@ package common -import "encoding/json" - const ( ServiceActiveStatusRunning = "running" ServiceActiveStatusExited = "exited" @@ -58,13 +56,3 @@ type Result struct { Mseeage string `json:"msg"` Data []*ServiceResult `json:"data"` } - -type CommonResult struct { - Code int `json:"code"` - Message string `json:"msg"` - Data json.RawMessage `json:"data"` -} - -func (r *CommonResult) ParseData(d interface{}) error { - return json.Unmarshal(r.Data, d) -} diff --git a/sdk/plugin/client/plugin.go b/sdk/plugin/client/plugin.go index a7215b2f..9466bf75 100644 --- a/sdk/plugin/client/plugin.go +++ b/sdk/plugin/client/plugin.go @@ -31,7 +31,7 @@ func (c *Client) GetPlugins() ([]*PluginInfo, error) { if !c.IsBind() { return nil, errors.New("unbind PilotGo-server platform") } - url := c.Server() + "/api/v1/pluginapi/plugins" + url := "http://" + c.Server() + "/api/v1/pluginapi/plugins" r, err := httputils.Get(url, &httputils.Params{ Cookie: map[string]string{ TokenCookie: c.token, diff --git a/src/go.mod b/src/go.mod index a2bc1414..87ec935f 100644 --- a/src/go.mod +++ b/src/go.mod @@ -35,7 +35,7 @@ require ( ) require ( - gitee.com/openeuler/PilotGo/sdk v0.0.0 + gitee.com/openeuler/PilotGo/sdk v0.0.0-20240722065021-a11187709b79 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect github.com/bytedance/sonic v1.9.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/common.go b/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/common.go new file mode 100644 index 00000000..40d57d70 --- /dev/null +++ b/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/common.go @@ -0,0 +1,17 @@ +package common + +import "encoding/json" + +type EventMessage struct { + MessageType int + MessageData string +} +type CommonResult struct { + Code int `json:"code"` + Message string `json:"msg"` + Data json.RawMessage `json:"data"` +} + +func (r *CommonResult) ParseData(d interface{}) error { + return json.Unmarshal(r.Data, d) +} diff --git a/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/event.go b/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/event.go index df2eca2c..21968b54 100644 --- a/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/event.go +++ b/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/event.go @@ -24,11 +24,6 @@ const ( MsgPluginRemove = 21 ) -type EventMessage struct { - MessageType int - MessageData string -} - // 将 MessageData json字符串转换成指定结构体的message消息数据 func ToMessage(d string, s interface{}) error { return json.Unmarshal([]byte(d), s) diff --git a/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/service.go b/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/service.go index 2e9dde09..c5a8df85 100644 --- a/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/service.go +++ b/src/vendor/gitee.com/openeuler/PilotGo/sdk/common/service.go @@ -1,7 +1,5 @@ package common -import "encoding/json" - const ( ServiceActiveStatusRunning = "running" ServiceActiveStatusExited = "exited" @@ -58,13 +56,3 @@ type Result struct { Mseeage string `json:"msg"` Data []*ServiceResult `json:"data"` } - -type CommonResult struct { - Code int `json:"code"` - Message string `json:"msg"` - Data json.RawMessage `json:"data"` -} - -func (r *CommonResult) ParseData(d interface{}) error { - return json.Unmarshal(r.Data, d) -} diff --git a/src/vendor/gitee.com/openeuler/PilotGo/sdk/plugin/client/plugin.go b/src/vendor/gitee.com/openeuler/PilotGo/sdk/plugin/client/plugin.go index e878f332..9466bf75 100644 --- a/src/vendor/gitee.com/openeuler/PilotGo/sdk/plugin/client/plugin.go +++ b/src/vendor/gitee.com/openeuler/PilotGo/sdk/plugin/client/plugin.go @@ -27,11 +27,11 @@ type PluginFullInfo struct { Permissions []common.Permission } -func (c *Client) GetPluginInfo(name string) (*PluginInfo, error) { +func (c *Client) GetPlugins() ([]*PluginInfo, error) { if !c.IsBind() { return nil, errors.New("unbind PilotGo-server platform") } - url := c.Server() + "/api/v1/pluginapi/plugins" + url := "http://" + c.Server() + "/api/v1/pluginapi/plugins" r, err := httputils.Get(url, &httputils.Params{ Cookie: map[string]string{ TokenCookie: c.token, @@ -41,10 +41,13 @@ func (c *Client) GetPluginInfo(name string) (*PluginInfo, error) { return nil, err } - resp := &PluginInfo{} - if err := json.Unmarshal(r.Body, resp); err != nil { + resp := struct { + Code int `json:"code"` + Data []*PluginInfo `json:"data"` + }{} + if err := json.Unmarshal(r.Body, &resp); err != nil { return nil, err } - return resp, nil + return resp.Data, nil } diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt index 72b2febf..ea74f8a2 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -1,4 +1,4 @@ -# gitee.com/openeuler/PilotGo/sdk v0.0.0 => ../sdk +# gitee.com/openeuler/PilotGo/sdk v0.0.0-20240722065021-a11187709b79 => ../sdk ## explicit; go 1.20 gitee.com/openeuler/PilotGo/sdk/common gitee.com/openeuler/PilotGo/sdk/logger -- Gitee