From 46b64b2728664dc83ec98b505975740b33b14adf Mon Sep 17 00:00:00 2001 From: zhanghan2021 Date: Tue, 30 Jul 2024 20:33:25 +0800 Subject: [PATCH] update vendor and fix frontend 404 --- .gitignore | 3 +++ cmd/server/app/resource/resource.go | 8 ++++---- go.mod | 1 + go.sum | 4 ++++ go.work | 1 + vendor/modules.txt | 2 ++ 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 27003310..9c8f56a6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,9 @@ yarn-error.log* /cmd/server/app/resource/assets /cmd/server/app/resource/pilotgo.ico +.pilotgo-agent.data +config_agent.yaml +config_server.yaml # Editor directories and files .idea .vscode diff --git a/cmd/server/app/resource/resource.go b/cmd/server/app/resource/resource.go index 257cd584..db0ffa36 100644 --- a/cmd/server/app/resource/resource.go +++ b/cmd/server/app/resource/resource.go @@ -26,15 +26,15 @@ import ( ) func StaticRouter(router *gin.Engine) { - router.Static("/assets", "../frontend/dist/assets") - router.Static("/pilotgo.ico", "../frontend/dist/pilotgo.ico") - router.StaticFile("/", "../frontend/dist/index.html") + router.Static("/assets", "./frontend/dist/assets") + router.Static("/pilotgo.ico", "./frontend/dist/pilotgo.ico") + router.StaticFile("/", "./frontend/dist/index.html") // 解决页面刷新404的问题 router.NoRoute(func(c *gin.Context) { logger.Debug("process noroute: %s", c.Request.URL.String()) if !strings.HasPrefix(c.Request.RequestURI, "/api/") && !strings.HasPrefix(c.Request.RequestURI, "/plugin/") { - c.File("../frontend/dist/index.html") + c.File("./frontend/dist/index.html") return } c.AbortWithStatus(http.StatusNotFound) diff --git a/go.mod b/go.mod index b050491d..142ca572 100644 --- a/go.mod +++ b/go.mod @@ -50,6 +50,7 @@ require ( ) require ( + gitee.com/openeuler/PilotGo-plugins/event/sdk v0.0.0-20240730120230-bb8de73ea049 gitee.com/openeuler/PilotGo/sdk v0.0.0 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect github.com/bytedance/sonic v1.9.1 // indirect diff --git a/go.sum b/go.sum index dcf9ad26..3937a857 100644 --- a/go.sum +++ b/go.sum @@ -37,6 +37,10 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +gitee.com/openeuler/PilotGo-plugins/event/sdk v0.0.0-20240726061006-b7fe75acff81 h1:pLX05z8LxTDijvN0Smdd8EViWlb9ZksUww4YTzxZYEk= +gitee.com/openeuler/PilotGo-plugins/event/sdk v0.0.0-20240726061006-b7fe75acff81/go.mod h1:qKN5mZT240WasFoPqLnmQWJ/PBB5+Db0BiLmCfYaLBk= +gitee.com/openeuler/PilotGo-plugins/event/sdk v0.0.0-20240730120230-bb8de73ea049 h1:ro/UVwEkT6hR90n2LmZpwc12tyU0AaWKWAIO9ySi9yM= +gitee.com/openeuler/PilotGo-plugins/event/sdk v0.0.0-20240730120230-bb8de73ea049/go.mod h1:qKN5mZT240WasFoPqLnmQWJ/PBB5+Db0BiLmCfYaLBk= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.2/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= diff --git a/go.work b/go.work index 13dafdb0..087964d3 100644 --- a/go.work +++ b/go.work @@ -1,5 +1,6 @@ go 1.20 use ( + . ./sdk ) diff --git a/vendor/modules.txt b/vendor/modules.txt index f7261b51..f5b13644 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,5 @@ +# gitee.com/openeuler/PilotGo-plugins/event/sdk v0.0.0-20240730120230-bb8de73ea049 +## explicit; go 1.21.6 # gitee.com/openeuler/PilotGo/sdk v0.0.0 => ./sdk ## explicit; go 1.20 gitee.com/openeuler/PilotGo/sdk/common -- Gitee