diff --git a/backend/webui_service/middleware.go b/backend/webui_service/middleware.go index 762600f80d6decc29babee38fffd6490e99e9d58..0f42b31bacddbe9effe26b6cb7690928ea6478ec 100644 --- a/backend/webui_service/middleware.go +++ b/backend/webui_service/middleware.go @@ -2,14 +2,12 @@ package webui_service import ( "github.com/gin-gonic/gin" - - "github.com/free5gc/path_util" ) var PublicPath string func init() { - PublicPath = path_util.Free5gcPath("free5gc/webconsole/public") + PublicPath = "public" } func ReturnPublic() gin.HandlerFunc { diff --git a/backend/webui_service/webui_init.go b/backend/webui_service/webui_init.go index 460e9d39b2235ef4890337fcb396eced90c0970b..17c5d16b262e0126668cf6b34c8693a7ca9becc5 100644 --- a/backend/webui_service/webui_init.go +++ b/backend/webui_service/webui_init.go @@ -13,7 +13,6 @@ import ( "github.com/free5gc/MongoDBLibrary" mongoDBLibLogger "github.com/free5gc/MongoDBLibrary/logger" openApiLogger "github.com/free5gc/openapi/logger" - "github.com/free5gc/path_util" pathUtilLogger "github.com/free5gc/path_util/logger" "github.com/free5gc/webconsole/backend/WebUI" "github.com/free5gc/webconsole/backend/factory" @@ -63,8 +62,7 @@ func (webui *WEBUI) Initialize(c *cli.Context) { panic(err) } } else { - DefaultWebUIConfigPath := path_util.Free5gcPath("free5gc/config/webuicfg.yaml") - if err := factory.InitConfigFactory(DefaultWebUIConfigPath); err != nil { + if err := factory.InitConfigFactory("./config/webuicfg.yaml"); err != nil { panic(err) } } @@ -189,8 +187,6 @@ func (webui *WEBUI) Start() { } func (webui *WEBUI) Exec(c *cli.Context) error { - // WEBUI.Initialize(cfgPath, c) - initLog.Traceln("args:", c.String("webuicfg")) args := webui.FilterCli(c) initLog.Traceln("filter: ", args) diff --git a/config/webuicfg.yaml b/config/webuicfg.yaml new file mode 100644 index 0000000000000000000000000000000000000000..0eb418e2676b113bc7e03b96d567a01b130f6b49 --- /dev/null +++ b/config/webuicfg.yaml @@ -0,0 +1,25 @@ +info: + version: 1.0.0 + description: WebUI initial local configuration + +configuration: + mongodb: # the mongodb connected by this webui + name: free5gc # name of the mongodb + url: mongodb://localhost:27017 # a valid URL of the mongodb + +# the kind of log output +# debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic +# ReportCaller: enable the caller report or not, value: true or false +logger: + WEBUI: + debugLevel: info + ReportCaller: true + PathUtil: + debugLevel: info + ReportCaller: false + OpenApi: + debugLevel: info + ReportCaller: false + MongoDBLibrary: + debugLevel: info + ReportCaller: false