update relogin

README.md

@@ -128,8 +128,3 @@ lz1998/gmc:0.1.11
 
 此时就能看到一个标准的 `JSON`, 复制 `ticket` 字段并回到 验证码处理 粘贴. 即可通过滑块验证.
 
-#### 方案B
-
-下载专用软件进行验证
-
-TODO

service/bot/bot.go

@@ -108,6 +108,17 @@ func Login(cli *client.QQClient) (bool, error) {
 
 func SetRelogin(cli *client.QQClient, retryInterval int, retryCount int) {
 	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
+		time.Sleep(5 * time.Second)
+
+		// 尝试token登录
+		if err := cli.TokenLogin(LoginToken); err != nil {
+			log.Errorf("failed to relogin with token, try to login with password, %+v", err)
+		} else {
+			LoginToken = cli.GenToken()
+			log.Info("succeed to relogin with token")
+			return
+		}
+
 		var times = 1
 		for {
 			if cli.Online {
@@ -122,22 +133,12 @@ func SetRelogin(cli *client.QQClient, retryInterval int, retryCount int) {
 			times++
 			time.Sleep(time.Second * time.Duration(retryInterval))
 
-			// 尝试token登录
-			if err := cli.TokenLogin(LoginToken); err != nil {
-				log.Errorf("failed to relogin with token, try to login with password, %+v", err)
-			} else {
-				LoginToken = cli.GenToken()
-				log.Info("succeed to relogin with token")
-				return
-			}
-
-			time.Sleep(time.Second)
-
 			// 尝试密码登录
 			ok, err := Login(cli)
 
 			if err != nil {
 				log.Errorf("重连失败: %v", err)
+				cli.Disconnect()
 				continue
 			}
 			if ok {