From 806dca928f9b36ac13386e8ed52617ba5a075310 Mon Sep 17 00:00:00 2001 From: luorijun Date: Mon, 21 Apr 2025 13:57:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20APP=5FPORT=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Docker=20Compose=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +++- .vscode/launch.json | 16 ++++++++++++++++ pkg/env/env.go | 8 -------- scripts/prev/docker-compose.yaml | 2 +- web/web.go | 10 ++++------ 5 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.gitignore b/.gitignore index 461a6d2..3b1a2dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,13 @@ .idea/ -.vscode/ +.vscode/* +!.vscode/launch.json .env .env.* !.env.example bin/ +*.exe *.pem *.http \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..e7af644 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + // 使用 IntelliSense 了解相关属性。 + // 悬停以查看现有属性的描述。 + // 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "main", + "type": "go", + "request": "launch", + "mode": "auto", + "program": "${workspaceFolder}/cmd/main", + "cwd": "${workspaceFolder}", + } + ] +} \ No newline at end of file diff --git a/pkg/env/env.go b/pkg/env/env.go index e669f15..6ed61bc 100644 --- a/pkg/env/env.go +++ b/pkg/env/env.go @@ -13,7 +13,6 @@ import ( var ( AppName = "platform" - AppPort string ) func loadApp() { @@ -21,13 +20,6 @@ func loadApp() { if _AppName != "" { AppName = _AppName } - - _AppPort := os.Getenv("APP_PORT") - if _AppPort != "" { - AppPort = _AppPort - } else { - panic("环境变量 APP_PORT 的值不能为空") - } } // endregion diff --git a/scripts/prev/docker-compose.yaml b/scripts/prev/docker-compose.yaml index d34bb28..6e59708 100644 --- a/scripts/prev/docker-compose.yaml +++ b/scripts/prev/docker-compose.yaml @@ -31,7 +31,7 @@ services: - postgres - redis ports: - - ${APP_PORT} + - 8080:8080 env_file: - ../../.env diff --git a/web/web.go b/web/web.go index cb61cf0..dda7939 100644 --- a/web/web.go +++ b/web/web.go @@ -2,7 +2,6 @@ package web import ( "net/http" - "platform/pkg/env" g "platform/web/globals" "runtime" @@ -13,9 +12,9 @@ import ( "github.com/gofiber/fiber/v2/middleware/requestid" "github.com/google/uuid" "github.com/jxskiss/base62" -) -import _ "net/http/pprof" + _ "net/http/pprof" +) type Config struct { Listen string @@ -72,9 +71,8 @@ func (s *Server) Run() error { }() // listen - port := env.AppPort - slog.Info("Server started on :" + port) - err := s.fiber.Listen(":" + port) + slog.Info("Server started on :8080") + err := s.fiber.Listen(":8080") if err != nil { slog.Error("Failed to start server", slog.Any("err", err)) }