From c238c27d7de6eb83bbefb0074ca07e46ffb4ef23 Mon Sep 17 00:00:00 2001
From: KirDeer <1215496644@qq.com>
Date: Mon, 28 Aug 2023 21:17:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A4=9A=E8=B4=A6=E5=8F=B7login?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=BB=B6=E8=BF=9B=E8=A1=8C=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/login.js |  3 +--
 main.js      | 12 +++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/login.js b/lib/login.js
index dc3bf72..cb59900 100644
--- a/lib/login.js
+++ b/lib/login.js
@@ -22,11 +22,10 @@ async function login(num) {
         log.info("cookie", cookie);
         if (await replaceCookie(env_path, uid, cookie)) {
             log.info("说明",`账号${num}已进行cookie自动更新，如未能生效请手动复制在env.js内替换。路径：${env_path}`);
-            return;
         }
     } catch (error) {
         if (error?.message?.includes('Cannot find module')) {
-            log.error('请先运行 yarn add @catlair/blogin');
+            log.error('请先运行 npm add @catlair/blogin');
             return;
         }
         log.error(error);
diff --git a/main.js b/main.js
index 63eaa9b..e232412 100644
--- a/main.js
+++ b/main.js
@@ -16,6 +16,9 @@ const metainfo = [
 let multiple_account = [];
 /**循环等待时间 */
 let loop_wait = 0;
+/**账号状态标记 1正常 -1失效 */
+// eslint-disable-next-line no-unused-vars
+let ck_flag = 0
 
 /**
  * @returns {Promise<string>} 错误信息
@@ -38,7 +41,11 @@ async function main() {
             if (err_msg) {
                 return err_msg
             } else {
-                await delay(acco.WAIT);
+                if(ck_flag===1){
+                    await delay(acco.WAIT);
+                } else {
+                    await delay(3 * 1000);
+                }
             }
         }
 
@@ -58,6 +65,7 @@ async function main() {
         const help_msg = "用法: lottery [OPTIONS]\n\nOPTIONS:\n\tstart  启动抽奖\n\tcheck  中奖检查\n\tacount 查看帐号信息\n\tclear  清理动态和关注\n\tlogin 扫码登录更新CK\n\tupdate 检查更新\n\thelp   帮助信息";
         if (await checkCookie(NUMBER)) {
             const { lottery_loop_wait, check_loop_wait, clear_loop_wait, save_lottery_info_to_file } = require("./lib/data/config");
+            ck_flag = 1;
             switch (mode) {
                 case 'start':
                     log.info('抽奖', '开始运行');
@@ -95,8 +103,10 @@ async function main() {
             }
         } else {
             log.error('Cookie已失效', '切换账号时不要点击退出账号而应直接删除Cookie退出')
+            ck_flag = -1;
             if (mode === "login") {
                 log.info('登陆', '开始扫码');
+                await delay(6 * 1000);
                 await login(NUMBER);
             }
         }