From 1b1cbfff422e6de58a6f524336b19ec809eb45f0 Mon Sep 17 00:00:00 2001 From: Ali Golzar <57574919+aliglzr@users.noreply.github.com> Date: Sat, 17 May 2025 14:03:22 +0330 Subject: [PATCH] feat: support .env file (#3013) --- .gitignore | 5 ++++- go.mod | 1 + go.sum | 2 ++ main.go | 5 ++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a6a8cf38..a7644d78 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,7 @@ Thumbs.db *.exe~ # Ignore Docker specific files -docker-compose.override.yml \ No newline at end of file +docker-compose.override.yml + +# Ignore .env (Environment Variables) file +.env \ No newline at end of file diff --git a/go.mod b/go.mod index 80dae592..1f545c64 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/gin-gonic/gin v1.10.0 github.com/goccy/go-json v0.10.5 github.com/google/uuid v1.6.0 + github.com/joho/godotenv v1.5.1 github.com/mymmrac/telego v0.32.0 github.com/nicksnyder/go-i18n/v2 v2.6.0 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 diff --git a/go.sum b/go.sum index f1895e1e..c6ae9c41 100644 --- a/go.sum +++ b/go.sum @@ -84,6 +84,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= diff --git a/main.go b/main.go index a94a899b..dcbd3c9e 100644 --- a/main.go +++ b/main.go @@ -13,11 +13,12 @@ import ( "x-ui/database" "x-ui/logger" "x-ui/sub" + "x-ui/util/crypto" "x-ui/web" "x-ui/web/global" "x-ui/web/service" - "x-ui/util/crypto" + "github.com/joho/godotenv" "github.com/op/go-logging" ) @@ -39,6 +40,8 @@ func runWebServer() { log.Fatalf("Unknown log level: %v", config.GetLogLevel()) } + godotenv.Load() + err := database.InitDB(config.GetDBPath()) if err != nil { log.Fatalf("Error initializing database: %v", err)