可追加新账号，手机号登录简化

develop202 · develop202 · commit 54e039e1e7e7 · 2026-03-15T12:54:43.000+08:00
diff --git a/.github/workflows/phoneLogin.yml b/.github/workflows/phoneLogin.yml
@@ -1,9 +1,15 @@
 name: phoneLogin
 on:
   workflow_dispatch:
-  # push:
-  # schedule:
-  #   - cron: 1 16 * * *
+    inputs:
+      append_user:
+        description: "是否追加新账号？（不删除已存在账号信息）"
+        required: true
+        default: "否"
+        type: choice
+        options:
+          - 是
+          - 否
 jobs:
   run:
     runs-on: ubuntu-latest
@@ -17,6 +23,20 @@ jobs:
           node-version: 24
           cache: 'npm'
           cache-dependency-path: ./api/package-lock.json
+      - name: 🔧 安装GitHub CLI，并使用PAT登录
+        env:
+          PAT: ${{ secrets.PAT }}
+        run: |
+          if [ -n "${PAT}" ]; then
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt update
+            sudo apt install gh -y
+            gh --version
+            echo "${{ secrets.PAT }}" | gh auth login --with-token
+            gh auth status
+          fi
       - name: Cache node_modules in api directory
         id: cache-npm
         uses: actions/cache@v5
@@ -33,3 +53,7 @@ jobs:
         env:
           PHONE: ${{ secrets.PHONE }}
           CODE: ${{ secrets.CODE }}
+          PAT: ${{ secrets.PAT }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          USERINFO: ${{ secrets.USERINFO }}
+          APPEND_USER: ${{ github.event.inputs.append_user }}
diff --git a/.github/workflows/qrcodeLogin.yml b/.github/workflows/qrcodeLogin.yml
@@ -3,9 +3,17 @@ on:
   workflow_dispatch:
     inputs:
       number:
-        description: "需要登录几个账号?"
+        description: "需要登录几个账号？"
         required: true
         default: 1
+      append_user:
+        description: "是否追加新账号？（不删除已存在账号信息）"
+        required: true
+        default: "否"
+        type: choice
+        options:
+          - 是
+          - 否
 jobs:
   run:
     runs-on: ubuntu-latest
@@ -49,3 +57,5 @@ jobs:
           NUMBER: ${{ github.event.inputs.number }}
           PAT: ${{ secrets.PAT }}
           GITHUB_REPOSITORY: ${{ github.repository }}
+          USERINFO: ${{ secrets.USERINFO }}
+          APPEND_USER: ${{ github.event.inputs.append_user }}
diff --git a/README.md b/README.md
@@ -50,15 +50,7 @@ GitHub Actions 实现 `酷狗概念VIP` 自动签到，每天领取总计 `两
 
    3.2 手机号
 
-   添加手机号到 Secret `PHONE`，运行 Actions `sent` 获取验证码，把验证码添加到 Secret `CODE`；运行Actions `phoneLogin`，复制 `token` 和 `userid` 添加到 Secret `USERINFO`，格式如下, 注意删去换行，否则会多出一些字符，但是不影响签到
-
-   > ```json
-   > [
-   >   { "userid": "写入id", "token": "写入token" },
-   >   // 其他账号信息 注意删掉此行
-   >   { "userid": "写入id", "token": "写入token" }
-   > ]
-   > ```
+   添加手机号到 Secret `PHONE`，运行 Actions `sent` 获取验证码，把验证码添加到 Secret `CODE`；运行Actions `phoneLogin` ，成功即可
 
 1. 启用 Actions `main` , 每天北京时间 00:01 自动签到
 
diff --git a/phoneLogin.js b/phoneLogin.js
@@ -1,9 +1,15 @@
+import { execSync } from "child_process";
+import { printBlue, printGreen, printRed, printYellow } from "./utils/colorOut.js";
 import { close_api, delay, send, startService } from "./utils/utils.js";
 
 async function login() {
 
   const phone = process.env.PHONE
   const code = process.env.CODE
+  const PAT = process.env.PAT
+  const USERINFO = process.env.USERINFO
+  const APPEND_USER = process.env.APPEND_USER
+  const userinfo = (USERINFO && APPEND_USER == "是") ? JSON.parse(USERINFO) : []
 
   // 不使用二维码登录并且没有手机号或验证码
   if (!phone || !code) {
@@ -17,14 +23,49 @@ async function login() {
     // 手机号登录请求
     const result = await send(`/login/cellphone?mobile=${phone}&code=${code}`, "GET", {})
     if (result.status === 1) {
-      console.log("登录成功！")
-      console.log("第一行是token,第二行是userid")
-      console.log(result.data.token)
-      console.log(result.data.userid)
+
+      let userAlreadyExist = false
+      printGreen("登录成功！")
+      if (PAT) {
+        if (APPEND_USER == "是") {
+          for (let i = 0; i < userinfo.length; i++) {
+
+            if (userinfo[i].userid == res.data.userid) {
+              userAlreadyExist = true
+              printYellow(`userid: ${userinfo[i].userid} 此账号已存在, 仅更新登录信息`)
+              userinfo[i].token = res.data.token
+            }
+          }
+        }
+        if (!userAlreadyExist) {
+          userinfo.push({
+            userid: res.data.userid,
+            token: res.data.token
+          })
+        }
+        if (userinfo.length) {
+          const userinfoJSON = JSON.stringify(userinfo)
+          if (PAT) {
+            try {
+              execSync(`gh secret set USERINFO -b'${userinfoJSON}' --repo ${process.env.GITHUB_REPOSITORY}`);
+              printGreen("secret <USERINFO> 更改成功")
+            } catch (error) {
+              printRed("自动写入出错，登录信息如下，请手动添加到secret USERINFO")
+              printRed(userinfoJSON)
+            }
+          } else {
+            printGreen("登录信息如下，把它添加到secret USERINFO 即可")
+            printBlue(userinfoJSON)
+          }
+        }
+      } else {
+        printRed("PAT变量缺失")
+
+      }
     } else if (result.error_code === 34175) {
       throw new Error("暂不支持多账号绑定手机登录")
     } else {
-      console.log("响应内容")
+      printRed("响应内容")
       console.dir(result, { depth: null })
       throw new Error("登录失败！请检查")
     }
diff --git a/qrcodeLogin.js b/qrcodeLogin.js
@@ -1,13 +1,16 @@
 import { execSync } from "child_process";
 import { close_api, delay, send, startService } from "./utils/utils.js";
+import { printBlue, printGreen, printMagenta, printRed, printYellow } from "./utils/colorOut.js";
 
 async function qrcode() {
 
   // 启动服务
   const api = startService()
   await delay(2000)
   let qrcode = ""
-  const userinfo = []
+  const USERINFO = process.env.USERINFO
+  const APPEND_USER = process.env.APPEND_USER
+  const userinfo = (USERINFO && APPEND_USER == "是") ? JSON.parse(USERINFO) : []
   const args = process.argv.slice(2);
   const number = parseInt(process.env.NUMBER || args[0] || "1")
   const pat = process.env.PAT
@@ -19,24 +22,24 @@ async function qrcode() {
         qrcode = result.data.qrcode
         const img_base64 = result.data.qrcode_img;
         const chunkSize = 1000;
-        console.log("二维码链接如下, 请在浏览器打开使用APP扫描并确认登录")
+        printMagenta("二维码链接如下, 请在浏览器打开使用APP扫描并确认登录")
         for (let i = 0; i < img_base64.length; i += chunkSize) {
           console.log(img_base64.slice(i, i + chunkSize));
         }
       } else {
-        console.log("响应内容")
+        printRed("响应内容")
         console.dir(result, { depth: null })
         throw new Error("请求出错")
       }
-      console.log("正在等待，请扫描二维码并确定登录")
+      printMagenta("正在等待，请扫描二维码并确定登录")
       // 登录
       for (let i = 0; i < 25; i++) {
         const timestrap = Date.now();
         const res = await send(`/login/qr/check?key=${qrcode}&timestrap=${timestrap}`, "GET", {})
         const status = res?.data?.status
         switch (status) {
           case 0:
-            console.log("二维码已过期")
+            printYellow("二维码已过期")
             break
 
           case 1:
@@ -47,21 +50,34 @@ async function qrcode() {
             // console.log("二维码未确认，请点击确认登录")
             break
           case 4:
-            console.log("登录成功！")
-            userinfo.push({
-              userid: res.data.userid,
-              token: res.data.token
-            })
+            let userAlreadyExist = false
+            printGreen("登录成功！")
+            if (APPEND_USER == "是") {
+              for (let i = 0; i < userinfo.length; i++) {
+
+                if (userinfo[i].userid == res.data.userid) {
+                  userAlreadyExist = true
+                  printYellow(`userid: ${userinfo[i].userid} 此账号已存在, 仅更新登录信息`)
+                  userinfo[i].token = res.data.token
+                }
+              }
+            }
+            if (!userAlreadyExist) {
+              userinfo.push({
+                userid: res.data.userid,
+                token: res.data.token
+              })
+            }
             break;
           default:
-            console.log("请求出错")
+            printRed("请求出错")
             console.dir(res, { depth: null })
         }
         if (status == 4 || status == 0) {
           break
         }
         if (i == 24) {
-          console.log("等待超时\n")
+          printRed("等待超时\n")
           break
         }
         await delay(5000)
@@ -72,14 +88,14 @@ async function qrcode() {
       if (pat) {
         try {
           execSync(`gh secret set USERINFO -b'${userinfoJSON}' --repo ${process.env.GITHUB_REPOSITORY}`);
-          console.log("secret <USERINFO> 更改成功")
+          printGreen("secret <USERINFO> 更改成功")
         } catch (error) {
-          console.log("自动写入出错，登录信息如下，请手动添加到secret USERINFO")
-          console.log(userinfoJSON)
+          printRed("自动写入出错，登录信息如下，请手动添加到secret USERINFO")
+          printRed(userinfoJSON)
         }
       } else {
-        console.log("登录信息如下，把它添加到secret USERINFO 即可")
-        console.log(userinfoJSON)
+        printGreen("登录信息如下，把它添加到secret USERINFO 即可")
+        printBlue(userinfoJSON)
       }
     }
   } finally {
