diff --git a/cmd/bitsrun/main.go b/cmd/bitsrun/main.go index 28f30d6..a40da61 100644 --- a/cmd/bitsrun/main.go +++ b/cmd/bitsrun/main.go @@ -3,7 +3,7 @@ package main import ( "github.com/Mmx233/BitSrunLoginGo/internal/config" "github.com/Mmx233/BitSrunLoginGo/internal/config/keys" - "github.com/Mmx233/BitSrunLoginGo/internal/controllers" + "github.com/Mmx233/BitSrunLoginGo/internal/login" ) func main() { @@ -14,10 +14,10 @@ func main() { if config.Settings.Guardian.Enable { //进入守护模式 - controllers.Guardian(logger.WithField(keys.LogComponent, "guard")) + login.Guardian(logger.WithField(keys.LogComponent, "guard")) } else { //执行单次流程 - _ = controllers.Login(controllers.LoginConf{ + _ = login.Login(login.Conf{ Logger: logger.WithField(keys.LogComponent, "login"), IsOnlineDetectLogDebugLevel: false, }) diff --git a/internal/config/models.go b/internal/config/models.go index ce23acd..5e15d33 100644 --- a/internal/config/models.go +++ b/internal/config/models.go @@ -1,9 +1,9 @@ package config import ( - "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns/aliyun" - "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns/cloudflare" - "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns/dnspod" + "github.com/Mmx233/BitSrunLoginGo/internal/dns/aliyun" + "github.com/Mmx233/BitSrunLoginGo/internal/dns/cloudflare" + "github.com/Mmx233/BitSrunLoginGo/internal/dns/dnspod" ) type ( diff --git a/internal/pkg/dns/aliyun/aliyun.go b/internal/dns/aliyun/aliyun.go similarity index 98% rename from internal/pkg/dns/aliyun/aliyun.go rename to internal/dns/aliyun/aliyun.go index 8672565..3e881d1 100644 --- a/internal/pkg/dns/aliyun/aliyun.go +++ b/internal/dns/aliyun/aliyun.go @@ -7,7 +7,7 @@ import ( "encoding/json" "errors" "fmt" - dnsUtil "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns/util" + "github.com/Mmx233/BitSrunLoginGo/internal/dns/util" "github.com/Mmx233/tool" "math/rand" "net/http" diff --git a/internal/pkg/dns/aliyun/models.go b/internal/dns/aliyun/models.go similarity index 100% rename from internal/pkg/dns/aliyun/models.go rename to internal/dns/aliyun/models.go diff --git a/internal/pkg/dns/cloudflare/cloudflare.go b/internal/dns/cloudflare/cloudflare.go similarity index 100% rename from internal/pkg/dns/cloudflare/cloudflare.go rename to internal/dns/cloudflare/cloudflare.go diff --git a/internal/pkg/dns/dns.go b/internal/dns/dns.go similarity index 85% rename from internal/pkg/dns/dns.go rename to internal/dns/dns.go index 2da8d57..b7850a1 100644 --- a/internal/pkg/dns/dns.go +++ b/internal/dns/dns.go @@ -3,9 +3,9 @@ package dns import ( "errors" "fmt" - "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns/aliyun" - "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns/cloudflare" - "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns/dnspod" + "github.com/Mmx233/BitSrunLoginGo/internal/dns/aliyun" + "github.com/Mmx233/BitSrunLoginGo/internal/dns/cloudflare" + "github.com/Mmx233/BitSrunLoginGo/internal/dns/dnspod" log "github.com/sirupsen/logrus" ) diff --git a/internal/pkg/dns/dnspod/dnspod.go b/internal/dns/dnspod/dnspod.go similarity index 97% rename from internal/pkg/dns/dnspod/dnspod.go rename to internal/dns/dnspod/dnspod.go index 7b54e9a..13ca4c2 100644 --- a/internal/pkg/dns/dnspod/dnspod.go +++ b/internal/dns/dnspod/dnspod.go @@ -1,7 +1,7 @@ package dnspod import ( - dnsUtil "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns/util" + "github.com/Mmx233/BitSrunLoginGo/internal/dns/util" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/regions" diff --git a/internal/pkg/dns/models.go b/internal/dns/models.go similarity index 100% rename from internal/pkg/dns/models.go rename to internal/dns/models.go diff --git a/internal/pkg/dns/util/domain.go b/internal/dns/util/domain.go similarity index 100% rename from internal/pkg/dns/util/domain.go rename to internal/dns/util/domain.go diff --git a/internal/pkg/http_client/http.go b/internal/http_client/http.go similarity index 100% rename from internal/pkg/http_client/http.go rename to internal/http_client/http.go diff --git a/internal/pkg/http_client/http_default.go b/internal/http_client/http_default.go similarity index 100% rename from internal/pkg/http_client/http_default.go rename to internal/http_client/http_default.go diff --git a/internal/pkg/http_client/http_linux.go b/internal/http_client/http_linux.go similarity index 100% rename from internal/pkg/http_client/http_linux.go rename to internal/http_client/http_linux.go diff --git a/internal/controllers/guardian.go b/internal/login/guardian.go similarity index 91% rename from internal/controllers/guardian.go rename to internal/login/guardian.go index ebb4eda..dbb6ee4 100644 --- a/internal/controllers/guardian.go +++ b/internal/login/guardian.go @@ -1,4 +1,4 @@ -package controllers +package login import ( "github.com/Mmx233/BitSrunLoginGo/internal/config" @@ -11,7 +11,7 @@ import ( func Guardian(logger log.FieldLogger) { GuardianDuration := time.Duration(config.Settings.Guardian.Duration) * time.Second for { - _ = Login(LoginConf{ + _ = Login(Conf{ Logger: logger.WithField(keys.LogComponent, "login"), IsOnlineDetectLogDebugLevel: true, }) diff --git a/internal/controllers/login.go b/internal/login/login.go similarity index 89% rename from internal/controllers/login.go rename to internal/login/login.go index e108ea6..ec4e52b 100644 --- a/internal/controllers/login.go +++ b/internal/login/login.go @@ -1,4 +1,4 @@ -package controllers +package login import ( "context" @@ -7,8 +7,8 @@ import ( "github.com/Mmx233/BitSrunLoginGo/internal/config" "github.com/Mmx233/BitSrunLoginGo/internal/config/flags" "github.com/Mmx233/BitSrunLoginGo/internal/config/keys" - "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns" - "github.com/Mmx233/BitSrunLoginGo/internal/pkg/http_client" + dns2 "github.com/Mmx233/BitSrunLoginGo/internal/dns" + "github.com/Mmx233/BitSrunLoginGo/internal/http_client" "github.com/Mmx233/BitSrunLoginGo/pkg/srun" "github.com/Mmx233/BitSrunLoginGo/tools" log "github.com/sirupsen/logrus" @@ -20,17 +20,17 @@ import ( var ipLast string var debugTip sync.Once -type LoginConf struct { +type Conf struct { Logger log.FieldLogger IsOnlineDetectLogDebugLevel bool } -func Login(conf LoginConf) error { +func Login(conf Conf) error { logger := conf.Logger if config.Settings.Basic.Interfaces == "" { //单网卡 - err := LoginSingle(LoginSingleConf{ - LoginConf: conf, - Eth: nil, + err := Single(SingleConf{ + Conf: conf, + Eth: nil, }) if err != nil { logger.Errorln("登录出错: ", err) @@ -42,12 +42,12 @@ func Login(conf LoginConf) error { } return err } else { //多网卡 - return LoginInterfaces(conf) + return Interfaces(conf) } } func ddns(logger log.FieldLogger, ip string, httpClient *http.Client) error { - return dns.Run(&dns.Config{ + return dns2.Run(&dns2.Config{ Logger: logger.WithField(keys.LogLoginModule, "ddns"), Provider: config.Settings.DDNS.Provider, IP: ip, @@ -58,7 +58,7 @@ func ddns(logger log.FieldLogger, ip string, httpClient *http.Client) error { }) } -func LoginInterfaces(conf LoginConf) error { +func Interfaces(conf Conf) error { logger := conf.Logger interfaces, err := tools.GetInterfaceAddr(logger, config.Settings.Basic.Interfaces) if err != nil { @@ -68,9 +68,9 @@ func LoginInterfaces(conf LoginConf) error { var errCount int for i, eth := range interfaces { logger.Infoln("使用网卡: ", eth.Name) - if err := LoginSingle(LoginSingleConf{ - LoginConf: conf, - Eth: ð, + if err := Single(SingleConf{ + Conf: conf, + Eth: ð, }); err != nil { logger.Errorf("网卡 %s 登录出错: %v", eth.Name, err) errCount++ @@ -85,12 +85,12 @@ func LoginInterfaces(conf LoginConf) error { return nil } -type LoginSingleConf struct { - LoginConf +type SingleConf struct { + Conf Eth *tools.Eth } -func LoginSingle(conf LoginSingleConf) error { +func Single(conf SingleConf) error { if config.Settings.Backoff.Enable { return backoff.NewInstance(func(ctx context.Context) error { return doLogin(conf) @@ -100,7 +100,7 @@ func LoginSingle(conf LoginSingleConf) error { } } -func doLogin(conf LoginSingleConf) error { +func doLogin(conf SingleConf) error { logger := conf.Logger // 登录配置初始化