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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Mrs4s 2022-08-13 23:01:52 +08:00
commit 202a75ee2d
No known key found for this signature in database
GPG Key ID: 3186E98FA19CE3A7
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/gocq/login.go
View File

@ -151,7 +151,7 @@ func loginResponseProcessor(res *client.LoginResponse) error {
log.Warn("请输入(1 - 2) (将在10秒后自动选择1)：")
text = readLineTimeout(time.Second*10, "1")
if strings.Contains(text, "1") {
ticket := sliderCaptchaProcessor(res.VerifyUrl)
ticket := getTicket(res.VerifyUrl)
if ticket == "" {
os.Exit(0)
}
@ -218,12 +218,31 @@ func loginResponseProcessor(res *client.LoginResponse) error {
}
}
func sliderCaptchaProcessor(u string) string {
func getTicket(u string) (str string) {
id := utils.RandomString(8)
log.Warnf("请前往该地址验证 -> %v", strings.ReplaceAll(u, "https://ssl.captcha.qq.com/template/wireless_mqq_captcha.html?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id)))
start := time.Now()
for time.Since(start).Minutes() < 2 {
time.Sleep(time.Second)
log.Warnf("请前往该地址验证 -> %v <- 或输入手动抓取的 ticket：（Enter 提交）", strings.ReplaceAll(u, "https://ssl.captcha.qq.com/template/wireless_mqq_captcha.html?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id)))
manual := make(chan string, 1)
go func() {
manual <- readLine()
}()
ticker := time.NewTicker(time.Second)
defer ticker.Stop()
for count := 120; count > 0; count-- {
select {
case <-ticker.C:
str = fetchCaptcha(id)
if str != "" {
return
}
case str = <-manual:
return
}
}
log.Warnf("验证超时")
return ""
}
func fetchCaptcha(id string) string {
data, err := global.GetBytes("https://captcha.go-cqhttp.org/captcha/ticket?id=" + id)
if err != nil {
log.Warnf("获取 Ticket 时出现错误: %v", err)
@ -233,7 +252,5 @@ func sliderCaptchaProcessor(u string) string {
if g.Get("ticket").Exists() {
return g.Get("ticket").String()
}
}
log.Warnf("验证超时")
return ""
}