diff --git a/controllers/login.go b/controllers/login.go index 2008867..fdc8239 100644 --- a/controllers/login.go +++ b/controllers/login.go @@ -7,12 +7,12 @@ import ( ) func Login(output bool, skipCheck bool) error { - return BitSrun.Login(&transfer.Login{ + return BitSrun.Login(&srunTransfer.Login{ Demo: global.Config.Settings.DemoMode, OutPut: output, CheckNet: !skipCheck, Timeout: global.Config.Settings.Timeout, - LoginInfo: transfer.LoginInfo{ + LoginInfo: srunTransfer.LoginInfo{ Form: &global.Config.Form, Meta: &global.Config.Meta, }, diff --git a/global/config.go b/global/config.go index 3f18b26..38b72d4 100644 --- a/global/config.go +++ b/global/config.go @@ -8,7 +8,7 @@ import ( "os" ) -var Config models.Config +var Config srunModels.Config func init() { initFlags() @@ -16,23 +16,23 @@ func init() { //配置文件初始化 if e := config.Load(config.Options{ Config: &Config, - Default: &models.Config{ - Form: models.LoginForm{ + Default: &srunModels.Config{ + Form: srunModels.LoginForm{ Domain: "www.msftconnecttest.com", UserType: "cmcc", }, - Meta: models.LoginMeta{ + Meta: srunModels.LoginMeta{ N: "200", Type: "1", Acid: "5", Enc: "srun_bx1", }, - Settings: models.Settings{ + Settings: srunModels.Settings{ Timeout: 1, - Daemon: models.Daemon{ + Daemon: srunModels.Daemon{ Path: ".autoLogin", }, - Guardian: models.Guardian{ + Guardian: srunModels.Guardian{ Duration: 300, }, }, diff --git a/models/config.go b/models/config.go index 06642ba..b39b8d4 100644 --- a/models/config.go +++ b/models/config.go @@ -1,4 +1,4 @@ -package models +package srunModels type Daemon struct { Enable bool `json:"enable"` diff --git a/models/login.go b/models/login.go index 6c31d88..063c04a 100644 --- a/models/login.go +++ b/models/login.go @@ -1,4 +1,4 @@ -package models +package srunModels type LoginForm struct { Domain string `json:"domain"` diff --git a/util/config.go b/util/config.go index f20fd85..66c45f6 100644 --- a/util/config.go +++ b/util/config.go @@ -2,14 +2,14 @@ package util import "github.com/Mmx233/BitSrunLoginGo/models" -func GenerateLoginInfo(Form *models.LoginForm, Meta *models.LoginMeta) *models.LoginInfo { - return &models.LoginInfo{ +func GenerateLoginInfo(Form *srunModels.LoginForm, Meta *srunModels.LoginMeta) *srunModels.LoginInfo { + return &srunModels.LoginInfo{ UrlLoginPage: "http://" + Form.Domain + "/srun_portal_success", UrlGetChallengeApi: "http://" + Form.Domain + "/cgi-bin/get_challenge", UrlLoginApi: "http://" + Form.Domain + "/cgi-bin/srun_portal", UrlCheckApi: "http://" + Form.Domain + "/cgi-bin/rad_user_info", Meta: Meta, - Form: &models.LoginForm{ + Form: &srunModels.LoginForm{ UserName: Form.UserName + "@" + Form.UserType, PassWord: Form.PassWord, }, diff --git a/v1/login.go b/v1/login.go index 1640847..84c448b 100644 --- a/v1/login.go +++ b/v1/login.go @@ -9,7 +9,7 @@ import ( "time" ) -func Login(c *transfer.Login) error { +func Login(c *srunTransfer.Login) error { util.Log.Demo = c.Demo util.Log.OutPut = c.OutPut diff --git a/v1/transfer/login.go b/v1/transfer/login.go index 7112d06..a9c11ca 100644 --- a/v1/transfer/login.go +++ b/v1/transfer/login.go @@ -1,10 +1,10 @@ -package transfer +package srunTransfer import "github.com/Mmx233/BitSrunLoginGo/models" type LoginInfo struct { - Form *models.LoginForm - Meta *models.LoginMeta + Form *srunModels.LoginForm + Meta *srunModels.LoginMeta } type Login struct {