[贴吧] 支持多账户签到

2024-11-22 08:28:25 +08:00 · 2022-09-14 23:17:52 +08:00 · 2022-09-14 23:17:52 +08:00 · d93b640a4b
commit d93b640a4b
parent fcc479ae9a
19 changed files with 621 additions and 401 deletions
--- a/README.md
+++ b/README.md
@ -55,24 +55,22 @@ https://github.com/blackmatrix7/ios_rule_script/tree/master/rewrite

 ### 脚本说明

-| 脚本                                                         | 介绍                                 | 维护状态 |
-| ------------------------------------------------------------ | ------------------------------------ | -------- |
-| [知乎助手](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/zhihu) | 使用纯净版知乎是一种怎么样的体验？   | 正常     |
-| ~~[哔哩哔哩](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/bilibili)~~ | ~~没有广告的哔哩哔哩更值得干杯~~     | 停止     |
-| [什么值得买](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/smzdm) | 什么值得买签到和去广告脚本           | 正常     |
-| [百度贴吧](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/tieba) | 带重试功能的贴吧签到，提高签到成功率 | 正常     |
-| [中国联通](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/10010) | 每日自动签到                         | 正常     |
-| [开屏去广告](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/startup) | 通过脚本去除缓存到本地的APP开屏广告  | 正常     |
-| [家长帮](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/jiazhangbang) | 每日自动签到                         | 正常     |
-| [慢慢买](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/manmanbuy) | 每日自动签到                         | 正常     |
-| [叮咚买菜](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/dingdong) | 每日自动签到                         | 正常     |
-| [万达电影](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/wanda) | 每日自动签到，月末将剩余能量抽奖     | 正常     |
-| [饿了么](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/eleme) | 每日自动领取会员任务                 | 正常     |
-| [Fa米家](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/famijia) | 每日自动签到                         | 正常     |
-| [Luka](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/luka) | 每日自动签到                         | 正常     |
-| [美团买菜](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/meituan) | 每日自动签到                         | 正常     |
-| [Synology](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/synology) | 群晖Download Station资源离线下载     | 正常     |
-| [AppleStore](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/applestore) | AppleStore 商品库存监控              | 正常     |
+| 脚本                                                         | 介绍                                 | 框架      | 维护状态 |
+| ------------------------------------------------------------ | ------------------------------------ | --------- | -------- |
+| [知乎助手](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/zhihu) | 使用纯净版知乎是一种怎么样的体验？   | MagicJS 2 | 正常     |
+| ~~[哔哩哔哩](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/bilibili)~~ | ~~没有广告的哔哩哔哩更值得干杯~~     | MagicJS 2 | 停止     |
+| [什么值得买](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/smzdm) | 什么值得买签到和去广告脚本           | MagicJS 3 | 正常     |
+| [百度贴吧](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/tieba) | 带重试功能的贴吧签到，提高签到成功率 | MagicJS 3 | 正常     |
+| [开屏去广告](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/startup) | 通过脚本去除缓存到本地的APP开屏广告  | MagicJS 2 | 正常     |
+| [家长帮](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/jiazhangbang) | 每日自动签到                         | MagicJS 2 | 正常     |
+| [慢慢买](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/manmanbuy) | 每日自动签到                         | MagicJS 2 | 正常     |
+| [叮咚买菜](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/dingdong) | 每日自动签到                         | MagicJS 2 | 正常     |
+| [饿了么](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/eleme) | 每日自动领取会员任务                 | MagicJS 2 | 正常     |
+| [Fa米家](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/famijia) | 每日自动签到                         | MagicJS 2 | 正常     |
+| [Luka](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/luka) | 每日自动签到                         | MagicJS 2 | 正常     |
+| [美团买菜](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/meituan) | 每日自动签到                         | MagicJS 2 | 正常     |
+| [Synology](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/synology) | 群晖Download Station资源离线下载     | MagicJS 3 | 正常     |
+| [AppleStore](https://github.com/blackmatrix7/ios_rule_script/tree/master/script/applestore) | AppleStore 商品库存监控              | MagicJS 3 | 正常     |

 #### Quantumult X Gallery

--- a/script/README.md
+++ b/script/README.md
@ -1,9 +1,150 @@
 # 脚本

-**常见问题**
+当前目录下的脚本都是基于 MagicJS 2 或 MaicJS 3 框架进行开发。

-使用过程中的常见问题，请访问：[https://github.com/blackmatrix7/ios_rule_script/wiki/脚本常见问题](https://github.com/blackmatrix7/ios_rule_script/wiki/脚本常见问题)
+其中 MagicJS 2 已停止维护，以下涉及的特性，都以MagicJS 3为主。

-**安全性**
+你可以在仓库的README中，查询到哪些项目是基于MagicJS3的。
+
+**涉及NodeJS（含青龙面板）的内容，统一在此说明，单个脚本的README中不再赘述。**
+
+## 数据存储
+
+### iOS平台
+
+基于 MagicJS 2/3 编写的脚本，运行在iOS平台的APP中时，数据存储在由APP提供的存储池。
+
+### NodeJS
+
+运行在NodeJS环境中时，数据存储在脚本同级目录下的magic.json文件中，而不存储在环境变量。
+
+如果有需求，可以将不同的脚本存放在不同的目录下，读取不同的magic.json文件来实现数据隔离。
+
+如果将所有的脚本数据存储在同个magic.json文件中，它们也可以和谐相处。
+
+例如下面的例子，把什么值得买和饿了么的数据存储在一起。
+
+```json
+{
+	"smzdm_cookie": "xxxxxxxxxxxxxxxxxxxxxxx",
+	"eleme_app_longitude": "xxxxxxxxxxxxxxxxx",
+	"eleme_app_latitude": "xxxxxxxxxxxxxxx",
+	"eleme_task_keywords": "xxxxxxxxxxxxxxxxxxxx",
+	"magic_bark_url": "xxxxxxxxxxxxxxxxxxxxxx"
+}
+```
+
+### 脚本变量
+
+基于MagicJS 3的脚本，会在README中明确说明使用的变量。在iOS平台下，这些变量可以在BoxJS中配置和修改。在NodeJS环境下，这些变量需要手动编辑magic.json文件。
+
+### 共用变量
+
+基于 MagicJS 3 的脚本，除脚本自身所需的变量外，以下的变量是所有脚本共用的。所有基于 MagicJS 3 的脚本(Magic 2 除外)，在iOS平台下都会受到共用变量的影响。而在NodeJS环境下，共用变量会影响所有读取同一个magic.json的脚本。
+
+| 变量名         | 类型   | 说明                                                         |
+| -------------- | ------ | ------------------------------------------------------------ |
+| magic_bark_url | string | Bark推送链接，如 https://api.day.app/xxxxxxxxxxxxxxx/        |
+| magic_loglevel | string | 日志等级，默认`INFO`，出现问题选`DEBUG`，更多等级见MagicJS手册 |
+
+## 青龙面板
+
+MagicJS 3 增加“青龙面板模块”，可以将所使用的变量，直接同步到青龙面板的magic.json文件中。以此来实现手机仅获取Cookie，青龙面板进行签到。
+
+同步变量需要通过手机访问青龙面板接口，请确保青龙面板可以被手机正常访问。
+
+### 同步开关
+
+支持数据同步到青龙面板的脚本，在BoxJS中都会有同步开关，请先将其打开。
+
+![](https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/images/05.jpg)
+
+如果没有青龙面板、访问缓慢，甚至无法访问，不建议在平时打开此功能，以免由于网络问题造成客户端加载数据缓慢。
+
+### 配置连接
+
+使用前，需要在BoxJS中配置青龙面板的链接。
+
+![](https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/images/04.jpg)
+
+配置完成后，如果访问没有问题，每次获取到的Cookies，都会同步到青龙面板。
+
+### 存储目录
+
+数据存储在青龙面板的脚本管理目录下的magic.json文件中。只有在同级目录下的脚本才会访问magic.json文件中的数据。
+
+## 多账户
+
+从 `MagicJS 3` 开始，正式对多账户进行支持，**部分脚本已实现多账户签到，如百度贴吧签到。**
+
+多账户分为以下几种情况：
+
+1. APP本身可以支持多账户
+
+   以百度贴吧为例，APP客户端本身能够切换账号。这类程序实现多账号，仅需要切换账号后，重启APP以重新获取Cookies即可。
+
+2. 通过网页登录的多账户
+
+   可以通过隐身模式、无痕模式等浏览器功能，来实现多账号同时登录，如什么值得买的签到。
+
+3. APP不支持多账户，但退出账户后Cookies不会失效
+
+   通过获取Cookie -> 退出账号 -> 登录新账号 -> 获取新账号Cookie的方式来实现多账户。
+
+4. APP不支持多账户，退出账户后Cookies失效
+
+   此类情况需要在不同设备上登录不同的账户，将Cookies同步到青龙面板，由青龙面板实现多账户签到。
+
+### 数据存储
+
+多账户的数据以JSON格式存储。
+
+以百度贴吧的为例，多账户Cookies存在在JSON中的格式，类似下面：
+
+```json
+{
+	"tieba_signin_cookie": {
+      "magic_session": true,
+      "百度用户1": "你第一个账户的Cookie",
+      "百度用户2": "你第二个账户的Cookie",
+      "百度用户3": "你第三个账户的Cookie"
+  }
+}
+```
+
+其中 **`"magic_session": true`  不可删除和更改，它用来辅助MagicJS判断存储的是Sessions还是Object。**
+
+`百度用户1`这样的文字可以随意编写，只要不重复。如果是由脚本自动获取，通常是用户id等唯一标识。
+
+不建议手动修改多账户的JSON字符串，错误的JSON字符串可能会导致脚本运行异常。
+
+### 脏数据
+
+如果因意外情况产生脏数据，导致多账户的签到出现异常，建议将Cookie数据进行删除，重新获取所有账户的Cookie。
+
+例如上述的`tieba_signin_cookie`，出现异常时，应将整个`tieba_signin_cookie`删除，全部重新获取。
+
+## 安全性
+
+JavaScript脚本可以执行非常多的操作，通常来说，在客户端中调用脚本属于高风险行为。您在使用脚本前，务必确认脚本安全可信，如果有条件，应该仔细阅读脚本代码。
+
+特别需要注意：
+
+### 脚本是否含有对外发送请求的操作
+
+如带有Cookie、Token、Password等等可以作为身份凭证的请求，这类请求比较敏感，务必确认请求的目标安全可信。理论上恶意脚本可以利用你的Cookie，进行非常多的行为，如发帖、购物等等。
+
+### 脚本对响应体进行修改
+
+对于修改响应体的脚本，必须确认修改响应体内容可信。通过对Http请求响应体的修改，可以在客户端上显示一些欺诈信息，例如显示一些虚假的中奖信息。
+
+应慎重使用可以由远端控制修改响应体的脚本，此类脚本可能在当初检查时执行的结果是正常的，但是在某个时刻，可由远端控制修改响应内容。
+
+### 加密的脚本
+
+本仓库的脚本源码都完全开放，不加密不混淆，不会将你的信息发送给任何第三方，欢迎进行Code Review。
+
+**出于安全性考虑，不建议使用任何被加密、混淆的脚本。**
+
+如果你在使用青龙面板，由于magic.json内的数据是完全开放不做加密的，并不能防止其他恶意脚本读取magic.json导致信息泄露。所以请务必确保在青龙面板上运行脚本的安全性，本仓库的脚本不会窃取你的数据，但是无法避免第三方恶意脚本，窃取由本仓库的脚本存储/生成的数据。

-关于安全性问题，请访问：[https://github.com/blackmatrix7/ios_rule_script/wiki/脚本的安全性](https://github.com/blackmatrix7/ios_rule_script/wiki/脚本的安全性)
--- a/script/boxjs.json
+++ b/script/boxjs.json
@ -6,24 +6,121 @@
  "repo": "https://github.com/blackmatrix7/ios_rule_script",
  "apps": [
    {
-      "id": "blackmatrix7.bark",
-      "name": "Bark推送",
+      "id": "blackmatrix7.magicjs",
+      "name": "MagicJS",
+      "settings": [
+        {
+          "id": "magic_loglevel",
+          "name": "日志等级",
+          "val": "INFO",
+          "type": "radios",
+          "items": [
+            {
+              "key": "INFO",
+              "label": "INFO"
+            },
+            {
+              "key": "WARNING",
+              "label": "WARNING"
+            },
+            {
+              "key": "ERROR",
+              "label": "ERROR"
+            },
+            {
+              "key": "DEBUG",
+              "label": "DEBUG"
+            },
+            {
+              "key": "SNIFFER",
+              "label": "SNIFFER"
+            }
+          ],
+          "desc": "出现异常时请选择DEBUG提交日志"
+        }
+      ],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/magicjs/images/logo_dark.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/magicjs/images/logo.png"
+      ]
+    },
+    {
+      "id": "blackmatrix7.qinglong",
+      "name": "青龙面板",
      "keys": [
-        "bark_url"
+        "magic_qlurl",
+        "magic_qlclient",
+        "magic_qlsecrt",
+        "magic_qlname",
+        "magic_qlpwd",
+        "magic_qltoken"
      ],
      "settings": [
        {
-          "id": "bark_url",
+          "id": "magic_qlurl",
+          "name": "登录地址",
+          "val": "",
+          "type": "input",
+          "placeholder": "http://qinglong.mydomain.com",
+          "autoGrow": true,
+          "desc": "填写青龙面板的登录地址，如为https请保证证书有效"
+        },
+        {
+          "id": "magic_qlclient",
+          "name": "ClientId",
+          "val": "",
+          "type": "input",
+          "placeholder": "",
+          "autoGrow": true,
+          "desc": "填写青龙面板的ClientId"
+        },
+        {
+          "id": "magic_qlsecrt",
+          "name": "ClientSecret",
+          "val": "",
+          "type": "input",
+          "placeholder": "",
+          "autoGrow": true,
+          "desc": "填写青龙面板的ClientSecret"
+        },
+        {
+          "id": "magic_qltoken",
+          "name": "token",
+          "val": "",
+          "type": "textarea",
+          "placeholder": "",
+          "autoGrow": true,
+          "desc": "登录token，正常情况下不需要填写，自动获取"
+        }
+      ],
+      "author": "@blackmatrix7",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/bilibili",
+      "icons": [
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/magicjs/images/qinglong_dark.png",
+        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/magicjs/images/qinglong.png"
+      ]
+    },
+    {
+      "id": "blackmatrix7.bark",
+      "name": "Bark推送",
+      "keys": [
+        "magic_bark_url"
+      ],
+      "settings": [
+        {
+          "id": "magic_bark_url",
          "name": "Bark推送URL",
          "val": "",
          "type": "input",
          "placeholder": "https://api.day.app/xxxxxxxxxxxxxxxxxx/",
          "autoGrow": true,
-          "desc": "填写Bark推送的链接，脚本通知将通过Bark推送"
+          "desc": "填写Bark推送的链接，脚本通知将通过Bark推送。仅基于MagicJS 3的脚本支持。"
        }
      ],
      "author": "@blackmatrix7",
-      "repo": "https://git.codecolor.cool/matrix/script/bilibili",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/bilibili",
      "icons": [
        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/icon/matrix/dark/bark.jpg",
        "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/icon/matrix/color/bark.jpg"
@ -34,9 +131,7 @@
      "name": "哔哩哔哩去广告",
      "keys": [
        "bilibili_story_aid",
-        "bilibili_feed_black",
-        "bilibili_disable_index_story",
-        "bilibili_enable_mall"
+        "bilibili_feed_black"
      ],
      "settings": [
        {
@ -48,20 +143,6 @@
          "autoGrow": true,
          "rows": 5,
          "desc": "以英文逗号分隔多个号码"
-        },
-        {
-          "id": "bilibili_disable_index_story",
-          "name": "停用首页竖屏播放器",
-          "val": false,
-          "type": "boolean",
-          "desc": "首页推荐竖屏视频转为普通播放器"
-        },
-        {
-          "id": "bilibili_enable_mall",
-          "name": "启用会员购",
-          "val": false,
-          "type": "boolean",
-          "desc": "我的tab-更多服务-添加会员购入口"
        }
      ],
      "author": "@blackmatrix7",
@ -96,7 +177,7 @@
        "eleme_task_keywords"
      ],
      "author": "@blackmatrix7",
-      "repo": "https://git.codecolor.cool/matrix/script/eleme",
+      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/eleme",
      "icons": [
        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/elem.png",
        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/elem.png"
@ -251,7 +332,11 @@
      "name": "什么值得买",
      "keys": [
        "smzdm_cookie",
-        "smzdm_session"
+        "smzdm_session",
+        "smzdm_signin",
+        "smzdm_mission",
+        "smzdm_lottery",
+        "smzdm_sync_qinglong"
      ],
      "author": "@blackmatrix7",
      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/smzdm",
@ -261,12 +346,38 @@
      ],
      "scripts": [
        {
-          "name": "每日自动任务",
-          "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/smzdm/smzdm_mission.js"
+          "name": "执行每日签到与任务",
+          "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/smzdm/smzdm_daily.js"
+        }
+      ],
+      "settings": [
+        {
+          "id": "smzdm_sync_qinglong",
+          "name": "同步Cookie到青龙面板",
+          "val": false,
+          "type": "boolean",
+          "desc": "需先配置好青龙面板登录参数，并确保手机可以访问青龙面板"
        },
        {
-          "name": "每日自动签到",
-          "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/smzdm/smzdm_signin.js"
+          "id": "smzdm_signin",
+          "name": "执行每日签到",
+          "val": true,
+          "type": "boolean",
+          "desc": ""
+        },
+        {
+          "id": "smzdm_mission",
+          "name": "执行每日任务",
+          "val": false,
+          "type": "boolean",
+          "desc": ""
+        },
+        {
+          "id": "smzdm_lottery",
+          "name": "执行每日抽奖",
+          "val": false,
+          "type": "boolean",
+          "desc": ""
        }
      ]
    },
@ -274,7 +385,8 @@
      "id": "blackmatrix7.tieba",
      "name": "百度贴吧",
      "keys": [
-        "tieba_checkin_cookie"
+        "tieba_signin_cookie",
+        "tieba_sync_qinglong"
      ],
      "author": "@blackmatrix7",
      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/tieba",
@ -282,7 +394,25 @@
        "https://raw.githubusercontent.com/Orz-3/mini/master/Alpha/tieba.png",
        "https://raw.githubusercontent.com/Orz-3/mini/master/Color/tieba.png"
      ],
-      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js"
+      "script": "https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js",
+      "settings": [
+        {
+          "id": "tieba_sync_qinglong",
+          "name": "同步Cookie到青龙面板",
+          "val": false,
+          "type": "boolean",
+          "desc": "需先配置好青龙面板登录参数，并确保手机可以访问青龙面板"
+        },
+        {
+          "id": "tieba_signin_cookie",
+          "name": "百度贴吧Cookies",
+          "val": "",
+          "type": "textarea",
+          "placeholder": "推荐由脚本自动获取Cookies，如有特殊情况可手动填写，必须为Json格式",
+          "autoGrow": true,
+          "desc": "多账户Cookies，如出现异常，请删除全部内容，避免直接编辑数据"
+        }
+      ]
    },
    {
      "id": "blackmatrix7.zhihu",
@ -336,7 +466,7 @@
          "name": "显示为盐选会员",
          "val": false,
          "type": "boolean",
-          "desc": "非会员用户显示为盐选会员，仅自己可见，无实际效果"
+          "desc": "非会员用户显示为盐选会员，屏蔽关键词解锁需要开启此功能"
        },
        {
          "id": "zhihu_settings_preset_words",
@ -345,6 +475,13 @@
          "type": "boolean",
          "desc": "屏蔽搜索页中的预置关键词广告"
        },
+        {
+          "id": "zhihu_settings_remove_article",
+          "name": "屏蔽推荐页中的文章",
+          "val": false,
+          "type": "boolean",
+          "desc": "屏蔽推荐页中的文章，默认不启用"
+        },
        {
          "id": "zhihu_settings_blocked_users",
          "name": "黑名单屏蔽效果增强✨",
@ -374,11 +511,11 @@
          "desc": "在知乎回答中提示付费或营销内容"
        },
        {
-          "id": "zhihu_settings_remove_yanxuan",
-          "name": "屏蔽“盐选推荐”❓",
-          "val": true,
+          "id": "zhihu_settings_remove_sections",
+          "name": "移除推荐页顶部项✨",
+          "val": false,
          "type": "boolean",
-          "desc": "屏蔽推荐页中的“盐选推荐”"
+          "desc": "知乎8.3.0有效，仅保留全部和直播，直播无法去除"
        },
        {
          "id": "zhihu_settings_app_conf",
@ -477,35 +614,6 @@
          "placeholder": "",
          "autoGrow": true,
          "desc": "除非无法正常获取Sid，否则保持现在的值，不要修改"
-        },
-        {
-          "id": "magicjs_loglevel",
-          "name": "日志等级",
-          "val": "INFO",
-          "type": "radios",
-          "items": [
-            {
-              "key": "INFO",
-              "label": "INFO"
-            },
-            {
-              "key": "WARNING",
-              "label": "WARNING"
-            },
-            {
-              "key": "ERROR",
-              "label": "ERROR"
-            },
-            {
-              "key": "CRITICAL",
-              "label": "CRITICAL"
-            },
-            {
-              "key": "DEBUG",
-              "label": "DEBUG"
-            }
-          ],
-          "desc": "出现异常时请选择DEBUG提交日志"
        }
      ],
      "author": "@blackmatrix7",
@ -534,40 +642,11 @@
      "author": "@blackmatrix7",
      "repo": "https://github.com/blackmatrix7/ios_rule_script/tree/master/script/applestore",
      "settings": [
-        {
-          "id": "applestore_type",
-          "name": "商店类型",
-          "val": "APPLESTORE",
-          "type": "radios",
-          "items": [
-            {
-              "key": "AppleStore零售店",
-              "label": "INFO"
-            },
-            {
-              "key": "Apple官网",
-              "label": "WARNING"
-            },
-            {
-              "key": "ERROR",
-              "label": "ERROR"
-            },
-            {
-              "key": "CRITICAL",
-              "label": "CRITICAL"
-            },
-            {
-              "key": "DEBUG",
-              "label": "DEBUG"
-            }
-          ],
-          "desc": "出现异常时请选择DEBUG提交日志"
-        },
        {
          "id": "goods_model",
          "name": "商品型号",
          "val": "",
-          "type": "input",
+          "type": "textarea",
          "placeholder": "Z0YQ#MKMR3CH/A,MJXA3FE/A#AppleWatch 7 石墨色不锈钢;MLDE3CH/A",
          "autoGrow": true,
          "desc": "需要监控的商品型号，option用#分隔，自定义名称在option后以#分隔。多款以;分隔，移动端建议只监控一个。"
@ -581,46 +660,12 @@
          "autoGrow": true,
          "desc": "直辖市示例：北京 北京 昌平区"
        },
-        {
-          "id": "applestore_bark_url",
-          "name": "Bark推送",
-          "val": "",
-          "type": "input",
-          "placeholder": "https://api.day.app/VXTWvaQ18N29bsQAg7DgkT",
-          "autoGrow": true,
-          "desc": "使用Bark推送到其他设备，比如iPad执行监控，推送结果到iPhone"
-        },
        {
          "id": "applestore_settings_notify_soldout",
          "name": "查询无货也进行通知",
          "val": false,
          "type": "boolean",
          "desc": "可能会发起大量推送，建议仅在测试时开启"
-        },
-        {
-          "id": "magicjs_loglevel",
-          "name": "日志等级",
-          "val": "INFO",
-          "type": "radios",
-          "items": [
-            {
-              "key": "INFO",
-              "label": "INFO"
-            },
-            {
-              "key": "WARNING",
-              "label": "WARNING"
-            },
-            {
-              "key": "ERROR",
-              "label": "ERROR"
-            },
-            {
-              "key": "DEBUG",
-              "label": "DEBUG"
-            }
-          ],
-          "desc": "出现异常时请选择DEBUG提交日志"
        }
      ],
      "icons": [
--- a/script/magicjs/images/logo.png
+++ b/script/magicjs/images/logo.png
--- a/script/magicjs/images/logo_dark.png
+++ b/script/magicjs/images/logo_dark.png
--- a/script/magicjs/images/qinglong.png
+++ b/script/magicjs/images/qinglong.png
--- a/script/magicjs/images/qinglong_dark.png
+++ b/script/magicjs/images/qinglong_dark.png
--- a/script/tieba/README.md
+++ b/script/tieba/README.md
@ -1,18 +1,8 @@
-# 百度贴吧签到
+# 🧸 百度贴吧签到

 ## 前言

-参考 https://github.com/NobyDa/Script/tree/master/BDTieBa-DailyBonus 做了彻底的重写。
-
-做如下改动：
-
-1. 精简合并通知
-
-   只显示签到贴吧总数、成功数量、失败数量，签到明细只会显示失败的，因为我并不关心哪些贴吧签到成功。
-
-2. 增加重试机制
-
-   针对签到失败的贴吧，进行10次，每次间隔2秒的重试，可以极大提高签到成功率。
+百度贴吧多账户自动签到，支持青龙面板。


 ## 配置
@ -21,38 +11,55 @@

 使用模块

-Surge在获取Cookie时，需要在MITM中设置h2=false，即关闭 MITM over HTTP/2，否则会提示获取Cookie出现异常。
-
-建议在获取Cookie时临时关闭，获取成功后再开启，或者等待客户端修复。
-
 ```ini
-https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.sgmodule
+https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.sgmodule
 ```

 ### Quantumult X

 ```ini
 [rewrite_remote]
-https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.qxrewrite, tag=贴吧_获取Cookie, update-interval=86400, opt-parser=false, enabled=true
+https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.qxrewrite, tag=贴吧_获取Cookie, update-interval=86400, opt-parser=false, enabled=true

 [task_local]
-30 9 * * *  https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js, tag=贴吧_每日签到, enabled=true
+30 10 * * *  https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js, tag=贴吧_每日签到, enabled=true
 ```

 ### Loon

-使用插件
+安装插件

 ```ini
-[Remote Script]
-https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.lnplugin, tag=贴吧_每日签到, enabled=true
+https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.lnplugin
+```
+
+### 青龙面板
+
+订阅单文件
+
+```ini
+https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js
 ```

 ## 获取Cookie

 关闭贴吧后台，重新进入一次贴吧即可。

-![](https://github.com/blackmatrix7/ios_rule_script/blob/master/script/tieba/images/03.jpg?raw=true)
+![](https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/images/03.jpg)
+
+## 多账户
+
+全新的百度贴吧签到脚本，原生提供了多账户签到的支持。
+
+**获取多账户Cookies的办法**：
+
+你需要做的仅仅是在百度贴吧客户端中，选择“我的”，点击右上角的设置图标，进入“我的账户”，切换不同的账号。
+
+每切换一个账号，需要重启一次贴吧客户端，让脚本自动获取Cookie。
+
+随着贴吧客户端更新，上述操作方式可能会有变化，但整体大同小异，跟日常切换多账户一样就可以了。
+
+*理论上，你可以执行无限多的账号签到，只要签到脚本执行不会超时。*

 ## 签到

@ -60,65 +67,19 @@ https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tie

 全部签到成功时：

-![](https://github.com/blackmatrix7/ios_rule_script/blob/master/script/tieba/images/01.jpg?raw=true)
+![](https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/images/01.jpg)

 部分贴吧签到失败时：

-![](https://github.com/blackmatrix7/ios_rule_script/blob/master/script/tieba/images/02.jpg?raw=true)
+![](https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/images/02.jpg)

-## 统一推送
+## 脚本变量

-MagicJS利用Bark，实现了跨设备的统一推送能力，将多个iOS设备的脚本执行结果，统一推送到一个设备上。
+当前脚本使用的变量，你可以根据这些Key，在magic.json中配置数据。

-执行效果图，以饿了么为例：
+| 名称                | 类型 | 作用                            |
+| ------------------- | ---- | ------------------------------- |
+| tieba_signin_cookie | json | 存储多账号的Cookies             |
+| tieba_sync_qinglong | bool | 判断是否将Cookies同步到青龙面板 |

-![](https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/eleme/images/bark.jpg)

-### 开启统一推送
-
-你需要安装Bark这个APP，打开后可以得到类似这样的链接：
-
-```http
-https://api.day.app/VXTWvaQ18N29bsQAg7DgkT
-```
-
-在Surge、Loon、QuantumultX中执行以下代码，将链接写入(如何执行代码请自己动手解决)。
-
-**Surge、Loon**
-
-```javascript
-# 开启所有脚本统一推送
-$persistentStore.write("https://api.day.app/VXTWvaQ18N29bsQAg7DgkT", "magicjs_unified_push_url");
-```
-
-**Quantumult X**
-
-```javascript
-# 开启所有脚本统一推送
-$prefs.setValueForKey("https://api.day.app/VXTWvaQ18N29bsQAg7DgkT", "magicjs_unified_push_url");
-```
-
-### 关闭统一推送
-
-**Surge、Loon**
-
-```javascript
-# 关闭所有脚本统一推送
-$persistentStore.write("", "magicjs_unified_push_url");
-```
-
-**Quantumult X**
-
-```javascript
-# 关闭所有脚本统一推送
-$prefs.setValueForKey("", "magicjs_unified_push_url");
-```
-
-### 其他
-
-1. 统一推送能力仅对支持的脚本有效。
-2. 开启统一推送后，所有支持统一推送的脚本，都会把通知推送到目标设备上。
-3. 限于Bark的功能，统一推送中的多媒体和链接不可用。
-4. 统一推送需要使用Bark的服务器，推送成功与否，与Bark服务器的可用性有关。
-5. 统一推送不会关闭APP的本地推送，即两个iOS设备都会有推送。
-6. 如有隐私考虑，可以参考Bark的服务端文档，自建服务端。
--- a/script/tieba/images/01.jpg
+++ b/script/tieba/images/01.jpg
--- a/script/tieba/images/02.jpg
+++ b/script/tieba/images/02.jpg
--- a/script/tieba/images/03.jpg
+++ b/script/tieba/images/03.jpg
--- a/script/tieba/images/04.jpg
+++ b/script/tieba/images/04.jpg
--- a/script/tieba/images/05.jpg
+++ b/script/tieba/images/05.jpg
--- a/script/tieba/images/06.jpg
+++ b/script/tieba/images/06.jpg
--- a/script/tieba/tieba_checkin.js
+++ b/script/tieba/tieba_checkin.js
--- a/script/tieba/tieba_signin.js
+++ b/script/tieba/tieba_signin.js
--- a/script/tieba/tieba_checkin.lnplugin
+++ b/script/tieba/tieba_checkin.lnplugin
@ -6,10 +6,10 @@
 #!icon= https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba.png

 [Script]
-http-request ^https?:\/\/(c\.tieba\.baidu\.com|180\.97\.\d+\.\d+)\/c\/s\/login script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js,tag=贴吧_获取Cookie1
-http-request ^https?:\/\/c\.tieba\.baidu\.com\/c\/s\/channelIconConfig script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js,tag=贴吧_新版Cookie2
-http-request ^https?:\/\/tiebac\.baidu\.com\/c\/u\/follow\/getFoldedMessageUserInfo script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js,tag=贴吧_新版Cookie3
-cron "30 9 * * *" script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js,timeout=60,tag=贴吧_每日签到
+http-request ^https?:\/\/(c\.tieba\.baidu\.com|180\.97\.\d+\.\d+)\/c\/s\/login script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js,tag=贴吧_获取Cookie1
+http-request ^https?:\/\/c\.tieba\.baidu\.com\/c\/s\/channelIconConfig script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js,tag=贴吧_新版Cookie2
+http-request ^https?:\/\/tiebac\.baidu\.com\/c\/u\/follow\/getFoldedMessageUserInfo script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js,tag=贴吧_新版Cookie3
+cron "30 9 * * *" script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js,timeout=60,tag=贴吧_每日签到

 [MITM]
 hostname = c.tieba.baidu.com, tiebac.baidu.com
--- a/script/tieba/tieba_checkin.qxrewrite
+++ b/script/tieba/tieba_checkin.qxrewrite
@ -1,7 +1,7 @@
 # 百度贴吧每日自动签到

-^https?:\/\/(c\.tieba\.baidu\.com|180\.97\.\d+\.\d+)\/c\/s\/login url script-request-header https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js
-^https?:\/\/c\.tieba\.baidu\.com\/c\/s\/channelIconConfig url script-request-header https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js
-^https?:\/\/tiebac\.baidu\.com\/c\/u\/follow\/getFoldedMessageUserInfo url script-request-header https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js
+^https?:\/\/(c\.tieba\.baidu\.com|180\.97\.\d+\.\d+)\/c\/s\/login url script-request-header https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js
+^https?:\/\/c\.tieba\.baidu\.com\/c\/s\/channelIconConfig url script-request-header https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js
+^https?:\/\/tiebac\.baidu\.com\/c\/u\/follow\/getFoldedMessageUserInfo url script-request-header https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js

-hostname = c.tieba.baidu.com, tiebac.baidu.com
+hostname = c.tieba.baidu.com
--- a/script/tieba/tieba_checkin.sgmodule
+++ b/script/tieba/tieba_checkin.sgmodule
@ -3,10 +3,10 @@
 #!system=ios

 [Script]
-贴吧_每日签到 = type=cron,cronexp=30 9 * * *,timeout=60,script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js
-贴吧_获取cookie1 = type=http-request,pattern=^https?:\/\/(c\.tieba\.baidu\.com|180\.97\.\d+\.\d+)\/c\/s\/login,script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js
-贴吧_获取cookie2 = type=http-request,pattern=^https?:\/\/c\.tieba\.baidu\.com\/c\/s\/channelIconConfig,script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js
-贴吧_获取cookie3 = type=http-request,pattern=^https?:\/\/tiebac\.baidu\.com\/c\/u\/follow\/getFoldedMessageUserInfo,script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_checkin.js
+贴吧_每日签到 = type=cron,cronexp=30 9 * * *,timeout=60,script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js
+贴吧_获取cookie1 = type=http-request,pattern=^https?:\/\/(c\.tieba\.baidu\.com|180\.97\.\d+\.\d+)\/c\/s\/login,script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js
+贴吧_获取cookie2 = type=http-request,pattern=^https?:\/\/c\.tieba\.baidu\.com\/c\/s\/channelIconConfig,script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js
+贴吧_获取cookie3 = type=http-request,pattern=^https?:\/\/tiebac\.baidu\.com\/c\/u\/follow\/getFoldedMessageUserInfo,script-path=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/script/tieba/tieba_signin.js

 [MITM] 
 hostname = %APPEND% c.tieba.baidu.com, tiebac.baidu.com