更新版本 v2.16.4

修改 task 日志展示逻辑
修复 mac 任务无法正常退出
2026-08-11 19:05:20 +08:00 · 2023-10-19 21:37:00 +08:00 · 2023-10-19 21:36:39 +08:00 · 2023-10-16 23:44:39 +08:00 · 2023-10-15 20:42:05 +08:00 · 2023-10-14 23:05:25 +08:00
158 changed files with 15447 additions and 9425 deletions
@@ -6,10 +6,9 @@ on:
      - '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:
@@ -45,7 +44,7 @@ jobs:
      - uses: actions/checkout@v3
      - uses: pnpm/action-setup@v2
        with:
-          version: latest
+          version: '8.3.1'

      - uses: actions/setup-node@v3
        with:
@@ -85,21 +84,20 @@ jobs:
          git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}

  build:
-    if: github.ref != 'refs/heads/master'
-
    needs: build-static

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

    permissions:
      packages: write
      contents: read

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: pnpm/action-setup@v2
        with:
-          version: latest
+          version: '8.3.1'
      - uses: actions/setup-node@v3
        with:
          cache: 'pnpm'
@@ -110,13 +108,13 @@ jobs:
          timezone: 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 }}
@@ -124,31 +122,34 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ github.repository }}
            ghcr.io/${{ github.repository }}
          # generate Docker tags based on the following events/attributes
          #   nightly, master, pr-2, 1.2.3, 1.2, 1
+          flavor: |
+            latest=false
          tags: |
            type=schedule,pattern=nightly
            type=edge
-            type=ref,event=branch
            type=ref,event=pr
+            type=ref,event=branch,enable=${{ github.ref != format('refs/heads/{0}', 'master') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
            type=semver,pattern={{version}}
            type=semver,pattern={{major}}.{{minor}}
            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 }}
@@ -29,3 +29,4 @@
 /manual_log
 /scripts
 /bak
+/.tmp
@@ -6,3 +6,27 @@ package.json
 .umi
 .umi-production
 .umi-test
+.history
+.tmp
+node_modules
+npm-debug.log*
+yarn-error.log
+yarn.lock
+package-lock.json
+static
+data
+DS_Store
+src/.umi
+src/.umi-production
+src/.umi-test
+.env.local
+.env
+history
+version.ts
+config
+log
+db
+manual_log
+scripts
+bak
+.tmp
@@ -1,25 +1,31 @@
 import { defineConfig } from '@umijs/max';
 const CompressionPlugin = require('compression-webpack-plugin');

+const baseUrl = process.env.QlBaseUrl || '/';
 export default defineConfig({
  hash: true,
+  jsMinifier: 'terser',
  antd: {},
+  locale: {
+    antd: true,
+    title: true,
+    baseNavigator: true,
+  },
  outputPath: 'static/dist',
  fastRefresh: true,
-  favicons: ['./images/favicon.svg'],
-  mfsu: {
-    strategy: 'eager',
-  },
+  favicons: [`https://qn.whyour.cn/favicon.svg`],
  publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
  proxy: {
-    '/api/public': {
+    [`${baseUrl}api/public`]: {
      target: 'http://127.0.0.1:5400/',
      changeOrigin: true,
+      pathRewrite: { [`^${baseUrl}api/public`]: '/api' },
    },
-    '/api': {
+    [`${baseUrl}api`]: {
      target: 'http://127.0.0.1:5600/',
      changeOrigin: true,
      ws: true,
+      pathRewrite: { [`^${baseUrl}api`]: '/api' },
    },
  },
  chainWebpack: ((config: any) => {
@@ -37,6 +43,7 @@ export default defineConfig({
    'react-dom': 'window.ReactDOM',
  },
  headScripts: [
+    `./api/env.js`,
    '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',
  ],
@@ -1,30 +1,29 @@
-<p align="center">
-  <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
-  </a>
-</p>
-
-<h1 align="center">Green Dragon</h1>
-
 <div align="center">
+<img width="100" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">

-Timed task management panel with python3, javaScript, shell, typescript support
+<h1 align="center">Qinglong</h1>

-[![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
+[简体中文](./README.md) | English

+Timed task management platform supporting Python3, JavaScript, Shell, Typescript
+
+[![npm version][npm-version-image]][npm-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
+
+[npm-version-image]: https://img.shields.io/npm/v/@whyour/qinglong?style=flat
+[npm-version-url]: https://www.npmjs.com/package/@whyour/qinglong?activeTab=readme
 [docker-pulls-image]: https://img.shields.io/docker/pulls/whyour/qinglong?style=flat
 [docker-pulls-url]: https://hub.docker.com/r/whyour/qinglong
-[docker-version-image]: https://img.shields.io/docker/v/whyour/qinglong?style=flat
-[docker-version-url]: https://hub.docker.com/r/whyour/qinglong/tags?page=1&ordering=last_updated
 [docker-stars-image]: https://img.shields.io/docker/stars/whyour/qinglong?style=flat
 [docker-stars-url]: https://hub.docker.com/r/whyour/qinglong
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
+
+[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+
+[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>

-[![](https://user-images.githubusercontent.com/22700758/203243067-1a8a570d-b1b4-4837-9f12-d78d83e31f35.jpg)](https://whyour.cn)
-
-[简体中文](./README.md) | English
+![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)

 ## Features

@@ -36,100 +35,49 @@ Timed task management panel with python3, javaScript, shell, typescript support
 - Support dark mode
 - Support cell phone operation

-## Deployment
+## Version

-### Local Deployment
+### 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.

 ```bash
-# To be refined, see the development steps first (not supported on windows yet)
+docker pull whyour/qinglong:latest
+docker pull whyour/qinglong:debian
 ```

-### Podman Deployment
+### npm

-1. podman installation
+The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.

 ```bash
-https://podman.io/getting-started/installation
+npm i @whyour/qinglong
 ```

-2. start the container
+## Built-in commands
+
+1. task

 ```bash
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  -p 5700:5700 \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
+# 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>
+# 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
 ```

-### Docker Deployment
-
-1. docker installation
-
-```bash
-sudo curl -sSL get.docker.com | sh
-```
-
-2. configure domestic mirror sources
-
-```bash
-mkdir -p /etc/docker
-tee /etc/docker/daemon.json <<-'EOF'
-{
-  "registry-mirrors": [
-    "https://0b27f0a81a00f3560fbdc00ddd2f99e0.mirror.swr.myhuaweicloud.com",
-    "https://ypzju6vq.mirror.aliyuncs.com",
-    "https://registry.docker-cn.com",
-    "http://hub-mirror.c.163.com",
-    "https://docker.mirrors.ustc.edu.cn"
-  ]
-}
-EOF
-systemctl daemon-reload
-systemctl restart docker
-```
-
-3. start the container
-
-```bash
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  -p 5700:5700 \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### Docker-compose Deployment
-
-1. docker-compose installation
-
-```bash
-sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-```
-
-2. start the container
-
-```bash
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# start
-docker-compose up -d
-# stop
-docker-compose down
-```
-
-3. access
-
-Open your browser and visit http://{ip}:5700
-
-## Use
-
-1. built-in commands
+1. ql

 ```bash
 # Update and restart Green Dragon
@@ -150,36 +98,100 @@ ql check
 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
+1. 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
+- 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
+
+## Deployment
+
+### Docker (Recommended)
+
+```bash
+# 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 \
+  whyour/qinglong:latest
+```
+
+### Docker-compose (Recommended)
+
+```bash
+# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# start
+docker-compose up -d
+# stop
+docker-compose down
+```
+
+### Podman (Recommended)
+
+```bash
+# https://podman.io/getting-started/installation
+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
+```
+
+### Local
+
+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
+npm install -g @whyour/qinglong
+qinglong
+# Add the environment variables QL_DIR and QL_DATA_DIR when prompted
+export QL_DIR=""
+export QL_DATA_DIR=""
+# Run again
+qinglong
+```
+
+## Development
+
+```bash
+$ git clone git@github.com:whyour/qinglong.git
+$ cd qinglong
+$ cp .env.example .env
+# Recommended use pnpm https://pnpm.io/zh/installation
+$ npm install -g pnpm@8.3.1
+$ pnpm install
+$ pnpm start
+```
+
+Open your browser and visit <http://127.0.0.1:5700>

 ## Links

@@ -191,24 +203,6 @@ task -l <file_path>
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)

-## Development
-
-```bash
-$ git clone git@github.com:whyour/qinglong.git
-$ cd qinglong
-$ cp .env.example .env
-# Recommended use pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm
-$ pnpm install
-$ pnpm start
-```
-
-Open your browser and visit http://127.0.0.1:5700
-
-## Communication
-
-[telegram channel](https://t.me/jiao_long)
-
 ## Name Origin

 The Green Dragon, also known as the Canglong, is one of the four elephants and one of the [four spirits of the heavens](https://zh.wikipedia.org/wiki/%E5%A4%A9%E4%B9%8B%E5%9B%9B%E7%81%B5) in traditional Chinese culture. According to the Five Elements, it is a spirit animal representing the East as a green dragon, the five elements are wood, and the season represented is spring, with the eight trigrams dominating vibration. Like the Ying Long, the Cang Long has feathered wings. According to the Zhang Guo Xing Zong (Zhang Guo Xing Zong), "a true dragon is one that has complementary wings".
@@ -1,30 +1,31 @@
-<p align="center">
-  <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
-  </a>
-</p>
+<div align="center">
+<img width="100" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">

 <h1 align="center">青龙</h1>

-<div align="center">
+简体中文 | [English](./README-en.md)

-支持python3、javaScript、shell、typescript 的定时任务管理面板
+支持 Python3、JavaScript、Shell、Typescript 的定时任务管理平台

-[![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
+Timed task management platform supporting Python3, JavaScript, Shell, Typescript

+[![npm version][npm-version-image]][npm-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
+
+[npm-version-image]: https://img.shields.io/npm/v/@whyour/qinglong?style=flat
+[npm-version-url]: https://www.npmjs.com/package/@whyour/qinglong?activeTab=readme
 [docker-pulls-image]: https://img.shields.io/docker/pulls/whyour/qinglong?style=flat
 [docker-pulls-url]: https://hub.docker.com/r/whyour/qinglong
-[docker-version-image]: https://img.shields.io/docker/v/whyour/qinglong?style=flat
-[docker-version-url]: https://hub.docker.com/r/whyour/qinglong/tags?page=1&ordering=last_updated
 [docker-stars-image]: https://img.shields.io/docker/stars/whyour/qinglong?style=flat
 [docker-stars-url]: https://hub.docker.com/r/whyour/qinglong
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
+
+[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+
+[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>

-[![](https://user-images.githubusercontent.com/22700758/203243067-1a8a570d-b1b4-4837-9f12-d78d83e31f35.jpg)](https://whyour.cn)
-
-简体中文 | [English](./README-en.md)
+![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)

 ## 功能

@@ -36,101 +37,47 @@
 - 支持暗黑模式
 - 支持手机端操作

-## 部署
+## 版本

-### 本机部署
+### docker
+
+`latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像

 ```bash
-# 待完善，可先参考开发步骤 (windows暂时不支持)
+docker pull whyour/qinglong:latest
+docker pull whyour/qinglong:debian
 ```

-### podman 部署
+### npm

-1. podman 安装
+npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`

 ```bash
-https://podman.io/getting-started/installation
+npm i @whyour/qinglong
 ```

-2. 启动容器
+## 内置命令
+
+1. task

 ```bash
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  -p 5700:5700 \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
+# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
+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>
+# 使用 -- 分割，-- 后面的参数会传给脚本，下面的例子，脚本就可接收到参数 -u whyour -p password
+task <file_path> -- -u whyour -p password
 ```

-### docker 部署
-
-1. docker 安装
-
-```bash
-sudo curl -sSL get.docker.com | sh
-```
-
-2. 配置国内镜像源
-Configure domestic mirror sources
-
-```bash
-mkdir -p /etc/docker
-tee /etc/docker/daemon.json <<-'EOF'
-{
-  "registry-mirrors": [
-    "https://0b27f0a81a00f3560fbdc00ddd2f99e0.mirror.swr.myhuaweicloud.com",
-    "https://ypzju6vq.mirror.aliyuncs.com",
-    "https://registry.docker-cn.com",
-    "http://hub-mirror.c.163.com",
-    "https://docker.mirrors.ustc.edu.cn"
-  ]
-}
-EOF
-systemctl daemon-reload
-systemctl restart docker
-```
-
-3. 启动容器
-
-```bash
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  -p 5700:5700 \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### docker-compose 部署
-
-1. docker-compose 安装
-
-```bash
-sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-```
-
-2. 启动容器
-
-```bash
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# 启动
-docker-compose up -d
-# 停止
-docker-compose down
-```
-
-3. 访问
-
-打开你的浏览器，访问 http://{ip}:5700
-
-## 使用
-
-1. 内置命令
+1. ql

 ```bash
 # 更新并重启青龙
@@ -151,35 +98,101 @@ 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. 参数说明
+1. 参数说明

-* file_url: 脚本地址
-* repo_url: 仓库地址
-* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
-* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
-* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
-* extensions: 拉取仓库的文件后缀，多个竖线分割
-* branch: 拉取仓库的分支
-* days: 需要保留的日志的天数
-* file_path: 任务执行时的文件路径
-* env_name: 任务执行时需要并发或者指定时的环境变量名称
-* account_number: 任务执行时指定某个环境变量需要执行的账号序号
-* max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
+- file_url: 脚本地址
+- repo_url: 仓库地址
+- whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
+- blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
+- dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
+- extensions: 拉取仓库的文件后缀，多个竖线分割
+- branch: 拉取仓库的分支
+- days: 需要保留的日志的天数
+- file_path: 任务执行时的文件路径
+- env_name: 任务执行时需要并发或者指定时的环境变量名称
+- account_number: 任务执行时指定某个环境变量需要执行的账号序号
+- max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
+
+## 部署
+
+### docker (推荐)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### docker-compose (推荐)
+
+```bash
+#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# 启动
+docker-compose up -d
+# 停止
+docker-compose down
+```
+
+### podman (推荐)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### 本机
+
+建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3
+
+```bash
+npm install -g @whyour/qinglong
+qinglong
+# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
+export QL_DIR=""
+export QL_DATA_DIR=""
+# 再次执行
+qinglong
+```
+
+## 开发
+
+```bash
+$ git clone git@github.com:whyour/qinglong.git
+$ cd qinglong
+$ cp .env.example .env
+# 推荐使用 pnpm https://pnpm.io/zh/installation
+$ npm install -g pnpm@8.3.1
+$ pnpm install
+$ pnpm start
+```
+
+打开你的浏览器，访问 http://127.0.0.1:5700

 ## 链接

@@ -191,24 +204,6 @@ task -l <file_path>
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)

-## 开发
-
-```bash
-$ git clone git@github.com:whyour/qinglong.git
-$ cd qinglong
-$ cp .env.example .env
-# 推荐使用 pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm
-$ pnpm install
-$ pnpm start
-```
-
-打开你的浏览器，访问 http://127.0.0.1:5700
-
-## 交流
-
-[telegram频道](https://t.me/jiao_long)
-
 ## 名称来源

 青龙，又名苍龙，在中国传统文化中是四象之一、[天之四灵](https://zh.wikipedia.org/wiki/%E5%A4%A9%E4%B9%8B%E5%9B%9B%E7%81%B5)之一，根据五行学说，它是代表东方的灵兽，为青色的龙，五行属木，代表的季节是春季，八卦主震。苍龙与应龙一样，都是身具羽翼。《张果星宗》称“又有辅翼，方为真龙”。
@@ -5,6 +5,7 @@ import { Logger } from 'winston';
 import config from '../config';
 import * as fs from 'fs';
 import { celebrate, Joi } from 'celebrate';
+import { join } from 'path';
 const route = Router();

 export default (app: Router) => {
@@ -41,11 +42,11 @@ export default (app: Router) => {
        }
        if (req.params.file.includes('sample')) {
          content = getFileContentByName(
-            `${config.samplePath}${req.params.file}`,
+            join(config.samplePath, req.params.file),
          );
        } else {
          content = getFileContentByName(
-            `${config.configPath}${req.params.file}`,
+            join(config.configPath, req.params.file),
          );
        }
        res.send({ code: 200, data: content });
@@ -70,7 +71,7 @@ export default (app: Router) => {
        if (config.blackFileList.includes(name)) {
          res.send({ code: 403, message: '文件无法访问' });
        }
-        const path = `${config.configPath}${name}`;
+        const path = join(config.configPath, name);
        fs.writeFileSync(path, content);
        res.send({ code: 200, message: '保存成功' });
      } catch (e) {
@@ -152,6 +152,21 @@ export default (app: Router) => {
    }
  });

+  route.get(
+    '/detail',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronService = Container.get(CronService);
+        const data = await cronService.find(req.query as any);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
  route.post(
    '/',
    celebrate({
@@ -160,6 +175,10 @@ export default (app: Router) => {
        schedule: Joi.string().required(),
        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) => {
@@ -316,6 +335,10 @@ export default (app: Router) => {
        command: Joi.string().required(),
        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(),
      }),
    }),
@@ -435,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) {
@@ -6,6 +6,7 @@ import { celebrate, Joi } from 'celebrate';
 import multer from 'multer';
 import config from '../config';
 import fs from 'fs';
+import { safeJSONParse } from '../config/util';
 const route = Router();

 const storage = multer.diskStorage({
@@ -200,7 +201,7 @@ export default (app: Router) => {
      try {
        const envService = Container.get(EnvService);
        const fileContent = await fs.promises.readFile(req!.file!.path, 'utf8');
-        const parseContent = JSON.parse(fileContent);
+        const parseContent = safeJSONParse(fileContent);
        const data = Array.isArray(parseContent)
          ? parseContent
          : [parseContent];
@@ -53,7 +53,7 @@ export default (app: Router) => {
      body: Joi.object({
        filename: Joi.string().required(),
        path: Joi.string().allow(''),
-        type: Joi.string().optional()
+        type: Joi.string().optional(),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
@@ -65,7 +65,7 @@ export default (app: Router) => {
        };
        const filePath = join(config.logPath, path, filename);
        if (type === 'directory') {
-          emptyDir(filePath);          
+          await emptyDir(filePath);
        } else {
          fs.unlinkSync(filePath);
        }
@@ -75,5 +75,4 @@ export default (app: Router) => {
      }
    },
  );
-
 };
@@ -34,7 +34,7 @@ export default (app: Router) => {
    const logger: Logger = Container.get('logger');
    try {
      let result = [];
-      const blacklist = ['node_modules', '.git'];
+      const blacklist = ['node_modules', '.git', '.pnpm'];
      if (req.query.path) {
        const targetPath = path.join(
          config.scriptPath,
@@ -94,7 +94,7 @@ export default (app: Router) => {
          path += '/';
        }
        if (!path.startsWith('/')) {
-          path = `${config.scriptPath}${path}`;
+          path = join(config.scriptPath, path);
        }
        if (config.writePathList.every((x) => !path.startsWith(x))) {
          return res.send({
@@ -124,7 +124,7 @@ export default (app: Router) => {
        if (fs.existsSync(originFilePath)) {
          fs.copyFileSync(
            originFilePath,
-            `${config.bakPath}${originFilename.replace(/\//g, '')}`,
+            join(config.bakPath, originFilename.replace(/\//g, '')),
          );
          if (filename !== originFilename) {
            fs.unlinkSync(originFilePath);
@@ -183,7 +183,7 @@ export default (app: Router) => {
        };
        const filePath = join(config.scriptPath, path, filename);
        if (type === 'directory') {
-          emptyDir(filePath);
+          await emptyDir(filePath);
        } else {
          fs.unlinkSync(filePath);
        }
@@ -207,7 +207,7 @@ export default (app: Router) => {
        let { filename } = req.body as {
          filename: string;
        };
-        const filePath = `${config.scriptPath}${filename}`;
+        const filePath = join(config.scriptPath, filename);
        // const stats = fs.statSync(filePath);
        // res.set({
        //   'Content-Type': 'application/octet-stream', //告诉浏览器这是一个二进制文件
@@ -260,14 +260,17 @@ 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);
        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
+        const logPath = join(config.logPath, path, `${name}.swap`);

        const scriptService = Container.get(ScriptService);
        const result = await scriptService.stopScript(filePath, pid);
+        setTimeout(() => {
+          emptyDir(logPath);
+        }, 3000);
        res.send(result);
      } catch (e) {
        return next(e);
@@ -210,12 +210,16 @@ export default (app: Router) => {
    '/',
    celebrate({
      body: Joi.array().items(Joi.number().required()),
+      query: Joi.object({
+        force: Joi.boolean().optional(),
+        t: Joi.number()
+      })
    }),
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
      try {
        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.remove(req.body);
+        const data = await subscriptionService.remove(req.body, req.query);
        return res.send({ code: 200, data });
      } catch (e) {
        return next(e);
@@ -7,10 +7,25 @@ import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
 import { EnvModel } from '../data/env';
-import { parseVersion, promiseExec } from '../config/util';
+import {
+  getUniqPath,
+  handleLogPath,
+  parseVersion,
+  promiseExec,
+} from '../config/util';
 import dayjs from 'dayjs';
+import multer from 'multer';

 const route = Router();
+const storage = multer.diskStorage({
+  destination: function (req, file, cb) {
+    cb(null, config.tmpPath);
+  },
+  filename: function (req, file, cb) {
+    cb(null, 'data.tgz');
+  },
+});
+const upload = multer({ storage: storage });

 export default (app: Router) => {
  app.use('/system', route);
@@ -20,30 +35,14 @@ export default (app: Router) => {
    try {
      const userService = Container.get(UserService);
      const authInfo = await userService.getUserInfo();
-      const envCount = await EnvModel.count();
-      const { version, changeLog, changeLogLink } = await parseVersion(
-        config.versionFile,
-      );
-      const lastCommitTime = (
-        await promiseExec(
-          `cd ${config.rootPath} && git show -s --format=%ai | head -1`,
-        )
-      ).replace('\n', '');
-      const lastCommitId = (
-        await promiseExec(`cd ${config.rootPath} && git rev-parse --short HEAD`)
-      ).replace('\n', '');
-      const branch = (
-        await promiseExec(
-          `cd ${config.rootPath} && git symbolic-ref --short HEAD`,
-        )
-      ).replace('\n', '');
+      const { version, changeLog, changeLogLink, publishTime } =
+        await parseVersion(config.versionFile);

      let isInitialized = true;
      if (
        Object.keys(authInfo).length === 2 &&
        authInfo.username === 'admin' &&
-        authInfo.password === 'admin' &&
-        envCount === 0
+        authInfo.password === 'admin'
      ) {
        isInitialized = false;
      }
@@ -52,9 +51,8 @@ export default (app: Router) => {
        data: {
          isInitialized,
          version,
-          lastCommitTime: dayjs(lastCommitTime).unix(),
-          lastCommitId,
-          branch,
+          publishTime: dayjs(publishTime).unix(),
+          branch: process.env.QL_BRANCH || 'master',
          changeLog,
          changeLogLink,
        },
@@ -66,12 +64,12 @@ export default (app: Router) => {
  });

  route.get(
-    '/log/remove',
+    '/config',
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
      try {
        const systemService = Container.get(SystemService);
-        const data = await systemService.getLogRemoveFrequency();
+        const data = await systemService.getSystemConfig();
        res.send({ code: 200, data });
      } catch (e) {
        return next(e);
@@ -80,19 +78,18 @@ export default (app: Router) => {
  );

  route.put(
-    '/log/remove',
+    '/config',
    celebrate({
      body: Joi.object({
-        frequency: Joi.number().required(),
+        logRemoveFrequency: Joi.number().optional().allow(null),
+        cronConcurrency: Joi.number().optional().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.updateLogRemoveFrequency(
-          req.body.frequency,
-        );
+        const result = await systemService.updateSystemConfig(req.body);
        res.send(result);
      } catch (e) {
        return next(e);
@@ -128,6 +125,25 @@ export default (app: Router) => {
    },
  );

+  route.put(
+    '/reload',
+    celebrate({
+      body: Joi.object({
+        type: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem(req.body.type);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
  route.put(
    '/notify',
    celebrate({
@@ -147,4 +163,106 @@ export default (app: Router) => {
      }
    },
  );
+
+  route.put(
+    '/command-run',
+    celebrate({
+      body: Joi.object({
+        command: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        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);
+        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
+        const logPath = `${uniqPath}/${logTime}.log`;
+        res.setHeader('Content-type', 'application/octet-stream');
+        await systemService.run(
+          { ...req.body, logPath },
+          {
+            onStart: async (cp, startTime) => {
+              res.setHeader('QL-Task-Pid', `${cp.pid}`);
+            },
+            onEnd: async (cp, endTime, diff) => {
+              res.end();
+            },
+            onError: async (message: string) => {
+              res.write(`\n${message}`);
+              const absolutePath = await handleLogPath(logPath);
+              fs.appendFileSync(absolutePath, `\n${message}`);
+            },
+            onLog: async (message: string) => {
+              res.write(`\n${message}`);
+              const absolutePath = await handleLogPath(logPath);
+              fs.appendFileSync(absolutePath, `\n${message}`);
+            },
+          },
+        );
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/command-stop',
+    celebrate({
+      body: Joi.object({
+        command: Joi.string().optional(),
+        pid: Joi.number().optional(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.stop(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/data/export',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        await systemService.exportData(res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/data/import',
+    upload.single('data'),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.importData();
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  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);
+      }
+    },
+  );
+
 };
@@ -6,6 +6,7 @@ import { celebrate, Joi } from 'celebrate';
 import multer from 'multer';
 import path from 'path';
 import { v4 as uuidV4 } from 'uuid';
+import rateLimit from 'express-rate-limit';
 import config from '../config';
 const route = Router();

@@ -26,6 +27,10 @@ export default (app: Router) => {

  route.post(
    '/login',
+    rateLimit({
+      windowMs: 15 * 60 * 1000,
+      max: 100,
+    }),
    celebrate({
      body: Joi.object({
        username: Joi.string().required(),
@@ -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();
@@ -18,9 +17,12 @@ async function startServer() {
  const server = app
    .listen(config.port, () => {
      Logger.debug(`✌️ 后端服务启动成功！`);
+      console.debug(`✌️ 后端服务启动成功！`);
+      process.send?.('ready');
    })
    .on('error', (err) => {
      Logger.error(err);
+      console.error(err);
      process.exit(1);
    });

@@ -1,6 +1,6 @@
 import dotenv from 'dotenv';
 import path from 'path';
-import { createRandomString } from './util';
+import { createRandomString } from './share';

 process.env.NODE_ENV = process.env.NODE_ENV || 'development';

@@ -20,6 +20,8 @@ const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });

 const dataPath = path.join(rootPath, 'data/');
+const shellPath = path.join(rootPath, 'shell/');
+const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
@@ -27,6 +29,8 @@ const bakPath = path.join(dataPath, 'bak/');
 const logPath = path.join(dataPath, 'log/');
 const dbPath = path.join(dataPath, 'db/');
 const uploadPath = path.join(dataPath, 'upload/');
+const sshdPath = path.join(dataPath, 'ssh.d/');
+const systemLogPath = path.join(dataPath, 'syslog/');

 const envFile = path.join(configPath, 'env.sh');
 const confFile = path.join(configPath, 'config.sh');
@@ -41,6 +45,8 @@ const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 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');

 if (envFound.error) {
  throw new Error("⚠️  Couldn't find .env file  ⚠️");
@@ -58,6 +64,10 @@ export default {
    prefix: '/api',
  },
  rootPath,
+  tmpPath,
+  dataPath,
+  dataTgzFile,
+  shareShellFile,
  configString,
  loginFaild,
  authError,
@@ -91,8 +101,15 @@ export default {
    '/api/system',
    '/api/user/init',
    '/api/user/notification/init',
+    '/open/user/login',
+    '/open/user/two-factor/login',
+    '/open/system',
+    '/open/user/init',
+    '/open/user/notification/init',
  ],
  versionFile,
  lastVersionFile,
  sqliteFile,
+  sshdPath,
+  systemLogPath,
 };
@@ -0,0 +1,28 @@
+import { Request, Response } from 'express';
+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;
+}
+
+export function serveEnv(_req: Request, res: Response) {
+  res.type('.js');
+  res.send(
+    Object.entries(getPickedEnv())
+      .map(([k, v]) => `window.__ENV__${k}=${JSON.stringify(v)};`)
+      .join('\n'),
+  );
+}
@@ -0,0 +1,84 @@
+export function createRandomString(min: number, max: number): string {
+  const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+  const english = [
+    'a',
+    'b',
+    'c',
+    'd',
+    'e',
+    'f',
+    'g',
+    'h',
+    'i',
+    'j',
+    'k',
+    'l',
+    'm',
+    'n',
+    'o',
+    'p',
+    'q',
+    'r',
+    's',
+    't',
+    'u',
+    'v',
+    'w',
+    'x',
+    'y',
+    'z',
+  ];
+  const ENGLISH = [
+    'A',
+    'B',
+    'C',
+    'D',
+    'E',
+    'F',
+    'G',
+    'H',
+    'I',
+    'J',
+    'K',
+    'L',
+    'M',
+    'N',
+    'O',
+    'P',
+    'Q',
+    'R',
+    'S',
+    'T',
+    'U',
+    'V',
+    'W',
+    'X',
+    'Y',
+    'Z',
+  ];
+  const special = ['-', '_'];
+  const config = num.concat(english).concat(ENGLISH).concat(special);
+
+  const arr = [];
+  arr.push(getOne(num));
+  arr.push(getOne(english));
+  arr.push(getOne(ENGLISH));
+  arr.push(getOne(special));
+
+  const len = min + Math.floor(Math.random() * (max - min + 1));
+
+  for (let i = 4; i < len; i++) {
+    arr.push(config[Math.floor(Math.random() * config.length)]);
+  }
+
+  const newArr = [];
+  for (let j = 0; j < len; j++) {
+    newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
+  }
+
+  function getOne(arr: any[]) {
+    return arr[Math.floor(Math.random() * arr.length)];
+  }
+
+  return newArr.join('');
+}
@@ -0,0 +1,44 @@
+import { Subscription } from '../data/subscription';
+import isNil from 'lodash/isNil';
+
+export function formatUrl(doc: Subscription) {
+  let url = doc.url;
+  let host = '';
+  if (doc.type === 'private-repo') {
+    if (doc.pull_type === 'ssh-key') {
+      host = doc.url!.replace(/.*\@([^\:]+)\:.*/, '$1');
+      url = doc.url!.replace(host, doc.alias);
+    } else {
+      host = doc.url!.replace(/.*\:\/\/([^\/]+)\/.*/, '$1');
+      const { username, password } = doc.pull_option as any;
+      url = doc.url!.replace(host, `${username}:${password}@${host}`);
+    }
+  }
+  return { url, host };
+}
+
+export function formatCommand(doc: Subscription, url?: string) {
+  let command = `SUB_ID=${doc.id} ql `;
+  let _url = url || formatUrl(doc).url;
+  const {
+    type,
+    whitelist,
+    blacklist,
+    dependences,
+    branch,
+    extensions,
+    proxy,
+    autoAddCron,
+    autoDelCron,
+  } = doc;
+  if (type === 'file') {
+    command += `raw "${_url}"`;
+  } else {
+    command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
+      dependences || ''
+    }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}" "${
+      isNil(autoAddCron) ? true : Boolean(autoAddCron)
+    }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
+  }
+  return command;
+}
@@ -7,6 +7,11 @@ import FormData from 'form-data';
 import psTreeFun from 'pstree.remy';
 import { promisify } from 'util';
 import { load } from 'js-yaml';
+import config from './index';
+import { TASK_COMMAND } from './const';
+import Logger from '../loaders/logger';
+
+export * from './share';

 export function getFileContentByName(fileName: string) {
  if (fs.existsSync(fileName)) {
@@ -34,91 +39,6 @@ export function getLastModifyFilePath(dir: string) {
  return filePath;
 }

-export function createRandomString(min: number, max: number): string {
-  const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-  const english = [
-    'a',
-    'b',
-    'c',
-    'd',
-    'e',
-    'f',
-    'g',
-    'h',
-    'i',
-    'j',
-    'k',
-    'l',
-    'm',
-    'n',
-    'o',
-    'p',
-    'q',
-    'r',
-    's',
-    't',
-    'u',
-    'v',
-    'w',
-    'x',
-    'y',
-    'z',
-  ];
-  const ENGLISH = [
-    'A',
-    'B',
-    'C',
-    'D',
-    'E',
-    'F',
-    'G',
-    'H',
-    'I',
-    'J',
-    'K',
-    'L',
-    'M',
-    'N',
-    'O',
-    'P',
-    'Q',
-    'R',
-    'S',
-    'T',
-    'U',
-    'V',
-    'W',
-    'X',
-    'Y',
-    'Z',
-  ];
-  const special = ['-', '_'];
-  const config = num.concat(english).concat(ENGLISH).concat(special);
-
-  const arr = [];
-  arr.push(getOne(num));
-  arr.push(getOne(english));
-  arr.push(getOne(ENGLISH));
-  arr.push(getOne(special));
-
-  const len = min + Math.floor(Math.random() * (max - min + 1));
-
-  for (let i = 4; i < len; i++) {
-    arr.push(config[Math.floor(Math.random() * config.length)]);
-  }
-
-  const newArr = [];
-  for (let j = 0; j < len; j++) {
-    newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
-  }
-
-  function getOne(arr: any[]) {
-    return arr[Math.floor(Math.random() * arr.length)];
-  }
-
-  return newArr.join('');
-}
-
 export function getToken(req: any) {
  const { authorization = '' } = req.headers;
  if (authorization && authorization.split(' ')[0] === 'Bearer') {
@@ -164,6 +84,11 @@ export async function getNetIp(req: any) {
  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 })
@@ -245,6 +170,18 @@ export async function createFile(file: string, data: string = '') {
  });
 }

+export async function handleLogPath(
+  logPath: string,
+  data: string = '',
+): Promise<string> {
+  const absolutePath = path.resolve(config.logPath, logPath);
+  const logFileExist = await fileExist(absolutePath);
+  if (!logFileExist) {
+    await createFile(absolutePath, data);
+  }
+  return absolutePath;
+}
+
 export async function concurrentRun(
  fnList: Array<() => Promise<any>> = [],
  max = 5,
@@ -293,22 +230,28 @@ interface IFile {
  type: 'directory' | 'file';
  parent: string;
  mtime: number;
+  size?: number;
  children?: IFile[];
 }

-export function dirSort(a: IFile, b: IFile) {
-  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;
+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
+  } else {
+    return 0;
+  }
 }

 export function readDirs(
  dir: string,
  baseDir: string = '',
  blacklist: string[] = [],
-) {
+): IFile[] {
  const relativePath = path.relative(baseDir, dir);
  const files = fs.readdirSync(dir);
-  const result: any = files
+  const result: IFile[] = files
    .filter((x) => !blacklist.includes(x))
    .map((file: string) => {
      const subPath = path.join(dir, file);
@@ -330,6 +273,7 @@ export function readDirs(
        isLeaf: true,
        key,
        parent: relativePath,
+        size: stats.size,
        mtime: stats.mtime.getTime(),
      };
    });
@@ -359,30 +303,40 @@ export function readDir(
  return result;
 }

-export function emptyDir(path: string) {
+export async function emptyDir(path: string) {
+  const pathExist = await fileExist(path);
+  if (!pathExist) {
+    return;
+  }
  const files = fs.readdirSync(path);
-  files.forEach((file) => {
+  for (const file of files) {
    const filePath = `${path}/${file}`;
    const stats = fs.statSync(filePath);
    if (stats.isDirectory()) {
-      emptyDir(filePath);
+      await emptyDir(filePath);
    } else {
      fs.unlinkSync(filePath);
    }
-  });
+  }
  fs.rmdirSync(path);
 }

-export function promiseExec(command: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    exec(
-      command,
-      { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
-      (err, stdout, stderr) => {
-        resolve(stdout || stderr || JSON.stringify(err));
-      },
-    );
-  });
+export async function promiseExec(command: string): Promise<string> {
+  try {
+    const { stderr, stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
+    return stdout || stderr;
+  } catch (error) {
+    return JSON.stringify(error);
+  }
+}
+
+export async function promiseExecSuccess(command: string): Promise<string> {
+  try {
+    const { stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
+    return stdout || '';
+  } catch (error) {
+    return '';
+  }
 }

 export function parseHeaders(headers: string) {
@@ -469,25 +423,29 @@ export function psTree(pid: number): Promise<number[]> {

 export async function killTask(pid: number) {
  const pids = await psTree(pid);
-  // SIGALRM 14 时钟信号
+
  if (pids.length) {
-    process.kill(pids[0], 14);
+    try {
+      [pid, ...pids].reverse().forEach((x) => {
+        process.kill(x, 15);
+      });
+    } catch (error) { }
  } else {
-    process.kill(pid, 14);
+    process.kill(pid, 2);
  }
 }

 export async function getPid(name: string) {
-  let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
-  const execAsync = promisify(exec);
-  let pid = (await execAsync(taskCommand)).stdout;
-  return Number(pid);
+  const taskCommand = `ps -eo pid,command | grep "${name}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
+  const pid = await promiseExec(taskCommand);
+  return pid ? Number(pid) : undefined;
 }

 interface IVersion {
  version: string;
  changeLogLink: string;
  changeLog: string;
+  publishTime: string;
 }

 export async function parseVersion(path: string): Promise<IVersion> {
@@ -497,3 +455,50 @@ export async function parseVersion(path: string): Promise<IVersion> {
 export async function parseContentVersion(content: string): Promise<IVersion> {
  return load(content) as IVersion;
 }
+
+export async function getUniqPath(command: string, id: string): Promise<string> {
+  if (/^\d+$/.test(id)) {
+    id = `_${id}`;
+  } else {
+    id = '';
+  }
+
+  const items = command.split(/ +/);
+  let str = items[0];
+  if (items[0] === TASK_COMMAND) {
+    str = items[1];
+  }
+
+  const dotIndex = str.lastIndexOf('.');
+
+  if (dotIndex !== -1) {
+    str = str.slice(0, dotIndex);
+  }
+
+  const slashIndex = str.lastIndexOf('/');
+
+  let tempStr = '';
+  if (slashIndex !== -1) {
+    tempStr = str.slice(0, slashIndex);
+    const _slashIndex = tempStr.lastIndexOf('/');
+    if (_slashIndex !== -1) {
+      tempStr = tempStr.slice(_slashIndex + 1);
+    }
+    str = `${tempStr}_${str.slice(slashIndex + 1)}`;
+  }
+
+  return `${str}${id}`;
+}
+
+export function safeJSONParse(value?: string) {
+  if (!value) {
+    return {};
+  }
+
+  try {
+    return JSON.parse(value);
+  } catch (error) {
+    Logger.error('[JSON.parse失败]', error)
+    return {};
+  }
+}
@@ -1,10 +1,11 @@
 import { sequelize } from '.';
 import { DataTypes, Model, ModelDefined } from 'sequelize';
+import { NotificationInfo } from './notify';

 export class AuthInfo {
  ip?: string;
  type: AuthDataType;
-  info?: any;
+  info?: AuthModelInfo;
  id?: number;

  constructor(options: AuthInfo) {
@@ -25,9 +26,27 @@ export enum AuthDataType {
  'authToken' = 'authToken',
  'notification' = 'notification',
  'removeLogFrequency' = 'removeLogFrequency',
+  'systemConfig' = 'systemConfig',
 }

-interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
+export interface SystemConfigInfo {
+  logRemoveFrequency?: number;
+  cronConcurrency?: number;
+}
+
+export interface LoginLogInfo {
+  timestamp?: number;
+  address?: string;
+  ip?: string;
+  platform?: string;
+  status?: LoginStatus;
+}
+
+export type AuthModelInfo = SystemConfigInfo &
+  Partial<NotificationInfo> &
+  LoginLogInfo;
+
+export interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
 export const AuthModel = sequelize.define<AuthInstance>('Auth', {
  ip: DataTypes.STRING,
  type: DataTypes.STRING,
@@ -17,15 +17,19 @@ export class Crontab {
  labels?: string[];
  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;
-    this.command = options.command;
+    this.command = options.command.trim();
    this.schedule = options.schedule;
    this.saved = options.saved;
    this.id = options.id;
    this.status =
-      options.status && CrontabStatus[options.status]
+      typeof options.status === 'number' && CrontabStatus[options.status]
        ? options.status
        : CrontabStatus.idle;
    this.timestamp = new Date().toString();
@@ -37,17 +41,21 @@ export class Crontab {
    this.labels = options.labels || [];
    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;
  }
 }

 export enum CrontabStatus {
-  'running',
-  'idle',
+  'running' = 0,
+  'queued' = 0.5,
+  'idle' = 1,
  'disabled',
-  'queued',
 }

-interface CronInstance extends Model<Crontab, Crontab>, Crontab {}
+export interface CronInstance extends Model<Crontab, Crontab>, Crontab { }
 export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
  name: {
    unique: 'compositeIndex',
@@ -72,4 +80,8 @@ export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
  labels: DataTypes.JSON,
  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,
 });
@@ -39,7 +39,7 @@ export class CrontabView {
  }
 }

-interface CronViewInstance
+export interface CronViewInstance
  extends Model<CrontabView, CrontabView>,
    CrontabView {}
 export const CrontabViewModel = sequelize.define<CronViewInstance>(
@@ -4,18 +4,21 @@ import { DataTypes, Model, ModelDefined } from 'sequelize';
 export class Dependence {
  timestamp?: string;
  id?: number;
-  status?: DependenceStatus;
-  type?: DependenceTypes;
-  name?: number;
+  status: DependenceStatus;
+  type: DependenceTypes;
+  name: string;
  log?: string[];
  remark?: string;

  constructor(options: Dependence) {
    this.id = options.id;
-    this.status = options.status || DependenceStatus.installing;
+    this.status =
+      typeof options.status === 'number' && DependenceStatus[options.status]
+        ? options.status
+        : DependenceStatus.queued;
    this.type = options.type || DependenceTypes.nodejs;
    this.timestamp = new Date().toString();
-    this.name = options.name;
+    this.name = options.name.trim();
    this.log = options.log || [];
    this.remark = options.remark || '';
  }
@@ -28,6 +31,7 @@ export enum DependenceStatus {
  'removing',
  'removed',
  'removeFailed',
+  'queued',
 }

 export enum DependenceTypes {
@@ -38,17 +42,29 @@ export enum DependenceTypes {

 export enum InstallDependenceCommandTypes {
  'pnpm add -g',
-  'pip3 install',
-  'apk add',
+  'pip3 install --disable-pip-version-check --root-user-action=ignore',
+  'apk add --no-check-certificate',
+}
+
+export enum GetDependenceCommandTypes {
+  'pnpm ls -g ',
+  'pip3 show --disable-pip-version-check',
+  'apk info -es',
+}
+
+export enum versionDependenceCommandTypes {
+  '@',
+  '==',
+  '=',
 }

 export enum unInstallDependenceCommandTypes {
  'pnpm remove -g',
-  'pip3 uninstall -y',
+  'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
  'apk del',
 }

-interface DependenceInstance
+export interface DependenceInstance
  extends Model<Dependence, Dependence>,
    Dependence {}
 export const DependenceModel = sequelize.define<DependenceInstance>(
@@ -13,7 +13,10 @@ export class Env {
  constructor(options: Env) {
    this.value = options.value;
    this.id = options.id;
-    this.status = options.status || EnvStatus.normal;
+    this.status =
+      typeof options.status === 'number' && EnvStatus[options.status]
+        ? options.status
+        : EnvStatus.normal;
    this.timestamp = new Date().toString();
    this.position = options.position;
    this.name = options.name;
@@ -28,10 +31,10 @@ export enum EnvStatus {

 export const maxPosition = 9000000000000000;
 export const initPosition = 4500000000000000;
-export const stepPosition = 10000000;
+export const stepPosition = 10000000000;
 export const minPosition = 100;

-interface EnvInstance extends Model<Env, Env>, Env {}
+export interface EnvInstance extends Model<Env, Env>, Env {}
 export const EnvModel = sequelize.define<EnvInstance>('Env', {
  value: { type: DataTypes.STRING, unique: 'compositeIndex' },
  timestamp: DataTypes.STRING,
@@ -1,9 +1,10 @@
 import { Sequelize, Transaction } from 'sequelize';
 import config from '../config/index';
+import { join } from 'path';

 export const sequelize = new Sequelize({
  dialect: 'sqlite',
-  storage: `${config.dbPath}database.sqlite`,
+  storage: join(config.dbPath, 'database.sqlite'),
  logging: false,
  retry: {
    max: 10,
@@ -15,8 +15,10 @@ export enum NotificationMode {
  'iGot' = 'iGot',
  'pushPlus' = 'pushPlus',
  'email' = 'email',
+  'pushMe' = 'pushMe',
  'feishu' = 'feishu',
  'webhook' = 'webhook',
+  'chronocat' = 'Chronocat',
 }

 abstract class NotificationBaseInfo {
@@ -54,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 {
@@ -72,10 +76,12 @@ export class DingtalkBotNotification extends NotificationBaseInfo {

 export class WeWorkBotNotification extends NotificationBaseInfo {
  public weWorkBotKey = '';
+  public weWorkOrigin = '';
 }

 export class WeWorkAppNotification extends NotificationBaseInfo {
  public weWorkAppKey = '';
+  public weWorkOrigin = '';
 }

 export class AibotkNotification extends NotificationBaseInfo {
@@ -99,6 +105,16 @@ export class EmailNotification extends NotificationBaseInfo {
  public emailPass: string = '';
 }

+export class PushMeNotification extends NotificationBaseInfo {
+  public pushMeKey: string = '';
+}
+
+export class ChronocatNotification extends NotificationBaseInfo {
+  public chronocatURL: string = '';
+  public chronocatQQ: string = '';
+  public chronocatToekn: string = '';
+}
+
 export class WebhookNotification extends NotificationBaseInfo {
  public webhookHeaders: string = '';
  public webhookBody: string = '';
@@ -129,5 +145,8 @@ export interface NotificationInfo
    IGotNotification,
    PushPlusNotification,
    EmailNotification,
+    PushMeNotification,
    WebhookNotification,
+    ChronocatNotification,
    LarkNotification {}
+    
@@ -26,14 +26,7 @@ export interface AppToken {

 export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs';

-export enum CrontabStatus {
-  'running',
-  'idle',
-  'disabled',
-  'queued',
-}
-
-interface AppInstance extends Model<App, App>, App {}
+export interface AppInstance extends Model<App, App>, App {}
 export const AppModel = sequelize.define<AppInstance>('App', {
  name: { type: DataTypes.STRING, unique: 'name' },
  scopes: DataTypes.JSON,
@@ -16,4 +16,5 @@ export type SockMessageType =
  | 'uninstallDependence'
  | 'updateSystemVersion'
  | 'manuallyRunScript'
-  | 'runSubscriptionEnd';
+  | 'runSubscriptionEnd'
+  | 'reloadSystem';
@@ -37,8 +37,8 @@ export class Subscription {
    this.name = options.name || options.alias;
    this.type = options.type;
    this.schedule = options.schedule;
-    this.status =
-      options.status && SubscriptionStatus[options.status]
+    this.status = this.status =
+      typeof options.status === 'number' && SubscriptionStatus[options.status]
        ? options.status
        : SubscriptionStatus.idle;
    this.url = options.url;
@@ -70,7 +70,7 @@ export enum SubscriptionStatus {
  'queued',
 }

-interface SubscriptionInstance
+export interface SubscriptionInstance
  extends Model<Subscription, Subscription>,
    Subscription {}
 export const SubscriptionModel = sequelize.define<SubscriptionInstance>(
@@ -3,3 +3,5 @@ declare namespace Express {
    platform: 'desktop' | 'mobile';
  }
 }
+
+declare module 'pstree.remy';
@@ -7,18 +7,28 @@ import linkDeps from './deps';
 import initTask from './initTask';

 export default async ({ expressApp }: { expressApp: Application }) => {
-  await depInjectorLoader();
-  Logger.info('✌️ Dependency Injector loaded');
+  try {
+    depInjectorLoader();
+    Logger.info('✌️ Dependency Injector loaded');
+    console.log('✌️ Dependency Injector loaded');
  
-  await expressLoader({ app: expressApp });
-  Logger.info('✌️ Express loaded');
+    expressLoader({ app: expressApp });
+    Logger.info('✌️ Express loaded');
+    console.log('✌️ Express loaded');
  
-  await initData();
-  Logger.info('✌️ init data loaded');
+    await initData();
+    Logger.info('✌️ init data loaded');
+    console.log('✌️ init data loaded');
  
-  await linkDeps();
-  Logger.info('✌️ link deps loaded');
+    await linkDeps();
+    Logger.info('✌️ link deps loaded');
+    console.log('✌️ link deps loaded');
  
-  initTask();
-  Logger.info('✌️ init task loaded');
+    initTask();
+    Logger.info('✌️ init task loaded');
+    console.log('✌️ init task loaded');
+  } catch (error) {
+    Logger.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`);
+    console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`);
+  }
 };
@@ -46,6 +46,18 @@ export default async () => {
        'alter table Subscriptions add column autoDelCron NUMBER',
      );
    } catch (error) {}
+    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');
@@ -119,9 +131,10 @@ export default async () => {
      });
    }

+    console.log('✌️ DB loaded');
    Logger.info('✌️ DB loaded');
  } catch (error) {
-    Logger.info('✌️ DB load failed');
-    Logger.info(error);
+    console.error('✌️ DB load failed');
+    Logger.error(error);
  }
 };
@@ -37,7 +37,7 @@ async function linkCommand() {
    if (fs.existsSync(target)) {
      fs.unlinkSync(target);
    }
-    fs.symlink(source, target, (err) => {});
+    fs.symlink(source, target, (err) => { });
  }
 }

@@ -5,37 +5,40 @@ import routes from '../api';
 import config from '../config';
 import jwt, { UnauthorizedError } from 'express-jwt';
 import fs from 'fs';
-import { getPlatform, getToken } from '../config/util';
+import { getPlatform, getToken, safeJSONParse } from '../config/util';
 import Container from 'typedi';
 import OpenService from '../services/open';
 import rewrite from 'express-urlrewrite';
 import UserService from '../services/user';
-import handler from 'serve-handler';
 import * as Sentry from '@sentry/node';
 import { EnvModel } from '../data/env';
 import { errors } from 'celebrate';
+import { createProxyMiddleware } from 'http-proxy-middleware';
+import { serveEnv } from '../config/serverEnv';
+import Logger from './logger';

 export default ({ app }: { app: Application }) => {
  app.enable('trust proxy');
  app.use(cors());
+  app.get(`${config.api.prefix}/env.js`, serveEnv);
  app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));

-  app.use((req, res, next) => {
-    if (req.path.startsWith('/api') || req.path.startsWith('/open')) {
-      next();
-    } else {
-      return handler(req, res, {
-        public: 'static/dist',
-        rewrites: [{ source: '**', destination: '/index.html' }],
-      });
-    }
-  });
+  app.use(
+    '/api/public',
+    createProxyMiddleware({
+      target: `http://0.0.0.0:${config.publicPort}/api`,
+      changeOrigin: true,
+      pathRewrite: { '/api/public': '' },
+      logProvider: () => Logger
+    }),
+  );
+
  app.use(bodyParser.json({ limit: '50mb' }));
  app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));

  app.use(
    jwt({
-      secret: config.secret as string,
+      secret: config.secret,
      algorithms: ['HS384'],
    }).unless({
      path: [...config.apiWhiteList, /^\/open\//],
@@ -82,7 +85,7 @@ export default ({ app }: { app: Application }) => {

    const data = fs.readFileSync(config.authConfigFile, 'utf8');
    if (data && headerToken) {
-      const { token = '', tokens = {} } = JSON.parse(data);
+      const { token = '', tokens = {} } = safeJSONParse(data);
      if (headerToken === token || tokens[req.platform] === headerToken) {
        return next();
      }
@@ -108,8 +111,7 @@ export default ({ app }: { app: Application }) => {
    if (
      Object.keys(authInfo).length === 2 &&
      authInfo.username === 'admin' &&
-      authInfo.password === 'admin' &&
-      envCount === 0
+      authInfo.password === 'admin'
    ) {
      isInitialized = false;
    }
@@ -170,18 +172,6 @@ export default ({ app }: { app: Application }) => {
    },
  );

-  app.use(
-    Sentry.Handlers.errorHandler({
-      shouldHandleError(error) {
-        // 排除 SequelizeUniqueConstraintError / NotFound
-        return (
-          !['SequelizeUniqueConstraintError'].includes(error.name) ||
-          !['Not Found'].includes(error.message)
-        );
-      },
-    }),
-  );
-
  app.use(
    (
      err: Error & { status: number },
@@ -4,8 +4,7 @@ import { Container } from 'typedi';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import CronService from '../services/cron';
 import EnvService from '../services/env';
-import groupBy from 'lodash/groupBy';
-import { DependenceModel } from '../data/dependence';
+import { DependenceModel, DependenceStatus } from '../data/dependence';
 import { Op } from 'sequelize';
 import config from '../config';
 import { CrontabViewModel, CronViewType } from '../data/cronView';
@@ -31,27 +30,25 @@ export default async () => {
  });

  // 初始化更新所有任务状态为空闲
-  await CrontabModel.update(
-    { status: CrontabStatus.idle },
-    { where: { status: [CrontabStatus.running, CrontabStatus.queued] } },
-  );
+  await CrontabModel.update({ status: CrontabStatus.idle }, { where: {} });

  // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
  DependenceModel.findAll({
    where: {},
-    order: [['type', 'DESC']],
+    order: [
+      ['type', 'DESC'],
+      ['createdAt', 'DESC'],
+    ],
    raw: true,
  }).then(async (docs) => {
-    const groups = groupBy(docs, 'type');
-    const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
-    for (const key of keys) {
-      const group = groups[key];
-      const depIds = group.map((x) => x.id);
-      await dependenceService.reInstall(depIds as number[]);
-    }
+    await DependenceModel.update(
+      { status: DependenceStatus.queued, log: [] },
+      { where: { id: docs.map((x) => x.id!) } },
+    );
+    dependenceService.installDependenceOneByOne(docs);
  });

-  // 初始化时执行一次所有的ql repo 任务
+  // 初始化时执行一次所有的 ql repo 任务
  CrontabModel.findAll({
    where: {
      isDisabled: { [Op.ne]: 1 },
@@ -5,7 +5,7 @@ import dotenv from 'dotenv';
 import Logger from './logger';
 import { fileExist } from '../config/util';

-const rootPath = process.env.QL_DIR as string;;
+const rootPath = process.env.QL_DIR as string;
 const dataPath = path.join(rootPath, 'data/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
@@ -13,12 +13,22 @@ const logPath = path.join(dataPath, 'log/');
 const uploadPath = path.join(dataPath, 'upload/');
 const bakPath = path.join(dataPath, 'bak/');
 const samplePath = path.join(rootPath, 'sample/');
+const tmpPath = path.join(logPath, '.tmp/');
 const confFile = path.join(configPath, 'config.sh');
 const authConfigFile = path.join(configPath, 'auth.json');
 const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
 const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
+const sampleTaskShellFile = path.join(samplePath, 'task.sample.sh');
+const sampleNotifyJsFile = path.join(samplePath, 'notify.js');
+const sampleNotifyPyFile = path.join(samplePath, 'notify.py');
+const scriptNotifyJsFile = path.join(scriptPath, 'sendNotify.js');
+const scriptNotifyPyFile = path.join(scriptPath, 'notify.py');
+const TaskBeforeFile = path.join(configPath, 'task_before.sh');
+const TaskAfterFile = path.join(configPath, 'task_after.sh');
 const homedir = os.homedir();
 const sshPath = path.resolve(homedir, '.ssh');
+const sshdPath = path.join(dataPath, 'ssh.d');
+const systemLogPath = path.join(dataPath, 'syslog');

 export default async () => {
  const authFileExist = await fileExist(authConfigFile);
@@ -29,19 +39,18 @@ export default async () => {
  const uploadDirExist = await fileExist(uploadPath);
  const sshDirExist = await fileExist(sshPath);
  const bakDirExist = await fileExist(bakPath);
+  const sshdDirExist = await fileExist(sshdPath);
+  const systemLogDirExist = await fileExist(systemLogPath);
+  const tmpDirExist = await fileExist(tmpPath);
+  const scriptNotifyJsFileExist = await fileExist(scriptNotifyJsFile);
+  const scriptNotifyPyFileExist = await fileExist(scriptNotifyPyFile);
+  const TaskBeforeFileExist = await fileExist(TaskBeforeFile);
+  const TaskAfterFileExist = await fileExist(TaskAfterFile);

  if (!configDirExist) {
    fs.mkdirSync(configPath);
  }

-  if (!authFileExist) {
-    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
-  }
-
-  if (!confFileExist) {
-    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
-  }
-
  if (!scriptDirExist) {
    fs.mkdirSync(scriptPath);
  }
@@ -50,6 +59,10 @@ export default async () => {
    fs.mkdirSync(logPath);
  }

+  if (!tmpDirExist) {
+    fs.mkdirSync(tmpPath);
+  }
+
  if (!uploadDirExist) {
    fs.mkdirSync(uploadPath);
  }
@@ -62,7 +75,41 @@ export default async () => {
    fs.mkdirSync(bakPath);
  }

+  if (!sshdDirExist) {
+    fs.mkdirSync(sshdPath);
+  }
+
+  if (!systemLogDirExist) {
+    fs.mkdirSync(systemLogPath);
+  }
+
+  // 初始化文件
+  if (!authFileExist) {
+    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
+  }
+
+  if (!confFileExist) {
+    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
+  }
+
+  if (!scriptNotifyJsFileExist) {
+    fs.writeFileSync(scriptNotifyJsFile, fs.readFileSync(sampleNotifyJsFile));
+  }
+
+  if (!scriptNotifyPyFileExist) {
+    fs.writeFileSync(scriptNotifyPyFile, fs.readFileSync(sampleNotifyPyFile));
+  }
+
+  if (!TaskBeforeFileExist) {
+    fs.writeFileSync(TaskBeforeFile, fs.readFileSync(sampleTaskShellFile));
+  }
+
+  if (!TaskAfterFileExist) {
+    fs.writeFileSync(TaskAfterFile, fs.readFileSync(sampleTaskShellFile));
+  }
+
  dotenv.config({ path: confFile });

  Logger.info('✌️ Init file down');
+  console.log('✌️ Init file down');
 };
@@ -1,9 +1,10 @@
 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';
+import { join } from 'path';

 export default async () => {
  const systemService = Container.get(SystemService);
@@ -11,8 +12,9 @@ export default async () => {
  const subscriptionService = Container.get(SubscriptionService);

  // 生成内置token
-  let tokenCommand = `ts-node-transpile-only ${config.rootPath}/back/token.ts`;
-  const tokenFile = `${config.rootPath}static/build/token.js`;
+  let tokenCommand = `tsx ${join(config.rootPath, 'back/token.ts')}`;
+  const tokenFile = join(config.rootPath, 'static/build/token.js');
+
  if (await fileExist(tokenFile)) {
    tokenCommand = `node ${tokenFile}`;
  }
@@ -20,32 +22,30 @@ export default async () => {
    id: NaN,
    name: '生成token',
    command: tokenCommand,
-  };
+  } as ScheduleTaskType;
+  await scheduleService.cancelIntervalTask(cron);
  scheduleService.createIntervalTask(cron, {
    days: 28,
  });

  // 运行删除日志任务
-  const data = await systemService.getLogRemoveFrequency();
-  if (data && data.info && data.info.frequency) {
-    const cron = {
-      id: data.id,
+  const data = await systemService.getSystemConfig();
+  if (data && data.info && data.info.logRemoveFrequency) {
+    const rmlogCron = {
+      id: data.id as number,
      name: '删除日志',
-      command: `ql rmlog ${data.info.frequency}`,
+      command: `ql rmlog ${data.info.logRemoveFrequency}`,
    };
-    scheduleService.createIntervalTask(cron, {
-      days: data.info.frequency,
+    await scheduleService.cancelIntervalTask(rmlogCron);
+    scheduleService.createIntervalTask(rmlogCron, {
+      days: data.info.logRemoveFrequency,
    });
  }

  // 运行所有订阅
+  await subscriptionService.setSshConfig();
  const subs = await subscriptionService.list();
  for (const sub of subs) {
-    await subscriptionService.handleTask(
-      sub,
-      !sub.is_disabled,
-      true,
-      !sub.is_disabled,
-    );
+    subscriptionService.handleTask(sub, !sub.is_disabled, !sub.is_disabled);
  }
 };
@@ -1,32 +1,38 @@
 import winston from 'winston';
+import 'winston-daily-rotate-file';
 import config from '../config';
+import path from 'path';

-const transports = [];
-if (process.env.NODE_ENV !== 'development') {
-  transports.push(new winston.transports.Console());
-} else {
-  transports.push(
-    new winston.transports.Console({
-      format: winston.format.combine(
-        winston.format.cli(),
-        winston.format.splat(),
-      ),
-    }),
-  );
+const levelMap: Record<string, string> = {
+  info: '🔵',
+  warn: '🟡',
+  error: '🔴',
+  debug: '🔶'
 }

+const customFormat = winston.format.combine(
+  winston.format.splat(),
+  winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
+  winston.format.align(),
+  winston.format.printf((i) => `[${levelMap[i.level]}${i.level}] [${[i.timestamp]}]: ${i.message}`),
+);
+
+const defaultOptions = {
+  format: customFormat,
+  datePattern: "YYYY-MM-DD",
+  maxSize: "20m",
+  maxFiles: "7d",
+};
+
 const LoggerInstance = winston.createLogger({
  level: config.logs.level,
  levels: winston.config.npm.levels,
-  format: winston.format.combine(
-    winston.format.timestamp({
-      format: 'YYYY-MM-DD HH:mm:ss',
-    }),
-    winston.format.errors({ stack: true }),
-    winston.format.splat(),
-    winston.format.json(),
-  ),
-  transports,
+  transports: [
+    new winston.transports.DailyRotateFile({
+      filename: path.join(config.systemLogPath, '%DATE%.log'),
+      ...defaultOptions,
+    })
+  ],
 });

 export default LoggerInstance;
@@ -10,12 +10,18 @@ export default async ({ expressApp }: { expressApp: Application }) => {
  const { version } = await parseVersion(config.versionFile);

  Sentry.init({
+    ignoreErrors: [
+      /SequelizeUniqueConstraintError/i,
+      /Validation error/i,
+      /UnauthorizedError/i,
+      /celebrate request validation failed/i,
+    ],
    dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
    integrations: [
      new Sentry.Integrations.Http({ tracing: true }),
      new Tracing.Integrations.Express({ app: expressApp }),
    ],
-    tracesSampleRate: 0.1,
+    tracesSampleRate: 0.8,
    release: version,
  });

@@ -23,4 +29,5 @@ export default async ({ expressApp }: { expressApp: Application }) => {
  expressApp.use(Sentry.Handlers.tracingHandler());

  Logger.info('✌️ Sentry loaded');
+  console.log('✌️ Sentry loaded');
 };
@@ -5,12 +5,34 @@ 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', () => {
-    Logger.info('✌️ Server need close');
+  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(() => {
-      Logger.info('✌️ Server closed');
-      process.exit(0);
+      if (timer) {
+        clearTimeout(timer);
+      }
+      timer = setTimeout(() => {
+        process.exit();
+      }, 15000);
    });
  });
+
+  process.on('uncaughtException', (error) => {
+    Logger.error('Uncaught exception:', error);
+  });
+
+  process.on('unhandledRejection', (reason, promise) => {
+    Logger.error('Unhandled rejection:', reason, promise);
+  });
 };
@@ -5,7 +5,7 @@ import { Container } from 'typedi';
 import SockService from '../services/sock';
 import config from '../config/index';
 import fs from 'fs';
-import { getPlatform } from '../config/util';
+import { getPlatform, safeJSONParse } from '../config/util';

 export default async ({ server }: { server: Server }) => {
  const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
@@ -20,7 +20,7 @@ export default async ({ server }: { server: Server }) => {
    const platform = getPlatform(conn.headers['user-agent'] || '') || 'desktop';
    const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
    if (data) {
-      const { token = '', tokens = {} } = JSON.parse(data);
+      const { token = '', tokens = {} } = safeJSONParse(data);
      if (headerToken === token || tokens[platform] === headerToken) {
        conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
        sockService.addClient(conn);
@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+package com.ql.cron;
+
+service Cron {
+  rpc addCron(AddCronRequest) returns (AddCronResponse);
+  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; }
+
+message AddCronResponse {}
+
+message DeleteCronRequest { repeated string ids = 1; }
+
+message DeleteCronResponse {}
@@ -0,0 +1,502 @@
+/* eslint-disable */
+import {
+  CallOptions,
+  ChannelCredentials,
+  Client,
+  ClientOptions,
+  ClientUnaryCall,
+  handleUnaryCall,
+  makeGenericClientConstructor,
+  Metadata,
+  ServiceError,
+  UntypedServiceImplementation,
+} from "@grpc/grpc-js";
+import _m0 from "protobufjs/minimal";
+
+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 DeleteCronRequest {
+  ids: string[];
+}
+
+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: "", extraSchedules: [], name: "" };
+}
+
+export const ICron = {
+  encode(message: ICron, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.id !== "") {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.schedule !== "") {
+      writer.uint32(18).string(message.schedule);
+    }
+    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);
+    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) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.schedule = reader.string();
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.command = reader.string();
+          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+
+          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);
+    }
+    return message;
+  },
+
+  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) : "",
+      extraSchedules: Array.isArray(object?.extraSchedules)
+        ? object.extraSchedules.map((e: any) => ISchedule.fromJSON(e))
+        : [],
+      name: isSet(object.name) ? String(object.name) : "",
+    };
+  },
+
+  toJSON(message: ICron): unknown {
+    const obj: any = {};
+    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;
+  },
+
+  create<I extends Exact<DeepPartial<ICron>, I>>(base?: I): ICron {
+    return ICron.fromPartial(base ?? {});
+  },
+
+  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.extraSchedules = object.extraSchedules?.map((e) => ISchedule.fromPartial(e)) || [];
+    message.name = object.name ?? "";
+    return message;
+  },
+};
+
+function createBaseAddCronRequest(): AddCronRequest {
+  return { crons: [] };
+}
+
+export const AddCronRequest = {
+  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();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronRequest {
+    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) {
+            break;
+          }
+
+          message.crons.push(ICron.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AddCronRequest {
+    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);
+    } else {
+      obj.crons = [];
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AddCronRequest>, I>>(base?: I): AddCronRequest {
+    return AddCronRequest.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(object: I): AddCronRequest {
+    const message = createBaseAddCronRequest();
+    message.crons = object.crons?.map((e) => ICron.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseAddCronResponse(): AddCronResponse {
+  return {};
+}
+
+export const AddCronResponse = {
+  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);
+    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) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): AddCronResponse {
+    return {};
+  },
+
+  toJSON(_: AddCronResponse): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(base?: I): AddCronResponse {
+    return AddCronResponse.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(_: I): AddCronResponse {
+    const message = createBaseAddCronResponse();
+    return message;
+  },
+};
+
+function createBaseDeleteCronRequest(): DeleteCronRequest {
+  return { ids: [] };
+}
+
+export const DeleteCronRequest = {
+  encode(message: DeleteCronRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    for (const v of message.ids) {
+      writer.uint32(10).string(v!);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronRequest {
+    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) {
+            break;
+          }
+
+          message.ids.push(reader.string());
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): DeleteCronRequest {
+    return { ids: Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [] };
+  },
+
+  toJSON(message: DeleteCronRequest): unknown {
+    const obj: any = {};
+    if (message.ids) {
+      obj.ids = message.ids.map((e) => e);
+    } else {
+      obj.ids = [];
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(base?: I): DeleteCronRequest {
+    return DeleteCronRequest.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(object: I): DeleteCronRequest {
+    const message = createBaseDeleteCronRequest();
+    message.ids = object.ids?.map((e) => e) || [];
+    return message;
+  },
+};
+
+function createBaseDeleteCronResponse(): DeleteCronResponse {
+  return {};
+}
+
+export const DeleteCronResponse = {
+  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);
+    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) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): DeleteCronResponse {
+    return {};
+  },
+
+  toJSON(_: DeleteCronResponse): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(base?: I): DeleteCronResponse {
+    return DeleteCronResponse.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(_: I): DeleteCronResponse {
+    const message = createBaseDeleteCronResponse();
+    return message;
+  },
+};
+
+export type CronService = typeof CronService;
+export const CronService = {
+  addCron: {
+    path: "/com.ql.cron.Cron/addCron",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: AddCronRequest) => Buffer.from(AddCronRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => AddCronRequest.decode(value),
+    responseSerialize: (value: AddCronResponse) => Buffer.from(AddCronResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => AddCronResponse.decode(value),
+  },
+  delCron: {
+    path: "/com.ql.cron.Cron/delCron",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: DeleteCronRequest) => Buffer.from(DeleteCronRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => DeleteCronRequest.decode(value),
+    responseSerialize: (value: DeleteCronResponse) => Buffer.from(DeleteCronResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => DeleteCronResponse.decode(value),
+  },
+} as const;
+
+export interface CronServer extends UntypedServiceImplementation {
+  addCron: handleUnaryCall<AddCronRequest, AddCronResponse>;
+  delCron: handleUnaryCall<DeleteCronRequest, DeleteCronResponse>;
+}
+
+export interface CronClient extends Client {
+  addCron(
+    request: AddCronRequest,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  addCron(
+    request: AddCronRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  addCron(
+    request: AddCronRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    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;
+  service: typeof CronService;
+};
+
+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]> }
+  : 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 };
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package com.ql.health;
+
+message HealthCheckRequest {
+  string service = 1;
+}
+
+message HealthCheckResponse {
+  enum ServingStatus {
+    UNKNOWN = 0;
+    SERVING = 1;
+    NOT_SERVING = 2;
+    SERVICE_UNKNOWN = 3;
+  }
+  ServingStatus status = 1;
+}
+
+service Health {
+  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
+  rpc Watch(HealthCheckRequest) returns (stream HealthCheckResponse);
+}
@@ -0,0 +1,254 @@
+/* eslint-disable */
+import {
+  CallOptions,
+  ChannelCredentials,
+  Client,
+  ClientOptions,
+  ClientReadableStream,
+  ClientUnaryCall,
+  handleServerStreamingCall,
+  handleUnaryCall,
+  makeGenericClientConstructor,
+  Metadata,
+  ServiceError,
+  UntypedServiceImplementation,
+} from "@grpc/grpc-js";
+import _m0 from "protobufjs/minimal";
+
+export const protobufPackage = "com.ql.health";
+
+export interface HealthCheckRequest {
+  service: string;
+}
+
+export interface HealthCheckResponse {
+  status: HealthCheckResponse_ServingStatus;
+}
+
+export enum HealthCheckResponse_ServingStatus {
+  UNKNOWN = 0,
+  SERVING = 1,
+  NOT_SERVING = 2,
+  SERVICE_UNKNOWN = 3,
+  UNRECOGNIZED = -1,
+}
+
+export function healthCheckResponse_ServingStatusFromJSON(object: any): HealthCheckResponse_ServingStatus {
+  switch (object) {
+    case 0:
+    case "UNKNOWN":
+      return HealthCheckResponse_ServingStatus.UNKNOWN;
+    case 1:
+    case "SERVING":
+      return HealthCheckResponse_ServingStatus.SERVING;
+    case 2:
+    case "NOT_SERVING":
+      return HealthCheckResponse_ServingStatus.NOT_SERVING;
+    case 3:
+    case "SERVICE_UNKNOWN":
+      return HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return HealthCheckResponse_ServingStatus.UNRECOGNIZED;
+  }
+}
+
+export function healthCheckResponse_ServingStatusToJSON(object: HealthCheckResponse_ServingStatus): string {
+  switch (object) {
+    case HealthCheckResponse_ServingStatus.UNKNOWN:
+      return "UNKNOWN";
+    case HealthCheckResponse_ServingStatus.SERVING:
+      return "SERVING";
+    case HealthCheckResponse_ServingStatus.NOT_SERVING:
+      return "NOT_SERVING";
+    case HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN:
+      return "SERVICE_UNKNOWN";
+    case HealthCheckResponse_ServingStatus.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+function createBaseHealthCheckRequest(): HealthCheckRequest {
+  return { service: "" };
+}
+
+export const HealthCheckRequest = {
+  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);
+    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) {
+            break;
+          }
+
+          message.service = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HealthCheckRequest {
+    return { service: isSet(object.service) ? String(object.service) : "" };
+  },
+
+  toJSON(message: HealthCheckRequest): unknown {
+    const obj: any = {};
+    message.service !== undefined && (obj.service = message.service);
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(base?: I): HealthCheckRequest {
+    return HealthCheckRequest.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(object: I): HealthCheckRequest {
+    const message = createBaseHealthCheckRequest();
+    message.service = object.service ?? "";
+    return message;
+  },
+};
+
+function createBaseHealthCheckResponse(): HealthCheckResponse {
+  return { status: 0 };
+}
+
+export const HealthCheckResponse = {
+  encode(message: HealthCheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.status !== 0) {
+      writer.uint32(8).int32(message.status);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckResponse {
+    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) {
+            break;
+          }
+
+          message.status = reader.int32() as any;
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HealthCheckResponse {
+    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));
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(base?: I): HealthCheckResponse {
+    return HealthCheckResponse.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(object: I): HealthCheckResponse {
+    const message = createBaseHealthCheckResponse();
+    message.status = object.status ?? 0;
+    return message;
+  },
+};
+
+export type HealthService = typeof HealthService;
+export const HealthService = {
+  check: {
+    path: "/com.ql.health.Health/Check",
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: HealthCheckRequest) => Buffer.from(HealthCheckRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
+    responseSerialize: (value: HealthCheckResponse) => Buffer.from(HealthCheckResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
+  },
+  watch: {
+    path: "/com.ql.health.Health/Watch",
+    requestStream: false,
+    responseStream: true,
+    requestSerialize: (value: HealthCheckRequest) => Buffer.from(HealthCheckRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
+    responseSerialize: (value: HealthCheckResponse) => Buffer.from(HealthCheckResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
+  },
+} as const;
+
+export interface HealthServer extends UntypedServiceImplementation {
+  check: handleUnaryCall<HealthCheckRequest, HealthCheckResponse>;
+  watch: handleServerStreamingCall<HealthCheckRequest, HealthCheckResponse>;
+}
+
+export interface HealthClient extends Client {
+  check(
+    request: HealthCheckRequest,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
+  ): ClientUnaryCall;
+  check(
+    request: HealthCheckRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
+  ): ClientUnaryCall;
+  check(
+    request: HealthCheckRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
+  ): ClientUnaryCall;
+  watch(request: HealthCheckRequest, options?: Partial<CallOptions>): ClientReadableStream<HealthCheckResponse>;
+  watch(
+    request: HealthCheckRequest,
+    metadata?: Metadata,
+    options?: Partial<CallOptions>,
+  ): ClientReadableStream<HealthCheckResponse>;
+}
+
+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;
+
+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 };
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
@@ -1,16 +1,21 @@
 import express from 'express';
-import { exec } from 'child_process';
 import Logger from './loaders/logger';
 import config from './config';
+import { HealthClient } from './protos/health';
+import { credentials } from '@grpc/grpc-js';

 const app = express();
+const client = new HealthClient(
+  `0.0.0.0:${config.cronPort}`,
+  credentials.createInsecure(),
+);

-app.get('/api/public/panel/log', (req, res) => {
-  exec('tail -n 300 ~/.pm2/logs/panel-error.log', (err, stdout, stderr) => {
-    if (err || stderr) {
-      return res.send({ code: 400, message: (err && err.message) || stderr });
+app.get('/api/health', (req, res) => {
+  client.check({ service: 'cron' }, (err, response) => {
+    if (err) {
+      return res.status(200).send({ code: 500, error: err });
    }
-    return res.send({ code: 200, data: stdout });
+    return res.status(200).send({ code: 200, data: response });
  });
 });

@@ -20,8 +25,11 @@ app
    await require('./loaders/db').default();

    Logger.debug(`✌️ 公共服务启动成功！`);
+    console.debug(`✌️ 公共服务启动成功！`);
+    process.send?.('ready');
  })
  .on('error', (err) => {
    Logger.error(err);
+    console.error(err);
    process.exit(1);
  });
@@ -1,56 +0,0 @@
-import schedule from 'node-schedule';
-import express from 'express';
-import { exec } from 'child_process';
-import Logger from './loaders/logger';
-import { CrontabModel, CrontabStatus } from './data/cron';
-import config from './config';
-import { QL_PREFIX, TASK_PREFIX } from './config/const';
-
-const app = express();
-
-const run = async () => {
-  CrontabModel.findAll({ where: {} })
-    .then((docs) => {
-      if (docs && docs.length > 0) {
-        for (let i = 0; i < docs.length; i++) {
-          const task = docs[i];
-          const _schedule = task.schedule && task.schedule.split(/ +/);
-          if (
-            _schedule &&
-            _schedule.length > 5 &&
-            task.status !== CrontabStatus.disabled &&
-            !task.isDisabled &&
-            task.schedule
-          ) {
-            schedule.scheduleJob(task.schedule, function () {
-              let command = task.command as string;
-              if (
-                !command.startsWith(TASK_PREFIX) &&
-                !command.startsWith(QL_PREFIX)
-              ) {
-                command = `${TASK_PREFIX}${command}`;
-              }
-              exec(`ID=${task.id} ${command}`);
-            });
-          }
-        }
-      }
-    })
-    .catch((err) => {
-      Logger.error(err);
-      process.exit(1);
-    });
-};
-
-app
-  .listen(config.cronPort, async () => {
-    await require('./loaders/sentry').default({ expressApp: app });
-    await require('./loaders/db').default();
-
-    await run();
-    Logger.debug('定时任务服务启动成功！');
-  })
-  .on('error', (err) => {
-    Logger.error(err);
-    process.exit(1);
-  });
@@ -0,0 +1,57 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { AddCronRequest, AddCronResponse } from '../protos/cron';
+import nodeSchedule from 'node-schedule';
+import { scheduleStacks } from './data';
+import { runCron } from '../shared/runCron';
+import Logger from '../loaders/logger';
+
+const addCron = (
+  call: ServerUnaryCall<AddCronRequest, AddCronResponse>,
+  callback: sendUnaryData<AddCronResponse>,
+) => {
+  for (const item of call.request.crons) {
+    const { id, schedule, command, extraSchedules, name } = item;
+    if (scheduleStacks.has(id)) {
+      scheduleStacks.get(id)?.forEach((x) => x.cancel());
+    }
+
+    Logger.info(
+      '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
+      id,
+      name,
+      schedule,
+      command,
+    );
+
+    if (extraSchedules?.length) {
+      extraSchedules.forEach(x => {
+        Logger.info(
+          '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
+          id,
+          name,
+          x.schedule,
+          command,
+        );
+      })
+    }
+
+    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);
+};
+
+export { addCron };
@@ -0,0 +1,40 @@
+import { credentials } from '@grpc/grpc-js';
+import {
+  AddCronRequest,
+  AddCronResponse,
+  CronClient,
+  DeleteCronRequest,
+  DeleteCronResponse,
+} from '../protos/cron';
+import config from '../config';
+
+class Client {
+  private client = new CronClient(
+    `0.0.0.0:${config.cronPort}`,
+    credentials.createInsecure(),
+  );
+
+  addCron(request: AddCronRequest['crons']): Promise<AddCronResponse> {
+    return new Promise((resolve, reject) => {
+      this.client.addCron({ crons: request }, (err, res) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(res);
+      });
+    });
+  }
+
+  delCron(request: DeleteCronRequest['ids']): Promise<DeleteCronResponse> {
+    return new Promise((resolve, reject) => {
+      this.client.delCron({ ids: request }, (err, res) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(res);
+      });
+    });
+  }
+}
+
+export default new Client();
@@ -0,0 +1,6 @@
+import nodeSchedule from 'node-schedule';
+import { ToadScheduler } from 'toad-scheduler';
+
+export const scheduleStacks = new Map<string, nodeSchedule.Job[]>();
+
+export const intervalSchedule = new ToadScheduler();
@@ -0,0 +1,24 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { DeleteCronRequest, DeleteCronResponse } from '../protos/cron';
+import { scheduleStacks } from './data';
+import Logger from '../loaders/logger';
+
+const delCron = (
+  call: ServerUnaryCall<DeleteCronRequest, DeleteCronResponse>,
+  callback: sendUnaryData<DeleteCronResponse>,
+) => {
+  for (const id of call.request.ids) {
+    if (scheduleStacks.has(id)) {
+      Logger.info(
+        '[schedule][取消定时任务], 任务ID: %s',
+        id,
+      );
+      scheduleStacks.get(id)?.forEach(x => x.cancel());
+      scheduleStacks.delete(id);
+    }
+  }
+
+  callback(null, null);
+};
+
+export { delCron };
@@ -0,0 +1,35 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { HealthCheckRequest, HealthCheckResponse } from '../protos/health';
+import config from '../config';
+import { promiseExec } from '../config/util';
+
+const check = async (
+  call: ServerUnaryCall<HealthCheckRequest, HealthCheckResponse>,
+  callback: sendUnaryData<HealthCheckResponse>,
+) => {
+  switch (call.request.service) {
+    case 'cron':
+      const res = await promiseExec(
+        `curl -s http://0.0.0.0:${config.port}/api/system`,
+      );
+
+      if (res.includes('200')) {
+        return callback(null, { status: 1 });
+      }
+
+      const panelErrLog = await promiseExec(
+        `tail -n 300 ~/.pm2/logs/panel-error.log`,
+      );
+      const scheduleErrLog = await promiseExec(
+        `tail -n 300 ~/.pm2/logs/schedule-error.log`,
+      );
+      return callback(
+        new Error(`${scheduleErrLog || ''}\n${panelErrLog || ''}\n${res}`.trim()),
+      );
+
+    default:
+      return callback(null, { status: 1 });
+  }
+};
+
+export { check };
@@ -0,0 +1,25 @@
+import { Server, ServerCredentials } from '@grpc/grpc-js';
+import { CronService } from '../protos/cron';
+import { addCron } from './addCron';
+import { delCron } from './delCron';
+import { HealthService } from '../protos/health';
+import { check } from './health';
+import config from '../config';
+import Logger from '../loaders/logger';
+
+const server = new Server();
+server.addService(HealthService, { check });
+server.addService(CronService, { addCron, delCron });
+server.bindAsync(
+  `0.0.0.0:${config.cronPort}`,
+  ServerCredentials.createInsecure(),
+  (err, port) => {
+    if (err) {
+      throw err;
+    }
+    server.start();
+    Logger.debug(`✌️ 定时服务启动成功！`);
+    console.debug(`✌️ 定时服务启动成功！`);
+    process.send?.('ready');
+  },
+);
@@ -2,19 +2,20 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
-import { exec, execSync, spawn } from 'child_process';
+import { exec, execSync } from 'child_process';
 import fs from 'fs';
 import cron_parser from 'cron-parser';
-import {
-  getFileContentByName,
-  concurrentRun,
-  fileExist,
-  killTask,
-} from '../config/util';
+import { getFileContentByName, fileExist, killTask, getUniqPath, safeJSONParse } from '../config/util';
 import { promises, existsSync } from 'fs';
-import { Op, where, col as colFn } from 'sequelize';
+import { Op, where, col as colFn, FindOptions, fn } from 'sequelize';
 import path from 'path';
 import { TASK_PREFIX, QL_PREFIX } from '../config/const';
+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 {
@@ -22,7 +23,7 @@ export default class CronService {

  private isSixCron(cron: Crontab) {
    const { schedule } = cron;
-    if (schedule?.split(/ +/).length === 6) {
+    if (Number(schedule?.split(/ +/).length) > 5) {
      return true;
    }
    return false;
@@ -32,6 +33,11 @@ export default class CronService {
    const tab = new Crontab(payload);
    tab.saved = false;
    const doc = await this.insert(tab);
+    if (this.isSixCron(doc) || doc.extra_schedules?.length) {
+      await cronClient.addCron([
+        { name: doc.name || '', id: String(doc.id), schedule: doc.schedule!, command: this.makeCommand(doc), extraSchedules: doc.extra_schedules || [] },
+      ]);
+    }
    await this.set_crontab();
    return doc;
  }
@@ -41,8 +47,27 @@ export default class CronService {
  }

  public async update(payload: Crontab): Promise<Crontab> {
-    payload.saved = false;
-    const newDoc = await this.updateDb(payload);
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new Crontab({ ...doc, ...payload });
+    tab.saved = false;
+    const newDoc = await this.updateDb(tab);
+    if (doc.isDisabled === 1) {
+      return newDoc;
+    }
+    if (this.isSixCron(doc) || doc.extra_schedules?.length) {
+      await cronClient.delCron([String(doc.id)]);
+    }
+    if (this.isSixCron(newDoc) || newDoc.extra_schedules?.length) {
+      await cronClient.addCron([
+        {
+          name: doc.name || '',
+          id: String(newDoc.id),
+          schedule: newDoc.schedule!,
+          command: this.makeCommand(newDoc),
+          extraSchedules: newDoc.extra_schedules || []
+        },
+      ]);
+    }
    await this.set_crontab();
    return newDoc;
  }
@@ -67,7 +92,7 @@ export default class CronService {
    last_running_time: number;
    last_execution_time: number;
  }) {
-    const options: any = {
+    let options: any = {
      status,
      pid,
      log_path,
@@ -77,11 +102,18 @@ 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[]) {
    await CrontabModel.destroy({ where: { id: ids } });
+    await cronClient.delCron(ids.map(String));
    await this.set_crontab();
  }

@@ -140,7 +172,7 @@ export default class CronService {
          case 'In':
            q[Op.or] = [
              {
-                [property]: value,
+                [property]: Array.isArray(value) ? value : [value],
              },
              property === 'status' && value.includes(2)
                ? { isDisabled: 1 }
@@ -151,7 +183,7 @@ export default class CronService {
            q[Op.and] = [
              {
                [property]: {
-                  [Op.notIn]: value,
+                  [Op.notIn]: Array.isArray(value) ? value : [value],
                },
              },
              property === 'status' && value.includes(2)
@@ -168,17 +200,13 @@ export default class CronService {
              {
                [operate2]: [
                  { [operate]: `%${value}%` },
-                  { [operate]: `%${encodeURIComponent(value)}%` },
+                  { [operate]: `%${encodeURI(value)}%` },
                ],
              },
              {
                [operate2]: [
                  where(colFn(property), operate, `%${value}%`),
-                  where(
-                    colFn(property),
-                    operate,
-                    `%${encodeURIComponent(value)}%`,
-                  ),
+                  where(colFn(property), operate, `%${encodeURI(value)}%`),
                ],
              },
            ],
@@ -205,7 +233,7 @@ export default class CronService {
          q[column] = {
            [Op.or]: [
              { [Op.like]: `%${textArray[1]}%` },
-              { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
+              { [Op.like]: `%${encodeURI(textArray[1])}%` },
            ],
          };
          break;
@@ -213,7 +241,7 @@ export default class CronService {
          const reg = {
            [Op.or]: [
              { [Op.like]: `%${searchText}%` },
-              { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+              { [Op.like]: `%${encodeURI(searchText)}%` },
            ],
          };
          q[Op.or] = [
@@ -244,8 +272,15 @@ export default class CronService {
      const filterKeys: any = Object.keys(filterQuery);
      for (const key of filterKeys) {
        let q: any = {};
-        if (filterKeys[key]) {
-          q[key] = filterKeys[key];
+        if (!filterQuery[key]) continue;
+        if (key === 'status') {
+          if (filterQuery[key].includes(CrontabStatus.disabled)) {
+            q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] };
+          } else {
+            q = { [Op.and]: [{ [key]: filterQuery[key] }, { isDisabled: 0 }] };
+          }
+        } else {
+          q[key] = filterQuery[key];
        }
        query[Op.and].push(q);
      }
@@ -260,6 +295,19 @@ export default class CronService {
    }
  }

+  public async find({
+    log_path,
+  }: {
+    log_path: string;
+  }): Promise<Crontab | null> {
+    try {
+      const result = await CrontabModel.findOne({ where: { log_path } });
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  }
+
  public async crontabs(params?: {
    searchValue: string;
    page: string;
@@ -271,9 +319,9 @@ export default class CronService {
    const searchText = params?.searchValue;
    const page = Number(params?.page || '0');
    const size = Number(params?.size || '0');
-    const viewQuery = JSON.parse(params?.queryString || '{}');
-    const filterQuery = JSON.parse(params?.filters || '{}');
-    const sorterQuery = JSON.parse(params?.sorter || '{}');
+    const viewQuery = safeJSONParse(params?.queryString);
+    const filterQuery = safeJSONParse(params?.filters);
+    const sorterQuery = safeJSONParse(params?.sorter);

    let query: any = {};
    let order = [
@@ -311,7 +359,7 @@ export default class CronService {
    }
  }

-  public async getDb(query: any): Promise<Crontab> {
+  public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
    const doc: any = await CrontabModel.findOne({ where: { ...query } });
    return doc && (doc.get({ plain: true }) as Crontab);
  }
@@ -321,10 +369,9 @@ export default class CronService {
      { status: CrontabStatus.queued },
      { where: { id: ids } },
    );
-    concurrentRun(
-      ids.map((id) => async () => await this.runSingle(id)),
-      10,
-    );
+    ids.forEach((id) => {
+      this.runSingle(id);
+    });
  }

  public async stop(ids: number[]) {
@@ -334,7 +381,7 @@ export default class CronService {
        try {
          await killTask(doc.pid);
        } catch (error) {
-          this.logger.silly(error);
+          this.logger.error(error);
        }
      }
    }
@@ -345,75 +392,71 @@ export default class CronService {
    );
  }

-  private async runSingle(cronId: number): Promise<number> {
-    return new Promise(async (resolve: any) => {
-      const cron = await this.getDb({ id: cronId });
-      if (cron.status !== CrontabStatus.queued) {
-        resolve();
-        return;
-      }
-
-      let { id, command, log_path } = cron;
-      const absolutePath = path.resolve(config.logPath, `${log_path}`);
-      const logFileExist = log_path && (await fileExist(absolutePath));
-
-      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(`ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
-
-      await CrontabModel.update(
-        { status: CrontabStatus.running, pid: cp.pid },
-        { where: { id } },
-      );
-      cp.stderr.on('data', (data) => {
-        if (logFileExist) {
-          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
+  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(params);
+          return;
        }
-      });
-      cp.on('error', (err) => {
-        if (logFileExist) {
-          fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
-        }
-      });

-      cp.on('exit', async (code, signal) => {
-        this.logger.info(
-          `任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`,
-        );
-      });
-      cp.on('close', async (code) => {
+        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 });
+        }
+        const logPath = `${uniqPath}/${logTime}.log`;
+        const absolutePath = path.resolve(config.logPath, `${logPath}`);
+
+        const cp = spawn(`real_log_path=${logPath} no_delay=true ${this.makeCommand(cron)}`, { shell: '/bin/bash' });
+
        await CrontabModel.update(
-          { status: CrontabStatus.idle, pid: undefined },
+          { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
          { where: { id } },
        );
-        resolve();
+        cp.stderr.on('data', (data) => {
+          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
+        });
+        cp.on('error', (err) => {
+          fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
+        });
+
+        cp.on('exit', async (code) => {
+          await CrontabModel.update(
+            { status: CrontabStatus.idle, pid: undefined },
+            { where: { id } },
+          );
+          resolve({ ...params, pid: cp.pid, code });
+        });
      });
    });
  }

  public async disabled(ids: number[]) {
    await CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
+    await cronClient.delCron(ids.map(String));
    await this.set_crontab();
  }

  public async enabled(ids: number[]) {
    await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
+    const docs = await CrontabModel.findAll({ where: { id: ids } });
+    const sixCron = docs
+      .filter((x) => this.isSixCron(x))
+      .map((doc) => ({
+        name: doc.name || '',
+        id: String(doc.id),
+        schedule: doc.schedule!,
+        command: this.makeCommand(doc),
+        extraSchedules: doc.extra_schedules || []
+      }));
+    await cronClient.addCron(sixCron);
    await this.set_crontab();
  }

@@ -428,7 +471,7 @@ export default class CronService {
    if (logFileExist) {
      return getFileContentByName(`${absolutePath}`);
    } else {
-      return '任务未运行或运行失败，请尝试手动运行';
+      return '任务未运行';
    }
  }

@@ -452,44 +495,49 @@ export default class CronService {
    } else {
      return [];
    }
-
  }

-  private make_command(tab: Crontab) {
-    if (
-      !tab.command.startsWith(TASK_PREFIX) &&
-      !tab.command.startsWith(QL_PREFIX)
-    ) {
-      tab.command = `${TASK_PREFIX}${tab.command}`;
+  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} ${tab.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;
  }

-  private async set_crontab() {
-    const tabs = await this.crontabs();
+  private async set_crontab(data?: { data: Crontab[]; total: number }) {
+    const tabs = data ?? (await this.crontabs());
    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';
      }
    });

-    this.logger.silly(crontab_string);
    fs.writeFileSync(config.crontabFile, crontab_string);

    execSync(`crontab ${config.crontabFile}`);
-    exec(`pm2 reload schedule`);
    await CrontabModel.update({ saved: true }, { where: {} });
  }

@@ -527,7 +575,19 @@ export default class CronService {
    });
  }

-  public autosave_crontab() {
-    return this.set_crontab();
+  public async autosave_crontab() {
+    const tabs = await this.crontabs();
+    this.set_crontab(tabs);
+
+    const sixCron = tabs.data
+      .filter((x) => this.isSixCron(x) && x.isDisabled !== 1)
+      .map((doc) => ({
+        name: doc.name || '',
+        id: String(doc.id),
+        schedule: doc.schedule!,
+        command: this.makeCommand(doc),
+        extraSchedules: doc.extra_schedules || []
+      }));
+    await cronClient.addCron(sixCron);
  }
 }
@@ -7,6 +7,7 @@ import {
  minPosition,
  stepPosition,
 } from '../data/env';
+import { FindOptions } from 'sequelize';

@Service()
 export default class CronViewService {
@@ -31,7 +32,9 @@ export default class CronViewService {
  }

  public async update(payload: CrontabView): Promise<CrontabView> {
-    const newDoc = await this.updateDb(payload);
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new CrontabView({ ...doc, ...payload });
+    const newDoc = await this.updateDb(tab);
    return newDoc;
  }

@@ -56,7 +59,9 @@ export default class CronViewService {
    }
  }

-  public async getDb(query: any): Promise<CrontabView> {
+  public async getDb(
+    query: FindOptions<CrontabView>['where'],
+  ): Promise<CrontabView> {
    const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
    return doc && (doc.get({ plain: true }) as CrontabView);
  }
@@ -8,12 +8,15 @@ import {
  DependenceTypes,
  unInstallDependenceCommandTypes,
  DependenceModel,
+  GetDependenceCommandTypes,
+  versionDependenceCommandTypes,
 } from '../data/dependence';
-import { spawn } from 'child_process';
+import { spawn } from 'cross-spawn';
 import SockService from './sock';
-import { Op } from 'sequelize';
-import { concurrentRun } from '../config/util';
+import { FindOptions, Op } from 'sequelize';
+import { promiseExecSuccess } from '../config/util';
 import dayjs from 'dayjs';
+import taskLimit from '../shared/pLimit';

@Service()
 export default class DependenceService {
@@ -24,7 +27,7 @@ export default class DependenceService {

  public async create(payloads: Dependence[]): Promise<Dependence[]> {
    const tabs = payloads.map((x) => {
-      const tab = new Dependence({ ...x, status: DependenceStatus.installing });
+      const tab = new Dependence({ ...x, status: DependenceStatus.queued });
      return tab;
    });
    const docs = await this.insert(tabs);
@@ -45,7 +48,7 @@ export default class DependenceService {
    const tab = new Dependence({
      ...doc,
      ...other,
-      status: DependenceStatus.installing,
+      status: DependenceStatus.queued,
    });
    const newDoc = await this.updateDb(tab);
    this.installDependenceOneByOne([newDoc]);
@@ -59,7 +62,7 @@ export default class DependenceService {

  public async remove(ids: number[], force = false): Promise<Dependence[]> {
    await DependenceModel.update(
-      { status: DependenceStatus.removing, log: [] },
+      { status: DependenceStatus.queued, log: [] },
      { where: { id: ids } },
    );
    const docs = await DependenceModel.findAll({ where: { id: ids } });
@@ -78,7 +81,7 @@ export default class DependenceService {
  ): Promise<Dependence[]> {
    let condition = { ...query, type: DependenceTypes[type as any] };
    if (searchValue) {
-      const encodeText = encodeURIComponent(searchValue);
+      const encodeText = encodeURI(searchValue);
      const reg = {
        [Op.or]: [
          { [Op.like]: `%${searchValue}%` },
@@ -99,23 +102,19 @@ export default class DependenceService {
    }
  }

-  private installDependenceOneByOne(
+  public installDependenceOneByOne(
    docs: Dependence[],
    isInstall: boolean = true,
    force: boolean = false,
  ) {
-    concurrentRun(
-      docs.map(
-        (dep) => async () =>
-          await this.installOrUninstallDependencies([dep], isInstall, force),
-      ),
-      1,
-    );
+    docs.forEach((dep) => {
+      this.installOrUninstallDependency(dep, isInstall, force);
+    });
  }

  public async reInstall(ids: number[]): Promise<Dependence[]> {
    await DependenceModel.update(
-      { status: DependenceStatus.installing, log: [] },
+      { status: DependenceStatus.queued, log: [] },
      { where: { id: ids } },
    );

@@ -132,113 +131,182 @@ export default class DependenceService {
    return docs;
  }

-  public async getDb(query: any): Promise<Dependence> {
+  public async getDb(
+    query: FindOptions<Dependence>['where'],
+  ): Promise<Dependence> {
    const doc: any = await DependenceModel.findOne({ where: { ...query } });
    return doc && (doc.get({ plain: true }) as Dependence);
  }

  private async updateLog(ids: number[], log: string): Promise<void> {
-    const doc = await DependenceModel.findOne({ where: { id: ids } });
-    const newLog = doc?.log ? [...doc.log, log] : [log];
-    await DependenceModel.update({ log: newLog }, { where: { id: ids } });
+    taskLimit.updateDepLog(async () => {
+      const docs = await DependenceModel.findAll({ where: { id: ids } });
+      for (const doc of docs) {
+        const newLog = doc?.log ? [...doc.log, log] : [log];
+        await DependenceModel.update(
+          { log: newLog },
+          { where: { id: doc.id } },
+        );
+      }
+      return null;
+    });
  }

-  public installOrUninstallDependencies(
-    dependencies: Dependence[],
+  public installOrUninstallDependency(
+    dependency: Dependence,
    isInstall: boolean = true,
    force: boolean = false,
  ) {
-    return new Promise(async (resolve) => {
-      if (dependencies.length === 0) {
-        resolve(null);
-        return;
-      }
-      const socketMessageType = !force
-        ? 'installDependence'
-        : 'uninstallDependence';
-      const depNames = dependencies.map((x) => x.name).join(' ');
-      const depRunCommand = (
-        isInstall
-          ? InstallDependenceCommandTypes
-          : unInstallDependenceCommandTypes
-      )[dependencies[0].type as any];
-      const actionText = isInstall ? '安装' : '删除';
-      const depIds = dependencies.map((x) => x.id) as number[];
-      const startTime = dayjs();
+    return taskLimit.runOneByOne(() => {
+      return new Promise(async (resolve) => {
+        const depIds = [dependency.id!];
+        const status = isInstall
+          ? DependenceStatus.installing
+          : DependenceStatus.removing;
+        await DependenceModel.update({ status }, { where: { id: depIds } });

-      const message = `开始${actionText}依赖 ${depNames}，开始时间 ${startTime.format(
-        'YYYY-MM-DD HH:mm:ss',
-      )}\n\n`;
-      this.sockService.sendMessage({
-        type: socketMessageType,
-        message,
-        references: depIds,
-      });
-      await this.updateLog(depIds, message);
+        const socketMessageType = isInstall
+          ? 'installDependence'
+          : 'uninstallDependence';
+        let depName = dependency.name.trim();
+        const depRunCommand = (
+          isInstall
+            ? InstallDependenceCommandTypes
+            : unInstallDependenceCommandTypes
+        )[dependency.type];
+        const actionText = isInstall ? '安装' : '删除';
+        const startTime = dayjs();

-      const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
-
-      cp.stdout.on('data', async (data) => {
-        this.sockService.sendMessage({
-          type: socketMessageType,
-          message: data.toString(),
-          references: depIds,
-        });
-        await this.updateLog(depIds, data.toString());
-      });
-
-      cp.stderr.on('data', async (data) => {
-        this.sockService.sendMessage({
-          type: socketMessageType,
-          message: data.toString(),
-          references: depIds,
-        });
-        await this.updateLog(depIds, data.toString());
-      });
-
-      cp.on('error', async (err) => {
-        this.sockService.sendMessage({
-          type: socketMessageType,
-          message: JSON.stringify(err),
-          references: depIds,
-        });
-        await this.updateLog(depIds, JSON.stringify(err));
-        resolve(null);
-      });
-
-      cp.on('close', async (code) => {
-        const endTime = dayjs();
-        const isSucceed = code === 0;
-        const resultText = isSucceed ? '成功' : '失败';
-
-        const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format(
+        const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format(
          'YYYY-MM-DD HH:mm:ss',
-        )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+        )}\n\n`;
        this.sockService.sendMessage({
          type: socketMessageType,
          message,
          references: depIds,
        });
-        await this.updateLog(depIds, message);
+        this.updateLog(depIds, message);

-        let status = null;
-        if (isSucceed) {
-          status = isInstall
-            ? DependenceStatus.installed
-            : DependenceStatus.removed;
-        } else {
-          status = isInstall
-            ? DependenceStatus.installFailed
-            : DependenceStatus.removeFailed;
-        }
-        await DependenceModel.update({ status }, { where: { id: depIds } });
+        // 判断是否已经安装过依赖
+        if (isInstall) {
+          const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
+          const depVersionStr = versionDependenceCommandTypes[dependency.type];
+          let depVersion = '';
+          if (depName.includes(depVersionStr)) {
+            const symbolRegx = new RegExp(
+              `(.*)${depVersionStr}([0-9\\.\\-\\+a-zA-Z]*)`,
+            );
+            const [, _depName, _depVersion] = depName.match(symbolRegx) || [];
+            if (_depVersion && _depName) {
+              depName = _depName;
+              depVersion = _depVersion;
+            }
+          }
+          const isNodeDependence = dependency.type === DependenceTypes.nodejs;
+          const isLinuxDependence = dependency.type === DependenceTypes.linux;
+          const isPythonDependence =
+            dependency.type === DependenceTypes.python3;
+          const depInfo = (
+            await promiseExecSuccess(
+              isNodeDependence
+                ? `${getCommandPrefix} | grep "${depName}" | head -1`
+                : `${getCommandPrefix} ${depName}`,
+            )
+          )
+            .replace(/\s{2,}/, ' ')
+            .replace(/\s+$/, '');

-        // 如果删除依赖成功或者强制删除
-        if ((isSucceed || force) && !isInstall) {
-          this.removeDb(depIds);
+          if (
+            depInfo &&
+            ((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
+              (isLinuxDependence &&
+                depInfo.toLocaleLowerCase().includes('installed')) ||
+              isPythonDependence) &&
+            (!depVersion || depInfo.includes(depVersion))
+          ) {
+            const endTime = dayjs();
+            const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
+              'YYYY-MM-DD HH:mm:ss',
+            )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+            this.sockService.sendMessage({
+              type: socketMessageType,
+              message: _message,
+              references: depIds,
+            });
+            this.updateLog(depIds, _message);
+            await DependenceModel.update(
+              { status: DependenceStatus.installed },
+              { where: { id: depIds } },
+            );
+            return resolve(null);
+          }
        }

-        resolve(null);
+        const cp = spawn(`${depRunCommand} ${dependency.name.trim()}`, {
+          shell: '/bin/bash',
+        });
+
+        cp.stdout.on('data', async (data) => {
+          this.sockService.sendMessage({
+            type: socketMessageType,
+            message: data.toString(),
+            references: depIds,
+          });
+          this.updateLog(depIds, data.toString());
+        });
+
+        cp.stderr.on('data', async (data) => {
+          this.sockService.sendMessage({
+            type: socketMessageType,
+            message: data.toString(),
+            references: depIds,
+          });
+          this.updateLog(depIds, data.toString());
+        });
+
+        cp.on('error', async (err) => {
+          this.sockService.sendMessage({
+            type: socketMessageType,
+            message: JSON.stringify(err),
+            references: depIds,
+          });
+          this.updateLog(depIds, JSON.stringify(err));
+        });
+
+        cp.on('exit', async (code) => {
+          const endTime = dayjs();
+          const isSucceed = code === 0;
+          const resultText = isSucceed ? '成功' : '失败';
+
+          const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format(
+            'YYYY-MM-DD HH:mm:ss',
+          )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+          this.sockService.sendMessage({
+            type: socketMessageType,
+            message,
+            references: depIds,
+          });
+          this.updateLog(depIds, message);
+
+          let status = null;
+          if (isSucceed) {
+            status = isInstall
+              ? DependenceStatus.installed
+              : DependenceStatus.removed;
+          } else {
+            status = isInstall
+              ? DependenceStatus.installFailed
+              : DependenceStatus.removeFailed;
+          }
+          await DependenceModel.update({ status }, { where: { id: depIds } });
+
+          // 如果删除依赖成功或者强制删除
+          if ((isSucceed || force) && !isInstall) {
+            this.removeDb(depIds);
+          }
+
+          resolve(null);
+        });
      });
    });
  }
@@ -12,7 +12,7 @@ import {
  stepPosition,
 } from '../data/env';
 import groupBy from 'lodash/groupBy';
-import { Op } from 'sequelize';
+import { FindOptions, Op } from 'sequelize';

@Service()
 export default class EnvService {
@@ -49,7 +49,9 @@ export default class EnvService {
  }

  public async update(payload: Env): Promise<Env> {
-    const newDoc = await this.updateDb(payload);
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new Env({ ...doc, ...payload });
+    const newDoc = await this.updateDb(tab);
    await this.set_envs();
    return newDoc;
  }
@@ -92,13 +94,17 @@ export default class EnvService {
      position: this.getPrecisionPosition(targetPosition),
    });

-    await this.checkPosition(targetPosition);
+    await this.checkPosition(targetPosition, envs[toIndex].position!);
    return newDoc;
  }

-  private async checkPosition(position: number) {
+  private async checkPosition(position: number, edge: number = 0) {
    const precisionPosition = parseFloat(position.toPrecision(16));
-    if (precisionPosition < minPosition || precisionPosition > maxPosition) {
+    if (
+      precisionPosition < minPosition ||
+      precisionPosition > maxPosition ||
+      Math.abs(precisionPosition - edge) < minPosition
+    ) {
      const envs = await this.envs();
      let position = initPosition;
      for (const env of envs) {
@@ -115,7 +121,7 @@ export default class EnvService {
  public async envs(searchText: string = '', query: any = {}): Promise<Env[]> {
    let condition = { ...query };
    if (searchText) {
-      const encodeText = encodeURIComponent(searchText);
+      const encodeText = encodeURI(searchText);
      const reg = {
        [Op.or]: [
          { [Op.like]: `%${searchText}%` },
@@ -140,7 +146,6 @@ export default class EnvService {
    }
    try {
      const result = await this.find(condition, [
-        ['status', 'ASC'],
        ['position', 'DESC'],
        ['createdAt', 'ASC'],
      ]);
@@ -158,7 +163,7 @@ export default class EnvService {
    return docs;
  }

-  public async getDb(query: any): Promise<Env> {
+  public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
    const doc: any = await EnvModel.findOne({ where: { ...query } });
    return doc && (doc.get({ plain: true }) as Env);
  }
@@ -197,11 +202,9 @@ export default class EnvService {
          let value = group
            .map((x) => x.value)
            .join('&')
-            .replace(/(\\)[^n]/g, '\\\\')
-            .replace(/(\\$)/, '\\\\')
-            .replace(/"/g, '\\"')
+            .replace(/'/g, "'\\''")
            .trim();
-          env_string += `export ${key}="${value}"\n`;
+          env_string += `export ${key}='${value}'\n`;
        }
      }
    }
@@ -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 {
@@ -28,15 +28,17 @@ export default class NotificationService {
    ['iGot', this.iGot],
    ['pushPlus', this.pushPlus],
    ['email', this.email],
+    ['pushMe', this.pushMe],
    ['webhook', this.webhook],
    ['lark', this.lark],
+    ['chronocat', this.chronocat],
  ]);

  private title = '';
  private content = '';
  private params!: Omit<NotificationInfo, 'type'>;
  private gotOption = {
-    timeout: 30000,
+    timeout: 10000,
    retry: 1,
  };

@@ -78,33 +80,49 @@ export default class NotificationService {
  }

  private async gotify() {
-    const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
-    const res: any = await got
-      .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        ...this.gotOption,
-        body: `title=${encodeURIComponent(
-          this.title,
-        )}&message=${encodeURIComponent(
-          this.content,
-        )}&priority=${gotifyPriority}`,
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-        },
-      })
-      .json();
-    return typeof res.id === 'number';
+    const { gotifyUrl, gotifyToken, gotifyPriority = 1 } = this.params;
+    try {
+      const res: any = await got
+        .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
+          ...this.gotOption,
+          body: `title=${encodeURIComponent(
+            this.title,
+          )}&message=${encodeURIComponent(
+            this.content,
+          )}&priority=${gotifyPriority}`,
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+          },
+        })
+        .json();
+      if (typeof res.id === 'number') {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async goCqHttpBot() {
    const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
-    const res: any = await got
-      .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        ...this.gotOption,
-        json: { message: `${this.title}\n${this.content}` },
-        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
-      })
-      .json();
-    return res.retcode === 0;
+    try {
+      const res: any = await got
+        .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
+          ...this.gotOption,
+          json: { message: `${this.title}\n${this.content}` },
+          headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+        })
+        .json();
+      if (res.retcode === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async serverChan() {
@@ -112,63 +130,98 @@ export default class NotificationService {
    const url = serverChanKey.startsWith('SCT')
      ? `https://sctapi.ftqq.com/${serverChanKey}.send`
      : `https://sc.ftqq.com/${serverChanKey}.send`;
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        body: `title=${this.title}&desp=${this.content}`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
-      .json();
-    return res.errno === 0 || res.data.errno === 0;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          body: `title=${this.title}&desp=${this.content}`,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();
+      if (res.errno === 0 || res.data.errno === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async pushDeer() {
    const { pushDeerKey, pushDeerUrl } = this.params;
    const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
-          this.title,
-        )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
-      .json();
-    return (
-      res.content.result.length !== undefined && res.content.result.length > 0
-    );
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
+            this.title,
+          )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();
+      if (
+        res.content.result.length !== undefined &&
+        res.content.result.length > 0
+      ) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async chat() {
    const { chatUrl, chatToken } = this.params;
    const url = `${chatUrl}${chatToken}`;
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        body: `payload={"text":"${this.title}\n${this.content}"}`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
-      .json();
-    return res.success;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          body: `payload={"text":"${this.title}\n${this.content}"}`,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();
+      if (res.success) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async bark() {
-    let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
-    if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
+    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
+      this.params;
+    if (!barkPush.startsWith('http')) {
      barkPush = `https://api.day.app/${barkPush}`;
    }
    const url = `${barkPush}/${encodeURIComponent(
      this.title,
    )}/${encodeURIComponent(
      this.content,
-    )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
-    const res: any = await got
-      .get(url, {
-        ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
-      .json();
-    return res.code === 200;
+    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
+
+    try {
+      const res: any = await got
+        .get(url, {
+          ...this.gotOption,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();
+      if (res.code === 200) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async telegramBot() {
@@ -200,15 +253,23 @@ export default class NotificationService {
        https: httpsAgent,
      };
    }
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        agent,
-      })
-      .json();
-    return !!res.ok;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          agent,
+        })
+        .json();
+      if (res.ok) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async dingtalkBot() {
@@ -222,42 +283,60 @@ export default class NotificationService {
      secretParam = `&timestamp=${dateNow}&sign=${result}`;
    }
    const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        json: {
-          msgtype: 'text',
-          text: {
-            content: ` ${this.title}\n\n${this.content}`,
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          json: {
+            msgtype: 'text',
+            text: {
+              content: ` ${this.title}\n\n${this.content}`,
+            },
          },
-        },
-      })
-      .json();
-    return res.errcode === 0;
+        })
+        .json();
+      if (res.errcode === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async weWorkBot() {
-    const { weWorkBotKey } = this.params;
-    const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        json: {
-          msgtype: 'text',
-          text: {
-            content: ` ${this.title}\n\n${this.content}`,
+    const { weWorkBotKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } =
+      this.params;
+    const url = `${weWorkOrigin}/cgi-bin/webhook/send?key=${weWorkBotKey}`;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          json: {
+            msgtype: 'text',
+            text: {
+              content: ` ${this.title}\n\n${this.content}`,
+            },
          },
-        },
-      })
-      .json();
-    return res.errcode === 0;
+        })
+        .json();
+      if (res.errcode === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async weWorkApp() {
-    const { weWorkAppKey } = this.params;
+    const { weWorkAppKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } =
+      this.params;
    const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] =
      weWorkAppKey.split(',');
-    const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
+    const url = `${weWorkOrigin}/cgi-bin/gettoken`;
    const tokenRes: any = await got
      .post(url, {
        ...this.gotOption,
@@ -306,22 +385,30 @@ export default class NotificationService {
        break;
    }

-    const res: any = await got
-      .post(
-        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
-        {
-          ...this.gotOption,
-          json: {
-            touser,
-            agentid,
-            safe: '0',
-            ...options,
+    try {
+      const res: any = await got
+        .post(
+          `${weWorkOrigin}/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
+          {
+            ...this.gotOption,
+            json: {
+              touser,
+              agentid,
+              safe: '0',
+              ...options,
+            },
          },
-        },
-      )
-      .json();
+        )
+        .json();

-    return res.errcode === 0;
+      if (res.errcode === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async aibotk() {
@@ -353,85 +440,211 @@ export default class NotificationService {
        break;
    }

-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        json: {
-          ...json,
-        },
-      })
-      .json();
-
-    return res.code === 0;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          json: {
+            ...json,
+          },
+        })
+        .json();
+      if (res.code === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async iGot() {
    const { iGotPushKey } = this.params;
    const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        body: `title=${this.title}&content=${this.content}`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
-      .json();
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          body: `title=${this.title}&content=${this.content}`,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();

-    return res.ret === 0;
+      if (res.ret === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async pushPlus() {
    const { pushPlusToken, pushPlusUser } = this.params;
    const url = `https://www.pushplus.plus/send`;
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        json: {
-          token: `${pushPlusToken}`,
-          title: `${this.title}`,
-          content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
-          topic: `${pushPlusUser || ''}`,
-        },
-      })
-      .json();
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          json: {
+            token: `${pushPlusToken}`,
+            title: `${this.title}`,
+            content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
+            topic: `${pushPlusUser || ''}`,
+          },
+        })
+        .json();

-    return res.code === 200;
+      if (res.code === 200) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async lark() {
-    const { larkKey } = this.params;
-    const res: any = await got
-      .post(`https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`, {
-        ...this.gotOption,
-        json: {
-          msg_type: 'text',
-          content: { text: `${this.title}\n\n${this.content}` },
-        },
-        headers: { 'Content-Type': 'application/json' },
-      })
-      .json();
-    return res.StatusCode === 0;
+    let { larkKey } = this.params;
+
+    if (!larkKey.startsWith('http')) {
+      larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
+    }
+
+    try {
+      const res: any = await got
+        .post(larkKey, {
+          ...this.gotOption,
+          json: {
+            msg_type: 'text',
+            content: { text: `${this.title}\n\n${this.content}` },
+          },
+          headers: { 'Content-Type': 'application/json' },
+        })
+        .json();
+      if (res.StatusCode === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private async email() {
    const { emailPass, emailService, emailUser } = this.params;
-    const transporter = nodemailer.createTransport({
-      service: emailService,
-      auth: {
-        user: emailUser,
-        pass: emailPass,
-      },
-    });

-    const info = await transporter.sendMail({
-      from: `"青龙快讯" <${emailUser}>`,
-      to: `${emailUser}`,
-      subject: `${this.title}`,
-      html: `${this.content.replace(/\n/g, '<br/>')}`,
-    });
+    try {
+      const transporter = nodemailer.createTransport({
+        service: emailService,
+        auth: {
+          user: emailUser,
+          pass: emailPass,
+        },
+      });

-    transporter.close();
+      const info = await transporter.sendMail({
+        from: `"青龙快讯" <${emailUser}>`,
+        to: `${emailUser}`,
+        subject: `${this.title}`,
+        html: `${this.content.replace(/\n/g, '<br/>')}`,
+      });

-    return !!info.messageId;
+      transporter.close();
+
+      if (info.messageId) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(info));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
+  private async pushMe() {
+    const { pushMeKey } = this.params;
+    try {
+      const res: any = await got.post(
+        `https://push.i-i.me/?push_key=${pushMeKey}`,
+        {
+          ...this.gotOption,
+          json: {
+            title: this.title,
+            content: this.content,
+          },
+          headers: { 'Content-Type': 'application/json' },
+        },
+      );
+      if (res.body === 'success') {
+        return true;
+      } else {
+        throw new Error(res.body);
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
+  private async chronocat() {
+    const { chronocatURL, chronocatQQ, chronocatToekn } = 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 ${chronocatToekn}`,
+      };
+
+      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.body === 'success') {
+            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() {
@@ -460,8 +673,16 @@ export default class NotificationService {
      allowGetBody: true,
      ...bodyParam,
    };
-    const res = await got(formatUrl, options);
-    return String(res.statusCode).startsWith('20');
+    try {
+      const res = await got(formatUrl, options);
+      if (String(res.statusCode).startsWith('20')) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
  }

  private formatBody(contentType: string, body: any): object {
@@ -484,11 +705,11 @@ export default class NotificationService {

    return {
      formatUrl: url
-        .replaceAll('$title', encodeURIComponent(this.title))
-        .replaceAll('$content', encodeURIComponent(this.content)),
+        ?.replaceAll('$title', encodeURIComponent(this.title))
+        ?.replaceAll('$content', encodeURIComponent(this.content)),
      formatBody: body
-        .replaceAll('$title', this.title)
-        .replaceAll('$content', this.content),
+        ?.replaceAll('$title', this.title)
+        ?.replaceAll('$content', this.content),
    };
  }
 }
@@ -75,7 +75,7 @@ export default class OpenService {
  ): Promise<App[]> {
    let condition = { ...query };
    if (searchText) {
-      const encodeText = encodeURIComponent(searchText);
+      const encodeText = encodeURI(searchText);
      const reg = {
        [Op.or]: [
          { [Op.like]: `%${searchText}%` },
@@ -1,16 +1,18 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import nodeSchedule from 'node-schedule';
-import { ChildProcessWithoutNullStreams, exec, spawn } from 'child_process';
+import { ChildProcessWithoutNullStreams } from 'child_process';
 import {
  ToadScheduler,
  LongIntervalJob,
-  AsyncTask,
  SimpleIntervalSchedule,
+  Task,
 } from 'toad-scheduler';
 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;
@@ -40,72 +42,71 @@ export default class ScheduleService {

  private maxBuffer = 200 * 1024 * 1024;

-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor(@Inject('logger') private logger: winston.Logger) { }

  async runTask(
    command: string,
    callbacks: TaskCallbacks = {},
+    params: {
+      schedule?: string;
+      name?: string;
+      command?: string;
+    },
    completionTime: 'start' | 'end' = 'end',
  ) {
-    return new Promise(async (resolve, reject) => {
-      try {
-        const startTime = dayjs();
-        await callbacks.onBefore?.(startTime);
+    return taskLimit.runWithCronLimit(() => {
+      return new Promise(async (resolve, reject) => {
+        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify({ ...params, command })}`);

-        const cp = spawn(command, { shell: '/bin/bash' });
+        try {
+          const startTime = dayjs();
+          await callbacks.onBefore?.(startTime);

-        // TODO:
-        callbacks.onStart?.(cp, startTime);
-        completionTime === 'start' && resolve(cp.pid);
+          const cp = spawn(command, { shell: '/bin/bash' });

-        cp.stdout.on('data', async (data) => {
-          await callbacks.onLog?.(data.toString());
-        });
+          callbacks.onStart?.(cp, startTime);
+          completionTime === 'start' && resolve(cp.pid);

-        cp.stderr.on('data', async (data) => {
+          cp.stdout.on('data', async (data) => {
+            await callbacks.onLog?.(data.toString());
+          });
+
+          cp.stderr.on('data', async (data) => {
+            this.logger.info(
+              '[panel][执行任务失败] 命令: %s, 错误信息: %j',
+              command,
+              data.toString(),
+            );
+            await callbacks.onError?.(data.toString());
+          });
+
+          cp.on('error', async (err) => {
+            this.logger.error(
+              '[panel][创建任务失败] 命令: %s, 错误信息: %j',
+              command,
+              err,
+            );
+            await callbacks.onError?.(JSON.stringify(err));
+          });
+
+          cp.on('exit', async (code) => {
+            const endTime = dayjs();
+            await callbacks.onEnd?.(
+              cp,
+              endTime,
+              endTime.diff(startTime, 'seconds'),
+            );
+            resolve({ ...params, pid: cp.pid, code });
+          });
+        } catch (error) {
          this.logger.error(
-            '执行任务 %s 失败，时间：%s, 错误信息：%j',
+            '[panel][执行任务失败] 命令: %s, 错误信息: %j',
            command,
-            new Date().toLocaleString(),
-            data.toString(),
+            error,
          );
-          await callbacks.onError?.(data.toString());
-        });
-
-        cp.on('error', async (err) => {
-          this.logger.error(
-            '创建任务 %s 失败，时间：%s, 错误信息：%j',
-            command,
-            new Date().toLocaleString(),
-            err,
-          );
-          await callbacks.onError?.(JSON.stringify(err));
-        });
-
-        cp.on('exit', async (code, signal) => {
-          this.logger.info(
-            `任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`,
-          );
-        });
-
-        cp.on('close', async (code) => {
-          const endTime = dayjs();
-          await callbacks.onEnd?.(
-            cp,
-            endTime,
-            endTime.diff(startTime, 'seconds'),
-          );
-          resolve(null);
-        });
-      } catch (error) {
-        await this.logger.error(
-          '执行任务%s失败，时间：%s, 错误信息：%j',
-          command,
-          new Date().toLocaleString(),
-          error,
-        );
-        await callbacks.onError?.(JSON.stringify(error));
-      }
+          await callbacks.onError?.(JSON.stringify(error));
+        }
+      });
    });
  }

@@ -116,7 +117,7 @@ export default class ScheduleService {
  ) {
    const _id = this.formatId(id);
    this.logger.info(
-      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
+      '[panel][创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s',
      _id,
      schedule,
      name,
@@ -126,19 +127,30 @@ export default class ScheduleService {
    this.scheduleStacks.set(
      _id,
      nodeSchedule.scheduleJob(_id, schedule, async () => {
-        await this.runTask(command, callbacks);
+        this.runTask(command, callbacks, {
+          name,
+          schedule,
+          command,
+        });
      }),
    );

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

  async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
    const _id = this.formatId(id);
-    this.logger.info('[取消定时任务]，任务名：%s', name);
-    this.scheduleStacks.has(_id) && this.scheduleStacks.get(_id)?.cancel();
+    this.logger.info('[panel][取消定时任务], 任务名: %s', name);
+    if (this.scheduleStacks.has(_id)) {
+      this.scheduleStacks.get(_id)?.cancel();
+      this.scheduleStacks.delete(_id);
+    }
  }

  async createIntervalTask(
@@ -149,23 +161,23 @@ export default class ScheduleService {
  ) {
    const _id = this.formatId(id);
    this.logger.info(
-      '[创建interval任务]，任务ID: %s，任务名: %s，执行命令: %s',
+      '[panel][创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s',
      _id,
      name,
      command,
    );
-    const task = new AsyncTask(
+    const task = new Task(
      name,
-      async () => {
-        return new Promise(async (resolve, reject) => {
-          await this.runTask(command, callbacks);
+      () => {
+        this.runTask(command, callbacks, {
+          name,
+          command,
        });
      },
      (err) => {
        this.logger.error(
-          '执行任务%s失败，时间：%s, 错误信息：%j',
+          '[执行任务失败] 命令: %s, 错误信息: %j',
          command,
-          new Date().toLocaleString(),
          err,
        );
      },
@@ -180,13 +192,16 @@ export default class ScheduleService {
    this.intervalSchedule.addIntervalJob(job);

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

  async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {
    const _id = this.formatId(id);
-    this.logger.info('[取消interval任务]，任务ID: %s，任务名：%s', _id, name);
+    this.logger.info('[取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
    this.intervalSchedule.removeById(_id);
  }

@@ -16,14 +16,14 @@ export default class ScriptService {
    private sockService: SockService,
    private cronService: CronService,
    private scheduleService: ScheduleService,
-  ) {}
+  ) { }

  private taskCallbacks(filePath: string): TaskCallbacks {
    return {
      onEnd: async (cp, endTime, diff) => {
        try {
          fs.unlinkSync(filePath);
-        } catch (error) {}
+        } catch (error) { }
      },
      onError: async (message: string) => {
        this.sockService.sendMessage({
@@ -46,6 +46,7 @@ export default class ScriptService {
    const pid = await this.scheduleService.runTask(
      command,
      this.taskCallbacks(filePath),
+      { command },
      'start',
    );

@@ -53,14 +54,13 @@ export default class ScriptService {
  }

  public async stopScript(filePath: string, pid: number) {
-    let str = '';
    if (!pid) {
      const relativePath = path.relative(config.scriptPath, filePath);
-      pid = await getPid(`${TASK_COMMAND} -l ${relativePath} now`);
+      pid = await getPid(`${TASK_COMMAND} -l ${relativePath} now`) as number;
    }
    try {
      await killTask(pid);
-    } catch (error) {}
+    } catch (error) { }

    return { code: 200 };
  }
@@ -7,7 +7,7 @@ import { SockMessage } from '../data/sock';
 export default class SockService {
  private clients: Connection[] = [];

-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor(@Inject('logger') private logger: winston.Logger) { }

  public getClients() {
    return this.clients;
@@ -1,20 +1,42 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import fs from 'fs';
+import fs, { existsSync } from 'fs';
 import os from 'os';
 import path from 'path';
+import { Subscription } from '../data/subscription';
+import { formatUrl } from '../config/subscription';
+import config from '../config';

@Service()
 export default class SshKeyService {
  private homedir = os.homedir();
-  private sshPath = path.resolve(this.homedir, '.ssh');
-  private sshConfigFilePath = path.resolve(this.sshPath, 'config');
+  private sshPath = config.sshdPath;
+  private sshConfigFilePath = path.resolve(this.homedir, '.ssh', 'config');
+  private sshConfigHeader = `Include ${path.join(this.sshPath, '*.config')}`;

-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor(@Inject('logger') private logger: winston.Logger) {
+    this.initSshConfigFile();
+  }
+
+  private initSshConfigFile() {
+    let config = '';
+    if (existsSync(this.sshConfigFilePath)) {
+      config = fs.readFileSync(this.sshConfigFilePath, { encoding: 'utf-8' });
+    } else {
+      fs.writeFileSync(this.sshConfigFilePath, '');
+    }
+    if (!config.includes(this.sshConfigHeader)) {
+      fs.writeFileSync(
+        this.sshConfigFilePath,
+        `${this.sshConfigHeader}\n\n${config}`,
+        { encoding: 'utf-8' },
+      );
+    }
+  }

  private generatePrivateKeyFile(alias: string, key: string): void {
    try {
-      fs.writeFileSync(`${this.sshPath}/${alias}`, `${key}${os.EOL}`, {
+      fs.writeFileSync(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
        encoding: 'utf8',
        mode: '400',
      });
@@ -23,55 +45,39 @@ export default class SshKeyService {
    }
  }

-  private getConfigRegx(alias: string) {
-    return new RegExp(
-      `Host ${alias}\n.*[^StrictHostKeyChecking]*.*[\n]*.*StrictHostKeyChecking no`,
-      'g',
-    );
-  }
-
  private removePrivateKeyFile(alias: string): void {
    try {
-      fs.unlinkSync(`${this.sshPath}/${alias}`);
+      const filePath = path.join(this.sshPath, alias);
+      if (existsSync(filePath)) {
+        fs.unlinkSync(filePath);
+      }
    } catch (error) {
      this.logger.error('删除私钥文件失败', error);
    }
  }

-  private generateSingleSshConfig(
-    alias: string,
-    host: string,
-    proxy?: string,
-  ): string {
+  private generateSingleSshConfig(alias: string, host: string, proxy?: string) {
    if (host === 'github.com') {
-      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa\n    PubkeyAcceptedAlgorithms +ssh-rsa`;
-    }
-    const proxyStr = proxy ? `    ProxyCommand nc -v -x ${proxy} %h %p\n` : '';
-    return `\nHost ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no\n${proxyStr}`;
-  }
-
-  private generateSshConfig(configs: string[]) {
-    try {
-      for (const config of configs) {
-        fs.appendFileSync(this.sshConfigFilePath, config, {
-          encoding: 'utf8',
-        });
-      }
-    } catch (error) {
-      this.logger.error('写入ssh配置文件失败', error);
+      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa`;
    }
+    const proxyStr = proxy
+      ? `    ProxyCommand nc -v -x ${proxy} %h %p 2>/dev/null\n`
+      : '';
+    const config = `Host ${alias}\n    Hostname ${host}\n    IdentityFile ${path.join(
+      this.sshPath,
+      alias,
+    )}\n    StrictHostKeyChecking no\n${proxyStr}`;
+    fs.writeFileSync(`${path.join(this.sshPath, `${alias}.config`)}`, config, {
+      encoding: 'utf8',
+    });
  }

  private removeSshConfig(alias: string) {
    try {
-      const configRegx = this.getConfigRegx(alias);
-      const data = fs
-        .readFileSync(this.sshConfigFilePath, { encoding: 'utf8' })
-        .replace(configRegx, '')
-        .replace(/\n[\n]+/g, '\n');
-      fs.writeFileSync(this.sshConfigFilePath, data, {
-        encoding: 'utf8',
-      });
+      const filePath = path.join(this.sshPath, `${alias}.config`);
+      if (existsSync(filePath)) {
+        fs.unlinkSync(filePath);
+      }
    } catch (error) {
      this.logger.error(`删除ssh配置文件${alias}失败`, error);
    }
@@ -84,14 +90,27 @@ export default class SshKeyService {
    proxy?: string,
  ): void {
    this.generatePrivateKeyFile(alias, key);
-    const config = this.generateSingleSshConfig(alias, host, proxy);
-    this.removeSshConfig(alias);
-    this.generateSshConfig([config]);
+    this.generateSingleSshConfig(alias, host, proxy);
  }

  public removeSSHKey(alias: string, host: string, proxy?: string): void {
    this.removePrivateKeyFile(alias);
-    const config = this.generateSingleSshConfig(alias, host, proxy);
-    this.removeSshConfig(config);
+    this.removeSshConfig(alias);
+  }
+
+  public 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(
+          alias,
+          (doc.pull_option as any).private_key,
+        );
+        this.generateSingleSshConfig(alias, host, proxy);
+      }
+    }
  }
 }
@@ -6,12 +6,7 @@ import {
  SubscriptionModel,
  SubscriptionStatus,
 } from '../data/subscription';
-import {
-  ChildProcessWithoutNullStreams,
-  exec,
-  execSync,
-  spawn,
-} from 'child_process';
+import { ChildProcessWithoutNullStreams } from 'child_process';
 import fs from 'fs';
 import {
  getFileContentByName,
@@ -19,16 +14,22 @@ import {
  fileExist,
  createFile,
  killTask,
+  handleLogPath,
+  promiseExec,
+  emptyDir,
 } from '../config/util';
 import { promises, existsSync } from 'fs';
-import { Op } from 'sequelize';
-import path from 'path';
+import { FindOptions, Op } from 'sequelize';
+import path, { join } from 'path';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import { SimpleIntervalSchedule } from 'toad-scheduler';
 import SockService from './sock';
 import SshKeyService from './sshKey';
 import dayjs from 'dayjs';
 import { LOG_END_SYMBOL } from '../config/const';
+import { formatCommand, formatUrl } from '../config/subscription';
+import { CrontabModel } from '../data/cron';
+import CrontabService from './cron';

@Service()
 export default class SubscriptionService {
@@ -37,7 +38,8 @@ export default class SubscriptionService {
    private scheduleService: ScheduleService,
    private sockService: SockService,
    private sshKeyService: SshKeyService,
-  ) {}
+    private crontabService: CrontabService,
+  ) { }

  public async list(searchText?: string): Promise<Subscription[]> {
    let query = {};
@@ -45,7 +47,7 @@ export default class SubscriptionService {
      const reg = {
        [Op.or]: [
          { [Op.like]: `%${searchText}%` },
-          { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+          { [Op.like]: `%${encodeURI(searchText)}%` },
        ],
      };
      query = {
@@ -67,75 +69,20 @@ export default class SubscriptionService {
          ['createdAt', 'DESC'],
        ],
      });
-      return result as any;
+      return result;
    } catch (error) {
      throw error;
    }
  }

-  private formatCommand(doc: Subscription, url?: string) {
-    let command = 'ql ';
-    let _url = url || this.formatUrl(doc).url;
-    const {
-      type,
-      whitelist,
-      blacklist,
-      dependences,
-      branch,
-      extensions,
-      proxy,
-      autoAddCron,
-      autoDelCron,
-    } = doc;
-    if (type === 'file') {
-      command += `raw "${_url}"`;
-    } else {
-      command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
-        dependences || ''
-      }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}" "${
-        Boolean(autoAddCron) || ''
-      }" "${Boolean(autoDelCron) || ''}"`;
-    }
-    return command;
-  }
-
-  private formatUrl(doc: Subscription) {
-    let url = doc.url;
-    let host = '';
-    if (doc.type === 'private-repo') {
-      if (doc.pull_type === 'ssh-key') {
-        host = doc.url!.replace(/.*\@([^\:]+)\:.*/, '$1');
-        url = doc.url!.replace(host, doc.alias);
-      } else {
-        host = doc.url!.replace(/.*\:\/\/([^\/]+)\/.*/, '$1');
-        const { username, password } = doc.pull_option as any;
-        url = doc.url!.replace(host, `${username}:${password}@${host}`);
-      }
-    }
-    return { url, host };
-  }
-
  public async handleTask(
    doc: Subscription,
    needCreate = true,
-    needAddKey = true,
    runImmediately = false,
  ) {
-    const { url, host } = this.formatUrl(doc);
-    if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
-      if (needAddKey) {
-        this.sshKeyService.addSSHKey(
-          (doc.pull_option as any).private_key,
-          doc.alias,
-          host,
-          doc.proxy,
-        );
-      } else {
-        this.sshKeyService.removeSSHKey(doc.alias, host, doc.proxy);
-      }
-    }
+    const { url } = formatUrl(doc);

-    doc.command = this.formatCommand(doc, url as string);
+    doc.command = formatCommand(doc, url as string);

    if (doc.schedule_type === 'crontab') {
      this.scheduleService.cancelCronTask(doc as any);
@@ -158,28 +105,9 @@ export default class SubscriptionService {
    }
  }

-  private async promiseExec(command: string): Promise<string> {
-    return new Promise((resolve, reject) => {
-      exec(
-        command,
-        { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
-        (err, stdout, stderr) => {
-          resolve(stdout || stderr || JSON.stringify(err));
-        },
-      );
-    });
-  }
-
-  private async handleLogPath(
-    logPath: string,
-    data: string = '',
-  ): Promise<string> {
-    const absolutePath = path.resolve(config.logPath, logPath);
-    const logFileExist = await fileExist(absolutePath);
-    if (!logFileExist) {
-      await createFile(absolutePath, data);
-    }
-    return absolutePath;
+  public async setSshConfig() {
+    const docs = await SubscriptionModel.findAll();
+    this.sshKeyService.setSshConfig(docs);
  }

  private taskCallbacks(doc: Subscription): TaskCallbacks {
@@ -194,7 +122,7 @@ export default class SubscriptionService {
          },
          { where: { id: doc.id } },
        );
-        const absolutePath = await this.handleLogPath(
+        const absolutePath = await handleLogPath(
          logPath as string,
          `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`,
        );
@@ -204,7 +132,7 @@ export default class SubscriptionService {
        try {
          if (doc.sub_before) {
            fs.appendFileSync(absolutePath, `\n## 执行before命令...\n\n`);
-            beforeStr = await this.promiseExec(doc.sub_before);
+            beforeStr = await promiseExec(doc.sub_before);
          }
        } catch (error: any) {
          beforeStr =
@@ -224,14 +152,14 @@ export default class SubscriptionService {
      },
      onEnd: async (cp, endTime, diff) => {
        const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);

        // 执行 sub_after
        let afterStr = '';
        try {
          if (sub.sub_after) {
            fs.appendFileSync(absolutePath, `\n\n## 执行after命令...\n\n`);
-            afterStr = await this.promiseExec(sub.sub_after);
+            afterStr = await promiseExec(sub.sub_after);
          }
        } catch (error: any) {
          afterStr =
@@ -261,12 +189,12 @@ export default class SubscriptionService {
      },
      onError: async (message: string) => {
        const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);
        fs.appendFileSync(absolutePath, `\n${message}`);
      },
      onLog: async (message: string) => {
        const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);
        fs.appendFileSync(absolutePath, `\n${message}`);
      },
    };
@@ -276,6 +204,7 @@ export default class SubscriptionService {
    const tab = new Subscription(payload);
    const doc = await this.insert(tab);
    await this.handleTask(doc);
+    await this.setSshConfig();
    return doc;
  }

@@ -284,9 +213,11 @@ export default class SubscriptionService {
  }

  public async update(payload: Subscription): Promise<Subscription> {
-    const tab = new Subscription(payload);
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new Subscription({ ...doc, ...payload });
    const newDoc = await this.updateDb(tab);
    await this.handleTask(newDoc, !newDoc.is_disabled);
+    await this.setSshConfig();
    return newDoc;
  }

@@ -326,15 +257,29 @@ export default class SubscriptionService {
    );
  }

-  public async remove(ids: number[]) {
+  public async remove(ids: number[], query: any) {
    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
    for (const doc of docs) {
-      await this.handleTask(doc, false, false);
+      await this.handleTask(doc, false);
    }
    await SubscriptionModel.destroy({ where: { id: ids } });
+    await this.setSshConfig();
+
+    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!))
+      }
+      for (const doc of docs) {
+        const filePath = join(config.scriptPath, doc.alias);
+        emptyDir(filePath);
+      }
+    }
  }

-  public async getDb(query: any): Promise<Subscription> {
+  public async getDb(
+    query: FindOptions<Subscription>['where'],
+  ): Promise<Subscription> {
    const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
    return doc && (doc.get({ plain: true }) as Subscription);
  }
@@ -344,10 +289,9 @@ export default class SubscriptionService {
      { status: SubscriptionStatus.queued },
      { where: { id: ids } },
    );
-    concurrentRun(
-      ids.map((id) => async () => await this.runSingle(id)),
-      10,
-    );
+    ids.forEach((id) => {
+      this.runSingle(id);
+    });
  }

  public async stop(ids: number[]) {
@@ -357,17 +301,9 @@ export default class SubscriptionService {
        try {
          await killTask(doc.pid);
        } catch (error) {
-          this.logger.silly(error);
+          this.logger.error(error);
        }
      }
-      const absolutePath = await this.handleLogPath(doc.log_path as string);
-
-      fs.appendFileSync(
-        `${absolutePath}`,
-        `\n## 执行结束...  ${dayjs().format(
-          'YYYY-MM-DD HH:mm:ss',
-        )}${LOG_END_SYMBOL}`,
-      );
    }

    await SubscriptionModel.update(
@@ -382,28 +318,31 @@ export default class SubscriptionService {
      return;
    }

-    const command = this.formatCommand(subscription);
+    const command = formatCommand(subscription);

-    await 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[]) {
+    await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
+    await this.setSshConfig();
    for (const doc of docs) {
      await this.handleTask(doc, false);
    }
-    await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
  }

  public async enabled(ids: number[]) {
+    await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
+    await this.setSshConfig();
    for (const doc of docs) {
      await this.handleTask(doc);
    }
-    await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
  }

  public async log(id: number) {
@@ -412,7 +351,7 @@ export default class SubscriptionService {
      return '';
    }

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

@@ -1,15 +1,34 @@
+import { Response } from 'express';
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import * as fs from 'fs';
-import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
+import {
+  AuthDataType,
+  AuthInfo,
+  AuthInstance,
+  AuthModel,
+  AuthModelInfo,
+} from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
-import ScheduleService from './schedule';
-import { spawn } from 'child_process';
+import ScheduleService, { TaskCallbacks } from './schedule';
+import { spawn } from 'cross-spawn';
 import SockService from './sock';
 import got from 'got';
-import { parseContentVersion, parseVersion } from '../config/util';
+import {
+  getPid,
+  killTask,
+  parseContentVersion,
+  parseVersion,
+  promiseExec,
+  readDirs,
+} from '../config/util';
+import { TASK_COMMAND } from '../config/const';
+import taskLimit from '../shared/pLimit';
+import tar from 'tar';
+import path from 'path';
+import fs from 'fs';
+import sum from 'lodash/sum';

@Service()
 export default class SystemService {
@@ -20,22 +39,22 @@ export default class SystemService {
    @Inject('logger') private logger: winston.Logger,
    private scheduleService: ScheduleService,
    private sockService: SockService,
-  ) {}
+  ) { }

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

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

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

  public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -56,25 +75,30 @@ export default class SystemService {
    }
  }

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

  public async checkUpdate() {
@@ -90,7 +114,7 @@ export default class SystemService {
          },
        );
        lastVersionContent = await parseContentVersion(result.body);
-      } catch (error) {}
+      } catch (error) { }

      if (!lastVersionContent) {
        lastVersionContent = currentVersionContent;
@@ -136,7 +160,7 @@ export default class SystemService {
  }

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

    cp.stdout.on('data', (data) => {
      this.sockService.sendMessage({
@@ -162,6 +186,33 @@ 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),
+      });
+    });
+
+    return { code: 200 };
+  }
+
  public async notify({ title, content }: { title: string; content: string }) {
    const isSuccess = await this.notificationService.notify(title, content);
    if (isSuccess) {
@@ -170,4 +221,89 @@ export default class SystemService {
      return { code: 400, message: '通知发送失败，请检查系统设置/通知配置' };
    }
  }
+
+  public async run(
+    { command, logPath }: { command: string; logPath: string },
+    callback: TaskCallbacks,
+  ) {
+    if (!command.startsWith(TASK_COMMAND)) {
+      command = `${TASK_COMMAND} ${command}`;
+    }
+    this.scheduleService.runTask(
+      `real_log_path=${logPath} real_time=true ${command}`,
+      callback,
+      {
+        command,
+      }
+    );
+  }
+
+  public async stop({ command, pid }: { command: string; pid: number }) {
+    if (!pid && !command) {
+      return { code: 400, message: '参数错误' };
+    }
+
+    if (pid) {
+      await killTask(pid);
+      return { code: 200 };
+    }
+
+    if (!command.startsWith(TASK_COMMAND)) {
+      command = `${TASK_COMMAND} ${command}`;
+    }
+    const _pid = await getPid(command);
+    if (_pid) {
+      await killTask(_pid);
+      return { code: 200 };
+    } else {
+      return { code: 400, message: '任务未找到' };
+    }
+  }
+
+  public async exportData(res: Response) {
+    try {
+      await tar.create(
+        { gzip: true, file: config.dataTgzFile, cwd: config.rootPath },
+        ['data'],
+      );
+      res.download(config.dataTgzFile);
+    } catch (error: any) {
+      return res.send({ code: 400, message: error.message });
+    }
+  }
+
+  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 };
+    } catch (error: any) {
+      return { code: 400, message: error.message };
+    }
+  }
+
+  public async getSystemLog(res: Response) {
+    const result = 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)),
+    });
+    (function sendFiles(res, fileNames) {
+      if (fileNames.length === 0) {
+        res.end();
+        return;
+      }
+
+      const currentLog = fileNames.shift();
+      if (currentLog) {
+        const currentFileStream = fs.createReadStream(
+          path.join(config.systemLogPath, currentLog.title),
+        );
+        currentFileStream.on('end', () => {
+          sendFiles(res, fileNames);
+        });
+        currentFileStream.pipe(res, { end: false });
+      }
+    })(res, logs);
+  }
 }
@@ -1,16 +1,27 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import { createRandomString, getNetIp, getPlatform } from '../config/util';
+import {
+  createRandomString,
+  fileExist,
+  getNetIp,
+  getPlatform,
+  safeJSONParse,
+} from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
-import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
+import {
+  AuthDataType,
+  AuthInfo,
+  AuthModel,
+  AuthModelInfo,
+  LoginStatus,
+} from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
 import { Request } from 'express';
 import ScheduleService from './schedule';
-import { spawn } from 'child_process';
 import SockService from './sock';
 import dayjs from 'dayjs';

@@ -183,12 +194,14 @@ export default class UserService {
    });
  }

-  public async getLoginLog(): Promise<AuthInfo[]> {
+  public async getLoginLog(): Promise<Array<AuthModelInfo | undefined>> {
    const docs = await AuthModel.findAll({
      where: { type: AuthDataType.loginLog },
    });
    if (docs && docs.length > 0) {
-      const result = docs.sort((a, b) => b.info.timestamp - a.info.timestamp);
+      const result = docs.sort(
+        (a, b) => b.info!.timestamp! - a.info!.timestamp!,
+      );
      if (result.length > 100) {
        await AuthModel.destroy({
          where: { id: result[result.length - 1].id },
@@ -205,17 +218,16 @@ export default class UserService {
  }

  private initAuthInfo() {
-    const newPassword = createRandomString(16, 22);
    fs.writeFileSync(
      config.authConfigFile,
      JSON.stringify({
        username: 'admin',
-        password: newPassword,
+        password: 'admin',
      }),
    );
    return {
      code: 100,
-      message: '已初始化密码，请前往auth.json查看并重新登录',
+      message: '未找到认证文件，重新初始化',
    };
  }

@@ -240,13 +252,18 @@ export default class UserService {
    return { code: 200, data: avatar, message: '更新成功' };
  }

-  public getUserInfo(): Promise<any> {
-    return new Promise((resolve) => {
-      fs.readFile(config.authConfigFile, 'utf8', (err, data) => {
-        if (err) console.log(err);
-        resolve(JSON.parse(data));
-      });
-    });
+  public async getUserInfo(): Promise<any> {
+    const authFileExist = await fileExist(config.authConfigFile);
+    if (!authFileExist) {
+      fs.writeFileSync(
+        config.authConfigFile,
+        JSON.stringify({
+          username: 'admin',
+          password: 'admin',
+        }),
+      );
+    }
+    return this.getAuthInfo();
  }

  public initTwoFactor() {
@@ -311,7 +328,7 @@ export default class UserService {

  private getAuthInfo() {
    const content = fs.readFileSync(config.authConfigFile, 'utf8');
-    return JSON.parse(content || '{}');
+    return safeJSONParse(content);
  }

  private updateAuthInfo(authInfo: any, info: any) {
@@ -0,0 +1,84 @@
+import PQueue, { QueueAddOptions } from 'p-queue-cjs';
+import os from 'os';
+import { AuthDataType, AuthModel } from '../data/auth';
+import Logger from '../loaders/logger';
+
+class TaskLimit {
+  private oneLimit = new PQueue({ concurrency: 1 });
+  private updateLogLimit = new PQueue({ concurrency: 1 });
+  private cronLimit = new PQueue({ concurrency: Math.max(os.cpus().length, 4) });
+
+  get cronLimitActiveCount() {
+    return this.cronLimit.pending;
+  }
+
+  get cronLimitPendingCount() {
+    return this.cronLimit.size;
+  }
+
+  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 async setCustomLimit(limit?: number) {
+    if (limit) {
+      this.cronLimit.concurrency = limit;
+      return;
+    }
+    await AuthModel.sync();
+    const doc = await AuthModel.findOne({
+      where: { type: AuthDataType.systemConfig },
+    });
+    if (doc?.info?.cronConcurrency) {
+      this.cronLimit.concurrency = doc.info.cronConcurrency;
+    }
+  }
+
+  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>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+    return this.oneLimit.add(fn, options);
+  }
+
+  public updateDepLog<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+    return this.updateLogLimit.add(fn, options);
+  }
+}
+
+export default new TaskLimit();
@@ -0,0 +1,31 @@
+import { spawn } from 'cross-spawn';
+import taskLimit from './pLimit';
+import Logger from '../loaders/logger';
+
+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][开始执行任务] 参数 ${JSON.stringify({ ...options, command: cmd })}`);
+      const cp = spawn(cmd, { shell: '/bin/bash' });
+
+      cp.stderr.on('data', (data) => {
+        Logger.info(
+          '[schedule][执行任务失败] 命令: %s, 错误信息: %j',
+          cmd,
+          data.toString(),
+        );
+      });
+      cp.on('error', (err) => {
+        Logger.error(
+          '[schedule][创建任务失败] 命令: %s, 错误信息: %j',
+          cmd,
+          err,
+        );
+      });
+
+      cp.on('exit', async (code) => {
+        resolve({ ...options, command: cmd, pid: cp.pid, code });
+      });
+    });
+  });
+}
@@ -1,11 +1,11 @@
 FROM python:3.10-alpine 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 \
-    && cd /tmp/build \
-    && pnpm install --prod
+  && apk update \
+  && apk add nodejs npm git \
+  && npm i -g pnpm@8.3.1 \
+  && cd /tmp/build \
+  && pnpm --registry https://registry.npmmirror.com install --prod

 FROM python:3.10-alpine

@@ -15,58 +15,64 @@ 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 \
-    LANG=zh_CN.UTF-8 \
-    SHELL=/bin/bash \
-    PS1="\u@\h:\w \$ " \
-    QL_DIR=/ql \
-    QL_BRANCH=${QL_BRANCH}
+  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}

 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 \
-                             coreutils \
-                             moreutils \
-                             git \
-                             curl \
-                             wget \
-                             tzdata \
-                             perl \
-                             openssl \
-                             nginx \
-                             nodejs \
-                             jq \
-                             openssh \
-                             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 \
-    && npm install -g pnpm \
-    && pnpm add -g pm2 ts-node typescript tslib \
-    && rm -rf /root/.pnpm-store \
-    && rm -rf /root/.local/share/pnpm/store \
-    && rm -rf /root/.cache \
-    && rm -rf /root/.npm
+  && 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 \
+  coreutils \
+  git \
+  curl \
+  wget \
+  tzdata \
+  perl \
+  openssl \
+  nginx \
+  nodejs \
+  jq \
+  openssh \
+  procps \
+  netcat-openbsd \
+  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 \
+  && 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

 ARG SOURCE_COMMIT
-RUN git clone -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 -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
+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 http://127.0.0.1:5400/api/health || exit 1
+
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
@@ -1,9 +1,15 @@
 version: '2'
 services:
  web:
+    # alpine 基础镜像版本
    image: whyour/qinglong:latest
+    # debian-slim 基础镜像版本
+    # image: whyour/qinglong:debian  
    volumes:
      - ./data:/ql/data
    ports:
      - "0.0.0.0:5700:5700"
+    environment:
+      # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+      QlBaseUrl: '/'
    restart: unless-stopped
@@ -4,57 +4,52 @@ dir_shell=/ql/shell
 . $dir_shell/share.sh
 link_shell

-export isFirstStartServer=true
-
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
-cp -fv $nginx_conf /etc/nginx/nginx.conf
-cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
-sed -i "s,QL_BASE_URL,${qlBaseUrl},g" /etc/nginx/conf.d/front.conf
+init_nginx
+fix_config
+
 pm2 l &>/dev/null

-patch_version &>/dev/null
-echo
-
 echo -e "======================2. 安装依赖========================\n"
-update_depend
+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. 启动面板监控========================\n"
-pm2 delete public &>/dev/null
-pm2 start $dir_static/build/public.js -n public --source-map-support --time
-echo -e "监控服务启动成功...\n"
-
-echo -e "======================5. 启动控制面板========================\n"
-pm2 delete panel &>/dev/null
-pm2 start $dir_static/build/app.js -n panel --source-map-support --time
-echo -e "控制面板启动成功...\n"
-
-echo -e "======================6. 启动定时任务========================\n"
-pm2 delete schedule &>/dev/null
-pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time
-echo -e "定时任务启动成功...\n"
+echo -e "======================4. 启动pm2服务========================\n"
+reload_pm2

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

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

 echo -e "############################################################\n"
 echo -e "容器启动成功..."
-echo -e "\n请先访问5700端口，登录成功面板之后再执行添加定时任务..."
 echo -e "############################################################\n"

 crond -f >/dev/null
@@ -12,32 +12,35 @@ map $http_upgrade $connection_upgrade {
 }

 server {
-  listen 5700;
-  root /ql/static/dist;
+  IPV4_CONFIG
+  IPV6_CONFIG
  ssl_session_timeout 5m;

-  location QL_BASE_URL/api/public/ {
+  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/public/;
+    proxy_pass http://publicApi/api/;
+    proxy_buffering off;
  }

-  location QL_BASE_URL/api/ {
+  location QL_BASE_URLapi/ {
    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://baseApi/api/;
+    proxy_buffering off;

    proxy_set_header Upgrade $http_upgrade;
    proxy_set_header Connection $connection_upgrade;
  }

-  location QL_BASE_URL/open/ {
+  location QL_BASE_URLopen/ {
    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://baseApi/open/;
+    proxy_buffering off;
  }

  gzip on;
@@ -48,10 +51,12 @@ server {
  gzip_comp_level 6;
  gzip_buffers 16 8k;
  gzip_http_version 1.0;
+  QL_ROOT_CONFIG

-  location QL_BASE_URL/ {
+  location QL_BASE_URL_LOCATION {
+    QL_ALIAS_CONFIG
    index index.html index.htm;
-    try_files $uri $uri/ QL_BASE_URL/index.html;
+    try_files $uri QL_BASE_URLindex.html;
  }

  location ~ .*\.(html)$ {
@@ -14,7 +14,7 @@ http {

  server_tokens off;

-  client_max_body_size 20m;
+  client_max_body_size 4096m;
  client_body_buffer_size 20m;

  keepalive_timeout 65;
@@ -0,0 +1,34 @@
+module.exports = {
+  apps: [
+    {
+      name: 'schedule',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      source_map_support: true,
+      time: true,
+      script: 'static/build/schedule/index.js',
+    },
+    {
+      name: 'public',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      source_map_support: true,
+      time: true,
+      script: 'static/build/public.js',
+    },
+    {
+      name: 'panel',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      source_map_support: true,
+      time: true,
+      script: 'static/build/app.js',
+    },
+  ],
+};
@@ -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"
 }
@@ -4,12 +4,14 @@
    "start": "concurrently -n w: npm:start:*",
    "start:front": "max dev",
    "start:back": "nodemon",
-    "start:public": "ts-node --transpile-only ./back/public.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.js",
+    "schedule": "npm run build:back && node static/build/schedule/index.js",
    "public": "npm run build:back && node static/build/public.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",
    "test": "umi-test",
@@ -53,6 +55,7 @@
    }
  },
  "dependencies": {
+    "@grpc/grpc-js": "^1.8.13",
    "@otplib/preset-default": "^12.0.1",
    "@sentry/node": "^7.12.1",
    "@sentry/tracing": "^7.12.1",
@@ -61,14 +64,17 @@
    "chokidar": "^3.5.3",
    "cors": "^2.8.5",
    "cron-parser": "^4.2.1",
+    "cross-spawn": "^7.0.3",
    "dayjs": "^1.11.2",
    "dotenv": "^16.0.0",
    "express": "^4.17.3",
    "express-jwt": "^6.1.1",
+    "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",
@@ -77,28 +83,34 @@
    "nedb": "^1.8.0",
    "node-schedule": "^2.1.0",
    "nodemailer": "^6.7.2",
+    "p-queue-cjs": "7.3.4",
+    "protobufjs": "^7.2.3",
    "pstree.remy": "^1.1.8",
    "reflect-metadata": "^0.1.13",
    "sequelize": "^6.25.5",
    "serve-handler": "^6.1.3",
    "sockjs": "^0.3.24",
-    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.2",
+    "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"
  },
  "devDependencies": {
    "@ant-design/icons": "^4.7.0",
    "@ant-design/pro-layout": "6.38.22",
-    "@monaco-editor/react": "4.4.6",
+    "@monaco-editor/react": "4.2.1",
    "@react-hook/resize-observer": "^1.2.6",
    "@sentry/react": "^7.12.1",
    "@types/body-parser": "^1.19.2",
    "@types/cors": "^2.8.12",
+    "@types/cross-spawn": "^6.0.2",
    "@types/express": "^4.17.13",
    "@types/express-jwt": "^6.0.4",
+    "@types/file-saver": "^2.0.5",
    "@types/js-yaml": "^4.0.5",
    "@types/jsonwebtoken": "^8.5.8",
    "@types/lodash": "^4.14.185",
@@ -114,15 +126,20 @@
    "@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",
-    "@umijs/max": "^4.0.42",
+    "@uiw/codemirror-extensions-langs": "^4.21.9",
+    "@uiw/react-codemirror": "^4.21.9",
+    "@umijs/max": "^4.0.72",
    "@umijs/ssr-darkreader": "^4.9.45",
+    "ahooks": "^3.7.8",
    "ansi-to-react": "^6.1.6",
-    "antd": "^4.24.7",
+    "antd": "^4.24.8",
    "antd-img-crop": "^4.2.3",
-    "codemirror": "^5.65.2",
+    "axios": "^1.4.0",
    "compression-webpack-plugin": "9.2.0",
    "concurrently": "^7.0.0",
+    "file-saver": "^2.0.5",
    "lint-staged": "^13.0.3",
    "monaco-editor": "0.33.0",
    "nodemon": "^2.0.15",
@@ -131,21 +148,23 @@
    "qrcode.react": "^1.0.1",
    "query-string": "^7.1.1",
    "rc-tween-one": "^3.0.6",
+    "rc-virtual-list": "3.5.3",
    "react": "18.2.0",
-    "react-codemirror2": "^7.2.1",
    "react-copy-to-clipboard": "^5.1.0",
    "react-diff-viewer": "^3.1.1",
    "react-dnd": "^14.0.2",
    "react-dnd-html5-backend": "^14.0.0",
    "react-dom": "18.2.0",
+    "react-intl-universal": "^2.6.21",
    "react-split-pane": "^0.1.92",
    "sockjs-client": "^1.6.0",
    "ts-node": "^10.6.0",
+    "ts-proto": "^1.146.0",
    "tslib": "^2.4.0",
-    "typescript": "4.8.4",
-    "umi-request": "^1.4.0",
+    "tsx": "^3.12.3",
+    "typescript": "5.2.2",
    "vh-check": "^2.0.5",
-    "virtuallist-antd": "^0.7.6",
+    "virtualizedtableforantd4": "1.3.0",
    "webpack": "^5.70.0",
    "yorkie": "^2.0.0"
  }
@@ -1,9 +1,3 @@
-## Version: v2.8.0
-## Date: 2021-06-20
-## Update Content: 可持续发展纲要\n1. session管理破坏性修改\n2. 配置管理可编辑config下文件\n3. 自定义脚本改为查看脚本\n4. 移除互助相关
-
-## 上面版本号中，如果第2位数字有变化，那么代表增加了新的参数，如果只有第3位数字有变化，仅代表更新了注释，没有增加新的参数，可更新可不更新
-
 ## 在运行 ql repo 命令时，是否自动删除失效的脚本与定时任务
 AutoDelCron="true"

@@ -24,11 +18,8 @@ CpuWarn=80
 MemoryWarn=80
 DiskWarn=90

-## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-CommandTimeoutTime="1h"
-
-## 设置批量执行任务时的并发数，默认同时执行5个任务
-MaxConcurrentNum="5"
+## 设置定时任务执行的超时时间，例如1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
+CommandTimeoutTime=""

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

+## 企业微信反向代理地址
+## (环境变量名 QYWX_ORIGIN)
+export QYWX_ORIGIN=""
+
 ## 5. 企业微信机器人
 ## 官方说明文档：https://work.weixin.qq.com/api/doc/90000/90136/91770
 ## 下方填写密钥，企业微信推送 webhook 后面的 key
@@ -173,4 +168,18 @@ export SMTP_PASSWORD=""
 ## smtp_name 填写 SMTP 收发件人姓名，可随意填写
 export SMTP_NAME=""

+## 15. PushMe
+## 官方说明文档：https://push.i-i.me/
+## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
+export PUSHME_KEY=""
+
+## 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=""
+
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可
@@ -40,6 +40,8 @@ push_config = {
    'BARK_GROUP': '',                   # bark 推送分组
    'BARK_SOUND': '',                   # bark 推送声音
    'BARK_ICON': '',                    # bark 推送图标
+    'BARK_LEVEL': '',                   # bark 推送时效性
+    'BARK_URL': '',                     # bark 推送跳转URL

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

@@ -76,6 +78,8 @@ push_config = {
    'QMSG_KEY': '',                     # qmsg 酱的 QMSG_KEY
    'QMSG_TYPE': '',                    # qmsg 酱的 QMSG_TYPE

+    'QYWX_ORIGIN': '',                  # 企业微信代理地址
+    
    'QYWX_AM': '',                      # 企业微信应用

    'QYWX_KEY': '',                     # 企业微信机器人
@@ -96,6 +100,18 @@ push_config = {
    'SMTP_EMAIL': '',                   # SMTP 收发件邮箱，通知将会由自己发给自己
    'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
    '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
@@ -126,6 +142,8 @@ def bark(title: str, content: str) -> None:
        "BARK_GROUP": "group",
        "BARK_SOUND": "sound",
        "BARK_ICON": "icon",
+        "BARK_LEVEL": "level",
+        "BARK_URL": "url",
    }
    params = ""
    for pair in filter(
@@ -220,7 +238,7 @@ def go_cqhttp(title: str, content: str) -> None:
        print("go-cqhttp 推送失败！")


-def gotify(title:str,content:str)  -> None:
+def gotify(title: str, content: str) -> None:
    """
    使用 gotify 推送消息。
    """
@@ -230,8 +248,12 @@ def gotify(title:str,content:str)  -> None:
    print("gotify 服务启动")

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

    if response.get("id"):
        print("gotify 推送成功！")
@@ -269,10 +291,10 @@ def serverJ(title: str, content: str) -> None:
    print("serverJ 服务启动")

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

    if response.get("errno") == 0 or response.get("code") == 0:
@@ -289,8 +311,13 @@ def pushdeer(title: str, content: str) -> None:
        print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
        return
    print("PushDeer 服务启动")
-    data = {"text": title, "desp": content, "type": "markdown", "pushkey": push_config.get("DEER_KEY")}
-    url = 'https://api2.pushdeer.com/message/push'
+    data = {
+        "text": title,
+        "desp": content,
+        "type": "markdown",
+        "pushkey": push_config.get("DEER_KEY"),
+    }
+    url = "https://api2.pushdeer.com/message/push"
    if push_config.get("DEER_URL"):
        url = push_config.get("DEER_URL")

@@ -310,7 +337,7 @@ def chat(title: str, content: str) -> None:
        print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
        return
    print("chat 服务启动")
-    data = 'payload=' + json.dumps({'text': title + '\n' + content})
+    data = "payload=" + json.dumps({"text": title + "\n" + content})
    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
    response = requests.post(url, data=data)

@@ -320,7 +347,6 @@ def chat(title: str, content: str) -> None:
        print("Chat 推送失败！错误信息：", response)


-
 def pushplus_bot(title: str, content: str) -> None:
    """
    通过 push+ 推送消息。
@@ -345,7 +371,6 @@ def pushplus_bot(title: str, content: str) -> None:
        print("PUSHPLUS 推送成功！")

    else:
-
        url_old = "http://pushplus.hxtrip.com/send"
        headers["Accept"] = "application/json"
        response = requests.post(url=url_old, data=body, headers=headers).json()
@@ -416,9 +441,12 @@ class WeCom:
        self.CORPID = corpid
        self.CORPSECRET = corpsecret
        self.AGENTID = agentid
+        self.ORIGIN = "https://qyapi.weixin.qq.com"
+        if push_config.get("QYWX_ORIGIN"):
+            self.ORIGIN = push_config.get("QYWX_ORIGIN")

    def get_access_token(self):
-        url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"
+        url = f"{self.ORIGIN}/cgi-bin/gettoken"
        values = {
            "corpid": self.CORPID,
            "corpsecret": self.CORPSECRET,
@@ -429,8 +457,7 @@ class WeCom:

    def send_text(self, message, touser="@all"):
        send_url = (
-            "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="
-            + self.get_access_token()
+            f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
        )
        send_values = {
            "touser": touser,
@@ -446,8 +473,7 @@ class WeCom:

    def send_mpnews(self, title, message, media_id, touser="@all"):
        send_url = (
-            "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="
-            + self.get_access_token()
+            f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
        )
        send_values = {
            "touser": touser,
@@ -481,7 +507,11 @@ def wecom_bot(title: str, content: str) -> None:
        return
    print("企业微信机器人服务启动")

-    url = f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
+    origin = "https://qyapi.weixin.qq.com"
+    if push_config.get("QYWX_ORIGIN"):
+        origin = push_config.get("QYWX_ORIGIN")
+
+    url = f"{origin}/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
    headers = {"Content-Type": "application/json;charset=utf-8"}
    data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
    response = requests.post(
@@ -543,24 +573,28 @@ def aibotk(title: str, content: str) -> None:
    """
    使用 智能微秘书 推送消息。
    """
-    if not push_config.get("AIBOTK_KEY") or not push_config.get("AIBOTK_TYPE") or not push_config.get("AIBOTK_NAME"):
+    if (
+        not push_config.get("AIBOTK_KEY")
+        or not push_config.get("AIBOTK_TYPE")
+        or not push_config.get("AIBOTK_NAME")
+    ):
        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
        return
    print("智能微秘书 服务启动")

-    if push_config.get("AIBOTK_TYPE") == 'room':
+    if push_config.get("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"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+            "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"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+            "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
        }
    body = json.dumps(data).encode(encoding="utf-8")
    headers = {"Content-Type": "application/json"}
@@ -576,24 +610,225 @@ def smtp(title: str, content: str) -> 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"):
-        print("SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送")
+    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")
+    ):
+        print(
+            "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送"
+        )
        return
    print("SMTP 邮件 服务启动")

-    message = MIMEText(content, 'plain', 'utf-8')
-    message['From'] = formataddr((Header(push_config.get("SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
-    message['To'] = formataddr((Header(push_config.get("SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
-    message['Subject'] = Header(title, 'utf-8')
+    message = MIMEText(content, "plain", "utf-8")
+    message["From"] = formataddr(
+        (
+            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
+            push_config.get("SMTP_EMAIL"),
+        )
+    )
+    message["To"] = formataddr(
+        (
+            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
+            push_config.get("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"))
-        smtp_server.sendmail(push_config.get("SMTP_EMAIL"), push_config.get("SMTP_EMAIL"), message.as_bytes())
+        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")
+        )
+        smtp_server.sendmail(
+            push_config.get("SMTP_EMAIL"),
+            push_config.get("SMTP_EMAIL"),
+            message.as_bytes(),
+        )
        smtp_server.close()
        print("SMTP 邮件 推送成功！")
    except Exception as e:
-        print(f'SMTP 邮件 推送失败！{e}')
+        print(f"SMTP 邮件 推送失败！{e}")
+
+
+def pushme(title: str, content: str) -> None:
+    """
+    使用 PushMe 推送消息。
+    """
+    if not push_config.get("PUSHME_KEY"):
+        print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送")
+        return
+    print("PushMe 服务启动")
+
+    url = f'https://push.i-i.me/?push_key={push_config.get("PUSHME_KEY")}'
+    data = {
+        "title": title,
+        "content": content,
+    }
+    response = requests.post(url, data=data)
+
+    if response.status_code == 200 and response.text == "success":
+        print("PushMe 推送成功！")
+    else:
+        print(f"PushMe 推送失败！{response.status_code} {response.text}")
+
+
+def chronocat(title: str, content: str) -> None:
+    """
+    使用 CHRONOCAT 推送消息。
+    """
+    if (
+        not push_config.get("CHRONOCAT_URL")
+        or not push_config.get("CHRONOCAT_QQ")
+        or not push_config.get("CHRONOCAT_TOKEN")
+    ):
+        print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送")
+        return
+
+    print("CHRONOCAT 服务启动")
+
+    user_ids = re.findall(r"user_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+    group_ids = re.findall(r"group_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+
+    url = f'{push_config.get("CHRONOCAT_URL")}/api/message/send'
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f'Bearer {push_config.get("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_body(body, content_type):
+    if not body:
+        return ""
+
+    parsed = {}
+    lines = body.split("\n")
+
+    for line in lines:
+        i = line.find(":")
+        if i == -1:
+            continue
+
+        key = line[:i].strip().lower()
+        val = line[i + 1 :].strip()
+
+        if not key or key in parsed:
+            continue
+
+        try:
+            json_value = json.loads(val)
+            parsed[key] = json_value
+        except:
+            parsed[key] = val
+
+    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")
+
+    formatUrl, formatBody = format_notify_content(
+        WEBHOOK_URL, WEBHOOK_BODY, title, content
+    )
+
+    if not formatUrl and not formatBody:
+        print("请求头或者请求体中必须包含 $title 和 $content")
+        return
+
+    headers = parse_headers(WEBHOOK_HEADERS)
+    body = parse_body(formatBody, WEBHOOK_CONTENT_TYPE)
+    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:
@@ -636,10 +871,30 @@ if push_config.get("QYWX_KEY"):
    notify_function.append(wecom_bot)
 if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
    notify_function.append(telegram_bot)
-if push_config.get("AIBOTK_KEY") and push_config.get("AIBOTK_TYPE") and push_config.get("AIBOTK_NAME"):
+if (
+    push_config.get("AIBOTK_KEY")
+    and push_config.get("AIBOTK_TYPE")
+    and push_config.get("AIBOTK_NAME")
+):
    notify_function.append(aibotk)
-if 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"):
+if (
+    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")
+):
    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:
@@ -647,6 +902,13 @@ def send(title: str, content: str) -> None:
        print(f"{title} 推送内容为空！")
        return

+    # 根据标题跳过一些消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔
+    skipTitle = os.getenv("SKIP_PUSH_TITLE")
+    if skipTitle:
+        if title in re.split("\n", skipTitle):
+            print(f"{title} 在SKIP_PUSH_TITLE环境变量内，跳过推送！")
+            return
+
    hitokoto = push_config.get("HITOKOTO")

    text = one() if hitokoto else ""
@@ -3,13 +3,8 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "crypto-js": "^4.0.0",
-    "download": "^8.0.0",
    "got": "^11.5.1",
-    "http-server": "^0.12.3",
    "nodemailer": "^6.8.0",
-    "qrcode-terminal": "^0.12.0",
-    "request": "^2.88.2",
    "tough-cookie": "^4.0.0",
    "tunnel": "0.0.6",
    "ws": "^7.4.3"
@@ -1,15 +1,24 @@
 #!/usr/bin/env bash

+create_token() {
+  local token_command="tsx ${dir_root}/back/token.ts"
+  local token_file="${dir_root}/static/build/token.js"
+  if [[ -f $token_file ]]; then
+    token_command="node ${token_file}"
+  fi
+  token=$(eval "$token_command")
+}
+
 get_token() {
  if [[ -f $file_auth_token ]]; then
    token=$(cat $file_auth_token | jq -r .value)
-  else
-    local token_command="ts-node-transpile-only ${dir_root}/back/token.ts"
-    local token_file="${dir_root}static/build/token.js"
-    if [[ -f $token_file ]]; then
-      token_command="node ${token_file}"
+    local expiration=$(cat $file_auth_token | jq -r .expiration)
+    local currentTimeStamp=$(date +%s)
+    if [[ $currentTimeStamp -ge $expiration ]]; then
+      create_token
    fi
-    token=$(eval "$token_command")
+  else
+    create_token
  fi
 }

@@ -19,10 +28,16 @@ add_cron_api() {
    local schedule=$(echo "$1" | awk -F ":" '{print $1}')
    local command=$(echo "$1" | awk -F ":" '{print $2}')
    local name=$(echo "$1" | awk -F ":" '{print $3}')
+    local sub_id=$(echo "$1" | awk -F ":" '{print $4}')
  else
-    local schedule=$1
-    local command=$2
-    local name=$3
+    local schedule="$1"
+    local command="$2"
+    local name="$3"
+    local sub_id="$4"
+  fi
+
+  if [[ ! $sub_id ]]; then
+    sub_id="null"
  fi

  local api=$(
@@ -34,11 +49,11 @@ 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\"}" \
+      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
      --compressed
  )
-  code=$(echo $api | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  code=$(echo "$api" | jq -r .code)
+  message=$(echo "$api" | jq -r .message)
  if [[ $code == 200 ]]; then
    echo -e "$name -> 添加成功"
  else
@@ -54,10 +69,10 @@ update_cron_api() {
    local name=$(echo "$1" | awk -F ":" '{print $3}')
    local id=$(echo "$1" | awk -F ":" '{print $4}')
  else
-    local schedule=$1
-    local command=$2
-    local name=$3
-    local id=$4
+    local schedule="$1"
+    local command="$2"
+    local name="$3"
+    local id="$4"
  fi

  local api=$(
@@ -73,8 +88,8 @@ update_cron_api() {
      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
      --compressed
  )
-  code=$(echo $api | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  code=$(echo "$api" | jq -r .code)
+  message=$(echo "$api" | jq -r .message)
  if [[ $code == 200 ]]; then
    echo -e "$name -> 更新成功"
  else
@@ -88,8 +103,8 @@ update_cron_command_api() {
    local command=$(echo "$1" | awk -F ":" '{print $1}')
    local id=$(echo "$1" | awk -F ":" '{print $2}')
  else
-    local command=$1
-    local id=$2
+    local command="$1"
+    local id="$2"
  fi

  local api=$(
@@ -105,8 +120,8 @@ update_cron_command_api() {
      --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
      --compressed
  )
-  code=$(echo $api | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  code=$(echo "$api" | jq -r .code)
+  message=$(echo "$api" | jq -r .message)
  if [[ $code == 200 ]]; then
    echo -e "$command -> 更新成功"
  else
@@ -115,7 +130,7 @@ update_cron_command_api() {
 }

 del_cron_api() {
-  local ids=$1
+  local ids="$1"
  local currentTimeStamp=$(date +%s)
  local api=$(
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
@@ -130,8 +145,8 @@ del_cron_api() {
      --data-raw "[$ids]" \
      --compressed
  )
-  code=$(echo $api | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  code=$(echo "$api" | jq -r .code)
+  message=$(echo "$api" | jq -r .message)
  if [[ $code == 200 ]]; then
    echo -e "成功"
  else
@@ -160,16 +175,16 @@ update_cron() {
      --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
      --compressed
  )
-  code=$(echo $api | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  code=$(echo "$api" | jq -r .code)
+  message=$(echo "$api" | jq -r .message)
  if [[ $code != 200 ]]; then
-    echo -e "\n## 更新任务状态失败(${message})\n" >>$dir_log/$log_path
+    echo -e "\n## 更新任务状态失败(${message})\n"
  fi
 }

 notify_api() {
-  local title=$1
-  local content=$2
+  local title="$1"
+  local content="$2"
  local currentTimeStamp=$(date +%s)
  local api=$(
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
@@ -184,13 +199,36 @@ notify_api() {
      --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
      --compressed
  )
-  code=$(echo $api | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  code=$(echo "$api" | jq -r .code)
+  message=$(echo "$api" | jq -r .message)
  if [[ $code == 200 ]]; then
-    echo -e "通知发送成功"
+    echo -e "通知发送成功🎉"
  else
    echo -e "通知失败(${message})"
  fi
 }

+find_cron_api() {
+  local params="$1"
+  local currentTimeStamp=$(date +%s)
+  local api=$(
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
+      -H "Accept: application/json" \
+      -H "Authorization: Bearer $token" \
+      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -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" \
+      --compressed
+  )
+  data=$(echo "$api" | jq -r .data)
+  if [[ $data == 'null' ]]; then
+    echo -e ""
+  else
+    name=$(echo "$api" | jq -r .data.name)
+    echo -e "$name"
+  fi
+}
+
 get_token
@@ -1,9 +1,5 @@
 #!/usr/bin/env bash

-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-
 if [[ -z ${BotRepoUrl} ]]; then
  url="https://github.com/SuMaiKaDe/bot.git"
  repo_path="${dir_repo}/dockerbot"
@@ -46,6 +42,6 @@ echo -e "\npython3依赖安装成功...\n"
 echo -e "4、启动bot程序...\n"
 make_dir $dir_log/bot
 cd $dir_data
-ps -ef | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
+ps -eo pid,command | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
 nohup python3 -m jbot >$dir_log/bot/nohup.log 2>&1 &
 echo -e "bot启动成功...\n"
@@ -1,9 +1,5 @@
 #!/usr/bin/env bash

-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-. $dir_shell/api.sh
-
 reset_env() {
  echo -e "---> 1. 开始检测配置文件\n"
  fix_config
@@ -29,9 +25,7 @@ copy_dep() {
  echo -e "---> 通知文件复制完成\n"

  echo -e "---> 2. 复制nginx配置文件\n"
-  cp -fv $nginx_conf /etc/nginx/nginx.conf
-  cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_BASE_URL,${qlBaseUrl},g" /etc/nginx/conf.d/front.conf
+  init_nginx
  echo -e "---> 配置文件复制完成\n"
 }

@@ -39,12 +33,12 @@ pm2_log() {
  echo -e "---> pm2日志"
  local panelOut="/root/.pm2/logs/panel-out.log"
  local panelError="/root/.pm2/logs/panel-error.log"
-  tail -n 100 "$panelOut"
-  tail -n 100 "$panelError"
+  tail -n 300 "$panelOut"
+  tail -n 300 "$panelError"
 }

 check_nginx() {
-  local nginxPid=$(ps -ef | grep nginx | grep -v grep)
+  local nginxPid=$(ps -eo pid,command | grep nginx | grep -v grep)
  echo -e "=====> 检测nginx服务\n$nginxPid"
  if [[ $nginxPid ]]; then
    echo -e "\n=====> nginx服务正常\n"
@@ -60,9 +54,6 @@ check_ql() {
  echo -e "\n=====> 检测面板\n\n$api\n"
  if [[ $api =~ "<div id=\"root\"></div>" ]]; then
    echo -e "=====> 面板服务启动正常\n"
-  else
-    echo -e "=====> 面板服务异常，重置基础环境\n"
-    reset_env
  fi
 }

@@ -70,9 +61,8 @@ check_pm2() {
  pm2_log
  local currentTimeStamp=$(date +%s)
  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/api/user?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/api/system?t=$currentTimeStamp" \
      -H 'Accept: */*' \
-      -H "Authorization: Bearer $token" \
      -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36' \
      -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' \
@@ -81,24 +71,24 @@ check_pm2() {
  echo -e "\n=====> 检测后台\n\n$api\n"
  if [[ $api =~ "{\"code\"" ]]; then
    echo -e "=====> 后台服务启动正常\n"
-  else
-    echo -e "=====> 后台服务异常，重置基础环境并重启后台\n"
-    reset_env
  fi
 }

-start_public() {
-  echo -e "=====> 启动公开服务\n"
-  pm2 delete public --source-map-support --time &>/dev/null
-  pm2 start $dir_static/build/public.js -n public --source-map-support --time &>/dev/null
-}
-
 main() {
  echo -e "=====> 开始检测"
-  npm i -g pnpm
-  pnpm add -g pm2
+  npm i -g pnpm@8.3.1
  patch_version
-  start_public
+
+  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
@@ -1,16 +1,5 @@
 #!/usr/bin/env bash

-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-. $dir_shell/api.sh
-
-trap "single_hanle" 2 20 15 14
-single_hanle() {
-  handle_task_after "$@"
-  exit 1
-}
-
 random_delay() {
  local random_delay_max=$RandomDelay
  if [[ $random_delay_max ]] && [[ $random_delay_max -gt 0 ]]; then
@@ -35,7 +24,7 @@ random_delay() {
    done

    local delay_second=$(($(gen_random_num "$random_delay_max") + 1))
-    echo -e "\n命令未添加 \"now\"，随机延迟 $delay_second 秒后执行\n"
+    echo -e "任务随机延迟 $delay_second 秒，配置文件参数 RandomDelay 置空可取消延迟 \n"
    sleep $delay_second
  fi
 }
@@ -49,7 +38,7 @@ gen_array_scripts() {
    if [[ -f $file ]] && [[ $file == *.js && $file != sendNotify.js ]]; then
      let i++
      array_scripts[i]=$(echo "$file" | perl -pe "s|$dir_scripts/||g")
-      array_scripts_name[i]=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1)
+      array_scripts_name[i]=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
      [[ -z ${array_scripts_name[i]} ]] && array_scripts_name[i]="<未识别出活动名称>"
    fi
  done
@@ -97,42 +86,15 @@ check_server() {
  fi
 }

-handle_task_before() {
-  begin_time=$(format_time "$time_format" "$time")
-  begin_timestamp=$(format_timestamp "$time_format" "$time")
-
-  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
-
-  echo -e "## 开始执行... $begin_time\n"
-
-  [[ $is_macos -eq 0 ]] && check_server
-
-  if [[ -s $task_error_log_path ]]; then
-    eval cat $task_error_log_path $cmd
-    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
-    eval echo $cmd
-  fi
-
-  . $file_task_before "$@"
-}
-
-handle_task_after() {
-  . $file_task_after "$@"
-
-  local etime=$(date "+$time_format")
-  local end_time=$(format_time "$time_format" "$etime")
-  local end_timestamp=$(format_timestamp "$time_format" "$etime")
-  local diff_time=$(($end_timestamp - $begin_timestamp))
-
-  echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
-
-  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+env_str_to_array() {
+  local IFS="&"
+  read -ra array <<<"${!env_param}"
 }

 ## 正常运行单个脚本，$1：传入参数
 run_normal() {
  local file_param=$1
-  if [[ $# -eq 1 ]]; then
+  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]] && [[ "$no_delay" != "true" ]]; then
    random_delay "$file_param"
  fi

@@ -143,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 不会生效，即所有任务立即执行
@@ -156,8 +118,7 @@ run_concurrent() {
    exit 1
  fi

-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
+  env_str_to_array
  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
  local runArr=($(eval echo $tempArr))
  runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
@@ -168,12 +129,14 @@ run_concurrent() {
    let n++
  done

-  local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+  local cookieStr=$(
+    IFS="&"
+    echo "${array_run[*]}"
+  )
+  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"

-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
-  single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
+  env_str_to_array
+  single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%3N")

  cd $dir_scripts
  local relative_path="${file_param%/*}"
@@ -182,9 +145,9 @@ run_concurrent() {
    file_param=${file_param/$relative_path\//}
  fi
  for i in "${!array[@]}"; do
-    export ${env_param}=${array[i]}
+    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
@@ -204,8 +167,7 @@ run_designated() {
    exit 1
  fi

-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
+  env_str_to_array
  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
  local runArr=($(eval echo $tempArr))
  runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
@@ -216,8 +178,11 @@ run_designated() {
    let n++
  done

-  local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+  local cookieStr=$(
+    IFS="&"
+    echo "${array_run[*]}"
+  )
+  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"

  cd $dir_scripts
  local relative_path="${file_param%/*}"
@@ -225,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[@]}"
 }

 ## 运行其他命令
@@ -236,7 +201,7 @@ run_else() {
  local relative_path="${file_param%/*}"
  if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
    cd ${relative_path}
-    file_param=${file_param/$relative_path\//}
+    file_param=${file_param/$relative_path\//.\/}
  fi

  shift
@@ -276,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[@]}"
@@ -11,7 +11,7 @@ echo -e "提交master代码"
 git push

 echo -e "更新cdn文件"
-ts-node sample/tool.ts
+tsx sample/tool.ts

 string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"
@@ -1,12 +1,8 @@
 #!/usr/bin/env bash

-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-
 days=$1

-## 删除运行js脚本的旧日志
+## 删除运行脚本的旧日志
 remove_js_log() {
  local log_full_path_list=$(find $dir_log/ -name "*.log")
  local diff_time
@@ -18,7 +14,17 @@ remove_js_log() {
      else
        diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
      fi
-      [[ $diff_time -gt $((${days} * 86400)) ]] && rm -vf $log
+      if [[ $diff_time -gt $((${days} * 86400)) ]]; then
+        local log_path=$(echo "$log" | sed "s,${dir_log}/,,g")
+        local result=$(find_cron_api "log_path=$log_path")
+        echo -e "查询文件 $log_path"
+        if [[ -z $result ]]; then
+          echo -e "删除中~"
+          rm -vf $log
+        else
+          echo -e "正在被 $result 使用，跳过~"
+        fi
+      fi
    fi
  done
 }
@@ -2,6 +2,7 @@

 ## 目录
 dir_root=$QL_DIR
+dir_tmp=$dir_root/.tmp
 dir_data=$dir_root/data
 dir_shell=$dir_root/shell
 dir_sample=$dir_root/sample
@@ -18,6 +19,7 @@ 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
@@ -34,7 +36,6 @@ file_notify_js_sample=$dir_sample/notify.js
 file_notify_py_sample=$dir_sample/notify.py
 file_notify_py=$dir_scripts/notify.py
 file_notify_js=$dir_scripts/sendNotify.js
-task_error_log_path=$dir_log/task_error.log
 nginx_app_conf=$dir_root/docker/front.conf
 nginx_conf=$dir_root/docker/nginx.conf
 dep_notify_py=$dir_dep/notify.py
@@ -67,8 +68,9 @@ import_config() {
  [[ -f $file_config_user ]] && . $file_config_user
  [[ -f $file_env ]] && . $file_env

-  ql_base_url=${QlBaseUrl:-""}
-  command_timeout_time=${CommandTimeoutTime:-"1h"}
+  ql_base_url=${QlBaseUrl:-"/"}
+  ql_port=${QlPort:-"5700"}
+  command_timeout_time=${CommandTimeoutTime:-""}
  proxy_url=${ProxyUrl:-""}
  file_extensions=${RepoFileExtensions:-"js py"}
  current_branch=${QL_BRANCH}
@@ -172,6 +174,7 @@ define_cmd() {
 }

 fix_config() {
+  make_dir $dir_tmp
  make_dir $dir_static
  make_dir $dir_data
  make_dir $dir_config
@@ -260,17 +263,7 @@ npm_install_sub() {
  else
    pnpm install --loglevel error --production
  fi
-}
-
-npm_install_1() {
-  local dir_current=$(pwd)
-  local dir_work=$1
-
-  cd $dir_work
-  echo -e "运行 npm install...\n"
-  npm_install_sub
-  [[ $? -ne 0 ]] && echo -e "\nnpm install 运行不成功，请进入 $dir_work 目录后手动运行 npm install...\n"
-  cd $dir_current
+  exit_status=$?
 }

 npm_install_2() {
@@ -278,12 +271,8 @@ npm_install_2() {
  local dir_work=$1

  cd $dir_work
-  echo -e "检测到 $dir_work 的依赖包有变化，运行 npm install...\n"
+  echo -e "安装 $dir_work 依赖包...\n"
  npm_install_sub
-  if [[ $? -ne 0 ]]; then
-    echo -e "\n安装 $dir_work 的依赖包运行不成功，再次尝试一遍...\n"
-    npm_install_1 $dir_work
-  fi
  cd $dir_current
 }

@@ -295,77 +284,22 @@ diff_and_copy() {
  fi
 }

-update_depend() {
-  local dir_current=$(pwd)
-
-  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
-
-  cd $dir_current
-}
-
 git_clone_scripts() {
  local url="$1"
  local dir="$2"
  local branch="$3"
  local proxy="$4"
  [[ $branch ]] && local part_cmd="-b $branch "
-  echo -e "开始克隆仓库 $url 到 $dir\n"
+  echo -e "开始拉取仓库 ${uniq_path} 到 $dir\n"

  set_proxy "$proxy"
-  git clone $part_cmd $url $dir
+
+  git clone --depth=1 $part_cmd $url $dir 2>&1
  exit_status=$?
+
  unset_proxy
 }

-git_pull_scripts() {
-  local dir_current=$(pwd)
-  local dir_work="$1"
-  local branch="$2"
-  local proxy="$3"
-  cd $dir_work
-  echo -e "开始更新仓库：$dir_work\n"
-
-  set_proxy "$proxy"
-  git fetch --all
-  exit_status=$?
-  git pull &>/dev/null
-  unset_proxy
-
-  cd $dir_current
-}
-
-reset_romote_url() {
-  local dir_current=$(pwd)
-  local dir_work=$1
-  local url=$2
-  local branch="$3"
-
-  cd $dir_work
-  if [[ -d "$dir_work/.git" ]]; then
-    [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
-    git remote set-url origin $url &>/dev/null
-  else
-    git init
-    git remote add origin $url &>/dev/null
-  fi
-  reset_branch "$branch"
-  cd $dir_current
-}
-
-reset_branch() {
-  local branch="$1"
-  local part_cmd=""
-  if [[ $branch ]]; then
-    part_cmd="origin/${branch}"
-    git checkout -B "$branch" &>/dev/null
-    git branch --set-upstream-to=$part_cmd $branch &>/dev/null
-  fi
-  git reset --hard $part_cmd &>/dev/null
-}
-
 random_range() {
  local beg=$1
  local end=$2
@@ -373,15 +307,9 @@ random_range() {
 }

 reload_pm2() {
-  pm2 l &>/dev/null
-
-  echo -e "启动面板服务\n"
-  pm2 delete panel --source-map-support --time &>/dev/null
-  pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
-
-  echo -e "启动定时任务服务\n"
-  pm2 delete schedule --source-map-support --time &>/dev/null
-  pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
+  cd $dir_root
+  pm2 flush &>/dev/null
+  env ALL_PROXY= HTTP_PROXY= HTTPS_PROXY= all_proxy= http_proxy= https_proxy= pm2 startOrGracefulReload $file_ecosystem_js --update-env
 }

 diff_time() {
@@ -413,9 +341,9 @@ format_log_time() {
  local time="$2"

  if [[ $is_macos -eq 1 ]]; then
-    echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S")
+    echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
  else
-    echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
  fi
 }

@@ -431,17 +359,9 @@ format_timestamp() {
 }

 patch_version() {
-  if [[ $PipMirror ]]; then
-    pip3 config set global.index-url $PipMirror
-  fi
-  if [[ $NpmMirror ]]; then
-    npm config set registry $NpmMirror
-  fi
+  git config --global pull.rebase false

-  # 兼容pnpm@7
-  pnpm setup &>/dev/null
-  source ~/.bashrc
-  pnpm install -g &>/dev/null
+  cp -f $dir_root/.env.example $dir_root/.env

  if [[ -f "$dir_root/db/cookie.db" ]]; then
    echo -e "检测到旧的db文件，拷贝为新db...\n"
@@ -450,14 +370,6 @@ patch_version() {
    echo
  fi

-  if ! type ts-node &>/dev/null; then
-    pnpm add -g ts-node typescript tslib
-  fi
-
-  git config --global pull.rebase false
-
-  cp -f $dir_root/.env.example $dir_root/.env
-
  if [[ -d "$dir_root/db" ]]; then
    echo -e "检测到旧的db目录，拷贝到data目录...\n"
    cp -rf $dir_root/config $dir_root/data
@@ -483,10 +395,86 @@ patch_version() {
  fi
 }

+init_nginx() {
+  cp -fv $nginx_conf /etc/nginx/nginx.conf
+  cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
+  local location_url="/"
+  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
+  sed -i "s,QL_ALIAS_CONFIG,${aliasStr},g" /etc/nginx/conf.d/front.conf
+  sed -i "s,QL_ROOT_CONFIG,${rootStr},g" /etc/nginx/conf.d/front.conf
+  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
+
+  local ipv6=$(ip a | grep inet6)
+  local ipv6Str=""
+  if [[ $ipv6 ]]; then
+    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_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
+}
+
+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")
+  local diff_time=$(($end_timestamp - $begin_timestamp))
+
+  [[ "$diff_time" == 0 ]] && diff_time=1
+
+  echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
+  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+}
+
 init_env
 detect_termux
 detect_macos
 define_cmd
-fix_config

-import_config $1 2>$task_error_log_path
+import_config $1
@@ -5,17 +5,27 @@ dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh

+trap "single_hanle" 2 3 20 15 14 19 1
+single_hanle() {
+  eval handle_task_end "$@" "$cmd"
+  exit 1
+}
+
 ## 选择python3还是node
 define_program() {
  local file_param=$1
-  if [[ $file_param == *.js ]]; then
+  if [[ $file_param == *.js ]] || [[ $file_param == *.mjs ]]; then
    which_program="node"
  elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
    which_program="python3"
  elif [[ $file_param == *.sh ]]; then
    which_program="bash"
  elif [[ $file_param == *.ts ]]; then
-    which_program="ts-node-transpile-only"
+    if ! type tsx &>/dev/null; then
+      which_program="ts-node-transpile-only"
+    else
+      which_program="tsx"
+    fi
  else
    which_program=""
  fi
@@ -24,16 +34,24 @@ define_program() {
 handle_log_path() {
  local file_param=$1

-  if [[ -z $file_param ]];then
+  if [[ -z $file_param ]]; then
    file_param="task"
  fi

+  if [[ -z $ID ]]; then
+    ID=$(cat $list_crontab_user | grep -E "$cmd_task.* $file_param" | perl -pe "s|.*ID=(.*) $cmd_task.* $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
+  fi
  local suffix=""
  if [[ ! -z $ID ]]; then
-    suffix="_${ID}"
+    if [[ "$ID" -gt 0 ]] 2>/dev/null; then
+      suffix="_${ID}"
+    else
+      ID=""
+    fi
  fi
-  time=$(date "+$time_format")
-  log_time=$(format_log_time "$time_format" "$time")
+
+  time=$(date "+$mtime_format")
+  log_time=$(format_log_time "$mtime_format" "$time")
  log_dir_tmp="${file_param##*/}"
  if [[ $file_param =~ "/" ]]; then
    if [[ $file_param == /* ]]; then
@@ -47,21 +65,56 @@ handle_log_path() {
  [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
  log_dir="${log_dir_tmp%.*}${suffix}"
  log_path="$log_dir/$log_time.log"
-  cmd=">> $dir_log/$log_path 2>&1"
-  if [[ "$show_log" == "true" ]]; then
+
+  if [[ $real_log_path ]]; then
+    log_path="$real_log_path"
+  fi
+
+  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
    cmd=""
-  else
-    make_dir "$dir_log/$log_dir"
  fi
 }

 format_params() {
  time_format="%Y-%m-%d %H:%M:%S"
+  if [[ $is_macos -eq 1 ]]; then
+    mtime_format=$time_format
+  else
+    mtime_format="%Y-%m-%d %H:%M:%S.%3N"
+  fi
  timeoutCmd=""
-  if type timeout &>/dev/null; then
-    timeoutCmd="timeout --foreground -s 14 -k 10s $command_timeout_time "
+  if [[ $command_timeout_time ]]; then
+    if type timeout &>/dev/null; then
+      timeoutCmd="timeout --foreground -s 2 -k 10s $command_timeout_time "
+    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() {
+  begin_time=$(format_time "$time_format" "$time")
+  begin_timestamp=$(format_timestamp "$time_format" "$time")
 }

 while getopts ":lm:" opt; do
@@ -81,10 +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" ]] && cat "$dir_log/$log_path"
-
 exit 0
@@ -31,7 +31,7 @@ output_list_add_drop() {
  local list=$1
  local type=$2
  if [[ -s $list ]]; then
-    echo -e "检测到有$type的定时任务：\n"
+    echo -e "检测到有${type}的定时任务:"
    cat $list
    echo
  fi
@@ -44,9 +44,9 @@ del_cron() {
  local path=$2
  local detail=""
  local ids=""
-  echo -e "开始尝试自动删除失效的定时任务...\n"
+  echo -e "开始尝试自动删除失效的定时任务..."
  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 | head -1 | awk -F " " '{print $1}')
+    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
      ids="$ids,\"$id\""
    else
@@ -54,7 +54,7 @@ del_cron() {
    fi
    cron_file="$dir_scripts/${cron}"
    if [[ -f $cron_file ]]; then
-      cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
      rm -f $cron_file
    fi
    [[ -z $cron_name ]] && cron_name="$cron"
@@ -75,7 +75,7 @@ del_cron() {
 add_cron() {
  local list_add=$1
  local path=$2
-  echo -e "开始尝试自动添加定时任务...\n"
+  echo -e "开始尝试自动添加定时任务..."
  local detail=""
  cd $dir_scripts
  for file in $(cat $list_add); do
@@ -92,12 +92,12 @@ add_cron() {
                        s|  | |g;
                    }" | sort -u | head -1
      )
-      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | 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")
+      result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name:$SUB_ID")
      echo -e "$result"
      if [[ $detail ]]; then
        detail="${detail}${result}\n"
@@ -130,58 +130,71 @@ update_repo() {
  make_dir "${dir_scripts}/${uniq_path}"

  local formatUrl="$url"
-  if [[ -d ${repo_path}/.git ]]; then
-    reset_romote_url ${repo_path} "${formatUrl}" "${branch}"
-    git_pull_scripts ${repo_path} "${branch}" "${proxy}"
-  else
-    rm -rf ${repo_path} &>/dev/null
-    git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
-  fi
+  rm -rf ${repo_path} &>/dev/null
+  git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
+
  if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新${repo_path}成功...\n"
+    echo -e "\n拉取 ${uniq_path} 成功...\n"
    diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
  else
-    echo -e "\n更新${repo_path}失败，请检查网络...\n"
+    echo -e "\n拉取 ${uniq_path} 失败，请检查网络...\n"
  fi
 }

 ## 更新所有 raw 文件
 update_raw() {
-  echo -e "--------------------------------------------------------------\n"
  local url="$1"
+  local proxy="$2"
+  local autoAddCron="$3"
+  local autoDelCron="$4"
+
+  if [[ ! $autoAddCron ]]; then
+    autoAddCron=${AutoAddCron}
+  fi
+  if [[ ! $autoDelCron ]]; then
+    autoDelCron=${AutoDelCron}
+  fi
+
+  local proxyStr=""
+  if [[ $proxy ]]; then
+    if [[ $url == http:* ]]; then
+      proxyStr="-e \"http_proxy=${proxy}\""
+    elif [[ $url == https:* ]]; then
+      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
+    fi
+  fi
+
  local raw_url="$url"
  local suffix="${raw_url##*.}"
  local raw_file_name="${uniq_path}.${suffix}"
  echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"

-  set_proxy
-  wget -q --no-check-certificate -O "$dir_raw/${raw_file_name}.new" ${raw_url}
-  unset_proxy
+  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}

  if [[ $? -eq 0 ]]; then
    mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
    echo -e "下载 ${raw_file_name} 成功...\n"
    cd $dir_raw
    local filename="raw_${raw_file_name}"
-    local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* $filename" | perl -pe "s|.*ID=(.*) $cmd_task.* $filename\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
+    local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* $filename" | perl -pe "s|.*ID=(.*) $cmd_task.* $filename\.*|\1|" | head -1 | awk -F " " '{print $1}')
    cp -f $raw_file_name $dir_scripts/${filename}
-    cron_line=$(
-      perl -ne "{
-                    print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
-                }" $raw_file_name |
-        perl -pe "{
-                    s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g;
-                    s|\*([\d\*])(.*)|\1\2|g;
-                    s|  | |g;
-                }" | sort -u | head -1
-    )
-    cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
-    [[ -z $cron_name ]] && cron_name="$raw_file_name"
-    [[ -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"
-    if [[ -z $cron_id ]]; then
-      result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
+    if [[ -z $cron_id ]] && [[ ${autoAddCron} == true ]]; then
+      cron_line=$(
+        perl -ne "{
+                      print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
+                  }" $raw_file_name |
+          perl -pe "{
+                      s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g;
+                      s|\*([\d\*])(.*)|\1\2|g;
+                      s|  | |g;
+                  }" | sort -u | head -1
+      )
+      cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
+      [[ -z $cron_name ]] && cron_name="$raw_file_name"
+      [[ -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")
      echo -e "$result\n"
      notify_api "新增任务通知" "\n$result"
      # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
@@ -195,13 +208,10 @@ update_raw() {

 ## 调用用户自定义的extra.sh
 run_extra_shell() {
-  if [[ ${EnableExtraShell} == true ]]; then
-    if [[ -f $file_extra_shell ]]; then
-      echo -e "--------------------------------------------------------------\n"
-      . $file_extra_shell
-    else
-      echo -e "$file_extra_shell文件不存在，跳过执行...\n"
-    fi
+  if [[ -f $file_extra_shell ]]; then
+    . $file_extra_shell
+  else
+    echo -e "$file_extra_shell文件不存在，跳过执行...\n"
  fi
 }

@@ -219,65 +229,99 @@ usage() {
  echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
 }

+reload_qinglong() {
+  local reload_target="${1}"
+  local primary_branch="master"
+  if [[ "${QL_BRANCH}" == "develop" ]]; then
+    primary_branch="develop"
+  fi
+
+  if [[ "$reload_target" == 'system' ]]; then
+    cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+    rm -rf $dir_static/*
+    cp -rf ${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}/
+  fi
+
+  reload_pm2
+}
+
 ## 更新qinglong
 update_qinglong() {
-  local mirror="github"
-  local githubStatus=$(curl -s -m 2 -IL "https://github.com" | grep 200)
-  if [ "$githubStatus" == "" ]; then
-    mirror="gitee"
+  rm -rf ${dir_tmp}/*
+  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)
+  if [[ ! -z $githubStatus ]]; then
+    mirror="github"
+    downloadQLUrl="https://github.com/whyour/qinglong/archive/refs/heads"
+    downloadStaticUrl="https://github.com/whyour/qinglong-static/archive/refs/heads"
  fi
  echo -e "使用 ${mirror} 源更新...\n"
-  export isFirstStartServer=false

-  local all_branch=$(cd ${dir_root} && git branch -a)
  local primary_branch="master"
-  if [[ "${all_branch}" =~ "${current_branch}" ]]; then
-    primary_branch="${current_branch}"
+  if [[ "${QL_BRANCH}" == "develop" ]]; then
+    primary_branch="develop"
  fi
-  [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
-  reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
-  git_pull_scripts $dir_root ${primary_branch}
+
+  wget -cqO "${dir_tmp}/ql.zip" "${downloadQLUrl}/${primary_branch}.zip"
+  exit_status=$?

  if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙源文件成功...\n"
-    reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
-    cp -f $file_config_sample $dir_config/config.sample.sh
-    update_depend
+    echo -e "更新青龙源文件成功...\n"

-    [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
-    [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root
+    unzip -oq ${dir_tmp}/ql.zip -d ${dir_tmp}

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

 update_qinglong_static() {
-  local no_restart="$1"
-  local primary_branch="$2"
-  local url="https://${mirror}.com/whyour/qinglong-static.git"
-  if [[ -d ${ql_static_repo}/.git ]]; then
-    reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
-    git_pull_scripts ${ql_static_repo} ${primary_branch}
+  wget -cqO "${dir_tmp}/static.zip" "${downloadStaticUrl}/${primary_branch}.zip"
+  exit_status=$?
+
+  if [[ $exit_status -eq 0 ]]; then
+    echo -e "更新青龙静态资源成功...\n"
+    unzip -oq ${dir_tmp}/static.zip -d ${dir_tmp}
+
+    check_update_dep
  else
-    rm -rf ${ql_static_repo} &>/dev/null
-    git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
+    echo -e "更新青龙静态资源失败，请检查网络...\n"
+  fi
+}
+
+check_update_dep() {
+  echo -e "\n开始检测依赖...\n"
+  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
+
+  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"
-    reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
+    echo -e "\n依赖检测安装成功...\n"
+    echo -e "更新包下载成功..."
+
+    if [[ "$needRestart" == 'true' ]]; then
+      cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+      rm -rf $dir_static/*
+      cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+      cp -f $file_config_sample $dir_config/config.sample.sh

-    rm -rf $dir_static/*
-    cp -rf $ql_static_repo/* $dir_static
-    if [[ $no_restart != "no-restart" ]]; then
-      nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
-      echo -e "重启面板中..."
-      sleep 3
      reload_pm2
    fi
  else
-    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+    echo -e "\n依赖检测安装失败，请检查网络...\n"
  fi
 }

@@ -293,10 +337,10 @@ diff_scripts() {
  local autoAddCron="$7"
  local autoDelCron="$8"

-  if [[ ! $autoAddCron ]];then
+  if [[ ! $autoAddCron ]]; then
    autoAddCron=${AutoAddCron}
  fi
-  if [[ ! $autoDelCron ]];then
+  if [[ ! $autoDelCron ]]; then
    autoDelCron=${AutoDelCron}
  fi

@@ -352,10 +396,10 @@ gen_list_repo() {
  done
  files=$(eval $cmd | sed 's/^..//')
  if [[ $path ]]; then
-    files=$(echo "$files" | egrep $path)
+    files=$(echo "$files" | egrep "$path")
  fi
  if [[ $blackword ]]; then
-    files=$(echo "$files" | egrep -v $blackword)
+    files=$(echo "$files" | egrep -v "$blackword")
  fi

  cp -f $file_notify_js "${dir_scripts}/${uniq_path}"
@@ -363,7 +407,7 @@ gen_list_repo() {

  if [[ $dependence ]]; then
    cd ${repo_path}
-    results=$(eval $cmd | sed 's/^..//' | egrep $dependence)
+    results=$(eval $cmd | sed 's/^..//' | egrep "$dependence")
    for _file in ${results}; do
      file_path=$(dirname $_file)
      make_dir "${dir_scripts}/${uniq_path}/${file_path}"
@@ -376,7 +420,7 @@ gen_list_repo() {
  fi

  for file in ${files}; do
-    filename=$(basename $file)
+    filename=$(basename "$file")
    cp -f $file "$dir_scripts/${uniq_path}/${filename}"
    echo "${uniq_path}/${filename}" >>"$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}')
@@ -445,12 +489,6 @@ main() {
    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
  fi

-  if [[ -s $task_error_log_path ]]; then
-    eval cat $task_error_log_path $cmd
-    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
-    eval echo $cmd
-  fi
-
  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
    eval echo -e "请移除 -l 参数" $cmd
    exit 1
@@ -458,7 +496,12 @@ main() {

  case $p1 in
  update)
-    eval update_qinglong "$2" $cmd
+    fix_config
+    local needRestart=${p2:-"true"}
+    eval update_qinglong $cmd
+    ;;
+  reload)
+    eval reload_qinglong "$p2" $cmd
    ;;
  extra)
    eval run_extra_shell $cmd
@@ -475,7 +518,7 @@ main() {
  raw)
    get_uniq_path "$p2"
    if [[ -n $p2 ]]; then
-      update_raw "$p2"
+      update_raw "$p2" "$p3" "$p4"
    else
      eval echo -e "命令输入错误...\\\n" $cmd
      eval usage $cmd
@@ -0,0 +1,38 @@
+const baseUrl = window.__ENV__QlBaseUrl || '/';
+import { setLocale } from '@umijs/max';
+import intl from 'react-intl-universal';
+
+export function rootContainer(container: any) {
+  const locales = {
+    'en': require('./locales/en-US.json'),
+    'zh': require('./locales/zh-CN.json'),
+  };
+  let currentLocale = intl.determineLocale({
+    urlLocaleKey: 'lang',
+    cookieLocaleKey: 'lang',
+    localStorageLocaleKey: 'lang',
+  }).slice(0, 2);
+
+  if (!currentLocale || !Object.keys(locales).includes(currentLocale)) {
+    currentLocale = 'zh';
+  }
+
+  intl.init({ currentLocale, locales });
+  setLocale(currentLocale === 'zh' ? 'zh-CN' : 'en-US');
+  return container;
+}
+
+export function modifyClientRenderOpts(memo: any) {
+  return {
+    ...memo,
+    publicPath: baseUrl,
+    basename: baseUrl,
+  };
+}
+
+export function modifyContextOpts(memo: any) {
+  return {
+    ...memo,
+    basename: baseUrl,
+  };
+}
@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import React, { useRef, useState, useEffect } from 'react';
 import { Tooltip, Typography } from 'antd';
 import { CopyOutlined, CheckOutlined } from '@ant-design/icons';
@@ -28,7 +29,10 @@ const Copy = ({ text }: { text: string }) => {
  return (
    <Link onClick={copyText} style={{ marginLeft: 1 }}>
      <CopyToClipboard text={text}>
-        <Tooltip key="copy" title={copied ? '复制成功' : '复制'}>
+        <Tooltip
+          key="copy"
+          title={copied ? intl.get('复制成功') : intl.get('复制')}
+        >
          {copied ? <CheckOutlined /> : <CopyOutlined />}
        </Tooltip>
      </CopyToClipboard>
@@ -0,0 +1,22 @@
+import { useRequest } from 'ahooks';
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
+import { Spin, Typography } from 'antd';
+
+export default function Name<
+  TData extends { data?: { name: string } },
+  TParams,
+>({
+  service,
+  options,
+}: {
+  service: Service<TData, [TParams]>;
+  options: Options<TData, [TParams]>;
+}) {
+  const { loading, data } = useRequest(service, options);
+
+  return (
+    <Spin spinning={loading}>
+      <Typography.Text ellipsis={true}>{data?.data?.name}</Typography.Text>
+    </Spin>
+  );
+}
@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import { Tag, Input } from 'antd';
 import { TweenOneGroup } from 'rc-tween-one';
 import { PlusOutlined } from '@ant-design/icons';
@@ -101,7 +102,7 @@ const EditableTagGroup = ({
          onClick={showInput}
          style={{ borderStyle: 'dashed', cursor: 'pointer' }}
        >
-          <PlusOutlined /> 新建
+          <PlusOutlined /> {intl.get('新建')}
        </Tag>
      )}
    </>
@@ -0,0 +1,14 @@
+import { RefObject, useState } from 'react';
+import useResizeObserver from '@react-hook/resize-observer';
+
+export default <T extends HTMLElement>(target: RefObject<T>) => {
+  const [height, setHeight] = useState<number>(0);
+
+  useResizeObserver(target, (entry) => {
+    let _height = entry.target.clientHeight;
+    if (height !== _height) {
+      setHeight(_height);
+    }
+  });
+  return height;
+};
@@ -1,16 +1,19 @@
-import { MutableRefObject, useLayoutEffect, useState } from 'react';
-import useResizeObserver from '@react-hook/resize-observer'
+import { RefObject, useState } from 'react';
+import useResizeObserver from '@react-hook/resize-observer';
 import { getTableScroll } from '@/utils';

-export default <T extends HTMLElement>(target: MutableRefObject<T>, extraHeight?: number) => {
-  const [height, setHeight] = useState<number>()
+export default <T extends HTMLElement>(
+  target: RefObject<T>,
+  extraHeight?: number,
+) => {
+  const [height, setHeight] = useState<number>(0);

  useResizeObserver(target, (entry) => {
-    let _targe = entry.target as any
-    if (!_targe.classList.contains('ant-table-wrapper')) {
-      _targe = entry.target.querySelector('.ant-table-wrapper')
+    let _target = entry.target as any;
+    if (!_target.classList.contains('ant-table-wrapper')) {
+      _target = entry.target.querySelector('.ant-table-wrapper');
    }
-    setHeight(getTableScroll({ extraHeight, target: _targe as HTMLElement }))
-  })
-  return height
-}
+    setHeight(getTableScroll({ extraHeight, target: _target as HTMLElement }));
+  });
+  return height;
+};
@@ -1,14 +1,5 @@
-import {
-  FormOutlined,
-  FieldTimeOutlined,
-  DiffOutlined,
-  SettingOutlined,
-  CodeOutlined,
-  FolderOutlined,
-  RadiusSettingOutlined,
-  ControlOutlined,
-  ContainerOutlined,
-} from '@ant-design/icons';
+import intl from 'react-intl-universal';
+import { SettingOutlined } from '@ant-design/icons';
 import IconFont from '@/components/iconfont';
 import { BasicLayoutProps } from '@ant-design/pro-layout';

@@ -16,74 +7,74 @@ export default {
  route: {
    routes: [
      {
-        name: '登录',
+        name: intl.get('登录'),
        path: '/login',
        hideInMenu: true,
        component: '@/pages/login/index',
      },
      {
-        name: '初始化',
+        name: intl.get('初始化'),
        path: '/initialization',
        hideInMenu: true,
        component: '@/pages/initialization/index',
      },
      {
-        name: '错误',
+        name: intl.get('错误'),
        path: '/error',
        hideInMenu: true,
        component: '@/pages/error/index',
      },
      {
        path: '/crontab',
-        name: '定时任务',
+        name: intl.get('定时任务'),
        icon: <IconFont type="ql-icon-crontab" />,
        component: '@/pages/crontab/index',
      },
      {
        path: '/subscription',
-        name: '订阅管理',
+        name: intl.get('订阅管理'),
        icon: <IconFont type="ql-icon-subs" />,
        component: '@/pages/subscription/index',
      },
      {
        path: '/env',
-        name: '环境变量',
+        name: intl.get('环境变量'),
        icon: <IconFont type="ql-icon-env" />,
        component: '@/pages/env/index',
      },
      {
        path: '/config',
-        name: '配置文件',
+        name: intl.get('配置文件'),
        icon: <IconFont type="ql-icon-config" />,
        component: '@/pages/config/index',
      },
      {
        path: '/script',
-        name: '脚本管理',
+        name: intl.get('脚本管理'),
        icon: <IconFont type="ql-icon-script" />,
        component: '@/pages/script/index',
      },
      {
        path: '/dependence',
-        name: '依赖管理',
+        name: intl.get('依赖管理'),
        icon: <IconFont type="ql-icon-dependence" />,
        component: '@/pages/dependence/index',
      },
      {
        path: '/log',
-        name: '日志管理',
+        name: intl.get('日志管理'),
        icon: <IconFont type="ql-icon-log" />,
        component: '@/pages/log/index',
      },
      {
        path: '/diff',
-        name: '对比工具',
+        name: intl.get('对比工具'),
        icon: <IconFont type="ql-icon-diff" />,
        component: '@/pages/diff/index',
      },
      {
        path: '/setting',
-        name: '系统设置',
+        name: intl.get('系统设置'),
        icon: <SettingOutlined />,
        component: '@/pages/password/index',
      },
@@ -1,6 +1,5 @@
@import '~antd/es/style/themes/default.less';
@import '~@/styles/variable.less';
-@import '~codemirror/lib/codemirror.css';

@font-face {
  font-family: 'Source Code Pro';
@@ -9,6 +8,26 @@
    url('../assets/fonts/SourceCodePro-Regular.ttf') format('truetype');
 }

+body {
+  // 禁止手机页面下拉刷新
+  overflow: hidden;
+
+  // 禁止手机页面弹簧效果
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+
+#root {
+  height: 100vh;
+  height: calc(100vh - var(--vh-offset, 0px));
+  -webkit-overflow-scrolling: touch;
+}
+
+.ant-modal-header {
+  padding-right: 54px;
+}
+
 .ant-modal-body {
  max-height: calc(80vh - 110px);
  max-height: calc(80vh - var(--vh-offset, 110px));
@@ -16,9 +35,24 @@
 }

 .log-modal {
-  .ant-modal {
-    padding-bottom: 0 !important;
-    width: 580px !important;
+  &.ant-modal {
+    max-width: 1000px !important;
+    width: 80vw !important;
+  }
+
+  .ant-modal-body {
+    overflow-y: auto;
+    min-height: 300px;
+    max-height: calc(80vh - 110px);
+    max-height: calc(80vh - var(--vh-offset, 110px));
+    padding: 0;
+    display: flex;
+
+    .log-container {
+      width: 100%;
+      padding: 24px;
+      overflow-y: auto;
+    }
  }

  pre {
@@ -71,10 +105,12 @@
 }

 .ant-tooltip {
-  max-width: 500px !important;
+  max-width: 300px !important;

  .ant-tooltip-inner {
    word-break: break-all !important;
+    max-height: 300px !important;
+    overflow-y: auto !important;
  }
 }

@@ -149,6 +185,7 @@
      .react-codemirror2,
      .CodeMirror {
        height: 100%;
+        overflow: auto;
      }
    }
  }
@@ -166,8 +203,14 @@
    }
  }

+  .log-modal {
+    &.ant-modal {
+      width: calc(100vw - 16px) !important;
+    }
+  }
+
  .ant-tooltip {
-    max-width: 250px !important;
+    max-width: 300px !important;
  }
 }

@@ -311,24 +354,27 @@ select:-webkit-autofill:focus {
 .side-menu-user-drop-menu {
  position: relative;
  text-align: left;
-  outline: none;
-  padding: 4px 0;
-  border: 1px solid fade(@component-background, 0.12);
-  border-radius: 4px;
-  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+  padding: 2px 10px;
  overflow: auto;
-  background-color: @component-background;
-}
-
-[data-dark='true'] .side-menu-user-drop-menu {
-  background-color: #373739;
 }

 .ant-pro-sider-logo {
-  padding: 16px 8px !important;
+  padding-inline: 5px !important;

-  h1 {
-    margin-left: 5px !important;
+  .title {
+    display: flex;
+    height: 32px;
+    margin: 0 5px;
+    font-weight: 600;
+    font-size: 16px;
+    line-height: 32px;
+    vertical-align: middle;
+    animation: pro-layout-title-hide 0.3s;
+
+    a {
+      display: inline-flex;
+      align-items: center;
+    }
  }

  img {
@@ -342,14 +388,77 @@ select:-webkit-autofill:focus {
    // 移动端logo被拉伸
    width: auto !important;
  }
+
+  .ant-image {
+    display: inline-flex;
+  }
 }

 pre {
-  word-break: break-all !important;
-  white-space: break-spaces !important;
-  padding: 0 !important;
+  word-break: break-all;
+  white-space: break-spaces;
+  padding: 0;
+}
+
+.virtuallist {
+  .ant-table-tbody > tr > td > div {
+    white-space: unset !important;
+  }
 }

 .virtuallist .ant-table-tbody > tr > td > div {
-  white-space: unset !important;
+  box-sizing: border-box;
+  white-space: nowrap;
+  vertical-align: middle;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+}
+
+.virtuallist .ant-table-tbody > tr > td.ant-table-row-expand-icon-cell > div {
+  overflow: inherit;
+}
+
+.ant-table-bordered .virtuallist > table > .ant-table-tbody > tr > td {
+  border-right: 1px solid #f0f0f0;
+}
+
+.ant-table-column-title {
+  flex: unset;
+}
+
+.ant-table-column-sorters,
+.ant-table-filter-column {
+  justify-content: unset;
+}
+
+textarea.ant-input {
+  word-break: break-all;
+}
+
+.ant-pro-sider-collapsed,
+body[data-mode='phone'] header {
+  .title {
+    display: none;
+  }
+}
+
+.ant-design-pro .ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed {
+  box-shadow: none;
+  border-right: 1px solid #eee;
+}
+
+.ant-table.ant-table-middle .ant-table-title,
+.ant-table.ant-table-middle .ant-table-footer,
+.ant-table.ant-table-middle .ant-table-thead > tr > th,
+.ant-table.ant-table-middle .ant-table-tbody > tr > td,
+.ant-table.ant-table-middle tfoot > tr > th,
+.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);
+  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
whyour	742d0b2135	更新版本 v2.16.2	2023-09-02 00:41:16 +08:00
whyour	2081364325	修改定时任务置顶样式	2023-09-02 00:41:13 +08:00
whyour	39dc31916e	修复日志弹框样式	2023-09-01 23:16:12 +08:00
whyour	5395cebdb4	修复环境变量有空格时并发数量错误	2023-09-01 22:35:15 +08:00
whyour	fe934fa4af	修复环境变量中单引号转义	2023-09-01 15:15:25 +08:00
whyour	461fa8e131	修改系统任务日志	2023-08-29 23:29:02 +08:00
whyour	4618a19c04	修改本地监听 ip	2023-08-29 21:50:23 +08:00
whyour	e2bd15683e	修复 JSON.parse 错误，修复删除环境变量名称过长	2023-08-27 12:41:06 +08:00
whyour	648b9c4520	修改系统日志时间打印	2023-08-26 20:51:17 +08:00
whyour	b4e4e84bbd	修复多语言翻译	2023-08-26 15:29:44 +08:00
whyour	aa5d6f3cb6	系统设置增加系统语言切换	2023-08-26 00:16:15 +08:00
whyour	e9416c23df	增加任务运行数日志	2023-08-25 19:25:12 +08:00
NANSIYVandGitHub	ef4999be55	修复 python 企业微信推送错误 (#2087 ) close #2086	2023-08-25 10:37:03 +08:00
whyour	e7be4999b0	修复定时任务日志滚动	2023-08-25 09:05:32 +08:00
whyour	5907553670	修改定时任务置顶样式	2023-08-25 00:46:28 +08:00
whyour	0b9066525a	修复任务运行错误时没有日志，修改 tooltip 样式	2023-08-24 23:14:22 +08:00
whyour	ac904cae61	修复停止订阅执行日志	2023-08-23 22:57:18 +08:00
whyour	4d5fa320ea	修改私有仓库 ssh 配置	2023-08-23 18:06:28 +08:00
whyour	003defedcf	修复环境变量中$变量被计算	2023-08-23 14:55:57 +08:00
whyour	40e8041401	修复退出调试自动删除调试日志目录	2023-08-22 22:18:18 +08:00
whyour	a8174e89be	更新版本 v2.16.1	2023-08-21 22:51:00 +08:00
whyour	cce83f7a4c	修复日志中多语言文本判断	2023-08-21 22:50:57 +08:00
whyour	4f7649f157	系统设置增加系统运行日志	2023-08-21 00:10:43 +08:00
whyour	b002cbef3a	修复手机端日志弹框样式	2023-08-19 09:29:35 +08:00
whyour	1d93fe0de0	修复添加订阅粘贴 ql 链接	2023-08-18 09:17:18 +08:00
whyour	2d936f1341	修复定时任务页面样式	2023-08-17 08:26:48 +08:00
whyour	b40673e9ac	修改日志弹框样式	2023-08-16 22:14:45 +08:00
whyour	637874e426	初始化数据增加错误捕获	2023-08-11 22:50:53 +08:00
whyour	de71d1a258	修复任务筛选条件切换	2023-08-11 22:25:14 +08:00
whyour	e174e190ee	修复 python 企业微信推送，debian 版本关于页面报错	2023-08-11 21:40:01 +08:00
whyour	89164a3bd2	更新版本 v2.16.0	2023-08-06 20:57:10 +08:00
whyour	a9b9c4d7ad	修复错误信息展示	2023-08-06 20:56:59 +08:00
whyour	f947866c32	修复全部任务多语言	2023-08-06 14:55:51 +08:00
whyour	a2e33d1ed4	修复 editor 判断语言	2023-08-05 13:18:28 +08:00
whyour	b1a242c8ee	更新多语言	2023-08-05 12:33:43 +08:00
whyour	0bf28e9ab3	task 支持运行 mjs 文件	2023-08-05 11:02:29 +08:00
whyour	624c9374e5	修复定时任务列表虚拟滚动	2023-08-04 22:24:54 +08:00
雨思andGitHub	a9da8fffc1	PushMe消息通道增加params参数，以支持markdown消息 (#2044 )	2023-08-01 21:33:19 +08:00
whyour	b4e5db9da9	删除订阅支持自动删除任务和脚本	2023-07-30 21:15:46 +08:00
whyour	2e27d4057e	定时任务增加关联订阅	2023-07-30 13:38:38 +08:00
whyour	e7d023a7e0	支持多语言英文	2023-07-29 18:26:30 +08:00
whyour	39bfd39559	修复任务详情日志列表卡顿	2023-07-27 23:15:48 +08:00
whyour	6832cb4e22	修复 6 位 cron 不以 task 开头运行失败	2023-07-25 22:18:35 +08:00
雨思andGitHub	590dbba19b	PushMe 推送通道修复 (#2034 )	2023-07-25 17:44:27 +08:00
whyour	3987ef8d97	更新版本 v2.15.20	2023-07-24 22:02:33 +08:00
whyour	8b0dedaf8c	修复 linux 依赖是否存在判断	2023-07-24 22:02:26 +08:00
whyour	04edd97967	修复 node 依赖匹配判断	2023-07-21 21:22:48 +08:00
whyour	6131fe0110	更新版本 v2.15.19	2023-07-20 23:14:16 +08:00
whyour	665c344ae4	修复依赖是否已经安装判断	2023-07-20 22:54:11 +08:00
雨思andGitHub	373b8c97d7	增加PushMe消息通道 (#2018 )，修复系统设置保存通知	2023-07-20 13:19:39 +08:00
whyour	56eb0c5408	更新版本 v2.15.18	2023-07-19 21:17:22 +08:00
whyour	fe55929959	更新 readme	2023-07-19 21:02:52 +08:00
whyour	01e2bd007d	修复重启提示持续时间	2023-07-18 21:39:03 +08:00
whyour	4e091b0c3e	修改 nginx body 限制，服务重启延迟时间	2023-07-18 15:30:43 +08:00
whyour	db94cd3799	修复备份数据超时时间	2023-07-18 13:43:02 +08:00
whyour	a15192b9b2	升级 @umijs/max 版本	2023-07-17 23:18:48 +08:00
whyour	efd4f1d5ab	umi-request 替换为 axios	2023-07-17 23:13:06 +08:00
whyour	bd166ee794	修复 pm2 重启逻辑	2023-07-17 13:25:56 +08:00
whyour	93e94ea94c	系统设置增加数据恢复功能	2023-07-16 22:02:30 +08:00
whyour	88b87de391	增加数据备份功能	2023-07-16 00:23:29 +08:00
whyour	8affff96f3	修改系统内更新系统逻辑	2023-07-13 22:09:45 +08:00
whyour	936b565fb1	修改系统更新时间和版本获取	2023-07-12 00:05:46 +08:00
whyour	b69ff2895e	增加依赖是否已经安装判断	2023-07-10 23:48:05 +08:00
whyour	f3791cbb62	修复编译错误	2023-07-09 17:46:02 +08:00
whyour	b0f3b51736	修复服务启动时定时删除日志失效	2023-07-08 20:58:36 +08:00
whyour	3aa112e373	修改 node 进程错误监控	2023-07-08 00:27:05 +08:00
whyour	683482e067	修改 ql update 逻辑	2023-07-08 00:18:09 +08:00
whyour	5a2caeb66b	更新版本 v2.15.17	2023-07-02 16:09:09 +08:00
whyour	ee6e5bd8b4	修改任务状态值	2023-07-02 16:09:01 +08:00
whyour	f970322f0a	修复定时任务状态筛选	2023-07-02 12:19:34 +08:00
whyour	1718120623	修改更新仓库逻辑	2023-07-01 20:48:28 +08:00
whyour	702c3160ec	修改并发逻辑，系统设置增加定时任务并发设置	2023-07-01 15:26:20 +08:00
whyour	db227e56bf	更新版本 v2.15.16	2023-06-18 15:51:42 +08:00
whyour	84828865f7	修复依赖安装流程	2023-06-18 15:51:35 +08:00
whyour	87455cebc0	修改应用设置 loading 默认值	2023-06-17 20:26:40 +08:00
whyour	9f4435b237	修改初始化逻辑	2023-06-16 02:12:25 +08:00
whyour	e5bc4b3b04	修复关闭全部任务视图，默认视图筛选错误	2023-06-14 22:38:15 +08:00
whyour	11e1b50000	修改订阅通知	2023-06-11 20:05:39 +08:00
whyour	bec226ae13	增加初始化文件写入，修复 shell 变量	2023-06-11 19:58:30 +08:00
whyour	c9ecdc6c97	企业微信通知增加代理地址配置 QYWX_ORIGIN	2023-06-11 15:03:07 +08:00
whyour	4cf64e7af0	增加 demo 环境变量	2023-06-10 22:20:19 +08:00
whyour	4ce01c5f0e	修复初始化界面样式	2023-06-10 16:16:36 +08:00
whyour	2eff99abe1	修复侧边栏样式	2023-06-10 13:27:21 +08:00
whyour	5bf57185d9	更新 readme	2023-06-10 12:52:53 +08:00
whyour	c59dac19ae	修复 shell 变量无引号报错	2023-06-09 19:50:38 +08:00
whyour	f1ef8e72ae	修复解析脚本名称逻辑	2023-06-09 19:45:25 +08:00
whyour	5b1accffb7	修改 api 限流策略，修复检查检查日志	2023-06-07 22:45:37 +08:00
whyour	f64ff83414	修复列表查询字符转码	2023-06-04 22:11:48 +08:00
whyour	26c914d1db	修复侧边栏样式	2023-06-03 01:24:52 +08:00
whyour	8f75a54110	修改 textarea 样式	2023-06-03 00:48:04 +08:00
whyour	874b6e3a56	修复错误页样式	2023-06-01 23:02:36 +08:00
whyour	f305d45225	修复依赖安装状态流转	2023-05-31 15:07:40 +08:00
whyour	a7f97bd729	替换 spawn 为 cross-spawn	2023-05-31 14:25:20 +08:00
whyour	0bbb7c7b89	修复获取 cpu 核数	2023-05-30 17:45:47 +08:00
whyour	f7465759c7	降级 p-limit，修复 esm 问题	2023-05-30 17:31:31 +08:00
whyour	998e82d323	增加 api 限流配置	2023-05-30 16:41:19 +08:00
whyour	f8dfee8945	重构任务并发执行逻辑	2023-05-30 16:32:00 +08:00
whyour	86e3d8736b	更新版本 v2.15.15	2023-05-28 20:06:15 +08:00
whyour	85d32d00e1	修改打包 latest 镜像分支	2023-05-28 20:06:05 +08:00
whyour	6a52e2f804	修复 env.js 路径	2023-05-27 23:05:46 +08:00
whyour	b4cb72c5d0	修改错误页面提示	2023-05-27 11:35:30 +08:00
whyour	79fd4ec58f	修复 nginx 变量替换	2023-05-26 17:08:40 +08:00
jzksnsjswkwandGitHub	49ed5c6632	修复可执行文件提示找不到文件的问题 (#1943 )	2023-05-26 15:17:47 +08:00
whyour	ffba7ee4a1	增加定时任务服务启动失败日志	2023-05-25 21:45:28 +08:00
whyour	91d080472f	修复环境变量接口前缀	2023-05-24 23:46:07 +08:00
whyour	826f214f0f	修复设置通知错误时提示不清晰	2023-05-24 23:37:44 +08:00
whyour	ca150dc6a6	修复 docker-compose 配置	2023-05-22 20:20:46 +08:00
whyour	ae5db60211	修复筛选可能报错	2023-05-21 12:29:29 +08:00
whyour	490bdc15f6	支持非根目录部署	2023-05-19 01:10:33 +08:00
whyour	1377fe31aa	更新版本 v2.15.14	2023-05-15 23:44:42 +08:00
whyour	3d1cf6bf2e	修改群晖名称	2023-05-15 23:44:32 +08:00
whyour	6ac755b478	修复后端 html 缓存	2023-05-15 22:34:06 +08:00
whyour	e70fa83074	修复获取配置文件参数	2023-05-14 20:53:45 +08:00
whyour	41521f1d08	修复 token 任务脚本路径，容器启动 bot	2023-05-13 01:10:49 +08:00
whyour	8b7bef097c	修复拉取仓库逻辑	2023-05-12 18:28:01 +08:00
whyour	618756d4a9	修复设置代理时，服务启动失败	2023-05-10 23:17:05 +08:00
whyour	70d0c71414	修复错误日志样式	2023-05-10 23:01:51 +08:00
whyour	65eb9c806d	更新 sqlite	2023-05-10 21:58:11 +08:00
whyour	50718ba714	修复 public 服务转发	2023-05-10 01:07:46 +08:00
whyour	7c3bb90d12	修复删除依赖和移动环境变量接口数据结构	2023-05-08 21:29:25 +08:00
whyour	f66390eabd	修改初始系统状态逻辑已经错误页面	2023-05-07 23:40:37 +08:00
whyour	481646501c	修复订阅更新仓库失败	2023-05-06 22:58:05 +08:00
whyour	5baa8e4391	增加 pm2 平滑重启	2023-05-06 00:09:03 +08:00
whyour	3d11210aeb	pnpm 版本降至 8.3.1	2023-05-05 00:26:23 +08:00
whyour	e1863407f2	修复 npm 源判断	2023-05-04 22:23:55 +08:00
whyour	0c28b63ab7	修改容器启动流程	2023-05-04 22:07:39 +08:00
whyour	8b8bd279c6	修复 nginx 转发stream接口失效，停止运行命令支持 pid 参数	2023-05-04 21:28:14 +08:00
whyour	01b404765e	更新版本 v2.15.13	2023-05-04 17:13:18 +08:00
whyour	c231a871d7	修复 check 异常	2023-05-04 17:13:04 +08:00
whyour	598c6b4e57	修复 task 打印日志逻辑	2023-05-04 15:17:38 +08:00
whyour	2295fabcc5	修复 task 命令日志目录判断	2023-05-04 13:11:18 +08:00
whyour	be94d796ac	增加 procps 依赖	2023-05-04 13:05:48 +08:00
whyour	c84908d7fa	修复运行命令api任务日志路径	2023-05-04 10:25:04 +08:00
whyour	d8ae039b92	修复内容区头部样式	2023-05-03 21:23:13 +08:00
whyour	bce1431d03	修复错误界面重试次数判断	2023-05-03 19:59:06 +08:00
whyour	9db0095e29	修复系统通知错误提示，gotifyPriority 配置参数	2023-05-03 18:18:28 +08:00
whyour	77dc7817fb	修复 pnpm 8.4.0 重新安装依赖会默认进行询问	2023-05-03 01:58:41 +08:00
whyour	d0dd97631e	修复 task 命令任务 ID 查询参数	2023-05-03 01:27:14 +08:00
whyour	d11d6d0c18	增加容器健康检查	2023-05-02 22:11:50 +08:00
whyour	0af687f781	增加停止指定命令接口	2023-05-01 22:56:47 +08:00
whyour	8db997abe8	修改 check 逻辑	2023-05-01 16:16:47 +08:00
whyour	aab6bbeb15	增加运行指定命令接口	2023-05-01 14:28:58 +08:00
whyour	df1addc1ff	修改 task 命令超时时间判断	2023-05-01 11:05:36 +08:00
whyour	1f8f35476a	移除任务默认超时时间	2023-04-30 20:02:14 +08:00
whyour	5354fc76db	修复 task 命令任务ID查询，系统依赖安装逻辑	2023-04-30 19:35:14 +08:00
whyour	b29a9e012c	修复停止任务无效	2023-04-29 22:49:50 +08:00
whyour	6e5d89c197	修改 task 命令生成日志逻辑和关联任务查询	2023-04-28 23:15:07 +08:00
whyour	d6cfb18f06	修改仓库拉取状态判断逻辑	2023-04-24 15:37:58 +08:00
whyour	9a3e38051d	克隆仓库增加 depth	2023-04-24 14:47:17 +08:00
whyour	b705ad6ee8	修复更新任务、环境变量、依赖、订阅状态丢失	2023-04-21 21:15:28 +08:00
whyour	db564d1add	更新版本 v2.15.12	2023-04-18 15:38:06 +08:00
whyour	4f422c0658	修改 dockerfile LANG 环境变量	2023-04-18 15:37:43 +08:00
whyour	f267720af4	修复初始化定时服务运行非禁用任务	2023-04-17 13:36:37 +08:00
whyour	4a0c66bcc0	修复初始化 ssh 配置文件不存在	2023-04-15 12:14:56 +08:00
whyour	ef7283a9fd	修改依赖安装初始状态	2023-04-12 00:45:06 +08:00
whyour	4498449eea	修复容器启动逻辑	2023-04-11 14:15:34 +08:00
whyour	ebb9676a51	修复定时服务启动路径	2023-04-08 21:58:34 +08:00
whyour	6fb39ce835	重构六位定时任务服务	2023-04-08 17:07:06 +08:00
whyour	59c26d90d3	修改手机端网页样式	2023-04-06 21:49:42 +08:00
whyour	1d2df860e8	修复 ssh 配置文件目录	2023-04-06 14:23:02 +08:00
whyour	ce22cad5b2	修改列表页更多菜单弹窗	2023-04-06 14:08:08 +08:00
whyour	dc44ce6b1a	修复 workflow pnpm 版本	2023-04-06 13:41:18 +08:00
whyour	b27ee23cc3	重构私有仓库ssh配置逻辑	2023-04-06 13:38:55 +08:00
whyour	083c8869aa	修复更新环境变量、定时任务、订阅等操作	2023-04-06 13:00:28 +08:00
whyour	6a971a0d6e	更新 readme	2023-04-02 14:49:30 +08:00
whyour	a25bfb6912	修复定时任务状态筛选	2023-04-02 14:42:18 +08:00
whyour	f19dd21155	更新 readme	2023-04-01 21:05:21 +08:00
whyour	79b342d1d2	更新版本 v2.15.11	2023-03-31 22:38:32 +08:00
whyour	20b0d75b0d	修改 pnpm 版本	2023-03-30 23:20:38 +08:00
whyour	c89724906e	修复定时任务表头样式	2023-03-23 22:19:48 +08:00
whyour	c3a548ece3	修改定时任务列表滚动	2023-03-22 22:30:47 +08:00
whyour	b431e39f8f	修复系统设置中登录日志样式	2023-03-20 23:23:03 +08:00
whyour	710746809b	修复删除视图筛选条件	2023-03-20 23:00:13 +08:00
whyour	8a225e9beb	修复视图筛选条件样式	2023-03-20 18:03:09 +08:00
whyour	a5ecb204b2	修复 python Server酱推送	2023-03-19 22:54:50 +08:00
whyour	f1f009da3b	禁止手机浏览器下拉刷新	2023-03-19 15:15:01 +08:00
whyour	7291098f98	修复手机页面滚动	2023-03-19 15:11:28 +08:00
whyour	666545ff03	修改初始化依赖安装逻辑	2023-03-18 22:26:29 +08:00
whyour	81e2bbb14c	更新版本 v2.15.10	2023-03-17 21:30:13 +08:00
whyour	970dff144c	修复订阅下载 http 协议文件	2023-03-15 21:44:11 +08:00
whyour	819b15b15e	容器增加 ipv6 检测，自动配置 nginx	2023-03-14 22:39:10 +08:00
whyour	3fa57c69ac	修改检查 pm2 状态 api	2023-03-13 23:57:56 +08:00
whyour	18689c8119	修复 shell 引入通用变量	2023-03-13 22:30:53 +08:00
adams549659584andGitHub	61e7049baa	修复系统 bark 推送铃声 (#1850 )	2023-03-13 22:13:20 +08:00
whyour	39c40a328d	修复检查更新弹框逻辑	2023-03-12 21:48:31 +08:00
whyour	955d815d14	修改 task 获取 token 逻辑	2023-03-12 21:33:46 +08:00
adams549659584andGitHub	3a3b945de8	修复 js 下 bark 推送声音 bug (#1847 )	2023-03-12 20:58:26 +08:00
whyour	73c53dbc8d	修改 typescript execute	2023-03-12 20:53:15 +08:00
whyour	f76828d4ec	修改 shell 文件权限	2023-03-11 01:10:03 +08:00
whyour	7b2956eb0a	修复日志删除逻辑	2023-03-10 14:21:52 +08:00
whyour	b2167ae5e4	修复自定义通知	2023-03-07 22:20:08 +08:00
whyour	98dfa4c425	更新版本 v2.15.9	2023-03-04 15:48:29 +08:00
whyour	5bf08b76de	修复系统更新源判断，回退 @monaco-editor/react	2023-03-03 23:45:38 +08:00
whyour	5c5b4f804e	更新 antd	2023-03-03 22:52:44 +08:00
whyour	6455245d11	更新 @umijs/max	2023-03-03 22:14:03 +08:00
pharaoh2012andGitHub	2ff3d9c601	根据标题跳过消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔 (#1833 )	2023-03-03 21:59:44 +08:00
whyour	d342fbf29f	修改登录日志表格样式	2023-03-03 11:58:06 +08:00
whyour	f865018cd6	修改表格样式	2023-03-02 23:31:46 +08:00
whyour	3b9a4f0834	修复定时任务状态筛选	2023-03-02 23:16:18 +08:00
whyour	67bc305950	修复拉取仓库重置操作	2023-03-01 22:12:49 +08:00
whyour	97f128d59f	修改 ql extra 执行逻辑	2023-02-28 22:56:06 +08:00
whyour	e25885c4d9	修改 nginx ipv6 配置	2023-02-27 23:30:00 +08:00
whyour	c285026339	修改删除日志逻辑	2023-02-27 23:25:08 +08:00
whyour	6c34045a48	修改订阅名称必填	2023-02-26 23:36:32 +08:00
whyour	e1e6261b4f	修复定时任务/视图/环境变量更新逻辑	2023-02-24 23:21:08 +08:00
whyour	697bcb5922	暂时去掉 vlist	2023-02-24 23:04:18 +08:00
whyour	e05b0a2491	修复文件类型订阅重复添加任务	2023-02-18 14:38:13 +08:00
whyour	e1655455d8	更新版本 v2.15.8	2023-02-17 23:11:41 +08:00
whyour	9921dab064	修复日志文件名格式化	2023-02-17 23:03:06 +08:00
whyour	403ab7f0f0	修改日志名称格式	2023-02-17 22:49:06 +08:00
whyour	9bc7ca4094	增加 NODE_PATH 环境变量	2023-02-15 22:27:40 +08:00
whyour	e924aa76b0	修复环境变量位置重置逻辑	2023-02-15 11:54:51 +08:00
whyour	0c46606e14	修复添加文件类型订阅	2023-02-14 21:15:59 +08:00
whyour	dbfa4049f5	修复订阅格式化参数	2023-02-14 11:10:25 +08:00
whyour	622fe2a8f8	修复订阅自动增加/删除任务默认值	2023-02-14 11:07:16 +08:00
whyour	7bce5c4f6a	任务增加关联订阅	2023-02-13 23:50:01 +08:00
whyour	1f7f2c8971	修复订阅生成 ssh 配置逻辑，自动添加/删除任务	2023-02-13 23:12:55 +08:00