feat: Config Live Reload (#12)

* refactor: move common to internal/ * feat: Config Live Reload
TensoRaws · Jul 14, 2024 · 6ddf47f · 6ddf47f
1 parent cad38b7
commit 6ddf47f
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 43 deletions.
diff --git a/internal/service/common/dao/user.go → internal/common/dao/user.go b/internal/service/common/dao/user.go → internal/common/dao/user.go
diff --git a/internal/service/user/login.go b/internal/service/user/login.go
@@ -1,8 +1,8 @@
 package user
 
 import (
+	"github.com/TensoRaws/NuxBT-Backend/internal/common/dao"
 	"github.com/TensoRaws/NuxBT-Backend/internal/middleware/jwt"
-	"github.com/TensoRaws/NuxBT-Backend/internal/service/common/dao"
 	"github.com/TensoRaws/NuxBT-Backend/module/util"
 	"github.com/gin-gonic/gin"
 	"golang.org/x/crypto/bcrypt"

diff --git a/internal/service/user/profile.go b/internal/service/user/profile.go
@@ -3,7 +3,7 @@ package user
 import (
 	"strconv"
 
-	"github.com/TensoRaws/NuxBT-Backend/internal/service/common/dao"
+	"github.com/TensoRaws/NuxBT-Backend/internal/common/dao"
 	"github.com/TensoRaws/NuxBT-Backend/module/log"
 	"github.com/TensoRaws/NuxBT-Backend/module/util"
 	"github.com/gin-gonic/gin"
@@ -25,7 +25,7 @@ type ProfileResponse struct {
 }
 
 type ProfileOthersRequest struct {
-	UserId int `form:"user_id" binding:"required"`
+	UserId int32 `form:"user_id" binding:"required"`
 }
 
 // ProfileMe 获取用户自己的信息 (GET /profile/me)
@@ -87,7 +87,7 @@ func ProfileOthers(c *gin.Context) {
 		return
 	}
 	// 获取信息
-	user, err := dao.GetUserByID(int32(req.UserId))
+	user, err := dao.GetUserByID(req.UserId)
 	if err != nil {
 		util.AbortWithMsg(c, "User not found")
 		return

diff --git a/internal/service/user/register.go b/internal/service/user/register.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/TensoRaws/NuxBT-Backend/dal/model"
-	"github.com/TensoRaws/NuxBT-Backend/internal/service/common/dao"
+	"github.com/TensoRaws/NuxBT-Backend/internal/common/dao"
 	"github.com/TensoRaws/NuxBT-Backend/module/config"
 	"github.com/TensoRaws/NuxBT-Backend/module/log"
 	"github.com/TensoRaws/NuxBT-Backend/module/util"

diff --git a/internal/service/user/reset.go b/internal/service/user/reset.go
@@ -1,7 +1,7 @@
 package user
 
 import (
-	"github.com/TensoRaws/NuxBT-Backend/internal/service/common/dao"
+	"github.com/TensoRaws/NuxBT-Backend/internal/common/dao"
 	"github.com/TensoRaws/NuxBT-Backend/module/log"
 	"github.com/TensoRaws/NuxBT-Backend/module/util"
 	"github.com/gin-gonic/gin"

diff --git a/module/config/config.go b/module/config/config.go
@@ -3,7 +3,6 @@ package config
 import (
 	"errors"
 	"fmt"
-	"log"
 	"strings"
 	"sync"
 
@@ -16,16 +15,6 @@ var (
 	once   sync.Once
 )
 
-var (
-	ServerConfig Server
-	JwtConfig    Jwt
-	LogConfig    Log
-	DBConfig     DB
-	RedisConfig  Redis
-	OSSConfig    OSS
-	OSS_PREFIX   string
-)
-
 func Init() {
 	once.Do(func() {
 		initialize()
@@ -49,7 +38,8 @@ func initialize() {
 
 	config.WatchConfig()
 	config.OnConfigChange(func(e fsnotify.Event) {
-		// 配置文件发生变更之后会调用的回调函数
+		// 配置文件发生变更之后，重新初始化配置
+		setConfig()
 		fmt.Println("Config file changed:", e.Name)
 	})
 
@@ -95,32 +85,9 @@ func initialize() {
 		}
 	}
 
-	err := config.UnmarshalKey("server", &ServerConfig)
-	if err != nil {
-		log.Fatalf("unable to decode into server struct, %v", err)
-	}
-	err = config.UnmarshalKey("jwt", &JwtConfig)
-	if err != nil {
-		log.Fatalf("unable to decode into jwt struct, %v", err)
-	}
-	err = config.UnmarshalKey("log", &LogConfig)
-	if err != nil {
-		log.Fatalf("unable to decode into log struct, %v", err)
-	}
-	err = config.UnmarshalKey("db", &DBConfig)
-	if err != nil {
-		log.Fatalf("unable to decode into db struct, %v", err)
-	}
-	err = config.UnmarshalKey("redis", &RedisConfig)
-	if err != nil {
-		log.Fatalf("unable to decode into redis struct, %v", err)
-	}
-	err = config.UnmarshalKey("oss", &OSSConfig)
-	if err != nil {
-		log.Fatalf("unable to decode into oss struct, %v", err)
-	}
+	// 初始化配置
+	setConfig()
 
-	OSS_PREFIX = GenerateOSSPrefix()
 	fmt.Printf("OSS TYPE: %v", config.GetString("oss.type"))
 	fmt.Printf(" OSS PREFIX: %v\n", OSS_PREFIX)
 }

diff --git a/module/config/global.go b/module/config/global.go
@@ -0,0 +1,43 @@
+package config
+
+import (
+	"log"
+)
+
+var (
+	ServerConfig Server
+	JwtConfig    Jwt
+	LogConfig    Log
+	DBConfig     DB
+	RedisConfig  Redis
+	OSSConfig    OSS
+	OSS_PREFIX   string
+)
+
+func setConfig() {
+	err := config.UnmarshalKey("server", &ServerConfig)
+	if err != nil {
+		log.Fatalf("unable to decode into server struct, %v", err)
+	}
+	err = config.UnmarshalKey("jwt", &JwtConfig)
+	if err != nil {
+		log.Fatalf("unable to decode into jwt struct, %v", err)
+	}
+	err = config.UnmarshalKey("log", &LogConfig)
+	if err != nil {
+		log.Fatalf("unable to decode into log struct, %v", err)
+	}
+	err = config.UnmarshalKey("db", &DBConfig)
+	if err != nil {
+		log.Fatalf("unable to decode into db struct, %v", err)
+	}
+	err = config.UnmarshalKey("redis", &RedisConfig)
+	if err != nil {
+		log.Fatalf("unable to decode into redis struct, %v", err)
+	}
+	err = config.UnmarshalKey("oss", &OSSConfig)
+	if err != nil {
+		log.Fatalf("unable to decode into oss struct, %v", err)
+	}
+	OSS_PREFIX = GenerateOSSPrefix()
+}