refactor: config system

Author: AutisticShark

api/api.go

@@ -38,7 +38,7 @@ func Tcping(c *gin.Context) {
 }
 
 func ping(ip string, port string) (status string, msg string) {
-	timeout := time.Duration(int64(config.GetTimeout()) * int64(time.Millisecond))
+	timeout := time.Duration(int64(config.Config.GetInt("timeout")) * int64(time.Millisecond))
 
 	conn, err := net.DialTimeout("tcp", net.JoinHostPort(ip, port), timeout)
 	if err != nil {

config.json.example

@@ -1,4 +1,4 @@
 {
     "port": 8080,
-    "tcpping_timeout": 1000,
+    "timeout": 1000,
 }

config/config.go

@@ -2,27 +2,22 @@ package config
 
 import "github.com/spf13/viper"
 
-var config = viper.New()
+var (
+	Config    = viper.New()
+	apiConfig = &ApiConfig{}
+)
 
 func init() {
-	config.SetConfigName("config")
-	config.SetConfigType("json")
-	config.AddConfigPath("/etc/netstatus-api-go/")
-	config.AddConfigPath(".")
+	Config.SetConfigName("Config")
+	Config.SetConfigType("json")
+	Config.AddConfigPath("/etc/netstatus-api-go/")
+	Config.AddConfigPath(".")
 
-	config.SetDefault("port", 8080)
-	config.SetDefault("timeout", 1000)
+	Config.SetDefault("port", 8080)
+	Config.SetDefault("timeout", 1000)
 
-	err := config.ReadInConfig()
+	err := Config.Unmarshal(&apiConfig)
 	if err != nil {
 		return
 	}
 }
-
-func GetPort() int {
-	return config.GetInt("port")
-}
-
-func GetTimeout() int {
-	return config.GetInt("timeout")
-}

config/model.go

@@ -1 +1,6 @@
 package config
+
+type ApiConfig struct {
+	Port    int `mapstructure:"port"`
+	Timeout int `mapstructure:"timeout"`
+}

go.mod

@@ -1,9 +1,10 @@
 module github.com/sspanel-uim/NetStatus-API-Go
 
-go 1.22.1
+go 1.22.2
 
 require (
 	github.com/gin-gonic/gin v1.9.1
+	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.18.2
 )
 
@@ -32,7 +33,6 @@ require (
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect

main.go

@@ -2,18 +2,27 @@ package main
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/spf13/pflag"
 	"github.com/sspanel-uim/NetStatus-API-Go/api"
 	"github.com/sspanel-uim/NetStatus-API-Go/config"
 	"strconv"
 )
 
 func main() {
+	configFilePath := pflag.String("config", "", "config file path")
+	pflag.Parse()
+
+	if *configFilePath != "" {
+		config.Config.AddConfigPath(*configFilePath)
+	}
+
 	gin.SetMode(gin.ReleaseMode)
-	r := gin.Default()
-	r.Group("v1").GET("/tcping", api.Tcping)
-	port := strconv.Itoa(config.GetPort())
 
-	err := r.Run(":" + port)
+	router := gin.Default()
+	router.Group("v1").GET("/tcping", api.Tcping)
+
+	port := strconv.Itoa(config.Config.GetInt("port"))
+	err := router.Run(":" + port)
 	if err != nil {
 		return
 	}