style: 修改包名
This commit is contained in:
@@ -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,
|
||||
},
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package models
|
||||
package srunModels
|
||||
|
||||
type Daemon struct {
|
||||
Enable bool `json:"enable"`
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package models
|
||||
package srunModels
|
||||
|
||||
type LoginForm struct {
|
||||
Domain string `json:"domain"`
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user