From 02e257fe1460fae294610af276a697dbeca78d18 Mon Sep 17 00:00:00 2001 From: Wangjunqi123 Date: Wed, 24 May 2023 11:14:02 +0800 Subject: [PATCH] annotation reverseproxy in sdk/plugin/client.defaultclient --- container/{ => server}/client/client.go | 2 +- container/{ => server}/config.yml.templete | 0 container/{ => server}/config/config.go | 0 container/{ => server}/database/mysql.go | 0 container/{ => server}/go.mod | 0 container/{ => server}/go.sum | 0 container/{ => server}/httphandler/agent.go | 0 container/{ => server}/main.go | 0 go.work | 2 +- grafana/main.go | 2 +- sdk/plugin/client.go | 16 ++++++++-------- 11 files changed, 11 insertions(+), 11 deletions(-) rename container/{ => server}/client/client.go (92%) rename container/{ => server}/config.yml.templete (100%) rename container/{ => server}/config/config.go (100%) rename container/{ => server}/database/mysql.go (100%) rename container/{ => server}/go.mod (100%) rename container/{ => server}/go.sum (100%) rename container/{ => server}/httphandler/agent.go (100%) rename container/{ => server}/main.go (100%) diff --git a/container/client/client.go b/container/server/client/client.go similarity index 92% rename from container/client/client.go rename to container/server/client/client.go index 14b942c5..5a7e6589 100644 --- a/container/client/client.go +++ b/container/server/client/client.go @@ -17,7 +17,7 @@ func init() { Author: "wangjunqi", Email: "wangjunqi@kylinos.cn", Url: "http://192.168.75.100:9999/plugin/container", - // ReverseDest: "http://192.168.75.100:3000/", + ReverseDest: "", }) } diff --git a/container/config.yml.templete b/container/server/config.yml.templete similarity index 100% rename from container/config.yml.templete rename to container/server/config.yml.templete diff --git a/container/config/config.go b/container/server/config/config.go similarity index 100% rename from container/config/config.go rename to container/server/config/config.go diff --git a/container/database/mysql.go b/container/server/database/mysql.go similarity index 100% rename from container/database/mysql.go rename to container/server/database/mysql.go diff --git a/container/go.mod b/container/server/go.mod similarity index 100% rename from container/go.mod rename to container/server/go.mod diff --git a/container/go.sum b/container/server/go.sum similarity index 100% rename from container/go.sum rename to container/server/go.sum diff --git a/container/httphandler/agent.go b/container/server/httphandler/agent.go similarity index 100% rename from container/httphandler/agent.go rename to container/server/httphandler/agent.go diff --git a/container/main.go b/container/server/main.go similarity index 100% rename from container/main.go rename to container/server/main.go diff --git a/go.work b/go.work index efe4ce8e..fceeec9a 100644 --- a/go.work +++ b/go.work @@ -3,7 +3,7 @@ go 1.19 use ( ./PilotGo ./gala-ops/server - ./container/ + ./container/server ./grafana/ ./prometheus/server ./sdk diff --git a/grafana/main.go b/grafana/main.go index 2b299858..a963d186 100644 --- a/grafana/main.go +++ b/grafana/main.go @@ -17,7 +17,7 @@ func main() { Author: "guozhengxin", Email: "guozhengxin@kylinos.cn", Url: "http://localhost:9999/plugin/grafana", - ReverseDest: "http://192.168.28.232:3000/", + ReverseDest: "http://192.168.75.100:3000/", }) client.Serve(":9999") diff --git a/sdk/plugin/client.go b/sdk/plugin/client.go index 5b20f3bf..eeb363aa 100644 --- a/sdk/plugin/client.go +++ b/sdk/plugin/client.go @@ -47,7 +47,7 @@ func ReverseProxyHandler(c *gin.Context) { func DefaultClient(desc *PluginInfo) *Client { BaseInfo = desc - dest := desc.ReverseDest + // dest := desc.ReverseDest router := gin.Default() mg := router.Group("plugin_manage/") @@ -55,13 +55,13 @@ func DefaultClient(desc *PluginInfo) *Client { mg.GET("/info", InfoHandler) } - pg := router.Group("/plugin/" + desc.Name) - { - pg.Any("/*any", func(c *gin.Context) { - c.Set("__internal__reverse_dest", dest) - ReverseProxyHandler(c) - }) - } + // pg := router.Group("/plugin/" + desc.Name) + // { + // pg.Any("/*any", func(c *gin.Context) { + // c.Set("__internal__reverse_dest", dest) + // ReverseProxyHandler(c) + // }) + // } return &Client{ HttpEngine: router, -- Gitee