From c5113a0cfb8abfc00ddae5d875050d165433a470 Mon Sep 17 00:00:00 2001
From: Wangjunqi123 <wangjunqi@kylinos.cn>
Date: Fri, 17 Nov 2023 17:34:29 +0800
Subject: [PATCH] Modify plugin initialization to adapt to SDK

---
 server/agentmanager/init.go       | 1 +
 server/agentmanager/topoclient.go | 8 ++++----
 server/collector/collector.go     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/agentmanager/init.go b/server/agentmanager/init.go
index 3f7f331..720f598 100644
--- a/server/agentmanager/init.go
+++ b/server/agentmanager/init.go
@@ -13,4 +13,5 @@ var PluginInfo = &client.PluginInfo{
 	Author:      "wangjunqi",
 	Email:       "wangjunqi@kylinos.cn",
 	Url:         "http://10.1.10.131:9991/plugin/topology",
+	PluginType:  "iframe",
 }
diff --git a/server/agentmanager/topoclient.go b/server/agentmanager/topoclient.go
index b52784b..4e9023f 100644
--- a/server/agentmanager/topoclient.go
+++ b/server/agentmanager/topoclient.go
@@ -33,11 +33,11 @@ type Topoclient struct {
 }
 
 func (t *Topoclient) InitMachineList() {
-	url := Topo.Sdkmethod.Server + "/api/v1/pluginapi/machine_list"
+	url := "http://" + Topo.Sdkmethod.Server() + "/api/v1/pluginapi/machine_list"
 
 	resp, err := httputils.Get(url, nil)
 	if err != nil {
-		err = errors.Errorf("%s **fatal**2", err.Error()) // err top
+		err = errors.Errorf("%s (url: %s) **fatal**2", err.Error(), url) // err top
 		t.ErrCh <- err
 		t.Errmu.Lock()
 		t.ErrCond.Wait()
@@ -82,7 +82,7 @@ func (t *Topoclient) InitMachineList() {
 }
 
 func (t *Topoclient) UpdateMachineList() {
-	url := Topo.Sdkmethod.Server + "/api/v1/pluginapi/machine_list"
+	url := "http://" + Topo.Sdkmethod.Server() + "/api/v1/pluginapi/machine_list"
 
 	resp, err := httputils.Get(url, nil)
 	if err != nil {
@@ -162,7 +162,7 @@ func (t *Topoclient) InitPluginClient() {
 	var errcondmu sync.Mutex
 	PluginInfo.Url = "http://" + conf.Config().Topo.Server_addr + "/plugin/topology"
 	PluginClient := client.DefaultClient(PluginInfo)
-	PluginClient.Server = "http://" + conf.Config().PilotGo.Addr
+	// PluginClient.Server = "http://" + conf.Config().PilotGo.Addr
 
 	Topo = &Topoclient{
 		Sdkmethod: PluginClient,
diff --git a/server/collector/collector.go b/server/collector/collector.go
index 8796a72..2d49037 100644
--- a/server/collector/collector.go
+++ b/server/collector/collector.go
@@ -60,7 +60,7 @@ func (d *DataCollector) GetCollectDataFromTopoAgent(agent *agentmanager.Agent_m)
 
 	resp, err := httputils.Get(url, nil)
 	if err != nil {
-		return errors.Errorf("%v, %s, %s **2", resp.StatusCode, url, err.Error())
+		return errors.Errorf("%s, %s **2", url, err.Error())
 	}
 
 	if statuscode := resp.StatusCode; statuscode != 200 {
-- 
Gitee