diff --git a/CHANGELOG.md b/CHANGELOG.md index 27de1ac..1be8344 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +24w17a +--- +- PRE-RELEASE: 此版本是v1.5.2的预发布版本,请勿在生产环境中使用 +- FIX: 初步修正flag传入问题,但仍有可能存在其他问题 + v1.5.1 --- - CHANGE: 优化代码结构,提升性能 diff --git a/DEV-VERSION b/DEV-VERSION index 34618f2..458ce3b 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w16a \ No newline at end of file +24w17a \ No newline at end of file diff --git a/main.go b/main.go index 5c3cb63..ff078ae 100644 --- a/main.go +++ b/main.go @@ -19,6 +19,7 @@ var ( cfg *config.Config router *gin.Engine configfile = "/data/ghproxy/config/config.toml" + cfgfile string ) // 日志模块 @@ -30,14 +31,14 @@ var ( ) func ReadFlag() { - cfgfile := flag.String("cfg", configfile, "config file path") - configfile = *cfgfile + flag.StringVar(&cfgfile, "cfg", configfile, "config file path") + fmt.Printf("Config file path: %s\n", cfgfile) } func loadConfig() { var err error // 初始化配置 - cfg, err = config.LoadConfig(configfile) + cfg, err = config.LoadConfig(cfgfile) if err != nil { log.Fatalf("Failed to load config: %v", err) } @@ -66,6 +67,7 @@ func setupApi(cfg *config.Config, router *gin.Engine) { func init() { ReadFlag() + flag.Parse() loadConfig() setupLogger(cfg) Loadlist(cfg)