shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 03:23:49 +08:00
Code Issues Projects Releases Wiki Activity

switch to scanf.

Browse Source
This commit is contained in:
Mrs4s 2020-10-12 14:14:25 +08:00
parent 1d7f1cc5d5
commit b7d3aec9b7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/apiAdmin.go
View File

@ -96,6 +96,10 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
func (s *webServer) Dologin() { func (s *webServer) Dologin() {
s.Console = bufio.NewReader(os.Stdin) s.Console = bufio.NewReader(os.Stdin)
readLine := func() (str string) {
_, _ = fmt.Scanf("%s", &str)
return
}
conf := GetConf() conf := GetConf()
cli := s.Cli cli := s.Cli
cli.AllowSlider = true cli.AllowSlider = true
@ -109,7 +113,7 @@ func (s *webServer) Dologin() {
if client.SystemDeviceInfo.Protocol == client.AndroidPhone { if client.SystemDeviceInfo.Protocol == client.AndroidPhone {
log.Warnf("警告: Android Phone 强制要求暂不支持的滑条验证码, 请开启设备锁或切换到Watch协议验证通过后再使用.") log.Warnf("警告: Android Phone 强制要求暂不支持的滑条验证码, 请开启设备锁或切换到Watch协议验证通过后再使用.")
log.Infof("按 Enter 继续....") log.Infof("按 Enter 继续....")
_, _ = s.Console.ReadString('\n') readLine()
os.Exit(0) os.Exit(0)
} }
cli.AllowSlider = false cli.AllowSlider = false
@ -125,7 +129,7 @@ func (s *webServer) Dologin() {
text = <-WebInput text = <-WebInput
} else { } else {
log.Warn("请输入验证码 (captcha.jpg)： (Enter 提交)") log.Warn("请输入验证码 (captcha.jpg)： (Enter 提交)")
text, _ = s.Console.ReadString('\n') text = readLine()
} }
rsp, err = cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), rsp.CaptchaSign) rsp, err = cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), rsp.CaptchaSign)
global.DelFile("captcha.jpg") global.DelFile("captcha.jpg")
@ -139,7 +143,7 @@ func (s *webServer) Dologin() {
os.Exit(0) os.Exit(0)
} }
log.Warn("请输入短信验证码： (Enter 提交)") log.Warn("请输入短信验证码： (Enter 提交)")
text, _ = s.Console.ReadString('\n') text = readLine()
rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", "")) rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
continue continue
case client.SMSOrVerifyNeededError: case client.SMSOrVerifyNeededError:
@ -155,13 +159,13 @@ func (s *webServer) Dologin() {
os.Exit(0) os.Exit(0)
} }
log.Warn("请输入短信验证码： (Enter 提交)") log.Warn("请输入短信验证码： (Enter 提交)")
text, _ = s.Console.ReadString('\n') text = readLine()
rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", "")) rsp, err = cli.SubmitSMS(strings.ReplaceAll(strings.ReplaceAll(text, "\n", ""), "\r", ""))
continue continue
} }
log.Warnf("请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl) log.Warnf("请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
log.Infof("按 Enter 继续....") log.Infof("按 Enter 继续....")
_, _ = s.Console.ReadString('\n') readLine()
os.Exit(0) os.Exit(0)
return return
case client.UnsafeDeviceError: case client.UnsafeDeviceError:
@ -171,7 +175,7 @@ func (s *webServer) Dologin() {
text = <-WebInput text = <-WebInput
} else { } else {
log.Infof("按 Enter 继续....") log.Infof("按 Enter 继续....")
_, _ = s.Console.ReadString('\n') readLine()
} }
log.Info(text) log.Info(text)
os.Exit(0) os.Exit(0)
@ -179,7 +183,7 @@ func (s *webServer) Dologin() {
case client.OtherLoginError, client.UnknownLoginError: case client.OtherLoginError, client.UnknownLoginError:
log.Warnf("登录失败: %v", rsp.ErrorMessage) log.Warnf("登录失败: %v", rsp.ErrorMessage)
log.Infof("按 Enter 继续....") log.Infof("按 Enter 继续....")
_, _ = s.Console.ReadString('\n') readLine()
os.Exit(0) os.Exit(0)
return return
} }