更新版本 v2.16.5

例如 task x.js -n whyour，脚本就能接收到参数 -n whyour

.github/workflows/build_docker_image.yml

@@ -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:
@@ -87,14 +86,15 @@ jobs:
   build:
     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: '8.3.1'
@@ -108,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 }}
@@ -122,7 +122,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ github.repository }}
@@ -142,14 +142,14 @@ jobs:
             type=semver,pattern={{major}}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           build-args: |
             MAINTAINER=${{ github.repository_owner }}

README-en.md

@@ -36,6 +36,7 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - Support cell phone operation
 
 ## Version
+
 ### docker
 
 The `latest` image is built on `alpine` and the `debian` image is built on `debian-slim`. If you need to use a dependency that is not supported by `alpine`, it is recommended that you use the `debian` image.
@@ -53,6 +54,64 @@ The npm version supports `debian/ubuntu/centos/alpine` systems and requires `nod
 npm i @whyour/qinglong
 ```
 
+## Built-in commands
+
+1. task
+
+```bash
+# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
+task <file_path>                                             
+# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
+# and the foreground will output the day, while recorded in the log file
+task <file_path> now                                         
+# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
+# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
+task <file_path> conc <env_name> <account_number>(Optional) 
+# Specify the account to execute and run immediately regardless of whether a random delay is set 
+task <file_path> desi <env_name> <account_number>       
+# Set task timeout   
+task -m <max_time> <file_path>
+# Use -- to split, -- followed by a parameter that is passed to the script, as in the following example, the script receives the parameter -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+1. ql
+
+```bash
+# Update and restart Green Dragon
+ql update                                                    
+# Run custom scripts extra.sh
+ql extra                                                     
+# Adding a single script file
+ql raw <file_url>                                             
+# Add a specific script for a single repository
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+# Delete old logs
+ql rmlog <days>                                              
+# Start bot
+ql bot                                                       
+# Detecting the Green Dragon environment and repairing it
+ql check                                                     
+# Reset the number of login errors
+ql resetlet                                                  
+# Disable two-step login
+ql resettfa                                                  
+```
+
+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
+
 ## Deployment
 
 ### Docker (Recommended)
@@ -61,7 +120,12 @@ npm i @whyour/qinglong
 # curl -sSL get.docker.com | sh
 docker run -dit \
   -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
   -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   --restart unless-stopped \
@@ -88,7 +152,12 @@ docker-compose down
 podman run -dit \
   --network bridge \
   -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
   -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   docker.io/whyour/qinglong:latest
@@ -108,60 +177,6 @@ export QL_DATA_DIR=""
 qinglong
 ```
 
-## Use
-
-1. built-in commands
-
-```bash
-# Update and restart Green Dragon
-ql update                                                    
-# Run custom scripts extra.sh
-ql extra                                                     
-# Adding a single script file
-ql raw <file_url>                                             
-# Add a specific script for a single repository
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
-# Delete old logs
-ql rmlog <days>                                              
-# Start bot
-ql bot                                                       
-# Detecting the Green Dragon environment and repairing it
-ql check                                                     
-# Reset the number of login errors
-ql resetlet                                                  
-# Disable two-step login
-ql resettfa                                                  
-
-# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
-task <file_path>                                             
-# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
-# and the foreground will output the day, while recorded in the log file
-task <file_path> now                                         
-# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
-# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
-task <file_path> conc <env_name> <account_number>(Optional) 
-# Specify the account to execute and run immediately regardless of whether a random delay is set 
-task <file_path> desi <env_name> <account_number>       
-# Set task timeout   
-task -m <max_time> <file_path>
-# Print task log in real time, no need to carry this parameter when creating timed tasks
-task -l <file_path>  
-```
-
-2. parameter description
-
-* file_url: Script address
-* repo_url: Repository address
-* whitelist: The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled
-* blacklist: Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled
-* dependence: Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist
-* branch: Pull the branch of the repository
-* days: Number of days of logs to be kept
-* file_path: File path for task execution
-* env_name: The name of the environment variable that needs to be concurrent or specified at the time of task execution
-* account_number: Specify the account number of an environment variable to be executed when the task is executed
-* max_time: Timeout, suffix "s" for seconds (default), "m" for minutes, "h" for hours, "d" for days
-
 ## Development
 
 ```bash
@@ -174,7 +189,7 @@ $ pnpm install
 $ pnpm start
 ```
 
-Open your browser and visit http://127.0.0.1:5700
+Open your browser and visit <http://127.0.0.1:5700>
 
 ## Links
 
@@ -192,4 +207,4 @@ The Green Dragon, also known as the Canglong, is one of the four elephants and o
 
 In the Book of the Later Han Dynasty (後漢書-律曆志下), it is written: "The sun is in the sky, a cold and a summer, the four seasons are ready, all things are changed, the regency moves, and the green dragon moves to the star, which is called the year. (The Year of the Star)
 
-Among the [twenty-eight Chinese constellations](https://zh.wikipedia.org/wiki/%E4%BA%8C%E5%8D%81%E5%85%AB%E5%AE%BF), the Green Dragon is the generic name for the seven eastern constellations (Horn, Hyper, Diao, Fang, Heart, Tail and Minchi). It is known in Taoism as "Mengzhang" and in different Taoist scriptures as "Dijun", "Shengjian", "Shenjian" and He is also known in different Daoist scriptures as "Dijun", "Shengjun", "Shenjun" and "Ghost Catcher"[1], and is the guardian deity of Daoism, together with the White Tiger Supervisor of Soldiers.
+Among the [twenty-eight Chinese constellations](https://zh.wikipedia.org/wiki/%E4%BA%8C%E5%8D%81%E5%85%AB%E5%AE%BF), the Green Dragon is the generic name for the seven eastern constellations (Horn, Hyper, Diao, Fang, Heart, Tail and Minchi). It is known in Taoism as "Mengzhang" and in different Taoist scriptures as "Dijun", "Shengjian", "Shenjian" and He is also known in different Daoist scriptures as "Dijun", "Shengjun", "Shenjun" and "Ghost Catcher"[1], and is the guardian deity of Daoism, together with the White Tiger Supervisor of Soldiers.

README.md

@@ -38,6 +38,7 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - 支持手机端操作
 
 ## 版本
+
 ### docker
 
 `latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像
@@ -55,6 +56,63 @@ npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node
 npm i @whyour/qinglong
 ```
 
+## 内置命令
+
+1. task
+
+```bash
+# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
+task <file_path>                                             
+# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
+task <file_path> now                                         
+# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
+task <file_path> conc <env_name> <account_number>(可选的) 
+# 指定账号执行，无论是否设置了随机延迟，均立即运行 
+task <file_path> desi <env_name> <account_number>      
+# 设置任务超时时间   
+task -m <max_time> <file_path>
+# 使用 -- 分割，-- 后面的参数会传给脚本，下面的例子，脚本就可接收到参数 -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+1. ql
+
+```bash
+# 更新并重启青龙
+ql update
+# 运行自定义脚本extra.sh
+ql extra
+# 添加单个脚本文件
+ql raw <file_url>
+# 添加单个仓库的指定脚本
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
+# 删除旧日志
+ql rmlog <days>
+# 启动tg-bot
+ql bot
+# 检测青龙环境并修复
+ql check
+# 重置登录错误次数
+ql resetlet                                                  
+# 禁用两步登录
+ql resettfa
+```
+
+1. 参数说明
+
+- file_url: 脚本地址
+- repo_url: 仓库地址
+- whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
+- blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
+- dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
+- extensions: 拉取仓库的文件后缀，多个竖线分割
+- branch: 拉取仓库的分支
+- days: 需要保留的日志的天数
+- file_path: 任务执行时的文件路径
+- env_name: 任务执行时需要并发或者指定时的环境变量名称
+- account_number: 任务执行时指定某个环境变量需要执行的账号序号
+- max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
+
 ## 部署
 
 ### docker (推荐)
@@ -63,9 +121,12 @@ npm i @whyour/qinglong
 # curl -sSL get.docker.com | sh
 docker run -dit \
   -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
   -p 5700:5700 \
-  # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+  # 部署路径非必须，比如 /test
   -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   --restart unless-stopped \
@@ -92,9 +153,12 @@ docker-compose down
 podman run -dit \
   --network bridge \
   -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
   -p 5700:5700 \
-  # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+  # 部署路径非必须，比如 /test
   -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   docker.io/whyour/qinglong:latest
@@ -114,59 +178,6 @@ export QL_DATA_DIR=""
 qinglong
 ```
 
-## 使用
-
-1. 内置命令
-
-```bash
-# 更新并重启青龙
-ql update                                                    
-# 运行自定义脚本extra.sh
-ql extra                                                     
-# 添加单个脚本文件
-ql raw <file_url>                                             
-# 添加单个仓库的指定脚本
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
-# 删除旧日志
-ql rmlog <days>                                              
-# 启动tg-bot
-ql bot                                                       
-# 检测青龙环境并修复
-ql check                                                     
-# 重置登录错误次数
-ql resetlet                                                  
-# 禁用两步登录
-ql resettfa                                                  
-
-# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
-task <file_path>                                             
-# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
-task <file_path> now                                         
-# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
-task <file_path> conc <env_name> <account_number>(可选的) 
-# 指定账号执行，无论是否设置了随机延迟，均立即运行 
-task <file_path> desi <env_name> <account_number>      
-# 设置任务超时时间   
-task -m <max_time> <file_path>
-# 实时打印任务日志，创建定时任务时，不用携带此参数
-task -l <file_path>
-```
-
-2. 参数说明
-
-* file_url: 脚本地址
-* repo_url: 仓库地址
-* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
-* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
-* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
-* extensions: 拉取仓库的文件后缀，多个竖线分割
-* branch: 拉取仓库的分支
-* days: 需要保留的日志的天数
-* file_path: 任务执行时的文件路径
-* env_name: 任务执行时需要并发或者指定时的环境变量名称
-* account_number: 任务执行时指定某个环境变量需要执行的账号序号
-* max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-
 ## 开发
 
 ```bash

back/api/cron.ts

@@ -176,6 +176,9 @@ export default (app: Router) => {
         name: Joi.string().optional(),
         labels: Joi.array().optional(),
         sub_id: Joi.number().optional().allow(null),
+        extra_schedules: Joi.array().optional().allow(null),
+        task_before: Joi.string().optional().allow('').allow(null),
+        task_after: Joi.string().optional().allow('').allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -333,6 +336,9 @@ export default (app: Router) => {
         schedule: Joi.string().required(),
         name: Joi.string().optional().allow(null),
         sub_id: Joi.number().optional().allow(null),
+        extra_schedules: Joi.array().optional().allow(null),
+        task_before: Joi.string().optional().allow('').allow(null),
+        task_after: Joi.string().optional().allow('').allow(null),
         id: Joi.number().required(),
       }),
     }),
@@ -452,13 +458,12 @@ export default (app: Router) => {
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
       try {
         const cronService = Container.get(CronService);
         const data = await cronService.status({
           ...req.body,
-          status: parseInt(req.body.status),
-          pid: parseInt(req.body.pid) || '',
+          status: req.body.status ? parseInt(req.body.status) : undefined,
+          pid: req.body.pid ? parseInt(req.body.pid) : undefined,
         });
         return res.send({ code: 200, data });
       } catch (e) {

back/api/log.ts

@@ -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);
         }

back/api/script.ts

@@ -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,
@@ -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);
         }
@@ -260,7 +260,6 @@ export default (app: Router) => {
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
       try {
         let { filename, path, pid } = req.body;
         const { name, ext } = parse(filename);
@@ -269,7 +268,9 @@ export default (app: Router) => {
 
         const scriptService = Container.get(ScriptService);
         const result = await scriptService.stopScript(filePath, pid);
-        emptyDir(logPath);
+        setTimeout(() => {
+          emptyDir(logPath);
+        }, 3000);
         res.send(result);
       } catch (e) {
         return next(e);

back/app.ts

@@ -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();

back/config/serverEnv.ts

@@ -1,11 +1,19 @@
 import { Request, Response } from 'express';
-import { pick } from 'lodash';
+import pick from 'lodash/pick';
 
 let pickedEnv: Record<string, string>;
 
 function getPickedEnv() {
   if (pickedEnv) return pickedEnv;
   const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv']);
+  if (picked.QlBaseUrl) {
+    if (!picked.QlBaseUrl.startsWith('/')) {
+      picked.QlBaseUrl = `/${picked.QlBaseUrl}`
+    }
+    if (!picked.QlBaseUrl.endsWith('/')) {
+      picked.QlBaseUrl = `${picked.QlBaseUrl}/`
+    }
+  }
   pickedEnv = picked as Record<string, string>;
   return picked;
 }

back/config/util.ts

@@ -84,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 })
@@ -298,17 +303,21 @@ 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);
 }
 
@@ -414,11 +423,11 @@ export function psTree(pid: number): Promise<number[]> {
 
 export async function killTask(pid: number) {
   const pids = await psTree(pid);
-  // SIGINT 2 程序终止(interrupt)信号，不会打印额外信息
+
   if (pids.length) {
     try {
-      [pid, ...pids].forEach((x) => {
-        process.kill(x, 2);
+      [pid, ...pids].reverse().forEach((x) => {
+        process.kill(x, 15);
       });
     } catch (error) { }
   } else {

back/data/cron.ts

@@ -18,6 +18,9 @@ export class Crontab {
   last_running_time?: number;
   last_execution_time?: number;
   sub_id?: number;
+  extra_schedules?: Array<{ schedule: string }>;
+  task_before?: string;
+  task_after?: string;
 
   constructor(options: Crontab) {
     this.name = options.name;
@@ -39,6 +42,9 @@ export class Crontab {
     this.last_running_time = options.last_running_time || 0;
     this.last_execution_time = options.last_execution_time || 0;
     this.sub_id = options.sub_id;
+    this.extra_schedules = options.extra_schedules;
+    this.task_before = options.task_before;
+    this.task_after = options.task_after;
   }
 }
 
@@ -49,7 +55,7 @@ export enum CrontabStatus {
   'disabled',
 }
 
-export 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',
@@ -75,4 +81,7 @@ export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
   last_running_time: DataTypes.NUMBER,
   last_execution_time: DataTypes.NUMBER,
   sub_id: { type: DataTypes.NUMBER, allowNull: true },
+  extra_schedules: DataTypes.JSON,
+  task_before: DataTypes.STRING,
+  task_after: DataTypes.STRING,
 });

back/data/notify.ts

@@ -18,6 +18,7 @@ export enum NotificationMode {
   'pushMe' = 'pushMe',
   'feishu' = 'feishu',
   'webhook' = 'webhook',
+  'chronocat' = 'Chronocat',
 }
 
 abstract class NotificationBaseInfo {
@@ -55,6 +56,8 @@ export class BarkNotification extends NotificationBaseInfo {
   public barkIcon = 'https://qn.whyour.cn/logo.png';
   public barkSound = '';
   public barkGroup = 'qinglong';
+  public barkLevel = 'active';
+  public barkUrl = '';
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -106,6 +109,12 @@ 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 = '';
@@ -138,4 +147,6 @@ export interface NotificationInfo
     EmailNotification,
     PushMeNotification,
     WebhookNotification,
+    ChronocatNotification,
     LarkNotification {}
+    

back/index.d.ts

@@ -3,3 +3,5 @@ declare namespace Express {
     platform: 'desktop' | 'mobile';
   }
 }
+
+declare module 'pstree.remy';

back/loaders/db.ts

@@ -48,7 +48,16 @@ export default async () => {
     } catch (error) {}
     try {
       await sequelize.query('alter table Crontabs add column sub_id NUMBER');
-    } catch (error) {}
+    } 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');

back/loaders/initFile.ts

@@ -108,8 +108,6 @@ export default async () => {
     fs.writeFileSync(TaskAfterFile, fs.readFileSync(sampleTaskShellFile));
   }
 
-  dotenv.config({ path: confFile });
-
   Logger.info('✌️ Init file down');
   console.log('✌️ Init file down');
 };

back/loaders/initTask.ts

@@ -1,6 +1,6 @@
 import { Container } from 'typedi';
 import SystemService from '../services/system';
-import ScheduleService from '../services/schedule';
+import ScheduleService, { ScheduleTaskType } from '../services/schedule';
 import SubscriptionService from '../services/subscription';
 import config from '../config';
 import { fileExist } from '../config/util';
@@ -22,7 +22,7 @@ export default async () => {
     id: NaN,
     name: '生成token',
     command: tokenCommand,
-  };
+  } as ScheduleTaskType;
   await scheduleService.cancelIntervalTask(cron);
   scheduleService.createIntervalTask(cron, {
     days: 28,

back/loaders/server.ts

@@ -30,13 +30,9 @@ export default async ({ server }: { server: Server }) => {
 
   process.on('uncaughtException', (error) => {
     Logger.error('Uncaught exception:', error);
-    console.error('Uncaught exception:', error);
-    process.exit(1);
   });
 
   process.on('unhandledRejection', (reason, promise) => {
     Logger.error('Unhandled rejection:', reason, promise);
-    console.error('Unhandled rejection:', reason, promise);
-    process.exit(1);
   });
 };

back/protos/cron.proto

@@ -7,10 +7,14 @@ service Cron {
   rpc delCron(DeleteCronRequest) returns (DeleteCronResponse);
 }
 
+message ISchedule { string schedule = 1; }
+
 message ICron {
   string id = 1;
   string schedule = 2;
   string command = 3;
+  repeated ISchedule extra_schedules = 4;
+  string name = 5;
 }
 
 message AddCronRequest { repeated ICron crons = 1; }

back/protos/cron.ts

@@ -10,78 +10,161 @@ import {
   Metadata,
   ServiceError,
   UntypedServiceImplementation,
-} from '@grpc/grpc-js';
-import _m0 from 'protobufjs/minimal';
+} from "@grpc/grpc-js";
+import _m0 from "protobufjs/minimal";
 
-export const protobufPackage = 'com.ql.cron';
+export const protobufPackage = "com.ql.cron";
+
+export interface ISchedule {
+  schedule: string;
+}
 
 export interface ICron {
   id: string;
   schedule: string;
   command: string;
+  extraSchedules: ISchedule[];
+  name: string;
 }
 
 export interface AddCronRequest {
   crons: ICron[];
 }
 
-export interface AddCronResponse {}
+export interface AddCronResponse {
+}
 
 export interface DeleteCronRequest {
   ids: string[];
 }
 
-export interface DeleteCronResponse {}
+export interface DeleteCronResponse {
+}
+
+function createBaseISchedule(): ISchedule {
+  return { schedule: "" };
+}
+
+export const ISchedule = {
+  encode(message: ISchedule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.schedule !== "") {
+      writer.uint32(10).string(message.schedule);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ISchedule {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseISchedule();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.schedule = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ISchedule {
+    return { schedule: isSet(object.schedule) ? String(object.schedule) : "" };
+  },
+
+  toJSON(message: ISchedule): unknown {
+    const obj: any = {};
+    message.schedule !== undefined && (obj.schedule = message.schedule);
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<ISchedule>, I>>(base?: I): ISchedule {
+    return ISchedule.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<ISchedule>, I>>(object: I): ISchedule {
+    const message = createBaseISchedule();
+    message.schedule = object.schedule ?? "";
+    return message;
+  },
+};
 
 function createBaseICron(): ICron {
-  return { id: '', schedule: '', command: '' };
+  return { id: "", schedule: "", command: "", extraSchedules: [], name: "" };
 }
 
 export const ICron = {
   encode(message: ICron, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.id !== '') {
+    if (message.id !== "") {
       writer.uint32(10).string(message.id);
     }
-    if (message.schedule !== '') {
+    if (message.schedule !== "") {
       writer.uint32(18).string(message.schedule);
     }
-    if (message.command !== '') {
+    if (message.command !== "") {
       writer.uint32(26).string(message.command);
     }
+    for (const v of message.extraSchedules) {
+      ISchedule.encode(v!, writer.uint32(34).fork()).ldelim();
+    }
+    if (message.name !== "") {
+      writer.uint32(42).string(message.name);
+    }
     return writer;
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ICron {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseICron();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag != 10) {
+          if (tag !== 10) {
             break;
           }
 
           message.id = reader.string();
           continue;
         case 2:
-          if (tag != 18) {
+          if (tag !== 18) {
             break;
           }
 
           message.schedule = reader.string();
           continue;
         case 3:
-          if (tag != 26) {
+          if (tag !== 26) {
             break;
           }
 
           message.command = reader.string();
           continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+
+          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) {
+      if ((tag & 7) === 4 || tag === 0) {
         break;
       }
       reader.skipType(tag & 7);
@@ -91,9 +174,13 @@ export const ICron = {
 
   fromJSON(object: any): ICron {
     return {
-      id: isSet(object.id) ? String(object.id) : '',
-      schedule: isSet(object.schedule) ? String(object.schedule) : '',
-      command: isSet(object.command) ? String(object.command) : '',
+      id: isSet(object.id) ? String(object.id) : "",
+      schedule: isSet(object.schedule) ? String(object.schedule) : "",
+      command: isSet(object.command) ? String(object.command) : "",
+      extraSchedules: Array.isArray(object?.extraSchedules)
+        ? object.extraSchedules.map((e: any) => ISchedule.fromJSON(e))
+        : [],
+      name: isSet(object.name) ? String(object.name) : "",
     };
   },
 
@@ -102,6 +189,12 @@ export const ICron = {
     message.id !== undefined && (obj.id = message.id);
     message.schedule !== undefined && (obj.schedule = message.schedule);
     message.command !== undefined && (obj.command = message.command);
+    if (message.extraSchedules) {
+      obj.extraSchedules = message.extraSchedules.map((e) => e ? ISchedule.toJSON(e) : undefined);
+    } else {
+      obj.extraSchedules = [];
+    }
+    message.name !== undefined && (obj.name = message.name);
     return obj;
   },
 
@@ -111,9 +204,11 @@ export const ICron = {
 
   fromPartial<I extends Exact<DeepPartial<ICron>, I>>(object: I): ICron {
     const message = createBaseICron();
-    message.id = object.id ?? '';
-    message.schedule = object.schedule ?? '';
-    message.command = object.command ?? '';
+    message.id = object.id ?? "";
+    message.schedule = object.schedule ?? "";
+    message.command = object.command ?? "";
+    message.extraSchedules = object.extraSchedules?.map((e) => ISchedule.fromPartial(e)) || [];
+    message.name = object.name ?? "";
     return message;
   },
 };
@@ -123,10 +218,7 @@ function createBaseAddCronRequest(): AddCronRequest {
 }
 
 export const AddCronRequest = {
-  encode(
-    message: AddCronRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(message: AddCronRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.crons) {
       ICron.encode(v!, writer.uint32(10).fork()).ldelim();
     }
@@ -134,22 +226,21 @@ export const AddCronRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): AddCronRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseAddCronRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag != 10) {
+          if (tag !== 10) {
             break;
           }
 
           message.crons.push(ICron.decode(reader, reader.uint32()));
           continue;
       }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
         break;
       }
       reader.skipType(tag & 7);
@@ -158,32 +249,24 @@ export const AddCronRequest = {
   },
 
   fromJSON(object: any): AddCronRequest {
-    return {
-      crons: Array.isArray(object?.crons)
-        ? object.crons.map((e: any) => ICron.fromJSON(e))
-        : [],
-    };
+    return { crons: Array.isArray(object?.crons) ? object.crons.map((e: any) => ICron.fromJSON(e)) : [] };
   },
 
   toJSON(message: AddCronRequest): unknown {
     const obj: any = {};
     if (message.crons) {
-      obj.crons = message.crons.map((e) => (e ? ICron.toJSON(e) : undefined));
+      obj.crons = message.crons.map((e) => e ? ICron.toJSON(e) : undefined);
     } else {
       obj.crons = [];
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<AddCronRequest>, I>>(
-    base?: I,
-  ): AddCronRequest {
+  create<I extends Exact<DeepPartial<AddCronRequest>, I>>(base?: I): AddCronRequest {
     return AddCronRequest.fromPartial(base ?? {});
   },
 
-  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(
-    object: I,
-  ): AddCronRequest {
+  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(object: I): AddCronRequest {
     const message = createBaseAddCronRequest();
     message.crons = object.crons?.map((e) => ICron.fromPartial(e)) || [];
     return message;
@@ -195,23 +278,19 @@ function createBaseAddCronResponse(): AddCronResponse {
 }
 
 export const AddCronResponse = {
-  encode(
-    _: AddCronResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(_: AddCronResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): AddCronResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseAddCronResponse();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
       }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
         break;
       }
       reader.skipType(tag & 7);
@@ -228,15 +307,11 @@ export const AddCronResponse = {
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(
-    base?: I,
-  ): AddCronResponse {
+  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(base?: I): AddCronResponse {
     return AddCronResponse.fromPartial(base ?? {});
   },
 
-  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(
-    _: I,
-  ): AddCronResponse {
+  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(_: I): AddCronResponse {
     const message = createBaseAddCronResponse();
     return message;
   },
@@ -247,10 +322,7 @@ function createBaseDeleteCronRequest(): DeleteCronRequest {
 }
 
 export const DeleteCronRequest = {
-  encode(
-    message: DeleteCronRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(message: DeleteCronRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.ids) {
       writer.uint32(10).string(v!);
     }
@@ -258,22 +330,21 @@ export const DeleteCronRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseDeleteCronRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag != 10) {
+          if (tag !== 10) {
             break;
           }
 
           message.ids.push(reader.string());
           continue;
       }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
         break;
       }
       reader.skipType(tag & 7);
@@ -282,11 +353,7 @@ export const DeleteCronRequest = {
   },
 
   fromJSON(object: any): DeleteCronRequest {
-    return {
-      ids: Array.isArray(object?.ids)
-        ? object.ids.map((e: any) => String(e))
-        : [],
-    };
+    return { ids: Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [] };
   },
 
   toJSON(message: DeleteCronRequest): unknown {
@@ -299,15 +366,11 @@ export const DeleteCronRequest = {
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
-    base?: I,
-  ): DeleteCronRequest {
+  create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(base?: I): DeleteCronRequest {
     return DeleteCronRequest.fromPartial(base ?? {});
   },
 
-  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
-    object: I,
-  ): DeleteCronRequest {
+  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(object: I): DeleteCronRequest {
     const message = createBaseDeleteCronRequest();
     message.ids = object.ids?.map((e) => e) || [];
     return message;
@@ -319,23 +382,19 @@ function createBaseDeleteCronResponse(): DeleteCronResponse {
 }
 
 export const DeleteCronResponse = {
-  encode(
-    _: DeleteCronResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(_: DeleteCronResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseDeleteCronResponse();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
       }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
         break;
       }
       reader.skipType(tag & 7);
@@ -352,15 +411,11 @@ export const DeleteCronResponse = {
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
-    base?: I,
-  ): DeleteCronResponse {
+  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(base?: I): DeleteCronResponse {
     return DeleteCronResponse.fromPartial(base ?? {});
   },
 
-  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
-    _: I,
-  ): DeleteCronResponse {
+  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(_: I): DeleteCronResponse {
     const message = createBaseDeleteCronResponse();
     return message;
   },
@@ -369,25 +424,21 @@ export const DeleteCronResponse = {
 export type CronService = typeof CronService;
 export const CronService = {
   addCron: {
-    path: '/com.ql.cron.Cron/addCron',
+    path: "/com.ql.cron.Cron/addCron",
     requestStream: false,
     responseStream: false,
-    requestSerialize: (value: AddCronRequest) =>
-      Buffer.from(AddCronRequest.encode(value).finish()),
+    requestSerialize: (value: AddCronRequest) => Buffer.from(AddCronRequest.encode(value).finish()),
     requestDeserialize: (value: Buffer) => AddCronRequest.decode(value),
-    responseSerialize: (value: AddCronResponse) =>
-      Buffer.from(AddCronResponse.encode(value).finish()),
+    responseSerialize: (value: AddCronResponse) => Buffer.from(AddCronResponse.encode(value).finish()),
     responseDeserialize: (value: Buffer) => AddCronResponse.decode(value),
   },
   delCron: {
-    path: '/com.ql.cron.Cron/delCron',
+    path: "/com.ql.cron.Cron/delCron",
     requestStream: false,
     responseStream: false,
-    requestSerialize: (value: DeleteCronRequest) =>
-      Buffer.from(DeleteCronRequest.encode(value).finish()),
+    requestSerialize: (value: DeleteCronRequest) => Buffer.from(DeleteCronRequest.encode(value).finish()),
     requestDeserialize: (value: Buffer) => DeleteCronRequest.decode(value),
-    responseSerialize: (value: DeleteCronResponse) =>
-      Buffer.from(DeleteCronResponse.encode(value).finish()),
+    responseSerialize: (value: DeleteCronResponse) => Buffer.from(DeleteCronResponse.encode(value).finish()),
     responseDeserialize: (value: Buffer) => DeleteCronResponse.decode(value),
   },
 } as const;
@@ -415,67 +466,36 @@ export interface CronClient extends Client {
   ): ClientUnaryCall;
   delCron(
     request: DeleteCronRequest,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
   ): ClientUnaryCall;
   delCron(
     request: DeleteCronRequest,
     metadata: Metadata,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
   ): ClientUnaryCall;
   delCron(
     request: DeleteCronRequest,
     metadata: Metadata,
     options: Partial<CallOptions>,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
   ): ClientUnaryCall;
 }
 
-export const CronClient = makeGenericClientConstructor(
-  CronService,
-  'com.ql.cron.Cron',
-) as unknown as {
-  new (
-    address: string,
-    credentials: ChannelCredentials,
-    options?: Partial<ClientOptions>,
-  ): CronClient;
+export const CronClient = makeGenericClientConstructor(CronService, "com.ql.cron.Cron") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): CronClient;
   service: typeof CronService;
 };
 
-type Builtin =
-  | Date
-  | Function
-  | Uint8Array
-  | string
-  | number
-  | boolean
-  | undefined;
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
-export type DeepPartial<T> = T extends Builtin
-  ? T
-  : T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U>
-  ? ReadonlyArray<DeepPartial<U>>
-  : T extends {}
-  ? { [K in keyof T]?: DeepPartial<T[K]> }
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
 
 type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin
-  ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
-      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
-    };
+export type Exact<P, I extends P> = P extends Builtin ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;

back/protos/health.ts

@@ -12,10 +12,10 @@ import {
   Metadata,
   ServiceError,
   UntypedServiceImplementation,
-} from '@grpc/grpc-js';
-import _m0 from 'protobufjs/minimal';
+} from "@grpc/grpc-js";
+import _m0 from "protobufjs/minimal";
 
-export const protobufPackage = 'com.ql.health';
+export const protobufPackage = "com.ql.health";
 
 export interface HealthCheckRequest {
   service: string;
@@ -33,79 +33,71 @@ export enum HealthCheckResponse_ServingStatus {
   UNRECOGNIZED = -1,
 }
 
-export function healthCheckResponse_ServingStatusFromJSON(
-  object: any,
-): HealthCheckResponse_ServingStatus {
+export function healthCheckResponse_ServingStatusFromJSON(object: any): HealthCheckResponse_ServingStatus {
   switch (object) {
     case 0:
-    case 'UNKNOWN':
+    case "UNKNOWN":
       return HealthCheckResponse_ServingStatus.UNKNOWN;
     case 1:
-    case 'SERVING':
+    case "SERVING":
       return HealthCheckResponse_ServingStatus.SERVING;
     case 2:
-    case 'NOT_SERVING':
+    case "NOT_SERVING":
       return HealthCheckResponse_ServingStatus.NOT_SERVING;
     case 3:
-    case 'SERVICE_UNKNOWN':
+    case "SERVICE_UNKNOWN":
       return HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN;
     case -1:
-    case 'UNRECOGNIZED':
+    case "UNRECOGNIZED":
     default:
       return HealthCheckResponse_ServingStatus.UNRECOGNIZED;
   }
 }
 
-export function healthCheckResponse_ServingStatusToJSON(
-  object: HealthCheckResponse_ServingStatus,
-): string {
+export function healthCheckResponse_ServingStatusToJSON(object: HealthCheckResponse_ServingStatus): string {
   switch (object) {
     case HealthCheckResponse_ServingStatus.UNKNOWN:
-      return 'UNKNOWN';
+      return "UNKNOWN";
     case HealthCheckResponse_ServingStatus.SERVING:
-      return 'SERVING';
+      return "SERVING";
     case HealthCheckResponse_ServingStatus.NOT_SERVING:
-      return 'NOT_SERVING';
+      return "NOT_SERVING";
     case HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN:
-      return 'SERVICE_UNKNOWN';
+      return "SERVICE_UNKNOWN";
     case HealthCheckResponse_ServingStatus.UNRECOGNIZED:
     default:
-      return 'UNRECOGNIZED';
+      return "UNRECOGNIZED";
   }
 }
 
 function createBaseHealthCheckRequest(): HealthCheckRequest {
-  return { service: '' };
+  return { service: "" };
 }
 
 export const HealthCheckRequest = {
-  encode(
-    message: HealthCheckRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
-    if (message.service !== '') {
+  encode(message: HealthCheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.service !== "") {
       writer.uint32(10).string(message.service);
     }
     return writer;
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseHealthCheckRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag != 10) {
+          if (tag !== 10) {
             break;
           }
 
           message.service = reader.string();
           continue;
       }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
         break;
       }
       reader.skipType(tag & 7);
@@ -114,7 +106,7 @@ export const HealthCheckRequest = {
   },
 
   fromJSON(object: any): HealthCheckRequest {
-    return { service: isSet(object.service) ? String(object.service) : '' };
+    return { service: isSet(object.service) ? String(object.service) : "" };
   },
 
   toJSON(message: HealthCheckRequest): unknown {
@@ -123,17 +115,13 @@ export const HealthCheckRequest = {
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(
-    base?: I,
-  ): HealthCheckRequest {
+  create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(base?: I): HealthCheckRequest {
     return HealthCheckRequest.fromPartial(base ?? {});
   },
 
-  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(
-    object: I,
-  ): HealthCheckRequest {
+  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(object: I): HealthCheckRequest {
     const message = createBaseHealthCheckRequest();
-    message.service = object.service ?? '';
+    message.service = object.service ?? "";
     return message;
   },
 };
@@ -143,10 +131,7 @@ function createBaseHealthCheckResponse(): HealthCheckResponse {
 }
 
 export const HealthCheckResponse = {
-  encode(
-    message: HealthCheckResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
+  encode(message: HealthCheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.status !== 0) {
       writer.uint32(8).int32(message.status);
     }
@@ -154,22 +139,21 @@ export const HealthCheckResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseHealthCheckResponse();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag != 8) {
+          if (tag !== 8) {
             break;
           }
 
           message.status = reader.int32() as any;
           continue;
       }
-      if ((tag & 7) == 4 || tag == 0) {
+      if ((tag & 7) === 4 || tag === 0) {
         break;
       }
       reader.skipType(tag & 7);
@@ -178,29 +162,20 @@ export const HealthCheckResponse = {
   },
 
   fromJSON(object: any): HealthCheckResponse {
-    return {
-      status: isSet(object.status)
-        ? healthCheckResponse_ServingStatusFromJSON(object.status)
-        : 0,
-    };
+    return { status: isSet(object.status) ? healthCheckResponse_ServingStatusFromJSON(object.status) : 0 };
   },
 
   toJSON(message: HealthCheckResponse): unknown {
     const obj: any = {};
-    message.status !== undefined &&
-      (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
+    message.status !== undefined && (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(
-    base?: I,
-  ): HealthCheckResponse {
+  create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(base?: I): HealthCheckResponse {
     return HealthCheckResponse.fromPartial(base ?? {});
   },
 
-  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(
-    object: I,
-  ): HealthCheckResponse {
+  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(object: I): HealthCheckResponse {
     const message = createBaseHealthCheckResponse();
     message.status = object.status ?? 0;
     return message;
@@ -210,25 +185,21 @@ export const HealthCheckResponse = {
 export type HealthService = typeof HealthService;
 export const HealthService = {
   check: {
-    path: '/com.ql.health.Health/Check',
+    path: "/com.ql.health.Health/Check",
     requestStream: false,
     responseStream: false,
-    requestSerialize: (value: HealthCheckRequest) =>
-      Buffer.from(HealthCheckRequest.encode(value).finish()),
+    requestSerialize: (value: HealthCheckRequest) => Buffer.from(HealthCheckRequest.encode(value).finish()),
     requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
-    responseSerialize: (value: HealthCheckResponse) =>
-      Buffer.from(HealthCheckResponse.encode(value).finish()),
+    responseSerialize: (value: HealthCheckResponse) => Buffer.from(HealthCheckResponse.encode(value).finish()),
     responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
   },
   watch: {
-    path: '/com.ql.health.Health/Watch',
+    path: "/com.ql.health.Health/Watch",
     requestStream: false,
     responseStream: true,
-    requestSerialize: (value: HealthCheckRequest) =>
-      Buffer.from(HealthCheckRequest.encode(value).finish()),
+    requestSerialize: (value: HealthCheckRequest) => Buffer.from(HealthCheckRequest.encode(value).finish()),
     requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
-    responseSerialize: (value: HealthCheckResponse) =>
-      Buffer.from(HealthCheckResponse.encode(value).finish()),
+    responseSerialize: (value: HealthCheckResponse) => Buffer.from(HealthCheckResponse.encode(value).finish()),
     responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
   },
 } as const;
@@ -241,32 +212,20 @@ export interface HealthServer extends UntypedServiceImplementation {
 export interface HealthClient extends Client {
   check(
     request: HealthCheckRequest,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
   ): ClientUnaryCall;
   check(
     request: HealthCheckRequest,
     metadata: Metadata,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
   ): ClientUnaryCall;
   check(
     request: HealthCheckRequest,
     metadata: Metadata,
     options: Partial<CallOptions>,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
+    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
   ): ClientUnaryCall;
-  watch(
-    request: HealthCheckRequest,
-    options?: Partial<CallOptions>,
-  ): ClientReadableStream<HealthCheckResponse>;
+  watch(request: HealthCheckRequest, options?: Partial<CallOptions>): ClientReadableStream<HealthCheckResponse>;
   watch(
     request: HealthCheckRequest,
     metadata?: Metadata,
@@ -274,43 +233,21 @@ export interface HealthClient extends Client {
   ): ClientReadableStream<HealthCheckResponse>;
 }
 
-export const HealthClient = makeGenericClientConstructor(
-  HealthService,
-  'com.ql.health.Health',
-) as unknown as {
-  new (
-    address: string,
-    credentials: ChannelCredentials,
-    options?: Partial<ClientOptions>,
-  ): HealthClient;
+export const HealthClient = makeGenericClientConstructor(HealthService, "com.ql.health.Health") as unknown as {
+  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): HealthClient;
   service: typeof HealthService;
 };
 
-type Builtin =
-  | Date
-  | Function
-  | Uint8Array
-  | string
-  | number
-  | boolean
-  | undefined;
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
-export type DeepPartial<T> = T extends Builtin
-  ? T
-  : T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U>
-  ? ReadonlyArray<DeepPartial<U>>
-  : T extends {}
-  ? { [K in keyof T]?: DeepPartial<T[K]> }
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
 
 type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin
-  ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
-      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
-    };
+export type Exact<P, I extends P> = P extends Builtin ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;

back/schedule/addCron.ts

@@ -3,41 +3,52 @@ import { AddCronRequest, AddCronResponse } from '../protos/cron';
 import nodeSchedule from 'node-schedule';
 import { scheduleStacks } from './data';
 import { runCron } from '../shared/runCron';
-import { QL_PREFIX, TASK_PREFIX } from '../config/const';
 import Logger from '../loaders/logger';
-import dayjs from 'dayjs';
 
 const addCron = (
   call: ServerUnaryCall<AddCronRequest, AddCronResponse>,
   callback: sendUnaryData<AddCronResponse>,
 ) => {
   for (const item of call.request.crons) {
-    const { id, schedule, command } = item;
+    const { id, schedule, command, extraSchedules, name } = item;
     if (scheduleStacks.has(id)) {
-      scheduleStacks.get(id)?.cancel();
-    }
-
-    let cmdStr = command.trim();
-    if (!cmdStr.startsWith(TASK_PREFIX) && !cmdStr.startsWith(QL_PREFIX)) {
-      cmdStr = `${TASK_PREFIX}${cmdStr}`;
+      scheduleStacks.get(id)?.forEach((x) => x.cancel());
     }
 
     Logger.info(
-      '[schedule][创建定时任务], 任务ID: %s, cron: %s, 执行命令: %s',
+      '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
       id,
+      name,
       schedule,
       command,
     );
 
-    scheduleStacks.set(
-      id,
-      nodeSchedule.scheduleJob(id, schedule, async () => {
+    if (extraSchedules?.length) {
+      extraSchedules.forEach(x => {
         Logger.info(
-          `[schedule][准备运行任务] 命令: ${cmdStr}`,
+          '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
+          id,
+          name,
+          x.schedule,
+          command,
         );
-        runCron(`ID=${id} ${cmdStr}`);
+      })
+    }
+
+    scheduleStacks.set(id, [
+      nodeSchedule.scheduleJob(id, schedule, async () => {
+        Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
+        runCron(command, { name, schedule, extraSchedules });
       }),
-    );
+      ...(extraSchedules?.length
+        ? extraSchedules.map((x) =>
+          nodeSchedule.scheduleJob(id, x.schedule, async () => {
+            Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
+            runCron(command, { name, schedule, extraSchedules });
+          }),
+        )
+        : []),
+    ]);
   }
 
   callback(null, null);

back/schedule/data.ts

@@ -1,6 +1,6 @@
 import nodeSchedule from 'node-schedule';
 import { ToadScheduler } from 'toad-scheduler';
 
-export const scheduleStacks = new Map<string, nodeSchedule.Job>();
+export const scheduleStacks = new Map<string, nodeSchedule.Job[]>();
 
 export const intervalSchedule = new ToadScheduler();

back/schedule/delCron.ts

@@ -13,7 +13,7 @@ const delCron = (
         '[schedule][取消定时任务], 任务ID: %s',
         id,
       );
-      scheduleStacks.get(id)?.cancel();
+      scheduleStacks.get(id)?.forEach(x => x.cancel());
       scheduleStacks.delete(id);
     }
   }

back/services/cron.ts

@@ -14,6 +14,8 @@ 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 {
@@ -31,9 +33,9 @@ export default class CronService {
     const tab = new Crontab(payload);
     tab.saved = false;
     const doc = await this.insert(tab);
-    if (this.isSixCron(doc)) {
+    if (this.isSixCron(doc) || doc.extra_schedules?.length) {
       await cronClient.addCron([
-        { id: String(doc.id), schedule: doc.schedule!, command: doc.command },
+        { name: doc.name || '', id: String(doc.id), schedule: doc.schedule!, command: this.makeCommand(doc), extraSchedules: doc.extra_schedules || [] },
       ]);
     }
     await this.set_crontab();
@@ -52,15 +54,17 @@ export default class CronService {
     if (doc.isDisabled === 1) {
       return newDoc;
     }
-    if (this.isSixCron(doc)) {
-      await cronClient.delCron([String(newDoc.id)]);
+    if (this.isSixCron(doc) || doc.extra_schedules?.length) {
+      await cronClient.delCron([String(doc.id)]);
     }
-    if (this.isSixCron(newDoc)) {
+    if (this.isSixCron(newDoc) || newDoc.extra_schedules?.length) {
       await cronClient.addCron([
         {
+          name: doc.name || '',
           id: String(newDoc.id),
           schedule: newDoc.schedule!,
-          command: newDoc.command,
+          command: this.makeCommand(newDoc),
+          extraSchedules: newDoc.extra_schedules || []
         },
       ]);
     }
@@ -88,7 +92,7 @@ export default class CronService {
     last_running_time: number;
     last_execution_time: number;
   }) {
-    const options: any = {
+    let options: any = {
       status,
       pid,
       log_path,
@@ -98,7 +102,13 @@ export default class CronService {
       options.last_running_time = last_running_time;
     }
 
-    return await CrontabModel.update({ ...options }, { where: { id: ids } });
+    for (const id of ids) {
+      const cron = await this.getDb({ id });
+      if (status === CrontabStatus.idle && log_path !== cron.log_path) {
+        options = omit(options, ['status', 'log_path', 'pid']);
+      }
+      await CrontabModel.update({ ...pickBy(options, (v) => v === 0 || !!v) }, { where: { id } });
+    }
   }
 
   public async remove(ids: number[]) {
@@ -382,15 +392,18 @@ export default class CronService {
     );
   }
 
-  private async runSingle(cronId: number): Promise<number> {
-    return taskLimit.runWithCpuLimit(() => {
+  private async runSingle(cronId: number): Promise<number | void> {
+    return taskLimit.runWithCronLimit(() => {
       return new Promise(async (resolve: any) => {
         const cron = await this.getDb({ id: cronId });
+        const params = { name: cron.name, command: cron.command, schedule: cron.schedule, extraSchedules: cron.extra_schedules };
         if (cron.status !== CrontabStatus.queued) {
-          resolve();
+          resolve(params);
           return;
         }
 
+        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify(params)}`);
+
         let { id, command, log_path } = cron;
         const uniqPath = await getUniqPath(command, `${id}`);
         const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
@@ -401,25 +414,7 @@ export default class CronService {
         const logPath = `${uniqPath}/${logTime}.log`;
         const absolutePath = path.resolve(config.logPath, `${logPath}`);
 
-        this.logger.silly('Running job');
-        this.logger.silly('ID: ' + id);
-        this.logger.silly('Original command: ' + command);
-
-        let cmdStr = command;
-        if (!cmdStr.startsWith(TASK_PREFIX) && !cmdStr.startsWith(QL_PREFIX)) {
-          cmdStr = `${TASK_PREFIX}${cmdStr}`;
-        }
-        if (
-          cmdStr.endsWith('.js') ||
-          cmdStr.endsWith('.py') ||
-          cmdStr.endsWith('.pyc') ||
-          cmdStr.endsWith('.sh') ||
-          cmdStr.endsWith('.ts')
-        ) {
-          cmdStr = `${cmdStr} now`;
-        }
-
-        const cp = spawn(`real_log_path=${logPath} ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
+        const cp = spawn(`real_log_path=${logPath} no_delay=true ${this.makeCommand(cron)}`, { shell: '/bin/bash' });
 
         await CrontabModel.update(
           { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
@@ -432,17 +427,12 @@ export default class CronService {
           fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
         });
 
-        cp.on('exit', async (code, signal) => {
-          this.logger.info(
-            `[panel][任务退出] 任务 ${command} 进程id: ${cp.pid}, 退出码 ${code}`,
-          );
-        });
-        cp.on('close', async (code) => {
+        cp.on('exit', async (code) => {
           await CrontabModel.update(
             { status: CrontabStatus.idle, pid: undefined },
             { where: { id } },
           );
-          resolve();
+          resolve({ ...params, pid: cp.pid, code });
         });
       });
     });
@@ -460,9 +450,11 @@ export default class CronService {
     const sixCron = docs
       .filter((x) => this.isSixCron(x))
       .map((doc) => ({
+        name: doc.name || '',
         id: String(doc.id),
         schedule: doc.schedule!,
-        command: doc.command,
+        command: this.makeCommand(doc),
+        extraSchedules: doc.extra_schedules || []
       }));
     await cronClient.addCron(sixCron);
     await this.set_crontab();
@@ -505,12 +497,22 @@ export default class CronService {
     }
   }
 
-  private make_command(tab: Crontab) {
+  private makeCommand(tab: Crontab) {
     let command = tab.command.trim();
     if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
       command = `${TASK_PREFIX}${tab.command}`;
     }
-    const crontab_job_string = `ID=${tab.id} ${command}`;
+    let commandVariable = `no_tee=true ID=${tab.id} `
+    if (tab.task_before) {
+      commandVariable += `task_before='${tab.task_before.replace(/'/g, "'\\''")
+        .trim()}' `;
+    }
+    if (tab.task_after) {
+      commandVariable += `task_after='${tab.task_after.replace(/'/g, "'\\''")
+        .trim()}' `;
+    }
+
+    const crontab_job_string = `${commandVariable}${command}`;
     return crontab_job_string;
   }
 
@@ -519,16 +521,16 @@ export default class CronService {
     var crontab_string = '';
     tabs.data.forEach((tab) => {
       const _schedule = tab.schedule && tab.schedule.split(/ +/);
-      if (tab.isDisabled === 1 || _schedule!.length !== 5) {
+      if (tab.isDisabled === 1 || _schedule!.length !== 5 || tab.extra_schedules?.length) {
         crontab_string += '# ';
         crontab_string += tab.schedule;
         crontab_string += ' ';
-        crontab_string += this.make_command(tab);
+        crontab_string += this.makeCommand(tab);
         crontab_string += '\n';
       } else {
         crontab_string += tab.schedule;
         crontab_string += ' ';
-        crontab_string += this.make_command(tab);
+        crontab_string += this.makeCommand(tab);
         crontab_string += '\n';
       }
     });
@@ -580,9 +582,11 @@ export default class CronService {
     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: doc.command,
+        command: this.makeCommand(doc),
+        extraSchedules: doc.extra_schedules || []
       }));
     await cronClient.addCron(sixCron);
   }

back/services/dependence.ts

@@ -273,7 +273,7 @@ export default class DependenceService {
           this.updateLog(depIds, JSON.stringify(err));
         });
 
-        cp.on('close', async (code) => {
+        cp.on('exit', async (code) => {
           const endTime = dayjs();
           const isSucceed = code === 0;
           const resultText = isSucceed ? '成功' : '失败';

back/services/notify.ts

@@ -1,12 +1,12 @@
-import { NotificationInfo } from '../data/notify';
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import UserService from './user';
-import got from 'got';
-import nodemailer from 'nodemailer';
 import crypto from 'crypto';
+import got from 'got';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
+import nodemailer from 'nodemailer';
+import { Inject, Service } from 'typedi';
+import winston from 'winston';
 import { parseBody, parseHeaders } from '../config/util';
+import { NotificationInfo } from '../data/notify';
+import UserService from './user';
 
 @Service()
 export default class NotificationService {
@@ -31,6 +31,7 @@ export default class NotificationService {
     ['pushMe', this.pushMe],
     ['webhook', this.webhook],
     ['lark', this.lark],
+    ['chronocat', this.chronocat],
   ]);
 
   private title = '';
@@ -195,7 +196,8 @@ export default class NotificationService {
   }
 
   private async bark() {
-    let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
+    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
+      this.params;
     if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
@@ -203,7 +205,7 @@ export default class NotificationService {
       this.title,
     )}/${encodeURIComponent(
       this.content,
-    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}`;
+    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
 
     try {
       const res: any = await got
@@ -588,6 +590,63 @@ export default class NotificationService {
     }
   }
 
+  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() {
     const {
       webhookUrl,

back/services/schedule.ts

@@ -12,7 +12,7 @@ import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';
 import { spawn } from 'cross-spawn';
 
-interface ScheduleTaskType {
+export interface ScheduleTaskType {
   id: number;
   command: string;
   name?: string;
@@ -42,15 +42,22 @@ 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 taskLimit.runWithCpuLimit(() => {
+    return taskLimit.runWithCronLimit(() => {
       return new Promise(async (resolve, reject) => {
+        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify({ ...params, command })}`);
+
         try {
           const startTime = dayjs();
           await callbacks.onBefore?.(startTime);
@@ -82,20 +89,14 @@ export default class ScheduleService {
             await callbacks.onError?.(JSON.stringify(err));
           });
 
-          cp.on('exit', async (code, signal) => {
-            this.logger.info(
-              `[panel][任务退出] ${command} 进程id: ${cp.pid}, 退出码 ${code}`,
-            );
-          });
-
-          cp.on('close', async (code) => {
+          cp.on('exit', async (code) => {
             const endTime = dayjs();
             await callbacks.onEnd?.(
               cp,
               endTime,
               endTime.diff(startTime, 'seconds'),
             );
-            resolve(null);
+            resolve({ ...params, pid: cp.pid, code });
           });
         } catch (error) {
           this.logger.error(
@@ -126,12 +127,20 @@ export default class ScheduleService {
     this.scheduleStacks.set(
       _id,
       nodeSchedule.scheduleJob(_id, schedule, async () => {
-        this.runTask(command, callbacks);
+        this.runTask(command, callbacks, {
+          name,
+          schedule,
+          command,
+        });
       }),
     );
 
     if (runImmediately) {
-      this.runTask(command, callbacks);
+      this.runTask(command, callbacks, {
+        name,
+        schedule,
+        command,
+      });
     }
   }
 
@@ -160,7 +169,10 @@ export default class ScheduleService {
     const task = new Task(
       name,
       () => {
-        this.runTask(command, callbacks);
+        this.runTask(command, callbacks, {
+          name,
+          command,
+        });
       },
       (err) => {
         this.logger.error(
@@ -180,7 +192,10 @@ export default class ScheduleService {
     this.intervalSchedule.addIntervalJob(job);
 
     if (runImmediately) {
-      this.runTask(command, callbacks);
+      this.runTask(command, callbacks, {
+        name,
+        command,
+      });
     }
   }
 

back/services/script.ts

@@ -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({
@@ -42,10 +42,11 @@ export default class ScriptService {
 
   public async runScript(filePath: string) {
     const relativePath = path.relative(config.scriptPath, filePath);
-    const command = `${TASK_COMMAND} -l ${relativePath} now`;
+    const command = `${TASK_COMMAND} ${relativePath} now`;
     const pid = await this.scheduleService.runTask(
       command,
       this.taskCallbacks(filePath),
+      { command },
       'start',
     );
 
@@ -55,11 +56,11 @@ export default class ScriptService {
   public async stopScript(filePath: string, pid: number) {
     if (!pid) {
       const relativePath = path.relative(config.scriptPath, filePath);
-      pid = await getPid(`${TASK_COMMAND} -l ${relativePath} now`) as number;
+      pid = await getPid(`${TASK_COMMAND} ${relativePath} now`) as number;
     }
     try {
       await killTask(pid);
-    } catch (error) {}
+    } catch (error) { }
 
     return { code: 200 };
   }

back/services/sock.ts

@@ -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;

back/services/subscription.ts

@@ -320,7 +320,11 @@ export default class SubscriptionService {
 
     const command = formatCommand(subscription);
 
-    this.scheduleService.runTask(command, this.taskCallbacks(subscription));
+    this.scheduleService.runTask(command, this.taskCallbacks(subscription), {
+      name: subscription.name,
+      schedule: subscription.schedule,
+      command
+    });
   }
 
   public async disabled(ids: number[]) {

back/services/system.ts

@@ -28,7 +28,7 @@ import taskLimit from '../shared/pLimit';
 import tar from 'tar';
 import path from 'path';
 import fs from 'fs';
-import { sum } from 'lodash';
+import sum from 'lodash/sum';
 
 @Service()
 export default class SystemService {
@@ -39,7 +39,7 @@ export default class SystemService {
     @Inject('logger') private logger: winston.Logger,
     private scheduleService: ScheduleService,
     private sockService: SockService,
-  ) {}
+  ) { }
 
   public async getSystemConfig() {
     const doc = await this.getDb({ type: AuthDataType.systemConfig });
@@ -84,7 +84,7 @@ export default class SystemService {
     });
     if (info.logRemoveFrequency) {
       const cron = {
-        id: result.id,
+        id: result.id || NaN,
         name: '删除日志',
         command: `ql rmlog ${info.logRemoveFrequency}`,
       };
@@ -114,7 +114,7 @@ export default class SystemService {
           },
         );
         lastVersionContent = await parseContentVersion(result.body);
-      } catch (error) {}
+      } catch (error) { }
 
       if (!lastVersionContent) {
         lastVersionContent = currentVersionContent;
@@ -232,6 +232,9 @@ export default class SystemService {
     this.scheduleService.runTask(
       `real_log_path=${logPath} real_time=true ${command}`,
       callback,
+      {
+        command,
+      }
     );
   }
 

back/shared/pLimit.ts

@@ -1,29 +1,62 @@
-import pLimit from 'p-limit';
+import PQueue, { QueueAddOptions } from 'p-queue-cjs';
 import os from 'os';
 import { AuthDataType, AuthModel } from '../data/auth';
 import Logger from '../loaders/logger';
-import dayjs from 'dayjs';
 
 class TaskLimit {
-  private oneLimit = pLimit(1);
-  private updateLogLimit = pLimit(1);
-  private cpuLimit = pLimit(Math.max(os.cpus().length, 4));
+  private oneLimit = new PQueue({ concurrency: 1 });
+  private updateLogLimit = new PQueue({ concurrency: 1 });
+  private cronLimit = new PQueue({ concurrency: Math.max(os.cpus().length, 4) });
 
-  get cpuLimitActiveCount() {
-    return this.cpuLimit.activeCount;
+  get cronLimitActiveCount() {
+    return this.cronLimit.pending;
   }
 
-  get cpuLimitPendingCount() {
-    return this.cpuLimit.pendingCount;
+  get cronLimitPendingCount() {
+    return this.cronLimit.size;
   }
 
   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.cpuLimit = pLimit(limit);
+      this.cronLimit.concurrency = limit;
       return;
     }
     await AuthModel.sync();
@@ -31,23 +64,20 @@ class TaskLimit {
       where: { type: AuthDataType.systemConfig },
     });
     if (doc?.info?.cronConcurrency) {
-      this.cpuLimit = pLimit(doc?.info?.cronConcurrency);
+      this.cronLimit.concurrency = doc.info.cronConcurrency;
     }
   }
 
-  public runWithCpuLimit<T>(fn: () => Promise<T>): Promise<T> {
-    Logger.info(
-      `[schedule][任务加入队列] 运行中任务数: ${this.cpuLimitActiveCount}, 等待中任务数: ${this.cpuLimitPendingCount}`,
-    );
-    return this.cpuLimit(fn);
+  public async runWithCronLimit<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+    return this.cronLimit.add(fn, options);
   }
 
-  public runOneByOne<T>(fn: () => Promise<T>): Promise<T> {
-    return this.oneLimit(fn);
+  public runOneByOne<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+    return this.oneLimit.add(fn, options);
   }
 
-  public updateDepLog<T>(fn: () => Promise<T>): Promise<T> {
-    return this.updateLogLimit(fn);
+  public updateDepLog<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+    return this.updateLogLimit.add(fn, options);
   }
 }
 

back/shared/runCron.ts

@@ -2,11 +2,10 @@ import { spawn } from 'cross-spawn';
 import taskLimit from './pLimit';
 import Logger from '../loaders/logger';
 
-export function runCron(cmd: string): Promise<number> {
-  return taskLimit.runWithCpuLimit(() => {
+export function runCron(cmd: string, options?: { schedule: string; extraSchedules: Array<{ schedule: string }>; name: string }): Promise<number | void> {
+  return taskLimit.runWithCronLimit(() => {
     return new Promise(async (resolve: any) => {
-      Logger.info(`[schedule][开始执行任务] 运行命令: ${cmd}`);
-
+      Logger.info(`[schedule][开始执行任务] 参数 ${JSON.stringify({ ...options, command: cmd })}`);
       const cp = spawn(cmd, { shell: '/bin/bash' });
 
       cp.stderr.on('data', (data) => {
@@ -24,9 +23,8 @@ export function runCron(cmd: string): Promise<number> {
         );
       });
 
-      cp.on('close', async (code) => {
-        Logger.info(`[schedule][任务退出] ${cmd} 进程id: ${cp.pid} 退出, 退出码 ${code}`);
-        resolve();
+      cp.on('exit', async (code) => {
+        resolve({ ...options, command: cmd, pid: cp.pid, code });
       });
     });
   });

docker/docker-entrypoint.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 dir_shell=/ql/shell
+. $dir_shell/env.sh
 . $dir_shell/share.sh
 link_shell
 

docker/front.conf

@@ -12,7 +12,7 @@ map $http_upgrade $connection_upgrade {
 }
 
 server {
-  listen 5700;
+  IPV4_CONFIG
   IPV6_CONFIG
   ssl_session_timeout 5m;
 

nodemon.json

@@ -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"
 }

package.json

@@ -4,8 +4,8 @@
     "start": "concurrently -n w: npm:start:*",
     "start:front": "max dev",
     "start:back": "nodemon",
-    "start:public": "ts-node --transpile-only ./back/public.ts",
-    "start:rpc": "ts-node --transpile-only ./back/schedule/index.ts",
+    "start: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",
@@ -69,11 +69,11 @@
     "dotenv": "^16.0.0",
     "express": "^4.17.3",
     "express-jwt": "^6.1.1",
-    "express-rate-limit": "^6.7.0",
+    "express-rate-limit": "^7.0.0",
     "express-urlrewrite": "^1.4.0",
     "form-data": "^4.0.0",
     "got": "^11.8.2",
-    "hpagent": "^0.1.2",
+    "hpagent": "^1.2.0",
     "http-proxy-middleware": "^2.0.6",
     "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
@@ -83,7 +83,7 @@
     "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
-    "p-limit": "3.1.0",
+    "p-queue-cjs": "7.3.4",
     "protobufjs": "^7.2.3",
     "pstree.remy": "^1.1.8",
     "reflect-metadata": "^0.1.13",
@@ -162,7 +162,7 @@
     "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
     "tsx": "^3.12.3",
-    "typescript": "4.8.4",
+    "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",
     "webpack": "^5.70.0",

sample/config.sample.sh

@@ -173,4 +173,13 @@ export SMTP_NAME=""
 ## 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 变量名= 声明即可

sample/notify.js

@@ -11,6 +11,7 @@
  */
 
 const querystring = require('querystring');
+const got = require('got');
 const $ = new Env();
 const timeout = 15000; //超时时间(单位毫秒)
 // =======================================gotify通知设置区域==============================================
@@ -55,6 +56,10 @@ let BARK_ICON = 'https://qn.whyour.cn/logo.png';
 let BARK_SOUND = '';
 //BARK app推送消息的分组, 默认为"QingLong"
 let BARK_GROUP = 'QingLong';
+//BARK app推送消息的时效性, 默认为"active"
+let BARK_LEVEL = 'active';
+//BARK app推送消息的跳转URL
+let BARK_URL = '';
 
 // =======================================telegram机器人通知设置区域===========================================
 //此处填你telegram bot 的Token，telegram机器人通知推送必填项.例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw
@@ -146,6 +151,23 @@ let SMTP_NAME = '';
 //此处填你的PushMe KEY.
 let PUSHME_KEY = '';
 
+// =======================================CHRONOCAT通知设置区域===========================================
+// CHRONOCAT_URL Red协议连接地址 例： http://127.0.0.1:16530
+// CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
+// CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群
+// CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
+let CHRONOCAT_URL = ''; // CHRONOCAT Red协议连接地址
+let CHRONOCAT_TOKEN = ''; //CHRONOCAT 生成的访问密钥
+let CHRONOCAT_QQ = ''; // 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
+
+// =======================================自定义通知设置区域=======================================
+// 自定义通知 接收回调的URL
+let WEBHOOK_URL = '';
+let WEBHOOK_BODY = '';
+let WEBHOOK_HEADERS = '';
+let WEBHOOK_METHOD = '';
+let WEBHOOK_CONTENT_TYPE = '';
+
 //==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
   GOTIFY_URL = process.env.GOTIFY_URL;
@@ -211,6 +233,12 @@ if (process.env.BARK_PUSH) {
   if (process.env.BARK_GROUP) {
     BARK_GROUP = process.env.BARK_GROUP;
   }
+  if (process.env.BARK_LEVEL) {
+    BARK_LEVEL = process.env.BARK_LEVEL;
+  }
+  if (process.env.BARK_URL) {
+    BARK_URL = process.env.BARK_URL;
+  }
 } else {
   if (
     BARK_PUSH &&
@@ -296,6 +324,32 @@ if (process.env.SMTP_NAME) {
 if (process.env.PUSHME_KEY) {
   PUSHME_KEY = process.env.PUSHME_KEY;
 }
+
+if (process.env.CHRONOCAT_URL) {
+  CHRONOCAT_URL = process.env.CHRONOCAT_URL;
+}
+if (process.env.CHRONOCAT_QQ) {
+  CHRONOCAT_QQ = process.env.CHRONOCAT_QQ;
+}
+if (process.env.CHRONOCAT_TOKEN) {
+  CHRONOCAT_TOKEN = process.env.CHRONOCAT_TOKEN;
+}
+
+if (process.env.WEBHOOK_URL) {
+  WEBHOOK_URL = process.env.WEBHOOK_URL;
+}
+if (process.env.WEBHOOK_BODY) {
+  WEBHOOK_BODY = process.env.WEBHOOK_BODY;
+}
+if (process.env.WEBHOOK_HEADERS) {
+  WEBHOOK_HEADERS = process.env.WEBHOOK_HEADERS;
+}
+if (process.env.WEBHOOK_METHOD) {
+  WEBHOOK_METHOD = process.env.WEBHOOK_METHOD;
+}
+if (process.env.WEBHOOK_CONTENT_TYPE) {
+  WEBHOOK_CONTENT_TYPE = process.env.WEBHOOK_CONTENT_TYPE;
+}
 //==========================云端环境变量的判断与接收=========================
 
 /**
@@ -345,6 +399,8 @@ async function sendNotify(
     fsBotNotify(text, desp), //飞书机器人
     smtpNotify(text, desp), //SMTP 邮件
     PushMeNotify(text, desp, params), //PushMe
+    ChronocatNotify(text, desp), // Chronocat
+    webhookNotify(text, desp), //自定义通知
   ]);
 }
 
@@ -552,7 +608,7 @@ function BarkNotify(text, desp, params = {}) {
       const options = {
         url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(
           desp,
-        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(
+        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&level=${BARK_LEVEL}&url=${BARK_URL}&${querystring.stringify(
           params,
         )}`,
         headers: {
@@ -1161,6 +1217,220 @@ function PushMeNotify(text, desp, params = {}) {
   });
 }
 
+function ChronocatNotify(title, desp) {
+  return new Promise((resolve) => {
+    if (!CHRONOCAT_TOKEN || !CHRONOCAT_QQ || !CHRONOCAT_URL) {
+      console.log(
+        'CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送',
+      );
+      return;
+    }
+
+    console.log('CHRONOCAT 服务启动');
+    const user_ids = CHRONOCAT_QQ.match(/user_id=(\d+)/g)?.map(
+      (match) => match.split('=')[1],
+    );
+    const group_ids = CHRONOCAT_QQ.match(/group_id=(\d+)/g)?.map(
+      (match) => match.split('=')[1],
+    );
+
+    const url = `${CHRONOCAT_URL}/api/message/send`;
+    const headers = {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${CHRONOCAT_TOKEN}`,
+    };
+
+    for (const [chat_type, ids] of [
+      [1, user_ids],
+      [2, group_ids],
+    ]) {
+      if (!ids) {
+        continue;
+      }
+      for (const chat_id of ids) {
+        const data = {
+          peer: {
+            chatType: chat_type,
+            peerUin: chat_id,
+          },
+          elements: [
+            {
+              elementType: 1,
+              textElement: {
+                content: `${title}\n\n${desp}`,
+              },
+            },
+          ],
+        };
+        const options = {
+          url: url,
+          json: data,
+          headers,
+          timeout,
+        };
+        $.post(options, (err, resp, data) => {
+          try {
+            if (err) {
+              console.log('Chronocat发送QQ通知消息失败！！\n');
+              console.log(err);
+            } else {
+              data = JSON.parse(data);
+              if (chat_type === 1) {
+                console.log(`QQ个人消息:${ids}推送成功！`);
+              } else {
+                console.log(`QQ群消息:${ids}推送成功！`);
+              }
+            }
+          } catch (e) {
+            $.logErr(e, resp);
+          } finally {
+            resolve(data);
+          }
+        });
+      }
+    }
+  });
+}
+
+function webhookNotify(text, desp) {
+  return new Promise((resolve) => {
+    const { formatBody, formatUrl } = formatNotifyContentFun(
+      WEBHOOK_URL,
+      WEBHOOK_BODY,
+      text,
+      desp,
+    );
+    if (!formatUrl && !formatBody) {
+      resolve();
+      return;
+    }
+    const headers = parseHeaders(WEBHOOK_HEADERS);
+    const body = parseBody(formatBody, WEBHOOK_CONTENT_TYPE);
+    const bodyParam = formatBodyFun(WEBHOOK_CONTENT_TYPE, body);
+    const options = {
+      method: WEBHOOK_METHOD,
+      headers,
+      allowGetBody: true,
+      ...bodyParam,
+      timeout,
+      retry: 1,
+    };
+
+    if (WEBHOOK_METHOD) {
+      got(formatUrl, options).then((resp) => {
+        try {
+          if (resp.statusCode !== 200) {
+            console.log('自定义发送通知消息失败！！\n');
+            console.log(resp.body);
+          } else {
+            console.log('自定义发送通知消息成功🎉。\n');
+            console.log(resp.body);
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(resp.body);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
+function parseHeaders(headers) {
+  if (!headers) return {};
+
+  const parsed = {};
+  let key;
+  let val;
+  let i;
+
+  headers &&
+    headers.split('\n').forEach(function parser(line) {
+      i = line.indexOf(':');
+      key = line.substring(0, i).trim().toLowerCase();
+      val = line.substring(i + 1).trim();
+
+      if (!key) {
+        return;
+      }
+
+      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+    });
+
+  return parsed;
+}
+
+function parseBody(body, contentType) {
+  if (!body) return '';
+
+  const parsed = {};
+  let key;
+  let val;
+  let i;
+
+  body &&
+    body.split('\n').forEach(function parser(line) {
+      i = line.indexOf(':');
+      key = line.substring(0, i).trim().toLowerCase();
+      val = line.substring(i + 1).trim();
+
+      if (!key || parsed[key]) {
+        return;
+      }
+
+      try {
+        const jsonValue = JSON.parse(val);
+        parsed[key] = jsonValue;
+      } catch (error) {
+        parsed[key] = val;
+      }
+    });
+
+  switch (contentType) {
+    case 'multipart/form-data':
+      return Object.keys(parsed).reduce((p, c) => {
+        p.append(c, parsed[c]);
+        return p;
+      }, new FormData());
+    case 'application/x-www-form-urlencoded':
+      return Object.keys(parsed).reduce((p, c) => {
+        return p ? `${p}&${c}=${parsed[c]}` : `${c}=${parsed[c]}`;
+      });
+  }
+
+  return parsed;
+}
+
+function formatBodyFun(contentType, body) {
+  if (!body) return {};
+  switch (contentType) {
+    case 'application/json':
+      return { json: body };
+    case 'multipart/form-data':
+      return { form: body };
+    case 'application/x-www-form-urlencoded':
+      return { body };
+  }
+  return {};
+}
+
+function formatNotifyContentFun(url, body, title, content) {
+  if (!url.includes('$title') && !body.includes('$title')) {
+    return {};
+  }
+
+  return {
+    formatUrl: url
+      .replaceAll('$title', encodeURIComponent(title))
+      .replaceAll('$content', encodeURIComponent(content)),
+    formatBody: body
+      .replaceAll('$title', title)
+      .replaceAll('$content', content),
+  };
+}
+
 module.exports = {
   sendNotify,
   BARK_PUSH,

sample/notify.py

@@ -40,6 +40,8 @@ push_config = {
     'BARK_GROUP': '',                   # bark 推送分组
     'BARK_SOUND': '',                   # bark 推送声音
     'BARK_ICON': '',                    # bark 推送图标
+    'BARK_LEVEL': '',                   # bark 推送时效性
+    'BARK_URL': '',                     # bark 推送跳转URL
 
     'CONSOLE': True,                    # 控制台输出
 
@@ -99,7 +101,17 @@ push_config = {
     'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
     'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
 
-    'PUSHME_KEY': '',                     # PushMe 酱的 PUSHME_KEY
+    '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
@@ -130,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(
@@ -442,7 +456,9 @@ class WeCom:
         return data["access_token"]
 
     def send_text(self, message, touser="@all"):
-        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = (
+            f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        )
         send_values = {
             "touser": touser,
             "msgtype": "text",
@@ -456,7 +472,9 @@ class WeCom:
         return respone["errmsg"]
 
     def send_mpnews(self, title, message, media_id, touser="@all"):
-        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = (
+            f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        )
         send_values = {
             "touser": touser,
             "msgtype": "mpnews",
@@ -639,6 +657,7 @@ def smtp(title: str, content: str) -> None:
     except Exception as e:
         print(f"SMTP 邮件 推送失败！{e}")
 
+
 def pushme(title: str, content: str) -> None:
     """
     使用 PushMe 推送消息。
@@ -661,6 +680,157 @@ def pushme(title: str, content: str) -> None:
         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:
     """
     获取一条一言。
@@ -717,6 +887,14 @@ if (
     notify_function.append(smtp)
 if push_config.get("PUSHME_KEY"):
     notify_function.append(pushme)
+if (
+    push_config.get("CHRONOCAT_URL")
+    and push_config.get("CHRONOCAT_QQ")
+    and push_config.get("CHRONOCAT_TOKEN")
+):
+    notify_function.append(chronocat)
+if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
+    notify_function.append(custom_notify)
 
 
 def send(title: str, content: str) -> None:

shell/env.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+store_env_vars() {
+  initial_vars=($(env | cut -d= -f1))
+}
+
+restore_env_vars() {
+  for key in $(env | cut -d= -f1); do
+    if ! [[ " ${initial_vars[@]} " =~ " $key " ]]; then
+      unset "$key"
+    fi
+  done
+}
+
+store_env_vars

shell/otask.sh

@@ -94,7 +94,7 @@ env_str_to_array() {
 ## 正常运行单个脚本，$1：传入参数
 run_normal() {
   local file_param=$1
-  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]]; then
+  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]] && [[ "$no_delay" != "true" ]]; then
     random_delay "$file_param"
   fi
 
@@ -105,7 +105,7 @@ run_normal() {
     file_param=${file_param/$relative_path\//}
   fi
 
-  $timeoutCmd $which_program $file_param
+  $timeoutCmd $which_program $file_param "${script_params[@]}"
 }
 
 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
@@ -147,7 +147,7 @@ run_concurrent() {
   for i in "${!array[@]}"; do
     export "${env_param}=${array[i]}"
     single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-    eval $timeoutCmd $which_program $file_param &>$single_log_path &
+    eval $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
   done
 
   wait
@@ -190,7 +190,7 @@ run_designated() {
     cd ${relative_path}
     file_param=${file_param/$relative_path\//}
   fi
-  $timeoutCmd $which_program $file_param
+  $timeoutCmd $which_program $file_param "${script_params[@]}"
 }
 
 ## 运行其他命令
@@ -241,6 +241,8 @@ main() {
   fi
 }
 
-handle_task_before "$@"
-main "$@"
-handle_task_after "$@"
+handle_task_start "${task_shell_params[@]}"
+run_task_before "${task_shell_params[@]}"
+main "${task_shell_params[@]}"
+run_task_after "${task_shell_params[@]}"
+handle_task_end "${task_shell_params[@]}"

shell/share.sh

@@ -19,7 +19,6 @@ dir_update_log=$dir_log/update
 ql_static_repo=$dir_repo/static
 
 ## 文件
-file_ecosystem_js=$dir_root/ecosystem.config.js
 file_config_sample=$dir_sample/config.sample.sh
 file_env=$dir_config/env.sh
 file_sharecode=$dir_config/sharecode.sh
@@ -69,6 +68,7 @@ import_config() {
   [[ -f $file_env ]] && . $file_env
 
   ql_base_url=${QlBaseUrl:-"/"}
+  ql_port=${QlPort:-"5700"}
   command_timeout_time=${CommandTimeoutTime:-""}
   proxy_url=${ProxyUrl:-""}
   file_extensions=${RepoFileExtensions:-"js py"}
@@ -99,9 +99,6 @@ set_proxy() {
 unset_proxy() {
   unset http_proxy
   unset https_proxy
-  unset ftp_proxy
-  unset all_proxy
-  unset no_proxy
 }
 
 make_dir() {
@@ -310,10 +307,9 @@ random_range() {
 
 reload_pm2() {
   cd $dir_root
-  # 代理会影响 grpc 服务
-  unset_proxy
+  restore_env_vars
   pm2 flush &>/dev/null
-  pm2 startOrGracefulReload $file_ecosystem_js --update-env
+  pm2 startOrGracefulReload ecosystem.config.js
 }
 
 diff_time() {
@@ -406,8 +402,18 @@ init_nginx() {
   local aliasStr=""
   local rootStr=""
   if [[ $ql_base_url != "/" ]]; then
+    if [[ $ql_base_url != /* ]]; then
+      ql_base_url="/$ql_base_url"
+    fi
+    if [[ $ql_base_url != */ ]]; then
+      ql_base_url="$ql_base_url/"
+    fi
     location_url="^~${ql_base_url%*/}"
     aliasStr="alias ${dir_static}/dist;"
+    if ! grep -q "<base href=\"$ql_base_url\">" "${dir_static}/dist/index.html"; then
+      awk -v text="<base href=\"$ql_base_url\">" '/<link/ && !inserted {print text; inserted=1} 1' "${dir_static}/dist/index.html" >temp.html
+      mv temp.html "${dir_static}/dist/index.html"
+    fi
   else
     rootStr="root ${dir_static}/dist;"
   fi
@@ -416,27 +422,45 @@ init_nginx() {
   sed -i "s,QL_BASE_URL_LOCATION,${location_url},g" /etc/nginx/conf.d/front.conf
   sed -i "s,QL_BASE_URL,${ql_base_url},g" /etc/nginx/conf.d/front.conf
 
-  ipv6=$(ip a | grep inet6)
-  ipv6Str=""
+  local ipv6=$(ip a | grep inet6)
+  local ipv6Str=""
   if [[ $ipv6 ]]; then
-    ipv6Str="listen [::]:5700 ipv6only=on;"
+    ipv6Str="listen [::]:${ql_port} ipv6only=on;"
   fi
+
+  local ipv4Str="listen ${ql_port};"
   sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf
+  sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf
 }
 
-handle_task_before() {
+handle_task_start() {
   [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
-
   echo -e "## 开始执行... $begin_time\n"
+}
 
+run_task_before() {
   [[ $is_macos -eq 0 ]] && check_server
 
   . $file_task_before "$@"
+
+  if [[ $task_before ]]; then
+    echo -e "执行前置命令\n"
+    eval "$task_before"
+    echo -e "\n执行前置命令结束\n"
+  fi
 }
 
-handle_task_after() {
+run_task_after() {
   . $file_task_after "$@"
 
+  if [[ $task_after ]]; then
+    echo -e "\n执行后置命令\n"
+    eval "$task_after"
+    echo -e "\n执行后置命令结束"
+  fi
+}
+
+handle_task_end() {
   local etime=$(date "+$time_format")
   local end_time=$(format_time "$time_format" "$etime")
   local end_timestamp=$(format_timestamp "$time_format" "$etime")
@@ -444,8 +468,7 @@ handle_task_after() {
 
   [[ "$diff_time" == 0 ]] && diff_time=1
 
-  echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
-
+  echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
   [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
 }
 

shell/task.sh

@@ -5,9 +5,9 @@ dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
-trap "single_hanle" 2 3 20 15 14
+trap "single_hanle" 2 3 20 15 14 19 1
 single_hanle() {
-  eval handle_task_after "$@" "$cmd"
+  eval handle_task_end "$@" "$cmd"
   exit 1
 }
 
@@ -70,10 +70,10 @@ handle_log_path() {
     log_path="$real_log_path"
   fi
 
-  cmd=">> $dir_log/$log_path 2>&1"
+  cmd="2>&1 | tee -a $dir_log/$log_path"
   make_dir "$dir_log/$log_dir"
-  if [[ "$show_log" == "true" ]]; then
-    cmd="2>&1 | tee -a $dir_log/$log_path"
+  if [[ "$no_tee" == "true" ]]; then
+    cmd=">> $dir_log/$log_path 2>&1"
   fi
 
   if [[ "$real_time" == "true" ]]; then
@@ -95,6 +95,21 @@ format_params() {
     fi
   fi
   # params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
+
+  # 分割 task 内置参数和脚本参数
+  task_shell_params=()
+  script_params=()
+  found_double_dash=false
+
+  for arg in "$@"; do
+    if $found_double_dash; then
+      script_params+=("$arg")
+    elif [ "$arg" == "--" ]; then
+      found_double_dash=true
+    else
+      task_shell_params+=("$arg")
+    fi
+  done
 }
 
 init_begin_time() {
@@ -119,11 +134,9 @@ if [[ $max_time ]]; then
 fi
 
 format_params "$@"
-define_program "$@"
-handle_log_path "$@"
+define_program "${task_shell_params[@]}"
+handle_log_path "${task_shell_params[@]}"
 init_begin_time
 
 eval . $dir_shell/otask.sh "$cmd"
-[[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
-
 exit 0

shell/update.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 dir_shell=$QL_DIR/shell
+. $dir_shell/env.sh
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
@@ -273,13 +274,13 @@ update_qinglong() {
   exit_status=$?
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙源文件成功...\n"
+    echo -e "更新青龙源文件成功...\n"
 
     unzip -oq ${dir_tmp}/ql.zip -d ${dir_tmp}
 
     update_qinglong_static
   else
-    echo -e "\n更新青龙源文件失败，请检查网络...\n"
+    echo -e "更新青龙源文件失败，请检查网络...\n"
   fi
 }
 
@@ -288,28 +289,29 @@ update_qinglong_static() {
   exit_status=$?
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙静态资源成功...\n"
+    echo -e "更新青龙静态资源成功...\n"
     unzip -oq ${dir_tmp}/static.zip -d ${dir_tmp}
 
     check_update_dep
   else
-    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+    echo -e "更新青龙静态资源失败，请检查网络...\n"
   fi
 }
 
 check_update_dep() {
   echo -e "\n开始检测依赖...\n"
-  if [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+  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"
-    echo -e "\n更新包下载成功...\n"
+    echo -e "更新包下载成功..."
 
     if [[ "$needRestart" == 'true' ]]; then
       cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/

src/layouts/index.less

@@ -24,9 +24,13 @@ body {
   -webkit-overflow-scrolling: touch;
 }
 
+.ant-modal-header {
+  padding-right: 54px;
+}
+
 .ant-modal-body {
-  max-height: calc(90vh - 110px);
-  max-height: calc(90vh - var(--vh-offset, 110px));
+  max-height: calc(80vh - 110px);
+  max-height: calc(80vh - var(--vh-offset, 110px));
   overflow-y: auto;
 }
 
@@ -181,6 +185,7 @@ body {
       .react-codemirror2,
       .CodeMirror {
         height: 100%;
+        overflow: auto;
       }
     }
   }
@@ -451,3 +456,9 @@ body[data-mode='phone'] header {
 .ant-table.ant-table-middle tfoot > tr > td {
   padding: 12px 16px;
 }
+
+body[data-dark='true'] {
+  .ant-popover-arrow-content {
+    --antd-arrow-background-color: rgb(24, 26, 27);
+  }
+}

src/layouts/index.tsx

@@ -1,5 +1,5 @@
 import intl from 'react-intl-universal';
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState } from 'react';
 import ProLayout, { PageLoading } from '@ant-design/pro-layout';
 import * as DarkReader from '@umijs/ssr-darkreader';
 import defaultProps from './defaultProps';
@@ -29,9 +29,9 @@ import {
   MenuProps,
 } from 'antd';
 // @ts-ignore
-import SockJS from 'sockjs-client';
 import * as Sentry from '@sentry/react';
 import { init } from '../utils/init';
+import WebSocketManager from '../utils/websocket';
 
 export interface SharedContext {
   headerStyle: React.CSSProperties;
@@ -40,7 +40,6 @@ export interface SharedContext {
   user: any;
   reloadUser: (needLoading?: boolean) => void;
   reloadTheme: () => void;
-  socketMessage: any;
   systemInfo: TSystemInfo;
 }
 
@@ -60,8 +59,6 @@ export default function () {
   const [user, setUser] = useState<any>({});
   const [loading, setLoading] = useState<boolean>(true);
   const [systemInfo, setSystemInfo] = useState<TSystemInfo>();
-  const ws = useRef<any>(null);
-  const [socketMessage, setSocketMessage] = useState<any>();
   const [collapsed, setCollapsed] = useState(false);
   const [initLoading, setInitLoading] = useState<boolean>(true);
   const {
@@ -180,32 +177,14 @@ export default function () {
 
   useEffect(() => {
     if (!user || !user.username) return;
-    ws.current = new SockJS(
-      `${window.location.origin}/api/ws?token=${localStorage.getItem(
+    const ws = WebSocketManager.getInstance(
+      `${window.location.origin}${config.apiPrefix}ws?token=${localStorage.getItem(
         config.authKey,
       )}`,
     );
 
-    ws.current.onmessage = (e: any) => {
-      try {
-        const data = JSON.parse(e.data);
-        if (data.type === 'ping') {
-          if (data && data.message === 'hanhh') {
-            console.log('WS connection succeeded !!!');
-          } else {
-            console.log('WS connection Failed !!!', e);
-          }
-        }
-        setSocketMessage(data);
-      } catch (error) {
-        console.log('websocket连接失败', e);
-      }
-    };
-
-    const wsCurrent = ws.current;
-
     return () => {
-      wsCurrent.close();
+      ws.close();
     };
   }, [user]);
 
@@ -246,7 +225,6 @@ export default function () {
             user,
             reloadUser,
             reloadTheme,
-            ws: ws.current,
           }}
         />
       );
@@ -342,7 +320,7 @@ export default function () {
                 shape="square"
                 size="small"
                 icon={<UserOutlined />}
-                src={user.avatar ? `/api/static/${user.avatar}` : ''}
+                src={user.avatar ? `${config.apiPrefix}static/${user.avatar}` : ''}
               />
               <span style={{ marginLeft: 5 }}>{user.username}</span>
             </span>
@@ -364,7 +342,7 @@ export default function () {
                   shape="square"
                   size="small"
                   icon={<UserOutlined />}
-                  src={user.avatar ? `/api/static/${user.avatar}` : ''}
+                  src={user.avatar ? `${config.apiPrefix}static/${user.avatar}` : ''}
                 />
                 <span style={{ marginLeft: 5 }}>{user.username}</span>
               </span>
@@ -387,7 +365,6 @@ export default function () {
           user,
           reloadUser,
           reloadTheme,
-          socketMessage,
           systemInfo,
         }}
       />

src/locales/en-US.json

@@ -352,6 +352,8 @@
   "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)": "BARK push icon, custom push icon (requires iOS 15 or above to display)",
   "BARK推送铃声，铃声列表去APP查看复制填写": "BARK push ringtone, check and copy from the APP's ringtone list",
   "BARK推送消息的分组，默认为qinglong": "BARK push message grouping, default is qinglong",
+  "BARK推送消息的时效性，默认为active": "BARK push message redirecting URL",
+  "BARK推送消息的跳转URL": "BARK push message grouping, default is qinglong",
   "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "Telegram Bot token, e.g., 1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
   "telegram用户的id，例如：129xxx206": "Telegram user ID, e.g., 129xxx206",
   "代理IP": "Proxy IP",
@@ -451,5 +453,18 @@
   "登录已过期，请重新登录": "Login session has expired, please log in again",
   "系统日志": "System Logs",
   "主题": "Theme",
-  "语言": "Language"
+  "语言": "Language",
+  "中...": "ing...",
+  "请选择操作符": "Please select operator",
+  "新增定时规则": "Add Timing Rules",
+  "运行任务前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "Run commands before executing the task, e.g., cp/mv/python3 xxx.py/node xxx.js",
+  "运行任务后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "Run commands after executing the task, e.g., cp/mv/python3 xxx.py/node xxx.js",
+  "请输入运行任务前要执行的命令，不能包含 task 命令": "Please enter the command to run before executing the task, cannot contain task commands",
+  "请输入运行任务后要执行的命令，不能包含 task 命令": "Please enter the command to run after executing the task, cannot contain task commands",
+  "不能包含 task 命令": "Cannot contain task commands",
+  "Chronocat Red 服务的连接地址 https://chronocat.vercel.app/install/docker/official/": "Connection address of the Chronocat Red service https://chronocat.vercel.app/install/docker/official/",
+  "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx": "Individuals: user_id=individual QQ Groups fill in group_id=QQ Groups more than one with English; separated by the same time to support individuals and groups such as: user_id=xxx;group_id=xxxx;group_id=xxxxx",
+  "docker安装在持久化config目录下的chronocat.yml文件可找到": "The docker installation can be found in the persistence config directory in the chronocat.yml file",
+  "请选择": "Please select",
+  "请输入": "Please input"
 }

src/locales/zh-CN.json

@@ -352,6 +352,8 @@
   "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)": "BARK推送图标，自定义推送图标 (需iOS15或以上才能显示)",
   "BARK推送铃声，铃声列表去APP查看复制填写": "BARK推送铃声，铃声列表去APP查看复制填写",
   "BARK推送消息的分组，默认为qinglong": "BARK推送消息的分组，默认为qinglong",
+  "BARK推送消息的时效性，默认为active": "BARK推送消息的时效性，默认为active",
+  "BARK推送消息的跳转URL": "BARK推送消息的跳转URL",
   "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
   "telegram用户的id，例如：129xxx206": "telegram用户的id，例如：129xxx206",
   "代理IP": "代理IP",
@@ -451,5 +453,18 @@
   "登录已过期，请重新登录": "登录已过期，请重新登录",
   "系统日志": "系统日志",
   "主题": "主题",
-  "语言": "语言"
+  "语言": "语言",
+  "中...": "中...",
+  "请选择操作符": "请选择操作符",
+  "新增定时规则": "新增定时规则",
+  "运行任务前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "运行任务前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js",
+  "运行任务后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "运行任务后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js",
+  "请输入运行任务前要执行的命令，不能包含 task 命令": "请输入运行任务前要执行的命令，不能包含 task 命令",
+  "请输入运行任务后要执行的命令，不能包含 task 命令": "请输入运行任务后要执行的命令，不能包含 task 命令",
+  "不能包含 task 命令": "不能包含 task 命令",
+  "Chronocat Red 服务的连接地址 https://chronocat.vercel.app/install/docker/official/": "Chronocat Red 服务的连接地址 https://chronocat.vercel.app/install/docker/official/",
+  "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx": "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx",
+  "docker安装在持久化config目录下的chronocat.yml文件可找到": "docker安装在持久化config目录下的chronocat.yml文件可找到",
+  "请选择": "请选择",
+  "请输入": "请输入"
 }

src/pages/crontab/detail.tsx

@@ -33,6 +33,7 @@ import IconFont from '@/components/iconfont';
 import { getCommandScript, getEditorMode } from '@/utils';
 import VirtualList from 'rc-virtual-list';
 import useScrollHeight from '@/hooks/useScrollHeight';
+import dayjs from 'dayjs';
 
 const { Text } = Typography;
 
@@ -52,8 +53,6 @@ interface LogItem {
   filename: string;
 }
 
-const language = navigator.language || navigator.languages[0];
-
 const CronDetailModal = ({
   cron = {},
   handleCancel,
@@ -121,10 +120,11 @@ const CronDetailModal = ({
   };
 
   const onClickItem = (item: LogItem) => {
-    localStorage.setItem('logCron', currentCron.id);
-    setLogUrl(
-      `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
-    );
+    const url = `${config.apiPrefix}logs/${item.filename}?path=${
+      item.directory || ''
+    }`;
+    localStorage.setItem('logCron', url);
+    setLogUrl(url);
     request
       .get(
         `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
@@ -362,8 +362,13 @@ const CronDetailModal = ({
     <Modal
       title={
         <div className="crontab-title-wrapper">
-          <div>
-            <span>{currentCron.name}</span>
+          <div style={{ minWidth: 0 }}>
+            <Typography.Text
+              style={{width: '100%'}}
+              ellipsis={{ tooltip: currentCron.name }}
+            >
+              {currentCron.name}
+            </Typography.Text>
             {currentCron.labels?.length > 0 && currentCron.labels[0] !== '' && (
               <Divider type="vertical"></Divider>
             )}
@@ -498,7 +503,12 @@ const CronDetailModal = ({
           </div>
           <div className="cron-detail-info-item">
             <div className="cron-detail-info-title">{intl.get('定时')}</div>
-            <div className="cron-detail-info-value">{currentCron.schedule}</div>
+            <div className="cron-detail-info-value">
+              <div>{currentCron.schedule}</div>
+              {currentCron.extra_schedules?.map((x) => (
+                <div key={x.schedule}>{x.schedule}</div>
+              ))}
+            </div>
           </div>
           <div className="cron-detail-info-item">
             <div className="cron-detail-info-title">
@@ -506,11 +516,9 @@ const CronDetailModal = ({
             </div>
             <div className="cron-detail-info-value">
               {currentCron.last_execution_time
-                ? new Date(currentCron.last_execution_time * 1000)
-                    .toLocaleString(language, {
-                      hour12: false,
-                    })
-                    .replace(' 24:', ' 00:')
+                ? dayjs(currentCron.last_execution_time * 1000).format(
+                    'YYYY-MM-DD HH:mm:ss',
+                  )
                 : '-'}
             </div>
           </div>
@@ -530,11 +538,7 @@ const CronDetailModal = ({
             </div>
             <div className="cron-detail-info-value">
               {currentCron.nextRunTime &&
-                currentCron.nextRunTime
-                  .toLocaleString(language, {
-                    hour12: false,
-                  })
-                  .replace(' 24:', ' 00:')}
+                dayjs(currentCron.nextRunTime).format('YYYY-MM-DD HH:mm:ss')}
             </div>
           </div>
         </Card>

src/pages/crontab/index.less

@@ -6,9 +6,9 @@
   .card-wrapper {
     .ant-card:last-child {
       .ant-card-body {
-        min-height: 300px;
-        height: calc(90vh - 367px);
-        height: calc(90vh - var(--vh-offset, 0px) - 367px);
+        min-height: 0;
+        height: calc(80vh - 314px);
+        height: calc(80vh - var(--vh-offset, 0px) - 314px);
         overflow-y: auto;
 
         > div {
@@ -21,6 +21,8 @@
   .ant-modal-body {
     background: #eee;
     padding: 12px;
+    max-height: calc(80vh - 57px);
+    max-height: calc(80vh - var(--vh-offset, 57px));
   }
 
   .ant-card-body {
@@ -35,7 +37,7 @@
     overflow: auto;
 
     .ant-card-body {
-      min-width: 600px;
+      min-width: 1000px;
     }
 
     .cron-detail-info-item {
@@ -58,7 +60,7 @@
     .ant-card-body {
       display: flex;
       justify-content: space-between;
-      min-width: 600px;
+      min-width: 1000px;
     }
   }
 
@@ -78,7 +80,6 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-right: 32px;
 
     .operations {
       display: flex;

src/pages/crontab/index.tsx

@@ -43,7 +43,6 @@ import { request } from '@/utils/http';
 import CronModal, { CronLabelModal } from './modal';
 import CronLogModal from './logModal';
 import CronDetailModal from './detail';
-import cron_parser from 'cron-parser';
 import { diffTime } from '@/utils/date';
 import { history, useOutletContext } from '@umijs/max';
 import './index.less';
@@ -52,13 +51,14 @@ import ViewManageModal from './viewManageModal';
 import { FilterValue, SorterResult } from 'antd/lib/table/interface';
 import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
-import { getCommandScript, parseCrontab } from '@/utils';
+import { getCommandScript, getCrontabsNextDate, parseCrontab } from '@/utils';
 import { ColumnProps } from 'antd/lib/table';
 import { useVT } from 'virtualizedtableforantd4';
 import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type';
 import Name from '@/components/name';
+import dayjs from 'dayjs';
 
-const { Text, Paragraph } = Typography;
+const { Text, Paragraph, Link } = Typography;
 const { Search } = Input;
 
 const Crontab = () => {
@@ -75,17 +75,18 @@ const Crontab = () => {
           style={{
             wordBreak: 'break-all',
             marginBottom: 0,
+            color: '#1890ff'
           }}
           ellipsis={{ tooltip: text, rows: 2 }}
         >
-          <a
+          <Link
             onClick={() => {
               setDetailCron(record);
               setIsDetailModalVisible(true);
             }}
           >
             {record.name || '-'}
-          </a>
+          </Link>
         </Paragraph>
       ),
       sorter: {
@@ -183,6 +184,32 @@ const Crontab = () => {
       sorter: {
         compare: (a, b) => a.schedule.localeCompare(b.schedule),
       },
+      render: (text, record) => {
+        return (
+          <Paragraph
+            style={{
+              wordBreak: 'break-all',
+              marginBottom: 0,
+            }}
+            ellipsis={{
+              tooltip: {
+                placement: 'right',
+                title: (
+                  <>
+                    <div>{text}</div>
+                    {record.extra_schedules?.map((x) => (
+                      <div key={x.schedule}>{x.schedule}</div>
+                    ))}
+                  </>
+                ),
+              },
+              rows: 2,
+            }}
+          >
+            {text}
+          </Paragraph>
+        );
+      },
     },
     {
       title: intl.get('最后运行时长'),
@@ -211,7 +238,6 @@ const Crontab = () => {
         },
       },
       render: (text, record) => {
-        const language = navigator.language || navigator.languages[0];
         return (
           <span
             style={{
@@ -219,11 +245,9 @@ const Crontab = () => {
             }}
           >
             {record.last_execution_time
-              ? new Date(record.last_execution_time * 1000)
-                  .toLocaleString(language, {
-                    hour12: false,
-                  })
-                  .replace(' 24:', ' 00:')
+              ? dayjs(record.last_execution_time * 1000).format(
+                  'YYYY-MM-DD HH:mm:ss',
+                )
               : '-'}
           </span>
         );
@@ -238,12 +262,7 @@ const Crontab = () => {
         },
       },
       render: (text, record) => {
-        const language = navigator.language || navigator.languages[0];
-        return record.nextRunTime
-          .toLocaleString(language, {
-            hour12: false,
-          })
-          .replace(' 24:', ' 00:');
+        return dayjs(record.nextRunTime).format('YYYY-MM-DD HH:mm:ss');
       },
     },
     {
@@ -376,7 +395,7 @@ const Crontab = () => {
             data.map((x) => {
               return {
                 ...x,
-                nextRunTime: parseCrontab(x.schedule),
+                nextRunTime: getCrontabsNextDate(x.schedule, x.extra_schedules),
               };
             }),
           );
@@ -664,7 +683,10 @@ const Crontab = () => {
         if (code === 200) {
           const index = value.findIndex((x) => x.id === cron.id);
           const result = [...value];
-          data.nextRunTime = parseCrontab(data.schedule);
+          data.nextRunTime = getCrontabsNextDate(
+            data.schedule,
+            data.extra_schedules,
+          );
           if (index !== -1) {
             result.splice(index, 1, {
               ...cron,

src/pages/crontab/logModal.tsx

@@ -1,6 +1,14 @@
 import intl from 'react-intl-universal';
 import React, { useEffect, useRef, useState } from 'react';
-import { Modal, message, Input, Form, Statistic, Button } from 'antd';
+import {
+  Modal,
+  message,
+  Input,
+  Form,
+  Statistic,
+  Button,
+  Typography,
+} from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import {
@@ -10,6 +18,7 @@ import {
 import { PageLoading } from '@ant-design/pro-layout';
 import { logEnded } from '@/utils';
 import { CrontabStatus } from './type';
+import Ansi from 'ansi-to-react';
 
 const { Countdown } = Statistic;
 
@@ -31,6 +40,7 @@ const CronLogModal = ({
   const [executing, setExecuting] = useState<any>(true);
   const [isPhone, setIsPhone] = useState(false);
   const scrollInfoRef = useRef({ value: 0, down: true });
+  const uniqPath = logUrl ? logUrl : String(cron?.id);
 
   const getCronLog = (isFirst?: boolean) => {
     if (isFirst) {
@@ -41,7 +51,7 @@ const CronLogModal = ({
       .then(({ code, data }) => {
         if (
           code === 200 &&
-          localStorage.getItem('logCron') === String(cron.id) &&
+          localStorage.getItem('logCron') === uniqPath &&
           data !== value
         ) {
           const log = data as string;
@@ -49,10 +59,15 @@ const CronLogModal = ({
           const hasNext = Boolean(
             log && !logEnded(log) && !log.includes('任务未运行'),
           );
+          if (!hasNext && !logEnded(value) && value !== intl.get('启动中...')) {
+            setTimeout(() => {
+              autoScroll();
+            });
+          }
           setExecuting(hasNext);
           if (hasNext) {
-            autoScroll();
             setTimeout(() => {
+              autoScroll();
               getCronLog();
             }, 2000);
           }
@@ -82,29 +97,32 @@ const CronLogModal = ({
     handleCancel();
   };
 
-  const handleScroll = (e) => {
-    const sTop = e.target.scrollTop;
+  const handleScroll: React.UIEventHandler<HTMLDivElement> = (e) => {
+    const sTop = (e.target as HTMLDivElement).scrollTop;
     if (scrollInfoRef.current.down) {
       scrollInfoRef.current = {
         value: sTop,
-        down: sTop > scrollInfoRef.current.value,
+        down: sTop - scrollInfoRef.current.value > -5 || !sTop,
       };
     }
   };
 
   const titleElement = () => {
     return (
-      <>
+      <div style={{ display: 'flex', alignItems: 'center' }}>
         {(executing || loading) && <Loading3QuartersOutlined spin />}
         {!executing && !loading && <CheckCircleOutlined />}
-        <span style={{ marginLeft: 5 }}>{cron && cron.name}</span>
-      </>
+        <Typography.Text ellipsis={true} style={{ marginLeft: 5 }}>
+          {cron && cron.name}
+        </Typography.Text>
+      </div>
     );
   };
 
   useEffect(() => {
     if (cron && cron.id && visible) {
       getCronLog(true);
+      scrollInfoRef.current.down = true;
     }
   }, [cron, visible]);
 
@@ -147,7 +165,7 @@ const CronLogModal = ({
                 : {}
             }
           >
-            {value}
+            <Ansi>{value}</Ansi>
           </pre>
         )}
         <div id="log-flag"></div>

src/pages/crontab/modal.tsx

@@ -1,10 +1,11 @@
 import intl from 'react-intl-universal';
 import React, { useEffect, useState } from 'react';
-import { Modal, message, Input, Form, Button } from 'antd';
+import { Modal, message, Input, Form, Button, Space } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import cronParse from 'cron-parser';
 import EditableTagGroup from '@/components/tag';
+import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 
 const CronModal = ({
   cron,
@@ -73,7 +74,11 @@ const CronModal = ({
         name="form_in_modal"
         initialValues={cron}
       >
-        <Form.Item name="name" label={intl.get('名称')}>
+        <Form.Item
+          name="name"
+          label={intl.get('名称')}
+          rules={[{ required: true, whitespace: true }]}
+        >
           <Input placeholder={intl.get('请输入任务名称')} />
         </Form.Item>
         <Form.Item
@@ -107,9 +112,97 @@ const CronModal = ({
         >
           <Input placeholder={intl.get('秒(可选) 分 时 天 月 周')} />
         </Form.Item>
+        <Form.List name="extra_schedules">
+          {(fields, { add, remove }, { errors }) => (
+            <>
+              {fields.map(({ key, name, ...restField }) => (
+                <Form.Item key={key} noStyle>
+                  <Space className="view-create-modal-sorts" align="baseline">
+                    <Form.Item
+                      {...restField}
+                      name={[name, 'schedule']}
+                      rules={[{ required: true }]}
+                    >
+                      <Input
+                        placeholder={intl.get('秒(可选) 分 时 天 月 周')}
+                      />
+                    </Form.Item>
+                    <MinusCircleOutlined
+                      className="dynamic-delete-button"
+                      onClick={() => remove(name)}
+                    />
+                  </Space>
+                </Form.Item>
+              ))}
+              <Form.Item>
+                <a onClick={() => add({ schedule: '' })}>
+                  <PlusOutlined />
+                  {intl.get('新增定时规则')}
+                </a>
+              </Form.Item>
+              <Form.ErrorList errors={errors} />
+            </>
+          )}
+        </Form.List>
         <Form.Item name="labels" label={intl.get('标签')}>
           <EditableTagGroup />
         </Form.Item>
+        <Form.Item
+          name="task_before"
+          label={intl.get('执行前')}
+          tooltip={intl.get(
+            '运行任务前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js',
+          )}
+          rules={[
+            {
+              validator(rule, value) {
+                if (
+                  value &&
+                  (value.includes(' task ') || value.startsWith('task '))
+                ) {
+                  return Promise.reject(intl.get('不能包含 task 命令'));
+                }
+                return Promise.resolve();
+              },
+            },
+          ]}
+        >
+          <Input.TextArea
+            rows={4}
+            autoSize={{ minRows: 1, maxRows: 5 }}
+            placeholder={intl.get(
+              '请输入运行任务前要执行的命令，不能包含 task 命令',
+            )}
+          />
+        </Form.Item>
+        <Form.Item
+          name="task_after"
+          label={intl.get('执行后')}
+          tooltip={intl.get(
+            '运行任务后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js',
+          )}
+          rules={[
+            {
+              validator(rule, value) {
+                if (
+                  value &&
+                  (value.includes(' task ') || value.startsWith('task '))
+                ) {
+                  return Promise.reject(intl.get('不能包含 task 命令'));
+                }
+                return Promise.resolve();
+              },
+            },
+          ]}
+        >
+          <Input.TextArea
+            rows={4}
+            autoSize={{ minRows: 1, maxRows: 5 }}
+            placeholder={intl.get(
+              '请输入运行任务后要执行的命令，不能包含 task 命令',
+            )}
+          />
+        </Form.Item>
       </Form>
     </Modal>
   );

src/pages/crontab/type.ts

@@ -35,4 +35,6 @@ export interface ICrontab {
   last_running_time?: number;
   last_execution_time?: number;
   nextRunTime: Date;
+  sub_id: number;
+  extra_schedules?: Array<{ schedule: string; }>;
 }

src/pages/crontab/viewCreateModal.tsx

@@ -107,20 +107,29 @@ const ViewCreateModal = ({
     }
     form.setFieldsValue(
       view || {
-        filters: [{ property: 'command', operation: 'Reg' }],
+        filters: [{ property: 'command' }],
       },
     );
   }, [view, visible]);
 
-  const operationElement = (
-    <Select style={{ width: 120 }}>
-      {OPERATIONS.map((x) => (
-        <Select.Option key={x.name} value={x.value}>
-          {x.name}
-        </Select.Option>
-      ))}
-    </Select>
-  );
+  const OperationElement = ({ name, ...others }: { name: number }) => {
+    const property = form.getFieldValue(['filters', name, 'property']);
+    return (
+      <Select
+        style={{ width: 120 }}
+        placeholder={intl.get('请选择操作符')}
+        {...others}
+      >
+        {OPERATIONS.filter((x) =>
+          STATUS_MAP[property as 'status' | 'sub_id'] ? x.type === 'select' : x,
+        ).map((x) => (
+          <Select.Option key={x.name} value={x.value}>
+            {x.name}
+          </Select.Option>
+        ))}
+      </Select>
+    );
+  };
 
   const propertyElement = (props: any, style: React.CSSProperties = {}) => {
     return (
@@ -190,7 +199,7 @@ const ViewCreateModal = ({
           <Input placeholder={intl.get('请输入视图名称')} />
         </Form.Item>
         <Form.List name="filters">
-          {(fields, { add, remove }) => (
+          {(fields, { add, remove }, { errors }) => (
             <div
               style={{ position: 'relative' }}
               className={`view-filters-container ${
@@ -256,9 +265,11 @@ const ViewCreateModal = ({
                       <Form.Item
                         {...restField}
                         name={[name, 'operation']}
-                        rules={[{ required: true }]}
+                        rules={[
+                          { required: true, message: intl.get('请选择操作符') },
+                        ]}
                       >
-                        {operationElement}
+                        <OperationElement name={name} />
                       </Form.Item>
                       <Form.Item
                         {...restField}
@@ -290,12 +301,13 @@ const ViewCreateModal = ({
                     {intl.get('新增筛选条件')}
                   </a>
                 </Form.Item>
+                <Form.ErrorList errors={errors} />
               </div>
             </div>
           )}
         </Form.List>
         <Form.List name="sorts">
-          {(fields, { add, remove }) => (
+          {(fields, { add, remove }, { errors }) => (
             <div
               style={{ position: 'relative' }}
               className={`view-filters-container ${
@@ -365,6 +377,7 @@ const ViewCreateModal = ({
                     {intl.get('新增排序方式')}
                   </a>
                 </Form.Item>
+                <Form.ErrorList errors={errors} />
               </div>
             </div>
           )}

src/pages/dependence/index.tsx

@@ -35,6 +35,7 @@ import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 import dayjs from 'dayjs';
+import WebSocketManager from '@/utils/websocket';
 
 const { Text } = Typography;
 const { Search } = Input;
@@ -87,12 +88,11 @@ const StatusMap: Record<number, { icon: React.ReactNode; color: string }> = {
 };
 
 const Dependence = () => {
-  const { headerStyle, isPhone, socketMessage } =
-    useOutletContext<SharedContext>();
+  const { headerStyle, isPhone } = useOutletContext<SharedContext>();
   const columns: any = [
     {
       title: intl.get('序号'),
-      width: 80,
+      width: 90,
       render: (text: string, record: any, index: number) => {
         return <span style={{ cursor: 'text' }}>{index + 1} </span>;
       },
@@ -100,7 +100,7 @@ const Dependence = () => {
     {
       title: intl.get('名称'),
       dataIndex: 'name',
-      width: 120,
+      width: 180,
       key: 'name',
     },
     {
@@ -109,11 +109,12 @@ const Dependence = () => {
       width: 120,
       dataIndex: 'status',
       render: (text: string, record: any, index: number) => {
+        console.log(record.status);
         return (
           <Space size="middle" style={{ cursor: 'text' }}>
             <Tag
-              color={StatusMap[record.status].color}
-              icon={StatusMap[record.status].icon}
+              color={StatusMap[record.status]?.color}
+              icon={StatusMap[record.status]?.icon}
               style={{ marginRight: 0 }}
             >
               {intl.get(Status[record.status])}
@@ -125,7 +126,7 @@ const Dependence = () => {
     {
       title: intl.get('备注'),
       dataIndex: 'remark',
-      width: 120,
+      width: 100,
       key: 'remark',
     },
     {
@@ -149,7 +150,7 @@ const Dependence = () => {
     {
       title: intl.get('操作'),
       key: 'action',
-      width: 150,
+      width: 140,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
@@ -395,63 +396,62 @@ const Dependence = () => {
     }
   }, [logDependence]);
 
-  useEffect(() => {
-    if (!socketMessage) return;
-    const { type, message, references } = socketMessage;
-    if (
-      type === 'installDependence' &&
-      message.includes('开始时间') &&
-      references.length > 0
-    ) {
-      const result = [...value];
-      for (let i = 0; i < references.length; i++) {
-        const index = value.findIndex((x) => x.id === references[i]);
-        if (index !== -1) {
-          result.splice(index, 1, {
-            ...value[index],
-            status: message.includes('安装') ? Status.安装中 : Status.删除中,
-          });
-        }
-      }
-      setValue(result);
+  const handleMessage = useCallback((payload: any) => {
+    const { message, references } = payload;
+    let status: number | undefined = undefined;
+    if (message.includes('开始时间') && references.length > 0) {
+      status = message.includes('安装') ? Status.安装中 : Status.删除中;
     }
-    if (
-      type === 'installDependence' &&
-      message.includes('结束时间') &&
-      references.length > 0
-    ) {
-      let status;
+    if (message.includes('结束时间') && references.length > 0) {
       if (message.includes('安装')) {
         status = message.includes('成功') ? Status.已安装 : Status.安装失败;
       } else {
         status = message.includes('成功') ? Status.已删除 : Status.删除失败;
       }
-      const result = [...value];
-      for (let i = 0; i < references.length; i++) {
-        const index = value.findIndex((x) => x.id === references[i]);
-        if (index !== -1) {
-          result.splice(index, 1, {
-            ...value[index],
-            status,
-          });
-        }
-      }
-      setValue(result);
 
       if (status === Status.已删除) {
         setTimeout(() => {
-          const _result = [...value];
-          for (let i = 0; i < references.length; i++) {
-            const index = value.findIndex((x) => x.id === references[i]);
-            if (index !== -1) {
-              _result.splice(index, 1);
+          setValue((p) => {
+            const _result = [...p];
+            for (let i = 0; i < references.length; i++) {
+              const index = p.findIndex((x) => x.id === references[i]);
+              if (index !== -1) {
+                _result.splice(index, 1);
+              }
             }
-          }
-          setValue(_result);
+            return _result;
+          });
         }, 5000);
+        return;
       }
     }
-  }, [socketMessage]);
+    if (typeof status === 'number') {
+      setValue((p) => {
+        const result = [...p];
+        for (let i = 0; i < references.length; i++) {
+          const index = p.findIndex((x) => x.id === references[i]);
+          if (index !== -1) {
+            result.splice(index, 1, {
+              ...p[index],
+              status,
+            });
+          }
+        }
+        return result;
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    const ws = WebSocketManager.getInstance();
+    ws.subscribe('installDependence', handleMessage);
+    ws.subscribe('uninstallDependence', handleMessage);
+
+    return () => {
+      ws.unsubscribe('installDependence', handleMessage);
+      ws.unsubscribe('uninstallDependence', handleMessage);
+    };
+  }, []);
 
   const onTabChange = (activeKey: string) => {
     setSelectedRowIds([]);
@@ -548,24 +548,25 @@ const Dependence = () => {
         dependence={editedDependence}
         defaultType={type}
       />
-      <DependenceLogModal
-        visible={isLogModalVisible}
-        handleCancel={(needRemove?: boolean) => {
-          setIsLogModalVisible(false);
-          if (needRemove) {
-            const index = value.findIndex((x) => x.id === logDependence.id);
-            const result = [...value];
-            if (index !== -1) {
-              result.splice(index, 1);
-              setValue(result);
+      {logDependence && (
+        <DependenceLogModal
+          visible={isLogModalVisible}
+          handleCancel={(needRemove?: boolean) => {
+            setIsLogModalVisible(false);
+            if (needRemove) {
+              const index = value.findIndex((x) => x.id === logDependence.id);
+              const result = [...value];
+              if (index !== -1) {
+                result.splice(index, 1);
+                setValue(result);
+              }
+            } else if ([...value].map((x) => x.id).includes(logDependence.id)) {
+              getDependenceDetail(logDependence);
             }
-          } else if ([...value].map((x) => x.id).includes(logDependence.id)) {
-            getDependenceDetail(logDependence);
-          }
-        }}
-        socketMessage={socketMessage}
-        dependence={logDependence}
-      />
+          }}
+          dependence={logDependence}
+        />
+      )}
     </PageContainer>
   );
 };

src/pages/dependence/logModal.tsx

@@ -9,17 +9,16 @@ import {
 } from '@ant-design/icons';
 import { PageLoading } from '@ant-design/pro-layout';
 import Ansi from 'ansi-to-react';
+import WebSocketManager from '@/utils/websocket';
 
 const DependenceLogModal = ({
   dependence,
   handleCancel,
   visible,
-  socketMessage,
 }: {
   dependence?: any;
   visible: boolean;
   handleCancel: (needRemove?: boolean) => void;
-  socketMessage: any;
 }) => {
   const [value, setValue] = useState<string>('');
   const [executing, setExecuting] = useState<any>(true);
@@ -54,7 +53,7 @@ const DependenceLogModal = ({
           code === 200 &&
           localStorage.getItem('logDependence') === String(dependence.id)
         ) {
-          const log = (data.log || []).join('') as string;
+          const log = (data?.log || []).join('') as string;
           setValue(log);
           setExecuting(!log.includes('结束时间'));
           setIsRemoveFailed(log.includes('删除失败'));
@@ -95,21 +94,25 @@ const DependenceLogModal = ({
     }
   }, [dependence]);
 
-  useEffect(() => {
-    if (!socketMessage || !dependence) return;
-    const { type, message, references } = socketMessage;
-    if (
-      type === 'installDependence' &&
-      references.length > 0 &&
-      references.includes(dependence.id)
-    ) {
+  const handleMessage = (payload: any) => {
+    const { message, references } = payload;
+    if (references.length > 0 && references.includes(dependence.id)) {
       if (message.includes('结束时间')) {
         setExecuting(false);
         setIsRemoveFailed(message.includes('删除失败'));
       }
-      setValue(`${value}${message}`);
+      setValue((p) => `${p}${message}`);
     }
-  }, [socketMessage]);
+  };
+
+  useEffect(() => {
+    const ws = WebSocketManager.getInstance();
+    ws.subscribe('installDependence', handleMessage);
+
+    return () => {
+      ws.unsubscribe('installDependence', handleMessage);
+    };
+  }, []);
 
   useEffect(() => {
     setIsPhone(document.body.clientWidth < 768);

src/pages/env/index.tsx

@@ -41,6 +41,7 @@ import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 import Copy from '../../components/copy';
 import { useVT } from 'virtualizedtableforantd4';
+import dayjs from 'dayjs';
 
 const { Paragraph } = Typography;
 const { Search } = Input;
@@ -82,6 +83,16 @@ const Env = () => {
       dataIndex: 'name',
       key: 'name',
       sorter: (a: any, b: any) => a.name.localeCompare(b.name),
+      render: (text: string, record: any) => {
+        return (
+          <div style={{ display: 'flex', alignItems: 'center' }}>
+            <Tooltip title={text} placement="topLeft">
+              <div className="text-ellipsis">{text}</div>
+            </Tooltip>
+            <Copy text={text} />
+          </div>
+        );
+      },
     },
     {
       title: intl.get('值'),
@@ -127,13 +138,9 @@ const Env = () => {
         },
       },
       render: (text: string, record: any) => {
-        const language = navigator.language || navigator.languages[0];
-        const time = record.updatedAt || record.timestamp;
-        const date = new Date(time)
-          .toLocaleString(language, {
-            hour12: false,
-          })
-          .replace(' 24:', ' 00:');
+        const date = dayjs(record.updatedAt || record.timestamp).format(
+          'YYYY-MM-DD HH:mm:ss',
+        );
         return (
           <Tooltip
             placement="topLeft"

src/pages/login/index.tsx

@@ -16,6 +16,7 @@ import { request } from '@/utils/http';
 import { useTheme } from '@/utils/hooks';
 import { MobileOutlined } from '@ant-design/icons';
 import { SharedContext } from '@/layouts';
+import dayjs from 'dayjs';
 
 const FormItem = Form.Item;
 const { Countdown } = Statistic;
@@ -86,7 +87,7 @@ const Login = () => {
           <>
             <div>
               {intl.get('上次登录时间：')}
-              {lastlogon ? new Date(lastlogon).toLocaleString() : '-'}
+              {lastlogon ? dayjs(lastlogon).format('YYYY-MM-DD HH:mm:ss') : '-'}
             </div>
             <div>
               {intl.get('上次登录地点：')}

src/pages/script/editModal.tsx

@@ -1,5 +1,11 @@
 import intl from 'react-intl-universal';
-import React, { useEffect, useState, useRef } from 'react';
+import React, {
+  useEffect,
+  useState,
+  useRef,
+  useCallback,
+  useReducer,
+} from 'react';
 import { Drawer, Button, Tabs, Badge, Select, TreeSelect } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
@@ -9,6 +15,8 @@ import SaveModal from './saveModal';
 import SettingModal from './setting';
 import { useTheme } from '@/utils/hooks';
 import { getEditorMode, logEnded } from '@/utils';
+import WebSocketManager from '@/utils/websocket';
+import Ansi from 'ansi-to-react';
 
 const { Option } = Select;
 
@@ -18,12 +26,10 @@ const EditModal = ({
   content,
   handleCancel,
   visible,
-  socketMessage,
 }: {
   treeData?: any;
   content?: string;
   visible: boolean;
-  socketMessage: any;
   currentNode: any;
   handleCancel: () => void;
 }) => {
@@ -34,12 +40,11 @@ const EditModal = ({
   const [saveModalVisible, setSaveModalVisible] = useState<boolean>(false);
   const [settingModalVisible, setSettingModalVisible] =
     useState<boolean>(false);
-  const [log, setLog] = useState<string>('');
+  const [log, setLog] = useState('');
   const { theme } = useTheme();
   const editorRef = useRef<any>(null);
   const [isRunning, setIsRunning] = useState(false);
   const [currentPid, setCurrentPid] = useState(null);
-
   const cancel = () => {
     handleCancel();
   };
@@ -104,28 +109,25 @@ const EditModal = ({
       });
   };
 
-  useEffect(() => {
-    if (!socketMessage) {
-      return;
-    }
-
-    let { type, message: _message, references } = socketMessage;
-
-    if (type !== 'manuallyRunScript') {
-      return;
-    }
-
+  const handleMessage = useCallback((payload: any) => {
+    let { message: _message } = payload;
     if (logEnded(_message)) {
       setTimeout(() => {
         setIsRunning(false);
       }, 300);
     }
 
-    if (log) {
-      _message = `\n${_message}`;
-    }
-    setLog(`${log}${_message}`);
-  }, [socketMessage]);
+    setLog((p) => `${p}${_message}`);
+  }, []);
+
+  useEffect(() => {
+    const ws = WebSocketManager.getInstance();
+    ws.subscribe('manuallyRunScript', handleMessage);
+
+    return () => {
+      ws.unsubscribe('manuallyRunScript', handleMessage);
+    };
+  }, []);
 
   useEffect(() => {
     setLog('');
@@ -245,7 +247,7 @@ const EditModal = ({
             padding: '0 15px',
           }}
         >
-          {log}
+          <Ansi>{log}</Ansi>
         </pre>
       </SplitPane>
       <SaveModal

src/pages/script/index.tsx

@@ -48,7 +48,7 @@ import { langs } from '@uiw/codemirror-extensions-langs';
 const { Text } = Typography;
 
 const Script = () => {
-  const { headerStyle, isPhone, theme, socketMessage } =
+  const { headerStyle, isPhone, theme } =
     useOutletContext<SharedContext>();
   const [value, setValue] = useState(intl.get('请选择脚本文件'));
   const [select, setSelect] = useState<string>('');
@@ -591,16 +591,15 @@ const Script = () => {
             }}
           />
         )}
-        <EditModal
+        {isLogModalVisible && <EditModal
           visible={isLogModalVisible}
           treeData={data}
           currentNode={currentNode}
           content={value}
-          socketMessage={socketMessage}
           handleCancel={() => {
             setIsLogModalVisible(false);
           }}
-        />
+        />}
         <EditScriptNameModal
           visible={isAddFileModalVisible}
           treeData={data}

src/pages/setting/about.tsx

@@ -7,12 +7,6 @@ import dayjs from 'dayjs';
 
 const { Link } = Typography;
 
-enum TVersion {
-  'develop' = '开发版',
-  'master' = '正式版',
-  'debian' = '正式版'
-}
-
 const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
   return (
     <div className={styles.container}>
@@ -30,7 +24,10 @@ const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
         </span>
         <Descriptions>
           <Descriptions.Item label={intl.get('版本')} span={3}>
-            {intl.get(TVersion[systemInfo.branch])} v{systemInfo.version}
+            {systemInfo?.branch === 'develop'
+              ? intl.get('开发版')
+              : intl.get('正式版')}{' '}
+            v{systemInfo.version}
           </Descriptions.Item>
           <Descriptions.Item label={intl.get('更新时间')} span={3}>
             {dayjs(systemInfo.publishTime * 1000).format('YYYY-MM-DD HH:mm')}

src/pages/setting/checkUpdate.tsx

@@ -1,12 +1,14 @@
 import intl from 'react-intl-universal';
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState, useRef, useCallback } from 'react';
 import { Statistic, Modal, Tag, Button, Spin, message } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
+import WebSocketManager from '@/utils/websocket';
+import Ansi from 'ansi-to-react';
 
 const { Countdown } = Statistic;
 
-const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
+const CheckUpdate = ({ systemInfo }: any) => {
   const [updateLoading, setUpdateLoading] = useState(false);
   const [value, setValue] = useState('');
   const modalRef = useRef<any>();
@@ -75,7 +77,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
           </div>
         </>
       ),
-      content: <pre>{lastLog}</pre>,
+      content: <pre><Ansi>{lastLog}</Ansi></pre>,
       okText: intl.get('下载更新'),
       cancelText: intl.get('以后再说'),
       onOk() {
@@ -100,7 +102,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
       okButtonProps: { disabled: true },
       title: intl.get('下载更新中...'),
       centered: true,
-      content: <pre>{value}</pre>,
+      content: <pre><Ansi>{value}</Ansi></pre>,
     });
   };
 
@@ -149,17 +151,8 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
   };
 
   useEffect(() => {
-    if (!modalRef.current || !socketMessage) {
-      return;
-    }
-    const { type, message: _message, references } = socketMessage;
-
-    if (type !== 'updateSystemVersion') {
-      return;
-    }
-
-    const newMessage = `${value}${_message}`;
-    const updateFailed = newMessage.includes('失败');
+    if (!value) return;
+    const updateFailed = value.includes('失败，请检查');
 
     modalRef.current.update({
       maskClosable: updateFailed,
@@ -167,29 +160,46 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
       okButtonProps: { disabled: !updateFailed },
       content: (
         <>
-          <pre>{newMessage}</pre>
+          <pre>
+            <Ansi>{value}</Ansi>
+          </pre>
           <div id="log-identifier" style={{ paddingBottom: 5 }}></div>
         </>
       ),
     });
+  }, [value]);
 
-    if (updateFailed && !value.includes('失败，请检查')) {
+  const handleMessage = useCallback((payload: any) => {
+    let { message: _message } = payload;
+    const updateFailed = _message.includes('失败，请检查');
+
+    if (updateFailed) {
       message.error(intl.get('更新失败，请检查网络及日志或稍后再试'));
     }
 
-    setValue(newMessage);
-
-    document.getElementById('log-identifier') &&
+    setTimeout(() => {
       document
-        .getElementById('log-identifier')!
-        .scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+        .querySelector('#log-identifier')!
+        .scrollIntoView({ behavior: 'smooth' });
+    }, 600);
 
     if (_message.includes('更新包下载成功')) {
       setTimeout(() => {
         showReloadModal();
       }, 1000);
     }
-  }, [socketMessage]);
+
+    setValue((p) => `${p}${_message}`);
+  }, []);
+
+  useEffect(() => {
+    const ws = WebSocketManager.getInstance();
+    ws.subscribe('updateSystemVersion', handleMessage);
+
+    return () => {
+      ws.unsubscribe('updateSystemVersion', handleMessage);
+    };
+  }, []);
 
   return (
     <>

src/pages/setting/index.tsx

@@ -32,8 +32,8 @@ import About from './about';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
 import './index.less';
-import CodeMirror from '@uiw/react-codemirror';
 import useResizeObserver from '@react-hook/resize-observer';
+import SystemLog from './systemLog';
 
 const { Text } = Typography;
 const isDemoEnv = window.__ENV__DeployEnv === 'demo';
@@ -46,7 +46,6 @@ const Setting = () => {
     theme,
     reloadUser,
     reloadTheme,
-    socketMessage,
     systemInfo,
   } = useOutletContext<SharedContext>();
   const columns = [
@@ -335,7 +334,7 @@ const Setting = () => {
                   dataSource={dataSource}
                   rowKey="id"
                   size="middle"
-                  scroll={{ x: 768 }}
+                  scroll={{ x: 1000 }}
                   loading={loading}
                 />
               ),
@@ -348,22 +347,7 @@ const Setting = () => {
             {
               key: 'syslog',
               label: intl.get('系统日志'),
-              children: (
-                <CodeMirror
-                  maxHeight={`${height}px`}
-                  value={systemLogData}
-                  onCreateEditor={(view) => {
-                    setTimeout(() => {
-                      view.scrollDOM.scrollTo({
-                        top: view.scrollDOM.scrollHeight,
-                        behavior: 'smooth',
-                      });
-                    }, 300);
-                  }}
-                  readOnly={true}
-                  theme={theme.includes('dark') ? 'dark' : 'light'}
-                />
-              ),
+              children: <SystemLog data={systemLogData} height={height} theme={theme}/>,
             },
             {
               key: 'login',
@@ -376,7 +360,6 @@ const Setting = () => {
               children: (
                 <Other
                   reloadTheme={reloadTheme}
-                  socketMessage={socketMessage}
                   systemInfo={systemInfo}
                 />
               ),

src/pages/setting/loginLog.tsx

@@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { Typography, Table, Tag, Button, Spin, message } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
+import dayjs from 'dayjs';
 
 const { Text, Link } = Typography;
 
@@ -30,7 +31,7 @@ const columns = [
     key: 'timestamp',
     width: 120,
     render: (text: string, record: any) => {
-      return new Date(record.timestamp).toLocaleString();
+      return dayjs(record.timestamp).format('YYYY-MM-DD HH:mm:ss');
     },
   },
   {

src/pages/setting/notification.tsx

@@ -76,7 +76,7 @@ const NotificationSetting = ({ data }: any) => {
           >
             {x.items ? (
               <Select
-                placeholder={x.placeholder || `请选择${x.label}`}
+                placeholder={x.placeholder || `${intl.get('请选择')} ${x.label}`}
                 disabled={loading}
               >
                 {x.items.map((y) => (
@@ -89,7 +89,7 @@ const NotificationSetting = ({ data }: any) => {
               <Input.TextArea
                 disabled={loading}
                 autoSize={{ minRows: 1, maxRows: 5 }}
-                placeholder={x.placeholder || `请输入${x.label}`}
+                placeholder={x.placeholder || `${intl.get('请输入')} ${x.label}`}
               />
             )}
           </Form.Item>

src/pages/setting/other.tsx

@@ -24,9 +24,8 @@ import useProgress from './progress';
 
 const Other = ({
   systemInfo,
-  socketMessage,
   reloadTheme,
-}: Pick<SharedContext, 'socketMessage' | 'reloadTheme' | 'systemInfo'>) => {
+}: Pick<SharedContext, 'reloadTheme' | 'systemInfo'>) => {
   const defaultTheme = localStorage.getItem('qinglong_dark_theme') || 'auto';
   const [systemConfig, setSystemConfig] = useState<{
     logRemoveFrequency?: number | null;
@@ -254,7 +253,7 @@ const Other = ({
           method="put"
           showUploadList={false}
           maxCount={1}
-          action="/api/system/data/import"
+          action={`${config.apiPrefix}system/data/import`}
           onChange={(e) => {
             if (e.event?.percent) {
               showUploadProgress(parseFloat(e.event?.percent.toFixed(1)));
@@ -274,7 +273,7 @@ const Other = ({
         </Upload>
       </Form.Item>
       <Form.Item label={intl.get('检查更新')} name="update">
-        <CheckUpdate systemInfo={systemInfo} socketMessage={socketMessage} />
+        <CheckUpdate systemInfo={systemInfo} />
       </Form.Item>
     </Form>
   );

src/pages/setting/progress.tsx

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import { Modal, Progress } from 'antd';
 import { useRef } from 'react';
 
@@ -15,14 +16,14 @@ export default function useProgress(title: string) {
   const showProgress = (percent: number) => {
     if (modalRef.current) {
       modalRef.current.update({
-        title: `${title}${percent >= 100 ? '成功' : '中...'}`,
+        title: `${title}${percent >= 100 ? intl.get('成功') : intl.get('中...')}`,
         content: <ProgressElement percent={percent} />,
       });
     } else {
       modalRef.current = Modal.info({
         width: 600,
         maskClosable: false,
-        title: `${title}${percent >= 100 ? '成功' : '中...'}`,
+        title: `${title}${percent >= 100 ? intl.get('成功') : intl.get('中...')}`,
         centered: true,
         content: <ProgressElement percent={percent} />,
       });

src/pages/setting/security.tsx

@@ -97,14 +97,16 @@ const SecuritySettings = ({ user, userChange }: any) => {
 
   const onChange = (e) => {
     if (e.file && e.file.response) {
-      setAvatar(`/api/static/${e.file.response.data}`);
+      setAvatar(
+        `${config.apiPrefix}static/${e.file.response.data}`,
+      );
       userChange();
     }
   };
 
   useEffect(() => {
     setTwoFactorActivated(user && user.twoFactorActivated);
-    setAvatar(user.avatar && `/api/static/${user.avatar}`);
+    setAvatar(user.avatar && `${config.apiPrefix}static/${user.avatar}`);
   }, [user]);
 
   return twoFactoring ? (
@@ -250,7 +252,7 @@ const SecuritySettings = ({ user, userChange }: any) => {
           method="put"
           showUploadList={false}
           maxCount={1}
-          action="/api/user/avatar"
+          action={`${config.apiPrefix}user/avatar`}
           onChange={onChange}
           name="avatar"
           headers={{

src/pages/setting/systemLog.tsx

@@ -0,0 +1,58 @@
+import React, { useRef } from 'react';
+import CodeMirror from '@uiw/react-codemirror';
+import { Button } from 'antd';
+import {
+  VerticalAlignBottomOutlined,
+  VerticalAlignTopOutlined,
+} from '@ant-design/icons';
+
+const SystemLog = ({ data, height, theme }: any) => {
+  const editorRef = useRef<any>(null);
+
+  const scrollTo = (position: 'start' | 'end') => {
+    editorRef.current.scrollDOM.scrollTo({
+      top: position === 'start' ? 0 : editorRef.current.scrollDOM.scrollHeight,
+    });
+  };
+
+  return (
+    <div style={{ position: 'relative' }}>
+      <CodeMirror
+        maxHeight={`${height}px`}
+        value={data}
+        onCreateEditor={(view) => {
+          editorRef.current = view;
+        }}
+        readOnly={true}
+        theme={theme.includes('dark') ? 'dark' : 'light'}
+      />
+      <div
+        style={{
+          position: 'absolute',
+          bottom: 20,
+          right: 20,
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 10,
+        }}
+      >
+        <Button
+          size='small'
+          icon={<VerticalAlignTopOutlined />}
+          onClick={() => {
+            scrollTo('start');
+          }}
+        />
+        <Button
+          size='small'
+          icon={<VerticalAlignBottomOutlined />}
+          onClick={() => {
+            scrollTo('end');
+          }}
+        />
+      </div>
+    </div>
+  );
+};
+
+export default SystemLog;

src/pages/subscription/index.tsx

@@ -1,5 +1,5 @@
 import intl from 'react-intl-universal';
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
 import {
   Button,
   message,
@@ -36,6 +36,7 @@ import './index.less';
 import SubscriptionLogModal from './logModal';
 import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
+import WebSocketManager from '@/utils/websocket';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -61,8 +62,7 @@ export enum SubscriptionType {
 }
 
 const Subscription = () => {
-  const { headerStyle, isPhone, socketMessage } =
-    useOutletContext<SharedContext>();
+  const { headerStyle, isPhone } = useOutletContext<SharedContext>();
 
   const columns: any = [
     {
@@ -508,23 +508,31 @@ const Subscription = () => {
       : 'subscription';
   };
 
-  useEffect(() => {
-    if (!socketMessage) return;
-    const { type, message, references } = socketMessage;
-    if (type === 'runSubscriptionEnd' && references.length > 0) {
-      const result = [...value];
+  const handleMessage = useCallback((payload: any) => {
+    const { message, references } = payload;
+    setValue((p) => {
+      const result = [...p];
       for (let i = 0; i < references.length; i++) {
-        const index = value.findIndex((x) => x.id === references[i]);
+        const index = p.findIndex((x) => x.id === references[i]);
         if (index !== -1) {
           result.splice(index, 1, {
-            ...value[index],
+            ...p[index],
             status: SubscriptionStatus.idle,
           });
         }
       }
-      setValue(result);
-    }
-  }, [socketMessage]);
+      return result;
+    });
+  }, []);
+
+  useEffect(() => {
+    const ws = WebSocketManager.getInstance();
+    ws.subscribe('runSubscriptionEnd', handleMessage);
+
+    return () => {
+      ws.unsubscribe('runSubscriptionEnd', handleMessage);
+    };
+  }, []);
 
   useEffect(() => {
     if (logSubscription) {

src/pages/subscription/logModal.tsx

@@ -9,6 +9,7 @@ import {
 } from '@ant-design/icons';
 import { PageLoading } from '@ant-design/pro-layout';
 import { logEnded } from '@/utils';
+import Ansi from 'ansi-to-react';
 
 const SubscriptionLogModal = ({
   subscription,
@@ -122,7 +123,7 @@ const SubscriptionLogModal = ({
                 : {}
             }
           >
-            {value}
+            <Ansi>{value}</Ansi>
           </pre>
         )}
       </div>

src/utils/config.ts

@@ -98,6 +98,7 @@ export default {
     { value: 'email', label: intl.get('邮箱') },
     { value: 'lark', label: intl.get('飞书机器人') },
     { value: 'pushMe', label: 'PushMe' },
+    { value: 'chronocat', label: 'Chronocat' },
     { value: 'webhook', label: intl.get('自定义通知') },
     { value: 'closed', label: intl.get('已关闭') },
   ],
@@ -126,14 +127,16 @@ export default {
     goCqHttpBot: [
       {
         label: 'goCqHttpBotUrl',
-        tip: intl.get('推送到个人QQ: http://127.0.0.1/send_private_msg，群：http://127.0.0.1/send_group_msg',
+        tip: intl.get(
+          '推送到个人QQ: http://127.0.0.1/send_private_msg，群：http://127.0.0.1/send_group_msg',
         ),
         required: true,
       },
       { label: 'goCqHttpBotToken', tip: intl.get('访问密钥'), required: true },
       {
         label: 'goCqHttpBotQq',
-        tip: intl.get('如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群',
+        tip: intl.get(
+          '如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群',
         ),
         required: true,
       },
@@ -153,14 +156,16 @@ export default {
       },
       {
         label: 'pushDeerUrl',
-        tip: intl.get('PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push',
+        tip: intl.get(
+          'PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push',
         ),
       },
     ],
     bark: [
       {
         label: 'barkPush',
-        tip: intl.get('Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX',
+        tip: intl.get(
+          'Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX',
         ),
         required: true,
       },
@@ -176,11 +181,20 @@ export default {
         label: 'barkGroup',
         tip: intl.get('BARK推送消息的分组，默认为qinglong'),
       },
+      {
+        label: 'barkLevel',
+        tip: intl.get('BARK推送消息的时效性，默认为active'),
+      },
+      {
+        label: 'barkUrl',
+        tip: intl.get('BARK推送消息的跳转URL'),
+      },
     ],
     telegramBot: [
       {
         label: 'telegramBotToken',
-        tip: intl.get('telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw',
+        tip: intl.get(
+          'telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw',
         ),
         required: true,
       },
@@ -193,7 +207,8 @@ export default {
       { label: 'telegramBotProxyPort', tip: intl.get('代理端口') },
       {
         label: 'telegramBotProxyAuth',
-        tip: intl.get('telegram代理配置认证参数，用户名与密码用英文冒号连接 user:password',
+        tip: intl.get(
+          'telegram代理配置认证参数，用户名与密码用英文冒号连接 user:password',
         ),
       },
       {
@@ -204,20 +219,23 @@ export default {
     dingtalkBot: [
       {
         label: 'dingtalkBotToken',
-        tip: intl.get('钉钉机器人webhook token，例如：5a544165465465645d0f31dca676e7bd07415asdasd',
+        tip: intl.get(
+          '钉钉机器人webhook token，例如：5a544165465465645d0f31dca676e7bd07415asdasd',
         ),
         required: true,
       },
       {
         label: 'dingtalkBotSecret',
-        tip: intl.get('密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的字符串',
+        tip: intl.get(
+          '密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的字符串',
         ),
       },
     ],
     weWorkBot: [
       {
         label: 'weWorkBotKey',
-        tip: intl.get('企业微信机器人的webhook(详见文档 https://work.weixin.qq.com/api/doc/90000/90136/91770)，例如：693a91f6-7xxx-4bc4-97a0-0ec2sifa5aaa',
+        tip: intl.get(
+          '企业微信机器人的webhook(详见文档 https://work.weixin.qq.com/api/doc/90000/90136/91770)，例如：693a91f6-7xxx-4bc4-97a0-0ec2sifa5aaa',
         ),
         required: true,
       },
@@ -229,7 +247,8 @@ export default {
     weWorkApp: [
       {
         label: 'weWorkAppKey',
-        tip: intl.get('corpid、corpsecret、touser(注:多个成员ID使用|隔开)、agentid、消息类型(选填，不填默认文本消息类型) 注意用,号隔开(英文输入法的逗号)，例如：wwcfrs,B-76WERQ,qinglong,1000001,2COat',
+        tip: intl.get(
+          'corpid、corpsecret、touser(注:多个成员ID使用|隔开)、agentid、消息类型(选填，不填默认文本消息类型) 注意用,号隔开(英文输入法的逗号)，例如：wwcfrs,B-76WERQ,qinglong,1000001,2COat',
         ),
         required: true,
       },
@@ -241,7 +260,8 @@ export default {
     aibotk: [
       {
         label: 'aibotkKey',
-        tip: intl.get('密钥key，智能微秘书个人中心获取apikey，申请地址：https://wechat.aibotk.com/signup?from=ql',
+        tip: intl.get(
+          '密钥key，智能微秘书个人中心获取apikey，申请地址：https://wechat.aibotk.com/signup?from=ql',
         ),
         required: true,
       },
@@ -257,7 +277,8 @@ export default {
       },
       {
         label: 'aibotkName',
-        tip: intl.get('要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称',
+        tip: intl.get(
+          '要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称',
         ),
         required: true,
       },
@@ -265,7 +286,8 @@ export default {
     iGot: [
       {
         label: 'iGotPushKey',
-        tip: intl.get('iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX',
+        tip: intl.get(
+          'iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX',
         ),
         required: true,
       },
@@ -273,20 +295,23 @@ export default {
     pushPlus: [
       {
         label: 'pushPlusToken',
-        tip: intl.get('微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/',
+        tip: intl.get(
+          '微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/',
         ),
         required: true,
       },
       {
         label: 'pushPlusUser',
-        tip: intl.get('一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）',
+        tip: intl.get(
+          '一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）',
         ),
       },
     ],
     lark: [
       {
         label: 'larkKey',
-        tip: intl.get('飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973',
+        tip: intl.get(
+          '飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973',
         ),
         required: true,
       },
@@ -294,7 +319,8 @@ export default {
     email: [
       {
         label: 'emailService',
-        tip: intl.get('邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/',
+        tip: intl.get(
+          '邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/',
         ),
         required: true,
       },
@@ -308,6 +334,29 @@ export default {
         required: true,
       },
     ],
+    chronocat: [
+      {
+        label: 'chronocatURL',
+        tip: intl.get(
+          'Chronocat Red 服务的连接地址 https://chronocat.vercel.app/install/docker/official/',
+        ),
+        required: true,
+      },
+      {
+        label: 'chronocatQQ',
+        tip: intl.get(
+          '个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx',
+        ),
+        required: true,
+      },
+      {
+        label: 'chronocatToken',
+        tip: intl.get(
+          'docker安装在持久化config目录下的chronocat.yml文件可找到',
+        ),
+        required: true,
+      },
+    ],
     webhook: [
       {
         label: 'webhookMethod',
@@ -327,7 +376,8 @@ export default {
       },
       {
         label: 'webhookUrl',
-        tip: intl.get('请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置',
+        tip: intl.get(
+          '请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置',
         ),
         required: true,
         placeholder: 'https://xxx.cn/api?content=$title\n',
@@ -339,7 +389,8 @@ export default {
       },
       {
         label: 'webhookBody',
-        tip: intl.get('请求体格式key1: value1，多个换行分割。url或者body中必须包含$title，$content可选，对应api内容的位置',
+        tip: intl.get(
+          '请求体格式key1: value1，多个换行分割。url或者body中必须包含$title，$content可选，对应api内容的位置',
         ),
         placeholder: 'key1: $title\nkey2: $content',
       },

src/utils/index.ts

@@ -329,7 +329,7 @@ export function getCommandScript(
   return [s, p];
 }
 
-export function parseCrontab(schedule: string): Date {
+export function parseCrontab(schedule: string): Date | null {
   try {
     const time = cron_parser.parseExpression(schedule);
     if (time) {
@@ -337,7 +337,20 @@ export function parseCrontab(schedule: string): Date {
     }
   } catch (error) { }
 
-  return new Date('1970');
+  return null;
+}
+
+export function getCrontabsNextDate(schedule: string, extra_schedules: string[]): Date | null {
+  let date = parseCrontab(schedule)
+  if (extra_schedules?.length) {
+    extra_schedules.forEach(x => {
+      const _date = parseCrontab(x)
+      if (_date && (!date || _date < date)) {
+        date = _date;
+      }
+    })
+  }
+  return date;
 }
 
 export function getExtension(filename: string) {

src/utils/type.ts

@@ -0,0 +1,8 @@
+export type SockMessageType =
+  | 'ping'
+  | 'installDependence'
+  | 'uninstallDependence'
+  | 'updateSystemVersion'
+  | 'manuallyRunScript'
+  | 'runSubscriptionEnd'
+  | 'reloadSystem';

src/utils/websocket.ts

@@ -0,0 +1,154 @@
+import SockJS from 'sockjs-client';
+import { SockMessageType } from './type';
+
+class WebSocketManager {
+  private static instance: WebSocketManager | null = null;
+  private url: string;
+  private socket: WebSocket | null = null;
+  private subscriptions: Map<SockMessageType, Set<(p: any) => void>> = new Map();
+  private options: {
+    maxReconnectAttempts: number;
+    reconnectInterval: number;
+    heartbeatInterval: number;
+  };
+  private reconnectAttempts: number = 0;
+  private heartbeatTimeout: NodeJS.Timeout | null = null;
+  private state: 'closed' | 'connecting' | 'open' = 'closed';
+
+  constructor(url: string, options: Partial<typeof WebSocketManager.prototype.options> = {}) {
+    this.url = url;
+    this.options = {
+      maxReconnectAttempts: options.maxReconnectAttempts || 5,
+      reconnectInterval: options.reconnectInterval || 3000,
+      heartbeatInterval: options.heartbeatInterval || 30000,
+    };
+
+    this.init();
+  }
+
+  public static getInstance(url: string = '', options?: Partial<typeof WebSocketManager.prototype.options>): WebSocketManager {
+    if (!WebSocketManager.instance) {
+      WebSocketManager.instance = new WebSocketManager(url, options);
+    }
+    return WebSocketManager.instance;
+  }
+
+  private async init() {
+    try {
+      this.state = 'connecting';
+      this.emit('connecting');
+
+      while (this.reconnectAttempts < this.options.maxReconnectAttempts) {
+        this.socket = new SockJS(this.url);
+        this.setupEventListeners();
+        this.startHeartbeat();
+        await this.waitForClose();
+        this.stopHeartbeat();
+        this.socket = null;
+        this.reconnectAttempts++;
+
+        await new Promise((resolve) => setTimeout(resolve, this.options.reconnectInterval));
+      }
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+
+  private setupEventListeners() {
+    if (!this.socket) return;
+
+    this.socket.onopen = () => {
+      this.state = 'open';
+      this.emit('open');
+    };
+
+    this.socket.onmessage = (event) => {
+      const message = JSON.parse(event.data);
+      this.dispatchMessage(message);
+    };
+
+    this.socket.onclose = () => {
+      this.state = 'closed';
+      this.emit('close');
+    };
+  }
+
+  private async waitForClose() {
+    while (this.socket?.readyState !== SockJS.CLOSED) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+  }
+
+  public subscribe(topic: SockMessageType, callback: (v: any) => void) {
+    const topicSubscriptions = this.subscriptions.get(topic) || new Set();
+
+    if (!topicSubscriptions.has(callback)) {
+      topicSubscriptions.add(callback);
+      this.subscriptions.set(topic, topicSubscriptions);
+
+      const subscriptionMessage = { action: 'subscribe', topic };
+      this.send(subscriptionMessage);
+    }
+  }
+
+  public unsubscribe(topic: SockMessageType, callback: (v: any) => void) {
+    const topicSubscriptions = this.subscriptions.get(topic) || new Set();
+    if (topicSubscriptions.has(callback)) {
+      topicSubscriptions.delete(callback);
+
+      const unsubscribeMessage = { action: 'unsubscribe', topic };
+      this.send(unsubscribeMessage);
+    }
+  }
+
+  public send(message: any) {
+    if (this.socket?.readyState === SockJS.OPEN) {
+      this.socket.send(JSON.stringify(message));
+    }
+  }
+
+  private dispatchMessage(message: any) {
+    const { type, ...others } = message;
+    const topicSubscriptions = this.subscriptions.get(type) || new Set();
+
+    [...topicSubscriptions].forEach((callback) => callback(others));
+  }
+
+  private startHeartbeat() {
+    this.heartbeatTimeout = setInterval(() => {
+      if (this.socket?.readyState === SockJS.OPEN) {
+        this.socket.send(JSON.stringify({ type: 'heartbeat' }));
+      }
+    }, this.options.heartbeatInterval);
+  }
+
+  private stopHeartbeat() {
+    if (this.heartbeatTimeout) {
+      clearInterval(this.heartbeatTimeout);
+    }
+  }
+
+  public close() {
+    if (this.socket) {
+      this.state = 'closed';
+      this.stopHeartbeat();
+      this.socket.close();
+      this.emit('close');
+    }
+  }
+
+  private handleError(error: any) {
+    console.error('WebSocket错误:', error);
+    this.emit('error', error);
+  }
+
+  public on(event: string, listener: Function) {
+    // this.addListener(event, listener);
+  }
+
+  public emit(event: string, data?: any) {
+    // this.listeners(event).forEach((listener) => listener(data));
+  }
+}
+
+export default WebSocketManager;

tsconfig.back.json

@@ -1,19 +1,17 @@
 {
   "compilerOptions": {
     "target": "es2017",
-    "lib": ["es2021", "esnext.asynciterable", "DOM"],
-    "typeRoots": [
-      "./node_modules/@types",
-      "./src/types",
-      "./node_modules/celebrate/lib/index.d.ts"
-    ],
+    "lib": ["ESNext"],
+    "typeRoots": ["./node_modules/celebrate/lib", "./node_modules/@types"],
     "paths": {
-      "@/*": ["./back/*"],
+      "@/*": ["./back/*"]
     },
     "allowSyntheticDefaultImports": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
     "moduleResolution": "node",
     "module": "commonjs",
     "pretty": true,
@@ -24,5 +22,6 @@
     "esModuleInterop": true
   },
   "include": ["./back/**/*"],
-  "exclude": ["node_modules", "tests"]
+  "exclude": ["node_modules"],
+  "files": ["./back/index.d.ts"]
 }

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2017",
+    "target": "ESNext",
     "module": "commonjs",
     "moduleResolution": "node",
     "importHelpers": true,
@@ -14,11 +14,6 @@
       "@@/*": ["src/.umi/*"]
     },
     "lib": ["dom", "es2021", "esnext.asynciterable"],
-    "typeRoots": [
-      "./node_modules/@types",
-      "./back/types",
-      "./node_modules/celebrate/lib/index.d.ts"
-    ],
     "allowSyntheticDefaultImports": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
@@ -30,14 +25,7 @@
   "include": ["src/**/*", ".umirc.ts", "typings.d.ts", "back/**/*"],
   "exclude": [
     "node_modules",
-    "lib",
-    "es",
     "static",
     "data",
-    "typings",
-    "**/__test__",
-    "test",
-    "docs",
-    "tests"
   ]
 }

typings.d.ts

@@ -9,8 +9,6 @@ declare module '*.svg' {
   export default url;
 }
 
-declare module 'pstree.remy';
-
 interface Window {
   __ENV__QlBaseUrl: string;
   __ENV__DeployEnv: string;

version.yaml

@@ -1,13 +1,6 @@
-version: 2.16.2
-changeLogLink: https://t.me/jiao_long/393
-publishTime: 2023-09-02 07:00
+version: 2.16.5
+changeLogLink: https://t.me/jiao_long/396
+publishTime: 2023-10-29 20:00
 changeLog: |
-  1. 系统设置增加语言设置
-  2. 修复环境变量有空格时并发数量错误
-  3. 修复环境变量特殊字符转义
-  4. 修复仓库订阅 ssh 配置
-  5. 修复停止订阅执行日志
-  6. 修改定时任务置顶样式
-  7. 修改任务日志样式
-  8. 修复环境变量值 tip 样式
-  9. 其他 bug 修复
+  1. 修复注释或删除环境变量可能无效
+  2. 修复定时任务详情日志列表样式