diff --git a/cmd/bitsrun/main.go b/cmd/bitsrun/main.go index 283b314..b9841a5 100644 --- a/cmd/bitsrun/main.go +++ b/cmd/bitsrun/main.go @@ -10,12 +10,9 @@ import ( ) func main() { - if global.Flags.RunningDaemon { - //后台挂起模式中 + if global.Config.Settings.Guardian.Enable { + //进入守护模式 controllers.Guardian() - } else if global.Config.Settings.Guardian.Enable { - //进入守护模式流程 - controllers.EnterGuardian() } else { //登录流程 var err error diff --git a/go.mod b/go.mod index c32de9a..ec11f0c 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/Mmx233/tool v0.7.2 github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/cloudflare/cloudflare-go v0.68.0 - github.com/howeyc/fsnotify v0.9.0 github.com/mitchellh/mapstructure v1.5.0 github.com/sirupsen/logrus v1.9.2 github.com/spf13/viper v1.16.0 diff --git a/go.sum b/go.sum index 1561bc8..c33a111 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,6 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Mmx233/tool v0.6.9 h1:K/kYT8YFlc08H52q8mZvBVNkwsIm1+lQJusoYgiZNWo= -github.com/Mmx233/tool v0.6.9/go.mod h1:pCKnFmN2yf3u58YjANsQ8261SxI/c8/0wiZhptjRsOk= github.com/Mmx233/tool v0.7.2 h1:pFo1N+OYCaRNhLeAwYbaWPaB7TWZDlEqXNh1RThyaEQ= github.com/Mmx233/tool v0.7.2/go.mod h1:pCKnFmN2yf3u58YjANsQ8261SxI/c8/0wiZhptjRsOk= github.com/antonfisher/nested-logrus-formatter v1.3.1 h1:NFJIr+pzwv5QLHTPyKz9UMEoHck02Q9L0FP13b/xSbQ= @@ -49,8 +47,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/cloudflare-go v0.64.0 h1:ofDHF3Ul1LvHSQOFMa+xzPEfIzUbWN9LaxW7hFsONoE= -github.com/cloudflare/cloudflare-go v0.64.0/go.mod h1:BZ1xWpRlxeMSZ5tcf20qD7Wk3VDw4c0m5P4pNMriivw= github.com/cloudflare/cloudflare-go v0.68.0 h1:YmCaLt0lUqZwxJp6fTrFX2fjb0zQZoKS8lFRMdwZKDI= github.com/cloudflare/cloudflare-go v0.68.0/go.mod h1:b6oSYwhXmZUdaF83Od/uefT092M41HHis/z6JFsT/kw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -66,7 +62,6 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= @@ -140,8 +135,6 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/howeyc/fsnotify v0.9.0 h1:0gtV5JmOKH4A8SsFxG2BczSeXWWPvcMT0euZt5gDAxY= -github.com/howeyc/fsnotify v0.9.0/go.mod h1:41HzSPxBGeFRQKEEwgh49TRw/nKBsYZ2cF1OzPjSJsA= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -149,7 +142,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -160,8 +152,6 @@ github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZb github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= -github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -170,24 +160,17 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y= github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -199,17 +182,12 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.633 h1:Yj8s35IjbgaHp4Ic9BZLVGWdN2gXBMtwYi1JJ+qYbrc= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.633/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.669 h1:5KKJBcemqKONBFxMdMyLMvk+TrqXaEPhqe9TrZqB3r0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.669/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.633 h1:KJZUrzoj0ZkI4buV2h7ue1zWa8K3fAgdlVKLkgUiB6E= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.633/go.mod h1:TSQpEW9D+qMt8V+Jcs87NOIbWja1ZDlg1FM9kczn7zo= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.669 h1:s8IULS15w5H8qfwfrbnAKdtZznlEPKgjHPscQ3Lf8NM= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.669/go.mod h1:36E0xMaAViaEtXSAgkAF+hMDfKExxM1DxxSmskO7rpM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -294,8 +272,6 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -354,8 +330,6 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/internal/controllers/daemon.go b/internal/controllers/daemon.go deleted file mode 100644 index 7a0f3a8..0000000 --- a/internal/controllers/daemon.go +++ /dev/null @@ -1,59 +0,0 @@ -package controllers - -import ( - "fmt" - "github.com/Mmx233/BitSrunLoginGo/internal/global" - "github.com/howeyc/fsnotify" - "os" - "time" -) - -type daemon struct { - Mark string - Path string -} - -// Daemon 后台模式控制包 -var Daemon = daemon{ - Mark: fmt.Sprint(time.Now().UnixNano()), - Path: global.Config.Settings.Daemon.Path, -} - -// MarkDaemon 写入后台标记文件 -func (a *daemon) MarkDaemon() error { - return os.WriteFile(a.Path, []byte(a.Mark), 0600) -} - -// CheckDaemon 检查后台标记文件 -func (a *daemon) CheckDaemon() bool { - if data, err := os.ReadFile(a.Path); err != nil { - return false - } else { - return string(data) == a.Mark - } -} - -// DaemonChan 后台标记文件监听 -func (a *daemon) DaemonChan() bool { - f, err := fsnotify.NewWatcher() - if err != nil { - panic(err) - } - - err = f.Watch(Daemon.Path) - if err != nil { - panic(err) - } - - for { - select { - case event := <-f.Event: - if event.IsModify() && a.CheckDaemon() { - continue - } - os.Exit(0) - case e := <-f.Error: - panic(e) - } - } -} diff --git a/internal/controllers/guardian.go b/internal/controllers/guardian.go index 53cb223..29c4b90 100644 --- a/internal/controllers/guardian.go +++ b/internal/controllers/guardian.go @@ -2,8 +2,6 @@ package controllers import ( "github.com/Mmx233/BitSrunLoginGo/internal/global" - "os" - "os/exec" "time" "github.com/Mmx233/BitSrunLoginGo/tools" @@ -12,16 +10,10 @@ import ( // Guardian 守护模式逻辑 func Guardian() { + log.Infoln("[以守护模式启动]") + GuardianDuration := time.Duration(global.Config.Settings.Guardian.Duration) * time.Second - if global.Config.Settings.Daemon.Enable { - go Daemon.DaemonChan() - - if e := Daemon.MarkDaemon(); e != nil { - log.Warnln("写入daemon标记文件失败: ", e) - } - } - var c = make(chan bool) for { go func() { @@ -52,16 +44,3 @@ func Guardian() { time.Sleep(GuardianDuration) } } - -// EnterGuardian 守护模式入口，控制是否进入daemon -func EnterGuardian() { - log.Infoln("[以守护模式启动]") - if global.Config.Settings.Daemon.Enable || global.Flags.Daemon { - if err := exec.Command(os.Args[0], append(os.Args[1:], "--running-daemon")...).Start(); err != nil { - log.Fatalln("启动守护失败: ", err) - } - log.Infoln("[进入后台进程模式]") - return - } - Guardian() -} diff --git a/internal/global/config.go b/internal/global/config.go index 7d494c1..2d9aa26 100644 --- a/internal/global/config.go +++ b/internal/global/config.go @@ -30,9 +30,6 @@ func readConfig() { Basic: models.Basic{ Timeout: 5, }, - Daemon: models.Daemon{ - Path: ".BitSrun", - }, Guardian: models.Guardian{ Duration: 300, }, diff --git a/internal/global/flags.go b/internal/global/flags.go index b8b4b79..a5558db 100644 --- a/internal/global/flags.go +++ b/internal/global/flags.go @@ -7,10 +7,6 @@ import ( var Flags struct { //配置文件路径 Path string - //daemon模式内置标记 - RunningDaemon bool - //强制daemon - Daemon bool Interface string } @@ -18,7 +14,5 @@ var Flags struct { func initFlags() { flag.StringVar(&Flags.Path, "config", "Config.yaml", "config path") flag.StringVar(&Flags.Interface, "interface", "", "specify the eth name") - flag.BoolVar(&Flags.RunningDaemon, "running-daemon", false, "") - flag.BoolVar(&Flags.Daemon, "daemon", false, "") flag.Parse() } diff --git a/internal/global/models/config.go b/internal/global/models/config.go index 55ec02a..1817e5f 100644 --- a/internal/global/models/config.go +++ b/internal/global/models/config.go @@ -4,11 +4,6 @@ import ( "github.com/Mmx233/BitSrunLoginGo/pkg/srun" ) -type Daemon struct { - Enable bool `json:"enable" yaml:"enable" mapstructure:"enable"` - Path string `json:"path" yaml:"path" mapstructure:"path"` -} - type Guardian struct { Enable bool `json:"enable" yaml:"enable" mapstructure:"enable"` Duration uint `json:"duration" yaml:"duration" mapstructure:"duration"` @@ -39,7 +34,6 @@ type DDNS struct { type Settings struct { Basic Basic `json:"basic" yaml:"basic" mapstructure:"basic"` Guardian Guardian `json:"guardian" yaml:"guardian" mapstructure:"guardian"` - Daemon Daemon `json:"daemon" yaml:"daemon" mapstructure:"daemon"` Log Log `json:"log" yaml:"log" mapstructure:"log"` DDNS DDNS `json:"ddns" yaml:"ddns" mapstructure:"ddns"` } diff --git a/pkg/srun/api.go b/pkg/srun/api.go index 686718e..e779143 100644 --- a/pkg/srun/api.go +++ b/pkg/srun/api.go @@ -18,7 +18,7 @@ type Api struct { Header http.Header } -func (a *Api) Init(https bool, domain string, client *http.Client, header http.Header) { +func (a *Api) Init(https bool, domain string, client *http.Client) { if a.inited { return } diff --git a/pkg/srun/models.go b/pkg/srun/models.go index 5c5c800..5582dce 100644 --- a/pkg/srun/models.go +++ b/pkg/srun/models.go @@ -30,11 +30,10 @@ type Conf struct { //登录参数，不可缺省 LoginInfo LoginInfo Client *http.Client - Header http.Header api Api } func (a *Conf) initApi() { - a.api.Init(a.Https, a.LoginInfo.Form.Domain, a.Client, a.Header) + a.api.Init(a.Https, a.LoginInfo.Form.Domain, a.Client) }