docs: 更新CHANGELOG

feat: 每组显示动态转发数(#97 )
feat: 推送携带帐号编号(#98 )
2026-07-22 21:13:47 +08:00 · 2021-12-23 15:28:01 +08:00 · 2021-12-23 15:19:07 +08:00 · 2021-12-23 14:54:02 +08:00 · 2021-12-23 14:42:46 +08:00 · 2021-12-14 16:54:25 +08:00
28 changed files with 1085 additions and 477 deletions
@@ -1,4 +1,4 @@
 **/**
 !lib/
-!package*
+!package.json
 !main.js
@@ -60,9 +60,11 @@ body:
    attributes:
      label: "运行日志"
      description: |
-        控制台日志。
+        控制台日志,请用md代码格式上传,日志内容过多时请上传文件
      placeholder: |
+        ```
        请在此黏贴运行日志。
+        ```

  - id: system
    type: input
@@ -6,35 +6,23 @@ on:
      - main
    paths:
      - "lib/**"
-      - "main.js"
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "lib/**"
-      - "main.js"
+      - "*.js"
+      - "*.json"
  workflow_dispatch:

 jobs:
-  path-context:
+  docker:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
+      - name: Build and push
+        env:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: shanmite/lottery_auto_docker:latest
+          repo: ${{ secrets.DOCKERHUB_REPO }}
+        run: |
+          curl -fsSL https://get.docker.com | bash -s docker
+          docker build -t $repo .
+          docker login -p $password -u $username
+          docker push $repo
@@ -1,23 +1,18 @@
 name: "Package Node.js project into an executable"
+
 on:
  push:
    branches:
      - main
    paths:
      - "lib/**"
-      - "main.js"
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "lib/**"
-      - "main.js"
+      - "*.js"
+      - "*.json"
  workflow_dispatch:
-    branches:
-      - main
+
 jobs:
-  pkg_x64:
-    runs-on: windows-latest
+  build_all:
+    runs-on: ubuntu-latest
    steps:
      - name: "Checkout codes"
        uses: actions/checkout@v2
@@ -27,56 +22,20 @@ jobs:
          node-version: "16"
      - name: "Pkg this"
        run: |
+          sudo apt install zip unzip
          npm install
-          npm run pkg_x64
-      - name: "Upload to artifact(win)"
+          npm run build_all
+      - name: "Upload to artifact"
        uses: actions/upload-artifact@v2
        with:
-          name: nlts-win-x64
-          path: dist/nlts-win-x64/
-      - name: "Upload to artifact(linux)"
-        uses: actions/upload-artifact@v2
+          name: all_platform
+          path: dist/
+      - name: "Upload to release draft"
+        uses: xresloader/upload-to-github-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
        with:
-          name: nlts-linux-x64
-          path: dist/nlts-linux-x64/
-      - name: "Upload to artifact(macos)"
-        uses: actions/upload-artifact@v2
-        with:
-          name: nlts-macos-x64
-          path: dist/nlts-macos-x64/
-  # pkg_arm64:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: "Checkout codes"
-  #       uses: actions/checkout@v2
-  #     - name: "Use Node.js"
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: "16"
-  #     - name: "Pkg this"
-  #       run: |
-  #         npm install
-  #         npm run pkg_arm64
-  #     - name: "Upload to artifact"
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: nlts-linux-arm64
-  #         path: dist/
-  # pkg_armv7:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: "Checkout codes"
-  #       uses: actions/checkout@v2
-  #     - name: "Use Node.js"
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: "16"
-  #     - name: "Pkg this"
-  #       run: |
-  #         npm install
-  #         npm run pkg_armv7
-  #     - name: "Upload to artifact"
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: nlts-linux-armv7
-  #         path: dist/
+          file: "dist/*.zip"
+          delete_file: "dist/*.zip"
+          tag_name: "v2"
+          overwrite: true
@@ -3,6 +3,8 @@ node_modules/
 tests/
 dyids/
 dist/
+.env
+*.log
 package-lock.json
 env.js
 my_config.js
@@ -1,5 +1,128 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.4.5)
+* ef969bb feat: 每组显示动态转发数(#97)
+* 0cbacd6 feat: 推送携带帐号编号(#98)
+* da75c8c feat: 增加设置屏蔽动态类型`block_dynamic_type`(#99)
+* 548ad4b fix: pushplus更新域名(#93)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.4)
+* c486abf fix: 黑名单不起作用(#92)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.3)
+* aba17ed feat: 提示关键词修改建议
+* 5a23043 feat: 只通过是否点赞判断时点赞
+* 76f7152 fix: 黑名单匹配(#90)
+* 0d4185d fix(Searcher): getLotteryInfoByUID(#89)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.2)
+* 20c423f fix: "公共黑名单"显示错误(#87)
+* 6851f29 fix: 描述中出现undefined(#88)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.1)
+* 0ba6ace feat: check_if_duplicated可同时使用多种方式
+* dd99426 fix: 只转已关注功能失效
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.0)
+* 01562b6 ci: verison升级时小版本号归0
+* 90ac347 docs: 更新README
+* 3cf3939 feat: 新增设置`check_if_duplicated`
+* d0a8aa9 feat: metainfo显示nodejs版本号
+* 10db52f fix: 完善错误延时重试(#82)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.3.9)
+* b36c555 ci: auto gen changelog
+* 7338e09 feat: 更新`notice_key_words`
+* 80a54e8 ci: `*.exe` `latest_version0`
+* 1a62914 feat: 新增设置`is_outof_maxfollow`(#80)
+* 449c8d9 docs: update README
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.3.8)
+* 313942a ci: pkg.yml tag_name
+* 66efd62 feat: 新增设置`use_public_blacklist`
+* d7cf742 feat: 增加粉丝数查询第三方接口
+* 094e019 fix: 二级转发带有效抽奖
+* 8de7453 fix: description获取不到
+* 70c10f2 fix: 更改默认设置`key_words` `blockword`
+* 2f26a39 feat: 源uid参与筛选判断
+## 较上一版本变化
+* 变更可执行文件
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.3.7...v2.3.8
+
+## 主要变化(2.3.7)
+* 50e18e2 feat: 下载更新时有多个版本
+* b9c73bd chore: change docker auto build
+* 608b1fb pref: 增加筛选时日志输出(#79)
+* 07ef8df chore: 移植并完善自动化构建脚本
+* 6b09e26 chore: update docker init.sh
+* 7babd57 docs: about docker
+* 8b57a85 chore: pkg build
+## 较上一版本变化
+* 变更可执行文件
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.3.6...v2.3.7
+
+## 主要变化(2.3.6)
+* eae72db feat: minfollower填0可关闭本地粉丝数筛选
+* 111602f perf: 日志显示是否转发过
+* d366e25 fix:  转发动态时非限制性错误码(#72)
+## 较上一版本变化
+* 变更可执行文件
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.3.5...v2.3.6
+
+## 主要变化(2.3.5)
+* 8c0d96a refactor: 检测是否已经发送过随机动态(#71)
+* 09b6db4 feat: 新增设置`check_session_pages`(#66)
+## 较上一版本变化
+* 变更可执行文件
+* [my_config.js](my_config.example.js)增加
+  - `check_session_pages` - 检查私信页数
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.3.4...v2.3.5
+
+## 主要变化(2.3.4)
+* 1962d97 fix: 过滤专栏时间失效(#67)
+## 较上一版本变化
+只变更可执行文件
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.3.2...v2.3.4
+
+## 主要变化(2.3.3)
+* 11625b3 feat: 检索专栏时能够根据发布时间进行过滤(#65)
+* 8c7a6d1 fix: 多帐号设置未更新
+## 较上一版本变化
+[my_config.js](my_config.example.js)增加
+* `article_create_time` - 专栏创建时间距离现在的最大天数
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.3.2...v.2.3.3

 ## 主要变化(2.3.2)

@@ -1,13 +1,10 @@
-# Latest Nodejs + Alpine Linux
 FROM node:lts-alpine

-MAINTAINER [email protected]
-
-LABEL version="1.0" description="自动参与B站动态抽奖"
+LABEL author="shanmite" version="1.1" description="自动参与B站动态抽奖"

 WORKDIR /lottery

-COPY ["package.json", "package*.json", "./"]
+COPY ["package.json", "./"]

 RUN npm install

@@ -9,7 +9,7 @@
        - [Windows](#windows)
        - [Linux](#linux)
    - [Docker](#docker)
-  - [防重复转发](#防重复转发)
+  - [防重复转发(可选)](#防重复转发可选)
  - [检测中奖](#检测中奖)
    - [检测未读信息, 已读未读信息](#检测未读信息-已读未读信息)
    - [中奖推送(可选)](#中奖推送可选)
@@ -201,7 +201,7 @@ npm i && npm run clear
 1.初始化

 ```bash
-curl -fsSL https://cdn.staticaly.com/gh/shanmiteko/LotteryAutoScript/main/script/docker/init.sh | sh
+curl -fsSL https://cdn.staticaly.com/gh/shanmiteko/LotteryAutoScript/main/script/docker/init.sh | sudo sh
 ```

 进入`lottery`文件夹
@@ -215,39 +215,36 @@ cd lottery
 - env.js 设置必要环境变量
 - my_config.js 你的设置

-执行相应的脚本
-> start,check,clear
-
-例如:
-
-```bash
-./start.sh
+2.执行相应的脚本
+```
+$ tree
+.
+├── check.sh
+├── clear.sh
+├── debug.sh 进入临时容器查看内容
+├── env.js
+├── my_config.js
+├── new_env.js
+├── new_my_config.js
+├── remove_all.sh 移除对应docker镜像和所有相关容器
+└── start.sh 
 ```

-2.更新
+[![asciicast](https://asciinema.org/a/453237.svg)](https://asciinema.org/a/453237)
+
+3.更新

 进入lottery上一级目录

 使用与初始化相同的命令

-3.卸载
-
-进入lottery上一级目录
-
-```bash
-docker image rm -f shanmite/lottery_auto_docker
-rm -rf lottery/
-```
-
 ----------------------------------------

-## 防重复转发
+## 防重复转发(可选)

-~~存储在专栏草稿~~
+- 脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中

-~~脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中~~
-
-是否点赞
+- 是否点赞

 ----------------------------------------

@@ -6,11 +6,12 @@ const bili = require('./net/bili')

 /**
 * 是否中奖
+ * @param {number} num
 */
-async function isMe() {
+async function isMe(num) {
    let desp = '';
    const
-        { notice_key_words, update_session_wait, get_session_wait } = config,
+        { notice_key_words, update_session_wait, get_session_wait, check_session_pages } = config,
        UnreadAtNum = await bili.getUnreadAtNum(),
        UnreadSessionNum = await bili.getUnreadSessionNum(),
        { follow_unread, unfollow_unread } = UnreadSessionNum || { unfollow_unread: 0, follow_unread: 0 };
@@ -23,7 +24,7 @@ async function isMe() {
            desp += '----------------------------------------------------------------\n\n'
            desp += `发生时间: ${new Date(at_time * 1000).toLocaleString()}\n\n`
            desp += `用户: ${up_uname}\n\n`
-            desp += `在${business}中@了你(${global_var.get("myUID")})\n\n`
+            desp += `在${business}中@了你(https://space.bilibili.com/${global_var.get("myUID")})\n\n`
            desp += `原内容为: ${source_content}\n\n`
            desp += `[直达链接](${url})\n\n`
            desp += '----------------------------------------------------------------\n\n'
@@ -34,6 +35,7 @@ async function isMe() {
        const check = async (type) => {
            let session_t = '';
            let MySession = await bili.getSessionInfo(type)
+            log.info("准备检查私信", check_session_pages + "页")
            for (const index of infiniteNumber()) {
                for (const Session of MySession.data) {
                    const { sender_uid, session_ts, timestamp, unread_count, talker_id, msg_seqno } = Session;
@@ -45,7 +47,7 @@ async function isMe() {
                            desp += '----------------------------------------------------------------\n\n'
                            desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}\n\n`
                            desp += `用户: ${sender_uid}\n\n`
-                            desp += `私信你(${global_var.get("myUID")})说:\n${content}\n\n`
+                            desp += `私信你(https://space.bilibili.com/${global_var.get("myUID")})说:\n${content}\n\n`
                            desp += `[直达链接](https://message.bilibili.com/#/whisper/mid${sender_uid})\n\n`
                            desp += '----------------------------------------------------------------\n\n'
                        }
@@ -53,7 +55,7 @@ async function isMe() {
                        await delay(update_session_wait);
                    }
                }
-                if (MySession.has_more && index < 16) {
+                if (MySession.has_more && index < check_session_pages) {
                    await delay(get_session_wait);
                    MySession = await bili.getSessionInfo(type, session_t)
                } else {
@@ -74,7 +76,7 @@ async function isMe() {
    if (desp) {
        desp += '中奖了别忘给脚本(https://github.com/shanmiteko/LotteryAutoScript)点一个Star哦, 赞助一两块也不是不可以‍‍‍_(:з」∠)_\n\n'
        log.info('可能中奖了', desp);
-        await sendNotify('可能中奖了', desp);
+        await sendNotify(`帐号${num}可能中奖了`, desp);
    } else {
        log.info('中奖检测', "暂未中奖");
    }
@@ -1,4 +1,4 @@
-const { log, hasEnv, shuffle, getRandomOne, delay, try_for_each } = require('../utils');
+const { log, hasEnv, shuffle, getRandomOne, delay, try_for_each, retryfn } = require('../utils');
 const { send } = require('../net/http');
 const bili = require('../net/bili');
 const { sendNotify } = require('../helper/notify');
@@ -7,6 +7,7 @@ const { randomDynamic } = require('../helper/randomDynamic')
 const { Searcher } = require('./searcher');
 const global_var = require("../data/global_var");
 const config = require("../data/config");
+const d_storage = require('../helper/d_storage');

 /**
 * 监视器
@@ -49,13 +50,16 @@ class Monitor extends Searcher {
            case 0:
                event_bus.emit('Turn_on_the_Monitor')
                break;
-            case 11:
+            case 1001:
                event_bus.emit('Turn_off_the_Monitor', '评论失败')
-                break
-            case 21:
+                break;
+            case 2001:
                event_bus.emit('Turn_off_the_Monitor', '关注出错')
-                break
-            case 22:
+                break;
+            case 3001:
+                event_bus.emit('Turn_off_the_Monitor', '分区移动出错')
+                break;
+            case 2004:
                log.warn('账号异常', `UID(${global_var.get('myUID')})异常号只会对部分UP出现关注异常`)
                if (!config.is_exception) {
                    await sendNotify('[动态抽奖]账号异常通知', `UID: ${global_var.get('myUID')}\n\n异常号只会对部分UP出现关注异常\n\n可在设置中令is_exception为true关闭此推送`)
@@ -63,17 +67,26 @@ class Monitor extends Searcher {
                config.is_exception = true;
                event_bus.emit('Turn_on_the_Monitor')
                break
-            case 31:
+            case 2005:
+                log.warn('关注已达上限', `UID(${global_var.get('myUID')})关注已达上限,已临时进入只转已关注模式`)
+                if (!config.is_outof_maxfollow) {
+                    await sendNotify('[动态抽奖]关注已达上限', `UID: ${global_var.get('myUID')}\n\n关注已达上限,已临时进入只转已关注模式\n\n可在设置中令is_outof_maxfollow为true关闭此推送`)
+                }
+                config.is_outof_maxfollow = true;
+                config.only_followed = true;
+                event_bus.emit('Turn_on_the_Monitor')
+                break
+            case 5001:
                event_bus.emit('Turn_off_the_Monitor', '转发失败')
                break
-            case 41:
+            case 6001:
                event_bus.emit('Turn_off_the_Monitor', '获取开奖时间失败')
                break
-            case 51:
+            case 7001:
                event_bus.emit('Turn_off_the_Monitor', '获取关注数失败')
                break
            default:
-                event_bus.emit('Turn_off_the_Monitor', '未知错误')
+                event_bus.emit('Turn_off_the_Monitor', '??? 未知错误')
                break;
        }
    }
@@ -89,35 +102,57 @@ class Monitor extends Searcher {
        log.info('筛选动态', `筛选完毕(${len})`);

        if (len) {
-            let is_exception = false;
-            for (const [index, Lottery] of shuffle(allLottery).entries()) {
-                let status = 0;
+            let
+                status = 0,
+                is_exception = 0,
+                is_outof_maxfollow = 0,
+                relayed_nums = 0;
+            for (const [index, lottery] of shuffle(allLottery).entries()) {
+                let is_shutdown = false;
+                if (
+                    is_outof_maxfollow
+                    && lottery.uid.length
+                    && (new RegExp(lottery.uid.join('|'))).test(this.attentionList)
+                ) {
+                    log.info('过滤', `已关注(${lottery.uid.join(',')})`)
+                    continue
+                }

-                if (Lottery.isOfficialLottery) {
-                    let { ts } = await bili.getLotteryNotice(Lottery.dyid);
+                if (lottery.isOfficialLottery) {
+                    let { ts } = await bili.getLotteryNotice(lottery.dyid);
                    const ts_10 = Date.now() / 1000;
                    if (ts < 0) {
-                        return 41
+                        status = 6001
+                        break;
                    }
                    if (ts < ts_10) {
                        log.info('过滤', '已过开奖时间')
+                        d_storage.updateDyid(lottery.dyid)
                        await delay(filter_wait)
                        continue
                    }
                    if (ts > ts_10 + config.maxday * 86400) {
                        log.info('过滤', '超过指定开奖时间')
+                        d_storage.updateDyid(lottery.dyid)
                        await delay(filter_wait)
                        continue
                    }
-                } else if (Lottery.uid[0]) {
-                    const followerNum = await bili.getUserInfo(Lottery.uid[0]);
-                    if (followerNum < 0) {
-                        return 51
-                    }
-                    if (followerNum < config.minfollower) {
-                        log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
-                        await delay(filter_wait)
-                        continue
+                } else if (lottery.uid[0]) {
+                    const { minfollower } = config
+                    if (minfollower > 0) {
+                        const followerNum = await bili.getUserInfo(lottery.uid[0]);
+                        if (followerNum < 0) {
+                            status = 7001
+                            break;
+                        }
+                        if (followerNum < minfollower) {
+                            log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
+                            d_storage.updateDyid(lottery.dyid)
+                            await delay(filter_wait)
+                            continue
+                        }
+                    } else {
+                        log.info('过滤', "不过滤粉丝数")
                    }
                }

@@ -130,27 +165,50 @@ class Monitor extends Searcher {
                    randomDynamic(number)
                }

-                status = await this.go(Lottery)
+                status = await this.go(lottery)
                switch (status) {
                    case 0:
-                    case 9:
-                    case 19:
+                        relayed_nums += 1
                        break;
-                    case 22:
-                        is_exception = true
+                    case 1002:
+                    case 1003:
+                    case 1004:
+                    case 1005:
+                    case 1006:
+                    case 1007:
+                    case 2002:
+                    case 2003:
+                    case 4001:
+                    case 4002:
+                    case 4003:
+                    case 5002:
+                    case 5003:
+                    case 5004:
+                        break;
+                    case 2004:
+                        is_exception = 2004
+                        break;
+                    case 2005:
+                        is_outof_maxfollow = 2005
+                        break;
+                    case 1001:
+                    case 2001:
+                    case 3001:
+                    case 5001:
+                        is_shutdown = true
                        break;
-                    default:
-                        return status
                }

+                if (is_shutdown) break
+
+                d_storage.updateDyid(lottery.dyid)
+
                await delay(wait * (Math.random() + 0.5));
            }
-            log.info('抽奖', '开始转发下一组动态');
-            if (is_exception) {
-                return 22
-            } else {
-                return 0
-            }
+            log.info('抽奖', `本轮共转发${relayed_nums}条`);
+            return is_exception
+                || is_outof_maxfollow
+                || status
        } else {
            log.info('抽奖', '无未转发抽奖');
            return 0
@@ -183,12 +241,10 @@ class Monitor extends Searcher {

        log.info('筛选动态', `开始筛选(${protoLotteryInfo.length})`);

-        log.debug('未进行筛选的动态信息', protoLotteryInfo);
-
        /** 所有抽奖信息 */
        let alllotteryinfo = [];
        const
-            { set_lottery_info_url, key_words, model, chatmodel, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist } = config,
+            { check_if_duplicated, set_lottery_info_url, key_words, model, chatmodel, block_dynamic_type, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist, use_public_blacklist } = config,
            now_ts = Date.now() / 1000;

        /**
@@ -205,7 +261,21 @@ class Monitor extends Searcher {
            return true
        });

-        if (lottery_param[0] !== "APIs" && set_lottery_info_url) {
+        log.info('筛选动态', `去重后(${protoLotteryInfo.length})`);
+
+        /**并发查询dyid */
+        if (check_if_duplicated === 1 || check_if_duplicated === 2) {
+            await Promise.all(
+                [...dyids_map.keys()]
+                    .map(it => d_storage
+                        .searchDyid(it)
+                        .then(hasIt => dyids_map.set(it, hasIt))
+                    )
+            )
+            log.info('筛选动态', `并发查询本地dyid完毕`);
+        }
+
+        if (lottery_param[0] !== "APIs" && set_lottery_info_url && protoLotteryInfo.length) {
            log.info("上传抽奖信息", "开始")
            await new Promise((resolve) => {
                send({
@@ -228,51 +298,107 @@ class Monitor extends Searcher {
        }

        /* 检查动态是否满足要求 */
-        await try_for_each(protoLotteryInfo, async function ({
-            lottery_info_type, is_liked,
-            uids, uname, dyid, create_time,
-            ctrl, rid, des, type,
-            hasOfficialLottery
-        }) {
+        await try_for_each(protoLotteryInfo, async function (lottery_info) {
+            const {
+                lottery_info_type, is_liked,
+                uids, uname, dyid, create_time,
+                ctrl, rid, des, type,
+                hasOfficialLottery
+            } = lottery_info;
+
+            log.debug('正在筛选的动态信息', lottery_info);
+
            /* 遇到转发过就退出 */
-            if (is_liked) return false;
+            if (
+                ((!check_if_duplicated || check_if_duplicated === 2)
+                    && is_liked)
+                || ((check_if_duplicated === 1 || check_if_duplicated === 2)
+                    && dyids_map.get(dyid))
+            ) {
+                log.info("筛选动态", `已转发(https://t.bilibili.com/${dyid})`)
+                return false
+            }

            /* 超过指定时间退出 */
-            if (now_ts - create_time > max_create_time * 86400) return false;
+            if (now_ts - create_time > max_create_time * 86400) {
+                log.info("筛选动态", `过时动态(https://t.bilibili.com/${dyid})`)
+                return false
+            }

            const
-                /**判断是转发源动态还是现动态 */
-                uid = lottery_info_type === 'uid' ? uids[1] : uids[0],
-                isFollowed = (new RegExp(uid)).test(attentionList),
-                description = typeof des === 'string' ? des : '',
+                [m_uid, ori_uid] = uids,
+                mIsFollowed = !m_uid || (new RegExp(m_uid)).test(attentionList),
+                oriIsFollowed = !ori_uid || (new RegExp(ori_uid)).test(attentionList),
+                /**判断是转发源动态还是现动态 实际发奖人*/
+                [real_uid, realIsFollowed] = lottery_info_type === 'uid'
+                    ? [ori_uid, oriIsFollowed]
+                    : [m_uid, mIsFollowed],
+                description = des.split(/\/\/@.*?:/)[0],
                needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description),
                needTopic = [...new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#|(?<=[带加上])#.+?#(?=话题|tag)/ig) || [])].join(' '),
                isRelayDynamic = type === 1,
-                isTwoLevelDynamic = /\/\/@/.test(description),
                has_key_words = key_words.every(it => new RegExp(it).test(description)),
                isBlock = new RegExp(blockword.join('|')).test(description),
                isLottery =
                    (is_imitator && lottery_info_type === 'uid' && model !== '00')
                    || (hasOfficialLottery && model[0] === '1')
-                    || (!hasOfficialLottery && model[1] === '1' && !isTwoLevelDynamic && has_key_words),
+                    || (!hasOfficialLottery && model[1] === '1' && has_key_words),
                isSendChat =
                    (is_imitator && lottery_info_type === 'uid' && chatmodel !== '00')
                    || (hasOfficialLottery && chatmodel[0] === '1')
-                    || (!hasOfficialLottery && chatmodel[1] === '1');
+                    || (!hasOfficialLottery && chatmodel[1] === '1'),
+                { blacklist: remote_blacklist } = use_public_blacklist === false
+                    ? { blacklist: "" }
+                    : global_var.get("remoteconfig"),
+                /**
+                 * 获取黑名单并去重合并
+                 * @type {string[]}
+                 */
+                new_blacklist = remote_blacklist
+                    ? [
+                        ...new Set([...blacklist.split(','),
+                        ...remote_blacklist.split(',')])
+                    ]
+                    : blacklist.split(','),
+                keys = [dyid, m_uid, ori_uid];
+
+            log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, type, isRelayDynamic, key_words, has_key_words, blockword, isBlock, isLottery, isSendChat })
+
+            if (block_dynamic_type.includes(type)) {
+                log.warn("筛选动态", `屏蔽动态类型 ${type}`)
+                return false
+            }
+
+            if (!has_key_words && description) {
+                log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n')}`)
+            }

            /**屏蔽词 */
-            if (isBlock) return false;
+            if (isBlock) {
+                log.info("筛选动态", `包含屏蔽词(https://t.bilibili.com/${dyid})`)
+                return false
+            }

            /**若勾选只转已关注 */
-            if (only_followed && !isFollowed) return false;
-
-            /* 获取黑名单并去重合并 */
-            const { blacklist: remote_blacklist } = global_var.get("remoteconfig")
-                , new_blacklist = remote_blacklist
-                    ? [...new Set([...blacklist.split(','), ...remote_blacklist.split(',')])].join()
-                    : blacklist;
-            if ((new RegExp(dyid + '|' + uid)).test(new_blacklist)) return false;
+            if (only_followed
+                && (!mIsFollowed || !oriIsFollowed)
+            ) {
+                log.info("筛选动态", `只转已关注(https://t.bilibili.com/${dyid})`)
+                return false
+            }

+            if (
+                new_blacklist.some(id => keys.some(key => {
+                    if (key + '' === id) {
+                        log.info("筛选动态", `黑名单匹配(${id})(https://t.bilibili.com/${dyid})`)
+                        return true
+                    } else {
+                        return false
+                    }
+                }))
+            ) {
+                return false
+            }

            if (isLottery) {
                let onelotteryinfo = {};
@@ -282,8 +408,8 @@ class Monitor extends Searcher {
                /**初始化待关注列表 */
                onelotteryinfo.uid = []

-                if (!isFollowed) {
-                    onelotteryinfo.uid.push(uid);
+                if (!realIsFollowed) {
+                    onelotteryinfo.uid.push(real_uid);
                }

                onelotteryinfo.dyid = dyid;
@@ -318,7 +444,7 @@ class Monitor extends Searcher {
                    const addlength = RandomStr.length + 2 + uname.length + 1 + 1;
                    onelotteryinfo.relay_chat = RandomStr + `//@${uname}:` + des;
                    new_ctrl.push({
-                        data: String(uid),
+                        data: String(real_uid),
                        location: RandomStr.length + 2,
                        length: uname.length + 1,
                        type: 1
@@ -327,8 +453,9 @@ class Monitor extends Searcher {
                        item.location += addlength;
                        return item;
                    }).forEach(it => new_ctrl.push(it))
-                    if (!(new RegExp(uids[1])).test(attentionList))
-                        onelotteryinfo.uid.push(uids[1]);
+                    if (!oriIsFollowed) {
+                        onelotteryinfo.uid.push(ori_uid);
+                    }
                } else {
                    onelotteryinfo.relay_chat = RandomStr;
                }
@@ -349,6 +476,8 @@ class Monitor extends Searcher {
                if (isSendChat) onelotteryinfo.rid = rid;

                alllotteryinfo.push(onelotteryinfo);
+            } else {
+                log.info("筛选动态", `非抽奖动态(https://t.bilibili.com/${dyid})`)
            }
        })

@@ -358,13 +487,27 @@ class Monitor extends Searcher {
     * 关注转发评论
     * @param {LotteryOptions} option
     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 9 - 评论黑名单/评论区关闭/动态删除  
-     * 11 - 评论错误  
-     * 19 - 关注黑名单  
-     * 21 - 关注错误  
-     * 22 - 关注异常  
-     * 31 - 转发失败  
+     * - 成功 0
+     * - 评论 未知错误 1001
+     * - 评论 原动态已删除 1002
+     * - 评论 评论区已关闭 1003
+     * - 评论 需要输入验证码 1004
+     * - 评论 已被对方拉入黑名单 1005
+     * - 评论 黑名单用户无法互动 1006
+     * - 评论 UP主已关闭评论区 1007
+     * - 关注 未知错误 2001
+     * - 关注 您已被对方拉入黑名单 2002
+     * - 关注 黑名单用户无法关注 2003
+     * - 关注 账号异常 2004
+     * - 关注 关注已达上限 2005
+     * - 分区 移动失败 3001
+     * - 点赞 未知错误 4001
+     * - 点赞 点赞异常 4002
+     * - 点赞 点赞频繁 4003
+     * - 转发 未知错误 5001
+     * - 转发 该动态不能转发分享 5002
+     * - 转发 请求数据发生错误，请刷新或稍后重试 5003
+     * - 转发 操作太频繁了，请稍后重试 5004
     */
    async go(option) {
        log.debug('正在转发的动态信息', option);
@@ -373,63 +516,72 @@ class Monitor extends Searcher {
            return 0
        }

-        const { uid, dyid, chat_type, rid, relay_chat, ctrl } = option;
+        let status = 0
+        const
+            { uid, dyid, chat_type, rid, relay_chat, ctrl } = option,
+            { chat, check_if_duplicated } = config;

        /* 评论 */
        if (rid && chat_type) {
-            let status = 0
-            const
-                { chat } = config,
-                retry = [...new Array(5).keys()],
-                max_retry_times = retry.length;
-            await try_for_each(retry, async (times) => {
-                status = await bili.sendChat(rid, getRandomOne(chat), chat_type)
-                switch (status) {
-                    case 0:
-                        return true
-                    case -1:
-                        log.warn('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
-                        return true
-                    default:
-                        log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
-                        log.info('自动评论', `将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
-                        await delay(60 * 1000 * (times + 1))
-                        return false
-                }
-            })
-            if (status) return 10 + status;
+
+            status = await retryfn(
+                5,
+                [1, 4],
+                () => bili.sendChat(rid, getRandomOne(chat), chat_type)
+            )
+
+            if (status) {
+                log.warn("抽奖信息", `dyid: ${dyid}, rid: ${rid}, chat_type: ${chat_type}`)
+                return 1000 + status
+            }
        }

        /* 关注 */
        if (uid.length) {
-            let status = 0
            await try_for_each(uid, async (u) => {
                status = await bili.autoAttention(u)
-                switch (status) {
-                    case 0:
-                        if (await bili.movePartition(u, this.tagid)) {
-                            log.error('抽奖信息', `uid: ${u},dyid: ${dyid}`)
-                        }
-                        return false
-                    case -1:
-                    case 2:
-                        log.warn('抽奖信息', `uid: ${u},dyid: ${dyid}`)
-                        return true
-                    default:
-                        log.error('抽奖信息', `uid: ${u},dyid: ${dyid}`)
-                        return true
+                if (status) {
+                    log.warn("抽奖信息", `dyid: ${dyid}, uid: ${u}`)
+                    return true
+                } else if (await bili.movePartition(u, this.tagid)) {
+                    log.warn("抽奖信息", `dyid: ${dyid}, uid: ${u} tagid: ${this.tagid}`)
+                    /* 3000系错误 */
+                    status = 1001
+                    return true
+                } else {
+                    return false
                }
            })
-            if (status) return 20 + status
+            if (status) return 2000 + status
        }

        /* 点赞 */
-        await bili.autolike(dyid)
+        if (!check_if_duplicated) {
+            status = await retryfn(
+                5,
+                [1, 2, 3],
+                () => bili.autolike(dyid)
+            )
+
+            if (status) {
+                log.warn("抽奖信息", `dyid: ${dyid}`)
+                return 4000 + status
+            }
+        }

        /* 转发 */
-        if (await bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)) return 31;
+        status = await retryfn(
+            5,
+            [1, 3, 4],
+            () => bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)
+        )

-        return 0
+        if (status) {
+            log.warn("抽奖信息", `dyid: ${dyid}`)
+            return 5000 + status
+        }
+
+        return status
    }
 }

@@ -1,7 +1,8 @@
 const utils = require('../utils');
 const bili = require('../net/bili');
 const { send } = require("../net/http");
-const { article_scan_page, not_check_article, get_dynamic_detail_wait, uid_scan_page, search_wait, tag_scan_page } = require("../data/config");
+const { check_if_duplicated, article_scan_page, article_create_time, not_check_article, get_dynamic_detail_wait, uid_scan_page, search_wait, tag_scan_page } = require("../data/config");
+const d_storage = require("../helper/d_storage")

 const { log } = utils

@@ -74,8 +75,11 @@ function parseDynamicCard(dynamic_detail_card) {
    obj.ctrl = (extend_json && strToJson(extend_json).ctrl) || [];
    /* 是否有官方抽奖 */
    obj.hasOfficialLottery = extension && extension.lott && true;
-    /* 转发者的描述 后两个分别是视频动态的描述和视频本身的描述*/
-    obj.description = (item && (item.content || item.description || cardToJson.dynamic || cardToJson.desc)) || '';
+    /* 转发者的描述 纯文字内容 图片动态描述 后两个分别是视频动态的描述和视频本身的描述*/
+    obj.description =
+        (item && (item.content || '' + item.description || ''))
+        || (cardToJson.dynamic || '' + cardToJson.desc || '')
+        || '';
    if (obj.type === 1) {
        const { origin_extension, origin } = cardToJson
            , originToJson = strToJson(origin)
@@ -93,7 +97,10 @@ function parseDynamicCard(dynamic_detail_card) {
        /* 被转发者的name */
        obj.origin_uname = (user && (user.name || user.uname)) || '';
        /* 被转发者的描述 */
-        obj.origin_description = (item && (item.content || item.description || originToJson.dynamic || originToJson.desc)) || '';
+        obj.origin_description =
+            (item && (item.content || '' + item.description || ''))
+            || (originToJson.dynamic || '' + originToJson.desc || '')
+            || '';
    }

    return obj
@@ -234,35 +241,35 @@ class Searcher {
                }
            })
            .reduce(async (pre, cur) => {
-                const results = await pre
-                    , { origin_dynamic_id } = cur;
+                let
+                    results = await pre,
+                    { origin_dynamic_id } = cur,
+                    is_liked = false;

-                log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`)
-
-                const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
-
-                if (card) {
+                if (!check_if_duplicated || check_if_duplicated === 2) {
+                    const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
+                    log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`)
+                    if (card) {
+                        ({ is_liked } = parseDynamicCard(card))
+                    }
                    await utils.delay(get_dynamic_detail_wait)
-
-                    const { is_liked } = parseDynamicCard(card)
-
-                    return [...results, {
-                        lottery_info_type: 'uid',
-                        create_time: cur.origin_create_time,
-                        is_liked,
-                        uids: [cur.uid, cur.origin_uid],
-                        uname: cur.origin_uname,
-                        ctrl: [],
-                        dyid: cur.origin_dynamic_id,
-                        rid: cur.origin_rid_str,
-                        des: cur.origin_description,
-                        type: cur.orig_type,
-                        hasOfficialLottery: cur.origin_hasOfficialLottery
-                    }]
                }

-                return results
+                results.push({
+                    lottery_info_type: 'uid',
+                    create_time: cur.origin_create_time,
+                    is_liked,
+                    uids: [cur.uid, cur.origin_uid],
+                    uname: cur.origin_uname,
+                    ctrl: [],
+                    dyid: cur.origin_dynamic_id,
+                    rid: cur.origin_rid_str,
+                    des: cur.origin_description,
+                    type: cur.orig_type,
+                    hasOfficialLottery: cur.origin_hasOfficialLottery
+                })

+                return results
            }, Promise.resolve([]))

        log.info('获取动态', `成功获取用户${UID}的动态信息`);
@@ -336,9 +343,14 @@ class Searcher {
        /**存储所有专栏中的dyid */
        let dyinfos = [];
        /**遍历专栏s */
-        for (const cv of cvs) {
+        for (const { id, pub_time } of cvs) {
+            let now_time = Math.floor(Date.now() / 1000);
+            if ((now_time - pub_time) / 86400 > article_create_time) {
+                log.warn("获取动态", `该专栏(${id})创建时间大于设定天数(${article_create_time}天)`)
+                continue
+            }
            const
-                content = await bili.getOneArticleByCv(cv),
+                content = await bili.getOneArticleByCv(id),
                dyids = content.match(/(?<=t.bilibili.com\/)[0-9]+/g) || [],
                dyids_set = [...new Set(dyids)],
                /**判断此专栏是否查看过的权重 */
@@ -349,13 +361,13 @@ class Searcher {
                _weight = 0,
                /**单个专栏中的dyid */
                _dyinfos = [];
-            log.info('获取动态', `提取专栏(${cv})中提及的dyid(${length})`)
+            log.info('获取动态', `提取专栏(${id})中提及的dyid(${length})`)

            /**遍历某专栏中的dyids */
            for (const dyid of dyids_set) {
                if (dyid.length === utils.dyid_length) {
-                    log.info('获取动态', `查看专栏中所提及动态(${dyid})是否点赞 (${length--})`)

+                    log.info('获取动态', `查看专栏中所提及动态(${dyid}) (${length--})`)
                    const card = await bili.getOneDynamicByDyid(dyid)

                    if (card) {
@@ -364,7 +376,12 @@ class Searcher {
                        const parsed_card = parseDynamicCard(card)
                            , { is_liked } = parsed_card;

-                        if (is_liked) {
+                        if (
+                            ((!check_if_duplicated || check_if_duplicated === 2)
+                                && is_liked)
+                            || ((check_if_duplicated === 1 || check_if_duplicated === 2)
+                                && await d_storage.searchDyid(dyid))
+                        ) {
                            log.info('获取动态', `动态(${dyid})已转发过`)
                            _weight += 1;
                        }
@@ -431,21 +448,27 @@ class Searcher {
                                if (length) {
                                    const lottery_info = raw_lottery_info
                                        .reduce(async (pre, cur) => {
-                                            const results = await pre
+                                            let results = await pre
                                                , { dyid } = cur;

-                                            log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
+                                            if (!check_if_duplicated || check_if_duplicated === 2) {
+                                                log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
+                                                const card = await bili.getOneDynamicByDyid(dyid)

-                                            const card = await bili.getOneDynamicByDyid(dyid)
+                                                if (card) {
+                                                    await utils.delay(get_dynamic_detail_wait)

-                                            if (card) {
-                                                await utils.delay(get_dynamic_detail_wait)
+                                                    const { is_liked } = parseDynamicCard(card)

-                                                const { is_liked } = parseDynamicCard(card)
-
-                                                cur.is_liked = is_liked
-
-                                                return [...results, cur]
+                                                    if (is_liked) {
+                                                        log.info('获取动态', `动态(${dyid})已转发过`)
+                                                    } else {
+                                                        cur.is_liked = is_liked
+                                                        results.push(cur)
+                                                    }
+                                                }
+                                            } else {
+                                                results.push(cur)
                                            }

                                            return results
@@ -49,8 +49,8 @@ const config = {
     * 符合js正则表达式的字符串
     */
    key_words: [
-        "[抽奖]",
-        "[转关].*[转关]"
+        "[抽奖送揪]|福利",
+        "[转关评粉]|参与"
    ],

    /**
@@ -69,6 +69,30 @@ const config = {
     */
    chatmodel: '01',

+    /**
+     * 检查是否重复转发
+     * - 不检查 -1
+     * - 通过是否点赞判断 0
+     * - 检索本地dyids文件 1
+     * - 通过是否点赞判断+检索本地dyids文件 2
+     */
+    check_if_duplicated: 1,
+
+    /**
+     * 屏蔽动态类型
+     * 
+     * | 动态类型   | type值 |
+     * | :------- |:----- |
+     * | 转发       | `1`    |
+     * | 含图片     | `2`    |
+     * | 无图纯文字  | `4`    |
+     * | 视频       | `8`    |
+     * | 番剧       | `512`  |
+     * | 活动       | `2048` |
+     * | 专栏       | `64`   |
+     */
+    block_dynamic_type: [0],
+
    /**
     * - 动态创建时间
     * - 多少天前
@@ -95,6 +119,11 @@ const config = {
     */
    article_scan_page: 3,

+    /**
+     * - 专栏创建时间距离现在的最大天数
+     */
+    article_create_time: 7,
+
    /**
     * - 不检查专栏是否看过，若选择检查可以提高检测效率
     * - 默认false(检查)
@@ -216,15 +245,20 @@ const config = {
    at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],

    /**
-     * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
     * - 英文逗号分隔 如: 1,2,3
     */
    blacklist: '',

+    /**
+     * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
+     * - 使用公共黑名单
+     */
+    use_public_blacklist: true,
+
    /**
     * 屏蔽词
     */
-    blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号", "钓鱼", "涨粉"],
+    blockword: ["脚本", "抽奖号", "钓鱼"],

    /**
     * 转发评语
@@ -253,6 +287,11 @@ const config = {
     */
    is_exception: false,

+    /**
+     * 是否关注已达上限
+     */
+    is_outof_maxfollow: false,
+
    /**
     * - 中奖通知关键词(满足一个就推送)
     * - 符合js正则表达式的字符串
@@ -261,9 +300,16 @@ const config = {
     */
    notice_key_words: [
        "~预约成功|预约主题",
-        "中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员"
+        "中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员",
+        "~你的账号在新设备或平台登录成功",
+        "~你预约的直播已开始"
    ],

+    /**
+     * - 获取私信页数
+     */
+    check_session_pages: 16,
+
    /**
     * - 清理白名单uid或dyid
     * - 英文逗号分隔 如: 1,2,3
@@ -335,10 +381,8 @@ const config = {
     * @param {string} n
     */
    updata(n) {
-        const new_config = this.raw_config()[`config_${n}`];
-        if (new_config) {
-            this.setObject(new_config)
-        }
+        this.init()
+        this.setObject(this.raw_config()[`config_${n}`])
    },

    init() {
@@ -1,4 +1,4 @@
-const { getRemoteConfig } = require("../utils");
+const { getRemoteConfig, createDir, createFile } = require("../utils");
 const config = require("../data/config");

 const key_map = new Map([['DedeUserID', 'myUID'], ['bili_jct', 'csrf']]);
@@ -15,10 +15,11 @@ let global_var = {
     * 全局变量初始化
     * 更新config
     * @param {string} cookie
+     * @param {string} num
     */
-    async init(cookie) {
+    async init(cookie, num) {
        if (cookie) {
-            config.updata(process.env.NUMBER);
+            config.updata(num);

            this.set('cookie', cookie);

@@ -37,6 +38,8 @@ let global_var = {
            ]);
            this.set('remoteconfig', await getRemoteConfig());
        }
+        await createDir('dyids');
+        await createFile(num < 2 ? 'dyid.txt' : `dyid${num}.txt`, '', 'a')
    }
 };

@@ -0,0 +1,52 @@
+const { log, readDyidFile, writeDyidFile, dyid_length } = require("../utils");
+
+const d_storage = {
+    /**
+     * 搜索dyid
+     * @param {string} dyid
+     * @returns {Promise<boolean>}
+     */
+    searchDyid: (dyid) => {
+        return new Promise((resolve) => {
+            const Rdyid = new RegExp(dyid);
+            const rs = readDyidFile(Number(process.env.NUMBER));
+            let status = false;
+            rs.on('data', chunk => {
+                if (Rdyid.test(chunk)) {
+                    status = true
+                }
+            })
+            rs.on('end', () => {
+                resolve(status)
+            })
+            rs.on('error', err => {
+                log.error('搜索dyid', err)
+                resolve(status)
+            })
+        })
+    },
+    /**
+     * 更新dyid
+     * @param {string} dyid
+     */
+    updateDyid: (dyid) => {
+        log.info('更新dyid', `写入${dyid}`);
+        if (dyid.length !== dyid_length) {
+            log.error('更新dyid', `dyid(${dyid})长度不为18 若出现此问题请即时通知开发者`)
+        }
+        return new Promise((resolve) => {
+            const ws = writeDyidFile(Number(process.env.NUMBER));
+            ws.write(dyid + ',', () => {
+                ws.destroy();
+                resolve()
+            })
+            ws.on('error', err => {
+                log.error('更新dyid', err)
+                resolve()
+            })
+        });
+    }
+}
+
+
+module.exports = d_storage;
@@ -621,7 +621,7 @@ function pushPlusNotify(text, desp) {
        if (PUSH_PLUS_TOKEN) {
            send({
                method: 'POST',
-                url: 'https://pushplus.hxtrip.com/send',
+                url: 'http://www.pushplus.plus/send',
                contents: {
                    token: PUSH_PLUS_TOKEN,
                    title: text,
@@ -8,32 +8,36 @@ const utils = require("../utils");
 * @returns
 */
 async function randomDynamic(num) {
-    const { create_dy_type, dy_contents, random_dynamic_wait } = config;
+    let dynamics = []
+    const
+        { create_dy_type, dy_contents, random_dynamic_wait } = config,
+        hasShareVideo = create_dy_type === -1 || create_dy_type === 1,
+        hasRandomCreate = create_dy_type === -1 || create_dy_type === 0 || typeof create_dy_type === 'undefined';

-    if (create_dy_type === -1 || create_dy_type === 0 || typeof create_dy_type === 'undefined') {
+    if (hasShareVideo) {
+        dynamics = await bili.getTopRcmd()
+        for (let index = 0; dynamics.length < num; index++) {
+            dynamics.push(...await bili.getTopRcmd())
+        }
+    }
+
+    if (hasRandomCreate) {
        for (let index = 0; index < num; index++) {
-            await bili.createDynamic(utils.getRandomOne(dy_contents));
-            await utils.delay(random_dynamic_wait);
+            dynamics.push(utils.getRandomOne(dy_contents))
        }
    }

-    if (create_dy_type === -1 || create_dy_type === 1) {
-        let videos = await bili.getTopRcmd()
-        for (let index = 0; videos.length < num; index++) {
-            videos.push(...await bili.getTopRcmd())
-        }
-
-        await utils.try_for_each(videos, async ([uid, aid]) => {
-            if (num--) {
-                await bili.shareVideo(uid, aid)
-                await utils.delay(random_dynamic_wait)
-                return false
+    await utils.try_for_each(
+        utils.shuffle(dynamics).slice(0, num),
+        async (dynamic) => {
+            await utils.delay(random_dynamic_wait)
+            if (dynamic instanceof Array && dynamic.length === 2 && typeof dynamic[0] === "number") {
+                return await bili.shareVideo(...dynamic)
            } else {
-                return true
+                return await bili.createDynamic(dynamic)
            }
-        })
-    }
+        }
+    )
 }

-
 module.exports = { randomDynamic }
@@ -10,8 +10,10 @@ const { log } = utils;
 async function createRandomDynamic(num) {
    if (config.create_dy) {
        log.info('随机动态', `准备创建${num}条随机动态`);
-        const Dynamic = await Searcher.checkAllDynamic(global_var.get("myUID"), 1);
-        if ((Dynamic.allModifyDynamicResArray[0] || { type: 0 }).type === 1) {
+        const
+            { allModifyDynamicResArray } = await Searcher.checkAllDynamic(global_var.get("myUID"), 1),
+            { type, orig_type } = allModifyDynamicResArray[0] || {};
+        if (type === 1 && orig_type !== 8) {
            await randomDynamic(num)
        } else {
            log.info('随机动态', '已有非抽奖动态故无需创建');
@@ -453,7 +453,7 @@ const bili_client = {
    /**
     * 搜索专栏
     * @param {string} keyword
-     * @return {Promise<Array<number>>}
+     * @return {Promise<Array<{pub_time: number, id: number}>>}
     */
    async searchArticlesByKeyword(keyword) {
        const
@@ -471,7 +471,12 @@ const bili_client = {
            let cv_arr = [];
            try {
                log.info('搜索专栏', '成功 关键词: ' + keyword);
-                cv_arr = res.data.result.map(it => it.id);
+                cv_arr = res.data.result.map(it => {
+                    return {
+                        pub_time: it.pub_time,
+                        id: it.id
+                    }
+                });
            } catch (error) {
                log.error('搜索专栏', '失败 原因:\n' + responseText);
                cv_arr = [];
@@ -521,6 +526,17 @@ const bili_client = {
            query: {
                vmid: uid
            }
+        }),
+        /**
+         * 线路三
+         * @param {number} uid
+         * @returns {Promise<string>}
+         */
+        (uid) => get({
+            url: "https://tenapi.cn/bilibilifo/",
+            query: {
+                uid
+            }
        })
    ], responseText => {
        const res = strToJson(responseText);
@@ -602,11 +618,13 @@ const bili_client = {
            case 0:
                return [false, 0, '关注+1']
            case 22002:
-                return [false, -1, '您已被对方拉入黑名单']
+                return [false, 2, '您已被对方拉入黑名单']
            case 22003:
-                return [false, -1, '黑名单用户无法关注', -1]
+                return [false, 3, '黑名单用户无法关注']
            case 22015:
-                return [false, 2, '账号异常', 2]
+                return [false, 4, '账号异常']
+            case 22009:
+                return [false, 5, '关注已达上限']
            default:
                return [true, 1, `未知错误\n${responseText}`]
        }
@@ -618,10 +636,12 @@ const bili_client = {
     * @param {Number} uid
     * 被关注者的UID
     * @returns {Promise<number>}
-     * -1 - 黑名单  
-     * 0 - 成功  
-     * 1 - 失败  
-     * 2 - 异常  
+     * - 成功 0  
+     * - 未知错误 1  
+     * - 您已被对方拉入黑名单 2  
+     * - 黑名单用户无法关注 3  
+     * - 账号异常 4  
+     * - 关注已达上限 5  
     */
    autoAttention(uid) {
        return this._autoAttention.run(uid)
@@ -631,8 +651,8 @@ const bili_client = {
     * @param {number} uid
     * @param {number} tagid 关注分区的ID
     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
+     * - 成功 0  
+     * - 失败 1  
     */
    async movePartition(uid, tagid) {
        const responseText = await post({
@@ -684,25 +704,36 @@ const bili_client = {
     * 动态自动点赞
     * @param {string} dyid
     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
+     * - 成功 0  
+     * - 未知错误 1  
+     * - 点赞异常 2  
+     * - 点赞频繁 3  
     */
    async autolike(dyid) {
-        const responseText = await post({
-            url: API.DYNAMIC_LIKE_THUMB,
-            contents: {
-                uid: GlobalVar.get("myUID"),
-                dynamic_id: dyid,
-                up: 1,
-                csrf: GlobalVar.get("csrf")
-            }
-        });
-        if (/^{"code":0/.test(responseText)) {
-            log.info('自动点赞', '点赞成功');
-            return 0;
-        } else {
-            log.error('自动点赞', `点赞失败\n${responseText}`);
-            return 1;
+        const
+            responseText = await post({
+                url: API.DYNAMIC_LIKE_THUMB,
+                contents: {
+                    uid: GlobalVar.get("myUID"),
+                    dynamic_id: dyid,
+                    up: 1,
+                    csrf: GlobalVar.get("csrf")
+                }
+            }),
+            res = strToJson(responseText);
+        switch (res.code) {
+            case 0:
+                log.info('自动点赞', '点赞成功');
+                return 0;
+            case 1000113:
+                log.warn('自动点赞', '点赞异常');
+                return 2;
+            case 1000001:
+                log.warn('自动点赞', '点赞频繁');
+                return 3;
+            default:
+                log.error('自动点赞', `未知错误\n${responseText}`);
+                return 1;
        }
    },
    /**
@@ -714,8 +745,11 @@ const bili_client = {
     * @param {string} [msg]
     * 动态的ID
     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
+     * - 成功 0  
+     * - 未知错误 1  
+     * - 该动态不能转发分享 2  
+     * - 请求数据发生错误，请刷新或稍后重试 3  
+     * - 操作太频繁了，请稍后重试 4  
     */
    async autoRelay(uid, dyid, msg = '转发动态', ctrl = '[]') {
        const len = msg.length;
@@ -737,15 +771,22 @@ const bili_client = {
                }
            }),
            res = strToJson(responseText);
-        if (res.code === 0) {
-            log.info('转发动态', '成功转发一条动态');
-            return 0;
-        } else if (res.code === 1101004) {
-            log.warn('转发动态', '该动态不能转发分享');
-            return 0;
-        } else {
-            log.error('转发动态', `转发动态失败\n${responseText}`);
-            return 1;
+        switch (res.code) {
+            case 0:
+                log.info('转发动态', '成功转发一条动态');
+                return 0;
+            case 1101004:
+                log.warn('转发动态', '该动态不能转发分享');
+                return 2;
+            case 2201116:
+                log.warn('转发动态', '请求数据发生错误，请刷新或稍后重试');
+                return 3;
+            case 1101008:
+                log.warn('转发动态', '操作太频繁了，请稍后重试');
+                return 4;
+            default:
+                log.error('转发动态', `未知错误\n${responseText}`);
+                return 1;
        }
    },
    /**
@@ -755,7 +796,7 @@ const bili_client = {
     * @property {number} img_height
     * 发布一条动态
     * @param { string | Picture[] } content
-     * @return {Promise<void>}
+     * @return {Promise<boolean>} isError true
     */
    async createDynamic(content) {
        let
@@ -785,8 +826,10 @@ const bili_client = {
        });
        if (/^{"code":0/.test(responseText)) {
            log.info('发布动态', `成功创建一条随机内容的动态\n${JSON.stringify(content)}\n`);
+            return false
        } else {
            log.error('发布动态', `发布动态失败\n${JSON.stringify(content)}\n${responseText}`);
+            return true
        }
    },
    /**
@@ -815,6 +858,7 @@ const bili_client = {
     * 分享视频
     * @param {number} uid
     * @param {number} aid
+     * @return {boolean} isError true
     */
    async shareVideo(uid, aid) {
        const responseText = await post({
@@ -831,8 +875,10 @@ const bili_client = {
        });
        if (/^{"code":0/.test(responseText)) {
            log.info('转发视频', `成功转发视频(av${aid})`);
+            return false
        } else {
            log.error('转发视频', `转发失败\n${responseText}`);
+            return true
        }
    },
    /**
@@ -870,8 +916,13 @@ const bili_client = {
     * 17(无图)
     * @returns {Promise<number>}
     * - 成功 0
-     * - 失败 1
-     * - 黑名单/评论区关闭/动态删除 -1
+     * - 未知错误 1
+     * - 原动态已删除 2
+     * - 评论区已关闭 3
+     * - 需要输入验证码 4
+     * - 已被对方拉入黑名单 5
+     * - 黑名单用户无法互动 6
+     * - UP主已关闭评论区 7
     */
    async sendChat(rid, msg, type) {
        const
@@ -891,22 +942,22 @@ const bili_client = {
                return 0;
            case -404:
                log.error('自动评论', '原动态已删除');
-                return -1;
+                return 2;
            case 12002:
                log.error('自动评论', '评论区已关闭');
-                return -1;
+                return 3;
            case 12015:
                log.error('自动评论', '需要输入验证码');
-                return 1;
+                return 4;
            case 12035:
                log.error('自动评论', `已被对方拉入黑名单`);
-                return -1;
+                return 5;
            case 12053:
                log.error('自动评论', '黑名单用户无法互动');
-                return -1;
+                return 6;
            case 12061:
                log.error('自动评论', 'UP主已关闭评论区');
-                return -1;
+                return 7;
            default:
                log.error('自动评论', `未知错误\n${responseText}`);
                return 1;
@@ -1,12 +1,12 @@
 const { send } = require('./net/http')
-const { strToJson, download } = require('./utils')
+const { strToJson, download, try_for_each } = require('./utils')
 const { version, checkVersion, log } = require('./utils')

 /**
 * 获取下载链接
 * @param {string} owner
 * @param {string} repo
- * @returns {Promise<{ download_url: string, text: string }>}
+ * @returns {Promise<{ download_url: string[], text: string }>}
 */
 function getLatestReleaseDownloadUrl(owner, repo) {
    return new Promise((resolve, reject) => {
@@ -36,8 +36,8 @@ function getLatestReleaseDownloadUrl(owner, repo) {
                            try {
                                const download_url = assets
                                    .filter(({ name }) => name.includes(platform) && name.includes(arch))
-                                    .map(({ browser_download_url }) => browser_download_url)[0]
-                                if (!download_url) {
+                                    .map(({ browser_download_url }) => browser_download_url)
+                                if (!download_url.length) {
                                    reject(`未找到能在此平台(${process.platform})-(${process.arch})上运行的版本`)
                                }
                                resolve({ download_url, text })
@@ -67,11 +67,12 @@ function getLatestReleaseDownloadUrl(owner, repo) {
 async function update() {
    try {
        const { download_url, text } = await getLatestReleaseDownloadUrl('shanmiteko', 'LotteryAutoScript')
-
-        let proxy_url = new URL(download_url)
-        proxy_url.host = 'download.fastgit.org'
-
-        await download(proxy_url.href, 'latest_version.zip')
+        await try_for_each(download_url.entries(), async ([i, url]) => {
+            let proxy_url = new URL(url)
+            proxy_url.host = 'download.fastgit.org'
+            await download(proxy_url.href, `latest_version${i}.zip`)
+            return false
+        })

        log.info('自动下载', '成功下载到当前目录')
        log.info('更新说明', '\n' + text + '\n')
@@ -13,6 +13,8 @@ const utils = {
    env_file: path.join(process.cwd(), "env.js"),
    /**配置文件 */
    config_file: path.join(process.cwd(), "my_config.js"),
+    /**dyids存放目录 */
+    dyids_dir: path.join(process.cwd(), "dyids"),
    /**dyid长度 */
    dyid_length: 18,
    /**
@@ -57,6 +59,25 @@ const utils = {
            if (await fn(item)) break
        }
    },
+    /**
+     * @template T
+     * @param {number} max_times
+     * @param {Array<T>} unexpected
+     * @param {() => Promise<T>} fn
+     */
+    async retryfn(max_times, unexpected, fn) {
+        let ret = null;
+        for (let times = 0; times < max_times; times++) {
+            ret = await fn()
+            if (unexpected.includes(ret)) {
+                utils.log.warn('自动重试', `将在 ${times + 1} 分钟后再次尝试(${times + 1}/${max_times})`)
+                await utils.delay(60 * 1000 * (times + 1))
+            } else {
+                break
+            }
+        }
+        return ret;
+    },
    /**
     * 函数柯里化
     * @template T
@@ -306,6 +327,50 @@ const utils = {
                resolve()
            })
        });
+    },
+    /**
+     * CreateFile
+     * @param {string} filepath 相对于dyids的文件路径
+     * @param {string} [defaultValue] 写入默认值
+     * @param {string} flag
+     * @returns {Promise<void>}
+     */
+    createFile(filepath, defaultValue, flag) {
+        const fpath = path.join(utils.dyids_dir, filepath);
+        const buffer = Buffer.from(defaultValue);
+        return new Promise((resolve, rejects) => {
+            fs.open(fpath, flag, (err, fd) => {
+                if (err) {
+                    rejects(err)
+                } else {
+                    fs.write(fd, buffer, 0, buffer.length, 0, err => {
+                        if (err) {
+                            rejects(err)
+                        } else {
+                            resolve();
+                        }
+                    })
+                }
+            })
+        });
+    },
+    /**
+     * 读取dyid文件
+     * @param {number} num
+     * @returns {fs.ReadStream}
+     */
+    readDyidFile(num) {
+        const fpath = num < 2 ? path.join(utils.dyids_dir, 'dyid.txt') : path.join(utils.dyids_dir, `dyid${num}.txt`);
+        return fs.createReadStream(fpath, { encoding: 'utf8', highWaterMark: (utils.dyid_length + 1) * 1000 })
+    },
+    /**
+     * 追加dyid
+     * @param {number} num
+     * @returns {fs.WriteStream}
+     */
+    writeDyidFile(num) {
+        const fpath = num < 2 ? path.join(utils.dyids_dir, 'dyid.txt') : path.join(utils.dyids_dir, `dyid${num}.txt`);
+        return fs.createWriteStream(fpath, { flags: 'a' })
    }
 };

@@ -10,8 +10,7 @@ const metainfo = [
    `                                __/ |                  | |        `,
    `                               |___/                   |_|        `,
    `                                                                  `,
-    `                                               Verison:   v${ve}`,
-    `                                               Written By shanmite`,
+    `    This: v${ve}     Nodejs: ${process.version}     Written By shanmite`,
 ]
 /**多账号存储 */
 let multiple_account = [];
@@ -46,7 +45,7 @@ async function main() {
        process.env.ENABLE_MULTIPLE_ACCOUNT = ENABLE_MULTIPLE_ACCOUNT;
    } else if (COOKIE) {
        const global_var = require("./lib/data/global_var");
-        await global_var.init(COOKIE, Number(NUMBER));
+        await global_var.init(COOKIE, NUMBER);

        /**引入基础功能 */
        const { start, isMe, clear, update, checkCookie } = require("./lib/index");
@@ -66,7 +65,7 @@ async function main() {
                case 'check':
                    log.info('中奖检测', '检查是否中奖');
                    loop_wait = check_loop_wait;
-                    await isMe();
+                    await isMe(NUMBER);
                    break;
                case 'clear':
                    if (CLEAR) {
@@ -48,7 +48,7 @@ module.exports = Object.freeze({
         * API传回数据类型 {RespondBody}
         * 获取抽奖信息的链接字符串
         * @example
-         * "https://raw.fastgit.org/spiritLHL/sync_lottery/master/archive_datas/datas.json"
+         * "https://github.com/spiritLHL/sync_lottery"
         */
        APIs: [],

@@ -63,8 +63,8 @@ module.exports = Object.freeze({
         * 符合js正则表达式的字符串
         */
        key_words: [
-            "[抽奖]",
-            "[转关].*[转关]"
+            "[抽奖送揪]|福利",
+            "[转关评粉]|参与"
        ],

        /**
@@ -83,6 +83,30 @@ module.exports = Object.freeze({
         */
        chatmodel: '01',

+        /**
+         * 检查是否重复转发
+         * - 不检查 -1
+         * - 通过是否点赞判断 0
+         * - 检索本地dyids文件 1
+         * - 通过是否点赞判断+检索本地dyids文件 2
+         */
+        check_if_duplicated: 1,
+
+        /**
+         * 屏蔽动态类型
+         * 
+         * | 动态类型   | type值 |
+         * | :------- |:----- |
+         * | 转发       | `1`    |
+         * | 含图片     | `2`    |
+         * | 无图纯文字  | `4`    |
+         * | 视频       | `8`    |
+         * | 番剧       | `512`  |
+         * | 活动       | `2048` |
+         * | 专栏       | `64`   |
+         */
+        block_dynamic_type: [0],
+
        /**
         * - 动态创建时间
         * - 多少天前
@@ -109,6 +133,11 @@ module.exports = Object.freeze({
         */
        article_scan_page: 3,

+        /**
+         * - 专栏创建时间距离现在的最大天数
+         */
+        article_create_time: 7,
+
        /**
         * - 不检查专栏是否看过，若选择检查可以提高检测效率
         * - 默认false(检查)
@@ -230,15 +259,21 @@ module.exports = Object.freeze({
        at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],

        /**
-         * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
+         * - 动态dyid或UID
         * - 英文逗号分隔 如: 1,2,3
         */
        blacklist: '',

+        /**
+         * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
+         * - 使用公共黑名单
+         */
+        use_public_blacklist: true,
+
        /**
         * 屏蔽词
         */
-        blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号", "钓鱼", "涨粉"],
+        blockword: ["脚本", "抽奖号", "钓鱼"],

        /**
         * 转发评语
@@ -267,6 +302,11 @@ module.exports = Object.freeze({
         */
        is_exception: false,

+        /**
+         * 是否关注已达上限
+         */
+        is_outof_maxfollow: false,
+
        /**
         * - 中奖通知关键词(满足一个就推送)
         * - 符合js正则表达式的字符串
@@ -275,9 +315,16 @@ module.exports = Object.freeze({
         */
        notice_key_words: [
            "~预约成功|预约主题",
-            "中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员"
+            "中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员",
+            "~你的账号在新设备或平台登录成功",
+            "~你预约的直播已开始"
        ],

+        /**
+         * - 获取私信页数
+         */
+        check_session_pages: 16,
+
        /**
         * - 清理白名单uid或dyid
         * - 英文逗号分隔 如: 1,2,3
@@ -1,6 +1,6 @@
 {
  "name": "lottery-auto-script",
-  "version": "2.3.2",
+  "version": "2.4.5",
  "description": "自动参与B站动态抽奖",
  "main": "main.js",
  "scripts": {
@@ -8,9 +8,8 @@
    "clear": "node main.js clear",
    "check": "node main.js check",
    "update": "node main.js update",
-    "pkg_x64": "PowerShell .\\script\\pkg\\pkg.ps1",
-    "pkg_arm64": "npx pkg -t node16-linux-arm64 -o dist/lottery main.js && cp my_config.example.js dist/my_config.js && cp env.example.js dist/env.js",
-    "pkg_armv7": "npx pkg -t node16-linuxstatic-armv7 -o dist/lottery main.js && cp my_config.example.js dist/my_config.js && cp env.example.js dist/env.js"
+    "build_all": "bash script/build/pkg.sh",
+    "changelog": "bash script/build/changelog.sh"
  },
  "files": [
    "lib",
@@ -24,9 +23,12 @@
  "bin": "main.js",
  "pkg": {
    "targets": [
-      "linux-x64",
-      "win-x64",
-      "macos-x64"
+      "node12-win-x64",
+      "node16-win-x64",
+      "node16-linux-x64",
+      "node16-macos-x64",
+      "node16-linuxstatic-arm64",
+      "node16-linuxstatic-armv7"
    ],
    "outputPath": "dist"
  },
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+# version: <major.minor.patch>
+level=patch
+
+npm version $level \
+    --no-commit-hooks \
+    --no-git-tag-version
+
+OLD_VERSION_ARRAY=($(npm view lottery-auto-script version | tr '.' ' '))
+major=${OLD_VERSION_ARRAY[0]}
+minor=${OLD_VERSION_ARRAY[1]}
+patch=${OLD_VERSION_ARRAY[2]}
+
+case "${level}" in
+"major")
+    ((major += 1))
+    minor=0
+    patch=0
+    ;;
+"minor")
+    ((minor += 1))
+    patch=0
+    ;;
+*)
+    ((patch += 1))
+    ;;
+esac
+
+NEW_VERSION="$major.$minor.$patch"
+
+echo "New Version: $NEW_VERSION"
+
+GIT_LOG="$(git log --pretty=format:"* %h %s" | sed -e '/CHANGELOG/,$d' | sed ':a;N;s/\n/\\n/g;ta')"
+
+sed -i "/# CHANGELOG/a\## 主要变化($NEW_VERSION)\n$GIT_LOG\n\n_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_\n" CHANGELOG.md
+
+git add .
+git commit -m "docs: 更新CHANGELOG"
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+ROOT=$PWD
+README="README.md"
+TEMPLATE_CONFIG_FILE="my_config.example.js"
+TEMPLATE_ENV_FILE="env.example.js"
+CONFIG_FILE="my_config.js"
+ENV_FILE="env.js"
+TARGET_DIR="./dist"
+BIN_NAME="lottery"
+
+create_win_bat() {
+	echo "@echo off && lottery $1 && pause"
+}
+
+if [ -d "$TARGET_DIR" ]; then
+	rm -rf "$TARGET_DIR"
+fi
+
+npx pkg .
+
+# Searching in the current directory
+for file in "$TARGET_DIR/"*; do
+	TMPDIR="${file%.exe}"
+	TMPDIR_NAME="${TMPDIR##*/}"
+	REMANE_FILE="$TARGET_DIR/$BIN_NAME"
+	mv $file $REMANE_FILE
+	mkdir -p "$TMPDIR/"
+	mv $REMANE_FILE "$TMPDIR/"
+	cp $README "$TMPDIR/"
+	cp $TEMPLATE_CONFIG_FILE "$TMPDIR/$CONFIG_FILE"
+	cp $TEMPLATE_ENV_FILE "$TMPDIR/$ENV_FILE"
+	if [ "$(echo $file | grep '.exe')" ]; then
+		BATS=("start" "check" "clear" "update")
+		for item in "${BATS[@]}"; do
+			create_win_bat "${item}" >"$TMPDIR/$item.bat"
+		done
+		mv "$TMPDIR/$BIN_NAME" "$TMPDIR/$BIN_NAME.exe"
+	else
+		ZIP_NAME=latest_version0
+		cat >"$TMPDIR/update.sh" <<-EOF
+			#!/bin/bash
+			./lottery update
+			ZIP_NAME=$ZIP_NAME
+			if [[ -r "\$ZIP_NAME.zip" ]]; then
+			unzip \$ZIP_NAME.zip
+			rm \$ZIP_NAME.zip
+			chmod u+x lottery
+			fi
+		EOF
+	fi
+	cd $TMPDIR
+	zip -r "$TMPDIR_NAME.zip" .
+	mv "$TMPDIR_NAME.zip" ../
+	cd $ROOT
+done
@@ -29,7 +29,9 @@ if [ ! -f "$ENV_FILE" ]; then
    echo "create $ENV_FILE"
    curl -fsSL $ENV_EXAMPLE -o $ENV_FILE
 else
-    echo "$ENV_FILE exists"
+    echo "$ENV_FILE already existed"
+    echo "create new_$ENV_FILE"
+    curl -fsSL $ENV_EXAMPLE -o "new_$ENV_FILE"
 fi

 # 新建配置文件
@@ -37,38 +39,99 @@ if [ ! -f "$CONFIG_FILE" ]; then
    echo "create $CONFIG_FILE"
    curl -fsSL $CONFIG_EXAMPLE -o $CONFIG_FILE
 else
-    echo "$CONFIG_FILE exists"
+    echo "$CONFIG_FILE already existed"
+    echo "create new_$CONFIG_FILE"
+    curl -fsSL $CONFIG_EXAMPLE -o "new_$CONFIG_FILE"
 fi

 echo "docker pull $DOCKER_REPO"
 docker -v && docker pull $DOCKER_REPO

 echo "create start.sh"
-echo -e "#!/bin/bash\n\
-docker run \
-v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
-v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-$DOCKER_REPO \
-start" \
-> start.sh
+cat >start.sh <<EOF
+#!/bin/sh
+NAME=shanmite-lottery-start
+if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
+    docker run \\
+        -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
+        -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --name \$NAME \\
+        $DOCKER_REPO \\
+        start
+else
+    echo "container \$NAME already existed"
+    echo "history logs -> docker logs \$NAME"
+    echo "close this -> docker stop \$NAME"
+    echo "start \$NAME"
+    docker start \$NAME
+fi
+EOF
 chmod +x start.sh

 echo "create check.sh"
-echo -e "#!/bin/bash\n\
-docker run \
-v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
-v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-$DOCKER_REPO \
-check" \
-> check.sh
+cat >check.sh <<EOF
+#!/bin/sh
+NAME=shanmite-lottery-check
+if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
+    docker run \\
+        -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
+        -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --name \$NAME \\
+        $DOCKER_REPO \\
+        check
+else
+    echo "container \$NAME already existed"
+    echo "history logs -> docker logs \$NAME"
+    echo "close this -> docker stop \$NAME"
+    echo "start \$NAME"
+    docker start \$NAME
+fi
+EOF
 chmod +x check.sh

 echo "create clear.sh"
-echo -e "#!/bin/bash\n\
-docker run \
-v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
-v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-$DOCKER_REPO \
-clear" \
-> clear.sh
+cat >clear.sh <<EOF
+#!/bin/sh
+NAME=shanmite-lottery-clear
+if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
+    docker run \\
+        -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
+        -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --name \$NAME \\
+        $DOCKER_REPO \\
+        clear
+else
+    echo "container \$NAME already existed"
+    echo "history logs -> docker logs \$NAME"
+    echo "close this -> docker stop \$NAME"
+    echo "start \$NAME"
+    docker start \$NAME
+fi
+EOF
 chmod +x clear.sh
+
+echo "create debug.sh"
+cat >debug.sh <<EOF
+#!/bin/sh
+NAME=shanmite-lottery-debug
+echo "create temporary debug container"
+docker run \\
+    -it \\
+    --name \$NAME \\
+    --entrypoint /bin/sh \\
+    $DOCKER_REPO -c sh
+echo "remove temporary debug container"
+docker rm -v \$NAME
+EOF
+chmod +x debug.sh
+
+echo "create remove_all.sh"
+cat >remove_all.sh <<EOF
+#!/bin/sh
+echo "remove all containers about $DOCKER_REPO"
+docker rm -v \$(docker ps -a | awk '/shanmite\/lottery_auto_docker/ {print \$1}')
+echo "remove image $DOCKER_REPO"
+docker image rm -f shanmite/lottery_auto_docker
+echo "see you next time!"
+EOF
+chmod +x remove_all.sh
@@ -1,57 +0,0 @@
-$README = "README.md"
-$TEMPLATE_CONFIG_FILE = "my_config.example.js"
-$TEMPLATE_ENV_FILE = "env.example.js"
-
-$CONFIG_FILE = "my_config.js"
-$ENV_FILE = "env.js"
-
-$TARGET_DIR = ".\dist"
-
-$NAME = 'lottery-auto-script'
-
-$TRIARR = @(
-    @("$NAME-win.exe", "lottery.exe", "nlts-win-x64"),
-    @("$NAME-linux", "lottery", "nlts-linux-x64"),
-    @("$NAME-macos", "lottery", "nlts-macos-x64")
-)
-
-if((Test-Path $TARGET_DIR) -eq "True") {
-    Remove-Item -Path $TARGET_DIR -Recurse
-}
-
-npx pkg .
-
-Copy-Item -Path $TEMPLATE_ENV_FILE -Destination $TARGET_DIR -Force
-Copy-Item -Path $TEMPLATE_CONFIG_FILE -Destination $TARGET_DIR -Force
-Copy-Item -Path $README -Destination $TARGET_DIR -Force
-
-Set-Location -Path $TARGET_DIR
-
-Move-Item -Path $TEMPLATE_ENV_FILE -Destination $ENV_FILE -Force
-Move-Item -Path $TEMPLATE_CONFIG_FILE -Destination $CONFIG_FILE -Force
-
-foreach ($TRI in $TRIARR) {
-    $PROTO_BIN,$BIN,$DIR = $TRI
-
-    New-Item -ItemType Directory -Force -Path $DIR
-    
-    Move-Item -Path $PROTO_BIN -Destination $BIN -Force
-
-    Move-Item -Path $BIN -Destination $DIR -Force
-    Copy-Item -Path $ENV_FILE -Destination $DIR -Force
-    Copy-Item -Path $CONFIG_FILE -Destination $DIR -Force
-    Copy-Item -Path $README -Destination $DIR -Force
-
-    if ($DIR -eq "nlts-win-x64") {
-        New-Item -Path $DIR -Name "start.bat" -ItemType File -Value "@echo off && lottery start && pause" -Force
-        New-Item -Path $DIR -Name "check.bat" -ItemType File -Value "@echo off && lottery check && pause" -Force
-        New-Item -Path $DIR -Name "clear.bat" -ItemType File -Value "@echo off && lottery clear && pause" -Force
-        New-Item -Path $DIR -Name "update.bat" -ItemType File -Value "@echo off && lottery update && pause" -Force
-    }
-
-    Compress-Archive -Path $DIR -DestinationPath $DIR -Force
-}
-
-Remove-Item -Path $ENV_FILE
-Remove-Item -Path $CONFIG_FILE
-Remove-Item -Path $README
@@ -1,8 +0,0 @@
-#!/bin/bash
-./lottery update
-
-if [[ -r "latest_version.zip" ]]; then
-    unzip latest_version.zip
-    rm latest_version.zip
-    chmod u+x lottery
-fi
Author	SHA1	Message	Date
shanmite	7c455aff9c	docs: 更新CHANGELOG	2021-12-23 15:28:01 +08:00
shanmite	ef969bb2c2	feat: 每组显示动态转发数(#97 )	2021-12-23 15:19:07 +08:00
shanmite	0cbacd6ddf	feat: 推送携带帐号编号(#98 )	2021-12-23 14:54:02 +08:00
shanmite	da75c8c17b	feat: 增加设置屏蔽动态类型`block_dynamic_type`(#99 )	2021-12-23 14:42:46 +08:00
shanmite	548ad4b589	fix: pushplus更新域名(#93 )	2021-12-14 16:54:25 +08:00
shanmite	922dd989bc	docs: 更新CHANGELOG	2021-12-13 14:44:55 +08:00
shanmite	c486abf0ed	fix: 黑名单不起作用(#92 ) 类型判断错误	2021-12-13 14:31:24 +08:00
shanmite	4bbbfc89a7	docs: 更新CHANGELOG	2021-12-12 16:39:45 +08:00
shanmite	aba17ed0ad	feat: 提示关键词修改建议	2021-12-12 16:32:49 +08:00
shanmite	5a23043466	feat: 只通过是否点赞判断时点赞	2021-12-12 16:02:01 +08:00
shanmite	76f715248d	fix: 黑名单匹配(#90 ) 子串不参与匹配	2021-12-12 15:57:48 +08:00
shanmite	0d4185d02a	fix(Searcher): getLotteryInfoByUID(#89 ) 是否获取点赞信息	2021-12-12 15:04:37 +08:00
shanmite	2ff4ec812b	docs: 更新CHANGELOG	2021-12-11 18:24:38 +08:00
shanmite	20c423fc09	fix: "公共黑名单"显示错误(#87 )	2021-12-11 18:21:37 +08:00
shanmite	6851f29f75	fix: 描述中出现undefined(#88 )	2021-12-11 18:18:43 +08:00
shanmite	77d198bec5	docs: 更新CHANGELOG	2021-12-10 15:21:26 +08:00
shanmite	0ba6acec31	feat: check_if_duplicated可同时使用多种方式	2021-12-10 15:16:17 +08:00
shanmite	dd994263b9	fix: 只转已关注功能失效	2021-12-10 14:50:41 +08:00
shanmite	12847d7cfc	docs: 更新CHANGELOG	2021-12-06 16:26:56 +08:00
shanmite	01562b6ee0	ci: verison升级时小版本号归0	2021-12-06 16:26:11 +08:00
shanmite	90ac347ff2	docs: 更新README	2021-12-06 16:14:59 +08:00
shanmite	3cf3939b49	feat: 新增设置`check_if_duplicated` 检查是否重复转发 - 不检查 -1 - 通过是否点赞判断 0 - 检索本地dyids文件 1	2021-12-06 16:12:41 +08:00
shanmite	d0a8aa9169	feat: metainfo显示nodejs版本号	2021-12-05 20:12:47 +08:00
shanmite	10db52f9ae	fix: 完善错误延时重试(#82 ) - 成功 0 - 评论未知错误 1001 - 评论原动态已删除 1002 - 评论评论区已关闭 1003 - 评论需要输入验证码 1004 - 评论已被对方拉入黑名单 1005 - 评论黑名单用户无法互动 1006 - 评论 UP主已关闭评论区 1007 - 关注未知错误 2001 - 关注您已被对方拉入黑名单 2002 - 关注黑名单用户无法关注 2003 - 关注账号异常 2004 - 关注关注已达上限 2005 - 分区移动失败 3001 - 点赞未知错误 4001 - 点赞点赞异常 4002 - 点赞点赞频繁 4003 - 转发未知错误 5001 - 转发该动态不能转发分享 5002 - 转发请求数据发生错误，请刷新或稍后重试 5003 - 转发操作太频繁了，请稍后重试 5004	2021-12-05 19:56:50 +08:00
shanmite	f9ebbb30eb	docs: 更新CHANGELOG	2021-12-03 19:16:39 +08:00
shanmite	b36c555c13	ci: auto gen changelog	2021-12-03 19:15:34 +08:00
shanmite	7338e09caf	feat: 更新`notice_key_words` 更新屏蔽通知词 "~你的账号在新设备或平台登录成功", "~你预约的直播已开始"	2021-12-03 18:46:28 +08:00
shanmite	80a54e87f8	ci: `*.exe` `latest_version0`	2021-12-03 15:49:17 +08:00
shanmite	1a6291471a	feat: 新增设置`is_outof_maxfollow`(#80 ) 关注已达上限时自动切换	2021-12-03 15:29:21 +08:00
shanmite	449c8d9272	docs: update README	2021-12-02 21:53:27 +08:00
shanmite	136379a3aa	docs: 更新CHANGELOG	2021-12-02 19:47:00 +08:00
shanmite	313942adb7	ci: pkg.yml tag_name	2021-12-02 19:40:08 +08:00
shanmite	66efd62d56	feat: 新增设置`use_public_blacklist`	2021-12-02 19:29:26 +08:00
shanmite	d7cf7422f4	feat: 增加粉丝数查询第三方接口	2021-12-02 19:18:51 +08:00
shanmite	094e019063	fix: 二级转发带有效抽奖	2021-12-02 19:07:43 +08:00
shanmite	8de74537f7	fix: description获取不到	2021-12-02 18:51:59 +08:00
shanmite	70c10f247b	fix: 更改默认设置`key_words` `blockword`	2021-12-02 18:50:41 +08:00
shanmite	2f26a393ca	feat: 源uid参与筛选判断 - 重构筛选处关于uid的逻辑 - debug日志详细化	2021-12-02 17:53:49 +08:00
shanmite	a19739d2d8	docs: 更新CHANGELOG	2021-12-01 20:39:00 +08:00
shanmite	50e18e2772	feat: 下载更新时有多个版本	2021-12-01 20:30:18 +08:00
shanmite	b9c73bda96	chore: change docker auto build	2021-12-01 20:08:38 +08:00
shanmite	608b1fb83e	pref: 增加筛选时日志输出(#79 )	2021-12-01 19:26:50 +08:00
shanmite	07ef8dfb2e	chore: 移植并完善自动化构建脚本	2021-12-01 18:48:52 +08:00
shanmite	6b09e26cbf	chore: update docker init.sh see stackoverflow why-docker-run-creates-new-container-every-time	2021-11-30 16:19:16 +08:00
shanmite	7babd5780b	docs: about docker	2021-11-29 20:28:52 +08:00
shanmite	8b57a85476	chore: pkg build	2021-11-29 16:09:39 +08:00
shanmite	c85ea6bc77	docs: 更新CHANGELOG	2021-11-29 15:49:16 +08:00
shanmite	eae72dbdd7	feat: minfollower填0可关闭本地粉丝数筛选	2021-11-28 21:33:15 +08:00
shanmite	111602f248	perf: 日志显示是否转发过	2021-11-28 20:04:45 +08:00
shanmite	d366e252e9	fix: 转发动态时非限制性错误码(#72 ) ```json { "code":2201116, "msg":"请求数据发生错误，请刷新或稍后重试", "message":"请求数据发生错误，请刷新或稍后重试", "data":{} } ```	2021-11-27 15:14:25 +08:00
shanmite	40dcc5f879	docs: 更新CHANGELOG	2021-11-17 16:49:04 +08:00
shanmite	8c0d96afc6	refactor: 检测是否已经发送过随机动态(#71 ) * 优化随机动态发送逻辑 * 修复随机动态的部分bug	2021-11-17 16:42:17 +08:00
shanmite	09b6db4f8b	feat: 新增设置`check_session_pages`(#66 ) 获取私信页数 - check_session_pages - 默认16	2021-11-17 15:36:54 +08:00
shanmite	24e16ed8bc	fix: 多帐号使用默认设置初始化(#70 )	2021-11-17 15:20:43 +08:00
shanmite	fabe9f7d6e	docs: 更新CHANGELOG	2021-11-09 19:13:32 +08:00
jkluio78andshanmite	1962d97bc1	fix: 过滤专栏时间失效(#67 )	2021-11-09 19:04:07 +08:00
shanmite	c43ab13790	docs: 更新CHANGELOG	2021-11-08 16:04:13 +08:00
shanmite	11625b3850	feat: 检索专栏时能够根据发布时间进行过滤(#65 )	2021-11-08 15:40:10 +08:00
shanmite	8c7a6d13d6	fix: 多帐号设置未更新未填写对应的config_n导致沿用之前的设置	2021-11-08 11:31:43 +08:00