diff --git a/cmd/server/handler/frontendResource/static.go b/cmd/server/handler/frontendResource/static.go index 96a0c9bd74be06d87a2a8b535c903970f1608b87..335ea2379575fd9f24e83fedd05d9ac10930d832 100644 --- a/cmd/server/handler/frontendResource/static.go +++ b/cmd/server/handler/frontendResource/static.go @@ -13,13 +13,13 @@ import ( func StaticRouter(router *gin.Engine) { static := router.Group("/plugin/topology") { - static.Static("/assets", "web/dist/assets") - static.StaticFile("/", "web/dist/index.html") + static.Static("/assets", "./web/dist/assets") + static.StaticFile("/", "./web/dist/index.html") // 解决页面刷新404的问题 router.NoRoute(func(c *gin.Context) { if !strings.HasPrefix(c.Request.RequestURI, "/plugin/topology/api") { - c.File("web/dist/index.html") + c.File("./web/dist/index.html") return } c.AbortWithStatus(http.StatusNotFound) diff --git a/cmd/server/handler/frontendResource/staticPro.go b/cmd/server/handler/frontendResource/staticPro.go index d4b495db1eba1ea2661441e604b27be548e916f3..59c5ab37f8945012db7a0695f471505ec9a525c5 100644 --- a/cmd/server/handler/frontendResource/staticPro.go +++ b/cmd/server/handler/frontendResource/staticPro.go @@ -10,8 +10,7 @@ import ( "net/http" "strings" - "gitee.com/openeuler/PilotGo-plugin-topology/server/errormanager" - "gitee.com/openeuler/PilotGo-plugin-topology/server/pluginclient" + "gitee.com/openeuler/PilotGo-plugin-topology/cmd/server/resourcemanage" "github.com/gin-gonic/gin" "github.com/pkg/errors" ) @@ -23,7 +22,7 @@ func StaticRouter(router *gin.Engine) { sf, err := fs.Sub(StaticFiles, "assets") if err != nil { err = errors.New(err.Error()) - errormanager.ErrorTransmit(pluginclient.Global_Context, err, false) + resourcemanage.ERManager.ErrorTransmit("error", err, false, true) return } diff --git a/cmd/server/main.go b/cmd/server/main.go index a02564c5e54452e1ec5579f269092ba2d2f551b3..38ad036aba0ab83f2f5587bece4a69b071d21401 100755 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -34,7 +34,7 @@ func main() { /* init error control、resource release、goroutine end */ - resourcemanage.InitResourceManage() + resourcemanage.InitResourceManager() /* init plugin client diff --git a/cmd/server/resourcemanage/meta.go b/cmd/server/resourcemanage/meta.go index b935650289be82bdc5958dfea65a491bdaf0fe34..a705202a3a04f5d1b8fc52929295ed454e5e298c 100644 --- a/cmd/server/resourcemanage/meta.go +++ b/cmd/server/resourcemanage/meta.go @@ -5,7 +5,7 @@ import ( "gitee.com/openeuler/PilotGo/sdk/logger" ) -func InitResourceManage() { +func InitResourceManager() { ermanager, err := CreateErrorReleaseManager(global.RootContext, global.Close) if err != nil { logger.Fatal(err.Error())