From c32920ac40a35f094c921ed36b4c26160bb87800 Mon Sep 17 00:00:00 2001
From: Mrs4s <1844812067@qq.com>
Date: Sun, 11 Apr 2021 17:20:51 +0800
Subject: [PATCH] fix #817.

---
 go.mod  | 2 +-
 go.sum  | 4 ++--
 main.go | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 1f87ef0..a877322 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
-	github.com/Mrs4s/MiraiGo v0.0.0-20210410123741-46a09462b006
+	github.com/Mrs4s/MiraiGo v0.0.0-20210411090602-132dc119bf4c
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
diff --git a/go.sum b/go.sum
index 4dacf66..c3250f9 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20210410123741-46a09462b006 h1:WgHUpyyPxtdg01atpzl/qtg0f8vPvdvA8IEe9xM54vI=
-github.com/Mrs4s/MiraiGo v0.0.0-20210410123741-46a09462b006/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
+github.com/Mrs4s/MiraiGo v0.0.0-20210411090602-132dc119bf4c h1:5FjKcZV/LHRJl8N3CEdZv2UOqJEYwdk6WfcUamtctEY=
+github.com/Mrs4s/MiraiGo v0.0.0-20210411090602-132dc119bf4c/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/main.go b/main.go
index eb25440..181b6f3 100644
--- a/main.go
+++ b/main.go
@@ -347,6 +347,9 @@ func main() {
 	cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
 		reLoginLock.Lock()
 		defer reLoginLock.Unlock()
+		if cli.Online {
+			return
+		}
 		log.Warnf("Bot已离线: %v", e.Message)
 		if conf.Account.ReLogin.Disabled {
 			os.Exit(1)
@@ -361,9 +364,6 @@ func main() {
 			time.Sleep(time.Second)
 		}
 		log.Warnf("尝试重连...")
-		if cli.Online {
-			return
-		}
 		if err := cli.TokenLogin(global.AccountToken); err == nil {
 			saveToken()
 			return
@@ -371,6 +371,8 @@ func main() {
 		if isQRCodeLogin {
 			log.Fatalf("快速重连失败")
 		}
+		log.Warnf("快速重连失败, 尝试普通登录. 这可能是因为其他端强行T下线导致的.")
+		time.Sleep(time.Second)
 		if err := commonLogin(); err != nil {
 			log.Fatalf("登录时发生致命错误: %v", err)
 		}