更新版本 v2.17.3

复制仓库任务时，保留任务原始目录层级
修改 git clone 参数
2026-08-11 10:40:52 +08:00 · 2024-03-29 22:45:02 +08:00 · 2024-03-28 23:42:05 +08:00 · 2024-03-28 23:00:49 +08:00 · 2024-03-25 23:41:39 +08:00 · 2024-03-25 22:42:28 +08:00
130 changed files with 5285 additions and 2448 deletions
@@ -1,3 +1,4 @@
+UPDATE_PORT=5300
 PUBLIC_PORT=5400
 CRON_PORT=5500
 BACK_PORT=5600
@@ -2,54 +2,51 @@ name: Build And Push Docker Image

 on:
  push:
+    paths-ignore:
+      - "*.md"
    branches:
-      - 'master'
-      - 'develop'
+      - "master"
+      - "develop"
    tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - "v*"
  schedule:
-    # 参考 https://jasonet.co/posts/scheduled-actions/
-    - cron: '00 14 * * *' # GMT 15:00 => 北京时间 23:00
+    - cron: "00 20 * * *"
  workflow_dispatch:

 jobs:
  to_gitlab:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - uses: pixta-dev/repository-mirroring-action@v1
        with:
-          target_repo_url:
-            git@gitlab.com:whyour/qinglong.git
-          ssh_private_key:
-            ${{ secrets.GITLAB_SSH_PK }}
+          target_repo_url: git@gitlab.com:whyour/qinglong.git
+          ssh_private_key: ${{ secrets.GITLAB_SSH_PK }}

  to_gitee:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - uses: pixta-dev/repository-mirroring-action@v1
        with:
-          target_repo_url:
-            git@gitee.com:whyour/qinglong.git
-          ssh_private_key:
-            ${{ secrets.GITLAB_SSH_PK }}
+          target_repo_url: git@gitee.com:whyour/qinglong.git
+          ssh_private_key: ${{ secrets.GITLAB_SSH_PK }}

  build-static:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
        with:
-          version: '8.3.1'
+          version: "8.3.1"

-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
-          cache: 'pnpm'
+          cache: "pnpm"

      - name: build front and back
        run: |
@@ -81,40 +78,43 @@ jobs:
          export GIT_SSH_COMMAND="ssh -v -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -l git"
          git remote add gitee "${REPO_GITEE}"
          git remote add gitlab "${REPO_GITLAB}"
+          git gc
          git push --force --quiet gitee ${GITHUB_BRANCH}:${GITHUB_BRANCH}
          git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}

  build:
    needs: build-static

-    runs-on: ubuntu-latest
+    # 由于 ubuntu-latest 中使用 linux6.x 内核 linux/s390x npm 无法使用
+    runs-on: ubuntu-20.04
+    # runs-on: self-hosted

    permissions:
      packages: write
      contents: read

    steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
        with:
-          version: '8.3.1'
-      - uses: actions/setup-node@v3
+          version: "8.3.1"
+      - uses: actions/setup-node@v4
        with:
-          cache: 'pnpm'
+          cache: "pnpm"

      - name: Setup timezone
-        uses: zcong1993/setup-timezone@master
+        uses: szenius/set-timezone@v1.2
        with:
-          timezone: Asia/Shanghai
+          timezoneLinux: Asia/Shanghai

      - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

      - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -122,7 +122,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ github.repository }}
@@ -142,14 +142,14 @@ jobs:
            type=semver,pattern={{major}}

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
        with:
          build-args: |
            MAINTAINER=${{ github.repository_owner }}
@@ -157,6 +157,7 @@ jobs:
            SOURCE_COMMIT=${{ github.sha }}
          network: host
          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
+          # platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386
          context: .
          file: ./docker/Dockerfile
          push: true
@@ -166,4 +167,69 @@ jobs:
          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max

      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+        run: |
+          echo ${{ steps.docker_build.outputs.digest }}
+  
+  build310:
+    if: ${{ github.ref_name == 'master' }}
+    needs: build-static
+
+    runs-on: ubuntu-20.04
+
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: "8.3.1"
+      - uses: actions/setup-node@v4
+        with:
+          cache: "pnpm"
+
+      - name: Setup timezone
+        uses: szenius/set-timezone@v1.2
+        with:
+          timezoneLinux: Asia/Shanghai
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push python3.10
+        id: docker_build_310
+        uses: docker/build-push-action@v5
+        with:
+          build-args: |
+            MAINTAINER=${{ github.repository_owner }}
+            QL_BRANCH=${{ github.ref_name }}
+            SOURCE_COMMIT=${{ github.sha }}
+          network: host
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
+          context: .
+          file: ./docker/310.Dockerfile
+          push: true
+          tags: whyour/qinglong:python3.10
+          cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
+          cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
+
+      - name: Image digest
+        run: |
+          echo ${{ steps.docker_build_310.outputs.digest }}
@@ -22,11 +22,4 @@
 .env
 .history
 .version.ts
-
-/config
-/log
-/db
-/manual_log
-/scripts
-/bak
 /.tmp
@@ -1,2 +1 @@
-sentrycli_cdnurl=https://npmmirror.com/mirrors/sentry-cli/
 strict-peer-dependencies=false
@@ -21,12 +21,5 @@ src/.umi-production
 src/.umi-test
 .env.local
 .env
-history
 version.ts
-config
-log
-db
-manual_log
-scripts
-bak
-.tmp
+/.tmp
@@ -16,6 +16,11 @@ export default defineConfig({
  favicons: [`https://qn.whyour.cn/favicon.svg`],
  publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
  proxy: {
+    [`${baseUrl}api/update`]: {
+      target: 'http://127.0.0.1:5300/',
+      changeOrigin: true,
+      pathRewrite: { [`^${baseUrl}api/update`]: '/api' },
+    },
    [`${baseUrl}api/public`]: {
      target: 'http://127.0.0.1:5400/',
      changeOrigin: true,
@@ -47,4 +52,10 @@ export default defineConfig({
    'https://gw.alipayobjects.com/os/lib/react/18.2.0/umd/react.production.min.js',
    'https://gw.alipayobjects.com/os/lib/react-dom/18.2.0/umd/react-dom.production.min.js',
  ],
+  copy: [
+    {
+      from: 'node_modules/monaco-editor/min/vs',
+      to: 'static/dist/monaco-editor/min/vs',
+    },
+  ],
 });
@@ -36,6 +36,7 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - Support cell phone operation

 ## Version
+
 ### docker

 The `latest` image is built on `alpine` and the `debian` image is built on `debian-slim`. If you need to use a dependency that is not supported by `alpine`, it is recommended that you use the `debian` image.
@@ -53,6 +54,62 @@ The npm version supports `debian/ubuntu/centos/alpine` systems and requires `nod
 npm i @whyour/qinglong
 ```

+## Built-in commands
+
+- task
+
+```bash
+# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
+task <file_path>                                             
+# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
+# and the foreground will output the day, while recorded in the log file
+task <file_path> now                                         
+# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
+# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
+task <file_path> conc <env_name> <account_number>(Optional) 
+# Specify the account to execute and run immediately regardless of whether a random delay is set 
+task <file_path> desi <env_name> <account_number>       
+# Set task timeout   
+task -m <max_time> <file_path>
+# Use -- to split, -- followed by a parameter that is passed to the script, as in the following example, the script receives the parameter -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+- ql
+
+```bash
+# Update and restart Green Dragon
+ql update                                                    
+# Run custom scripts extra.sh
+ql extra                                                     
+# Adding a single script file
+ql raw <file_url>                                             
+# Add a specific script for a single repository
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+# Delete old logs
+ql rmlog <days>                                              
+# Start bot
+ql bot                                                       
+# Detecting the Green Dragon environment and repairing it
+ql check                                                     
+# Reset the number of login errors
+ql resetlet                                                  
+# Disable two-step login
+ql resettfa                                                  
+```
+
+| **Parameter** | **Description** |
+|---|---|
+| file_url | Script address |
+| repo_url | Repository address |
+| whitelist | The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled |
+| blacklist | Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled |
+| dependence | Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist |
+| extensions | Pull the branch of the repository |
+| branch | Number of days of logs to be kept |
+| days | File path for task execution |
+| file_path | The name of the environment variable that needs to be concurrent or specified at the time of task execution |
+
 ## Deployment

 ### Docker (Recommended)
@@ -61,7 +118,12 @@ npm i @whyour/qinglong
 # curl -sSL get.docker.com | sh
 docker run -dit \
  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
  --name qinglong \
  --hostname qinglong \
  --restart unless-stopped \
@@ -88,7 +150,12 @@ docker-compose down
 podman run -dit \
  --network bridge \
  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
  --name qinglong \
  --hostname qinglong \
  docker.io/whyour/qinglong:latest
@@ -99,6 +166,14 @@ podman run -dit \
 It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3 yourself

 ```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+# Centos
+curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
 npm install -g @whyour/qinglong
 qinglong
 # Add the environment variables QL_DIR and QL_DATA_DIR when prompted
@@ -108,64 +183,10 @@ export QL_DATA_DIR=""
 qinglong
 ```

-## Use
-
-1. built-in commands
-
-```bash
-# Update and restart Green Dragon
-ql update                                                    
-# Run custom scripts extra.sh
-ql extra                                                     
-# Adding a single script file
-ql raw <file_url>                                             
-# Add a specific script for a single repository
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
-# Delete old logs
-ql rmlog <days>                                              
-# Start bot
-ql bot                                                       
-# Detecting the Green Dragon environment and repairing it
-ql check                                                     
-# Reset the number of login errors
-ql resetlet                                                  
-# Disable two-step login
-ql resettfa                                                  
-
-# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
-task <file_path>                                             
-# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
-# and the foreground will output the day, while recorded in the log file
-task <file_path> now                                         
-# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
-# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
-task <file_path> conc <env_name> <account_number>(Optional) 
-# Specify the account to execute and run immediately regardless of whether a random delay is set 
-task <file_path> desi <env_name> <account_number>       
-# Set task timeout   
-task -m <max_time> <file_path>
-# Print task log in real time, no need to carry this parameter when creating timed tasks
-task -l <file_path>  
-```
-
-2. parameter description
-
-* file_url: Script address
-* repo_url: Repository address
-* whitelist: The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled
-* blacklist: Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled
-* dependence: Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist
-* branch: Pull the branch of the repository
-* days: Number of days of logs to be kept
-* file_path: File path for task execution
-* env_name: The name of the environment variable that needs to be concurrent or specified at the time of task execution
-* account_number: Specify the account number of an environment variable to be executed when the task is executed
-* max_time: Timeout, suffix "s" for seconds (default), "m" for minutes, "h" for hours, "d" for days
-
 ## Development

 ```bash
-$ git clone git@github.com:whyour/qinglong.git
+$ git clone https://github.com/whyour/qinglong.git
 $ cd qinglong
 $ cp .env.example .env
 # Recommended use pnpm https://pnpm.io/zh/installation
@@ -174,7 +195,7 @@ $ pnpm install
 $ pnpm start
 ```

-Open your browser and visit http://127.0.0.1:5700
+Open your browser and visit <http://127.0.0.1:5700>

 ## Links

@@ -38,6 +38,7 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - 支持手机端操作

 ## 版本
+
 ### docker

 `latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像
@@ -55,6 +56,60 @@ npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node
 npm i @whyour/qinglong
 ```

+## 内置命令
+
+- task
+
+```bash
+# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
+task <file_path>                                             
+# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
+task <file_path> now                                         
+# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
+task <file_path> conc <env_name> <account_number>(可选的) 
+# 指定账号执行，无论是否设置了随机延迟，均立即运行 
+task <file_path> desi <env_name> <account_number>      
+# 设置任务超时时间   
+task -m <max_time> <file_path>
+# 使用 -- 分割，-- 后面的参数会传给脚本，下面的例子，脚本就可接收到参数 -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+- ql
+
+```bash
+# 更新并重启青龙
+ql update
+# 运行自定义脚本extra.sh
+ql extra
+# 添加单个脚本文件
+ql raw <file_url>
+# 添加单个仓库的指定脚本
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
+# 删除旧日志
+ql rmlog <days>
+# 启动tg-bot
+ql bot
+# 检测青龙环境并修复
+ql check
+# 重置登录错误次数
+ql resetlet                                                  
+# 禁用两步登录
+ql resettfa
+```
+
+| **参数**   | **说明**                                                                                    |
+|------------|---------------------------------------------------------------------------------------------|
+| file_url   | 脚本地址                                                                                    |
+| repo_url   | 仓库地址                                                                                    |
+| whitelist  | 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割                    |
+| blacklist  | 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割                  |
+| dependence | 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割 |
+| extensions | 拉取仓库的文件后缀，多个竖线分割                                                            |
+| branch     | 拉取仓库的分支                                                                              |
+| days       | 需要保留的日志的天数                                                                        |
+| file_path  | 任务执行时的文件路径                                                                        |
+
 ## 部署

 ### docker (推荐)
@@ -63,9 +118,12 @@ npm i @whyour/qinglong
 # curl -sSL get.docker.com | sh
 docker run -dit \
  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
  -p 5700:5700 \
-  # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+  # 部署路径非必须，比如 /test
  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
  --name qinglong \
  --hostname qinglong \
  --restart unless-stopped \
@@ -92,9 +150,12 @@ docker-compose down
 podman run -dit \
  --network bridge \
  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
  -p 5700:5700 \
-  # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+  # 部署路径非必须，比如 /test
  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
  --name qinglong \
  --hostname qinglong \
  docker.io/whyour/qinglong:latest
@@ -105,6 +166,14 @@ podman run -dit \
 建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3

 ```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+# Centos
+curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
 npm install -g @whyour/qinglong
 qinglong
 # 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
@@ -114,63 +183,10 @@ export QL_DATA_DIR=""
 qinglong
 ```

-## 使用
-
-1. 内置命令
-
-```bash
-# 更新并重启青龙
-ql update                                                    
-# 运行自定义脚本extra.sh
-ql extra                                                     
-# 添加单个脚本文件
-ql raw <file_url>                                             
-# 添加单个仓库的指定脚本
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
-# 删除旧日志
-ql rmlog <days>                                              
-# 启动tg-bot
-ql bot                                                       
-# 检测青龙环境并修复
-ql check                                                     
-# 重置登录错误次数
-ql resetlet                                                  
-# 禁用两步登录
-ql resettfa                                                  
-
-# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
-task <file_path>                                             
-# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
-task <file_path> now                                         
-# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
-task <file_path> conc <env_name> <account_number>(可选的) 
-# 指定账号执行，无论是否设置了随机延迟，均立即运行 
-task <file_path> desi <env_name> <account_number>      
-# 设置任务超时时间   
-task -m <max_time> <file_path>
-# 实时打印任务日志，创建定时任务时，不用携带此参数
-task -l <file_path>
-```
-
-2. 参数说明
-
-* file_url: 脚本地址
-* repo_url: 仓库地址
-* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
-* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
-* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
-* extensions: 拉取仓库的文件后缀，多个竖线分割
-* branch: 拉取仓库的分支
-* days: 需要保留的日志的天数
-* file_path: 任务执行时的文件路径
-* env_name: 任务执行时需要并发或者指定时的环境变量名称
-* account_number: 任务执行时指定某个环境变量需要执行的账号序号
-* max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-
 ## 开发

 ```bash
-$ git clone git@github.com:whyour/qinglong.git
+$ git clone https://github.com/whyour/qinglong.git
 $ cd qinglong
 $ cp .env.example .env
 # 推荐使用 pnpm https://pnpm.io/zh/installation
@@ -179,7 +195,7 @@ $ pnpm install
 $ pnpm start
 ```

-打开你的浏览器，访问 http://127.0.0.1:5700
+打开你的浏览器，访问 <http://127.0.0.1:5700>

 ## 链接

@@ -3,20 +3,36 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import config from '../config';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import { celebrate, Joi } from 'celebrate';
 import { join } from 'path';
+import { SAMPLE_FILES } from '../config/const';
+import ConfigService from '../services/config';
 const route = Router();

 export default (app: Router) => {
  app.use('/configs', route);

+  route.get(
+    '/sample',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        res.send({
+          code: 200,
+          data: SAMPLE_FILES,
+        });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
  route.get(
    '/files',
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
      try {
-        const fileList = fs.readdirSync(config.configPath, 'utf-8');
+        const fileList = await fs.readdir(config.configPath, 'utf-8');
        res.send({
          code: 200,
          data: fileList
@@ -32,24 +48,11 @@ export default (app: Router) => {
  );

  route.get(
-    '/:file',
+    '/detail',
    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
-        let content = '';
-        if (config.blackFileList.includes(req.params.file)) {
-          res.send({ code: 403, message: '文件无法访问' });
-        }
-        if (req.params.file.includes('sample')) {
-          content = getFileContentByName(
-            join(config.samplePath, req.params.file),
-          );
-        } else {
-          content = getFileContentByName(
-            join(config.configPath, req.params.file),
-          );
-        }
-        res.send({ code: 200, data: content });
+        const configService = Container.get(ConfigService);
+        await configService.getFile(req.query.path as string, res);
      } catch (e) {
        return next(e);
      }
@@ -71,12 +74,27 @@ export default (app: Router) => {
        if (config.blackFileList.includes(name)) {
          res.send({ code: 403, message: '文件无法访问' });
        }
-        const path = join(config.configPath, name);
-        fs.writeFileSync(path, content);
+        let path = join(config.configPath, name);
+        if (name.startsWith('data/scripts/')) {
+          path = join(config.rootPath, name);
+        }
+        await fs.writeFile(path, content);
        res.send({ code: 200, message: '保存成功' });
      } catch (e) {
        return next(e);
      }
    },
  );
+
+  route.get(
+    '/:file',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const configService = Container.get(ConfigService);
+        await configService.getFile(req.params.file, res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };
@@ -176,6 +176,9 @@ export default (app: Router) => {
        name: Joi.string().optional(),
        labels: Joi.array().optional(),
        sub_id: Joi.number().optional().allow(null),
+        extra_schedules: Joi.array().optional().allow(null),
+        task_before: Joi.string().optional().allow('').allow(null),
+        task_after: Joi.string().optional().allow('').allow(null),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
@@ -333,6 +336,9 @@ export default (app: Router) => {
        schedule: Joi.string().required(),
        name: Joi.string().optional().allow(null),
        sub_id: Joi.number().optional().allow(null),
+        extra_schedules: Joi.array().optional().allow(null),
+        task_before: Joi.string().optional().allow('').allow(null),
+        task_after: Joi.string().optional().allow('').allow(null),
        id: Joi.number().required(),
      }),
    }),
@@ -452,13 +458,12 @@ export default (app: Router) => {
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
        const cronService = Container.get(CronService);
        const data = await cronService.status({
          ...req.body,
-          status: parseInt(req.body.status),
-          pid: parseInt(req.body.pid) || '',
+          status: req.body.status ? parseInt(req.body.status) : undefined,
+          pid: req.body.pid ? parseInt(req.body.pid) : undefined,
        });
        return res.send({ code: 200, data });
      } catch (e) {
@@ -134,4 +134,20 @@ export default (app: Router) => {
      }
    },
  );
+
+  route.put(
+    '/cancel',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const dependenceService = Container.get(DependenceService);
+        await dependenceService.cancel(req.body);
+        return res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };
@@ -3,7 +3,7 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { emptyDir, getFileContentByName, readDirs } from '../config/util';
+import { getFileContentByName, readDirs, rmPath } from '../config/util';
 import { join } from 'path';
 import { celebrate, Joi } from 'celebrate';
 const route = Router();
@@ -15,7 +15,7 @@ export default (app: Router) => {
  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
    const logger: Logger = Container.get('logger');
    try {
-      const result = readDirs(config.logPath, config.logPath, blacklist);
+      const result = await readDirs(config.logPath, config.logPath, blacklist);
      res.send({
        code: 200,
        data: result,
@@ -26,10 +26,29 @@ export default (app: Router) => {
    }
  });

+  route.get(
+    '/detail',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        if (blacklist.includes(req.path)) {
+          return res.send({ code: 403, message: '暂无权限' });
+        }
+        const filePath = join(
+          config.logPath,
+          (req.query.path || '') as string,
+          req.query.file as string,
+        );
+        const content = await getFileContentByName(filePath);
+        res.send({ code: 200, data: content });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
  route.get(
    '/:file',
    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
        if (blacklist.includes(req.path)) {
          return res.send({ code: 403, message: '暂无权限' });
@@ -39,7 +58,7 @@ export default (app: Router) => {
          (req.query.path || '') as string,
          req.params.file,
        );
-        const content = getFileContentByName(filePath);
+        const content = await getFileContentByName(filePath);
        res.send({ code: 200, data: content });
      } catch (e) {
        return next(e);
@@ -64,11 +83,7 @@ export default (app: Router) => {
          type: string;
        };
        const filePath = join(config.logPath, path, filename);
-        if (type === 'directory') {
-          emptyDir(filePath);
-        } else {
-          fs.unlinkSync(filePath);
-        }
+        await rmPath(filePath);
        res.send({ code: 200 });
      } catch (e) {
        return next(e);
@@ -4,13 +4,13 @@ import {
  readDirs,
  getLastModifyFilePath,
  readDir,
-  emptyDir,
+  rmPath,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import config from '../config';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import { celebrate, Joi } from 'celebrate';
 import path, { join, parse } from 'path';
 import ScriptService from '../services/script';
@@ -34,15 +34,33 @@ export default (app: Router) => {
    const logger: Logger = Container.get('logger');
    try {
      let result = [];
-      const blacklist = ['node_modules', '.git'];
+      const blacklist = [
+        'node_modules',
+        '.git',
+        '.pnpm',
+        'pnpm-lock.yaml',
+        'yarn.lock',
+        'package-lock.json',
+      ];
      if (req.query.path) {
        const targetPath = path.join(
          config.scriptPath,
          req.query.path as string,
        );
-        result = readDir(targetPath, config.scriptPath, blacklist);
+        result = await readDir(targetPath, config.scriptPath, blacklist);
      } else {
-        result = readDirs(config.scriptPath, config.scriptPath, blacklist);
+        result = await readDirs(
+          config.scriptPath,
+          config.scriptPath,
+          blacklist,
+          (a, b) => {
+            if (a.type === b.type) {
+              return a.title.localeCompare(b.title);
+            } else {
+              return a.type === 'directory' ? -1 : 1;
+            }
+          },
+        );
      }
      res.send({
        code: 200,
@@ -54,17 +72,31 @@ export default (app: Router) => {
    }
  });

+  route.get(
+    '/detail',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const scriptService = Container.get(ScriptService);
+        const content = await scriptService.getFile(
+          req.query.path as string,
+          req.query.file as string,
+        );
+        res.send({ code: 200, data: content });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
  route.get(
    '/:file',
    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
-        const filePath = join(
-          config.scriptPath,
+        const scriptService = Container.get(ScriptService);
+        const content = await scriptService.getFile(
          req.query.path as string,
          req.params.file,
        );
-        const content = getFileContentByName(filePath);
        res.send({ code: 200, data: content });
      } catch (e) {
        return next(e);
@@ -104,12 +136,12 @@ export default (app: Router) => {
        }

        if (req.file) {
-          fs.renameSync(req.file.path, join(path, req.file.filename));
+          await fs.rename(req.file.path, join(path, req.file.filename));
          return res.send({ code: 200 });
        }

        if (directory) {
-          fs.mkdirSync(join(path, directory), { recursive: true });
+          await fs.mkdir(join(path, directory), { recursive: true });
          return res.send({ code: 200 });
        }

@@ -121,16 +153,17 @@ export default (app: Router) => {
          `${originFilename.replace(/\//g, '')}`,
        );
        const filePath = join(path, `${filename.replace(/\//g, '')}`);
-        if (fs.existsSync(originFilePath)) {
-          fs.copyFileSync(
+        const fileExists = await fileExist(filePath);
+        if (fileExists) {
+          await fs.copyFile(
            originFilePath,
            join(config.bakPath, originFilename.replace(/\//g, '')),
          );
          if (filename !== originFilename) {
-            fs.unlinkSync(originFilePath);
+            await rmPath(originFilePath);
          }
        }
-        fs.writeFileSync(filePath, content);
+        await fs.writeFile(filePath, content);
        return res.send({ code: 200 });
      } catch (e) {
        return next(e);
@@ -156,7 +189,7 @@ export default (app: Router) => {
          path: string;
        };
        const filePath = join(config.scriptPath, path, filename);
-        fs.writeFileSync(filePath, content);
+        await fs.writeFile(filePath, content);
        return res.send({ code: 200 });
      } catch (e) {
        return next(e);
@@ -182,11 +215,7 @@ export default (app: Router) => {
          type: string;
        };
        const filePath = join(config.scriptPath, path, filename);
-        if (type === 'directory') {
-          emptyDir(filePath);
-        } else {
-          fs.unlinkSync(filePath);
-        }
+        await rmPath(filePath);
        res.send({ code: 200 });
      } catch (e) {
        return next(e);
@@ -239,7 +268,7 @@ export default (app: Router) => {
        let { filename, content, path } = req.body;
        const { name, ext } = parse(filename);
        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
-        fs.writeFileSync(filePath, content || '', { encoding: 'utf8' });
+        await fs.writeFile(filePath, content || '', { encoding: 'utf8' });

        const scriptService = Container.get(ScriptService);
        const result = await scriptService.runScript(filePath);
@@ -260,7 +289,6 @@ export default (app: Router) => {
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
        let { filename, path, pid } = req.body;
        const { name, ext } = parse(filename);
@@ -269,7 +297,9 @@ export default (app: Router) => {

        const scriptService = Container.get(ScriptService);
        const result = await scriptService.stopScript(filePath, pid);
-        emptyDir(logPath);
+        setTimeout(() => {
+          rmPath(logPath);
+        }, 3000);
        res.send(result);
      } catch (e) {
        return next(e);
@@ -296,7 +326,7 @@ export default (app: Router) => {
        };
        const filePath = join(config.scriptPath, path, filename);
        const newPath = join(config.scriptPath, path, newFilename);
-        fs.renameSync(filePath, newPath);
+        await fs.rename(filePath, newPath);
        res.send({ code: 200 });
      } catch (e) {
        return next(e);
@@ -1,12 +1,11 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import config from '../config';
 import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
-import { EnvModel } from '../data/env';
 import {
  getUniqPath,
  handleLogPath,
@@ -78,18 +77,16 @@ export default (app: Router) => {
  );

  route.put(
-    '/config',
+    '/config/log-remove-frequency',
    celebrate({
      body: Joi.object({
-        logRemoveFrequency: Joi.number().optional().allow(null),
-        cronConcurrency: Joi.number().optional().allow(null),
+        logRemoveFrequency: Joi.number().allow(null),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
        const systemService = Container.get(SystemService);
-        const result = await systemService.updateSystemConfig(req.body);
+        const result = await systemService.updateLogRemoveFrequency(req.body);
        res.send(result);
      } catch (e) {
        return next(e);
@@ -97,6 +94,96 @@ export default (app: Router) => {
    },
  );

+  route.put(
+    '/config/cron-concurrency',
+    celebrate({
+      body: Joi.object({
+        cronConcurrency: Joi.number().allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.updateCronConcurrency(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/config/dependence-proxy',
+    celebrate({
+      body: Joi.object({
+        dependenceProxy: Joi.string().allow('').allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.updateDependenceProxy(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/config/node-mirror',
+    celebrate({
+      body: Joi.object({
+        nodeMirror: Joi.string().allow('').allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        res.setHeader('Content-type', 'application/octet-stream');
+        await systemService.updateNodeMirror(req.body, res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/config/python-mirror',
+    celebrate({
+      body: Joi.object({
+        pythonMirror: Joi.string().allow('').allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.updatePythonMirror(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/config/linux-mirror',
+    celebrate({
+      body: Joi.object({
+        linuxMirror: Joi.string().allow('').allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        res.setHeader('Content-type', 'application/octet-stream');
+        await systemService.updateLinuxMirror(req.body, res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
  route.put(
    '/update-check',
    async (req: Request, res: Response, next: NextFunction) => {
@@ -129,7 +216,7 @@ export default (app: Router) => {
    '/reload',
    celebrate({
      body: Joi.object({
-        type: Joi.string().required(),
+        type: Joi.string().optional().allow('').allow(null),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
@@ -174,7 +261,7 @@ export default (app: Router) => {
    async (req: Request, res: Response, next: NextFunction) => {
      try {
        const systemService = Container.get(SystemService);
-        const command = req.body.command
+        const command = req.body.command;
        const idStr = `cat ${config.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
        let id = await promiseExec(idStr);
        const uniqPath = await getUniqPath(command, id);
@@ -193,12 +280,12 @@ export default (app: Router) => {
            onError: async (message: string) => {
              res.write(`\n${message}`);
              const absolutePath = await handleLogPath(logPath);
-              fs.appendFileSync(absolutePath, `\n${message}`);
+              await fs.appendFile(absolutePath, `\n${message}`);
            },
            onLog: async (message: string) => {
              res.write(`\n${message}`);
              const absolutePath = await handleLogPath(logPath);
-              fs.appendFileSync(absolutePath, `\n${message}`);
+              await fs.appendFile(absolutePath, `\n${message}`);
            },
          },
        );
@@ -253,16 +340,12 @@ export default (app: Router) => {
    },
  );

-  route.get(
-    '/log',
-    async (req: Request, res: Response, next: NextFunction) => {
+  route.get('/log', async (req: Request, res: Response, next: NextFunction) => {
    try {
      const systemService = Container.get(SystemService);
      await systemService.getSystemLog(res);
    } catch (e) {
      return next(e);
    }
-    },
-  );
-
+  });
 };
@@ -74,6 +74,9 @@ export default (app: Router) => {
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
      try {
+        if (process.env.DeployEnv === 'demo') {
+          return res.send({ code: 450, message: '未知错误' });
+        }
        const userService = Container.get(UserService);
        await userService.updateUsernameAndPassword(req.body);
        res.send({ code: 200, message: '更新成功' });
@@ -2,7 +2,6 @@ import 'reflect-metadata'; // We need this in order to use @Decorators
 import config from './config';
 import express from 'express';
 import Logger from './loaders/logger';
-import path from 'path';

 async function startServer() {
  const app = express();
@@ -5,3 +5,21 @@ export const QL_COMMAND = 'ql';

 export const TASK_PREFIX = `${TASK_COMMAND} `;
 export const QL_PREFIX = `${QL_COMMAND} `;
+
+export const SAMPLE_FILES = [
+  {
+    title: 'config.sample.sh',
+    value: 'sample/config.sample.sh',
+    target: 'config.sh',
+  },
+  {
+    title: 'notify.js',
+    value: 'sample/notify.js',
+    target: 'data/scripts/sendNotify.js',
+  },
+  {
+    title: 'notify.py',
+    value: 'sample/notify.py',
+    target: 'data/scripts/notify.py',
+  },
+];
@@ -47,6 +47,7 @@ const configString = 'config sample crontab shareCode diy';
 const versionFile = path.join(rootPath, 'version.yaml');
 const dataTgzFile = path.join(tmpPath, 'data.tgz');
 const shareShellFile = path.join(shellPath, 'share.sh');
+const dependenceProxyFile = path.join(configPath, 'dependence-proxy.sh');

 if (envFound.error) {
  throw new Error("⚠️  Couldn't find .env file  ⚠️");
@@ -56,6 +57,7 @@ export default {
  port: parseInt(process.env.BACK_PORT as string, 10),
  cronPort: parseInt(process.env.CRON_PORT as string, 10),
  publicPort: parseInt(process.env.PUBLIC_PORT as string, 10),
+  updatePort: parseInt(process.env.UPDATE_PORT as string, 10),
  secret: process.env.SECRET || createRandomString(16, 32),
  logs: {
    level: process.env.LOG_LEVEL || 'silly',
@@ -68,6 +70,7 @@ export default {
  dataPath,
  dataTgzFile,
  shareShellFile,
+  dependenceProxyFile,
  configString,
  loginFaild,
  authError,
@@ -89,6 +92,7 @@ export default {
    'config.sh.sample',
    'cookie.sh',
    'crontab.list',
+    'dependence-proxy.sh',
    'env.sh',
    'token.json',
  ],
@@ -1,11 +1,19 @@
 import { Request, Response } from 'express';
-import { pick } from 'lodash';
+import pick from 'lodash/pick';

 let pickedEnv: Record<string, string>;

 function getPickedEnv() {
  if (pickedEnv) return pickedEnv;
  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv']);
+  if (picked.QlBaseUrl) {
+    if (!picked.QlBaseUrl.startsWith('/')) {
+      picked.QlBaseUrl = `/${picked.QlBaseUrl}`
+    }
+    if (!picked.QlBaseUrl.endsWith('/')) {
+      picked.QlBaseUrl = `${picked.QlBaseUrl}/`
+    }
+  }
  pickedEnv = picked as Record<string, string>;
  return picked;
 }
@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import * as path from 'path';
 import got from 'got';
 import iconv from 'iconv-lite';
@@ -13,22 +13,24 @@ import Logger from '../loaders/logger';

 export * from './share';

-export function getFileContentByName(fileName: string) {
-  if (fs.existsSync(fileName)) {
-    return fs.readFileSync(fileName, 'utf8');
+export async function getFileContentByName(fileName: string) {
+  const _exsit = await fileExist(fileName);
+  if (_exsit) {
+    return await fs.readFile(fileName, 'utf8');
  }
  return '';
 }

-export function getLastModifyFilePath(dir: string) {
+export async function getLastModifyFilePath(dir: string) {
  let filePath = '';

-  if (fs.existsSync(dir)) {
-    const arr = fs.readdirSync(dir);
+  const _exsit = await fileExist(dir);
+  if (_exsit) {
+    const arr = await fs.readdir(dir);

-    arr.forEach((item) => {
+    arr.forEach(async (item) => {
      const fullpath = path.join(dir, item);
-      const stats = fs.statSync(fullpath);
+      const stats = await fs.stat(fullpath);
      if (stats.isFile()) {
        if (stats.mtimeMs >= 0) {
          filePath = fullpath;
@@ -59,7 +61,8 @@ export async function getNetIp(req: any) {
      ...req.ips,
      req.socket.remoteAddress,
    ]),
-  ];
+  ].filter(Boolean);
+
  let ip = ipArray[0];

  if (ipArray.length > 1) {
@@ -80,34 +83,42 @@ export async function getNetIp(req: any) {
      break;
    }
  }
+
  ip = ip.substr(ip.lastIndexOf(':') + 1, ip.length);
  if (ip.includes('127.0') || ip.includes('192.168') || ip.includes('10.7')) {
    ip = '';
  }
+
+  if (!ip) {
+    return { address: `获取失败`, ip };
+  }
+
  try {
-    const baiduApi = got
-      .get(`https://www.cip.cc/${ip}`, { timeout: 10000, retry: 0 })
+    const csdnApi = got
+      .get(`https://searchplugin.csdn.net/api/v1/ip/get?ip=${ip}`, {
+        timeout: 10000,
+        retry: 0,
+      })
      .text();
-    const ipApi = got
+    const pconlineApi = got
      .get(`https://whois.pconline.com.cn/ipJson.jsp?ip=${ip}&json=true`, {
        timeout: 10000,
        retry: 0,
      })
      .buffer();
-    const [data, ipApiBody] = await await Promise.all<any>([baiduApi, ipApi]);
-
-    const ipRegx = /.*IP	:(.*)\n/;
-    const addrRegx = /.*数据二	:(.*)\n/;
-    if (data && ipRegx.test(data) && addrRegx.test(data)) {
-      const ip = data.match(ipRegx)[1];
-      const addr = data.match(addrRegx)[1];
-      return { address: addr, ip };
-    } else if (ipApiBody) {
-      const { addr, ip } = JSON.parse(iconv.decode(ipApiBody, 'GBK'));
-      return { address: `${addr}`, ip };
-    } else {
-      return { address: `获取失败`, ip };
+    const [csdnBody, pconlineBody] = await await Promise.all<any>([
+      csdnApi,
+      pconlineApi,
+    ]);
+    const csdnRes = JSON.parse(csdnBody);
+    const pconlineRes = JSON.parse(iconv.decode(pconlineBody, 'GBK'));
+    let address = '';
+    if (csdnBody && csdnRes.code == 200) {
+      address = csdnRes.data.address;
+    } else if (pconlineRes && pconlineRes.addr) {
+      address = pconlineRes.addr;
    }
+    return { address, ip };
  } catch (error) {
    return { address: `获取失败`, ip };
  }
@@ -147,22 +158,17 @@ export function getPlatform(userAgent: string): 'mobile' | 'desktop' {
 }

 export async function fileExist(file: any) {
-  return new Promise((resolve) => {
  try {
-      fs.accessSync(file);
-      resolve(true);
+    await fs.access(file);
+    return true;
  } catch (error) {
-      resolve(false);
+    return false;
  }
-  });
 }

 export async function createFile(file: string, data: string = '') {
-  return new Promise((resolve) => {
-    fs.mkdirSync(path.dirname(file), { recursive: true });
-    fs.writeFileSync(file, data);
-    resolve(true);
-  });
+  await fs.mkdir(path.dirname(file), { recursive: true });
+  await fs.writeFile(file, data);
 }

 export async function handleLogPath(
@@ -230,63 +236,71 @@ interface IFile {
 }

 export function dirSort(a: IFile, b: IFile): number {
-  if (a.type !== b.type) {
-    return FileType[a.type] < FileType[b.type] ? -1 : 1
-  } else if (a.mtime !== b.mtime) {
-    return a.mtime > b.mtime ? -1 : 1
+  if (a.type === 'file' && b.type === 'file') {
+    return b.mtime - a.mtime;
+  } else if (a.type === 'directory' && b.type === 'directory') {
+    return a.title.localeCompare(b.title);
  } else {
-    return 0;
+    return a.type === 'directory' ? -1 : 1;
  }
 }

-export function readDirs(
+export async function readDirs(
  dir: string,
  baseDir: string = '',
  blacklist: string[] = [],
-): IFile[] {
+  sort: (a: IFile, b: IFile) => number = dirSort,
+): Promise<IFile[]> {
  const relativePath = path.relative(baseDir, dir);
-  const files = fs.readdirSync(dir);
-  const result: IFile[] = files
-    .filter((x) => !blacklist.includes(x))
-    .map((file: string) => {
+  const files = await fs.readdir(dir);
+  const result: IFile[] = [];
+
+  for (const file of files) {
    const subPath = path.join(dir, file);
-      const stats = fs.statSync(subPath);
+    const stats = await fs.stat(subPath);
    const key = path.join(relativePath, file);
+
+    if (blacklist.includes(file) || stats.isSymbolicLink()) {
+      continue;
+    }
+
    if (stats.isDirectory()) {
-        return {
+      const children = await readDirs(subPath, baseDir, blacklist, sort);
+      result.push({
        title: file,
        key,
        type: 'directory',
        parent: relativePath,
        mtime: stats.mtime.getTime(),
-          children: readDirs(subPath, baseDir).sort(dirSort),
-        };
-      }
-      return {
+        children: children.sort(sort),
+      });
+    } else {
+      result.push({
        title: file,
        type: 'file',
-        isLeaf: true,
        key,
        parent: relativePath,
        size: stats.size,
        mtime: stats.mtime.getTime(),
-      };
      });
-  return result.sort(dirSort);
+    }
  }

-export function readDir(
+  return result.sort(sort);
+}
+
+export async function readDir(
  dir: string,
  baseDir: string = '',
  blacklist: string[] = [],
 ) {
  const relativePath = path.relative(baseDir, dir);
-  const files = fs.readdirSync(dir);
+  const files = await fs.readdir(dir);
  const result: any = files
    .filter((x) => !blacklist.includes(x))
-    .map((file: string) => {
+    .map(async (file: string) => {
      const subPath = path.join(dir, file);
-      const stats = fs.statSync(subPath);
+      const stats = await fs.stat(subPath);
      const key = path.join(relativePath, file);
      return {
        title: file,
@@ -298,23 +312,12 @@ export function readDir(
  return result;
 }

-export function emptyDir(path: string) {
-  const files = fs.readdirSync(path);
-  files.forEach((file) => {
-    const filePath = `${path}/${file}`;
-    const stats = fs.statSync(filePath);
-    if (stats.isDirectory()) {
-      emptyDir(filePath);
-    } else {
-      fs.unlinkSync(filePath);
-    }
-  });
-  fs.rmdirSync(path);
-}
-
 export async function promiseExec(command: string): Promise<string> {
  try {
-    const { stderr, stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
+    const { stderr, stdout } = await promisify(exec)(command, {
+      maxBuffer: 200 * 1024 * 1024,
+      encoding: 'utf8',
+    });
    return stdout || stderr;
  } catch (error) {
    return JSON.stringify(error);
@@ -323,7 +326,10 @@ export async function promiseExec(command: string): Promise<string> {

 export async function promiseExecSuccess(command: string): Promise<string> {
  try {
-    const { stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
+    const { stdout } = await promisify(exec)(command, {
+      maxBuffer: 200 * 1024 * 1024,
+      encoding: 'utf8',
+    });
    return stdout || '';
  } catch (error) {
    return '';
@@ -354,37 +360,49 @@ export function parseHeaders(headers: string) {
  return parsed;
 }

+function parseString(
+  input: string,
+  valueFormatFn?: (v: string) => string,
+): Record<string, string> {
+  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
+  const matches: Record<string, string> = {};
+
+  let match;
+  while ((match = regex.exec(input)) !== null) {
+    const [, key, value] = match;
+    const _key = key.trim();
+    if (!_key || matches[_key]) {
+      continue;
+    }
+
+    let _value = value.trim();
+
+    try {
+      _value = valueFormatFn ? valueFormatFn(_value) : _value;
+      const jsonValue = JSON.parse(_value);
+      matches[_key] = jsonValue;
+    } catch (error) {
+      matches[_key] = _value;
+    }
+  }
+
+  return matches;
+}
+
 export function parseBody(
  body: string,
  contentType:
    | 'application/json'
    | 'multipart/form-data'
-    | 'application/x-www-form-urlencoded',
+    | 'application/x-www-form-urlencoded'
+    | 'text/plain',
+  valueFormatFn?: (v: string) => string,
 ) {
-  if (!body) return '';
-
-  const parsed: any = {};
-  let key;
-  let val;
-  let i;
-
-  body &&
-    body.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim().toLowerCase();
-      val = line.substring(i + 1).trim();
-
-      if (!key || parsed[key]) {
-        return;
+  if (contentType === 'text/plain' || !body) {
+    return body;
  }

-      try {
-        const jsonValue = JSON.parse(val);
-        parsed[key] = jsonValue;
-      } catch (error) {
-        parsed[key] = val;
-      }
-    });
+  const parsed = parseString(body, valueFormatFn);

  switch (contentType) {
    case 'multipart/form-data':
@@ -414,11 +432,11 @@ export function psTree(pid: number): Promise<number[]> {

 export async function killTask(pid: number) {
  const pids = await psTree(pid);
-  // SIGINT 2 程序终止(interrupt)信号，不会打印额外信息
+
  if (pids.length) {
    try {
-      [pid, ...pids].forEach((x) => {
-        process.kill(x, 2);
+      [pid, ...pids].reverse().forEach((x) => {
+        process.kill(x, 15);
      });
    } catch (error) {}
  } else {
@@ -426,8 +444,8 @@ export async function killTask(pid: number) {
  }
 }

-export async function getPid(name: string) {
-  const taskCommand = `ps -eo pid,command | grep "${name}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
+export async function getPid(cmd: string) {
+  const taskCommand = `ps -eo pid,command | grep "${cmd}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
  const pid = await promiseExec(taskCommand);
  return pid ? Number(pid) : undefined;
 }
@@ -440,14 +458,17 @@ interface IVersion {
 }

 export async function parseVersion(path: string): Promise<IVersion> {
-  return load(await promisify(fs.readFile)(path, 'utf8')) as IVersion;
+  return load(await fs.readFile(path, 'utf8')) as IVersion;
 }

 export async function parseContentVersion(content: string): Promise<IVersion> {
  return load(content) as IVersion;
 }

-export async function getUniqPath(command: string, id: string): Promise<string> {
+export async function getUniqPath(
+  command: string,
+  id: string,
+): Promise<string> {
  if (/^\d+$/.test(id)) {
    id = `_${id}`;
  } else {
@@ -489,7 +510,18 @@ export function safeJSONParse(value?: string) {
  try {
    return JSON.parse(value);
  } catch (error) {
-    Logger.error('[JSON.parse失败]', error)
+    Logger.error('[JSON.parse失败]', error);
    return {};
  }
 }
+
+export async function rmPath(path: string) {
+  try {
+    const _exsit = await fileExist(path);
+    if (_exsit) {
+      await fs.rm(path, { force: true, recursive: true, maxRetries: 5 });
+    }
+  } catch (error) {
+    Logger.error('[rmPath失败]', error);
+  }
+}
@@ -18,6 +18,9 @@ export class Crontab {
  last_running_time?: number;
  last_execution_time?: number;
  sub_id?: number;
+  extra_schedules?: Array<{ schedule: string }>;
+  task_before?: string;
+  task_after?: string;

  constructor(options: Crontab) {
    this.name = options.name;
@@ -39,6 +42,9 @@ export class Crontab {
    this.last_running_time = options.last_running_time || 0;
    this.last_execution_time = options.last_execution_time || 0;
    this.sub_id = options.sub_id;
+    this.extra_schedules = options.extra_schedules;
+    this.task_before = options.task_before;
+    this.task_after = options.task_after;
  }
 }

@@ -75,4 +81,7 @@ export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
  last_running_time: DataTypes.NUMBER,
  last_execution_time: DataTypes.NUMBER,
  sub_id: { type: DataTypes.NUMBER, allowNull: true },
+  extra_schedules: DataTypes.JSON,
+  task_before: DataTypes.STRING,
+  task_after: DataTypes.STRING,
 });
@@ -32,6 +32,7 @@ export enum DependenceStatus {
  'removed',
  'removeFailed',
  'queued',
+  'cancelled',
 }

 export enum DependenceTypes {
@@ -18,6 +18,7 @@ export enum NotificationMode {
  'pushMe' = 'pushMe',
  'feishu' = 'feishu',
  'webhook' = 'webhook',
+  'chronocat' = 'Chronocat',
 }

 abstract class NotificationBaseInfo {
@@ -55,6 +56,8 @@ export class BarkNotification extends NotificationBaseInfo {
  public barkIcon = 'https://qn.whyour.cn/logo.png';
  public barkSound = '';
  public barkGroup = 'qinglong';
+  public barkLevel = 'active';
+  public barkUrl = '';
 }

 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -63,7 +66,7 @@ export class TelegramBotNotification extends NotificationBaseInfo {
  public telegramBotProxyHost = '';
  public telegramBotProxyPort = '';
  public telegramBotProxyAuth = '';
-  public telegramBotApiHost = 'api.telegram.org';
+  public telegramBotApiHost = 'https://api.telegram.org';
 }

 export class DingtalkBotNotification extends NotificationBaseInfo {
@@ -106,6 +109,12 @@ export class PushMeNotification extends NotificationBaseInfo {
  public pushMeKey: string = '';
 }

+export class ChronocatNotification extends NotificationBaseInfo {
+  public chronocatURL: string = '';
+  public chronocatQQ: string = '';
+  public chronocatToken: string = '';
+}
+
 export class WebhookNotification extends NotificationBaseInfo {
  public webhookHeaders: string = '';
  public webhookBody: string = '';
@@ -138,4 +147,6 @@ export interface NotificationInfo
    EmailNotification,
    PushMeNotification,
    WebhookNotification,
+    ChronocatNotification,
    LarkNotification {}
+    
@@ -17,4 +17,6 @@ export type SockMessageType =
  | 'updateSystemVersion'
  | 'manuallyRunScript'
  | 'runSubscriptionEnd'
-  | 'reloadSystem';
+  | 'reloadSystem'
+  | 'updateNodeMirror'
+  | 'updateLinuxMirror';
@@ -5,7 +5,7 @@ import { NotificationInfo } from './notify';
 export class AuthInfo {
  ip?: string;
  type: AuthDataType;
-  info?: AuthModelInfo;
+  info?: SystemModelInfo;
  id?: number;

  constructor(options: AuthInfo) {
@@ -32,6 +32,10 @@ export enum AuthDataType {
 export interface SystemConfigInfo {
  logRemoveFrequency?: number;
  cronConcurrency?: number;
+  dependenceProxy?: string;
+  nodeMirror?: string;
+  pythonMirror?: string;
+  linuxMirror?: string;
 }

 export interface LoginLogInfo {
@@ -42,12 +46,12 @@ export interface LoginLogInfo {
  status?: LoginStatus;
 }

-export type AuthModelInfo = SystemConfigInfo &
+export type SystemModelInfo = SystemConfigInfo &
  Partial<NotificationInfo> &
  LoginLogInfo;

-export interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
-export const AuthModel = sequelize.define<AuthInstance>('Auth', {
+export interface SystemInstance extends Model<AuthInfo, AuthInfo>, AuthInfo { }
+export const SystemModel = sequelize.define<SystemInstance>('Auth', {
  ip: DataTypes.STRING,
  type: DataTypes.STRING,
  info: {
@@ -3,3 +3,5 @@ declare namespace Express {
    platform: 'desktop' | 'mobile';
  }
 }
+
+declare module 'pstree.remy';
@@ -5,7 +5,7 @@ import { EnvModel } from '../data/env';
 import { CrontabModel } from '../data/cron';
 import { DependenceModel } from '../data/dependence';
 import { AppModel } from '../data/open';
-import { AuthModel } from '../data/auth';
+import { SystemModel } from '../data/system';
 import { fileExist } from '../config/util';
 import { SubscriptionModel } from '../data/subscription';
 import { CrontabViewModel } from '../data/cronView';
@@ -17,7 +17,7 @@ export default async () => {
    await CrontabModel.sync();
    await DependenceModel.sync();
    await AppModel.sync();
-    await AuthModel.sync();
+    await SystemModel.sync();
    await EnvModel.sync();
    await SubscriptionModel.sync();
    await CrontabViewModel.sync();
@@ -49,6 +49,15 @@ export default async () => {
    try {
      await sequelize.query('alter table Crontabs add column sub_id NUMBER');
    } catch (error) { }
+    try {
+      await sequelize.query('alter table Crontabs add column extra_schedules JSON');
+    } catch (error) { }
+    try {
+      await sequelize.query('alter table Crontabs add column task_before TEXT');
+    } catch (error) { }
+    try {
+      await sequelize.query('alter table Crontabs add column task_after TEXT');
+    } catch (error) { }

    // 2.10-2.11 升级
    const cronDbFile = path.join(config.rootPath, 'db/crontab.db');
@@ -66,7 +75,7 @@ export default async () => {
    const dependenceCount = await DependenceModel.count();
    const envCount = await EnvModel.count();
    const appCount = await AppModel.count();
-    const authCount = await AuthModel.count();
+    const authCount = await SystemModel.count();
    if (crondbExist && cronCount === 0) {
      const cronDb = new DataStore({
        filename: cronDbFile,
@@ -118,7 +127,7 @@ export default async () => {
      });
      authDb.persistence.compactDatafile();
      authDb.find({}).exec(async (err, docs) => {
-        await AuthModel.bulkCreate(docs, { ignoreDuplicates: true });
+        await SystemModel.bulkCreate(docs, { ignoreDuplicates: true });
      });
    }

@@ -1,20 +1,19 @@
 import path from 'path';
-import fs from 'fs';
+import fs from 'fs/promises';
 import chokidar from 'chokidar';
 import config from '../config/index';
-import { promiseExec } from '../config/util';
+import { fileExist, promiseExec, rmPath } from '../config/util';

-function linkToNodeModule(src: string, dst?: string) {
+async function linkToNodeModule(src: string, dst?: string) {
  const target = path.join(config.rootPath, 'node_modules', dst || src);
  const source = path.join(config.rootPath, src);

-  fs.lstat(target, (err, stat) => {
-    if (!stat) {
-      fs.symlink(source, target, 'dir', (err) => {
-        if (err) throw err;
-      });
+  try {
+    const stats = await fs.lstat(target);
+    if (!stats) {
+      await fs.symlink(source, target, 'dir');
    }
-  });
+  } catch (error) {}
 }

 async function linkCommand() {
@@ -34,16 +33,14 @@ async function linkCommand() {
  for (const link of linkShell) {
    const source = path.join(config.rootPath, 'shell', link.src);
    const target = path.join(commandDir, link.dest);
-    if (fs.existsSync(target)) {
-      fs.unlinkSync(target);
-    }
-    fs.symlink(source, target, (err) => { });
+    await rmPath(target);
+    await fs.symlink(source, target);
  }
 }

 export default async (src: string = 'deps') => {
  await linkCommand();
-  linkToNodeModule(src);
+  await linkToNodeModule(src);

  const source = path.join(config.rootPath, src);
  const watcher = chokidar.watch(source, {
@@ -4,7 +4,7 @@ import cors from 'cors';
 import routes from '../api';
 import config from '../config';
 import jwt, { UnauthorizedError } from 'express-jwt';
-import fs from 'fs';
+import fs from 'fs/promises';
 import { getPlatform, getToken, safeJSONParse } from '../config/util';
 import Container from 'typedi';
 import OpenService from '../services/open';
@@ -18,7 +18,7 @@ import { serveEnv } from '../config/serverEnv';
 import Logger from './logger';

 export default ({ app }: { app: Application }) => {
-  app.enable('trust proxy');
+  app.set('trust proxy', 'loopback');
  app.use(cors());
  app.get(`${config.api.prefix}/env.js`, serveEnv);
  app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));
@@ -29,7 +29,7 @@ export default ({ app }: { app: Application }) => {
      target: `http://0.0.0.0:${config.publicPort}/api`,
      changeOrigin: true,
      pathRewrite: { '/api/public': '' },
-      logProvider: () => Logger
+      logProvider: () => Logger,
    }),
  );

@@ -83,7 +83,7 @@ export default ({ app }: { app: Application }) => {
      return next();
    }

-    const data = fs.readFileSync(config.authConfigFile, 'utf8');
+    const data = await fs.readFile(config.authConfigFile, 'utf8');
    if (data && headerToken) {
      const { token = '', tokens = {} } = safeJSONParse(data);
      if (headerToken === token || tokens[req.platform] === headerToken) {
@@ -105,7 +105,6 @@ export default ({ app }: { app: Application }) => {
    }
    const userService = Container.get(UserService);
    const authInfo = await userService.getUserInfo();
-    const envCount = await EnvModel.count();

    let isInitialized = true;
    if (
@@ -9,11 +9,58 @@ import { Op } from 'sequelize';
 import config from '../config';
 import { CrontabViewModel, CronViewType } from '../data/cronView';
 import { initPosition } from '../data/env';
+import { AuthDataType, SystemModel } from '../data/system';
+import SystemService from '../services/system';

 export default async () => {
  const cronService = Container.get(CronService);
  const envService = Container.get(EnvService);
  const dependenceService = Container.get(DependenceService);
+  const systemService = Container.get(SystemService);
+
+  const installDependencies = () => {
+    // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
+    DependenceModel.findAll({
+      where: {},
+      order: [
+        ['type', 'DESC'],
+        ['createdAt', 'DESC'],
+      ],
+      raw: true,
+    }).then(async (docs) => {
+      await DependenceModel.update(
+        { status: DependenceStatus.queued, log: [] },
+        { where: { id: docs.map((x) => x.id!) } },
+      );
+      setTimeout(() => {
+        dependenceService.installDependenceOneByOne(docs);
+      }, 5000);
+    });
+  };
+
+  // 初始化更新 linux/python/nodejs 镜像源配置
+  const systemConfig = await systemService.getSystemConfig();
+  if (systemConfig.info?.pythonMirror) {
+    systemService.updatePythonMirror({
+      pythonMirror: systemConfig.info?.pythonMirror,
+    });
+  }
+  if (systemConfig.info?.linuxMirror) {
+    systemService.updateLinuxMirror(
+      {
+        linuxMirror: systemConfig.info?.linuxMirror,
+      },
+      undefined,
+      () => installDependencies(),
+    );
+  } else {
+    installDependencies();
+  }
+  if (systemConfig.info?.nodeMirror) {
+    systemService.updateNodeMirror({
+      nodeMirror: systemConfig.info?.nodeMirror,
+    });
+  }

  // 初始化新增默认全部任务视图
  CrontabViewModel.findAll({
@@ -32,22 +79,6 @@ export default async () => {
  // 初始化更新所有任务状态为空闲
  await CrontabModel.update({ status: CrontabStatus.idle }, { where: {} });

-  // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  DependenceModel.findAll({
-    where: {},
-    order: [
-      ['type', 'DESC'],
-      ['createdAt', 'DESC'],
-    ],
-    raw: true,
-  }).then(async (docs) => {
-    await DependenceModel.update(
-      { status: DependenceStatus.queued, log: [] },
-      { where: { id: docs.map((x) => x.id!) } },
-    );
-    dependenceService.installDependenceOneByOne(docs);
-  });
-
  // 初始化时执行一次所有的 ql repo 任务
  CrontabModel.findAll({
    where: {
@@ -127,4 +158,7 @@ export default async () => {
  // 初始化保存一次ck和定时任务数据
  await cronService.autosave_crontab();
  await envService.set_envs();
+
+  // 初始化增加系统配置
+  await SystemModel.upsert({ type: AuthDataType.systemConfig });
 };
@@ -1,7 +1,6 @@
-import fs from 'fs';
+import fs from 'fs/promises';
 import path from 'path';
 import os from 'os';
-import dotenv from 'dotenv';
 import Logger from './logger';
 import { fileExist } from '../config/util';

@@ -48,68 +47,72 @@ export default async () => {
  const TaskAfterFileExist = await fileExist(TaskAfterFile);

  if (!configDirExist) {
-    fs.mkdirSync(configPath);
+    await fs.mkdir(configPath);
  }

  if (!scriptDirExist) {
-    fs.mkdirSync(scriptPath);
+    await fs.mkdir(scriptPath);
  }

  if (!logDirExist) {
-    fs.mkdirSync(logPath);
+    await fs.mkdir(logPath);
  }

  if (!tmpDirExist) {
-    fs.mkdirSync(tmpPath);
+    await fs.mkdir(tmpPath);
  }

  if (!uploadDirExist) {
-    fs.mkdirSync(uploadPath);
+    await fs.mkdir(uploadPath);
  }

  if (!sshDirExist) {
-    fs.mkdirSync(sshPath);
+    await fs.mkdir(sshPath);
  }

  if (!bakDirExist) {
-    fs.mkdirSync(bakPath);
+    await fs.mkdir(bakPath);
  }

  if (!sshdDirExist) {
-    fs.mkdirSync(sshdPath);
+    await fs.mkdir(sshdPath);
  }

  if (!systemLogDirExist) {
-    fs.mkdirSync(systemLogPath);
+    await fs.mkdir(systemLogPath);
  }

  // 初始化文件
  if (!authFileExist) {
-    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
+    await fs.writeFile(authConfigFile, await fs.readFile(sampleAuthFile));
  }

  if (!confFileExist) {
-    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
+    await fs.writeFile(confFile, await fs.readFile(sampleConfigFile));
  }

  if (!scriptNotifyJsFileExist) {
-    fs.writeFileSync(scriptNotifyJsFile, fs.readFileSync(sampleNotifyJsFile));
+    await fs.writeFile(
+      scriptNotifyJsFile,
+      await fs.readFile(sampleNotifyJsFile),
+    );
  }

  if (!scriptNotifyPyFileExist) {
-    fs.writeFileSync(scriptNotifyPyFile, fs.readFileSync(sampleNotifyPyFile));
+    await fs.writeFile(
+      scriptNotifyPyFile,
+      await fs.readFile(sampleNotifyPyFile),
+    );
  }

  if (!TaskBeforeFileExist) {
-    fs.writeFileSync(TaskBeforeFile, fs.readFileSync(sampleTaskShellFile));
+    await fs.writeFile(TaskBeforeFile, await fs.readFile(sampleTaskShellFile));
  }

  if (!TaskAfterFileExist) {
-    fs.writeFileSync(TaskAfterFile, fs.readFileSync(sampleTaskShellFile));
+    await fs.writeFile(TaskAfterFile, await fs.readFile(sampleTaskShellFile));
  }

-  dotenv.config({ path: confFile });
-
  Logger.info('✌️ Init file down');
  console.log('✌️ Init file down');
 };
@@ -1,6 +1,6 @@
 import { Container } from 'typedi';
 import SystemService from '../services/system';
-import ScheduleService from '../services/schedule';
+import ScheduleService, { ScheduleTaskType } from '../services/schedule';
 import SubscriptionService from '../services/subscription';
 import config from '../config';
 import { fileExist } from '../config/util';
@@ -22,7 +22,7 @@ export default async () => {
    id: NaN,
    name: '生成token',
    command: tokenCommand,
-  };
+  } as ScheduleTaskType;
  await scheduleService.cancelIntervalTask(cron);
  scheduleService.createIntervalTask(cron, {
    days: 28,
@@ -1,6 +1,5 @@
 import { Application } from 'express';
 import * as Sentry from '@sentry/node';
-import * as Tracing from '@sentry/tracing';
 import Logger from './logger';
 import config from '../config';
 import fs from 'fs';
@@ -16,10 +15,10 @@ export default async ({ expressApp }: { expressApp: Application }) => {
      /UnauthorizedError/i,
      /celebrate request validation failed/i,
    ],
-    dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
+    dsn: 'https://8b5c84cfef3e22541bc84de0ed00497b@o1098464.ingest.sentry.io/6122819',
    integrations: [
      new Sentry.Integrations.Http({ tracing: true }),
-      new Tracing.Integrations.Express({ app: expressApp }),
+      new Sentry.Integrations.Express({ app: expressApp }),
    ],
    tracesSampleRate: 0.8,
    release: version,
@@ -5,38 +5,12 @@ import Sock from './sock';
 export default async ({ server }: { server: Server }) => {
  await Sock({ server });
  Logger.info('✌️ Sock loaded');
-  let exitTime = 0;
-  let timer: NodeJS.Timeout;
-
-  process.on('SIGINT', (singal) => {
-    Logger.warn(`Server need close, singal ${singal}`);
-    console.warn(`Server need close, singal ${singal}`);
-    exitTime++;
-    if (exitTime >= 3) {
-      Logger.warn('Forcing server close');
-      console.warn('Forcing server close');
-      clearTimeout(timer);
-      process.exit(1);
-    }
-    server.close(() => {
-      if (timer) {
-        clearTimeout(timer);
-      }
-      timer = setTimeout(() => {
-        process.exit();
-      }, 15000);
-    });
-  });

  process.on('uncaughtException', (error) => {
    Logger.error('Uncaught exception:', error);
-    console.error('Uncaught exception:', error);
-    process.exit(1);
  });

  process.on('unhandledRejection', (reason, promise) => {
    Logger.error('Unhandled rejection:', reason, promise);
-    console.error('Unhandled rejection:', reason, promise);
-    process.exit(1);
  });
 };
@@ -1,22 +1,21 @@
 import sockJs from 'sockjs';
 import { Server } from 'http';
-import Logger from './logger';
 import { Container } from 'typedi';
 import SockService from '../services/sock';
 import config from '../config/index';
-import fs from 'fs';
+import fs from 'fs/promises';
 import { getPlatform, safeJSONParse } from '../config/util';

 export default async ({ server }: { server: Server }) => {
  const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
  const sockService = Container.get(SockService);

-  echo.on('connection', (conn) => {
+  echo.on('connection', async (conn) => {
    if (!conn.headers || !conn.url || !conn.pathname) {
      conn.close('404');
    }

-    const data = fs.readFileSync(config.authConfigFile, 'utf8');
+    const data = await fs.readFile(config.authConfigFile, 'utf8');
    const platform = getPlatform(conn.headers['user-agent'] || '') || 'desktop';
    const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
    if (data) {
@@ -0,0 +1,106 @@
+import bodyParser from 'body-parser';
+import { errors } from 'celebrate';
+import cors from 'cors';
+import { Application, NextFunction, Request, Response } from 'express';
+import jwt from 'express-jwt';
+import Container from 'typedi';
+import config from '../config';
+import SystemService from '../services/system';
+import Logger from './logger';
+
+export default ({ app }: { app: Application }) => {
+  app.set('trust proxy', 'loopback');
+  app.use(cors());
+
+  app.use(bodyParser.json({ limit: '50mb' }));
+  app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
+
+  app.use(
+    jwt({
+      secret: config.secret,
+      algorithms: ['HS384'],
+    }),
+  );
+
+  app.put(
+    '/api/reload',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem();
+        res.send(result);
+      } catch (e) {
+        Logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  app.put(
+    '/api/system',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem('system');
+        res.send(result);
+      } catch (e) {
+        Logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  app.put(
+    '/api/data',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem('data');
+        res.send(result);
+      } catch (e) {
+        Logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  app.use((req, res, next) => {
+    const err: any = new Error('Not Found');
+    err['status'] = 404;
+    next(err);
+  });
+
+  app.use(errors());
+
+  app.use(
+    (
+      err: Error & { status: number },
+      req: Request,
+      res: Response,
+      next: NextFunction,
+    ) => {
+      if (err.name === 'UnauthorizedError') {
+        return res
+          .status(err.status)
+          .send({ code: 401, message: err.message })
+          .end();
+      }
+      return next(err);
+    },
+  );
+
+  app.use(
+    (
+      err: Error & { status: number },
+      req: Request,
+      res: Response,
+      next: NextFunction,
+    ) => {
+      res.status(err.status || 500);
+      res.json({
+        code: err.status || 500,
+        message: err.message,
+      });
+    },
+  );
+};
@@ -7,10 +7,14 @@ service Cron {
  rpc delCron(DeleteCronRequest) returns (DeleteCronResponse);
 }

+message ISchedule { string schedule = 1; }
+
 message ICron {
  string id = 1;
  string schedule = 2;
  string command = 3;
+  repeated ISchedule extra_schedules = 4;
+  string name = 5;
 }

 message AddCronRequest { repeated ICron crons = 1; }
@@ -10,78 +10,161 @@ import {
  Metadata,
  ServiceError,
  UntypedServiceImplementation,
-} from '@grpc/grpc-js';
-import _m0 from 'protobufjs/minimal';
+} from "@grpc/grpc-js";
+import _m0 from "protobufjs/minimal";

-export const protobufPackage = 'com.ql.cron';
+export const protobufPackage = "com.ql.cron";
+
+export interface ISchedule {
+  schedule: string;
+}

 export interface ICron {
  id: string;
  schedule: string;
  command: string;
+  extraSchedules: ISchedule[];
+  name: string;
 }

 export interface AddCronRequest {
  crons: ICron[];
 }

-export interface AddCronResponse {}
+export interface AddCronResponse {
+}

 export interface DeleteCronRequest {
  ids: string[];
 }

-export interface DeleteCronResponse {}
+export interface DeleteCronResponse {
+}
+
+function createBaseISchedule(): ISchedule {
+  return { schedule: "" };
+}
+
+export const ISchedule = {
+  encode(message: ISchedule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.schedule !== "") {
+      writer.uint32(10).string(message.schedule);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ISchedule {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseISchedule();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.schedule = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ISchedule {
+    return { schedule: isSet(object.schedule) ? String(object.schedule) : "" };
+  },
+
+  toJSON(message: ISchedule): unknown {
+    const obj: any = {};
+    message.schedule !== undefined && (obj.schedule = message.schedule);
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<ISchedule>, I>>(base?: I): ISchedule {
+    return ISchedule.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<ISchedule>, I>>(object: I): ISchedule {
+    const message = createBaseISchedule();
+    message.schedule = object.schedule ?? "";
+    return message;
+  },
+};

 function createBaseICron(): ICron {
-  return { id: '', schedule: '', command: '' };
+  return { id: "", schedule: "", command: "", extraSchedules: [], name: "" };
 }

 export const ICron = {
  encode(message: ICron, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.id !== '') {
+    if (message.id !== "") {
      writer.uint32(10).string(message.id);
    }
-    if (message.schedule !== '') {
+    if (message.schedule !== "") {
      writer.uint32(18).string(message.schedule);
    }
-    if (message.command !== '') {
+    if (message.command !== "") {
      writer.uint32(26).string(message.command);
    }
+    for (const v of message.extraSchedules) {
+      ISchedule.encode(v!, writer.uint32(34).fork()).ldelim();
+    }
+    if (message.name !== "") {
+      writer.uint32(42).string(message.name);
+    }
    return writer;
  },

  decode(input: _m0.Reader | Uint8Array, length?: number): ICron {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
    let end = length === undefined ? reader.len : reader.pos + length;
    const message = createBaseICron();
    while (reader.pos < end) {
      const tag = reader.uint32();
      switch (tag >>> 3) {
        case 1:
-          if (tag != 10) {
+          if (tag !== 10) {
            break;
          }

          message.id = reader.string();
          continue;
        case 2:
-          if (tag != 18) {
+          if (tag !== 18) {
            break;
          }

          message.schedule = reader.string();
          continue;
        case 3:
-          if (tag != 26) {
+          if (tag !== 26) {
            break;
          }

          message.command = reader.string();
          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
          }
-      if ((tag & 7) == 4 || tag == 0) {
+
+          message.extraSchedules.push(ISchedule.decode(reader, reader.uint32()));
+          continue;
+        case 5:
+          if (tag !== 42) {
+            break;
+          }
+
+          message.name = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
        break;
      }
      reader.skipType(tag & 7);
@@ -91,9 +174,13 @@ export const ICron = {

  fromJSON(object: any): ICron {
    return {
-      id: isSet(object.id) ? String(object.id) : '',
-      schedule: isSet(object.schedule) ? String(object.schedule) : '',
-      command: isSet(object.command) ? String(object.command) : '',
+      id: isSet(object.id) ? String(object.id) : "",
+      schedule: isSet(object.schedule) ? String(object.schedule) : "",
+      command: isSet(object.command) ? String(object.command) : "",
+      extraSchedules: Array.isArray(object?.extraSchedules)
+        ? object.extraSchedules.map((e: any) => ISchedule.fromJSON(e))
+        : [],
+      name: isSet(object.name) ? String(object.name) : "",
    };
  },

@@ -102,6 +189,12 @@ export const ICron = {
    message.id !== undefined && (obj.id = message.id);
    message.schedule !== undefined && (obj.schedule = message.schedule);
    message.command !== undefined && (obj.command = message.command);
+    if (message.extraSchedules) {
+      obj.extraSchedules = message.extraSchedules.map((e) => e ? ISchedule.toJSON(e) : undefined);
+    } else {
+      obj.extraSchedules = [];
+    }
+    message.name !== undefined && (obj.name = message.name);
    return obj;
  },

@@ -111,9 +204,11 @@ export const ICron = {

  fromPartial<I extends Exact<DeepPartial<ICron>, I>>(object: I): ICron {
    const message = createBaseICron();
-    message.id = object.id ?? '';
-    message.schedule = object.schedule ?? '';
-    message.command = object.command ?? '';
+    message.id = object.id ?? "";
+    message.schedule = object.schedule ?? "";
+    message.command = object.command ?? "";
+    message.extraSchedules = object.extraSchedules?.map((e) => ISchedule.fromPartial(e)) || [];
+    message.name = object.name ?? "";
    return message;
  },
 };
@@ -123,10 +218,7 @@ function createBaseAddCronRequest(): AddCronRequest {
 }

 export const AddCronRequest = {
-  encode(
-    message: AddCronRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(message: AddCronRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
    for (const v of message.crons) {
      ICron.encode(v!, writer.uint32(10).fork()).ldelim();
    }
@@ -134,22 +226,21 @@ export const AddCronRequest = {
  },

  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
    let end = length === undefined ? reader.len : reader.pos + length;
    const message = createBaseAddCronRequest();
    while (reader.pos < end) {
      const tag = reader.uint32();
      switch (tag >>> 3) {
        case 1:
-          if (tag != 10) {
+          if (tag !== 10) {
            break;
          }

          message.crons.push(ICron.decode(reader, reader.uint32()));
          continue;
      }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
        break;
      }
      reader.skipType(tag & 7);
@@ -158,32 +249,24 @@ export const AddCronRequest = {
  },

  fromJSON(object: any): AddCronRequest {
-    return {
-      crons: Array.isArray(object?.crons)
-        ? object.crons.map((e: any) => ICron.fromJSON(e))
-        : [],
-    };
+    return { crons: Array.isArray(object?.crons) ? object.crons.map((e: any) => ICron.fromJSON(e)) : [] };
  },

  toJSON(message: AddCronRequest): unknown {
    const obj: any = {};
    if (message.crons) {
-      obj.crons = message.crons.map((e) => (e ? ICron.toJSON(e) : undefined));
+      obj.crons = message.crons.map((e) => e ? ICron.toJSON(e) : undefined);
    } else {
      obj.crons = [];
    }
    return obj;
  },

-  create<I extends Exact<DeepPartial<AddCronRequest>, I>>(
-    base?: I,
-  ): AddCronRequest {
+  create<I extends Exact<DeepPartial<AddCronRequest>, I>>(base?: I): AddCronRequest {
    return AddCronRequest.fromPartial(base ?? {});
  },

-  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(
-    object: I,
-  ): AddCronRequest {
+  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(object: I): AddCronRequest {
    const message = createBaseAddCronRequest();
    message.crons = object.crons?.map((e) => ICron.fromPartial(e)) || [];
    return message;
@@ -195,23 +278,19 @@ function createBaseAddCronResponse(): AddCronResponse {
 }

 export const AddCronResponse = {
-  encode(
-    _: AddCronResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(_: AddCronResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
    return writer;
  },

  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
    let end = length === undefined ? reader.len : reader.pos + length;
    const message = createBaseAddCronResponse();
    while (reader.pos < end) {
      const tag = reader.uint32();
      switch (tag >>> 3) {
      }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
        break;
      }
      reader.skipType(tag & 7);
@@ -228,15 +307,11 @@ export const AddCronResponse = {
    return obj;
  },

-  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(
-    base?: I,
-  ): AddCronResponse {
+  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(base?: I): AddCronResponse {
    return AddCronResponse.fromPartial(base ?? {});
  },

-  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(
-    _: I,
-  ): AddCronResponse {
+  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(_: I): AddCronResponse {
    const message = createBaseAddCronResponse();
    return message;
  },
@@ -247,10 +322,7 @@ function createBaseDeleteCronRequest(): DeleteCronRequest {
 }

 export const DeleteCronRequest = {
-  encode(
-    message: DeleteCronRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(message: DeleteCronRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
    for (const v of message.ids) {
      writer.uint32(10).string(v!);
    }
@@ -258,22 +330,21 @@ export const DeleteCronRequest = {
  },

  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
    let end = length === undefined ? reader.len : reader.pos + length;
    const message = createBaseDeleteCronRequest();
    while (reader.pos < end) {
      const tag = reader.uint32();
      switch (tag >>> 3) {
        case 1:
-          if (tag != 10) {
+          if (tag !== 10) {
            break;
          }

          message.ids.push(reader.string());
          continue;
      }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
        break;
      }
      reader.skipType(tag & 7);
@@ -282,11 +353,7 @@ export const DeleteCronRequest = {
  },

  fromJSON(object: any): DeleteCronRequest {
-    return {
-      ids: Array.isArray(object?.ids)
-        ? object.ids.map((e: any) => String(e))
-        : [],
-    };
+    return { ids: Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [] };
  },

  toJSON(message: DeleteCronRequest): unknown {
@@ -299,15 +366,11 @@ export const DeleteCronRequest = {
    return obj;
  },

-  create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
-    base?: I,
-  ): DeleteCronRequest {
+  create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(base?: I): DeleteCronRequest {
    return DeleteCronRequest.fromPartial(base ?? {});
  },

-  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
-    object: I,
-  ): DeleteCronRequest {
+  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(object: I): DeleteCronRequest {
    const message = createBaseDeleteCronRequest();
    message.ids = object.ids?.map((e) => e) || [];
    return message;
@@ -319,23 +382,19 @@ function createBaseDeleteCronResponse(): DeleteCronResponse {
 }

 export const DeleteCronResponse = {
-  encode(
-    _: DeleteCronResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(_: DeleteCronResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
    return writer;
  },

  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
    let end = length === undefined ? reader.len : reader.pos + length;
    const message = createBaseDeleteCronResponse();
    while (reader.pos < end) {
      const tag = reader.uint32();
      switch (tag >>> 3) {
      }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
        break;
      }
      reader.skipType(tag & 7);
@@ -352,15 +411,11 @@ export const DeleteCronResponse = {
    return obj;
  },

-  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
-    base?: I,
-  ): DeleteCronResponse {
+  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(base?: I): DeleteCronResponse {
    return DeleteCronResponse.fromPartial(base ?? {});
  },

-  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
-    _: I,
-  ): DeleteCronResponse {
+  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(_: I): DeleteCronResponse {
    const message = createBaseDeleteCronResponse();
    return message;
  },
@@ -369,25 +424,21 @@ export const DeleteCronResponse = {
 export type CronService = typeof CronService;
 export const CronService = {
  addCron: {
-    path: '/com.ql.cron.Cron/addCron',
+    path: "/com.ql.cron.Cron/addCron",
    requestStream: false,
    responseStream: false,
-    requestSerialize: (value: AddCronRequest) =>
-      Buffer.from(AddCronRequest.encode(value).finish()),
+    requestSerialize: (value: AddCronRequest) => Buffer.from(AddCronRequest.encode(value).finish()),
    requestDeserialize: (value: Buffer) => AddCronRequest.decode(value),
-    responseSerialize: (value: AddCronResponse) =>
-      Buffer.from(AddCronResponse.encode(value).finish()),
+    responseSerialize: (value: AddCronResponse) => Buffer.from(AddCronResponse.encode(value).finish()),
    responseDeserialize: (value: Buffer) => AddCronResponse.decode(value),
  },
  delCron: {
-    path: '/com.ql.cron.Cron/delCron',
+    path: "/com.ql.cron.Cron/delCron",
    requestStream: false,
    responseStream: false,
-    requestSerialize: (value: DeleteCronRequest) =>
-      Buffer.from(DeleteCronRequest.encode(value).finish()),
+    requestSerialize: (value: DeleteCronRequest) => Buffer.from(DeleteCronRequest.encode(value).finish()),
    requestDeserialize: (value: Buffer) => DeleteCronRequest.decode(value),
-    responseSerialize: (value: DeleteCronResponse) =>
-      Buffer.from(DeleteCronResponse.encode(value).finish()),
+    responseSerialize: (value: DeleteCronResponse) => Buffer.from(DeleteCronResponse.encode(value).finish()),
    responseDeserialize: (value: Buffer) => DeleteCronResponse.decode(value),
  },
 } as const;
@@ -415,67 +466,36 @@ export interface CronClient extends Client {
  ): ClientUnaryCall;
  delCron(
    request: DeleteCronRequest,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
  ): ClientUnaryCall;
  delCron(
    request: DeleteCronRequest,
    metadata: Metadata,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
  ): ClientUnaryCall;
  delCron(
    request: DeleteCronRequest,
    metadata: Metadata,
    options: Partial<CallOptions>,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
  ): ClientUnaryCall;
 }

-export const CronClient = makeGenericClientConstructor(
-  CronService,
-  'com.ql.cron.Cron',
-) as unknown as {
-  new (
-    address: string,
-    credentials: ChannelCredentials,
-    options?: Partial<ClientOptions>,
-  ): CronClient;
+export const CronClient = makeGenericClientConstructor(CronService, "com.ql.cron.Cron") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): CronClient;
  service: typeof CronService;
 };

-type Builtin =
-  | Date
-  | Function
-  | Uint8Array
-  | string
-  | number
-  | boolean
-  | undefined;
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;

-export type DeepPartial<T> = T extends Builtin
-  ? T
-  : T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U>
-  ? ReadonlyArray<DeepPartial<U>>
-  : T extends {}
-  ? { [K in keyof T]?: DeepPartial<T[K]> }
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
  : Partial<T>;

 type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin
-  ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
-      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
-    };
+export type Exact<P, I extends P> = P extends Builtin ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };

 function isSet(value: any): boolean {
  return value !== null && value !== undefined;
@@ -12,10 +12,10 @@ import {
  Metadata,
  ServiceError,
  UntypedServiceImplementation,
-} from '@grpc/grpc-js';
-import _m0 from 'protobufjs/minimal';
+} from "@grpc/grpc-js";
+import _m0 from "protobufjs/minimal";

-export const protobufPackage = 'com.ql.health';
+export const protobufPackage = "com.ql.health";

 export interface HealthCheckRequest {
  service: string;
@@ -33,79 +33,71 @@ export enum HealthCheckResponse_ServingStatus {
  UNRECOGNIZED = -1,
 }

-export function healthCheckResponse_ServingStatusFromJSON(
-  object: any,
-): HealthCheckResponse_ServingStatus {
+export function healthCheckResponse_ServingStatusFromJSON(object: any): HealthCheckResponse_ServingStatus {
  switch (object) {
    case 0:
-    case 'UNKNOWN':
+    case "UNKNOWN":
      return HealthCheckResponse_ServingStatus.UNKNOWN;
    case 1:
-    case 'SERVING':
+    case "SERVING":
      return HealthCheckResponse_ServingStatus.SERVING;
    case 2:
-    case 'NOT_SERVING':
+    case "NOT_SERVING":
      return HealthCheckResponse_ServingStatus.NOT_SERVING;
    case 3:
-    case 'SERVICE_UNKNOWN':
+    case "SERVICE_UNKNOWN":
      return HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN;
    case -1:
-    case 'UNRECOGNIZED':
+    case "UNRECOGNIZED":
    default:
      return HealthCheckResponse_ServingStatus.UNRECOGNIZED;
  }
 }

-export function healthCheckResponse_ServingStatusToJSON(
-  object: HealthCheckResponse_ServingStatus,
-): string {
+export function healthCheckResponse_ServingStatusToJSON(object: HealthCheckResponse_ServingStatus): string {
  switch (object) {
    case HealthCheckResponse_ServingStatus.UNKNOWN:
-      return 'UNKNOWN';
+      return "UNKNOWN";
    case HealthCheckResponse_ServingStatus.SERVING:
-      return 'SERVING';
+      return "SERVING";
    case HealthCheckResponse_ServingStatus.NOT_SERVING:
-      return 'NOT_SERVING';
+      return "NOT_SERVING";
    case HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN:
-      return 'SERVICE_UNKNOWN';
+      return "SERVICE_UNKNOWN";
    case HealthCheckResponse_ServingStatus.UNRECOGNIZED:
    default:
-      return 'UNRECOGNIZED';
+      return "UNRECOGNIZED";
  }
 }

 function createBaseHealthCheckRequest(): HealthCheckRequest {
-  return { service: '' };
+  return { service: "" };
 }

 export const HealthCheckRequest = {
-  encode(
-    message: HealthCheckRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
-    if (message.service !== '') {
+  encode(message: HealthCheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.service !== "") {
      writer.uint32(10).string(message.service);
    }
    return writer;
  },

  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
    let end = length === undefined ? reader.len : reader.pos + length;
    const message = createBaseHealthCheckRequest();
    while (reader.pos < end) {
      const tag = reader.uint32();
      switch (tag >>> 3) {
        case 1:
-          if (tag != 10) {
+          if (tag !== 10) {
            break;
          }

          message.service = reader.string();
          continue;
      }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
        break;
      }
      reader.skipType(tag & 7);
@@ -114,7 +106,7 @@ export const HealthCheckRequest = {
  },

  fromJSON(object: any): HealthCheckRequest {
-    return { service: isSet(object.service) ? String(object.service) : '' };
+    return { service: isSet(object.service) ? String(object.service) : "" };
  },

  toJSON(message: HealthCheckRequest): unknown {
@@ -123,17 +115,13 @@ export const HealthCheckRequest = {
    return obj;
  },

-  create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(
-    base?: I,
-  ): HealthCheckRequest {
+  create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(base?: I): HealthCheckRequest {
    return HealthCheckRequest.fromPartial(base ?? {});
  },

-  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(
-    object: I,
-  ): HealthCheckRequest {
+  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(object: I): HealthCheckRequest {
    const message = createBaseHealthCheckRequest();
-    message.service = object.service ?? '';
+    message.service = object.service ?? "";
    return message;
  },
 };
@@ -143,10 +131,7 @@ function createBaseHealthCheckResponse(): HealthCheckResponse {
 }

 export const HealthCheckResponse = {
-  encode(
-    message: HealthCheckResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(message: HealthCheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
    if (message.status !== 0) {
      writer.uint32(8).int32(message.status);
    }
@@ -154,22 +139,21 @@ export const HealthCheckResponse = {
  },

  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
    let end = length === undefined ? reader.len : reader.pos + length;
    const message = createBaseHealthCheckResponse();
    while (reader.pos < end) {
      const tag = reader.uint32();
      switch (tag >>> 3) {
        case 1:
-          if (tag != 8) {
+          if (tag !== 8) {
            break;
          }

          message.status = reader.int32() as any;
          continue;
      }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
        break;
      }
      reader.skipType(tag & 7);
@@ -178,29 +162,20 @@ export const HealthCheckResponse = {
  },

  fromJSON(object: any): HealthCheckResponse {
-    return {
-      status: isSet(object.status)
-        ? healthCheckResponse_ServingStatusFromJSON(object.status)
-        : 0,
-    };
+    return { status: isSet(object.status) ? healthCheckResponse_ServingStatusFromJSON(object.status) : 0 };
  },

  toJSON(message: HealthCheckResponse): unknown {
    const obj: any = {};
-    message.status !== undefined &&
-      (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
+    message.status !== undefined && (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
    return obj;
  },

-  create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(
-    base?: I,
-  ): HealthCheckResponse {
+  create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(base?: I): HealthCheckResponse {
    return HealthCheckResponse.fromPartial(base ?? {});
  },

-  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(
-    object: I,
-  ): HealthCheckResponse {
+  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(object: I): HealthCheckResponse {
    const message = createBaseHealthCheckResponse();
    message.status = object.status ?? 0;
    return message;
@@ -210,25 +185,21 @@ export const HealthCheckResponse = {
 export type HealthService = typeof HealthService;
 export const HealthService = {
  check: {
-    path: '/com.ql.health.Health/Check',
+    path: "/com.ql.health.Health/Check",
    requestStream: false,
    responseStream: false,
-    requestSerialize: (value: HealthCheckRequest) =>
-      Buffer.from(HealthCheckRequest.encode(value).finish()),
+    requestSerialize: (value: HealthCheckRequest) => Buffer.from(HealthCheckRequest.encode(value).finish()),
    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
-    responseSerialize: (value: HealthCheckResponse) =>
-      Buffer.from(HealthCheckResponse.encode(value).finish()),
+    responseSerialize: (value: HealthCheckResponse) => Buffer.from(HealthCheckResponse.encode(value).finish()),
    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
  },
  watch: {
-    path: '/com.ql.health.Health/Watch',
+    path: "/com.ql.health.Health/Watch",
    requestStream: false,
    responseStream: true,
-    requestSerialize: (value: HealthCheckRequest) =>
-      Buffer.from(HealthCheckRequest.encode(value).finish()),
+    requestSerialize: (value: HealthCheckRequest) => Buffer.from(HealthCheckRequest.encode(value).finish()),
    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
-    responseSerialize: (value: HealthCheckResponse) =>
-      Buffer.from(HealthCheckResponse.encode(value).finish()),
+    responseSerialize: (value: HealthCheckResponse) => Buffer.from(HealthCheckResponse.encode(value).finish()),
    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
  },
 } as const;
@@ -241,32 +212,20 @@ export interface HealthServer extends UntypedServiceImplementation {
 export interface HealthClient extends Client {
  check(
    request: HealthCheckRequest,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
  ): ClientUnaryCall;
  check(
    request: HealthCheckRequest,
    metadata: Metadata,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
  ): ClientUnaryCall;
  check(
    request: HealthCheckRequest,
    metadata: Metadata,
    options: Partial<CallOptions>,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
  ): ClientUnaryCall;
-  watch(
-    request: HealthCheckRequest,
-    options?: Partial<CallOptions>,
-  ): ClientReadableStream<HealthCheckResponse>;
+  watch(request: HealthCheckRequest, options?: Partial<CallOptions>): ClientReadableStream<HealthCheckResponse>;
  watch(
    request: HealthCheckRequest,
    metadata?: Metadata,
@@ -274,43 +233,21 @@ export interface HealthClient extends Client {
  ): ClientReadableStream<HealthCheckResponse>;
 }

-export const HealthClient = makeGenericClientConstructor(
-  HealthService,
-  'com.ql.health.Health',
-) as unknown as {
-  new (
-    address: string,
-    credentials: ChannelCredentials,
-    options?: Partial<ClientOptions>,
-  ): HealthClient;
+export const HealthClient = makeGenericClientConstructor(HealthService, "com.ql.health.Health") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): HealthClient;
  service: typeof HealthService;
 };

-type Builtin =
-  | Date
-  | Function
-  | Uint8Array
-  | string
-  | number
-  | boolean
-  | undefined;
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;

-export type DeepPartial<T> = T extends Builtin
-  ? T
-  : T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U>
-  ? ReadonlyArray<DeepPartial<U>>
-  : T extends {}
-  ? { [K in keyof T]?: DeepPartial<T[K]> }
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
  : Partial<T>;

 type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin
-  ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
-      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
-    };
+export type Exact<P, I extends P> = P extends Builtin ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };

 function isSet(value: any): boolean {
  return value !== null && value !== undefined;
@@ -8,6 +8,7 @@ const app = express();
 const client = new HealthClient(
  `0.0.0.0:${config.cronPort}`,
  credentials.createInsecure(),
+  { 'grpc.enable_http_proxy': 0 },
 );

 app.get('/api/health', (req, res) => {
@@ -3,41 +3,52 @@ import { AddCronRequest, AddCronResponse } from '../protos/cron';
 import nodeSchedule from 'node-schedule';
 import { scheduleStacks } from './data';
 import { runCron } from '../shared/runCron';
-import { QL_PREFIX, TASK_PREFIX } from '../config/const';
 import Logger from '../loaders/logger';
-import dayjs from 'dayjs';

 const addCron = (
  call: ServerUnaryCall<AddCronRequest, AddCronResponse>,
  callback: sendUnaryData<AddCronResponse>,
 ) => {
  for (const item of call.request.crons) {
-    const { id, schedule, command } = item;
+    const { id, schedule, command, extraSchedules, name } = item;
    if (scheduleStacks.has(id)) {
-      scheduleStacks.get(id)?.cancel();
-    }
-
-    let cmdStr = command.trim();
-    if (!cmdStr.startsWith(TASK_PREFIX) && !cmdStr.startsWith(QL_PREFIX)) {
-      cmdStr = `${TASK_PREFIX}${cmdStr}`;
+      scheduleStacks.get(id)?.forEach((x) => x.cancel());
    }

    Logger.info(
-      '[schedule][创建定时任务], 任务ID: %s, cron: %s, 执行命令: %s',
+      '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
      id,
+      name,
      schedule,
      command,
    );

-    scheduleStacks.set(
-      id,
-      nodeSchedule.scheduleJob(id, schedule, async () => {
+    if (extraSchedules?.length) {
+      extraSchedules.forEach(x => {
        Logger.info(
-          `[schedule][准备运行任务] 命令: ${cmdStr}`,
+          '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
+          id,
+          name,
+          x.schedule,
+          command,
        );
-        runCron(`ID=${id} ${cmdStr}`);
+      })
+    }
+
+    scheduleStacks.set(id, [
+      nodeSchedule.scheduleJob(id, schedule, async () => {
+        Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
+        runCron(command, { name, schedule, extraSchedules });
      }),
-    );
+      ...(extraSchedules?.length
+        ? extraSchedules.map((x) =>
+          nodeSchedule.scheduleJob(id, x.schedule, async () => {
+            Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
+            runCron(command, { name, schedule, extraSchedules });
+          }),
+        )
+        : []),
+    ]);
  }

  callback(null, null);
@@ -12,6 +12,7 @@ class Client {
  private client = new CronClient(
    `0.0.0.0:${config.cronPort}`,
    credentials.createInsecure(),
+    { 'grpc.enable_http_proxy': 0 },
  );

  addCron(request: AddCronRequest['crons']): Promise<AddCronResponse> {
@@ -1,6 +1,6 @@
 import nodeSchedule from 'node-schedule';
 import { ToadScheduler } from 'toad-scheduler';

-export const scheduleStacks = new Map<string, nodeSchedule.Job>();
+export const scheduleStacks = new Map<string, nodeSchedule.Job[]>();

 export const intervalSchedule = new ToadScheduler();
@@ -13,7 +13,7 @@ const delCron = (
        '[schedule][取消定时任务], 任务ID: %s',
        id,
      );
-      scheduleStacks.get(id)?.cancel();
+      scheduleStacks.get(id)?.forEach(x => x.cancel());
      scheduleStacks.delete(id);
    }
  }
@@ -10,7 +10,7 @@ const check = async (
  switch (call.request.service) {
    case 'cron':
      const res = await promiseExec(
-        `curl -s http://0.0.0.0:${config.port}/api/system`,
+        `curl -s --noproxy '*' http://0.0.0.0:${config.port}/api/system`,
      );

      if (res.includes('200')) {
@@ -7,7 +7,7 @@ import { check } from './health';
 import config from '../config';
 import Logger from '../loaders/logger';

-const server = new Server();
+const server = new Server({ 'grpc.enable_http_proxy': 0 });
 server.addService(HealthService, { check });
 server.addService(CronService, { addCron, delCron });
 server.bindAsync(
@@ -0,0 +1,30 @@
+import { Service, Inject } from 'typedi';
+import path, { join } from 'path';
+import config from '../config';
+import { getFileContentByName } from '../config/util';
+import { Response } from 'express';
+import got from 'got';
+
+@Service()
+export default class ConfigService {
+  constructor() {}
+
+  public async getFile(filePath: string, res: Response) {
+    let content = '';
+    if (config.blackFileList.includes(filePath) || !filePath) {
+      res.send({ code: 403, message: '文件无法访问' });
+    }
+    if (filePath.startsWith('sample/')) {
+      const res = await got.get(
+        `https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`,
+      );
+      content = res.body;
+    } else if (filePath.startsWith('data/scripts/')) {
+      content = await getFileContentByName(join(config.rootPath, filePath));
+    } else {
+      content = await getFileContentByName(join(config.configPath, filePath));
+    }
+
+    res.send({ code: 200, data: content });
+  }
+}
@@ -3,10 +3,15 @@ import winston from 'winston';
 import config from '../config';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import { exec, execSync } from 'child_process';
-import fs from 'fs';
+import fs from 'fs/promises';
 import cron_parser from 'cron-parser';
-import { getFileContentByName, fileExist, killTask, getUniqPath, safeJSONParse } from '../config/util';
-import { promises, existsSync } from 'fs';
+import {
+  getFileContentByName,
+  fileExist,
+  killTask,
+  getUniqPath,
+  safeJSONParse,
+} from '../config/util';
 import { Op, where, col as colFn, FindOptions, fn } from 'sequelize';
 import path from 'path';
 import { TASK_PREFIX, QL_PREFIX } from '../config/const';
@@ -14,14 +19,16 @@ import cronClient from '../schedule/client';
 import taskLimit from '../shared/pLimit';
 import { spawn } from 'cross-spawn';
 import dayjs from 'dayjs';
+import pickBy from 'lodash/pickBy';
+import omit from 'lodash/omit';

@Service()
 export default class CronService {
  constructor(@Inject('logger') private logger: winston.Logger) {}

-  private isSixCron(cron: Crontab) {
-    const { schedule } = cron;
-    if (Number(schedule?.split(/ +/).length) > 5) {
+  private isNodeCron(cron: Crontab) {
+    const { schedule, extra_schedules } = cron;
+    if (Number(schedule?.split(/ +/).length) > 5 || extra_schedules?.length) {
      return true;
    }
    return false;
@@ -31,9 +38,15 @@ export default class CronService {
    const tab = new Crontab(payload);
    tab.saved = false;
    const doc = await this.insert(tab);
-    if (this.isSixCron(doc)) {
+    if (this.isNodeCron(doc)) {
      await cronClient.addCron([
-        { id: String(doc.id), schedule: doc.schedule!, command: doc.command },
+        {
+          name: doc.name || '',
+          id: String(doc.id),
+          schedule: doc.schedule!,
+          command: this.makeCommand(doc),
+          extraSchedules: doc.extra_schedules || [],
+        },
      ]);
    }
    await this.set_crontab();
@@ -52,15 +65,17 @@ export default class CronService {
    if (doc.isDisabled === 1) {
      return newDoc;
    }
-    if (this.isSixCron(doc)) {
-      await cronClient.delCron([String(newDoc.id)]);
+    if (this.isNodeCron(doc)) {
+      await cronClient.delCron([String(doc.id)]);
    }
-    if (this.isSixCron(newDoc)) {
+    if (this.isNodeCron(newDoc)) {
      await cronClient.addCron([
        {
+          name: doc.name || '',
          id: String(newDoc.id),
          schedule: newDoc.schedule!,
-          command: newDoc.command,
+          command: this.makeCommand(newDoc),
+          extraSchedules: newDoc.extra_schedules || [],
        },
      ]);
    }
@@ -88,7 +103,7 @@ export default class CronService {
    last_running_time: number;
    last_execution_time: number;
  }) {
-    const options: any = {
+    let options: any = {
      status,
      pid,
      log_path,
@@ -98,7 +113,16 @@ export default class CronService {
      options.last_running_time = last_running_time;
    }

-    return await CrontabModel.update({ ...options }, { where: { id: ids } });
+    for (const id of ids) {
+      const cron = await this.getDb({ id });
+      if (status === CrontabStatus.idle && log_path !== cron.log_path) {
+        options = omit(options, ['status', 'log_path', 'pid']);
+      }
+      await CrontabModel.update(
+        { ...pickBy(options, (v) => v === 0 || !!v) },
+        { where: { id } },
+      );
+    }
  }

  public async remove(ids: number[]) {
@@ -382,67 +406,57 @@ export default class CronService {
    );
  }

-  private async runSingle(cronId: number): Promise<number> {
-    return taskLimit.runWithCpuLimit(() => {
+  private async runSingle(cronId: number): Promise<number | void> {
+    return taskLimit.runWithCronLimit(() => {
      return new Promise(async (resolve: any) => {
        const cron = await this.getDb({ id: cronId });
+        const params = {
+          name: cron.name,
+          command: cron.command,
+          schedule: cron.schedule,
+          extraSchedules: cron.extra_schedules,
+        };
        if (cron.status !== CrontabStatus.queued) {
-          resolve();
+          resolve(params);
          return;
        }

+        this.logger.info(
+          `[panel][开始执行任务] 参数 ${JSON.stringify(params)}`,
+        );
+
        let { id, command, log_path } = cron;
        const uniqPath = await getUniqPath(command, `${id}`);
        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
        const logDirPath = path.resolve(config.logPath, `${uniqPath}`);
-        if (log_path?.split('/')?.every(x => x !== uniqPath)) {
-          fs.mkdirSync(logDirPath, { recursive: true });
+        if (log_path?.split('/')?.every((x) => x !== uniqPath)) {
+          await fs.mkdir(logDirPath, { recursive: true });
        }
        const logPath = `${uniqPath}/${logTime}.log`;
        const absolutePath = path.resolve(config.logPath, `${logPath}`);

-        this.logger.silly('Running job');
-        this.logger.silly('ID: ' + id);
-        this.logger.silly('Original command: ' + command);
-
-        let cmdStr = command;
-        if (!cmdStr.startsWith(TASK_PREFIX) && !cmdStr.startsWith(QL_PREFIX)) {
-          cmdStr = `${TASK_PREFIX}${cmdStr}`;
-        }
-        if (
-          cmdStr.endsWith('.js') ||
-          cmdStr.endsWith('.py') ||
-          cmdStr.endsWith('.pyc') ||
-          cmdStr.endsWith('.sh') ||
-          cmdStr.endsWith('.ts')
-        ) {
-          cmdStr = `${cmdStr} now`;
-        }
-
-        const cp = spawn(`real_log_path=${logPath} ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
+        const cp = spawn(
+          `real_log_path=${logPath} no_delay=true ${this.makeCommand(cron)}`,
+          { shell: '/bin/bash' },
+        );

        await CrontabModel.update(
          { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
          { where: { id } },
        );
-        cp.stderr.on('data', (data) => {
-          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
+        cp.stderr.on('data', async (data) => {
+          await fs.appendFile(`${absolutePath}`, `${data.toString()}`);
        });
-        cp.on('error', (err) => {
-          fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
+        cp.on('error', async (err) => {
+          await fs.appendFile(`${absolutePath}`, `${JSON.stringify(err)}`);
        });

-        cp.on('exit', async (code, signal) => {
-          this.logger.info(
-            `[panel][任务退出] 任务 ${command} 进程id: ${cp.pid}, 退出码 ${code}`,
-          );
-        });
-        cp.on('close', async (code) => {
+        cp.on('exit', async (code) => {
          await CrontabModel.update(
            { status: CrontabStatus.idle, pid: undefined },
            { where: { id } },
          );
-          resolve();
+          resolve({ ...params, pid: cp.pid, code });
        });
      });
    });
@@ -458,11 +472,13 @@ export default class CronService {
    await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
    const docs = await CrontabModel.findAll({ where: { id: ids } });
    const sixCron = docs
-      .filter((x) => this.isSixCron(x))
+      .filter((x) => this.isNodeCron(x))
      .map((doc) => ({
+        name: doc.name || '',
        id: String(doc.id),
        schedule: doc.schedule!,
-        command: doc.command,
+        command: this.makeCommand(doc),
+        extraSchedules: doc.extra_schedules || [],
      }));
    await cronClient.addCron(sixCron);
    await this.set_crontab();
@@ -477,7 +493,7 @@ export default class CronService {
    const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
    const logFileExist = doc.log_path && (await fileExist(absolutePath));
    if (logFileExist) {
-      return getFileContentByName(`${absolutePath}`);
+      return await getFileContentByName(`${absolutePath}`);
    } else {
      return '任务未运行';
    }
@@ -491,26 +507,41 @@ export default class CronService {

    const relativeDir = path.dirname(`${doc.log_path}`);
    const dir = path.resolve(config.logPath, relativeDir);
-    if (existsSync(dir)) {
-      let files = await promises.readdir(dir);
-      return files
-        .map((x) => ({
+    const dirExist = await fileExist(dir);
+    if (dirExist) {
+      let files = await fs.readdir(dir);
+      return (
+        await Promise.all(
+          files.map(async (x) => ({
            filename: x,
            directory: relativeDir.replace(config.logPath, ''),
-          time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
-        }))
-        .sort((a, b) => b.time - a.time);
+            time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
+          })),
+        )
+      ).sort((a, b) => b.time - a.time);
    } else {
      return [];
    }
  }

-  private make_command(tab: Crontab) {
+  private makeCommand(tab: Crontab) {
    let command = tab.command.trim();
    if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
      command = `${TASK_PREFIX}${tab.command}`;
    }
-    const crontab_job_string = `ID=${tab.id} ${command}`;
+    let commandVariable = `no_tee=true ID=${tab.id} `;
+    if (tab.task_before) {
+      commandVariable += `task_before='${tab.task_before
+        .replace(/'/g, "'\\''")
+        .trim()}' `;
+    }
+    if (tab.task_after) {
+      commandVariable += `task_after='${tab.task_after
+        .replace(/'/g, "'\\''")
+        .trim()}' `;
+    }
+
+    const crontab_job_string = `${commandVariable}${command}`;
    return crontab_job_string;
  }

@@ -519,21 +550,25 @@ export default class CronService {
    var crontab_string = '';
    tabs.data.forEach((tab) => {
      const _schedule = tab.schedule && tab.schedule.split(/ +/);
-      if (tab.isDisabled === 1 || _schedule!.length !== 5) {
+      if (
+        tab.isDisabled === 1 ||
+        _schedule!.length !== 5 ||
+        tab.extra_schedules?.length
+      ) {
        crontab_string += '# ';
        crontab_string += tab.schedule;
        crontab_string += ' ';
-        crontab_string += this.make_command(tab);
+        crontab_string += this.makeCommand(tab);
        crontab_string += '\n';
      } else {
        crontab_string += tab.schedule;
        crontab_string += ' ';
-        crontab_string += this.make_command(tab);
+        crontab_string += this.makeCommand(tab);
        crontab_string += '\n';
      }
    });

-    fs.writeFileSync(config.crontabFile, crontab_string);
+    await fs.writeFile(config.crontabFile, crontab_string);

    execSync(`crontab ${config.crontabFile}`);
    await CrontabModel.update({ saved: true }, { where: {} });
@@ -578,11 +613,13 @@ export default class CronService {
    this.set_crontab(tabs);

    const sixCron = tabs.data
-      .filter((x) => this.isSixCron(x) && x.isDisabled !== 1)
+      .filter((x) => this.isNodeCron(x) && x.isDisabled !== 1)
      .map((doc) => ({
+        name: doc.name || '',
        id: String(doc.id),
        schedule: doc.schedule!,
-        command: doc.command,
+        command: this.makeCommand(doc),
+        extraSchedules: doc.extra_schedules || [],
      }));
    await cronClient.addCron(sixCron);
  }
@@ -14,7 +14,12 @@ import {
 import { spawn } from 'cross-spawn';
 import SockService from './sock';
 import { FindOptions, Op } from 'sequelize';
-import { promiseExecSuccess } from '../config/util';
+import {
+  fileExist,
+  getPid,
+  killTask,
+  promiseExecSuccess,
+} from '../config/util';
 import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';

@@ -61,12 +66,23 @@ export default class DependenceService {
  }

  public async remove(ids: number[], force = false): Promise<Dependence[]> {
+    const docs = await DependenceModel.findAll({ where: { id: ids } });
+    const unInstalledDeps = docs.filter(
+      (x) => x.status !== DependenceStatus.installed,
+    );
+    const installedDeps = docs.filter(
+      (x) => x.status === DependenceStatus.installed,
+    );
+    await this.removeDb(unInstalledDeps.map((x) => x.id!));
+
+    if (installedDeps.length) {
      await DependenceModel.update(
        { status: DependenceStatus.queued, log: [] },
        { where: { id: ids } },
      );
-    const docs = await DependenceModel.findAll({ where: { id: ids } });
+
      this.installDependenceOneByOne(docs, false, force);
+    }
    return docs;
  }

@@ -75,11 +91,21 @@ export default class DependenceService {
  }

  public async dependencies(
-    { searchValue, type }: { searchValue: string; type: string },
-    sort: any = { position: -1 },
+    {
+      searchValue,
+      type,
+      status,
+    }: { searchValue: string; type: string; status: string },
+    sort: any = [],
    query: any = {},
  ): Promise<Dependence[]> {
-    let condition = { ...query, type: DependenceTypes[type as any] };
+    let condition = {
+      ...query,
+      type: DependenceTypes[type as any],
+    };
+    if (status) {
+      condition.status = status.split(',').map(Number);
+    }
    if (searchValue) {
      const encodeText = encodeURI(searchValue);
      const reg = {
@@ -95,7 +121,7 @@ export default class DependenceService {
      };
    }
    try {
-      const result = await this.find(condition);
+      const result = await this.find(condition, sort);
      return result as any;
    } catch (error) {
      throw error;
@@ -119,10 +145,32 @@ export default class DependenceService {
    );

    const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installDependenceOneByOne(docs);
+    this.installDependenceOneByOne(docs, true, true);
    return docs;
  }

+  public async cancel(ids: number[]) {
+    const docs = await DependenceModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      taskLimit.removeQueuedDependency(doc);
+      const depInstallCommand = InstallDependenceCommandTypes[doc.type];
+      const depUnInstallCommand = unInstallDependenceCommandTypes[doc.type];
+      const installCmd = `${depInstallCommand} ${doc.name.trim()}`;
+      const unInstallCmd = `${depUnInstallCommand} ${doc.name.trim()}`;
+      const pids = await Promise.all([
+        getPid(installCmd),
+        getPid(unInstallCmd),
+      ]);
+      for (const pid of pids) {
+        pid && (await killTask(pid));
+      }
+    }
+    await DependenceModel.update(
+      { status: DependenceStatus.cancelled },
+      { where: { id: ids } },
+    );
+  }
+
  private async find(query: any, sort: any = []): Promise<Dependence[]> {
    const docs = await DependenceModel.findAll({
      where: { ...query },
@@ -157,8 +205,14 @@ export default class DependenceService {
    isInstall: boolean = true,
    force: boolean = false,
  ) {
-    return taskLimit.runOneByOne(() => {
+    return taskLimit.runDependeny(dependency, () => {
      return new Promise(async (resolve) => {
+        if (taskLimit.firstDependencyId !== dependency.id) {
+          return resolve(null);
+        }
+
+        taskLimit.removeQueuedDependency(dependency);
+
        const depIds = [dependency.id!];
        const status = isInstall
          ? DependenceStatus.installing
@@ -188,7 +242,7 @@ export default class DependenceService {
        this.updateLog(depIds, message);

        // 判断是否已经安装过依赖
-        if (isInstall) {
+        if (isInstall && !force) {
          const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
          const depVersionStr = versionDependenceCommandTypes[dependency.type];
          let depVersion = '';
@@ -241,10 +295,18 @@ export default class DependenceService {
            return resolve(null);
          }
        }
-
-        const cp = spawn(`${depRunCommand} ${dependency.name.trim()}`, {
+        const dependenceProxyFileExist = await fileExist(
+          config.dependenceProxyFile,
+        );
+        const proxyStr = dependenceProxyFileExist
+          ? `source ${config.dependenceProxyFile} &&`
+          : '';
+        const cp = spawn(
+          `${proxyStr} ${depRunCommand} ${dependency.name.trim()}`,
+          {
            shell: '/bin/bash',
-        });
+          },
+        );

        cp.stdout.on('data', async (data) => {
          this.sockService.sendMessage({
@@ -273,7 +335,7 @@ export default class DependenceService {
          this.updateLog(depIds, JSON.stringify(err));
        });

-        cp.on('close', async (code) => {
+        cp.on('exit', async (code) => {
          const endTime = dayjs();
          const isSucceed = code === 0;
          const resultText = isSucceed ? '成功' : '失败';
@@ -298,7 +360,17 @@ export default class DependenceService {
              ? DependenceStatus.installFailed
              : DependenceStatus.removeFailed;
          }
-          await DependenceModel.update({ status }, { where: { id: depIds } });
+          const docs = await DependenceModel.findAll({ where: { id: depIds } });
+          const _docIds = docs
+            .filter((x) => x.status !== DependenceStatus.cancelled)
+            .map((x) => x.id!);
+
+          if (_docIds.length > 0) {
+            await DependenceModel.update(
+              { status },
+              { where: { id: _docIds } },
+            );
+          }

          // 如果删除依赖成功或者强制删除
          if ((isSucceed || force) && !isInstall) {
@@ -1,7 +1,7 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import {
  Env,
  EnvModel,
@@ -208,6 +208,6 @@ export default class EnvService {
        }
      }
    }
-    fs.writeFileSync(config.envFile, env_string);
+    await fs.writeFile(config.envFile, env_string);
  }
 }
@@ -1,12 +1,12 @@
-import { NotificationInfo } from '../data/notify';
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import UserService from './user';
-import got from 'got';
-import nodemailer from 'nodemailer';
 import crypto from 'crypto';
+import got from 'got';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
+import nodemailer from 'nodemailer';
+import { Inject, Service } from 'typedi';
+import winston from 'winston';
 import { parseBody, parseHeaders } from '../config/util';
+import { NotificationInfo } from '../data/notify';
+import UserService from './user';

@Service()
 export default class NotificationService {
@@ -31,6 +31,7 @@ export default class NotificationService {
    ['pushMe', this.pushMe],
    ['webhook', this.webhook],
    ['lark', this.lark],
+    ['chronocat', this.chronocat],
  ]);

  private title = '';
@@ -56,7 +57,7 @@ export default class NotificationService {
      try {
        return await notificationModeAction?.call(this);
      } catch (error: any) {
-        return false;
+        throw error;
      }
    }
    return false;
@@ -195,7 +196,8 @@ export default class NotificationService {
  }

  private async bark() {
-    let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
+    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
+      this.params;
    if (!barkPush.startsWith('http')) {
      barkPush = `https://api.day.app/${barkPush}`;
    }
@@ -203,7 +205,7 @@ export default class NotificationService {
      this.title,
    )}/${encodeURIComponent(
      this.content,
-    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}`;
+    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;

    try {
      const res: any = await got
@@ -232,8 +234,8 @@ export default class NotificationService {
      telegramBotUserId,
    } = this.params;
    const authStr = telegramBotProxyAuth ? `${telegramBotProxyAuth}@` : '';
-    const url = `https://${
-      telegramBotApiHost ? telegramBotApiHost : 'api.telegram.org'
+    const url = `${
+      telegramBotApiHost ? telegramBotApiHost : 'https://api.telegram.org'
    }/bot${telegramBotToken}/sendMessage`;
    let agent;
    if (telegramBotProxyHost && telegramBotProxyPort) {
@@ -560,7 +562,7 @@ export default class NotificationService {
        throw new Error(JSON.stringify(info));
      }
    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
+      throw error;
    }
  }

@@ -588,6 +590,63 @@ export default class NotificationService {
    }
  }

+  private async chronocat() {
+    const { chronocatURL, chronocatQQ, chronocatToken } = this.params;
+    try {
+      const user_ids = chronocatQQ
+        .match(/user_id=(\d+)/g)
+        ?.map((match: any) => match.split('=')[1]);
+      const group_ids = chronocatQQ
+        .match(/group_id=(\d+)/g)
+        ?.map((match: any) => match.split('=')[1]);
+
+      const url = `${chronocatURL}/api/message/send`;
+      const headers = {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${chronocatToken}`,
+      };
+
+      for (const [chat_type, ids] of [
+        [1, user_ids],
+        [2, group_ids],
+      ]) {
+        if (!ids) {
+          continue;
+        }
+        let _ids: any = ids;
+        for (const chat_id of _ids) {
+          const data = {
+            peer: {
+              chatType: chat_type,
+              peerUin: chat_id,
+            },
+            elements: [
+              {
+                elementType: 1,
+                textElement: {
+                  content: `${this.title}\n\n${this.content}`,
+                },
+              },
+            ],
+          };
+          const res: any = await got.post(url, {
+            ...this.gotOption,
+            json: data,
+            headers,
+          });
+          if (res.statusCode === 200) {
+            return true;
+          } else {
+            throw new Error(res.body);
+          }
+        }
+      }
+      return false;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
  private async webhook() {
    const {
      webhookUrl,
@@ -597,15 +656,14 @@ export default class NotificationService {
      webhookContentType,
    } = this.params;

-    const { formatBody, formatUrl } = this.formatNotifyContent(
-      webhookUrl,
-      webhookBody,
-    );
-    if (!formatUrl && !formatBody) {
-      return false;
+    if (!webhookUrl.includes('$title') && !webhookBody.includes('$title')) {
+      throw new Error('Url 或者 Body 中必须包含 $title');
    }
+
    const headers = parseHeaders(webhookHeaders);
-    const body = parseBody(formatBody, webhookContentType);
+    const body = parseBody(webhookBody, webhookContentType, (v) =>
+      v?.replaceAll('$title', this.title)?.replaceAll('$content', this.content),
+    );
    const bodyParam = this.formatBody(webhookContentType, body);
    const options = {
      method: webhookMethod,
@@ -615,6 +673,9 @@ export default class NotificationService {
      ...bodyParam,
    };
    try {
+      const formatUrl = webhookUrl
+        ?.replaceAll('$title', encodeURIComponent(this.title))
+        ?.replaceAll('$content', encodeURIComponent(this.content));
      const res = await got(formatUrl, options);
      if (String(res.statusCode).startsWith('20')) {
        return true;
@@ -634,23 +695,9 @@ export default class NotificationService {
      case 'multipart/form-data':
        return { form: body };
      case 'application/x-www-form-urlencoded':
+      case 'text/plain':
        return { body };
    }
    return {};
  }
-
-  private formatNotifyContent(url: string, body: string) {
-    if (!url.includes('$title') && !body.includes('$title')) {
-      return {};
-    }
-
-    return {
-      formatUrl: url
-        ?.replaceAll('$title', encodeURIComponent(this.title))
-        ?.replaceAll('$content', encodeURIComponent(this.content)),
-      formatBody: body
-        ?.replaceAll('$title', this.title)
-        ?.replaceAll('$content', this.content),
-    };
-  }
 }
@@ -12,7 +12,7 @@ import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';
 import { spawn } from 'cross-spawn';

-interface ScheduleTaskType {
+export interface ScheduleTaskType {
  id: number;
  command: string;
  name?: string;
@@ -47,10 +47,17 @@ export default class ScheduleService {
  async runTask(
    command: string,
    callbacks: TaskCallbacks = {},
+    params: {
+      schedule?: string;
+      name?: string;
+      command?: string;
+    },
    completionTime: 'start' | 'end' = 'end',
  ) {
-    return taskLimit.runWithCpuLimit(() => {
+    return taskLimit.runWithCronLimit(() => {
      return new Promise(async (resolve, reject) => {
+        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify({ ...params, command })}`);
+
        try {
          const startTime = dayjs();
          await callbacks.onBefore?.(startTime);
@@ -82,20 +89,14 @@ export default class ScheduleService {
            await callbacks.onError?.(JSON.stringify(err));
          });

-          cp.on('exit', async (code, signal) => {
-            this.logger.info(
-              `[panel][任务退出] ${command} 进程id: ${cp.pid}, 退出码 ${code}`,
-            );
-          });
-
-          cp.on('close', async (code) => {
+          cp.on('exit', async (code) => {
            const endTime = dayjs();
            await callbacks.onEnd?.(
              cp,
              endTime,
              endTime.diff(startTime, 'seconds'),
            );
-            resolve(null);
+            resolve({ ...params, pid: cp.pid, code });
          });
        } catch (error) {
          this.logger.error(
@@ -126,12 +127,20 @@ export default class ScheduleService {
    this.scheduleStacks.set(
      _id,
      nodeSchedule.scheduleJob(_id, schedule, async () => {
-        this.runTask(command, callbacks);
+        this.runTask(command, callbacks, {
+          name,
+          schedule,
+          command,
+        });
      }),
    );

    if (runImmediately) {
-      this.runTask(command, callbacks);
+      this.runTask(command, callbacks, {
+        name,
+        schedule,
+        command,
+      });
    }
  }

@@ -160,7 +169,10 @@ export default class ScheduleService {
    const task = new Task(
      name,
      () => {
-        this.runTask(command, callbacks);
+        this.runTask(command, callbacks, {
+          name,
+          command,
+        });
      },
      (err) => {
        this.logger.error(
@@ -180,7 +192,10 @@ export default class ScheduleService {
    this.intervalSchedule.addIntervalJob(job);

    if (runImmediately) {
-      this.runTask(command, callbacks);
+      this.runTask(command, callbacks, {
+        name,
+        command,
+      });
    }
  }

@@ -1,13 +1,12 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import fs from 'fs';
-import path from 'path';
+import path, { join } from 'path';
 import SockService from './sock';
 import CronService from './cron';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import config from '../config';
 import { TASK_COMMAND } from '../config/const';
-import { getPid, killTask } from '../config/util';
+import { getFileContentByName, getPid, killTask, rmPath } from '../config/util';

@Service()
 export default class ScriptService {
@@ -21,9 +20,7 @@ export default class ScriptService {
  private taskCallbacks(filePath: string): TaskCallbacks {
    return {
      onEnd: async (cp, endTime, diff) => {
-        try {
-          fs.unlinkSync(filePath);
-        } catch (error) {}
+        await rmPath(filePath);
      },
      onError: async (message: string) => {
        this.sockService.sendMessage({
@@ -42,10 +39,11 @@ export default class ScriptService {

  public async runScript(filePath: string) {
    const relativePath = path.relative(config.scriptPath, filePath);
-    const command = `${TASK_COMMAND} -l ${relativePath} now`;
+    const command = `${TASK_COMMAND} ${relativePath} now`;
    const pid = await this.scheduleService.runTask(
      command,
      this.taskCallbacks(filePath),
+      { command },
      'start',
    );

@@ -55,7 +53,7 @@ export default class ScriptService {
  public async stopScript(filePath: string, pid: number) {
    if (!pid) {
      const relativePath = path.relative(config.scriptPath, filePath);
-      pid = await getPid(`${TASK_COMMAND} -l ${relativePath} now`) as number;
+      pid = (await getPid(`${TASK_COMMAND} ${relativePath} now`)) as number;
    }
    try {
      await killTask(pid);
@@ -63,4 +61,10 @@ export default class ScriptService {

    return { code: 200 };
  }
+
+  public async getFile(filePath: string, fileName: string) {
+    const _filePath = join(config.scriptPath, filePath, fileName);
+    const content = await getFileContentByName(_filePath);
+    return content;
+  }
 }
@@ -1,11 +1,12 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import fs, { existsSync } from 'fs';
+import fs from 'fs/promises';
 import os from 'os';
 import path from 'path';
 import { Subscription } from '../data/subscription';
 import { formatUrl } from '../config/subscription';
 import config from '../config';
+import { fileExist, rmPath } from '../config/util';

@Service()
 export default class SshKeyService {
@@ -18,15 +19,16 @@ export default class SshKeyService {
    this.initSshConfigFile();
  }

-  private initSshConfigFile() {
+  private async initSshConfigFile() {
    let config = '';
-    if (existsSync(this.sshConfigFilePath)) {
-      config = fs.readFileSync(this.sshConfigFilePath, { encoding: 'utf-8' });
+    const _exist = await fileExist(this.sshConfigFilePath);
+    if (_exist) {
+      config = await fs.readFile(this.sshConfigFilePath, { encoding: 'utf-8' });
    } else {
-      fs.writeFileSync(this.sshConfigFilePath, '');
+      await fs.writeFile(this.sshConfigFilePath, '');
    }
    if (!config.includes(this.sshConfigHeader)) {
-      fs.writeFileSync(
+      await fs.writeFile(
        this.sshConfigFilePath,
        `${this.sshConfigHeader}\n\n${config}`,
        { encoding: 'utf-8' },
@@ -34,9 +36,12 @@ export default class SshKeyService {
    }
  }

-  private generatePrivateKeyFile(alias: string, key: string): void {
+  private async generatePrivateKeyFile(
+    alias: string,
+    key: string,
+  ): Promise<void> {
    try {
-      fs.writeFileSync(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
+      await fs.writeFile(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
        encoding: 'utf8',
        mode: '400',
      });
@@ -45,18 +50,20 @@ export default class SshKeyService {
    }
  }

-  private removePrivateKeyFile(alias: string): void {
+  private async removePrivateKeyFile(alias: string): Promise<void> {
    try {
      const filePath = path.join(this.sshPath, alias);
-      if (existsSync(filePath)) {
-        fs.unlinkSync(filePath);
-      }
+      await rmPath(filePath);
    } catch (error) {
      this.logger.error('删除私钥文件失败', error);
    }
  }

-  private generateSingleSshConfig(alias: string, host: string, proxy?: string) {
+  private async generateSingleSshConfig(
+    alias: string,
+    host: string,
+    proxy?: string,
+  ) {
    if (host === 'github.com') {
      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa`;
    }
@@ -67,49 +74,51 @@ export default class SshKeyService {
      this.sshPath,
      alias,
    )}\n    StrictHostKeyChecking no\n${proxyStr}`;
-    fs.writeFileSync(`${path.join(this.sshPath, `${alias}.config`)}`, config, {
+    await fs.writeFile(
+      `${path.join(this.sshPath, `${alias}.config`)}`,
+      config,
+      {
        encoding: 'utf8',
-    });
+      },
+    );
  }

-  private removeSshConfig(alias: string) {
+  private async removeSshConfig(alias: string) {
    try {
      const filePath = path.join(this.sshPath, `${alias}.config`);
-      if (existsSync(filePath)) {
-        fs.unlinkSync(filePath);
-      }
+      await rmPath(filePath);
    } catch (error) {
      this.logger.error(`删除ssh配置文件${alias}失败`, error);
    }
  }

-  public addSSHKey(
+  public async addSSHKey(
    key: string,
    alias: string,
    host: string,
    proxy?: string,
-  ): void {
-    this.generatePrivateKeyFile(alias, key);
-    this.generateSingleSshConfig(alias, host, proxy);
+  ): Promise<void> {
+    await this.generatePrivateKeyFile(alias, key);
+    await this.generateSingleSshConfig(alias, host, proxy);
  }

-  public removeSSHKey(alias: string, host: string, proxy?: string): void {
-    this.removePrivateKeyFile(alias);
-    this.removeSshConfig(alias);
+  public async removeSSHKey(alias: string, host: string, proxy?: string): Promise<void> {
+    await this.removePrivateKeyFile(alias);
+    await this.removeSshConfig(alias);
  }

-  public setSshConfig(docs: Subscription[]) {
+  public async setSshConfig(docs: Subscription[]) {
    for (const doc of docs) {
      if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
        const { alias, proxy } = doc;
        const { host } = formatUrl(doc);
-        this.removePrivateKeyFile(alias);
-        this.removeSshConfig(alias);
-        this.generatePrivateKeyFile(
+        await this.removePrivateKeyFile(alias);
+        await this.removeSshConfig(alias);
+        await this.generatePrivateKeyFile(
          alias,
          (doc.pull_option as any).private_key,
        );
-        this.generateSingleSshConfig(alias, host, proxy);
+        await this.generateSingleSshConfig(alias, host, proxy);
      }
    }
  }
@@ -7,7 +7,6 @@ import {
  SubscriptionStatus,
 } from '../data/subscription';
 import { ChildProcessWithoutNullStreams } from 'child_process';
-import fs from 'fs';
 import {
  getFileContentByName,
  concurrentRun,
@@ -16,9 +15,9 @@ import {
  killTask,
  handleLogPath,
  promiseExec,
-  emptyDir,
+  rmPath,
 } from '../config/util';
-import { promises, existsSync } from 'fs';
+import fs from 'fs/promises';
 import { FindOptions, Op } from 'sequelize';
 import path, { join } from 'path';
 import ScheduleService, { TaskCallbacks } from './schedule';
@@ -107,7 +106,7 @@ export default class SubscriptionService {

  public async setSshConfig() {
    const docs = await SubscriptionModel.findAll();
-    this.sshKeyService.setSshConfig(docs);
+    await this.sshKeyService.setSshConfig(docs);
  }

  private taskCallbacks(doc: Subscription): TaskCallbacks {
@@ -131,7 +130,7 @@ export default class SubscriptionService {
        let beforeStr = '';
        try {
          if (doc.sub_before) {
-            fs.appendFileSync(absolutePath, `\n## 执行before命令...\n\n`);
+            await fs.appendFile(absolutePath, `\n## 执行before命令...\n\n`);
            beforeStr = await promiseExec(doc.sub_before);
          }
        } catch (error: any) {
@@ -139,7 +138,7 @@ export default class SubscriptionService {
            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
        }
        if (beforeStr) {
-          fs.appendFileSync(absolutePath, `${beforeStr}\n`);
+          await fs.appendFile(absolutePath, `${beforeStr}\n`);
        }
      },
      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
@@ -158,7 +157,7 @@ export default class SubscriptionService {
        let afterStr = '';
        try {
          if (sub.sub_after) {
-            fs.appendFileSync(absolutePath, `\n\n## 执行after命令...\n\n`);
+            await fs.appendFile(absolutePath, `\n\n## 执行after命令...\n\n`);
            afterStr = await promiseExec(sub.sub_after);
          }
        } catch (error: any) {
@@ -166,10 +165,10 @@ export default class SubscriptionService {
            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
        }
        if (afterStr) {
-          fs.appendFileSync(absolutePath, `${afterStr}\n`);
+          await fs.appendFile(absolutePath, `${afterStr}\n`);
        }

-        fs.appendFileSync(
+        await fs.appendFile(
          absolutePath,
          `\n## 执行结束... ${endTime.format(
            'YYYY-MM-DD HH:mm:ss',
@@ -190,12 +189,12 @@ export default class SubscriptionService {
      onError: async (message: string) => {
        const sub = await this.getDb({ id: doc.id });
        const absolutePath = await handleLogPath(sub.log_path as string);
-        fs.appendFileSync(absolutePath, `\n${message}`);
+        await fs.appendFile(absolutePath, `\n${message}`);
      },
      onLog: async (message: string) => {
        const sub = await this.getDb({ id: doc.id });
        const absolutePath = await handleLogPath(sub.log_path as string);
-        fs.appendFileSync(absolutePath, `\n${message}`);
+        await fs.appendFile(absolutePath, `\n${message}`);
      },
    };
  }
@@ -268,11 +267,11 @@ export default class SubscriptionService {
    if (query?.force === true) {
      const crons = await CrontabModel.findAll({ where: { sub_id: ids } });
      if (crons?.length) {
-        await this.crontabService.remove(crons.map(x => x.id!))
+        await this.crontabService.remove(crons.map((x) => x.id!));
      }
      for (const doc of docs) {
        const filePath = join(config.scriptPath, doc.alias);
-        emptyDir(filePath);
+        await rmPath(filePath);
      }
    }
  }
@@ -320,7 +319,11 @@ export default class SubscriptionService {

    const command = formatCommand(subscription);

-    this.scheduleService.runTask(command, this.taskCallbacks(subscription));
+    this.scheduleService.runTask(command, this.taskCallbacks(subscription), {
+      name: subscription.name,
+      schedule: subscription.schedule,
+      command,
+    });
  }

  public async disabled(ids: number[]) {
@@ -348,7 +351,7 @@ export default class SubscriptionService {
    }

    const absolutePath = await handleLogPath(doc.log_path as string);
-    return getFileContentByName(absolutePath);
+    return await getFileContentByName(absolutePath);
  }

  public async logs(id: number) {
@@ -360,15 +363,18 @@ export default class SubscriptionService {
    if (doc.log_path) {
      const relativeDir = path.dirname(`${doc.log_path}`);
      const dir = path.resolve(config.logPath, relativeDir);
-      if (existsSync(dir)) {
-        let files = await promises.readdir(dir);
-        return files
-          .map((x) => ({
+      const _exist = await fileExist(dir);
+      if (_exist) {
+        let files = await fs.readdir(dir);
+        return (
+          await Promise.all(
+            files.map(async (x) => ({
              filename: x,
              directory: relativeDir.replace(config.logPath, ''),
-            time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
-          }))
-          .sort((a, b) => b.time - a.time);
+              time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
+            })),
+          )
+        ).sort((a, b) => b.time - a.time);
      }
    }
  }
@@ -1,20 +1,13 @@
+import { spawn } from 'cross-spawn';
 import { Response } from 'express';
-import { Service, Inject } from 'typedi';
+import fs from 'fs';
+import got from 'got';
+import sum from 'lodash/sum';
+import path from 'path';
+import { Inject, Service } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import {
-  AuthDataType,
-  AuthInfo,
-  AuthInstance,
-  AuthModel,
-  AuthModelInfo,
-} from '../data/auth';
-import { NotificationInfo } from '../data/notify';
-import NotificationService from './notify';
-import ScheduleService, { TaskCallbacks } from './schedule';
-import { spawn } from 'cross-spawn';
-import SockService from './sock';
-import got from 'got';
+import { TASK_COMMAND } from '../config/const';
 import {
  getPid,
  killTask,
@@ -23,12 +16,23 @@ import {
  promiseExec,
  readDirs,
 } from '../config/util';
-import { TASK_COMMAND } from '../config/const';
+import {
+  DependenceModel,
+  DependenceStatus,
+  DependenceTypes,
+} from '../data/dependence';
+import { NotificationInfo } from '../data/notify';
+import {
+  AuthDataType,
+  AuthInfo,
+  SystemInstance,
+  SystemModel,
+  SystemModelInfo,
+} from '../data/system';
 import taskLimit from '../shared/pLimit';
-import tar from 'tar';
-import path from 'path';
-import fs from 'fs';
-import { sum } from 'lodash';
+import NotificationService from './notify';
+import ScheduleService, { TaskCallbacks } from './schedule';
+import SockService from './sock';

@Service()
 export default class SystemService {
@@ -43,17 +47,17 @@ export default class SystemService {

  public async getSystemConfig() {
    const doc = await this.getDb({ type: AuthDataType.systemConfig });
-    return doc || ({} as AuthInstance);
+    return doc || ({} as SystemInstance);
  }

-  private async updateAuthDb(payload: AuthInfo): Promise<AuthInstance> {
-    await AuthModel.upsert({ ...payload });
+  private async updateAuthDb(payload: AuthInfo): Promise<SystemInstance> {
+    await SystemModel.upsert({ ...payload });
    const doc = await this.getDb({ type: payload.type });
    return doc;
  }

-  public async getDb(query: any): Promise<AuthInstance> {
-    const doc: any = await AuthModel.findOne({ where: { ...query } });
+  public async getDb(query: any): Promise<SystemInstance> {
+    const doc: any = await SystemModel.findOne({ where: { ...query } });
    return doc && doc.get({ plain: true });
  }

@@ -75,32 +79,174 @@ export default class SystemService {
    }
  }

-  public async updateSystemConfig(info: AuthModelInfo) {
+  public async updateLogRemoveFrequency(info: SystemModelInfo) {
    const oDoc = await this.getSystemConfig();
    const result = await this.updateAuthDb({
      ...oDoc,
-      type: AuthDataType.systemConfig,
-      info,
+      info: { ...oDoc.info, ...info },
    });
-    if (info.logRemoveFrequency) {
    const cron = {
-        id: result.id,
+      id: result.id || NaN,
      name: '删除日志',
      command: `ql rmlog ${info.logRemoveFrequency}`,
    };
+    if (oDoc.info?.logRemoveFrequency) {
      await this.scheduleService.cancelIntervalTask(cron);
-      if (info.logRemoveFrequency > 0) {
+    }
+    if (info.logRemoveFrequency && info.logRemoveFrequency > 0) {
      this.scheduleService.createIntervalTask(cron, {
        days: info.logRemoveFrequency,
      });
    }
+    return { code: 200, data: info };
  }
+
+  public async updateCronConcurrency(info: SystemModelInfo) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
    if (info.cronConcurrency) {
      await taskLimit.setCustomLimit(info.cronConcurrency);
    }
    return { code: 200, data: info };
  }

+  public async updateDependenceProxy(info: SystemModelInfo) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
+    if (info.dependenceProxy) {
+      await fs.promises.writeFile(
+        config.dependenceProxyFile,
+        `export http_proxy="${info.dependenceProxy}"\nexport https_proxy="${info.dependenceProxy}"`,
+      );
+    } else {
+      await fs.promises.rm(config.dependenceProxyFile);
+    }
+    return { code: 200, data: info };
+  }
+
+  public async updateNodeMirror(info: SystemModelInfo, res?: Response) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
+    let cmd = 'pnpm config delete registry';
+    if (info.nodeMirror) {
+      cmd = `pnpm config set registry ${info.nodeMirror}`;
+    }
+    let command = `cd && ${cmd}`;
+    const docs = await DependenceModel.findAll({
+      where: {
+        type: DependenceTypes.nodejs,
+        status: DependenceStatus.installed,
+      },
+    });
+    if (docs.length > 0) {
+      command += ` && pnpm i -g`;
+    }
+    this.scheduleService.runTask(
+      command,
+      {
+        onStart: async (cp) => {
+          res?.setHeader('QL-Task-Pid', `${cp.pid}`);
+          res?.end();
+        },
+        onEnd: async () => {
+          this.sockService.sendMessage({
+            type: 'updateNodeMirror',
+            message: 'update node mirror end',
+          });
+        },
+        onError: async (message: string) => {
+          this.sockService.sendMessage({ type: 'updateNodeMirror', message });
+        },
+        onLog: async (message: string) => {
+          this.sockService.sendMessage({ type: 'updateNodeMirror', message });
+        },
+      },
+      {
+        command,
+      },
+    );
+  }
+
+  public async updatePythonMirror(info: SystemModelInfo) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
+    let cmd = 'pip config unset global.index-url';
+    if (info.pythonMirror) {
+      cmd = `pip3 config set global.index-url ${info.pythonMirror}`;
+    }
+    await promiseExec(cmd);
+    return { code: 200, data: info };
+  }
+
+  public async updateLinuxMirror(
+    info: SystemModelInfo,
+    res?: Response,
+    onEnd?: () => void,
+  ) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
+    let defaultDomain = 'https://dl-cdn.alpinelinux.org';
+    let targetDomain = 'https://dl-cdn.alpinelinux.org';
+    const content = await fs.promises.readFile('/etc/apk/repositories', {
+      encoding: 'utf-8',
+    });
+    const domainMatch = content.match(/(http.*)\/alpine\/.*/);
+    if (domainMatch) {
+      defaultDomain = domainMatch[1];
+    }
+    if (info.linuxMirror) {
+      targetDomain = info.linuxMirror;
+    }
+    const command = `sed -i 's/${defaultDomain.replace(
+      /\//g,
+      '\\/',
+    )}/${targetDomain.replace(
+      /\//g,
+      '\\/',
+    )}/g' /etc/apk/repositories && apk update -f`;
+
+    this.scheduleService.runTask(
+      command,
+      {
+        onStart: async (cp) => {
+          res?.setHeader('QL-Task-Pid', `${cp.pid}`);
+          res?.end();
+        },
+        onEnd: async () => {
+          this.sockService.sendMessage({
+            type: 'updateLinuxMirror',
+            message: 'update linux mirror end',
+          });
+          onEnd?.();
+        },
+        onError: async (message: string) => {
+          this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
+        },
+        onLog: async (message: string) => {
+          this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
+        },
+      },
+      {
+        command,
+      },
+    );
+  }
+
  public async checkUpdate() {
    try {
      const currentVersionContent = await parseVersion(config.versionFile);
@@ -160,7 +306,7 @@ export default class SystemService {
  }

  public async updateSystem() {
-    const cp = spawn('ql -l update false', { shell: '/bin/bash' });
+    const cp = spawn('real_time=true ql update false', { shell: '/bin/bash' });

    cp.stdout.on('data', (data) => {
      this.sockService.sendMessage({
@@ -186,30 +332,10 @@ export default class SystemService {
    return { code: 200 };
  }

-  public async reloadSystem(target: 'system' | 'data') {
-    const cp = spawn(`ql -l reload ${target || ''}`, { shell: '/bin/bash' });
-
-    cp.stdout.on('data', (data) => {
-      this.sockService.sendMessage({
-        type: 'reloadSystem',
-        message: data.toString(),
-      });
-    });
-
-    cp.stderr.on('data', (data) => {
-      this.sockService.sendMessage({
-        type: 'reloadSystem',
-        message: data.toString(),
-      });
-    });
-
-    cp.on('error', (err) => {
-      this.sockService.sendMessage({
-        type: 'reloadSystem',
-        message: JSON.stringify(err),
-      });
-    });
-
+  public async reloadSystem(target?: 'system' | 'data') {
+    const cmd = `real_time=true ql reload ${target || ''}`;
+    const cp = spawn(cmd, { shell: '/bin/bash' });
+    cp.unref();
    return { code: 200 };
  }

@@ -232,6 +358,9 @@ export default class SystemService {
    this.scheduleService.runTask(
      `real_log_path=${logPath} real_time=true ${command}`,
      callback,
+      {
+        command,
+      },
    );
  }

@@ -259,10 +388,7 @@ export default class SystemService {

  public async exportData(res: Response) {
    try {
-      await tar.create(
-        { gzip: true, file: config.dataTgzFile, cwd: config.rootPath },
-        ['data'],
-      );
+      await promiseExec(`cd ${config.rootPath} && tar -zcvf ${config.dataTgzFile} data/`);
      res.download(config.dataTgzFile);
    } catch (error: any) {
      return res.send({ code: 400, message: error.message });
@@ -272,15 +398,17 @@ export default class SystemService {
  public async importData() {
    try {
      await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
-      await tar.x({ file: config.dataTgzFile, cwd: config.tmpPath });
-      return { code: 200 };
+      const res = await promiseExec(
+        `cd ${config.tmpPath} && tar -zxvf data.tgz`,
+      );
+      return { code: 200, data: res };
    } catch (error: any) {
      return { code: 400, message: error.message };
    }
  }

  public async getSystemLog(res: Response) {
-    const result = readDirs(config.systemLogPath, config.systemLogPath);
+    const result = await readDirs(config.systemLogPath, config.systemLogPath);
    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
    res.set({
      'Content-Length': sum(logs.map((x) => x.size)),
@@ -8,22 +8,25 @@ import {
  safeJSONParse,
 } from '../config/util';
 import config from '../config';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import {
  AuthDataType,
  AuthInfo,
-  AuthModel,
-  AuthModelInfo,
+  SystemModel,
+  SystemModelInfo,
  LoginStatus,
-} from '../data/auth';
+} from '../data/system';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
 import { Request } from 'express';
 import ScheduleService from './schedule';
 import SockService from './sock';
 import dayjs from 'dayjs';
+import IP2Region from 'ip2region';
+import requestIp from 'request-ip';
+import uniq from 'lodash/uniq';

@Service()
 export default class UserService {
@@ -44,12 +47,13 @@ export default class UserService {
    req: Request,
    needTwoFactor = true,
  ): Promise<any> {
-    if (!fs.existsSync(config.authConfigFile)) {
+    const _exist = await fileExist(config.authConfigFile);
+    if (!_exist) {
      return this.initAuthInfo();
    }

    let { username, password } = payloads;
-    const content = this.getAuthInfo();
+    const content = await this.getAuthInfo();
    const timestamp = Date.now();
    if (content) {
      let {
@@ -102,7 +106,16 @@ export default class UserService {
        };
      }

-      const { ip, address } = await getNetIp(req);
+      const ip = requestIp.getClientIp(req) || '';
+      const query = new IP2Region();
+      const ipAddress = query.search(ip);
+      let address = '';
+      if (ipAddress) {
+        const { country, province, city, isp } = ipAddress;
+        address = uniq([country, province, city, isp])
+          .filter(Boolean)
+          .join(' ');
+      }
      if (username === cUsername && password === cPassword) {
        const data = createRandomString(50, 100);
        const expiration = twoFactorActivated ? 60 : 20;
@@ -124,13 +137,12 @@ export default class UserService {
          platform: req.platform,
          isTwoFactorChecking: false,
        });
-        await this.notificationService.notify(
+        this.notificationService.notify(
          '登录通知',
          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
            req.platform
          }端 登录成功，ip地址 ${ip}`,
        );
-        await this.getLoginLog();
        await this.insertDb({
          type: AuthDataType.loginLog,
          info: {
@@ -153,13 +165,12 @@ export default class UserService {
          lastaddr: address,
          platform: req.platform,
        });
-        await this.notificationService.notify(
+        this.notificationService.notify(
          '登录通知',
          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
            req.platform
          }端 登录失败，ip地址 ${ip}`,
        );
-        await this.getLoginLog();
        await this.insertDb({
          type: AuthDataType.loginLog,
          info: {
@@ -187,15 +198,15 @@ export default class UserService {
  }

  public async logout(platform: string): Promise<any> {
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
    this.updateAuthInfo(authInfo, {
      token: '',
      tokens: { ...authInfo.tokens, [platform]: '' },
    });
  }

-  public async getLoginLog(): Promise<Array<AuthModelInfo | undefined>> {
-    const docs = await AuthModel.findAll({
+  public async getLoginLog(): Promise<Array<SystemModelInfo | undefined>> {
+    const docs = await SystemModel.findAll({
      where: { type: AuthDataType.loginLog },
    });
    if (docs && docs.length > 0) {
@@ -203,7 +214,7 @@ export default class UserService {
        (a, b) => b.info!.timestamp! - a.info!.timestamp!,
      );
      if (result.length > 100) {
-        await AuthModel.destroy({
+        await SystemModel.destroy({
          where: { id: result[result.length - 1].id },
        });
      }
@@ -213,12 +224,12 @@ export default class UserService {
  }

  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
-    const doc = await AuthModel.create({ ...payload }, { returning: true });
+    const doc = await SystemModel.create({ ...payload }, { returning: true });
    return doc;
  }

-  private initAuthInfo() {
-    fs.writeFileSync(
+  private async initAuthInfo() {
+    await fs.writeFile(
      config.authConfigFile,
      JSON.stringify({
        username: 'admin',
@@ -241,13 +252,13 @@ export default class UserService {
    if (password === 'admin') {
      return { code: 400, message: '密码不能设置为admin' };
    }
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
    this.updateAuthInfo(authInfo, { username, password });
    return { code: 200, message: '更新成功' };
  }

  public async updateAvatar(avatar: string) {
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
    this.updateAuthInfo(authInfo, { avatar });
    return { code: 200, data: avatar, message: '更新成功' };
  }
@@ -255,7 +266,7 @@ export default class UserService {
  public async getUserInfo(): Promise<any> {
    const authFileExist = await fileExist(config.authConfigFile);
    if (!authFileExist) {
-      fs.writeFileSync(
+      await fs.writeFile(
        config.authConfigFile,
        JSON.stringify({
          username: 'admin',
@@ -263,19 +274,19 @@ export default class UserService {
        }),
      );
    }
-    return this.getAuthInfo();
+    return await this.getAuthInfo();
  }

-  public initTwoFactor() {
+  public async initTwoFactor() {
    const secret = authenticator.generateSecret();
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
    const otpauth = authenticator.keyuri(authInfo.username, 'qinglong', secret);
    this.updateAuthInfo(authInfo, { twoFactorSecret: secret });
    return { secret, url: otpauth };
  }

-  public activeTwoFactor(code: string) {
-    const authInfo = this.getAuthInfo();
+  public async activeTwoFactor(code: string) {
+    const authInfo = await this.getAuthInfo();
    const isValid = authenticator.verify({
      token: code,
      secret: authInfo.twoFactorSecret,
@@ -294,7 +305,7 @@ export default class UserService {
    }: { username: string; password: string; code: string },
    req: any,
  ) {
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
    const { isTwoFactorChecking, twoFactorSecret } = authInfo;
    if (!isTwoFactorChecking) {
      return { code: 450, message: '未知错误' };
@@ -316,8 +327,8 @@ export default class UserService {
    }
  }

-  public deactiveTwoFactor() {
-    const authInfo = this.getAuthInfo();
+  public async deactiveTwoFactor() {
+    const authInfo = await this.getAuthInfo();
    this.updateAuthInfo(authInfo, {
      twoFactorActivated: false,
      twoFactorActived: false,
@@ -326,13 +337,13 @@ export default class UserService {
    return true;
  }

-  private getAuthInfo() {
-    const content = fs.readFileSync(config.authConfigFile, 'utf8');
+  private async getAuthInfo() {
+    const content = await fs.readFile(config.authConfigFile, 'utf8');
    return safeJSONParse(content);
  }

-  private updateAuthInfo(authInfo: any, info: any) {
-    fs.writeFileSync(
+  private async updateAuthInfo(authInfo: any, info: any) {
+    await fs.writeFile(
      config.authConfigFile,
      JSON.stringify({ ...authInfo, ...info }),
    );
@@ -344,21 +355,21 @@ export default class UserService {
  }

  private async updateAuthDb(payload: AuthInfo): Promise<any> {
-    let doc = await AuthModel.findOne({ type: payload.type });
+    let doc = await SystemModel.findOne({ type: payload.type });
    if (doc) {
-      const updateResult = await AuthModel.update(payload, {
+      const updateResult = await SystemModel.update(payload, {
        where: { id: doc.id },
        returning: true,
      });
      doc = updateResult[1][0];
    } else {
-      doc = await AuthModel.create(payload, { returning: true });
+      doc = await SystemModel.create(payload, { returning: true });
    }
    return doc;
  }

  public async getDb(query: any): Promise<any> {
-    const doc: any = await AuthModel.findOne({ where: { ...query } });
+    const doc: any = await SystemModel.findOne({ where: { ...query } });
    return doc && (doc.get({ plain: true }) as any);
  }

@@ -1,53 +1,109 @@
-import pLimit from 'p-limit';
+import PQueue, { QueueAddOptions } from 'p-queue-cjs';
 import os from 'os';
-import { AuthDataType, AuthModel } from '../data/auth';
+import { AuthDataType, SystemModel } from '../data/system';
 import Logger from '../loaders/logger';
-import dayjs from 'dayjs';
+import { Dependence } from '../data/dependence';

+interface IDependencyFn<T> {
+  (): Promise<T>;
+  dependency?: Dependence;
+}
 class TaskLimit {
-  private oneLimit = pLimit(1);
-  private updateLogLimit = pLimit(1);
-  private cpuLimit = pLimit(Math.max(os.cpus().length, 4));
+  private dependenyLimit = new PQueue({ concurrency: 1 });
+  private queuedDependencyIds = new Set<number>([]);
+  private updateLogLimit = new PQueue({ concurrency: 1 });
+  private cronLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });

-  get cpuLimitActiveCount() {
-    return this.cpuLimit.activeCount;
+  get cronLimitActiveCount() {
+    return this.cronLimit.pending;
  }

-  get cpuLimitPendingCount() {
-    return this.cpuLimit.pendingCount;
+  get cronLimitPendingCount() {
+    return this.cronLimit.size;
+  }
+
+  get firstDependencyId() {
+    return [...this.queuedDependencyIds.values()][0];
  }

  constructor() {
    this.setCustomLimit();
+    this.handleEvents();
+  }
+
+  private handleEvents() {
+    this.cronLimit.on('add', () => {
+      Logger.info(
+        `[schedule][任务加入队列] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`,
+      );
+    });
+    this.cronLimit.on('active', () => {
+      Logger.info(
+        `[schedule][开始处理任务] 运行中任务数: ${
+          this.cronLimitActiveCount + 1
+        }, 等待中任务数: ${this.cronLimitPendingCount}`,
+      );
+    });
+    this.cronLimit.on('completed', (param) => {
+      Logger.info(`[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`);
+    });
+    this.cronLimit.on('error', (error) => {
+      Logger.error(`[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`);
+    });
+    this.cronLimit.on('next', () => {
+      Logger.info(
+        `[schedule][任务处理结束] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`,
+      );
+    });
+    this.cronLimit.on('idle', () => {
+      Logger.info(`[schedule][任务队列] 空闲中...`);
+    });
+  }
+
+  public removeQueuedDependency(dependency: Dependence) {
+    if (this.queuedDependencyIds.has(dependency.id!)) {
+      this.queuedDependencyIds.delete(dependency.id!);
+    }
  }

  public async setCustomLimit(limit?: number) {
    if (limit) {
-      this.cpuLimit = pLimit(limit);
+      this.cronLimit.concurrency = limit;
      return;
    }
-    await AuthModel.sync();
-    const doc = await AuthModel.findOne({
+    await SystemModel.sync();
+    const doc = await SystemModel.findOne({
      where: { type: AuthDataType.systemConfig },
    });
    if (doc?.info?.cronConcurrency) {
-      this.cpuLimit = pLimit(doc?.info?.cronConcurrency);
+      this.cronLimit.concurrency = doc.info.cronConcurrency;
    }
  }

-  public runWithCpuLimit<T>(fn: () => Promise<T>): Promise<T> {
-    Logger.info(
-      `[schedule][任务加入队列] 运行中任务数: ${this.cpuLimitActiveCount}, 等待中任务数: ${this.cpuLimitPendingCount}`,
-    );
-    return this.cpuLimit(fn);
+  public async runWithCronLimit<T>(
+    fn: () => Promise<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    return this.cronLimit.add(fn, options);
  }

-  public runOneByOne<T>(fn: () => Promise<T>): Promise<T> {
-    return this.oneLimit(fn);
+  public runDependeny<T>(
+    dependency: Dependence,
+    fn: IDependencyFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    this.queuedDependencyIds.add(dependency.id!);
+    fn.dependency = dependency;
+    return this.dependenyLimit.add(fn, options);
  }

-  public updateDepLog<T>(fn: () => Promise<T>): Promise<T> {
-    return this.updateLogLimit(fn);
+  public updateDepLog<T>(
+    fn: () => Promise<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    return this.updateLogLimit.add(fn, options);
  }
 }

@@ -2,11 +2,10 @@ import { spawn } from 'cross-spawn';
 import taskLimit from './pLimit';
 import Logger from '../loaders/logger';

-export function runCron(cmd: string): Promise<number> {
-  return taskLimit.runWithCpuLimit(() => {
+export function runCron(cmd: string, options?: { schedule: string; extraSchedules: Array<{ schedule: string }>; name: string }): Promise<number | void> {
+  return taskLimit.runWithCronLimit(() => {
    return new Promise(async (resolve: any) => {
-      Logger.info(`[schedule][开始执行任务] 运行命令: ${cmd}`);
-
+      Logger.info(`[schedule][开始执行任务] 参数 ${JSON.stringify({ ...options, command: cmd })}`);
      const cp = spawn(cmd, { shell: '/bin/bash' });

      cp.stderr.on('data', (data) => {
@@ -24,9 +23,8 @@ export function runCron(cmd: string): Promise<number> {
        );
      });

-      cp.on('close', async (code) => {
-        Logger.info(`[schedule][任务退出] ${cmd} 进程id: ${cp.pid} 退出, 退出码 ${code}`);
-        resolve();
+      cp.on('exit', async (code) => {
+        resolve({ ...options, command: cmd, pid: cp.pid, code });
      });
    });
  });
@@ -0,0 +1,27 @@
+import 'reflect-metadata'; // We need this in order to use @Decorators
+import config from './config';
+import express from 'express';
+import depInjectorLoader from './loaders/depInjector';
+import Logger from './loaders/logger';
+
+
+async function startServer() {
+  const app = express();
+  depInjectorLoader();
+
+  await require('./loaders/update').default({ app });
+
+  app
+    .listen(config.updatePort, () => {
+      Logger.debug(`✌️ 更新服务启动成功！`);
+      console.debug(`✌️ 更新服务启动成功！`);
+      process.send?.('ready');
+    })
+    .on('error', (err) => {
+      Logger.error(err);
+      console.error(err);
+      process.exit(1);
+    });
+}
+
+startServer();
@@ -0,0 +1,82 @@
+FROM python:3.10-alpine3.18 as builder
+COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
+RUN set -x \
+  && apk update \
+  && apk add nodejs npm git \
+  && npm i -g pnpm@8.3.1 pm2 tsx \
+  && cd /tmp/build \
+  && pnpm install --prod
+
+FROM python:3.10-alpine
+
+ARG QL_MAINTAINER="whyour"
+LABEL maintainer="${QL_MAINTAINER}"
+ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
+ARG QL_BRANCH=develop
+
+ENV PNPM_HOME=/root/.local/share/pnpm \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
+  LANG=C.UTF-8 \
+  SHELL=/bin/bash \
+  PS1="\u@\h:\w \$ " \
+  QL_DIR=/ql \
+  QL_BRANCH=${QL_BRANCH}
+
+VOLUME /ql/data
+  
+EXPOSE 5700
+
+COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=builder /usr/local/bin/. /usr/local/bin/
+
+RUN set -x \
+  && apk update -f \
+  && apk upgrade \
+  && apk --no-cache add -f bash \
+  coreutils \
+  git \
+  curl \
+  wget \
+  tzdata \
+  perl \
+  openssl \
+  nginx \
+  nodejs \
+  jq \
+  openssh \
+  procps \
+  netcat-openbsd \
+  unzip \
+  npm \
+  && rm -rf /var/cache/apk/* \
+  && apk update \
+  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+  && echo "Asia/Shanghai" > /etc/timezone \
+  && git config --global user.email "qinglong@@users.noreply.github.com" \
+  && git config --global user.name "qinglong" \
+  && git config --global http.postBuffer 524288000 \
+  && rm -rf /root/.pnpm-store \
+  && rm -rf /root/.local/share/pnpm/store \
+  && rm -rf /root/.cache \
+  && ulimit -c 0
+
+ARG SOURCE_COMMIT
+RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
+  && cd ${QL_DIR} \
+  && cp -f .env.example .env \
+  && chmod 777 ${QL_DIR}/shell/*.sh \
+  && chmod 777 ${QL_DIR}/docker/*.sh \
+  && git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
+  && mkdir -p ${QL_DIR}/static \
+  && cp -rf /static/* ${QL_DIR}/static \
+  && rm -rf /static
+
+COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
+
+WORKDIR ${QL_DIR}
+
+HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
+
+ENTRYPOINT ["./docker/docker-entrypoint.sh"]
@@ -1,13 +1,13 @@
-FROM python:3.10-alpine as builder
+FROM python:3.11-alpine3.18 as builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
  && apk update \
  && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 \
+  && npm i -g pnpm@8.3.1 pm2 tsx \
  && cd /tmp/build \
-  && pnpm --registry https://registry.npmmirror.com install --prod
+  && pnpm install --prod

-FROM python:3.10-alpine
+FROM python:3.11-alpine

 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -23,8 +23,14 @@ ENV PNPM_HOME=/root/.local/share/pnpm \
  QL_DIR=/ql \
  QL_BRANCH=${QL_BRANCH}

+VOLUME /ql/data
+  
+EXPOSE 5700
+
+COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=builder /usr/local/bin/. /usr/local/bin/
+
 RUN set -x \
-  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
  && apk update -f \
  && apk upgrade \
  && apk --no-cache add -f bash \
@@ -41,6 +47,7 @@ RUN set -x \
  openssh \
  procps \
  netcat-openbsd \
+  unzip \
  npm \
  && rm -rf /var/cache/apk/* \
  && apk update \
@@ -49,13 +56,10 @@ RUN set -x \
  && git config --global user.email "qinglong@@users.noreply.github.com" \
  && git config --global user.name "qinglong" \
  && git config --global http.postBuffer 524288000 \
-  && npm install -g pnpm@8.3.1 \
-  && cd && pnpm config set registry https://registry.npmmirror.com \
-  && pnpm add -g pm2 tsx \
  && rm -rf /root/.pnpm-store \
  && rm -rf /root/.local/share/pnpm/store \
  && rm -rf /root/.cache \
-  && rm -rf /root/.npm
+  && ulimit -c 0

 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
@@ -73,6 +77,6 @@ COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 WORKDIR ${QL_DIR}

 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
-  CMD curl -sf http://127.0.0.1:5400/api/health || exit 1
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1

 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
@@ -1,6 +1,7 @@
 #!/bin/bash

 dir_shell=/ql/shell
+. $dir_shell/env.sh
 . $dir_shell/share.sh
 link_shell

@@ -14,37 +15,24 @@ pm2 l &>/dev/null

 echo -e "======================2. 安装依赖========================\n"
 patch_version
-if [[ $PipMirror ]]; then
-  pip3 config set global.index-url $PipMirror
-fi
-current_npm_registry=$(cd && pnpm config get registry)
-is_equal_registry=$(echo $current_npm_registry | grep "${NpmMirror}")
-if [[ "$is_equal_registry" == "" ]]; then
-  cd && pnpm config set registry $NpmMirror
-  pnpm install -g
-fi
-if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
-  cp -f $dir_sample/package.json $dir_scripts/package.json
-  npm_install_2 $dir_scripts
-fi
-echo

 echo -e "======================3. 启动nginx========================\n"
 nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"

 echo -e "======================4. 启动pm2服务========================\n"
+reload_update
 reload_pm2

 if [[ $AutoStartBot == true ]]; then
  echo -e "======================5. 启动bot========================\n"
-  nohup ql -l bot >$dir_log/bot.log 2>&1 &
+  nohup ql bot >$dir_log/bot.log 2>&1 &
  echo -e "bot后台启动中...\n"
 fi

 if [[ $EnableExtraShell == true ]]; then
  echo -e "====================6. 执行自定义脚本========================\n"
-  nohup ql -l extra >$dir_log/extra.log 2>&1 &
+  nohup ql extra >$dir_log/extra.log 2>&1 &
  echo -e "自定义脚本后台执行中...\n"
 fi

@@ -6,22 +6,42 @@ upstream publicApi {
  server 0.0.0.0:5400;
 }

+upstream updateApi {
+  server 0.0.0.0:5300;
+}
+
 map $http_upgrade $connection_upgrade {
  default keep-alive;
  'websocket' upgrade;
 }

 server {
-  listen 5700;
+  IPV4_CONFIG
  IPV6_CONFIG
  ssl_session_timeout 5m;

+  location QL_BASE_URLapi/update/ {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://updateApi/api/;
+    proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
+  }
+
  location QL_BASE_URLapi/public/ {
    proxy_set_header Host $http_host;
    proxy_set_header X-Real-IP $remote_addr;
    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
    proxy_pass http://publicApi/api/;
    proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
  }

  location QL_BASE_URLapi/ {
@@ -30,6 +50,10 @@ server {
    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
    proxy_pass http://baseApi/api/;
    proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;

    proxy_set_header Upgrade $http_upgrade;
    proxy_set_header Connection $connection_upgrade;
@@ -41,6 +65,10 @@ server {
    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
    proxy_pass http://baseApi/open/;
    proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
  }

  gzip on;
@@ -9,6 +9,14 @@ module.exports = {
      source_map_support: true,
      time: true,
      script: 'static/build/schedule/index.js',
+      env: {
+        http_proxy: '',
+        https_proxy: '',
+        HTTP_PROXY: '',
+        HTTPS_PROXY: '',
+        all_proxy: '',
+        ALL_PROXY: '',
+      },
    },
    {
      name: 'public',
@@ -1,6 +1,5 @@
 {
  "watch": ["back", ".env"],
  "ext": "js,ts,json",
-  "ignore": ["src/**/*.spec.ts"],
-  "exec": "ts-node  --transpile-only ./back/app.ts"
+  "exec": "ts-node -P tsconfig.back.json ./back/app.ts"
 }
@@ -0,0 +1,13 @@
+module.exports = {
+  apps: [
+    {
+      name: 'update',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      time: true,
+      script: 'static/build/update.js',
+    },
+  ],
+};
@@ -4,13 +4,15 @@
    "start": "concurrently -n w: npm:start:*",
    "start:front": "max dev",
    "start:back": "nodemon",
-    "start:public": "ts-node --transpile-only ./back/public.ts",
-    "start:rpc": "ts-node --transpile-only ./back/schedule/index.ts",
+    "start:update": "ts-node -P tsconfig.back.json ./back/update.ts",
+    "start:public": "ts-node -P tsconfig.back.json ./back/public.ts",
+    "start:rpc": "ts-node -P tsconfig.back.json ./back/schedule/index.ts",
    "build:front": "max build",
    "build:back": "tsc -p tsconfig.back.json",
    "panel": "npm run build:back && node static/build/app.js",
    "schedule": "npm run build:back && node static/build/schedule/index.js",
    "public": "npm run build:back && node static/build/public.js",
+    "update": "npm run build:back && node static/build/update.js",
    "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true",
    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
    "postinstall": "max setup 2>/dev/null || true",
@@ -58,7 +60,6 @@
    "@grpc/grpc-js": "^1.8.13",
    "@otplib/preset-default": "^12.0.1",
    "@sentry/node": "^7.12.1",
-    "@sentry/tracing": "^7.12.1",
    "body-parser": "^1.19.2",
    "celebrate": "^15.0.1",
    "chokidar": "^3.5.3",
@@ -69,21 +70,21 @@
    "dotenv": "^16.0.0",
    "express": "^4.17.3",
    "express-jwt": "^6.1.1",
-    "express-rate-limit": "^6.7.0",
+    "express-rate-limit": "^7.0.0",
    "express-urlrewrite": "^1.4.0",
    "form-data": "^4.0.0",
    "got": "^11.8.2",
-    "hpagent": "^0.1.2",
+    "hpagent": "^1.2.0",
    "http-proxy-middleware": "^2.0.6",
    "iconv-lite": "^0.6.3",
    "js-yaml": "^4.1.0",
    "jsonwebtoken": "^8.5.1",
    "lodash": "^4.17.21",
-    "multer": "^1.4.4",
+    "multer": "1.4.5-lts.1",
    "nedb": "^1.8.0",
    "node-schedule": "^2.1.0",
    "nodemailer": "^6.7.2",
-    "p-limit": "3.1.0",
+    "p-queue-cjs": "7.3.4",
    "protobufjs": "^7.2.3",
    "pstree.remy": "^1.1.8",
    "reflect-metadata": "^0.1.13",
@@ -91,13 +92,15 @@
    "serve-handler": "^6.1.3",
    "sockjs": "^0.3.24",
    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
-    "tar": "^6.1.15",
    "toad-scheduler": "^1.6.0",
    "typedi": "^0.10.0",
    "uuid": "^8.3.2",
    "winston": "^3.6.0",
    "winston-daily-rotate-file": "^4.7.1",
-    "yargs": "^17.3.1"
+    "yargs": "^17.3.1",
+    "tough-cookie": "^4.0.0",
+    "request-ip": "3.3.0",
+    "ip2region": "2.3.0"
  },
  "devDependencies": {
    "@ant-design/icons": "^4.7.0",
@@ -110,7 +113,7 @@
    "@types/cross-spawn": "^6.0.2",
    "@types/express": "^4.17.13",
    "@types/express-jwt": "^6.0.4",
-    "@types/file-saver": "^2.0.5",
+    "@types/file-saver": "2.0.2",
    "@types/js-yaml": "^4.0.5",
    "@types/jsonwebtoken": "^8.5.8",
    "@types/lodash": "^4.14.185",
@@ -126,8 +129,8 @@
    "@types/serve-handler": "^6.1.1",
    "@types/sockjs": "^0.3.33",
    "@types/sockjs-client": "^1.5.1",
-    "@types/tar": "^6.1.5",
    "@types/uuid": "^8.3.4",
+    "@types/request-ip": "0.0.41",
    "@uiw/codemirror-extensions-langs": "^4.21.9",
    "@uiw/react-codemirror": "^4.21.9",
    "@umijs/max": "^4.0.72",
@@ -139,11 +142,13 @@
    "axios": "^1.4.0",
    "compression-webpack-plugin": "9.2.0",
    "concurrently": "^7.0.0",
-    "file-saver": "^2.0.5",
+    "react-hotkeys-hook": "^4.4.1",
+    "file-saver": "2.0.2",
    "lint-staged": "^13.0.3",
    "monaco-editor": "0.33.0",
-    "nodemon": "^2.0.15",
+    "nodemon": "^3.0.1",
    "prettier": "^2.5.1",
+    "pretty-bytes": "6.1.1",
    "qiniu": "^7.4.0",
    "qrcode.react": "^1.0.1",
    "query-string": "^7.1.1",
@@ -162,7 +167,7 @@
    "ts-proto": "^1.146.0",
    "tslib": "^2.4.0",
    "tsx": "^3.12.3",
-    "typescript": "4.8.4",
+    "typescript": "5.2.2",
    "vh-check": "^2.0.5",
    "virtualizedtableforantd4": "1.3.0",
    "webpack": "^5.70.0",
@@ -21,20 +21,19 @@ DiskWarn=90
 ## 设置定时任务执行的超时时间，例如1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 CommandTimeoutTime=""

-## 在运行 task 命令时，随机延迟启动任务的最大延迟时间
-## 默认给javascript任务加随机延迟，如 RandomDelay="300" ，表示任务将在 1-300 秒内随机延迟一个秒数，然后再运行，取消延迟赋值为空
-RandomDelay="300"
+## 在运行 task 命令时，随机延迟启动任务的最大延迟时间，如 RandomDelay="300" ，表示任务将在 1-300 秒内随机延迟一个秒数，然后再运行，取消延迟赋值为空
+RandomDelay=""

 ## 需要随机延迟运行任务的文件后缀，直接写后缀名即可，多个后缀用空格分开，例如: js py ts
 ## 默认仅给javascript任务加随机延迟，其它任务按定时规则准点运行。全部任务随机延迟赋值为空
-RandomDelayFileExtensions="js"
+RandomDelayFileExtensions=""

 ## 每小时的第几分钟准点运行任务，当在这些时间运行任务时将忽略 RandomDelay 配置，不会被随机延迟
 ## 默认是第0分钟和第30分钟，例如21:00或21:30分的任务将会准点运行。不需要准点运行赋值为空
-RandomDelayIgnoredMinutes="0 30"
+RandomDelayIgnoredMinutes=""

-## 如果你自己会写shell脚本，并且希望在每次运行 ql update 命令时，额外运行你的 shell 脚本，请赋值为 "true"，默认为true
-EnableExtraShell="true"
+## 如果你自己会写shell脚本，并且希望在每次容器启动时，额外运行你的 shell 脚本，请赋值为 "true"
+EnableExtraShell=""

 ## 是否自动启动bot，默认不启动，设置为true时自动启动，目前需要自行克隆bot仓库所需代码，存到ql/repo目录下，文件夹命名为dockerbot
 AutoStartBot=""
@@ -42,12 +41,6 @@ AutoStartBot=""
 ## 是否使用第三方bot，默认不使用，使用时填入仓库地址，存到ql/repo目录下，文件夹命名为diybot
 BotRepoUrl=""

-## 安装python依赖时指定pip源
-PipMirror="https://pypi.doubanio.com/simple/"
-
-## 安装node依赖时指定npm源
-NpmMirror="https://registry.npmmirror.com"
-
 ## 通知环境变量
 ## 1. Server酱
 ## https://sct.ftqq.com
@@ -155,12 +148,18 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""

+## 13. CHRONOCAT
+## CHRONOCAT_URL 推送 http://127.0.0.1:16530
+## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
+## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
+## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
+export CHRONOCAT_URL=""
+export CHRONOCAT_QQ=""
+export CHRONOCAT_TOKEN=""
+
 ## 14. SMTP
-## 暂时只支持在 Python 中调用 notify.py 以发送 SMTP 邮件通知
-## smtp_server 填写 SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
-export SMTP_SERVER=""
-## smtp_ssl 填写 SMTP 发送邮件服务器是否使用 SSL，内容应为 true 或 false
-export SMTP_SSL="false"
+## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
+export SMTP_SERVICE=""
 ## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
 export SMTP_EMAIL=""
 ## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
@@ -173,4 +172,15 @@ export SMTP_NAME=""
 ## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
 export PUSHME_KEY=""

+## 15. 自定义通知
+## 自定义通知 接收回调的URL
+export WEBHOOK_URL=""
+## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"
+export WEBHOOK_BODY=""
+export WEBHOOK_HEADERS=""
+## 支持 GET/POST/PUT
+export WEBHOOK_METHOD=""
+## 支持 text/plain、application/json、multipart/form-data、application/x-www-form-urlencoded
+export WEBHOOK_CONTENT_TYPE=""
+
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可
@@ -11,6 +11,7 @@
 */

 const querystring = require('querystring');
+const got = require('got');
 const $ = new Env();
 const timeout = 15000; // 超时时间(单位毫秒)
 // =======================================gotify通知设置区域==============================================
@@ -55,6 +56,10 @@ let BARK_ICON = 'https://qn.whyour.cn/logo.png';
 let BARK_SOUND = '';
 // BARK app推送消息的分组, 默认为"QingLong"
 let BARK_GROUP = 'QingLong';
+// BARK app推送消息的时效性, 默认为"active"
+let BARK_LEVEL = 'active';
+// BARK app推送消息的跳转URL
+let BARK_URL = '';

 // =======================================telegram机器人通知设置区域===========================================
 // 此处填你telegram bot 的Token，telegram机器人通知推送必填项.例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw
@@ -68,7 +73,7 @@ let TG_PROXY_HOST = ''; //例如:127.0.0.1(环境变量名:TG_PROXY_HOST)
 let TG_PROXY_PORT = ''; // 例如:1080(环境变量名:TG_PROXY_PORT)
 let TG_PROXY_AUTH = ''; // tg代理配置认证参数
 // Telegram api自建的反向代理地址(不懂可忽略,telegram机器人通知推送功能中非必填),默认tg官方api(环境变量名:TG_API_HOST)
-let TG_API_HOST = 'api.telegram.org';
+let TG_API_HOST = 'https://api.telegram.org';
 // =======================================钉钉机器人通知设置区域===========================================
 // 此处填你钉钉 bot 的webhook，例如：5a544165465465645d0f31dca676e7bd07415asdasd
 // (环境变量名 DD_BOT_TOKEN)
@@ -108,13 +113,6 @@ let IGOT_PUSH_KEY = '';
 let PUSH_PLUS_TOKEN = '';
 let PUSH_PLUS_USER = '';

-// =======================================Cool Push设置区域=======================================
-//官方文档：https://cp.xuthus.cc/docs
-//QQ_SKEY: Cool Push登录授权后推送消息的调用代码Skey
-//QQ_MODE: 推送模式详情请登录获取QQ_SKEY后见https://cp.xuthus.cc/feat
-let QQ_SKEY = '';
-let QQ_MODE = '';
-
 // =======================================智能微秘书设置区域=======================================
 // 官方文档：http://wechat.aibotk.com/docs/about
 // AIBOTK_KEY： 填写智能微秘书个人中心的apikey
@@ -130,13 +128,11 @@ let AIBOTK_NAME = '';
 let FSKEY = '';

 // =======================================SMTP 邮件设置区域=======================================
-// SMTP_SERVER: 填写 SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
-// SMTP_SSL: 填写 SMTP 发送邮件服务器是否使用 SSL，内容应为 true 或 false
+// SMTP_SERVICE: 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
 // SMTP_EMAIL: 填写 SMTP 收发件邮箱，通知将会由自己发给自己
 // SMTP_PASSWORD: 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
 // SMTP_NAME: 填写 SMTP 收发件人姓名，可随意填写
-let SMTP_SERVER = '';
-let SMTP_SSL = 'false';
+let SMTP_SERVICE = '';
 let SMTP_EMAIL = '';
 let SMTP_PASSWORD = '';
 let SMTP_NAME = '';
@@ -146,6 +142,23 @@ let SMTP_NAME = '';
 // 此处填你的PushMe KEY.
 let PUSHME_KEY = '';

+// =======================================CHRONOCAT通知设置区域===========================================
+// CHRONOCAT_URL Red协议连接地址 例： http://127.0.0.1:16530
+// CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
+// CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群
+// CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
+let CHRONOCAT_URL = ''; // CHRONOCAT Red协议连接地址
+let CHRONOCAT_TOKEN = ''; // CHRONOCAT 生成的访问密钥
+let CHRONOCAT_QQ = ''; // 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
+
+// =======================================自定义通知设置区域=======================================
+// 自定义通知 接收回调的URL
+let WEBHOOK_URL = '';
+let WEBHOOK_BODY = '';
+let WEBHOOK_HEADERS = '';
+let WEBHOOK_METHOD = '';
+let WEBHOOK_CONTENT_TYPE = '';
+
 // ==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
  GOTIFY_URL = process.env.GOTIFY_URL;
@@ -211,6 +224,12 @@ if (process.env.BARK_PUSH) {
  if (process.env.BARK_GROUP) {
    BARK_GROUP = process.env.BARK_GROUP;
  }
+  if (process.env.BARK_LEVEL) {
+    BARK_LEVEL = process.env.BARK_LEVEL;
+  }
+  if (process.env.BARK_URL) {
+    BARK_URL = process.env.BARK_URL;
+  }
 } else {
  if (
    BARK_PUSH &&
@@ -278,11 +297,8 @@ if (process.env.FSKEY) {
  FSKEY = process.env.FSKEY;
 }

-if (process.env.SMTP_SERVER) {
-  SMTP_SERVER = process.env.SMTP_SERVER;
-}
-if (process.env.SMTP_SSL) {
-  SMTP_SSL = process.env.SMTP_SSL;
+if (process.env.SMTP_SERVICE) {
+  SMTP_SERVICE = process.env.SMTP_SERVICE;
 }
 if (process.env.SMTP_EMAIL) {
  SMTP_EMAIL = process.env.SMTP_EMAIL;
@@ -296,6 +312,32 @@ if (process.env.SMTP_NAME) {
 if (process.env.PUSHME_KEY) {
  PUSHME_KEY = process.env.PUSHME_KEY;
 }
+
+if (process.env.CHRONOCAT_URL) {
+  CHRONOCAT_URL = process.env.CHRONOCAT_URL;
+}
+if (process.env.CHRONOCAT_QQ) {
+  CHRONOCAT_QQ = process.env.CHRONOCAT_QQ;
+}
+if (process.env.CHRONOCAT_TOKEN) {
+  CHRONOCAT_TOKEN = process.env.CHRONOCAT_TOKEN;
+}
+
+if (process.env.WEBHOOK_URL) {
+  WEBHOOK_URL = process.env.WEBHOOK_URL;
+}
+if (process.env.WEBHOOK_BODY) {
+  WEBHOOK_BODY = process.env.WEBHOOK_BODY;
+}
+if (process.env.WEBHOOK_HEADERS) {
+  WEBHOOK_HEADERS = process.env.WEBHOOK_HEADERS;
+}
+if (process.env.WEBHOOK_METHOD) {
+  WEBHOOK_METHOD = process.env.WEBHOOK_METHOD;
+}
+if (process.env.WEBHOOK_CONTENT_TYPE) {
+  WEBHOOK_CONTENT_TYPE = process.env.WEBHOOK_CONTENT_TYPE;
+}
 // ==========================云端环境变量的判断与接收=========================

 /**
@@ -344,7 +386,9 @@ async function sendNotify(
    aibotkNotify(text, desp), // 智能微秘书
    fsBotNotify(text, desp), // 飞书机器人
    smtpNotify(text, desp), // SMTP 邮件
-    PushMeNotify(text, desp, params), //PushMe
+    pushMeNotify(text, desp, params), // PushMe
+    chronocatNotify(text, desp), // Chronocat
+    webhookNotify(text, desp), // 自定义通知
  ]);
 }

@@ -552,7 +596,7 @@ function BarkNotify(text, desp, params = {}) {
      const options = {
        url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(
          desp,
-        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(
+        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&level=${BARK_LEVEL}&url=${BARK_URL}&${querystring.stringify(
          params,
        )}`,
        headers: {
@@ -589,7 +633,7 @@ function tgBotNotify(text, desp) {
  return new Promise((resolve) => {
    if (TG_BOT_TOKEN && TG_USER_ID) {
      const options = {
-        url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`,
+        url: `${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`,
        json: {
          chat_id: `${TG_USER_ID}`,
          text: `${text}\n\n${desp}`,
@@ -601,15 +645,19 @@ function tgBotNotify(text, desp) {
        timeout,
      };
      if (TG_PROXY_HOST && TG_PROXY_PORT) {
-        const tunnel = require('tunnel');
+        const { HttpProxyAgent, HttpsProxyAgent } = require('hpagent');
+        const options = {
+          keepAlive: true,
+          keepAliveMsecs: 1000,
+          maxSockets: 256,
+          maxFreeSockets: 256,
+          proxy: `http://${TG_PROXY_AUTH}${TG_PROXY_HOST}:${TG_PROXY_PORT}`,
+        };
+        const httpAgent = new HttpProxyAgent(options);
+        const httpsAgent = new HttpsProxyAgent(options);
        const agent = {
-          https: tunnel.httpsOverHttp({
-            proxy: {
-              host: TG_PROXY_HOST,
-              port: TG_PROXY_PORT * 1,
-              proxyAuth: TG_PROXY_AUTH,
-            },
-          }),
+          http: httpAgent,
+          https: httpsAgent,
        };
        Object.assign(options, { agent });
      }
@@ -768,7 +816,18 @@ function ChangeUserId(desp) {
  }
 }

-function qywxamNotify(text, desp) {
+async function qywxamNotify(text, desp) {
+  const MAX_LENGTH = 900;
+  if (desp.length > MAX_LENGTH) {
+    let d = desp.substr(0, MAX_LENGTH) + '\n==More==';
+    await do_qywxamNotify(text, d);
+    await qywxamNotify(text, desp.substr(MAX_LENGTH));
+  } else {
+    return await do_qywxamNotify(text, desp);
+  }
+}
+
+function do_qywxamNotify(text, desp) {
  return new Promise((resolve) => {
    if (QYWX_AM) {
      const QYWX_AM_AY = QYWX_AM.split(',');
@@ -1081,31 +1140,31 @@ function fsBotNotify(text, desp) {
 }

 async function smtpNotify(text, desp) {
-  if (![SMTP_SERVER, SMTP_EMAIL, SMTP_PASSWORD].every(Boolean)) {
+  if (![SMTP_EMAIL, SMTP_PASSWORD].every(Boolean) || !SMTP_SERVICE) {
    return;
  }

  try {
    const nodemailer = require('nodemailer');
-    const transporter = nodemailer.createTransport(
-      `${SMTP_SSL === 'true' ? 'smtps:' : 'smtp:'}//${SMTP_SERVER}`,
-      {
+    const transporter = nodemailer.createTransport({
+      service: SMTP_SERVICE,
      auth: {
        user: SMTP_EMAIL,
        pass: SMTP_PASSWORD,
      },
-      },
-    );
+    });

    const addr = SMTP_NAME ? `"${SMTP_NAME}" <${SMTP_EMAIL}>` : SMTP_EMAIL;
    const info = await transporter.sendMail({
      from: addr,
      to: addr,
      subject: text,
-      text: desp,
+      html: `${desp.replace(/\n/g, '<br/>')}`,
    });

-    if (!!info.messageId) {
+    transporter.close();
+
+    if (info.messageId) {
      console.log('SMTP发送通知消息成功🎉\n');
      return true;
    }
@@ -1116,17 +1175,7 @@ async function smtpNotify(text, desp) {
  }
 }

-function smtpNotify(text, desp) {
-  return new Promise((resolve) => {
-    if (SMTP_SERVER && SMTP_SSL && SMTP_EMAIL && SMTP_PASSWORD && SMTP_NAME) {
-      // todo: Node.js并没有内置的 smtp 实现，需要调用外部库，因为不清楚这个文件的模块依赖情况，所以留给有缘人实现
-    } else {
-      resolve();
-    }
-  });
-}
-
-function PushMeNotify(text, desp, params = {}) {
+function pushMeNotify(text, desp, params = {}) {
  return new Promise((resolve) => {
    if (PUSHME_KEY) {
      const options = {
@@ -1161,6 +1210,223 @@ function PushMeNotify(text, desp, params = {}) {
  });
 }

+function chronocatNotify(title, desp) {
+  return new Promise((resolve) => {
+    if (!CHRONOCAT_TOKEN || !CHRONOCAT_QQ || !CHRONOCAT_URL) {
+      resolve();
+      return;
+    }
+
+    const user_ids = CHRONOCAT_QQ.match(/user_id=(\d+)/g)?.map(
+      (match) => match.split('=')[1],
+    );
+    const group_ids = CHRONOCAT_QQ.match(/group_id=(\d+)/g)?.map(
+      (match) => match.split('=')[1],
+    );
+
+    const url = `${CHRONOCAT_URL}/api/message/send`;
+    const headers = {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${CHRONOCAT_TOKEN}`,
+    };
+
+    for (const [chat_type, ids] of [
+      [1, user_ids],
+      [2, group_ids],
+    ]) {
+      if (!ids) {
+        continue;
+      }
+      for (const chat_id of ids) {
+        const data = {
+          peer: {
+            chatType: chat_type,
+            peerUin: chat_id,
+          },
+          elements: [
+            {
+              elementType: 1,
+              textElement: {
+                content: `${title}\n\n${desp}`,
+              },
+            },
+          ],
+        };
+        const options = {
+          url: url,
+          json: data,
+          headers,
+          timeout,
+        };
+        $.post(options, (err, resp, data) => {
+          try {
+            if (err) {
+              console.log('Chronocat发送QQ通知消息失败！！\n');
+              console.log(err);
+            } else {
+              data = JSON.parse(data);
+              if (chat_type === 1) {
+                console.log(`QQ个人消息:${ids}推送成功！`);
+              } else {
+                console.log(`QQ群消息:${ids}推送成功！`);
+              }
+            }
+          } catch (e) {
+            $.logErr(e, resp);
+          } finally {
+            resolve(data);
+          }
+        });
+      }
+    }
+  });
+}
+
+function webhookNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (!WEBHOOK_URL.includes('$title') && !WEBHOOK_BODY.includes('$title')) {
+      resolve();
+      return;
+    }
+
+    const headers = parseHeaders(WEBHOOK_HEADERS);
+    const body = parseBody(WEBHOOK_BODY, WEBHOOK_CONTENT_TYPE, (v) =>
+      v?.replaceAll('$title', text)?.replaceAll('$content', desp),
+    );
+    const bodyParam = formatBodyFun(WEBHOOK_CONTENT_TYPE, body);
+    const options = {
+      method: WEBHOOK_METHOD,
+      headers,
+      allowGetBody: true,
+      ...bodyParam,
+      timeout,
+      retry: 1,
+    };
+
+    if (WEBHOOK_METHOD) {
+      const formatUrl = WEBHOOK_URL.replaceAll(
+        '$title',
+        encodeURIComponent(text),
+      ).replaceAll('$content', encodeURIComponent(desp));
+      got(formatUrl, options).then((resp) => {
+        try {
+          if (resp.statusCode !== 200) {
+            console.log(`自定义发送通知消息失败！！\n${resp.body}`);
+          } else {
+            console.log(`自定义发送通知消息成功🎉。\n${resp.body}`);
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(resp.body);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
+function parseString(input, valueFormatFn) {
+  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
+  const matches = {};
+
+  let match;
+  while ((match = regex.exec(input)) !== null) {
+    const [, key, value] = match;
+    const _key = key.trim();
+    if (!_key || matches[_key]) {
+      continue;
+    }
+
+    let _value = value.trim();
+
+    try {
+      _value = valueFormatFn ? valueFormatFn(_value) : _value;
+      const jsonValue = JSON.parse(_value);
+      matches[_key] = jsonValue;
+    } catch (error) {
+      matches[_key] = _value;
+    }
+  }
+
+  return matches;
+}
+
+function parseHeaders(headers) {
+  if (!headers) return {};
+
+  const parsed = {};
+  let key;
+  let val;
+  let i;
+
+  headers &&
+    headers.split('\n').forEach(function parser(line) {
+      i = line.indexOf(':');
+      key = line.substring(0, i).trim().toLowerCase();
+      val = line.substring(i + 1).trim();
+
+      if (!key) {
+        return;
+      }
+
+      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+    });
+
+  return parsed;
+}
+
+function parseBody(body, contentType, valueFormatFn) {
+  if (contentType === 'text/plain' || !body) {
+    return body;
+  }
+
+  const parsed = parseString(body, valueFormatFn);
+
+  switch (contentType) {
+    case 'multipart/form-data':
+      return Object.keys(parsed).reduce((p, c) => {
+        p.append(c, parsed[c]);
+        return p;
+      }, new FormData());
+    case 'application/x-www-form-urlencoded':
+      return Object.keys(parsed).reduce((p, c) => {
+        return p ? `${p}&${c}=${parsed[c]}` : `${c}=${parsed[c]}`;
+      });
+  }
+
+  return parsed;
+}
+
+function formatBodyFun(contentType, body) {
+  if (!body) return {};
+  switch (contentType) {
+    case 'application/json':
+      return { json: body };
+    case 'multipart/form-data':
+      return { form: body };
+    case 'application/x-www-form-urlencoded':
+      return { body };
+  }
+  return {};
+}
+
+function formatNotifyContentFun(url, body, title, content) {
+  if (!url.includes('$title') && !body.includes('$title')) {
+    return {};
+  }
+
+  return {
+    formatUrl: url
+      .replaceAll('$title', encodeURIComponent(title))
+      .replaceAll('$content', encodeURIComponent(content)),
+    formatBody: body
+      .replaceAll('$title', title)
+      .replaceAll('$content', content),
+  };
+}
+
 module.exports = {
  sendNotify,
  BARK_PUSH,
@@ -40,6 +40,8 @@ push_config = {
    'BARK_GROUP': '',                   # bark 推送分组
    'BARK_SOUND': '',                   # bark 推送声音
    'BARK_ICON': '',                    # bark 推送图标
+    'BARK_LEVEL': '',                   # bark 推送时效性
+    'BARK_URL': '',                     # bark 推送跳转URL

    'CONSOLE': True,                    # 控制台输出

@@ -100,6 +102,16 @@ push_config = {
    'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写

    'PUSHME_KEY': '',                   # PushMe 酱的 PUSHME_KEY
+
+    'CHRONOCAT_QQ': '',                 # qq号
+    'CHRONOCAT_TOKEN': '',              # CHRONOCAT 的token
+    'CHRONOCAT_URL': '',                # CHRONOCAT的url地址
+
+    'WEBHOOK_URL': '',                  # 自定义通知 请求地址
+    'WEBHOOK_BODY': '',                 # 自定义通知 请求体
+    'WEBHOOK_HEADERS': '',              # 自定义通知 请求头
+    'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
+    'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
 }
 notify_function = []
 # fmt: on
@@ -111,35 +123,38 @@ for k in push_config:
        push_config[k] = v


-def bark(title: str, content: str) -> None:
+def bark(title: str, content: str, **kwargs) -> None:
    """
    使用 bark 推送消息。
    """
-    if not push_config.get("BARK_PUSH"):
+    if not (push_config.get("BARK_PUSH") or kwargs.get("BARK_PUSH")):
        print("bark 服务的 BARK_PUSH 未设置!!\n取消推送")
        return
    print("bark 服务启动")
-
-    if push_config.get("BARK_PUSH").startswith("http"):
-        url = f'{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+    BARK_PUSH = kwargs.get("BARK_PUSH", push_config.get("BARK_PUSH"))
+    if BARK_PUSH.startswith("http"):
+        url = f"{BARK_PUSH}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}"
    else:
-        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f"https://api.day.app/{BARK_PUSH}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}"

    bark_params = {
        "BARK_ARCHIVE": "isArchive",
        "BARK_GROUP": "group",
        "BARK_SOUND": "sound",
        "BARK_ICON": "icon",
+        "BARK_LEVEL": "level",
+        "BARK_URL": "url",
    }
    params = ""
    for pair in filter(
        lambda pairs: pairs[0].startswith("BARK_")
        and pairs[0] != "BARK_PUSH"
-        and pairs[1]
+        and (pairs[1] or kwargs.get(pairs[0]))
        and bark_params.get(pairs[0]),
        push_config.items(),
    ):
-        params += f"{bark_params.get(pair[0])}={pair[1]}&"
+        value = kwargs.get(pair[0], pair[1])
+        params += f"{bark_params.get(pair[0])}={value}&"
    if params:
        url = url + "?" + params.rstrip("&")
    response = requests.get(url).json()
@@ -150,31 +165,40 @@ def bark(title: str, content: str) -> None:
        print("bark 推送失败！")


-def console(title: str, content: str) -> None:
+def console(title: str, content: str, **kwargs) -> None:
    """
    使用 控制台 推送消息。
    """
    print(f"{title}\n\n{content}")


-def dingding_bot(title: str, content: str) -> None:
+def dingding_bot(title: str, content: str, **kwargs) -> None:
    """
    使用 钉钉机器人 推送消息。
    """
-    if not push_config.get("DD_BOT_SECRET") or not push_config.get("DD_BOT_TOKEN"):
+    if not (
+        (kwargs.get("DD_BOT_SECRET") and kwargs.get("DD_BOT_TOKEN"))
+        or (push_config.get("DD_BOT_SECRET") and push_config.get("DD_BOT_TOKEN"))
+    ):
        print("钉钉机器人 服务的 DD_BOT_SECRET 或者 DD_BOT_TOKEN 未设置!!\n取消推送")
        return
    print("钉钉机器人 服务启动")
+    if kwargs.get("DD_BOT_SECRET") and kwargs.get("DD_BOT_TOKEN"):
+        DD_BOT_SECRET = kwargs.get("DD_BOT_SECRET")
+        DD_BOT_TOKEN = kwargs.get("DD_BOT_TOKEN")
+    else:
+        DD_BOT_SECRET = push_config.get("DD_BOT_SECRET")
+        DD_BOT_TOKEN = push_config.get("DD_BOT_TOKEN")

    timestamp = str(round(time.time() * 1000))
-    secret_enc = push_config.get("DD_BOT_SECRET").encode("utf-8")
-    string_to_sign = "{}\n{}".format(timestamp, push_config.get("DD_BOT_SECRET"))
+    secret_enc = DD_BOT_SECRET.encode("utf-8")
+    string_to_sign = "{}\n{}".format(timestamp, DD_BOT_SECRET)
    string_to_sign_enc = string_to_sign.encode("utf-8")
    hmac_code = hmac.new(
        secret_enc, string_to_sign_enc, digestmod=hashlib.sha256
    ).digest()
    sign = urllib.parse.quote_plus(base64.b64encode(hmac_code))
-    url = f'https://oapi.dingtalk.com/robot/send?access_token={push_config.get("DD_BOT_TOKEN")}&timestamp={timestamp}&sign={sign}'
+    url = f"https://oapi.dingtalk.com/robot/send?access_token={DD_BOT_TOKEN}&timestamp={timestamp}&sign={sign}"
    headers = {"Content-Type": "application/json;charset=utf-8"}
    data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
    response = requests.post(
@@ -187,16 +211,16 @@ def dingding_bot(title: str, content: str) -> None:
        print("钉钉机器人 推送失败！")


-def feishu_bot(title: str, content: str) -> None:
+def feishu_bot(title: str, content: str, **kwargs) -> None:
    """
    使用 飞书机器人 推送消息。
    """
-    if not push_config.get("FSKEY"):
+    if not (kwargs.get("DD_BOT_SECRET") or push_config.get("FSKEY")):
        print("飞书 服务的 FSKEY 未设置!!\n取消推送")
        return
    print("飞书 服务启动")
-
-    url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{push_config.get("FSKEY")}'
+    FSKEY = kwargs.get("DD_BOT_SECRET", push_config.get("FSKEY"))
+    url = f"https://open.feishu.cn/open-apis/bot/v2/hook/{FSKEY}"
    data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}}
    response = requests.post(url, data=json.dumps(data)).json()

@@ -206,16 +230,27 @@ def feishu_bot(title: str, content: str) -> None:
        print("飞书 推送失败！错误信息如下：\n", response)


-def go_cqhttp(title: str, content: str) -> None:
+def go_cqhttp(title: str, content: str, **kwargs) -> None:
    """
    使用 go_cqhttp 推送消息。
    """
-    if not push_config.get("GOBOT_URL") or not push_config.get("GOBOT_QQ"):
+    if not (
+        (kwargs.get("GOBOT_URL") and kwargs.get("GOBOT_QQ"))
+        or (push_config.get("GOBOT_URL") and push_config.get("GOBOT_QQ"))
+    ):
        print("go-cqhttp 服务的 GOBOT_URL 或 GOBOT_QQ 未设置!!\n取消推送")
        return
    print("go-cqhttp 服务启动")
+    if kwargs.get("GOBOT_URL") and kwargs.get("GOBOT_QQ"):
+        GOBOT_URL = kwargs.get("GOBOT_URL")
+        GOBOT_QQ = kwargs.get("GOBOT_QQ")
+        GOBOT_TOKEN = kwargs.get("GOBOT_TOKEN")
+    else:
+        GOBOT_URL = push_config.get("GOBOT_URL")
+        GOBOT_QQ = push_config.get("GOBOT_QQ")
+        GOBOT_TOKEN = push_config.get("GOBOT_TOKEN")

-    url = f'{push_config.get("GOBOT_URL")}?access_token={push_config.get("GOBOT_TOKEN")}&{push_config.get("GOBOT_QQ")}&message=标题:{title}\n内容:{content}'
+    url = f"{GOBOT_URL}?access_token={GOBOT_TOKEN}&{GOBOT_QQ}&message=标题:{title}\n内容:{content}"
    response = requests.get(url).json()

    if response["status"] == "ok":
@@ -224,20 +259,31 @@ def go_cqhttp(title: str, content: str) -> None:
        print("go-cqhttp 推送失败！")


-def gotify(title: str, content: str) -> None:
+def gotify(title: str, content: str, **kwargs) -> None:
    """
    使用 gotify 推送消息。
    """
-    if not push_config.get("GOTIFY_URL") or not push_config.get("GOTIFY_TOKEN"):
+    if not (
+        (kwargs.get("GOTIFY_URL") and kwargs.get("GOTIFY_TOKEN"))
+        or (push_config.get("GOTIFY_URL") and push_config.get("GOTIFY_TOKEN"))
+    ):
        print("gotify 服务的 GOTIFY_URL 或 GOTIFY_TOKEN 未设置!!\n取消推送")
        return
    print("gotify 服务启动")
+    if kwargs.get("GOTIFY_URL") and kwargs.get("GOTIFY_TOKEN"):
+        GOTIFY_URL = kwargs.get("GOTIFY_URL")
+        GOTIFY_TOKEN = kwargs.get("GOBOTGOTIFY_TOKEN_QQ")
+        GOTIFY_PRIORITY = kwargs.get("GOTIFY_PRIORITY")
+    else:
+        GOTIFY_URL = push_config.get("GOTIFY_URL")
+        GOTIFY_TOKEN = push_config.get("GOTIFY_TOKEN")
+        GOTIFY_PRIORITY = kwargs.get("GOTIFY_PRIORITY")

-    url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}'
+    url = f"{GOTIFY_URL}/message?token={GOTIFY_TOKEN}"
    data = {
        "title": title,
        "message": content,
-        "priority": push_config.get("GOTIFY_PRIORITY"),
+        "priority": GOTIFY_PRIORITY,
    }
    response = requests.post(url, data=data).json()

@@ -247,16 +293,16 @@ def gotify(title: str, content: str) -> None:
        print("gotify 推送失败！")


-def iGot(title: str, content: str) -> None:
+def iGot(title: str, content: str, **kwargs) -> None:
    """
    使用 iGot 推送消息。
    """
-    if not push_config.get("IGOT_PUSH_KEY"):
+    if not (kwargs.get("IGOT_PUSH_KEY") or push_config.get("IGOT_PUSH_KEY")):
        print("iGot 服务的 IGOT_PUSH_KEY 未设置!!\n取消推送")
        return
    print("iGot 服务启动")
-
-    url = f'https://push.hellyw.com/{push_config.get("IGOT_PUSH_KEY")}'
+    IGOT_PUSH_KEY = kwargs.get("IGOT_PUSH_KEY", push_config.get("IGOT_PUSH_KEY"))
+    url = f"https://push.hellyw.com/{IGOT_PUSH_KEY}"
    data = {"title": title, "content": content}
    headers = {"Content-Type": "application/x-www-form-urlencoded"}
    response = requests.post(url, data=data, headers=headers).json()
@@ -267,20 +313,21 @@ def iGot(title: str, content: str) -> None:
        print(f'iGot 推送失败！{response["errMsg"]}')


-def serverJ(title: str, content: str) -> None:
+def serverJ(title: str, content: str, **kwargs) -> None:
    """
    通过 serverJ 推送消息。
    """
-    if not push_config.get("PUSH_KEY"):
+    if not (kwargs.get("PUSH_KEY") or push_config.get("PUSH_KEY")):
        print("serverJ 服务的 PUSH_KEY 未设置!!\n取消推送")
        return
    print("serverJ 服务启动")
+    PUSH_KEY = kwargs.get("PUSH_KEY", push_config.get("PUSH_KEY"))

    data = {"text": title, "desp": content.replace("\n", "\n\n")}
-    if push_config.get("PUSH_KEY").find("SCT") != -1:
-        url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+    if PUSH_KEY.find("SCT") != -1:
+        url = f"https://sctapi.ftqq.com/{PUSH_KEY}.send"
    else:
-        url = f'https://sc.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+        url = f"https://sc.ftqq.com/{PUSH_KEY}.send"
    response = requests.post(url, data=data).json()

    if response.get("errno") == 0 or response.get("code") == 0:
@@ -289,23 +336,27 @@ def serverJ(title: str, content: str) -> None:
        print(f'serverJ 推送失败！错误码：{response["message"]}')


-def pushdeer(title: str, content: str) -> None:
+def pushdeer(title: str, content: str, **kwargs) -> None:
    """
    通过PushDeer 推送消息
    """
-    if not push_config.get("DEER_KEY"):
+    if not (kwargs.get("DEER_KEY") or push_config.get("DEER_KEY")):
        print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
        return
    print("PushDeer 服务启动")
+    DEER_KEY = kwargs.get("DEER_KEY", push_config.get("DEER_KEY"))
+
    data = {
        "text": title,
        "desp": content,
        "type": "markdown",
-        "pushkey": push_config.get("DEER_KEY"),
+        "pushkey": DEER_KEY,
    }
    url = "https://api2.pushdeer.com/message/push"
    if push_config.get("DEER_URL"):
        url = push_config.get("DEER_URL")
+    if kwargs.get("DEER_URL"):
+        url = kwargs.get("DEER_URL")

    response = requests.post(url, data=data).json()

@@ -315,16 +366,26 @@ def pushdeer(title: str, content: str) -> None:
        print("PushDeer 推送失败！错误信息：", response)


-def chat(title: str, content: str) -> None:
+def chat(title: str, content: str, **kwargs) -> None:
    """
    通过Chat 推送消息
    """
-    if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
+    if not (
+        (kwargs.get("CHAT_URL") and kwargs.get("CHAT_TOKEN"))
+        or (push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"))
+    ):
        print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
        return
    print("chat 服务启动")
+    if kwargs.get("CHAT_URL") and kwargs.get("CHAT_TOKEN"):
+        CHAT_URL = kwargs.get("CHAT_URL")
+        CHAT_TOKEN = kwargs.get("CHAT_TOKEN")
+    else:
+        CHAT_URL = push_config.get("CHAT_URL")
+        CHAT_TOKEN = push_config.get("CHAT_TOKEN")
+
    data = "payload=" + json.dumps({"text": title + "\n" + content})
-    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
+    url = CHAT_URL + CHAT_TOKEN
    response = requests.post(url, data=data)

    if response.status_code == 200:
@@ -333,21 +394,23 @@ def chat(title: str, content: str) -> None:
        print("Chat 推送失败！错误信息：", response)


-def pushplus_bot(title: str, content: str) -> None:
+def pushplus_bot(title: str, content: str, **kwargs) -> None:
    """
    通过 push+ 推送消息。
    """
-    if not push_config.get("PUSH_PLUS_TOKEN"):
+    if not (kwargs.get("PUSH_PLUS_TOKEN") or push_config.get("PUSH_PLUS_TOKEN")):
        print("PUSHPLUS 服务的 PUSH_PLUS_TOKEN 未设置!!\n取消推送")
        return
    print("PUSHPLUS 服务启动")
+    PUSH_PLUS_TOKEN = kwargs.get("PUSH_PLUS_TOKEN", push_config.get("PUSH_PLUS_TOKEN"))
+    PUSH_PLUS_USER = kwargs.get("PUSH_PLUS_USER", push_config.get("PUSH_PLUS_USER"))

    url = "http://www.pushplus.plus/send"
    data = {
-        "token": push_config.get("PUSH_PLUS_TOKEN"),
+        "token": PUSH_PLUS_TOKEN,
        "title": title,
        "content": content,
-        "topic": push_config.get("PUSH_PLUS_USER"),
+        "topic": PUSH_PLUS_USER,
    }
    body = json.dumps(data).encode(encoding="utf-8")
    headers = {"Content-Type": "application/json"}
@@ -368,16 +431,25 @@ def pushplus_bot(title: str, content: str) -> None:
            print("PUSHPLUS 推送失败！")


-def qmsg_bot(title: str, content: str) -> None:
+def qmsg_bot(title: str, content: str, **kwargs) -> None:
    """
    使用 qmsg 推送消息。
    """
-    if not push_config.get("QMSG_KEY") or not push_config.get("QMSG_TYPE"):
+    if not (
+        (kwargs.get("QMSG_KEY") and kwargs.get("QMSG_TYPE"))
+        or (push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"))
+    ):
        print("qmsg 的 QMSG_KEY 或者 QMSG_TYPE 未设置!!\n取消推送")
        return
    print("qmsg 服务启动")
+    if kwargs.get("QMSG_KEY") and kwargs.get("QMSG_TYPE"):
+        QMSG_KEY = kwargs.get("QMSG_KEY")
+        QMSG_TYPE = kwargs.get("QMSG_TYPE")
+    else:
+        QMSG_KEY = push_config.get("QMSG_KEY")
+        QMSG_TYPE = push_config.get("QMSG_TYPE")

-    url = f'https://qmsg.zendee.cn/{push_config.get("QMSG_TYPE")}/{push_config.get("QMSG_KEY")}'
+    url = f"https://qmsg.zendee.cn/{QMSG_TYPE}/{QMSG_KEY}"
    payload = {"msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
    response = requests.post(url=url, params=payload).json()

@@ -387,14 +459,15 @@ def qmsg_bot(title: str, content: str) -> None:
        print(f'qmsg 推送失败！{response["reason"]}')


-def wecom_app(title: str, content: str) -> None:
+def wecom_app(title: str, content: str, **kwargs) -> None:
    """
    通过 企业微信 APP 推送消息。
    """
-    if not push_config.get("QYWX_AM"):
+    if not (kwargs.get("QYWX_AM") or push_config.get("QYWX_AM")):
        print("QYWX_AM 未设置!!\n取消推送")
        return
-    QYWX_AM_AY = re.split(",", push_config.get("QYWX_AM"))
+    QYWX_AM = kwargs.get("QYWX_AM", push_config.get("QYWX_AM"))
+    QYWX_AM_AY = re.split(",", QYWX_AM)
    if 4 < len(QYWX_AM_AY) > 5:
        print("QYWX_AM 设置错误!!\n取消推送")
        return
@@ -442,7 +515,9 @@ class WeCom:
        return data["access_token"]

    def send_text(self, message, touser="@all"):
-        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = (
+            f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        )
        send_values = {
            "touser": touser,
            "msgtype": "text",
@@ -456,7 +531,9 @@ class WeCom:
        return respone["errmsg"]

    def send_mpnews(self, title, message, media_id, touser="@all"):
-        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = (
+            f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        )
        send_values = {
            "touser": touser,
            "msgtype": "mpnews",
@@ -480,20 +557,23 @@ class WeCom:
        return respone["errmsg"]


-def wecom_bot(title: str, content: str) -> None:
+def wecom_bot(title: str, content: str, **kwargs) -> None:
    """
    通过 企业微信机器人 推送消息。
    """
-    if not push_config.get("QYWX_KEY"):
+    if not (kwargs.get("QYWX_KEY") or push_config.get("QYWX_KEY")):
        print("企业微信机器人 服务的 QYWX_KEY 未设置!!\n取消推送")
        return
    print("企业微信机器人服务启动")
+    QYWX_KEY = kwargs.get("QYWX_KEY", push_config.get("QYWX_KEY"))

    origin = "https://qyapi.weixin.qq.com"
    if push_config.get("QYWX_ORIGIN"):
        origin = push_config.get("QYWX_ORIGIN")
+    if kwargs.get("QYWX_ORIGIN"):
+        origin = kwargs.get("QYWX_ORIGIN")

-    url = f"{origin}/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
+    url = f"{origin}/cgi-bin/webhook/send?key={QYWX_KEY}"
    headers = {"Content-Type": "application/json;charset=utf-8"}
    data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
    response = requests.post(
@@ -506,40 +586,53 @@ def wecom_bot(title: str, content: str) -> None:
        print("企业微信机器人推送失败！")


-def telegram_bot(title: str, content: str) -> None:
+def telegram_bot(title: str, content: str, **kwargs) -> None:
    """
    使用 telegram 机器人 推送消息。
    """
-    if not push_config.get("TG_BOT_TOKEN") or not push_config.get("TG_USER_ID"):
-        print("tg 服务的 bot_token 或者 user_id 未设置!!\n取消推送")
+    if not (
+        (kwargs.get("TG_BOT_TOKEN") and kwargs.get("TG_USER_ID"))
+        or (push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"))
+    ):
+        print("tg 服务的 TG_BOT_TOKEN 或者 TG_USER_ID 未设置!!\n取消推送")
        return
    print("tg 服务启动")
-
-    if push_config.get("TG_API_HOST"):
-        url = f"https://{push_config.get('TG_API_HOST')}/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
+    if kwargs.get("TG_BOT_TOKEN") and kwargs.get("TG_USER_ID"):
+        TG_BOT_TOKEN = kwargs.get("TG_BOT_TOKEN")
+        TG_USER_ID = kwargs.get("TG_USER_ID")
    else:
-        url = (
-            f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
-        )
+        TG_BOT_TOKEN = push_config.get("TG_BOT_TOKEN")
+        TG_USER_ID = push_config.get("TG_USER_ID")
+
+    if kwargs.get("TG_API_HOST") or push_config.get("TG_API_HOST"):
+        TG_API_HOST = kwargs.get("TG_API_HOST", push_config.get("TG_API_HOST"))
+        url = f"{TG_API_HOST}/bot{TG_BOT_TOKEN}/sendMessage"
+    else:
+        url = f"https://api.telegram.org/bot{TG_BOT_TOKEN}/sendMessage"
    headers = {"Content-Type": "application/x-www-form-urlencoded"}
    payload = {
-        "chat_id": str(push_config.get("TG_USER_ID")),
+        "chat_id": str(TG_USER_ID),
        "text": f"{title}\n\n{content}",
        "disable_web_page_preview": "true",
    }
    proxies = None
-    if push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"):
-        if push_config.get("TG_PROXY_AUTH") is not None and "@" not in push_config.get(
-            "TG_PROXY_HOST"
+    if not (
+        (kwargs.get("TG_PROXY_HOST") and kwargs.get("TG_PROXY_PORT"))
+        or (push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"))
    ):
-            push_config["TG_PROXY_HOST"] = (
-                push_config.get("TG_PROXY_AUTH")
-                + "@"
-                + push_config.get("TG_PROXY_HOST")
-            )
-        proxyStr = "http://{}:{}".format(
-            push_config.get("TG_PROXY_HOST"), push_config.get("TG_PROXY_PORT")
+        if kwargs.get("TG_PROXY_HOST") and kwargs.get("TG_PROXY_PORT"):
+            TG_PROXY_HOST = kwargs.get("TG_PROXY_HOST")
+            TG_PROXY_PORT = kwargs.get("TG_PROXY_PORT")
+        else:
+            TG_PROXY_HOST = kwargs.get("TG_PROXY_HOST")
+            TG_PROXY_PORT = kwargs.get("TG_PROXY_PORT")
+        if kwargs.get("TG_PROXY_AUTH") or push_config.get("TG_PROXY_AUTH"):
+            TG_PROXY_AUTH = kwargs.get(
+                "TG_PROXY_AUTH", push_config.get("TG_PROXY_AUTH")
            )
+        if TG_PROXY_AUTH is not None and "@" not in TG_PROXY_HOST:
+            TG_PROXY_HOST = TG_PROXY_AUTH + "@" + TG_PROXY_HOST
+        proxyStr = "http://{}:{}".format(TG_PROXY_HOST, TG_PROXY_PORT)
        proxies = {"http": proxyStr, "https": proxyStr}
    response = requests.post(
        url=url, headers=headers, params=payload, proxies=proxies
@@ -551,31 +644,51 @@ def telegram_bot(title: str, content: str) -> None:
        print("tg 推送失败！")


-def aibotk(title: str, content: str) -> None:
+def aibotk(title: str, content: str, **kwargs) -> None:
    """
    使用 智能微秘书 推送消息。
    """
-    if (
-        not push_config.get("AIBOTK_KEY")
-        or not push_config.get("AIBOTK_TYPE")
-        or not push_config.get("AIBOTK_NAME")
+    if not (
+        (
+            kwargs.get("AIBOTK_KEY")
+            and kwargs.get("AIBOTK_TYPE")
+            and kwargs.get("AIBOTK_NAME")
+        )
+        or (
+            push_config.get("AIBOTK_KEY")
+            and push_config.get("AIBOTK_TYPE")
+            and push_config.get("AIBOTK_NAME")
+        )
    ):
-        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
+        print(
+            "智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送"
+        )
        return
    print("智能微秘书 服务启动")
-
-    if push_config.get("AIBOTK_TYPE") == "room":
+    if (
+        kwargs.get("AIBOTK_KEY")
+        and kwargs.get("AIBOTK_TYPE")
+        and kwargs.get("AIBOTK_NAME")
+    ):
+        AIBOTK_KEY = kwargs.get("AIBOTK_KEY")
+        AIBOTK_TYPE = kwargs.get("AIBOTK_TYPE")
+        AIBOTK_NAME = kwargs.get("AIBOTK_NAME")
+    else:
+        AIBOTK_KEY = push_config.get("AIBOTK_KEY")
+        AIBOTK_TYPE = push_config.get("AIBOTK_TYPE")
+        AIBOTK_NAME = push_config.get("AIBOTK_NAME")
+    if AIBOTK_TYPE == "room":
        url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
        data = {
-            "apiKey": push_config.get("AIBOTK_KEY"),
-            "roomName": push_config.get("AIBOTK_NAME"),
+            "apiKey": AIBOTK_KEY,
+            "roomName": AIBOTK_NAME,
            "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
        }
    else:
        url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
        data = {
-            "apiKey": push_config.get("AIBOTK_KEY"),
-            "name": push_config.get("AIBOTK_NAME"),
+            "apiKey": AIBOTK_KEY,
+            "name": AIBOTK_NAME,
            "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
        }
    body = json.dumps(data).encode(encoding="utf-8")
@@ -588,50 +701,75 @@ def aibotk(title: str, content: str) -> None:
        print(f'智能微秘书 推送失败！{response["error"]}')


-def smtp(title: str, content: str) -> None:
+def smtp(title: str, content: str, **kwargs) -> None:
    """
    使用 SMTP 邮件 推送消息。
    """
-    if (
-        not push_config.get("SMTP_SERVER")
-        or not push_config.get("SMTP_SSL")
-        or not push_config.get("SMTP_EMAIL")
-        or not push_config.get("SMTP_PASSWORD")
-        or not push_config.get("SMTP_NAME")
+    if not (
+        (
+            kwargs.get("SMTP_SERVER")
+            and kwargs.get("SMTP_SSL")
+            and kwargs.get("SMTP_EMAIL")
+            and kwargs.get("SMTP_PASSWORD")
+            and kwargs.get("SMTP_NAME")
+        )
+        or (
+            push_config.get("SMTP_SERVER")
+            and push_config.get("SMTP_SSL")
+            and push_config.get("SMTP_EMAIL")
+            and push_config.get("SMTP_PASSWORD")
+            and push_config.get("SMTP_NAME")
+        )
    ):
        print(
            "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送"
        )
        return
    print("SMTP 邮件 服务启动")
+    if (
+        kwargs.get("SMTP_SERVER")
+        and kwargs.get("SMTP_SSL")
+        and kwargs.get("SMTP_EMAIL")
+        and kwargs.get("SMTP_PASSWORD")
+        and kwargs.get("SMTP_NAME")
+    ):
+        SMTP_SERVER = kwargs.get("SMTP_SERVER")
+        SMTP_SSL = kwargs.get("SMTP_SSL")
+        SMTP_EMAIL = kwargs.get("SMTP_EMAIL")
+        SMTP_PASSWORD = kwargs.get("SMTP_PASSWORD")
+        SMTP_NAME = kwargs.get("SMTP_NAME")
+    else:
+        SMTP_SERVER = push_config.get("SMTP_SERVER")
+        SMTP_SSL = push_config.get("SMTP_SSL")
+        SMTP_EMAIL = push_config.get("SMTP_EMAIL")
+        SMTP_PASSWORD = push_config.get("SMTP_PASSWORD")
+        SMTP_NAME = push_config.get("SMTP_NAME")

    message = MIMEText(content, "plain", "utf-8")
    message["From"] = formataddr(
        (
-            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
-            push_config.get("SMTP_EMAIL"),
+            Header(SMTP_NAME, "utf-8").encode(),
+            SMTP_EMAIL,
        )
    )
    message["To"] = formataddr(
        (
-            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
-            push_config.get("SMTP_EMAIL"),
+            Header(SMTP_NAME, "utf-8").encode(),
+            SMTP_EMAIL,
        )
    )
    message["Subject"] = Header(title, "utf-8")

    try:
        smtp_server = (
-            smtplib.SMTP_SSL(push_config.get("SMTP_SERVER"))
-            if push_config.get("SMTP_SSL") == "true"
-            else smtplib.SMTP(push_config.get("SMTP_SERVER"))
-        )
-        smtp_server.login(
-            push_config.get("SMTP_EMAIL"), push_config.get("SMTP_PASSWORD")
+            smtplib.SMTP_SSL(SMTP_SERVER)
+            if SMTP_SSL == "true"
+            else smtplib.SMTP(SMTP_SERVER)
        )
+        smtp_server.login(SMTP_EMAIL, SMTP_PASSWORD)
        smtp_server.sendmail(
-            push_config.get("SMTP_EMAIL"),
-            push_config.get("SMTP_EMAIL"),
+            SMTP_EMAIL,
+            SMTP_EMAIL,
            message.as_bytes(),
        )
        smtp_server.close()
@@ -639,16 +777,18 @@ def smtp(title: str, content: str) -> None:
    except Exception as e:
        print(f"SMTP 邮件 推送失败！{e}")

-def pushme(title: str, content: str) -> None:
+
+def pushme(title: str, content: str, **kwargs) -> None:
    """
    使用 PushMe 推送消息。
    """
-    if not push_config.get("PUSHME_KEY"):
+    if not (kwargs.get("PUSHME_KEY") or push_config.get("PUSHME_KEY")):
        print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送")
        return
    print("PushMe 服务启动")
+    PUSHME_KEY = kwargs.get("PUSHME_KEY", push_config.get("PUSHME_KEY"))

-    url = f'https://push.i-i.me/?push_key={push_config.get("PUSHME_KEY")}'
+    url = f"https://push.i-i.me/?push_key={PUSHME_KEY}"
    data = {
        "title": title,
        "content": content,
@@ -661,6 +801,175 @@ def pushme(title: str, content: str) -> None:
        print(f"PushMe 推送失败！{response.status_code} {response.text}")


+def chronocat(title: str, content: str, **kwargs) -> None:
+    """
+    使用 CHRONOCAT 推送消息。
+    """
+    if not (
+        (
+            push_config.get("CHRONOCAT_URL")
+            and push_config.get("CHRONOCAT_QQ")
+            and push_config.get("CHRONOCAT_TOKEN")
+        )
+        or (
+            push_config.get("CHRONOCAT_URL")
+            and push_config.get("CHRONOCAT_QQ")
+            and push_config.get("CHRONOCAT_TOKEN")
+        )
+    ):
+        print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送")
+        return
+    print("CHRONOCAT 服务启动")
+    if (
+        kwargs.get("CHRONOCAT_URL")
+        and kwargs.get("CHRONOCAT_QQ")
+        and kwargs.get("CHRONOCAT_TOKEN")
+    ):
+        CHRONOCAT_URL = kwargs.get("CHRONOCAT_URL")
+        CHRONOCAT_QQ = kwargs.get("CHRONOCAT_QQ")
+        CHRONOCAT_TOKEN = kwargs.get("CHRONOCAT_TOKEN")
+    else:
+        CHRONOCAT_URL = push_config.get("CHRONOCAT_URL")
+        CHRONOCAT_QQ = push_config.get("CHRONOCAT_QQ")
+        CHRONOCAT_TOKEN = push_config.get("CHRONOCAT_TOKEN")
+
+    user_ids = re.findall(r"user_id=(\d+)", CHRONOCAT_QQ)
+    group_ids = re.findall(r"group_id=(\d+)", CHRONOCAT_QQ)
+
+    url = f"{CHRONOCAT_URL}/api/message/send"
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {CHRONOCAT_TOKEN}",
+    }
+
+    for chat_type, ids in [(1, user_ids), (2, group_ids)]:
+        if not ids:
+            continue
+        for chat_id in ids:
+            data = {
+                "peer": {"chatType": chat_type, "peerUin": chat_id},
+                "elements": [
+                    {
+                        "elementType": 1,
+                        "textElement": {"content": f"{title}\n\n{content}"},
+                    }
+                ],
+            }
+            response = requests.post(url, headers=headers, data=json.dumps(data))
+            if response.status_code == 200:
+                if chat_type == 1:
+                    print(f"QQ个人消息:{ids}推送成功！")
+                else:
+                    print(f"QQ群消息:{ids}推送成功！")
+            else:
+                if chat_type == 1:
+                    print(f"QQ个人消息:{ids}推送失败！")
+                else:
+                    print(f"QQ群消息:{ids}推送失败！")
+
+
+def parse_headers(headers):
+    if not headers:
+        return {}
+
+    parsed = {}
+    lines = headers.split("\n")
+
+    for line in lines:
+        i = line.find(":")
+        if i == -1:
+            continue
+
+        key = line[:i].strip().lower()
+        val = line[i + 1 :].strip()
+        parsed[key] = parsed.get(key, "") + ", " + val if key in parsed else val
+
+    return parsed
+
+
+def parse_string(input_string, value_format_fn=None):
+    matches = {}
+    pattern = r"(\w+):\s*((?:(?!\n\w+:).)*)"
+    regex = re.compile(pattern)
+    for match in regex.finditer(input_string):
+        key, value = match.group(1).strip(), match.group(2).strip()
+        try:
+            value = value_format_fn(value) if value_format_fn else value
+            json_value = json.loads(value)
+            matches[key] = json_value
+        except:
+            matches[key] = value
+    return matches
+
+
+def parse_body(body, content_type, value_format_fn=None):
+    if not body or content_type == "text/plain":
+        return body
+
+    parsed = parse_string(input_string, value_format_fn)
+
+    if content_type == "application/x-www-form-urlencoded":
+        data = urlencode(parsed, doseq=True)
+        return data
+
+    if content_type == "application/json":
+        data = json.dumps(parsed)
+        return data
+
+    return parsed
+
+
+def format_notify_content(url, body, title, content):
+    if "$title" not in url and "$title" not in body:
+        return {}
+
+    formatted_url = url.replace("$title", urllib.parse.quote_plus(title)).replace(
+        "$content", urllib.parse.quote_plus(content)
+    )
+    formatted_body = body.replace("$title", title).replace("$content", content)
+
+    return formatted_url, formatted_body
+
+
+def custom_notify(title: str, content: str) -> None:
+    """
+    通过 自定义通知 推送消息。
+    """
+    if not push_config.get("WEBHOOK_URL") or not push_config.get("WEBHOOK_METHOD"):
+        print("自定义通知的 WEBHOOK_URL 或 WEBHOOK_METHOD 未设置!!\n取消推送")
+        return
+
+    print("自定义通知服务启动")
+
+    WEBHOOK_URL = push_config.get("WEBHOOK_URL")
+    WEBHOOK_METHOD = push_config.get("WEBHOOK_METHOD")
+    WEBHOOK_CONTENT_TYPE = push_config.get("WEBHOOK_CONTENT_TYPE")
+    WEBHOOK_BODY = push_config.get("WEBHOOK_BODY")
+    WEBHOOK_HEADERS = push_config.get("WEBHOOK_HEADERS")
+
+    if "$title" not in WEBHOOK_URL and "$title" not in WEBHOOK_BODY:
+        print("请求头或者请求体中必须包含 $title 和 $content")
+        return
+
+    headers = parse_headers(WEBHOOK_HEADERS)
+    body = parse_body(
+        WEBHOOK_BODY,
+        WEBHOOK_CONTENT_TYPE,
+        lambda v: v.replace("$title", title).replace("$content", content),
+    )
+    formatted_url = WEBHOOK_URL.replace(
+        "$title", urllib.parse.quote_plus(title)
+    ).replace("$content", urllib.parse.quote_plus(content))
+    response = requests.request(
+        method=WEBHOOK_METHOD, url=formatUrl, headers=headers, timeout=15, data=body
+    )
+
+    if response.status_code == 200:
+        print("自定义通知推送成功！")
+    else:
+        print(f"自定义通知推送失败！{response.status_code} {response.text}")
+
+
 def one() -> str:
    """
    获取一条一言。
@@ -671,6 +980,7 @@ def one() -> str:
    return res["hitokoto"] + "    ----" + res["from"]


+def add_notify_function():
    if push_config.get("BARK_PUSH"):
        notify_function.append(bark)
    if push_config.get("CONSOLE"):
@@ -717,9 +1027,17 @@ if (
        notify_function.append(smtp)
    if push_config.get("PUSHME_KEY"):
        notify_function.append(pushme)
+    if (
+        push_config.get("CHRONOCAT_URL")
+        and push_config.get("CHRONOCAT_QQ")
+        and push_config.get("CHRONOCAT_TOKEN")
+    ):
+        notify_function.append(chronocat)
+    if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
+        notify_function.append(custom_notify)


-def send(title: str, content: str) -> None:
+def send(title: str, content: str, **kwargs) -> None:
    if not content:
        print(f"{title} 推送内容为空！")
        return
@@ -732,12 +1050,13 @@ def send(title: str, content: str) -> None:
            return

    hitokoto = push_config.get("HITOKOTO")
+    content += "\n\n" + one() if hitokoto else ""

-    text = one() if hitokoto else ""
-    content += "\n\n" + text
-
+    add_notify_function()
    ts = [
-        threading.Thread(target=mode, args=(title, content), name=mode.__name__)
+        threading.Thread(
+            target=mode, args=(title, content), kwargs=kwargs, name=mode.__name__
+        )
        for mode in notify_function
    ]
    [t.start() for t in ts]
@@ -1,12 +0,0 @@
-{
-  "name": "dependence",
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "got": "^11.5.1",
-    "nodemailer": "^6.8.0",
-    "tough-cookie": "^4.0.0",
-    "tunnel": "0.0.6",
-    "ws": "^7.4.3"
-  }
-}
@@ -49,7 +49,7 @@ add_cron_api() {
      -H "Origin: http://0.0.0.0:5700" \
      -H "Referer: http://0.0.0.0:5700/crontab" \
      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
+      --data-raw "{\"name\":\"${name//\"/\\\"}\",\"command\":\"${command//\"/\\\"}\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
      --compressed
  )
  code=$(echo "$api" | jq -r .code)
@@ -85,7 +85,7 @@ update_cron_api() {
      -H "Origin: http://0.0.0.0:5700" \
      -H "Referer: http://0.0.0.0:5700/crontab" \
      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
+      --data-raw "{\"name\":\"${name//\"/\\\"}\",\"command\":\"${command//\"/\\\"}\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
      --compressed
  )
  code=$(echo "$api" | jq -r .code)
@@ -117,7 +117,7 @@ update_cron_command_api() {
      -H "Origin: http://0.0.0.0:5700" \
      -H "Referer: http://0.0.0.0:5700/crontab" \
      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
+      --data-raw "{\"command\":\"${command//\"/\\\"}\",\"id\":\"$id\"}" \
      --compressed
  )
  code=$(echo "$api" | jq -r .code)
@@ -196,7 +196,7 @@ notify_api() {
      -H "Origin: http://0.0.0.0:5700" \
      -H "Referer: http://0.0.0.0:5700/crontab" \
      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
+      --data-raw "{\"title\":\"${title//\"/\\\"}\",\"content\":\"${content//\"/\\\"}\"}" \
      --compressed
  )
  code=$(echo "$api" | jq -r .code)
@@ -25,9 +25,6 @@ fi
 echo -e "\nbot文件下载成功...\n"

 echo -e "3、安装python3依赖...\n"
-if [[ $PipMirror ]]; then
-  pip3 config set global.index-url $PipMirror
-fi
 cp -f "$repo_path/jbot/requirements.txt" "$dir_data"

 cd $dir_data
@@ -9,9 +9,6 @@ reset_env() {
  npm_install_2 $dir_root
  echo -e "---> 青龙依赖安装完成\n"

-  echo -e "---> 3. 开始安装脚本依赖\n"
-  cp -f $dir_sample/package.json $dir_scripts/package.json
-  npm_install_2 $dir_scripts
  echo -e "---> 脚本依赖安装完成\n"
 }

@@ -76,23 +73,15 @@ check_pm2() {

 main() {
  echo -e "=====> 开始检测"
-  npm i -g pnpm@8.3.1
+  npm i -g pnpm@8.3.1 pm2 tsx
  patch_version

-  if [[ $PipMirror ]]; then
-    pip3 config set global.index-url $PipMirror
-  fi
-  if [[ $NpmMirror ]]; then
-    cd && pnpm config set registry $NpmMirror
-    pnpm install -g
-  fi
-
-  pnpm add -g pm2 tsx
  reset_env
  copy_dep
  check_ql
  check_nginx
  check_pm2
+  reload_update
  reload_pm2
  echo -e "\n=====> 检测结束\n"
 }
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+store_env_vars() {
+  initial_vars=($(env | cut -d= -f1))
+}
+
+restore_env_vars() {
+  for key in $(env | cut -d= -f1); do
+    if ! [[ " ${initial_vars[@]} " =~ " $key " ]]; then
+      unset "$key"
+    fi
+  done
+}
+
+store_env_vars
@@ -94,7 +94,7 @@ env_str_to_array() {
 ## 正常运行单个脚本，$1：传入参数
 run_normal() {
  local file_param=$1
-  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]]; then
+  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]] && [[ "$no_delay" != "true" ]]; then
    random_delay "$file_param"
  fi

@@ -105,7 +105,7 @@ run_normal() {
    file_param=${file_param/$relative_path\//}
  fi

-  $timeoutCmd $which_program $file_param
+  $timeoutCmd $which_program $file_param "${script_params[@]}"
 }

 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
@@ -147,7 +147,7 @@ run_concurrent() {
  for i in "${!array[@]}"; do
    export "${env_param}=${array[i]}"
    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-    eval $timeoutCmd $which_program $file_param &>$single_log_path &
+    eval $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
  done

  wait
@@ -190,7 +190,7 @@ run_designated() {
    cd ${relative_path}
    file_param=${file_param/$relative_path\//}
  fi
-  $timeoutCmd $which_program $file_param
+  $timeoutCmd $which_program $file_param "${script_params[@]}"
 }

 ## 运行其他命令
@@ -241,6 +241,8 @@ main() {
  fi
 }

-handle_task_before "$@"
-main "$@"
-handle_task_after "$@"
+handle_task_start "${task_shell_params[@]}"
+run_task_before "${task_shell_params[@]}"
+main "${task_shell_params[@]}"
+run_task_after "${task_shell_params[@]}"
+handle_task_end "${task_shell_params[@]}"
@@ -19,7 +19,6 @@ dir_update_log=$dir_log/update
 ql_static_repo=$dir_repo/static

 ## 文件
-file_ecosystem_js=$dir_root/ecosystem.config.js
 file_config_sample=$dir_sample/config.sample.sh
 file_env=$dir_config/env.sh
 file_sharecode=$dir_config/sharecode.sh
@@ -69,9 +68,10 @@ import_config() {
  [[ -f $file_env ]] && . $file_env

  ql_base_url=${QlBaseUrl:-"/"}
+  ql_port=${QlPort:-"5700"}
  command_timeout_time=${CommandTimeoutTime:-""}
-  proxy_url=${ProxyUrl:-""}
  file_extensions=${RepoFileExtensions:-"js py"}
+  proxy_url=${ProxyUrl:-""}
  current_branch=${QL_BRANCH}

  if [[ -n "${DefaultCronRule}" ]]; then
@@ -99,9 +99,6 @@ set_proxy() {
 unset_proxy() {
  unset http_proxy
  unset https_proxy
-  unset ftp_proxy
-  unset all_proxy
-  unset no_proxy
 }

 make_dir() {
@@ -296,7 +293,7 @@ git_clone_scripts() {

  set_proxy "$proxy"

-  git clone --depth=1 $part_cmd $url $dir 2>&1
+  git clone -q --depth=1 $part_cmd $url $dir
  exit_status=$?

  unset_proxy
@@ -308,12 +305,23 @@ random_range() {
  echo $((RANDOM % ($end - $beg) + $beg))
 }

+delete_pm2() {
+  cd $dir_root
+  pm2 delete ecosystem.config.js
+}
+
 reload_pm2() {
  cd $dir_root
-  # 代理会影响 grpc 服务
-  unset_proxy
+  restore_env_vars
  pm2 flush &>/dev/null
-  pm2 startOrGracefulReload $file_ecosystem_js --update-env
+  pm2 startOrGracefulReload ecosystem.config.js
+}
+
+reload_update() {
+  cd $dir_root
+  restore_env_vars
+  pm2 flush &>/dev/null
+  pm2 startOrGracefulReload other.config.js
 }

 diff_time() {
@@ -365,8 +373,6 @@ format_timestamp() {
 patch_version() {
  git config --global pull.rebase false

-  cp -f $dir_root/.env.example $dir_root/.env
-
  if [[ -f "$dir_root/db/cookie.db" ]]; then
    echo -e "检测到旧的db文件，拷贝为新db...\n"
    mv $dir_root/db/cookie.db $dir_root/db/env.db
@@ -406,8 +412,18 @@ init_nginx() {
  local aliasStr=""
  local rootStr=""
  if [[ $ql_base_url != "/" ]]; then
+    if [[ $ql_base_url != /* ]]; then
+      ql_base_url="/$ql_base_url"
+    fi
+    if [[ $ql_base_url != */ ]]; then
+      ql_base_url="$ql_base_url/"
+    fi
    location_url="^~${ql_base_url%*/}"
    aliasStr="alias ${dir_static}/dist;"
+    if ! grep -q "<base href=\"$ql_base_url\">" "${dir_static}/dist/index.html"; then
+      awk -v text="<base href=\"$ql_base_url\">" '/<link/ && !inserted {print text; inserted=1} 1' "${dir_static}/dist/index.html" >temp.html
+      mv temp.html "${dir_static}/dist/index.html"
+    fi
  else
    rootStr="root ${dir_static}/dist;"
  fi
@@ -416,27 +432,45 @@ init_nginx() {
  sed -i "s,QL_BASE_URL_LOCATION,${location_url},g" /etc/nginx/conf.d/front.conf
  sed -i "s,QL_BASE_URL,${ql_base_url},g" /etc/nginx/conf.d/front.conf

-  ipv6=$(ip a | grep inet6)
-  ipv6Str=""
+  local ipv6=$(ip a | grep inet6)
+  local ipv6Str=""
  if [[ $ipv6 ]]; then
-    ipv6Str="listen [::]:5700 ipv6only=on;"
+    ipv6Str="listen [::]:${ql_port} ipv6only=on;"
  fi
+
+  local ipv4Str="listen ${ql_port};"
  sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf
+  sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf
 }

-handle_task_before() {
+handle_task_start() {
  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
-
  echo -e "## 开始执行... $begin_time\n"
+}

+run_task_before() {
  [[ $is_macos -eq 0 ]] && check_server

  . $file_task_before "$@"
+
+  if [[ $task_before ]]; then
+    echo -e "执行前置命令\n"
+    eval "$task_before"
+    echo -e "\n执行前置命令结束\n"
+  fi
 }

-handle_task_after() {
+run_task_after() {
  . $file_task_after "$@"

+  if [[ $task_after ]]; then
+    echo -e "\n执行后置命令\n"
+    eval "$task_after"
+    echo -e "\n执行后置命令结束"
+  fi
+}
+
+handle_task_end() {
  local etime=$(date "+$time_format")
  local end_time=$(format_time "$time_format" "$etime")
  local end_timestamp=$(format_timestamp "$time_format" "$etime")
@@ -444,8 +478,7 @@ handle_task_after() {

  [[ "$diff_time" == 0 ]] && diff_time=1

-  echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
-
+  echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
 }

@@ -5,9 +5,9 @@ dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh

-trap "single_hanle" 2 3 20 15 14
+trap "single_hanle" 2 3 20 15 14 19 1
 single_hanle() {
-  eval handle_task_after "$@" "$cmd"
+  eval handle_task_end "$@" "$cmd"
  exit 1
 }

@@ -70,10 +70,10 @@ handle_log_path() {
    log_path="$real_log_path"
  fi

-  cmd=">> $dir_log/$log_path 2>&1"
-  make_dir "$dir_log/$log_dir"
-  if [[ "$show_log" == "true" ]]; then
  cmd="2>&1 | tee -a $dir_log/$log_path"
+  make_dir "$dir_log/$log_dir"
+  if [[ "$no_tee" == "true" ]]; then
+    cmd=">> $dir_log/$log_path 2>&1"
  fi

  if [[ "$real_time" == "true" ]]; then
@@ -95,6 +95,21 @@ format_params() {
    fi
  fi
  # params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
+
+  # 分割 task 内置参数和脚本参数
+  task_shell_params=()
+  script_params=()
+  found_double_dash=false
+
+  for arg in "$@"; do
+    if $found_double_dash; then
+      script_params+=("$arg")
+    elif [ "$arg" == "--" ]; then
+      found_double_dash=true
+    else
+      task_shell_params+=("$arg")
+    fi
+  done
 }

 init_begin_time() {
@@ -119,11 +134,9 @@ if [[ $max_time ]]; then
 fi

 format_params "$@"
-define_program "$@"
-handle_log_path "$@"
+define_program "${task_shell_params[@]}"
+handle_log_path "${task_shell_params[@]}"
 init_begin_time

 eval . $dir_shell/otask.sh "$cmd"
-[[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
-
 exit 0
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash

 dir_shell=$QL_DIR/shell
+. $dir_shell/env.sh
 . $dir_shell/share.sh
 . $dir_shell/api.sh

@@ -33,7 +34,6 @@ output_list_add_drop() {
  if [[ -s $list ]]; then
    echo -e "检测到有${type}的定时任务:"
    cat $list
-    echo
  fi
 }

@@ -44,7 +44,7 @@ del_cron() {
  local path=$2
  local detail=""
  local ids=""
-  echo -e "开始尝试自动删除失效的定时任务..."
+  echo -e "\n开始尝试自动删除失效的定时任务..."
  for cron in $(cat $list_drop); do
    local id=$(cat $list_crontab_user | grep -E "$cmd_task.* $cron" | perl -pe "s|.*ID=(.*) $cmd_task.* $cron\.*|\1|" | head -1 | awk -F " " '{print $1}')
    if [[ $ids ]]; then
@@ -75,7 +75,7 @@ del_cron() {
 add_cron() {
  local list_add=$1
  local path=$2
-  echo -e "开始尝试自动添加定时任务..."
+  echo -e "\n开始尝试自动添加定时任务..."
  local detail=""
  cd $dir_scripts
  for file in $(cat $list_add); do
@@ -85,19 +85,20 @@ add_cron() {
      cron_line=$(
        perl -ne "{
                        print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$file_name/
-                    }" $file |
+                    }" $file 2>/dev/null |
          perl -pe "{
                        s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$file_name.*|\1|g;
                        s|\*([\d\*])(.*)|\1\2|g;
                        s|  | |g;
-                    }" | sort -u | head -1
+                    }" 2>/dev/null | sort -u | head -1
      )
-      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
-      [[ -z $cron_name ]] && cron_name="$file_name"
      [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
      [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
      [[ -z $cron_line ]] && cron_line="$default_cron"
-      result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name:$SUB_ID")
+      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
+      [[ -z $cron_name ]] && cron_name=$(grep "name:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
+      [[ -z $cron_name ]] && cron_name=$(basename "$file_name")
+      result=$(add_cron_api "${cron_line}:${cmd_task} ${file}:${cron_name}:${SUB_ID}")
      echo -e "$result"
      if [[ $detail ]]; then
        detail="${detail}${result}\n"
@@ -134,10 +135,10 @@ update_repo() {
  git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"

  if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n拉取 ${uniq_path} 成功...\n"
+    echo -e "拉取 ${uniq_path} 成功...\n"
    diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
  else
-    echo -e "\n拉取 ${uniq_path} 失败，请检查网络...\n"
+    echo -e "拉取 ${uniq_path} 失败，请检查日志...\n"
  fi
 }

@@ -194,7 +195,7 @@ update_raw() {
      [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
      [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
      [[ -z $cron_line ]] && cron_line="$default_cron"
-      result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name:$SUB_ID")
+      result=$(add_cron_api "${cron_line}:${cmd_task} ${filename}:${cron_name}:${SUB_ID}")
      echo -e "$result\n"
      notify_api "新增任务通知" "\n$result"
      # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
@@ -230,21 +231,25 @@ usage() {
 }

 reload_qinglong() {
+  delete_pm2
+
  local reload_target="${1}"
  local primary_branch="master"
-  if [[ "${QL_BRANCH}" == "develop" ]]; then
-    primary_branch="develop"
+  if [[ "${QL_BRANCH}" == "develop" ]] || [[ "${QL_BRANCH}" == "debian" ]] || [[ "${QL_BRANCH}" == "debian-dev" ]]; then
+    primary_branch="${QL_BRANCH}"
  fi

  if [[ "$reload_target" == 'system' ]]; then
-    cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+    rm -rf ${dir_root}/back ${dir_root}/cli ${dir_root}/docker ${dir_root}/sample ${dir_root}/shell ${dir_root}/src
+    mv -f ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
    rm -rf $dir_static/*
-    cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+    mv -f ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
    cp -f $file_config_sample $dir_config/config.sample.sh
  fi

  if [[ "$reload_target" == 'data' ]]; then
-    cp -rf ${dir_tmp}/data ${dir_root}/
+    rm -rf ${dir_root}/data/*
+    mv -f ${dir_tmp}/data/* ${dir_root}/data/
  fi

  reload_pm2
@@ -256,7 +261,7 @@ update_qinglong() {
  local mirror="gitee"
  local downloadQLUrl="https://gitee.com/whyour/qinglong/repository/archive"
  local downloadStaticUrl="https://gitee.com/whyour/qinglong-static/repository/archive"
-  local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200)
+  local githubStatus=$(curl -s --noproxy "*" -m 2 -IL "https://google.com" | grep 200)
  if [[ ! -z $githubStatus ]]; then
    mirror="github"
    downloadQLUrl="https://github.com/whyour/qinglong/archive/refs/heads"
@@ -265,21 +270,21 @@ update_qinglong() {
  echo -e "使用 ${mirror} 源更新...\n"

  local primary_branch="master"
-  if [[ "${QL_BRANCH}" == "develop" ]]; then
-    primary_branch="develop"
+  if [[ "${QL_BRANCH}" == "develop" ]] || [[ "${QL_BRANCH}" == "debian" ]] || [[ "${QL_BRANCH}" == "debian-dev" ]]; then
+    primary_branch="${QL_BRANCH}"
  fi

  wget -cqO "${dir_tmp}/ql.zip" "${downloadQLUrl}/${primary_branch}.zip"
  exit_status=$?

  if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙源文件成功...\n"
+    echo -e "更新青龙源文件成功...\n"

    unzip -oq ${dir_tmp}/ql.zip -d ${dir_tmp}

    update_qinglong_static
  else
-    echo -e "\n更新青龙源文件失败，请检查网络...\n"
+    echo -e "更新青龙源文件失败，请检查网络...\n"
  fi
 }

@@ -288,33 +293,32 @@ update_qinglong_static() {
  exit_status=$?

  if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙静态资源成功...\n"
+    echo -e "更新青龙静态资源成功...\n"
    unzip -oq ${dir_tmp}/static.zip -d ${dir_tmp}

    check_update_dep
  else
-    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+    echo -e "更新青龙静态资源失败，请检查网络...\n"
  fi
 }

 check_update_dep() {
  echo -e "\n开始检测依赖...\n"
-  if [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
-    cp -f $dir_sample/package.json $dir_scripts/package.json
-    npm_install_2 $dir_scripts
-  fi
  if [[ $(diff $dir_root/package.json ${dir_tmp}/qinglong-${primary_branch}/package.json) ]]; then
    npm_install_2 "${dir_tmp}/qinglong-${primary_branch}"
  fi

  if [[ $exit_status -eq 0 ]]; then
    echo -e "\n依赖检测安装成功...\n"
-    echo -e "\n更新包下载成功...\n"
+    echo -e "更新包下载成功..."

    if [[ "$needRestart" == 'true' ]]; then
-      cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+      delete_pm2
+
+      rm -rf ${dir_root}/back ${dir_root}/cli ${dir_root}/docker ${dir_root}/sample ${dir_root}/shell ${dir_root}/src
+      mv -f ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
      rm -rf $dir_static/*
-      cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+      mv -f ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
      cp -f $file_config_sample $dir_config/config.sample.sh

      reload_pm2
@@ -419,9 +423,15 @@ gen_list_repo() {
  fi

  for file in ${files}; do
+    dirPath=$(dirname "$file")
    filename=$(basename "$file")
-    cp -f $file "$dir_scripts/${uniq_path}/${filename}"
-    echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
+    filePath="${uniq_path}/${filename}"
+    if [[ $dirPath ]] && [[ $dirPath != '.' ]]; then
+      mkdir -p "${dir_scripts}/${uniq_path}/${dirPath}"
+      filePath="${uniq_path}/${dirPath}/${filename}"
+    fi
+    cp -f $file "${dir_scripts}/$filePath"
+    echo "$filePath" >>"$dir_list_tmp/${uniq_path}_scripts.list"
    # cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task.* ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
    # if [[ $cron_id ]]; then
    #   result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
@@ -474,8 +484,13 @@ main() {
  local log_path="${log_dir}/${log_time}.log"
  local file_path="$dir_log/$log_path"

+  cmd="2>&1 | tee -a $file_path"
+  if [[ "$no_tee" == "true" ]]; then
    cmd=">> $file_path 2>&1"
-  [[ "$show_log" == "true" ]] && cmd=""
+  fi
+  if [[ "$real_time" == "true" ]]; then
+    cmd=""
+  fi

  local time_format="%Y-%m-%d %H:%M:%S"
  local time=$(date "+$time_format")
@@ -488,11 +503,6 @@ main() {
    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
  fi

-  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
-    eval echo -e "请移除 -l 参数" $cmd
-    exit 1
-  fi
-
  case $p1 in
  update)
    fix_config
@@ -557,10 +567,6 @@ main() {
  if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒　　　　　" $cmd
  fi
-
-  if [[ -f $file_path ]]; then
-    cat $file_path
-  fi
 }

 main "$@"
@@ -1,7 +1,7 @@
 import { createFromIconfontCN } from '@ant-design/icons';

 const IconFont = createFromIconfontCN({
-  scriptUrl: ['//at.alicdn.com/t/c/font_3354854_ob5y15ewlyq.js'],
+  scriptUrl: ['//at.alicdn.com/t/c/font_3354854_lc939gab1iq.js'],
 });

 export default IconFont;
@@ -24,9 +24,13 @@ body {
  -webkit-overflow-scrolling: touch;
 }

+.ant-modal-header {
+  padding-right: 54px;
+}
+
 .ant-modal-body {
-  max-height: calc(90vh - 110px);
-  max-height: calc(90vh - var(--vh-offset, 110px));
+  max-height: calc(80vh - 110px);
+  max-height: calc(80vh - var(--vh-offset, 110px));
  overflow-y: auto;
 }

@@ -181,6 +185,7 @@ body {
      .react-codemirror2,
      .CodeMirror {
        height: 100%;
+        overflow: auto;
      }
    }
  }
@@ -451,3 +456,9 @@ body[data-mode='phone'] header {
 .ant-table.ant-table-middle tfoot > tr > td {
  padding: 12px 16px;
 }
+
+body[data-dark='true'] {
+  .ant-popover-arrow-content {
+    --antd-arrow-background-color: rgb(24, 26, 27);
+  }
+}
@@ -1,5 +1,5 @@
 import intl from 'react-intl-universal';
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState } from 'react';
 import ProLayout, { PageLoading } from '@ant-design/pro-layout';
 import * as DarkReader from '@umijs/ssr-darkreader';
 import defaultProps from './defaultProps';
@@ -29,9 +29,9 @@ import {
  MenuProps,
 } from 'antd';
 // @ts-ignore
-import SockJS from 'sockjs-client';
 import * as Sentry from '@sentry/react';
 import { init } from '../utils/init';
+import WebSocketManager from '../utils/websocket';

 export interface SharedContext {
  headerStyle: React.CSSProperties;
@@ -40,7 +40,6 @@ export interface SharedContext {
  user: any;
  reloadUser: (needLoading?: boolean) => void;
  reloadTheme: () => void;
-  socketMessage: any;
  systemInfo: TSystemInfo;
 }

@@ -60,8 +59,6 @@ export default function () {
  const [user, setUser] = useState<any>({});
  const [loading, setLoading] = useState<boolean>(true);
  const [systemInfo, setSystemInfo] = useState<TSystemInfo>();
-  const ws = useRef<any>(null);
-  const [socketMessage, setSocketMessage] = useState<any>();
  const [collapsed, setCollapsed] = useState(false);
  const [initLoading, setInitLoading] = useState<boolean>(true);
  const {
@@ -180,32 +177,14 @@ export default function () {

  useEffect(() => {
    if (!user || !user.username) return;
-    ws.current = new SockJS(
-      `${window.location.origin}/api/ws?token=${localStorage.getItem(
+    const ws = WebSocketManager.getInstance(
+      `${window.location.origin}${config.apiPrefix}ws?token=${localStorage.getItem(
        config.authKey,
      )}`,
    );

-    ws.current.onmessage = (e: any) => {
-      try {
-        const data = JSON.parse(e.data);
-        if (data.type === 'ping') {
-          if (data && data.message === 'hanhh') {
-            console.log('WS connection succeeded !!!');
-          } else {
-            console.log('WS connection Failed !!!', e);
-          }
-        }
-        setSocketMessage(data);
-      } catch (error) {
-        console.log('websocket连接失败', e);
-      }
-    };
-
-    const wsCurrent = ws.current;
-
    return () => {
-      wsCurrent.close();
+      ws.close();
    };
  }, [user]);

@@ -246,7 +225,6 @@ export default function () {
            user,
            reloadUser,
            reloadTheme,
-            ws: ws.current,
          }}
        />
      );
@@ -342,7 +320,7 @@ export default function () {
                shape="square"
                size="small"
                icon={<UserOutlined />}
-                src={user.avatar ? `/api/static/${user.avatar}` : ''}
+                src={user.avatar ? `${config.apiPrefix}static/${user.avatar}` : ''}
              />
              <span style={{ marginLeft: 5 }}>{user.username}</span>
            </span>
@@ -364,7 +342,7 @@ export default function () {
                  shape="square"
                  size="small"
                  icon={<UserOutlined />}
-                  src={user.avatar ? `/api/static/${user.avatar}` : ''}
+                  src={user.avatar ? `${config.apiPrefix}static/${user.avatar}` : ''}
                />
                <span style={{ marginLeft: 5 }}>{user.username}</span>
              </span>
@@ -387,7 +365,6 @@ export default function () {
          user,
          reloadUser,
          reloadTheme,
-          socketMessage,
          systemInfo,
        }}
      />
@@ -100,12 +100,14 @@
  "删除中": "Deleting",
  "已删除": "Deleted",
  "删除失败": "Deletion Failed",
+  "已取消": "Cancelled",
  "序号": "Number",
  "备注": "Remarks",
  "更新时间": "Update Time",
  "创建时间": "Creation Time",
  "确认删除依赖": "Confirm to delete the dependency",
  "确认重新安装": "Confirm to reinstall",
+  "确认取消安装": "Confirm to cancel install",
  "确认删除选中的依赖吗": "Confirm to delete the selected dependencies?",
  "确认重新安装选中的依赖吗": "Confirm to reinstall the selected dependencies?",
  "请输入名称": "Please enter a name",
@@ -141,7 +143,7 @@
  "服务启动超时": "Service startup timeout",
  "请先按如下方式修复：": "Please fix it as follows:",
  "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>": "1. Execute 'docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower -cR <container_name>' on the host machine",
-  "2. 容器内执行 ql -l check、ql -l update": "2. Execute 'ql -l check' and 'ql -l update' inside the container",
+  "2. 容器内执行 ql check、ql update": "2. Execute 'ql check' and 'ql update' inside the container",
  "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果": "3. If the problem persists, execute 'pm2 logs' inside the container and copy the results",
  "提交 issue": "Submit an issue",
  "启动中，请稍后...": "Starting, please wait...",
@@ -237,6 +239,7 @@
  "系统将在": "The system will restart in",
  "秒后自动刷新": "seconds and automatically refresh",
  "检查更新": "Check for Updates",
+  "重新启动": "Reboot",
  "确认删除应用": "Confirm to delete the application",
  "确认重置": "Confirm to reset",
  "确认重置应用": "Confirm to reset the application",
@@ -352,6 +355,8 @@
  "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)": "BARK push icon, custom push icon (requires iOS 15 or above to display)",
  "BARK推送铃声，铃声列表去APP查看复制填写": "BARK push ringtone, check and copy from the APP's ringtone list",
  "BARK推送消息的分组，默认为qinglong": "BARK push message grouping, default is qinglong",
+  "BARK推送消息的时效性，默认为active": "BARK push message redirecting URL",
+  "BARK推送消息的跳转URL": "BARK push message grouping, default is qinglong",
  "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "Telegram Bot token, e.g., 1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
  "telegram用户的id，例如：129xxx206": "Telegram user ID, e.g., 129xxx206",
  "代理IP": "Proxy IP",
@@ -373,9 +378,9 @@
  "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "After WeChat scan login, one-to-one or one-to-many push using the provided token (your Token). If PUSH_PLUS_USER is not provided, it defaults to one-to-one push. See reference at https://www.pushplus.plus/",
  "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "The 'group code' for one-to-many push (one-to-many push -> your group (if none, create one) -> group code). If you are the creator of the group, you need to click 'View QR code' to scan and bind, otherwise, you won't receive group messages.",
  "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "Feishu group bot: https://www.feishu.cn/hc/zh-CN/articles/360024984973",
-  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://nodemailer.com/smtp/well-known/",
+  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
  "邮箱地址": "Email Address",
-  "邮箱SMTP授权码": "Email SMTP Authorization Code",
+  "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "The SMTP login password may also be a special passphrase, depending on the specific email service provider's instructions",
  "PushMe的Key，https://push.i-i.me/": "PushMe key, https://push.i-i.me/",
  "请求方法": "Request Method",
  "请求头Content-Type": "Request Header Content-Type",
@@ -391,6 +396,7 @@
  "系统": "System",
  "个人": "Personal",
  "重新安装": "Reinstall",
+  "取消安装": "Cancel Install",
  "强制删除": "Force Delete",
  "全部任务": "All Tasks",
  "关联订阅": "Associate Subscription",
@@ -451,5 +457,28 @@
  "登录已过期，请重新登录": "Login session has expired, please log in again",
  "系统日志": "System Logs",
  "主题": "Theme",
-  "语言": "Language"
+  "语言": "Language",
+  "中...": "ing...",
+  "请选择操作符": "Please select operator",
+  "新增定时规则": "Add Timing Rules",
+  "运行任务前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "Run commands before executing the task, e.g., cp/mv/python3 xxx.py/node xxx.js",
+  "运行任务后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "Run commands after executing the task, e.g., cp/mv/python3 xxx.py/node xxx.js",
+  "请输入运行任务前要执行的命令，不能包含 task 命令": "Please enter the command to run before executing the task, cannot contain task commands",
+  "请输入运行任务后要执行的命令，不能包含 task 命令": "Please enter the command to run after executing the task, cannot contain task commands",
+  "不能包含 task 命令": "Cannot contain task commands",
+  "Chronocat Red 服务的连接地址 https://chronocat.vercel.app/install/docker/official/": "Connection address of the Chronocat Red service https://chronocat.vercel.app/install/docker/official/",
+  "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx": "Individuals: user_id=individual QQ Groups fill in group_id=QQ Groups more than one with English; separated by the same time to support individuals and groups such as: user_id=xxx;group_id=xxxx;group_id=xxxxx",
+  "docker安装在持久化config目录下的chronocat.yml文件可找到": "The docker installation can be found in the persistence config directory in the chronocat.yml file",
+  "请选择": "Please select",
+  "请输入": "Please input",
+  "依赖设置": "Dependence Settings",
+  "Node 软件包镜像源": "Node Software Package Mirror Source",
+  "Python 软件包镜像源": "Python Software Package Mirror Source",
+  "Linux 软件包镜像源": "Linux Software Package Mirror Source",
+  "代理与镜像源二选一即可": "Either Proxy or Mirror Source can be chosen",
+  "代理地址, 支持HTTP(S)/SOCK5": "Proxy Address, supports HTTP(S)/SOCK5",
+  "NPM 镜像源": "NPM Mirror Source",
+  "PyPI 镜像源": "PyPI Mirror Source",
+  "alpine linux 镜像源": "Alpine Linux Mirror Source",
+  "如果恢复失败，可进入容器执行": "If recovery fails, you can enter the container and execute"
 }
@@ -100,12 +100,14 @@
  "删除中": "删除中",
  "已删除": "已删除",
  "删除失败": "删除失败",
+  "已取消": "已取消",
  "序号": "序号",
  "备注": "备注",
  "更新时间": "更新时间",
  "创建时间": "创建时间",
  "确认删除依赖": "确认删除依赖",
  "确认重新安装": "确认重新安装",
+  "确认取消安装": "确认取消安装",
  "确认删除选中的依赖吗": "确认删除选中的依赖吗",
  "确认重新安装选中的依赖吗": "确认重新安装选中的依赖吗",
  "请输入名称": "请输入名称",
@@ -141,7 +143,7 @@
  "服务启动超时": "服务启动超时",
  "请先按如下方式修复：": "请先按如下方式修复：",
  "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>": "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>",
-  "2. 容器内执行 ql -l check、ql -l update": "2. 容器内执行 ql -l check、ql -l update",
+  "2. 容器内执行 ql check、ql update": "2. 容器内执行 ql check、ql update",
  "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果": "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果",
  "提交 issue": "提交 issue",
  "启动中，请稍后...": "启动中，请稍后...",
@@ -237,6 +239,7 @@
  "系统将在": "系统将在",
  "秒后自动刷新": "秒后自动刷新",
  "检查更新": "检查更新",
+  "重新启动": "重新启动",
  "确认删除应用": "确认删除应用",
  "确认重置": "确认重置",
  "确认重置应用": "确认重置应用",
@@ -352,6 +355,8 @@
  "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)": "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)",
  "BARK推送铃声，铃声列表去APP查看复制填写": "BARK推送铃声，铃声列表去APP查看复制填写",
  "BARK推送消息的分组，默认为qinglong": "BARK推送消息的分组，默认为qinglong",
+  "BARK推送消息的时效性，默认为active": "BARK推送消息的时效性，默认为active",
+  "BARK推送消息的跳转URL": "BARK推送消息的跳转URL",
  "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
  "telegram用户的id，例如：129xxx206": "telegram用户的id，例如：129xxx206",
  "代理IP": "代理IP",
@@ -373,9 +378,9 @@
  "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/",
  "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）",
  "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973",
-  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/",
+  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
  "邮箱地址": "邮箱地址",
-  "邮箱SMTP授权码": "邮箱SMTP授权码",
+  "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",
  "PushMe的Key，https://push.i-i.me/": "PushMe的Key，https://push.i-i.me/",
  "请求方法": "请求方法",
  "请求头Content-Type": "请求头Content-Type",
@@ -391,6 +396,7 @@
  "系统": "系统",
  "个人": "个人",
  "重新安装": "重新安装",
+  "取消安装": "取消安装",
  "强制删除": "强制删除",
  "全部任务": "全部任务",
  "关联订阅": "关联订阅",
@@ -451,5 +457,28 @@
  "登录已过期，请重新登录": "登录已过期，请重新登录",
  "系统日志": "系统日志",
  "主题": "主题",
-  "语言": "语言"
+  "语言": "语言",
+  "中...": "中...",
+  "请选择操作符": "请选择操作符",
+  "新增定时规则": "新增定时规则",
+  "运行任务前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "运行任务前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js",
+  "运行任务后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "运行任务后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js",
+  "请输入运行任务前要执行的命令，不能包含 task 命令": "请输入运行任务前要执行的命令，不能包含 task 命令",
+  "请输入运行任务后要执行的命令，不能包含 task 命令": "请输入运行任务后要执行的命令，不能包含 task 命令",
+  "不能包含 task 命令": "不能包含 task 命令",
+  "Chronocat Red 服务的连接地址 https://chronocat.vercel.app/install/docker/official/": "Chronocat Red 服务的连接地址 https://chronocat.vercel.app/install/docker/official/",
+  "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx": "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx",
+  "docker安装在持久化config目录下的chronocat.yml文件可找到": "docker安装在持久化config目录下的chronocat.yml文件可找到",
+  "请选择": "请选择",
+  "请输入": "请输入",
+  "依赖设置": "依赖设置",
+  "Node 软件包镜像源": "Node 软件包镜像源",
+  "Python 软件包镜像源": "Python 软件包镜像源",
+  "Linux 软件包镜像源": "Linux 软件包镜像源",
+  "代理与镜像源二选一即可": "代理与镜像源二选一即可",
+  "代理地址, 支持HTTP(S)/SOCK5": "代理地址, 支持HTTP(S)/SOCK5",
+  "NPM 镜像源": "NPM 镜像源",
+  "PyPI 镜像源": "PyPI 镜像源",
+  "alpine linux 镜像源": "alpine linux 镜像源",
+  "如果恢复失败，可进入容器执行": "如果恢复失败，可进入容器执行"
 }
@@ -1,4 +1,4 @@
-import intl from 'react-intl-universal'
+import intl from 'react-intl-universal';
 import React, {
  PureComponent,
  Fragment,
@@ -15,6 +15,8 @@ import CodeMirror from '@uiw/react-codemirror';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
 import { langs } from '@uiw/codemirror-extensions-langs';
+import { useHotkeys } from 'react-hotkeys-hook';
+import { getEditorMode } from '@/utils';

 const Config = () => {
  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
@@ -25,9 +27,12 @@ const Config = () => {
  const [data, setData] = useState<any[]>([]);
  const editorRef = useRef<any>(null);
  const [confirmLoading, setConfirmLoading] = useState(false);
+  const [language, setLanguage] = useState<string>('shell');

  const getConfig = (name: string) => {
-    request.get(`${config.apiPrefix}configs/${name}`).then(({ code, data }) => {
+    request
+      .get(`${config.apiPrefix}configs/detail?path=${encodeURIComponent(name)}`)
+      .then(({ code, data }) => {
        if (code === 200) {
          setValue(data);
        }
@@ -66,8 +71,18 @@ const Config = () => {
    setSelect(value);
    setTitle(node.value);
    getConfig(node.value);
+    const newMode = getEditorMode(value);
+    setLanguage(newMode);
  };

+  useHotkeys(
+    'mod+s',
+    (e) => {
+      updateConfig();
+    },
+    { enableOnFormTags: ['textarea'], preventDefault: true },
+  );
+
  useEffect(() => {
    getFiles();
    getConfig('config.sh');
@@ -113,7 +128,7 @@ const Config = () => {
        />
      ) : (
        <Editor
-          defaultLanguage="shell"
+          language={language}
          value={value}
          theme={theme}
          options={{
@@ -33,6 +33,7 @@ import IconFont from '@/components/iconfont';
 import { getCommandScript, getEditorMode } from '@/utils';
 import VirtualList from 'rc-virtual-list';
 import useScrollHeight from '@/hooks/useScrollHeight';
+import dayjs from 'dayjs';

 const { Text } = Typography;

@@ -52,8 +53,6 @@ interface LogItem {
  filename: string;
 }

-const language = navigator.language || navigator.languages[0];
-
 const CronDetailModal = ({
  cron = {},
  handleCancel,
@@ -108,10 +107,9 @@ const CronDetailModal = ({
        value={value}
        options={{
          fontSize: 12,
+          minimap: { enabled: false },
          lineNumbersMinChars: 3,
-          fontFamily: 'Source Code Pro',
          glyphMargin: false,
-          wordWrap: 'on',
        }}
        onMount={(editor, monaco) => {
          editorRef.current = editor;
@@ -121,15 +119,12 @@ const CronDetailModal = ({
  };

  const onClickItem = (item: LogItem) => {
-    localStorage.setItem('logCron', currentCron.id);
-    setLogUrl(
-      `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
-    );
-    request
-      .get(
-        `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
-      )
-      .then(({ code, data }) => {
+    const url = `${config.apiPrefix}logs/detail?file=${item.filename}&path=${
+      item.directory || ''
+    }`;
+    localStorage.setItem('logCron', url);
+    setLogUrl(url);
+    request.get(url).then(({ code, data }) => {
      if (code === 200) {
        setLog(data);
        setIsLogModalVisible(true);
@@ -160,7 +155,7 @@ const CronDetailModal = ({
      const [s, p] = result;
      setScriptInfo({ parent: p, filename: s });
      request
-        .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
+        .get(`${config.apiPrefix}scripts/detail?file=${s}&path=${p || ''}`)
        .then(({ code, data }) => {
          if (code === 200) {
            setValue(data);
@@ -362,8 +357,13 @@ const CronDetailModal = ({
    <Modal
      title={
        <div className="crontab-title-wrapper">
-          <div>
-            <span>{currentCron.name}</span>
+          <div style={{ minWidth: 0 }}>
+            <Typography.Text
+              style={{ width: '100%' }}
+              ellipsis={{ tooltip: currentCron.name }}
+            >
+              {currentCron.name}
+            </Typography.Text>
            {currentCron.labels?.length > 0 && currentCron.labels[0] !== '' && (
              <Divider type="vertical"></Divider>
            )}
@@ -498,7 +498,12 @@ const CronDetailModal = ({
          </div>
          <div className="cron-detail-info-item">
            <div className="cron-detail-info-title">{intl.get('定时')}</div>
-            <div className="cron-detail-info-value">{currentCron.schedule}</div>
+            <div className="cron-detail-info-value">
+              <div>{currentCron.schedule}</div>
+              {currentCron.extra_schedules?.map((x) => (
+                <div key={x.schedule}>{x.schedule}</div>
+              ))}
+            </div>
          </div>
          <div className="cron-detail-info-item">
            <div className="cron-detail-info-title">
@@ -506,11 +511,9 @@ const CronDetailModal = ({
            </div>
            <div className="cron-detail-info-value">
              {currentCron.last_execution_time
-                ? new Date(currentCron.last_execution_time * 1000)
-                    .toLocaleString(language, {
-                      hour12: false,
-                    })
-                    .replace(' 24:', ' 00:')
+                ? dayjs(currentCron.last_execution_time * 1000).format(
+                    'YYYY-MM-DD HH:mm:ss',
+                  )
                : '-'}
            </div>
          </div>
@@ -530,11 +533,7 @@ const CronDetailModal = ({
            </div>
            <div className="cron-detail-info-value">
              {currentCron.nextRunTime &&
-                currentCron.nextRunTime
-                  .toLocaleString(language, {
-                    hour12: false,
-                  })
-                  .replace(' 24:', ' 00:')}
+                dayjs(currentCron.nextRunTime).format('YYYY-MM-DD HH:mm:ss')}
            </div>
          </div>
        </Card>
@@ -6,9 +6,9 @@
  .card-wrapper {
    .ant-card:last-child {
      .ant-card-body {
-        min-height: 300px;
-        height: calc(90vh - 367px);
-        height: calc(90vh - var(--vh-offset, 0px) - 367px);
+        min-height: 0;
+        height: calc(80vh - 314px);
+        height: calc(80vh - var(--vh-offset, 0px) - 314px);
        overflow-y: auto;

        > div {
@@ -21,6 +21,9 @@
  .ant-modal-body {
    background: #eee;
    padding: 12px;
+    max-height: calc(80vh - 57px);
+    max-height: calc(80vh - var(--vh-offset, 57px));
+    word-wrap: unset;
  }

  .ant-card-body {
@@ -35,7 +38,7 @@
    overflow: auto;

    .ant-card-body {
-      min-width: 600px;
+      min-width: 1000px;
    }

    .cron-detail-info-item {
@@ -58,7 +61,7 @@
    .ant-card-body {
      display: flex;
      justify-content: space-between;
-      min-width: 600px;
+      min-width: 1000px;
    }
  }

@@ -78,7 +81,6 @@
    display: flex;
    align-items: center;
    justify-content: space-between;
-    margin-right: 32px;

    .operations {
      display: flex;
@@ -43,7 +43,6 @@ import { request } from '@/utils/http';
 import CronModal, { CronLabelModal } from './modal';
 import CronLogModal from './logModal';
 import CronDetailModal from './detail';
-import cron_parser from 'cron-parser';
 import { diffTime } from '@/utils/date';
 import { history, useOutletContext } from '@umijs/max';
 import './index.less';
@@ -52,13 +51,14 @@ import ViewManageModal from './viewManageModal';
 import { FilterValue, SorterResult } from 'antd/lib/table/interface';
 import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
-import { getCommandScript, parseCrontab } from '@/utils';
+import { getCommandScript, getCrontabsNextDate, parseCrontab } from '@/utils';
 import { ColumnProps } from 'antd/lib/table';
 import { useVT } from 'virtualizedtableforantd4';
 import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type';
 import Name from '@/components/name';
+import dayjs from 'dayjs';

-const { Text, Paragraph } = Typography;
+const { Text, Paragraph, Link } = Typography;
 const { Search } = Input;

 const Crontab = () => {
@@ -75,17 +75,18 @@ const Crontab = () => {
          style={{
            wordBreak: 'break-all',
            marginBottom: 0,
+            color: '#1890ff'
          }}
          ellipsis={{ tooltip: text, rows: 2 }}
        >
-          <a
+          <Link
            onClick={() => {
              setDetailCron(record);
              setIsDetailModalVisible(true);
            }}
          >
            {record.name || '-'}
-          </a>
+          </Link>
        </Paragraph>
      ),
      sorter: {
@@ -183,6 +184,32 @@ const Crontab = () => {
      sorter: {
        compare: (a, b) => a.schedule.localeCompare(b.schedule),
      },
+      render: (text, record) => {
+        return (
+          <Paragraph
+            style={{
+              wordBreak: 'break-all',
+              marginBottom: 0,
+            }}
+            ellipsis={{
+              tooltip: {
+                placement: 'right',
+                title: (
+                  <>
+                    <div>{text}</div>
+                    {record.extra_schedules?.map((x) => (
+                      <div key={x.schedule}>{x.schedule}</div>
+                    ))}
+                  </>
+                ),
+              },
+              rows: 2,
+            }}
+          >
+            {text}
+          </Paragraph>
+        );
+      },
    },
    {
      title: intl.get('最后运行时长'),
@@ -211,7 +238,6 @@ const Crontab = () => {
        },
      },
      render: (text, record) => {
-        const language = navigator.language || navigator.languages[0];
        return (
          <span
            style={{
@@ -219,11 +245,9 @@ const Crontab = () => {
            }}
          >
            {record.last_execution_time
-              ? new Date(record.last_execution_time * 1000)
-                  .toLocaleString(language, {
-                    hour12: false,
-                  })
-                  .replace(' 24:', ' 00:')
+              ? dayjs(record.last_execution_time * 1000).format(
+                  'YYYY-MM-DD HH:mm:ss',
+                )
              : '-'}
          </span>
        );
@@ -238,12 +262,7 @@ const Crontab = () => {
        },
      },
      render: (text, record) => {
-        const language = navigator.language || navigator.languages[0];
-        return record.nextRunTime
-          .toLocaleString(language, {
-            hour12: false,
-          })
-          .replace(' 24:', ' 00:');
+        return dayjs(record.nextRunTime).format('YYYY-MM-DD HH:mm:ss');
      },
    },
    {
@@ -376,7 +395,7 @@ const Crontab = () => {
            data.map((x) => {
              return {
                ...x,
-                nextRunTime: parseCrontab(x.schedule),
+                nextRunTime: getCrontabsNextDate(x.schedule, x.extra_schedules),
              };
            }),
          );
@@ -664,7 +683,10 @@ const Crontab = () => {
        if (code === 200) {
          const index = value.findIndex((x) => x.id === cron.id);
          const result = [...value];
-          data.nextRunTime = parseCrontab(data.schedule);
+          data.nextRunTime = getCrontabsNextDate(
+            data.schedule,
+            data.extra_schedules,
+          );
          if (index !== -1) {
            result.splice(index, 1, {
              ...cron,
@@ -1,6 +1,14 @@
 import intl from 'react-intl-universal';
 import React, { useEffect, useRef, useState } from 'react';
-import { Modal, message, Input, Form, Statistic, Button } from 'antd';
+import {
+  Modal,
+  message,
+  Input,
+  Form,
+  Statistic,
+  Button,
+  Typography,
+} from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import {
@@ -10,6 +18,7 @@ import {
 import { PageLoading } from '@ant-design/pro-layout';
 import { logEnded } from '@/utils';
 import { CrontabStatus } from './type';
+import Ansi from 'ansi-to-react';

 const { Countdown } = Statistic;

@@ -31,6 +40,7 @@ const CronLogModal = ({
  const [executing, setExecuting] = useState<any>(true);
  const [isPhone, setIsPhone] = useState(false);
  const scrollInfoRef = useRef({ value: 0, down: true });
+  const uniqPath = logUrl ? logUrl : String(cron?.id);

  const getCronLog = (isFirst?: boolean) => {
    if (isFirst) {
@@ -41,7 +51,7 @@ const CronLogModal = ({
      .then(({ code, data }) => {
        if (
          code === 200 &&
-          localStorage.getItem('logCron') === String(cron.id) &&
+          localStorage.getItem('logCron') === uniqPath &&
          data !== value
        ) {
          const log = data as string;
@@ -49,10 +59,15 @@ const CronLogModal = ({
          const hasNext = Boolean(
            log && !logEnded(log) && !log.includes('任务未运行'),
          );
+          if (!hasNext && !logEnded(value) && value !== intl.get('启动中...')) {
+            setTimeout(() => {
+              autoScroll();
+            });
+          }
          setExecuting(hasNext);
          if (hasNext) {
-            autoScroll();
            setTimeout(() => {
+              autoScroll();
              getCronLog();
            }, 2000);
          }
@@ -82,29 +97,32 @@ const CronLogModal = ({
    handleCancel();
  };

-  const handleScroll = (e) => {
-    const sTop = e.target.scrollTop;
+  const handleScroll: React.UIEventHandler<HTMLDivElement> = (e) => {
+    const sTop = (e.target as HTMLDivElement).scrollTop;
    if (scrollInfoRef.current.down) {
      scrollInfoRef.current = {
        value: sTop,
-        down: sTop > scrollInfoRef.current.value,
+        down: sTop - scrollInfoRef.current.value > -5 || !sTop,
      };
    }
  };

  const titleElement = () => {
    return (
-      <>
+      <div style={{ display: 'flex', alignItems: 'center' }}>
        {(executing || loading) && <Loading3QuartersOutlined spin />}
        {!executing && !loading && <CheckCircleOutlined />}
-        <span style={{ marginLeft: 5 }}>{cron && cron.name}</span>
-      </>
+        <Typography.Text ellipsis={true} style={{ marginLeft: 5 }}>
+          {cron && cron.name}
+        </Typography.Text>
+      </div>
    );
  };

  useEffect(() => {
    if (cron && cron.id && visible) {
      getCronLog(true);
+      scrollInfoRef.current.down = true;
    }
  }, [cron, visible]);

@@ -147,7 +165,7 @@ const CronLogModal = ({
                : {}
            }
          >
-            {value}
+            <Ansi>{value}</Ansi>
          </pre>
        )}
        <div id="log-flag"></div>
@@ -1,10 +1,11 @@
 import intl from 'react-intl-universal';
 import React, { useEffect, useState } from 'react';
-import { Modal, message, Input, Form, Button } from 'antd';
+import { Modal, message, Input, Form, Button, Space } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import cronParse from 'cron-parser';
 import EditableTagGroup from '@/components/tag';
+import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';

 const CronModal = ({
  cron,
@@ -73,7 +74,11 @@ const CronModal = ({
        name="form_in_modal"
        initialValues={cron}
      >
-        <Form.Item name="name" label={intl.get('名称')}>
+        <Form.Item
+          name="name"
+          label={intl.get('名称')}
+          rules={[{ required: true, whitespace: true }]}
+        >
          <Input placeholder={intl.get('请输入任务名称')} />
        </Form.Item>
        <Form.Item
@@ -107,9 +112,97 @@ const CronModal = ({
        >
          <Input placeholder={intl.get('秒(可选) 分 时 天 月 周')} />
        </Form.Item>
+        <Form.List name="extra_schedules">
+          {(fields, { add, remove }, { errors }) => (
+            <>
+              {fields.map(({ key, name, ...restField }) => (
+                <Form.Item key={key} noStyle>
+                  <Space className="view-create-modal-sorts" align="baseline">
+                    <Form.Item
+                      {...restField}
+                      name={[name, 'schedule']}
+                      rules={[{ required: true }]}
+                    >
+                      <Input
+                        placeholder={intl.get('秒(可选) 分 时 天 月 周')}
+                      />
+                    </Form.Item>
+                    <MinusCircleOutlined
+                      className="dynamic-delete-button"
+                      onClick={() => remove(name)}
+                    />
+                  </Space>
+                </Form.Item>
+              ))}
+              <Form.Item>
+                <a onClick={() => add({ schedule: '' })}>
+                  <PlusOutlined />
+                  {intl.get('新增定时规则')}
+                </a>
+              </Form.Item>
+              <Form.ErrorList errors={errors} />
+            </>
+          )}
+        </Form.List>
        <Form.Item name="labels" label={intl.get('标签')}>
          <EditableTagGroup />
        </Form.Item>
+        <Form.Item
+          name="task_before"
+          label={intl.get('执行前')}
+          tooltip={intl.get(
+            '运行任务前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js',
+          )}
+          rules={[
+            {
+              validator(rule, value) {
+                if (
+                  value &&
+                  (value.includes(' task ') || value.startsWith('task '))
+                ) {
+                  return Promise.reject(intl.get('不能包含 task 命令'));
+                }
+                return Promise.resolve();
+              },
+            },
+          ]}
+        >
+          <Input.TextArea
+            rows={4}
+            autoSize={{ minRows: 1, maxRows: 5 }}
+            placeholder={intl.get(
+              '请输入运行任务前要执行的命令，不能包含 task 命令',
+            )}
+          />
+        </Form.Item>
+        <Form.Item
+          name="task_after"
+          label={intl.get('执行后')}
+          tooltip={intl.get(
+            '运行任务后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js',
+          )}
+          rules={[
+            {
+              validator(rule, value) {
+                if (
+                  value &&
+                  (value.includes(' task ') || value.startsWith('task '))
+                ) {
+                  return Promise.reject(intl.get('不能包含 task 命令'));
+                }
+                return Promise.resolve();
+              },
+            },
+          ]}
+        >
+          <Input.TextArea
+            rows={4}
+            autoSize={{ minRows: 1, maxRows: 5 }}
+            placeholder={intl.get(
+              '请输入运行任务后要执行的命令，不能包含 task 命令',
+            )}
+          />
+        </Form.Item>
      </Form>
    </Modal>
  );
@@ -35,4 +35,6 @@ export interface ICrontab {
  last_running_time?: number;
  last_execution_time?: number;
  nextRunTime: Date;
+  sub_id: number;
+  extra_schedules?: Array<{ schedule: string; }>;
 }
@@ -107,20 +107,29 @@ const ViewCreateModal = ({
    }
    form.setFieldsValue(
      view || {
-        filters: [{ property: 'command', operation: 'Reg' }],
+        filters: [{ property: 'command' }],
      },
    );
  }, [view, visible]);

-  const operationElement = (
-    <Select style={{ width: 120 }}>
-      {OPERATIONS.map((x) => (
+  const OperationElement = ({ name, ...others }: { name: number }) => {
+    const property = form.getFieldValue(['filters', name, 'property']);
+    return (
+      <Select
+        style={{ width: 120 }}
+        placeholder={intl.get('请选择操作符')}
+        {...others}
+      >
+        {OPERATIONS.filter((x) =>
+          STATUS_MAP[property as 'status' | 'sub_id'] ? x.type === 'select' : x,
+        ).map((x) => (
          <Select.Option key={x.name} value={x.value}>
            {x.name}
          </Select.Option>
        ))}
      </Select>
    );
+  };

  const propertyElement = (props: any, style: React.CSSProperties = {}) => {
    return (
@@ -190,7 +199,7 @@ const ViewCreateModal = ({
          <Input placeholder={intl.get('请输入视图名称')} />
        </Form.Item>
        <Form.List name="filters">
-          {(fields, { add, remove }) => (
+          {(fields, { add, remove }, { errors }) => (
            <div
              style={{ position: 'relative' }}
              className={`view-filters-container ${
@@ -256,9 +265,11 @@ const ViewCreateModal = ({
                      <Form.Item
                        {...restField}
                        name={[name, 'operation']}
-                        rules={[{ required: true }]}
+                        rules={[
+                          { required: true, message: intl.get('请选择操作符') },
+                        ]}
                      >
-                        {operationElement}
+                        <OperationElement name={name} />
                      </Form.Item>
                      <Form.Item
                        {...restField}
@@ -290,12 +301,13 @@ const ViewCreateModal = ({
                    {intl.get('新增筛选条件')}
                  </a>
                </Form.Item>
+                <Form.ErrorList errors={errors} />
              </div>
            </div>
          )}
        </Form.List>
        <Form.List name="sorts">
-          {(fields, { add, remove }) => (
+          {(fields, { add, remove }, { errors }) => (
            <div
              style={{ position: 'relative' }}
              className={`view-filters-container ${
@@ -365,6 +377,7 @@ const ViewCreateModal = ({
                    {intl.get('新增排序方式')}
                  </a>
                </Form.Item>
+                <Form.ErrorList errors={errors} />
              </div>
            </div>
          )}
@@ -22,6 +22,7 @@ import {
  FileTextOutlined,
  CloseCircleOutlined,
  ClockCircleOutlined,
+  MinusCircleOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -35,20 +36,13 @@ import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 import dayjs from 'dayjs';
+import WebSocketManager from '@/utils/websocket';
+import { DependenceStatus, Status } from './type';
+import IconFont from '@/components/iconfont';

 const { Text } = Typography;
 const { Search } = Input;

-enum Status {
-  '安装中',
-  '已安装',
-  '安装失败',
-  '删除中',
-  '已删除',
-  '删除失败',
-  '队列中',
-}
-
 enum StatusColor {
  'processing',
  'success',
@@ -84,15 +78,18 @@ const StatusMap: Record<number, { icon: React.ReactNode; color: string }> = {
    icon: <ClockCircleOutlined />,
    color: 'default',
  },
+  7: {
+    icon: <MinusCircleOutlined />,
+    color: 'default',
+  },
 };

 const Dependence = () => {
-  const { headerStyle, isPhone, socketMessage } =
-    useOutletContext<SharedContext>();
+  const { headerStyle, isPhone } = useOutletContext<SharedContext>();
  const columns: any = [
    {
      title: intl.get('序号'),
-      width: 80,
+      width: 90,
      render: (text: string, record: any, index: number) => {
        return <span style={{ cursor: 'text' }}>{index + 1} </span>;
      },
@@ -100,7 +97,7 @@ const Dependence = () => {
    {
      title: intl.get('名称'),
      dataIndex: 'name',
-      width: 120,
+      width: 180,
      key: 'name',
    },
    {
@@ -108,12 +105,46 @@ const Dependence = () => {
      key: 'status',
      width: 120,
      dataIndex: 'status',
+      filters: [
+        {
+          text: intl.get('队列中'),
+          value: DependenceStatus.queued,
+        },
+        {
+          text: intl.get('安装中'),
+          value: DependenceStatus.installing,
+        },
+        {
+          text: intl.get('已安装'),
+          value: DependenceStatus.installed,
+        },
+        {
+          text: intl.get('安装失败'),
+          value: DependenceStatus.installFailed,
+        },
+        {
+          text: intl.get('删除中'),
+          value: DependenceStatus.removing,
+        },
+        {
+          text: intl.get('已删除'),
+          value: DependenceStatus.removed,
+        },
+        {
+          text: intl.get('删除失败'),
+          value: DependenceStatus.removeFailed,
+        },
+        {
+          text: intl.get('已取消'),
+          value: DependenceStatus.cancelled,
+        },
+      ],
      render: (text: string, record: any, index: number) => {
        return (
          <Space size="middle" style={{ cursor: 'text' }}>
            <Tag
-              color={StatusMap[record.status].color}
-              icon={StatusMap[record.status].icon}
+              color={StatusMap[record.status]?.color}
+              icon={StatusMap[record.status]?.icon}
              style={{ marginRight: 0 }}
            >
              {intl.get(Status[record.status])}
@@ -125,7 +156,7 @@ const Dependence = () => {
    {
      title: intl.get('备注'),
      dataIndex: 'remark',
-      width: 120,
+      width: 100,
      key: 'remark',
    },
    {
@@ -149,11 +180,12 @@ const Dependence = () => {
    {
      title: intl.get('操作'),
      key: 'action',
-      width: 150,
+      width: 140,
      render: (text: string, record: any, index: number) => {
        const isPc = !isPhone;
        return (
          <Space size="middle">
+            {![Status.队列中, Status.已取消].includes(record.status) && (
              <Tooltip title={isPc ? intl.get('日志') : ''}>
                <a
                  onClick={() => {
@@ -163,19 +195,29 @@ const Dependence = () => {
                  <FileTextOutlined />
                </a>
              </Tooltip>
-            {record.status !== Status.安装中 &&
-              record.status !== Status.删除中 && (
+            )}
+            {[Status.队列中, Status.安装中, Status.删除中].includes(
+              record.status,
+            ) ? (
+              <Tooltip title={isPc ? intl.get('取消安装') : ''}>
+                <a onClick={() => cancelDependence(record)}>
+                  <IconFont type="ql-icon-quxiaoanzhuang" />
+                </a>
+              </Tooltip>
+            ) : (
              <>
                <Tooltip title={isPc ? intl.get('重新安装') : ''}>
                  <a onClick={() => reInstallDependence(record, index)}>
                    <BugOutlined />
                  </a>
                </Tooltip>
+                {Status.已安装 === record.status && (
                  <Tooltip title={isPc ? intl.get('删除') : ''}>
                    <a onClick={() => deleteDependence(record, index)}>
                      <DeleteOutlined />
                    </a>
                  </Tooltip>
+                )}
                <Tooltip title={isPc ? intl.get('强制删除') : ''}>
                  <a onClick={() => deleteDependence(record, index, true)}>
                    <DeleteFilled />
@@ -200,11 +242,15 @@ const Dependence = () => {
  const tableRef = useRef<HTMLDivElement>(null);
  const tableScrollHeight = useTableScrollHeight(tableRef, 59);

-  const getDependencies = () => {
+  const getDependencies = (status?: number[]) => {
    setLoading(true);
    request
      .get(
-        `${config.apiPrefix}dependencies?searchValue=${searchText}&type=${type}`,
+        `${
+          config.apiPrefix
+        }dependencies?searchValue=${searchText}&type=${type}&status=${
+          status || ''
+        }`,
      )
      .then(({ code, data }) => {
        if (code === 200) {
@@ -289,6 +335,31 @@ const Dependence = () => {
    });
  };

+  const cancelDependence = (record: any) => {
+    Modal.confirm({
+      title: intl.get('确认取消安装'),
+      content: (
+        <>
+          {intl.get('确认取消安装')}{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          {intl.get('吗')}
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}dependencies/cancel`, [record.id])
+          .then(() => {
+            getDependencies();
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
  const handleCancel = (dependence?: any[]) => {
    setIsModalVisible(false);
    dependence && handleDependence(dependence);
@@ -395,63 +466,62 @@ const Dependence = () => {
    }
  }, [logDependence]);

-  useEffect(() => {
-    if (!socketMessage) return;
-    const { type, message, references } = socketMessage;
-    if (
-      type === 'installDependence' &&
-      message.includes('开始时间') &&
-      references.length > 0
-    ) {
-      const result = [...value];
-      for (let i = 0; i < references.length; i++) {
-        const index = value.findIndex((x) => x.id === references[i]);
-        if (index !== -1) {
-          result.splice(index, 1, {
-            ...value[index],
-            status: message.includes('安装') ? Status.安装中 : Status.删除中,
-          });
+  const handleMessage = useCallback((payload: any) => {
+    const { message, references } = payload;
+    let status: number | undefined = undefined;
+    if (message.includes('开始时间') && references.length > 0) {
+      status = message.includes('安装') ? Status.安装中 : Status.删除中;
    }
-      }
-      setValue(result);
-    }
-    if (
-      type === 'installDependence' &&
-      message.includes('结束时间') &&
-      references.length > 0
-    ) {
-      let status;
+    if (message.includes('结束时间') && references.length > 0) {
      if (message.includes('安装')) {
        status = message.includes('成功') ? Status.已安装 : Status.安装失败;
      } else {
        status = message.includes('成功') ? Status.已删除 : Status.删除失败;
      }
-      const result = [...value];
-      for (let i = 0; i < references.length; i++) {
-        const index = value.findIndex((x) => x.id === references[i]);
-        if (index !== -1) {
-          result.splice(index, 1, {
-            ...value[index],
-            status,
-          });
-        }
-      }
-      setValue(result);

      if (status === Status.已删除) {
        setTimeout(() => {
-          const _result = [...value];
+          setValue((p) => {
+            const _result = [...p];
            for (let i = 0; i < references.length; i++) {
-            const index = value.findIndex((x) => x.id === references[i]);
+              const index = p.findIndex((x) => x.id === references[i]);
              if (index !== -1) {
                _result.splice(index, 1);
              }
            }
-          setValue(_result);
-        }, 5000);
+            return _result;
+          });
+        }, 300);
+        return;
      }
    }
-  }, [socketMessage]);
+    if (typeof status === 'number') {
+      setValue((p) => {
+        const result = [...p];
+        for (let i = 0; i < references.length; i++) {
+          const index = p.findIndex((x) => x.id === references[i]);
+          if (index !== -1) {
+            result.splice(index, 1, {
+              ...p[index],
+              status,
+            });
+          }
+        }
+        return result;
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    const ws = WebSocketManager.getInstance();
+    ws.subscribe('installDependence', handleMessage);
+    ws.subscribe('uninstallDependence', handleMessage);
+
+    return () => {
+      ws.unsubscribe('installDependence', handleMessage);
+      ws.unsubscribe('uninstallDependence', handleMessage);
+    };
+  }, []);

  const onTabChange = (activeKey: string) => {
    setSelectedRowIds([]);
@@ -539,6 +609,9 @@ const Dependence = () => {
            size="middle"
            scroll={{ x: 768, y: tableScrollHeight }}
            loading={loading}
+            onChange={(pagination, filters) => {
+              getDependencies(filters?.status as number[]);
+            }}
          />
        </DndProvider>
      </div>
@@ -548,6 +621,7 @@ const Dependence = () => {
        dependence={editedDependence}
        defaultType={type}
      />
+      {logDependence && (
        <DependenceLogModal
          visible={isLogModalVisible}
          handleCancel={(needRemove?: boolean) => {
@@ -563,9 +637,9 @@ const Dependence = () => {
              getDependenceDetail(logDependence);
            }
          }}
-        socketMessage={socketMessage}
          dependence={logDependence}
        />
+      )}
    </PageContainer>
  );
 };
@@ -9,17 +9,17 @@ import {
 } from '@ant-design/icons';
 import { PageLoading } from '@ant-design/pro-layout';
 import Ansi from 'ansi-to-react';
+import WebSocketManager from '@/utils/websocket';
+import { Status } from './type';

 const DependenceLogModal = ({
  dependence,
  handleCancel,
  visible,
-  socketMessage,
 }: {
  dependence?: any;
  visible: boolean;
  handleCancel: (needRemove?: boolean) => void;
-  socketMessage: any;
 }) => {
  const [value, setValue] = useState<string>('');
  const [executing, setExecuting] = useState<any>(true);
@@ -54,7 +54,7 @@ const DependenceLogModal = ({
          code === 200 &&
          localStorage.getItem('logDependence') === String(dependence.id)
        ) {
-          const log = (data.log || []).join('') as string;
+          const log = (data?.log || []).join('') as string;
          setValue(log);
          setExecuting(!log.includes('结束时间'));
          setIsRemoveFailed(log.includes('删除失败'));
@@ -95,21 +95,31 @@ const DependenceLogModal = ({
    }
  }, [dependence]);

-  useEffect(() => {
-    if (!socketMessage || !dependence) return;
-    const { type, message, references } = socketMessage;
+  const handleMessage = (payload: any) => {
+    const { message, references } = payload;
    if (
-      type === 'installDependence' &&
      references.length > 0 &&
-      references.includes(dependence.id)
+      references.includes(dependence.id) &&
+      [Status.删除中, Status.安装中].includes(dependence.status)
    ) {
      if (message.includes('结束时间')) {
        setExecuting(false);
        setIsRemoveFailed(message.includes('删除失败'));
      }
-      setValue(`${value}${message}`);
+      setValue((p) => `${p}${message}`);
    }
-  }, [socketMessage]);
+  };
+
+  useEffect(() => {
+    const ws = WebSocketManager.getInstance();
+    ws.subscribe('installDependence', handleMessage);
+    ws.subscribe('uninstallDependence', handleMessage);
+
+    return () => {
+      ws.unsubscribe('installDependence', handleMessage);
+      ws.unsubscribe('uninstallDependence', handleMessage);
+    };
+  }, [dependence]);

  useEffect(() => {
    setIsPhone(document.body.clientWidth < 768);
@@ -0,0 +1,21 @@
+export enum DependenceStatus {
+  'installing',
+  'installed',
+  'installFailed',
+  'removing',
+  'removed',
+  'removeFailed',
+  'queued',
+  'cancelled',
+}
+
+export enum Status {
+  '安装中',
+  '已安装',
+  '安装失败',
+  '删除中',
+  '已删除',
+  '删除失败',
+  '队列中',
+  '已取消',
+}
@@ -9,22 +9,24 @@ import { DiffEditor } from '@monaco-editor/react';
 import ReactDiffViewer from 'react-diff-viewer';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
+import { getEditorMode } from '@/utils';

 const { Option } = Select;

 const Diff = () => {
  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
-  const [origin, setOrigin] = useState('config.sample.sh');
+  const [origin, setOrigin] = useState('sample/config.sample.sh');
  const [current, setCurrent] = useState('config.sh');
  const [originValue, setOriginValue] = useState('');
  const [currentValue, setCurrentValue] = useState('');
  const [loading, setLoading] = useState(true);
  const [files, setFiles] = useState<any[]>([]);
  const editorRef = useRef<any>(null);
+  const [language, setLanguage] = useState<string>('shell');

  const getConfig = () => {
    request
-      .get(`${config.apiPrefix}configs/${current}`)
+      .get(`${config.apiPrefix}configs/detail?path=${encodeURIComponent(current)}`)
      .then(({ code, data }) => {
        if (code === 200) {
          setCurrentValue(data);
@@ -34,7 +36,7 @@ const Diff = () => {

  const getSample = () => {
    request
-      .get(`${config.apiPrefix}configs/${origin}`)
+      .get(`${config.apiPrefix}configs/detail?path=${encodeURIComponent(origin)}`)
      .then(({ code, data }) => {
        if (code === 200) {
          setOriginValue(data);
@@ -62,7 +64,7 @@ const Diff = () => {
  const getFiles = () => {
    setLoading(true);
    request
-      .get(`${config.apiPrefix}configs/files`)
+      .get(`${config.apiPrefix}configs/sample`)
      .then(({ code, data }) => {
        if (code === 200) {
          setFiles(data);
@@ -71,12 +73,11 @@ const Diff = () => {
      .finally(() => setLoading(false));
  };

-  const originFileChange = (value: string) => {
+  const originFileChange = (value: string, op) => {
+    setCurrent(op.extra.target);
    setOrigin(value);
-  };
-
-  const currentFileChange = (value: string) => {
-    setCurrent(value);
+    const newMode = getEditorMode(value);
+    setLanguage(newMode);
  };

  useEffect(() => {
@@ -112,7 +113,7 @@ const Diff = () => {
          <Form.Item label={intl.get('源文件')}>
            <Select value={origin} onChange={originFileChange}>
              {files.map((x) => (
-                <Option key={x.value} value={x.value}>
+                <Option key={x.value} value={x.value} extra={x}>
                  {x.title}
                </Option>
              ))}
@@ -121,13 +122,7 @@ const Diff = () => {
        </Col>
        <Col span={12}>
          <Form.Item label={intl.get('当前文件')}>
-            <Select value={current} onChange={currentFileChange}>
-              {files.map((x) => (
-                <Option key={x.value} value={x.value}>
-                  {x.title}
-                </Option>
-              ))}
-            </Select>
+            <span className="ant-form-text">{current}</span>
          </Form.Item>
        </Col>
      </Row>
@@ -159,7 +154,7 @@ const Diff = () => {
        />
      ) : (
        <DiffEditor
-          language={'shell'}
+          language={language}
          original={originValue}
          modified={currentValue}
          options={{
@@ -41,6 +41,7 @@ import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 import Copy from '../../components/copy';
 import { useVT } from 'virtualizedtableforantd4';
+import dayjs from 'dayjs';

 const { Paragraph } = Typography;
 const { Search } = Input;
@@ -82,6 +83,16 @@ const Env = () => {
      dataIndex: 'name',
      key: 'name',
      sorter: (a: any, b: any) => a.name.localeCompare(b.name),
+      render: (text: string, record: any) => {
+        return (
+          <div style={{ display: 'flex', alignItems: 'center' }}>
+            <Tooltip title={text} placement="topLeft">
+              <div className="text-ellipsis">{text}</div>
+            </Tooltip>
+            <Copy text={text} />
+          </div>
+        );
+      },
    },
    {
      title: intl.get('值'),
@@ -127,13 +138,9 @@ const Env = () => {
        },
      },
      render: (text: string, record: any) => {
-        const language = navigator.language || navigator.languages[0];
-        const time = record.updatedAt || record.timestamp;
-        const date = new Date(time)
-          .toLocaleString(language, {
-            hour12: false,
-          })
-          .replace(' 24:', ' 00:');
+        const date = dayjs(record.updatedAt || record.timestamp).format(
+          'YYYY-MM-DD HH:mm:ss',
+        );
        return (
          <Tooltip
            placement="topLeft"
@@ -71,7 +71,7 @@ const Error = () => {
                  /var/run/docker.sock:/var/run/docker.sock
                  containrrr/watchtower -cR &lt;容器名&gt;
                </div>
-                <div>{intl.get('2. 容器内执行 ql -l check、ql -l update')}</div>
+                <div>{intl.get('2. 容器内执行 ql check、ql update')}</div>
                <div>
                  {intl.get(
                    '3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果'
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
whyour	ac6de4911a	更新版本 v2.17.3	2024-03-29 22:45:02 +08:00
whyour	1628e05ece	复制仓库任务时，保留任务原始目录层级	2024-03-28 23:42:05 +08:00
whyour	7b7e03b503	修改 git clone 参数	2024-03-28 23:00:49 +08:00
whyour	8d14c9dae1	修复配置文件默认参数	2024-03-25 23:41:39 +08:00
whyour	4d6d0a55e7	修改基础镜像 node 版本	2024-03-25 22:42:28 +08:00
whyour	8ab2dc3280	修复重启命令	2024-03-22 23:01:20 +08:00
whyour	3f54048127	修改压缩解压文件命令	2024-03-22 22:23:49 +08:00
whyour	47c2c61f33	增加自定义通知 header 和 body 环境变量填写提示	2024-03-16 14:50:38 +08:00
whyour	47d2fc24bc	修改系统 reload 分支	2024-03-16 13:25:42 +08:00
whyour	7a8a8ab9b3	修改系统重启逻辑	2024-03-14 17:37:52 +08:00
whyour	2ac4581d54	修改自定义通知 body 解析逻辑	2024-03-12 22:22:10 +08:00
whyour	68ad01e0e8	增加 update 服务	2024-03-10 22:07:06 +08:00
秋澪AkimioandGitHub	cdeca4b808	notify.py 支持自定义参数 (#2285 ) * Bark自定义参数 * 钉钉机器人自定义参数 * 飞书机器人自定义参数 * go_cqhttp自定义参数 * gotify自定义参数 * iGot自定义参数 * serverJ自定义参数 * PushDeer自定义参数 * Chat自定义参数 * push+自定义参数 * qmsg自定义参数 * 企业微信自定义参数 * 企业微信机器人自定义参数 * telegram自定义参数 * 智能微秘书自定义参数 * SMTP 邮件自定义设置 * PUSHME自定义参数 * CHRONOCAT自定义参数 * 智能微秘书条件判断错误修正	2024-03-05 22:13:38 +08:00
whyour	55945e4cd1	更新版本 v2.17.2	2024-03-02 16:24:30 +08:00
whyour	b39036f8f8	取消生成 core 文件	2024-03-02 16:22:18 +08:00
pharaoh2012andGitHub	f07093d29f	企业微信有长度限制，超长的进行分段提交 (#2255 )	2024-03-02 16:15:58 +08:00
whyour	11c789c71c	修复 webhook 通知 body 拆分逻辑	2024-02-25 15:27:48 +08:00
whyour	81898f9dd7	修复依赖安装失败状态变更	2024-02-14 22:28:32 +08:00
whyour	6dba8ae72d	依赖增加已取消状态	2024-02-14 21:54:53 +08:00
whyour	c47896e787	修改依赖操作状态判断	2024-02-14 16:41:14 +08:00
whyour	14cb1f7788	依赖管理支持取消安装和状态筛选	2024-02-13 22:42:22 +08:00
whyour	892d91edc4	更新版本 v2.17.1	2024-02-13 15:19:52 +08:00
whyour	74916670eb	修复设置 nodejs 镜像源	2024-02-13 15:19:44 +08:00
whyour	b31eab02d7	修复重启系统	2024-02-11 22:04:41 +08:00
whyour	9c258ab113	修复初始化更新镜像源配置	2024-02-11 21:46:27 +08:00
whyour	3bcba11b33	修改 workflow 编译	2024-02-08 22:10:11 +08:00
whyour	15140fd87d	静态资源编译增加 git gc	2024-02-08 21:28:46 +08:00
whyour	e83058c3bc	兼容脚本、日志、配置文件详情接口	2024-02-08 20:47:03 +08:00
whyour	29f0c2c9ac	修复对比工具保存文件	2024-02-07 20:08:10 +08:00
whyour	f25fe27473	脚本管理重命名增加默认值，增加新建、删除快捷键	2024-02-06 22:17:07 +08:00
whyour	0ae1f284ec	修改脚本详情和日志详情接口	2024-01-29 21:47:03 +08:00
whyour	49c441117a	修改 sqlite 版本	2024-01-28 20:22:55 +08:00
whyour	7bc5ff01a6	更新 readme	2024-01-25 23:54:03 +08:00
whyour	8128fb8a9f	修改依赖设置提示	2024-01-25 22:42:33 +08:00
秋澪andGitHub	315ae49360	添加发布端口和数据卷 (#2231 )	2024-01-25 20:48:03 +08:00
Cp0204andGitHub	35c6475534	修复未开启一言时多余空行, 通知渠道改发送前检查 (#2222 )	2024-01-25 13:14:26 +08:00
whyour	7f3e60423b	修复启动时依赖配置未初始化	2024-01-24 22:55:21 +08:00
whyour	0a723318a1	修复 workflow 缓存	2024-01-22 23:50:47 +08:00
whyour	2c1e7535b8	修复 debian 系统内更新源代码分支错误	2024-01-22 23:38:58 +08:00
whyour	48d1fba699	系统设置增加重启	2024-01-22 23:36:11 +08:00
whyour	06f861baaf	更新版本 v2.17.0	2024-01-22 22:51:33 +08:00
whyour	bbbd353567	增加 python3.10 镜像	2024-01-22 22:51:22 +08:00
whyour	8283f62db2	修改获取配置文件接口，初始化系统配置	2024-01-18 13:51:06 +08:00
whyour	1a94a660a5	修改对比工具数据源，修复编辑器语言	2024-01-14 16:28:11 +08:00
whyour	5c393fef36	更新 readme	2024-01-13 21:34:13 +08:00
whyour	53346a3962	修复 notify.js smtp 通知	2024-01-13 20:52:04 +08:00
whyour	4e66a3aff5	修改 monaco-editor 静态资源地址	2024-01-10 22:12:41 +08:00
whyour	b79d10b452	修改获取登录 ip 和 ip 地址方式	2024-01-08 19:05:12 +08:00
whyour	3dc3ece993	修改日志脚本文件大小展示	2024-01-07 16:54:05 +08:00
whyour	792cf9ad20	修复依赖设置样式	2024-01-02 22:07:12 +08:00
whyour	201f41e15b	修改镜像源设置样式	2024-01-01 22:33:20 +08:00
whyour	71e7ba9cb6	修改 nginx api 代理超时时间	2024-01-01 17:14:57 +08:00
whyour	a7562259d1	更新 sqlite3 版本	2024-01-01 15:07:56 +08:00
whyour	18671264bf	移除 config.sh 中 PipMirror 和 NpmMirror配置	2023-12-25 22:05:33 +08:00
whyour	37bcb77be0	修复健康检查命令	2023-12-24 15:48:34 +08:00
whyour	563457cf1b	JavaScript 通知文件 tunnel 替换为 hpagent，移除 scripts 目录下 package.json	2023-12-24 14:30:56 +08:00
whyour	d2cf482d11	修复保存文件	2023-12-23 23:56:11 +08:00
whyour	2713942a68	脚本管理忽略符号文件	2023-12-23 00:28:31 +08:00
whyour	62168979e3	修复更新用户信息	2023-12-22 22:13:09 +08:00
whyour	f8aba4b1fb	日志和脚本增加文件大小展示，修改脚本管理列表排序	2023-12-21 09:57:06 +08:00
whyour	52a89a21f6	降级 Alpine 为 3.18	2023-12-18 23:39:16 +08:00
whyour	ca8790bbec	修复任务详情脚本行数展示	2023-12-17 17:53:15 +08:00
whyour	be1d68c0d1	修改 schedule 服务代理环境变量	2023-12-10 21:53:23 +08:00
whyour	95afcbc9dd	更新 workflow	2023-12-09 21:29:04 +08:00
whyour	20249119a0	修复 sentry 配置	2023-12-09 12:02:58 +08:00
whyour	6e0ee6f627	移除 console	2023-12-05 23:23:13 +08:00
whyour	13e7dac333	修复自定义通知 body 中 key 被自动转为小写	2023-12-04 17:44:13 +08:00
whyour	b89dc6dfc6	修改镜像源按钮增加 loading	2023-12-01 09:28:11 +08:00
whyour	897b710527	通知 TG_API_HOST 参数移除默认 https 协议，参数包含协议	2023-12-01 09:21:27 +08:00
whyour	5afec03548	修改获取切换 node 和 linux 源日志	2023-11-30 23:39:14 +08:00
whyour	c6a25e5359	修改代理地址提示	2023-11-25 23:03:16 +08:00
whyour	3777a4e7b4	系统设置增加依赖代理和镜像设置	2023-11-25 21:49:33 +08:00
luckrnx09andGitHub	9b7d4cb8fe	Enhance the script editor experience (#2186 )	2023-11-25 14:24:08 +08:00
whyour	59f7b72bb1	移除 ql -l 参数	2023-11-23 19:40:52 +08:00
whyour	4d97f0f44d	重新安装依赖时不检查是否已安装	2023-11-22 22:54:36 +08:00
whyour	de9e9ce627	webhook 通知 body 增加 text/plain 类型，修复多定时任务服务重启未初始化	2023-11-22 22:43:48 +08:00
whyour	f056b611a4	修复删除依赖逻辑	2023-11-11 11:23:04 +08:00
whyour	659484511f	修复 js 通知文件	2023-11-10 22:57:17 +08:00
whyour	9ed107980c	系统设置增加依赖代理和镜像源设置	2023-11-06 23:55:16 +08:00
whyour	4a3ac7dc4b	移除随机延迟相关配置及 ProxyUrl 默认值，修复拉库通知可能失败	2023-11-05 01:02:31 +08:00
whyour	c3a0f58003	更新 python 版本为 3.11	2023-11-04 21:21:21 +08:00
whyour	23781d8b34	修复获取日志列表	2023-11-03 21:31:48 +08:00
6dylan6andwhyour	c1d6a0a40b	修复调用就结束执行的问题	2023-11-03 18:07:07 +08:00
Bad ChildandGitHub	82c9978514	修复 chronocat 通知成功判断 (#2166 )	2023-11-03 17:57:10 +08:00
TungliesandGitHub	9f6d4943ea	修复: 邮件服务支持列表链接失效(#2167 )	2023-11-03 17:55:59 +08:00
whyour	c4a44a48c5	使用 npm 安装 pm2 tsx	2023-11-02 19:37:24 +08:00
whyour	d2fef75e01	修改 trust proxy	2023-11-02 00:47:33 +08:00
whyour	085cb789b5	修复初始化设置通知，shell 映射，邮箱通知错误提示	2023-11-02 00:41:04 +08:00
whyour	20f615eadf	fs 文件操作替换为 fs.promise	2023-11-01 16:44:34 +08:00
whyour	66a2769e7c	更新版本 v2.16.5	2023-10-30 15:04:16 +08:00
whyour	899a30eacd	修改重置环境变量逻辑	2023-10-30 15:04:14 +08:00
whyour	8760ac2964	修复定时任务详情日志列表样式	2023-10-26 23:03:58 +08:00
whyour	62a29867a3	更新 readme	2023-10-21 16:57:11 +08:00
whyour	4938635ef4	修复服务启动时环境变量污染	2023-10-20 17:54:32 +08:00
whyour	046239404f	更新版本 v2.16.4	2023-10-19 21:37:00 +08:00
whyour	b90243f55c	修改 task 日志展示逻辑	2023-10-19 21:36:39 +08:00
whyour	43c0cd8132	修复 mac 任务无法正常退出	2023-10-16 23:44:39 +08:00
whyour	533e12a796	脚本推送增加自定义 webhook 方式	2023-10-15 20:42:05 +08:00
whyour	bd004a0489	修复设置代理时，schedule 服务通信异常	2023-10-14 23:05:25 +08:00
whyour	41befcc0a8	更新 readme	2023-10-14 21:50:12 +08:00
whyour	9fb9b3d121	task 命令支持给脚本传参，使用 -- 分割，后面的参数都会传给脚本例如 task x.js -n whyour，脚本就能接收到参数 -n whyour	2023-10-14 21:47:46 +08:00
LinCheng Wu GitHub child	5055045d22	增加chronocat无头模式的QQNT推送用于无法使go-cqhttp的接替 (#2141 ) * 增加chronocat无头模式的QQNT推送 * Chronocat发送时没有配置群号或个人消息号发送出错 * 增加系统通知、去除注释 * 增加系统通知 --------- Co-authored-by: child <wulincheng@javalc.com>	2023-10-14 20:56:32 +08:00
whyour	9f7beb934d	系统日志增加置顶置底按钮	2023-10-13 23:44:28 +08:00
whyour	26b06c17c5	修复清空文件夹报错	2023-10-13 15:35:50 +08:00
whyour	b8a9b26ca3	修复定时任务任务前后命令校验	2023-10-12 00:55:22 +08:00
whyour	b6376ed2e8	修复定时任务 task_after 命令无法停止	2023-10-12 00:45:49 +08:00
whyour	99f6073c8e	定时任务增加前后规则校验，不能包含 task 命令	2023-10-10 23:06:01 +08:00
whyour	5e73f0390f	修复定时任务详情页查看历史日志异常	2023-10-09 23:56:35 +08:00
whyour	c35cfba8b0	修改任务队列重新设置并发	2023-10-08 22:18:54 +08:00
whyour	aac109621a	修改任务队列日志打印	2023-10-08 22:11:46 +08:00
whyour	a340964c82	修改获取登录 ip 判断	2023-10-08 00:10:46 +08:00
whyour	00818b694a	使用 spawn exit 方法监听进程退出	2023-10-07 22:51:44 +08:00
whyour	ec5b885476	修改任务队列执行日志	2023-10-06 02:34:40 +08:00
whyour	9d55cb108c	定时任务详情增加额外定时展示	2023-09-29 23:16:07 +08:00
whyour	4c19054b30	修复 api 前缀	2023-09-29 16:26:03 +08:00
whyour	2a41f64d1b	修复 QlBaseUrl 末尾不加斜杠无法访问	2023-09-29 16:07:41 +08:00
whyour	d3023d31e3	修复定时任务日志滚动	2023-09-27 23:04:16 +08:00
whyour	eddc03e295	修复定时任务间隔较小，任务状态不准确	2023-09-26 22:51:33 +08:00
whyour	77a8e00b17	更新版本 v2.16.3	2023-09-24 13:39:53 +08:00
whyour	99281a061e	修复更新历史定时任务规则未生效	2023-09-24 13:39:52 +08:00
whyour	22eedebf14	修复任务管理创建视图	2023-09-24 00:47:56 +08:00
whyour	d7e0531935	修复系统设置展示版本失败	2023-09-23 11:14:24 +08:00
whyour	16734326cf	修复 ws 变量错误	2023-09-22 20:44:47 +08:00
whyour	956cfe18be	环境变量名称增加复制功能	2023-09-22 00:47:36 +08:00
whyour	a864a56917	修复调试脚本日志丢失	2023-09-22 00:46:16 +08:00
whyour	ab3fc9b5f1	定时任务增加运行任务前和运行任务后参数	2023-09-19 22:44:32 +08:00
whyour	8d899f1a53	更新 workflow	2023-09-19 00:30:45 +08:00
whyour	a1eef2c644	修复使用 ubuntu-latest linux/s390x 无法使用 npm	2023-09-18 13:09:14 +08:00
zui-langandGitHub	aab096843c	消息通知 Bark 增加额外参数：时效性通知、跳转Url (#2112 )	2023-09-17 01:01:34 +08:00
whyour	acc7443004	定时任务支持多个定时规则	2023-09-16 00:15:50 +08:00
whyour	042d7d3b8e	修复任务管理创建视图 placeholder，更新 npm 包	2023-09-15 21:27:53 +08:00
whyour	0511a4af0d	增加 QlPort 环境变量，支持设置服务启动的端口，修复定时任务视图操作符筛选	2023-09-15 17:57:28 +08:00
whyour	748a099087	修复日志滚动逻辑	2023-09-12 22:28:26 +08:00