diff --git a/global/config.go b/global/config.go index 91ce7c0..fc746b5 100644 --- a/global/config.go +++ b/global/config.go @@ -3,7 +3,6 @@ package global import ( "autoLogin/models" "github.com/Mmx233/config" - "github.com/Mmx233/tool" "log" "os" ) @@ -11,7 +10,7 @@ import ( var Config models.Config func init() { - tool.File.Options.ForceRoot = true + initFlags() //配置文件初始化 if e := config.Load(config.Options{ @@ -31,7 +30,7 @@ func init() { Timeout: 1, }, }, - Path: "Config.json", + Path: Flags.Path, FillDefault: true, Overwrite: true, }); e != nil { diff --git a/global/flags.go b/global/flags.go new file mode 100644 index 0000000..50f0b88 --- /dev/null +++ b/global/flags.go @@ -0,0 +1,12 @@ +package global + +import "flag" + +var Flags struct { + Path string +} + +func initFlags() { + flag.StringVar(&Flags.Path, "config", "", "config path") + flag.Parse() +} diff --git a/go.mod b/go.mod index 17780bd..9dbdfa9 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/Mmx233/config v0.0.3 - github.com/Mmx233/tool v0.2.5 + github.com/Mmx233/tool v0.2.6 github.com/PuerkitoBio/goquery v1.7.1 // indirect golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect ) diff --git a/go.sum b/go.sum index 63365c8..9b50af4 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/Mmx233/config v0.0.3 h1:E744hob5fWD5P7m7q+91Z41R+Y1LDkxIhQXIeV1tel0= github.com/Mmx233/config v0.0.3/go.mod h1:3mt+LSHUvD/C6tq1ge/Dmp8xKivFmo7gxSihCPjIAi0= -github.com/Mmx233/tool v0.2.5 h1:48iYgydVhoqDqeVXKBXS6WALRbp/0W3WRalo4/yV/xY= -github.com/Mmx233/tool v0.2.5/go.mod h1:un5MCoI21lH40fFI5S9++aja8nJb+2sjATak7PnGMZ0= +github.com/Mmx233/tool v0.2.6 h1:kby/EOdP2YzATLi/s6y0lWNNYDXDidMSUIyYm8AcS4s= +github.com/Mmx233/tool v0.2.6/go.mod h1:un5MCoI21lH40fFI5S9++aja8nJb+2sjATak7PnGMZ0= github.com/PuerkitoBio/goquery v1.7.1 h1:oE+T06D+1T7LNrn91B4aERsRIeCLJ/oPSa6xB9FPnz4= github.com/PuerkitoBio/goquery v1.7.1/go.mod h1:XY0pP4kfraEmmV1O7Uf6XyjoslwsneBbgeDjLYuN8xY= github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=