chinhwajie/BitSrunLoginGo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 修正导入名、修正 readme 导入使用指引

Browse Source
This commit is contained in:
Mmx233
2023-04-12 10:15:53 +08:00
parent 16a5da155c
commit d355559e53
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -165,14 +165,14 @@ func main() {
conf:=&srun.Conf{ conf:=&srun.Conf{
Https: false, Https: false,
Client: nil, Client: nil,
LoginInfo: BitSrun.LoginInfo{ LoginInfo: srun.LoginInfo{
Form: &BitSrun.LoginForm{ Form: &srun.LoginForm{
Domain: "", Domain: "",
UserName: "", UserName: "",
UserType: "", UserType: "",
PassWord: "", PassWord: "",
}, },
Meta: &BitSrun.LoginMeta{ Meta: &srun.LoginMeta{
N: "", N: "",
Type: "", Type: "",
Acid: "", Acid: "",

30
internal/controllers/login.go
View File

@@ -1,8 +1,8 @@
package controllers package controllers
import ( import (
global2 "github.com/Mmx233/BitSrunLoginGo/internal/global" "github.com/Mmx233/BitSrunLoginGo/internal/global"
dns2 "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns" "github.com/Mmx233/BitSrunLoginGo/internal/pkg/dns"
"github.com/Mmx233/BitSrunLoginGo/pkg/srun" "github.com/Mmx233/BitSrunLoginGo/pkg/srun"
"github.com/Mmx233/BitSrunLoginGo/tools" "github.com/Mmx233/BitSrunLoginGo/tools"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@@ -16,10 +16,10 @@ func Login(localAddr net.Addr, debugOutput bool) error {
httpClient := tools.HttpPackSelect(localAddr).Client httpClient := tools.HttpPackSelect(localAddr).Client
conf := &srun.Conf{ conf := &srun.Conf{
Https: global2.Config.Settings.Basic.Https, Https: global.Config.Settings.Basic.Https,
LoginInfo: srun.LoginInfo{ LoginInfo: srun.LoginInfo{
Form: &global2.Config.Form, Form: &global.Config.Form,
Meta: &global2.Config.Meta, Meta: &global.Config.Meta,
}, },
Client: httpClient, Client: httpClient,
} }
@@ -38,10 +38,10 @@ func Login(localAddr net.Addr, debugOutput bool) error {
return e return e
} }
if localAddr != nil && global2.Config.Settings.Basic.UseDhcpIP { if localAddr != nil && global.Config.Settings.Basic.UseDhcpIP {
ip = localAddr.(*net.TCPAddr).IP.String() ip = localAddr.(*net.TCPAddr).IP.String()
} else if global2.Flags.ClientIP != "" { } else if global.Flags.ClientIP != "" {
ip = global2.Flags.ClientIP ip = global.Flags.ClientIP
} }
log.Debugln("认证客户端 ip: ", ip) log.Debugln("认证客户端 ip: ", ip)
@@ -51,7 +51,7 @@ func Login(localAddr net.Addr, debugOutput bool) error {
if online { if online {
output("已登录~") output("已登录~")
if global2.Config.Settings.DDNS.Enable && global2.Config.Settings.Guardian.Enable && ipLast != ip { if global.Config.Settings.DDNS.Enable && global.Config.Settings.Guardian.Enable && ipLast != ip {
if ddns(ip, httpClient) == nil { if ddns(ip, httpClient) == nil {
ipLast = ip ipLast = ip
} }
@@ -67,7 +67,7 @@ func Login(localAddr net.Addr, debugOutput bool) error {
log.Infoln("登录成功~") log.Infoln("登录成功~")
if global2.Config.Settings.DDNS.Enable { if global.Config.Settings.DDNS.Enable {
_ = ddns(ip, httpClient) _ = ddns(ip, httpClient)
} }
} }
@@ -78,12 +78,12 @@ func Login(localAddr net.Addr, debugOutput bool) error {
var ipLast string var ipLast string
func ddns(ip string, httpClient *http.Client) error { func ddns(ip string, httpClient *http.Client) error {
return dns2.Run(&dns2.Config{ return dns.Run(&dns.Config{
Provider: global2.Config.Settings.DDNS.Provider, Provider: global.Config.Settings.DDNS.Provider,
IP: ip, IP: ip,
Domain: global2.Config.Settings.DDNS.Domain, Domain: global.Config.Settings.DDNS.Domain,
TTL: global2.Config.Settings.DDNS.TTL, TTL: global.Config.Settings.DDNS.TTL,
Conf: global2.Config.Settings.DDNS.Config, Conf: global.Config.Settings.DDNS.Config,
Http: httpClient, Http: httpClient,
}) })
} }