From a2cc77531b1be1cf2313036ea4ce96932e87574a Mon Sep 17 00:00:00 2001
From: Wangjunqi123 <wangjunqi@kylinos.cn>
Date: Tue, 5 Nov 2024 17:12:53 +0800
Subject: [PATCH] server: update import of static router production

---
 cmd/server/handler/frontendResource/static.go    | 6 +++---
 cmd/server/handler/frontendResource/staticPro.go | 5 ++---
 cmd/server/main.go                               | 2 +-
 cmd/server/resourcemanage/meta.go                | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cmd/server/handler/frontendResource/static.go b/cmd/server/handler/frontendResource/static.go
index 96a0c9b..335ea23 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 d4b495d..59c5ab3 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 a02564c..38ad036 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 b935650..a705202 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())
-- 
Gitee