From 75088e6988d078069d6411b111f2ea8ec2d2d736 Mon Sep 17 00:00:00 2001 From: Gzx1999 Date: Tue, 7 Dec 2021 16:25:56 +0800 Subject: [PATCH] add frontend static file router --- package.json | 2 +- pkg/app/server/main.go | 24 ++++++++---------- pkg/app/server/network/httpserver.go | 4 ++- pkg/config/config.go | 7 ++--- yarn.lock | 38 ++++++++++++++++++++++++++-- 5 files changed, 54 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index a8531795..421cd9f3 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "babel-plugin-transform-vue-jsx": "^3.5.0", "babel-preset-env": "^1.3.2", "babel-preset-stage-2": "^6.22.0", - "chalk": "^2.4.2", + "chalk": "4.1.2", "copy-webpack-plugin": "^4.0.1", "css-loader": "^0.28.0", "extract-text-webpack-plugin": "^3.0.0", diff --git a/pkg/app/server/main.go b/pkg/app/server/main.go index 012cb1a1..0a77519d 100644 --- a/pkg/app/server/main.go +++ b/pkg/app/server/main.go @@ -1,24 +1,19 @@ package main import ( - "fmt" - "os" - "openeluer.org/PilotGo/PilotGo/pkg/app/server/agentmanager" "openeluer.org/PilotGo/PilotGo/pkg/app/server/network" - "openeluer.org/PilotGo/PilotGo/pkg/config" - "openeluer.org/PilotGo/PilotGo/pkg/logger" ) func main() { - conf, err := config.Load() - if err != nil { - fmt.Println("failed to load configure, exit..", err) - os.Exit(-1) - } + // conf, err := config.Load() + // if err != nil { + // fmt.Println("failed to load configure, exit..", err) + // os.Exit(-1) + // } - logger.Init(conf) - logger.Info("Thanks to choose PilotGo!") + // logger.Init(conf) + // logger.Info("Thanks to choose PilotGo!") server := &network.SocketServer{ // MessageProcesser: protocol.NewMessageProcesser(), @@ -28,13 +23,14 @@ func main() { // agentmanager := agentmanager.GetAgentManager() + // 启动agent socket server go func() { server.Run("localhost:8879") }() + // 此处启动前端及REST http server go func() { - // TODO: 此处启动 http server - network.HttpServerStart("localhost:8880") + network.HttpServerStart("localhost:8080") }() select {} diff --git a/pkg/app/server/network/httpserver.go b/pkg/app/server/network/httpserver.go index 76ca85bd..68f1fc2d 100644 --- a/pkg/app/server/network/httpserver.go +++ b/pkg/app/server/network/httpserver.go @@ -6,11 +6,13 @@ import ( ) func HttpServerStart(addr string) error { - // TODO: 此处绑定 http api handler r := gin.Default() + // TODO: 此处绑定 http api handler r.GET("/api/agent_info", handlers.AgentInfoHandler) // TODO: 此处绑定前端静态资源handler + r.Static("/static", "./dist/static") + r.StaticFile("/", "./dist/index.html") return r.Run(addr) } diff --git a/pkg/config/config.go b/pkg/config/config.go index 6faf26e1..c2826c7c 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -9,17 +9,18 @@ package config import ( "encoding/json" "fmt" - "github.com/fsnotify/fsnotify" - "github.com/spf13/viper" "io" "io/ioutil" + + "github.com/fsnotify/fsnotify" + "github.com/spf13/viper" ) const ( configType = "yaml" ) -var pilogo_config_file_name = "pkg/config//config.json" +var pilogo_config_file_name = "pkg/config/config.json" type LogOpts struct { LogLevel string `json:"log_level"` diff --git a/yarn.lock b/yarn.lock index 0b196945..fe0fc108 100644 --- a/yarn.lock +++ b/yarn.lock @@ -123,6 +123,13 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha1-7dgDYornHATIWuegkG7a00tkiTc= + dependencies: + color-convert "^2.0.1" + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1426,6 +1433,14 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" +chalk@4.1.2: + version "4.1.2" + resolved "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha1-qsTit3NKdAhnrrFr8CqtVWoeegE= + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1437,7 +1452,7 @@ chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1616,12 +1631,19 @@ color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.3: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM= + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -3325,6 +3347,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s= + has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" @@ -7058,6 +7085,13 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha1-G33NyzK4E4gBs+R4umpRyqiWSNo= + dependencies: + has-flag "^4.0.0" + svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" -- Gitee