From 485d0de64bfe9455587762afb2aa36a0feb0f510 Mon Sep 17 00:00:00 2001 From: Asai Neko Date: Tue, 23 Dec 2025 23:46:00 +0800 Subject: [PATCH] Fix grabage codes 5 years ago Signed-off-by: Asai Neko --- config/config.go | 8 -------- config/default.go | 16 ---------------- config/types.go | 4 ++-- data/data.go | 12 ++++++------ internal/crypto/jwt/jwt.go | 6 +++--- internal/crypto/jwt/jwt_test.go | 3 ++- logger/logrus.go | 10 +++++----- server/server.go | 6 +++--- 8 files changed, 21 insertions(+), 44 deletions(-) delete mode 100644 config/default.go diff --git a/config/config.go b/config/config.go index 4629cf9..5a583a2 100644 --- a/config/config.go +++ b/config/config.go @@ -41,11 +41,3 @@ func Init() { log.Fatal(err) } } - -func Get(key string) any { - return viper.Get(key) -} - -func Set(key string, value any) { - viper.Set(key, value) -} diff --git a/config/default.go b/config/default.go deleted file mode 100644 index a2cb58d..0000000 --- a/config/default.go +++ /dev/null @@ -1,16 +0,0 @@ -package config - -var serverDef = server{ - Address: ":8000", - DebugMode: false, - FileLogger: false, - JwtSecret: "something", -} - -var databaseDef = database{ - Type: "postgres", - Host: "", - Name: "", - Username: "", - Password: "", -} diff --git a/config/types.go b/config/types.go index 197eabe..3889a41 100644 --- a/config/types.go +++ b/config/types.go @@ -7,8 +7,8 @@ type config struct { type server struct { Address string `yaml:"address"` - DebugMode bool `yaml:"debug_mode"` - FileLogger bool `yaml:"file_logger"` + DebugMode string `yaml:"debug_mode"` + FileLogger string `yaml:"file_logger"` JwtSecret string `yaml:"jwt_secret"` } diff --git a/data/data.go b/data/data.go index c1920ec..865a2d3 100644 --- a/data/data.go +++ b/data/data.go @@ -1,22 +1,22 @@ package data import ( - "nixcn-cms/config" "nixcn-cms/data/drivers" log "github.com/sirupsen/logrus" + "github.com/spf13/viper" ) var Database *drivers.DBClient func Init() { // Init database - dbType := config.Get("database.type").(string) + dbType := viper.GetString("database.type") exDSN := drivers.ExternalDSN{ - Host: config.Get("database.host").(string), - Name: config.Get("database.name").(string), - Username: config.Get("database.username").(string), - Password: config.Get("database.password").(string), + Host: viper.GetString("database.host"), + Name: viper.GetString("database.name"), + Username: viper.GetString("database.username"), + Password: viper.GetString("database.password"), } if dbType != "postgres" { diff --git a/internal/crypto/jwt/jwt.go b/internal/crypto/jwt/jwt.go index 53e2a05..721b0eb 100644 --- a/internal/crypto/jwt/jwt.go +++ b/internal/crypto/jwt/jwt.go @@ -2,13 +2,13 @@ package jwt import ( "net/http" - "nixcn-cms/config" "strings" "time" "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v5" "github.com/google/uuid" + "github.com/spf13/viper" ) type Claims struct { @@ -17,7 +17,7 @@ type Claims struct { } func JWTAuth() gin.HandlerFunc { - var JwtSecret = []byte(config.Get("server.jwt_secret").(string)) + var JwtSecret = []byte(viper.GetString("server.jwt_secret")) return func(c *gin.Context) { auth := c.GetHeader("Authorization") if auth == "" { @@ -62,7 +62,7 @@ func JWTAuth() gin.HandlerFunc { } func GenerateToken(userID uuid.UUID, application string) (string, error) { - var JwtSecret = []byte(config.Get("server.jwt_secret").(string)) + var JwtSecret = []byte(viper.GetString("server.jwt_secret")) claims := Claims{ UserID: userID, RegisteredClaims: jwt.RegisteredClaims{ diff --git a/internal/crypto/jwt/jwt_test.go b/internal/crypto/jwt/jwt_test.go index b9a7b0b..9f5ebc8 100644 --- a/internal/crypto/jwt/jwt_test.go +++ b/internal/crypto/jwt/jwt_test.go @@ -10,6 +10,7 @@ import ( "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v5" "github.com/google/uuid" + "github.com/spf13/viper" ) func init() { @@ -17,7 +18,7 @@ func init() { } func generateTestToken(userID uuid.UUID, expire time.Duration) string { - var JwtSecret = []byte(config.Get("server.jwt_secret").(string)) + var JwtSecret = []byte(viper.GetString("server.jwt_secret")) claims := Claims{ UserID: userID, RegisteredClaims: jwt.RegisteredClaims{ diff --git a/logger/logrus.go b/logger/logrus.go index 1ff2e7b..6bf17d0 100644 --- a/logger/logrus.go +++ b/logger/logrus.go @@ -1,19 +1,19 @@ package logger import ( - "nixcn-cms/config" "os" "time" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" + "github.com/spf13/viper" ) func Init() { - FileLogger := config.Get("server.file_logger").(bool) - DebugMode := config.Get("server.debug_mode").(bool) + FileLogger := viper.GetBool("server.file_logger") + DebugMode := viper.GetBool("server.debug_mode") - if FileLogger { + if FileLogger == true { gin.DisableConsoleColor() file, err := os.OpenFile("app.log", os.O_APPEND|os.O_CREATE|os.O_RDWR, 0666) if err != nil { @@ -28,7 +28,7 @@ func Init() { log.SetLevel(log.WarnLevel) } - if DebugMode { + if DebugMode == true { gin.SetMode(gin.DebugMode) log.SetLevel(log.DebugLevel) } else { diff --git a/server/server.go b/server/server.go index cdc28b2..b036460 100644 --- a/server/server.go +++ b/server/server.go @@ -2,12 +2,12 @@ package server import ( "net/http" - "nixcn-cms/config" "nixcn-cms/logger" "time" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" + "github.com/spf13/viper" ) func Start() { @@ -18,14 +18,14 @@ func Start() { // Start http server server := &http.Server{ - Addr: config.Get("server.address").(string), + Addr: viper.GetString("server.address"), Handler: r, ReadTimeout: 10 * time.Second, WriteTimeout: 10 * time.Second, MaxHeaderBytes: 1 << 20, } - log.Info("Starting server on " + config.Get("server.address").(string)) + log.Info("Starting server on " + viper.GetString("server.address")) if err := server.ListenAndServe(); err != nil { log.Errorf("Error starting server: %v\n", err) }