更新版本 v2.16.4

例如 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 }}

.gitignore

@@ -28,4 +28,5 @@
 /db
 /manual_log
 /scripts
-/bak
+/bak
+/.tmp

.prettierignore

@@ -6,3 +6,27 @@ package.json
 .umi
 .umi-production
 .umi-test
+.history
+.tmp
+node_modules
+npm-debug.log*
+yarn-error.log
+yarn.lock
+package-lock.json
+static
+data
+DS_Store
+src/.umi
+src/.umi-production
+src/.umi-test
+.env.local
+.env
+history
+version.ts
+config
+log
+db
+manual_log
+scripts
+bak
+.tmp

.umirc.ts

@@ -4,13 +4,16 @@ const CompressionPlugin = require('compression-webpack-plugin');
 const baseUrl = process.env.QlBaseUrl || '/';
 export default defineConfig({
   hash: true,
+  jsMinifier: 'terser',
   antd: {},
+  locale: {
+    antd: true,
+    title: true,
+    baseNavigator: true,
+  },
   outputPath: 'static/dist',
   fastRefresh: true,
   favicons: [`https://qn.whyour.cn/favicon.svg`],
-  mfsu: {
-    strategy: 'eager',
-  },
   publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
   proxy: {
     [`${baseUrl}api/public`]: {

README-en.md

@@ -35,6 +35,85 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - Support dark mode
 - 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.
+
+```bash
+docker pull whyour/qinglong:latest
+docker pull whyour/qinglong:debian
+```
+
+### npm
+
+The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
+
+```bash
+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>
+# Print task log in real time, no need to carry this parameter when creating timed tasks
+task -l <file_path>
+# Use -- to split, -- followed by a parameter that is passed to the script, as in the following example, the script receives the parameter -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+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)
@@ -43,7 +122,12 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 # 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 \
@@ -70,7 +154,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
@@ -90,60 +179,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
@@ -156,7 +191,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
 
@@ -174,4 +209,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

@@ -37,6 +37,84 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - 支持暗黑模式
 - 支持手机端操作
 
+## 版本
+
+### docker
+
+`latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像
+
+```bash
+docker pull whyour/qinglong:latest
+docker pull whyour/qinglong:debian
+```
+
+### npm
+
+npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
+
+```bash
+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>
+# 实时打印任务日志，创建定时任务时，不用携带此参数
+task -l <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 (推荐)
@@ -45,9 +123,12 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 # 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 \
@@ -74,9 +155,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
@@ -96,59 +180,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/env.ts

@@ -6,6 +6,7 @@ import { celebrate, Joi } from 'celebrate';
 import multer from 'multer';
 import config from '../config';
 import fs from 'fs';
+import { safeJSONParse } from '../config/util';
 const route = Router();
 
 const storage = multer.diskStorage({
@@ -200,7 +201,7 @@ export default (app: Router) => {
       try {
         const envService = Container.get(EnvService);
         const fileContent = await fs.promises.readFile(req!.file!.path, 'utf8');
-        const parseContent = JSON.parse(fileContent);
+        const parseContent = safeJSONParse(fileContent);
         const data = Array.isArray(parseContent)
           ? parseContent
           : [parseContent];

back/api/log.ts

@@ -53,7 +53,7 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().allow(''),
-        type: Joi.string().optional()
+        type: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -65,7 +65,7 @@ export default (app: Router) => {
         };
         const filePath = join(config.logPath, path, filename);
         if (type === 'directory') {
-          emptyDir(filePath);          
+          await emptyDir(filePath);
         } else {
           fs.unlinkSync(filePath);
         }
@@ -75,5 +75,4 @@ export default (app: Router) => {
       }
     },
   );
-
 };

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

back/api/subscription.ts

@@ -210,12 +210,16 @@ export default (app: Router) => {
     '/',
     celebrate({
       body: Joi.array().items(Joi.number().required()),
+      query: Joi.object({
+        force: Joi.boolean().optional(),
+        t: Joi.number()
+      })
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.remove(req.body);
+        const data = await subscriptionService.remove(req.body, req.query);
         return res.send({ code: 200, data });
       } catch (e) {
         return next(e);

back/api/system.ts

@@ -14,8 +14,18 @@ import {
   promiseExec,
 } from '../config/util';
 import dayjs from 'dayjs';
+import multer from 'multer';
 
 const route = Router();
+const storage = multer.diskStorage({
+  destination: function (req, file, cb) {
+    cb(null, config.tmpPath);
+  },
+  filename: function (req, file, cb) {
+    cb(null, 'data.tgz');
+  },
+});
+const upload = multer({ storage: storage });
 
 export default (app: Router) => {
   app.use('/system', route);
@@ -25,23 +35,8 @@ export default (app: Router) => {
     try {
       const userService = Container.get(UserService);
       const authInfo = await userService.getUserInfo();
-      const envCount = await EnvModel.count();
-      const { version, changeLog, changeLogLink } = await parseVersion(
-        config.versionFile,
-      );
-      const lastCommitTime = (
-        await promiseExec(
-          `cd ${config.rootPath} && git show -s --format=%ai | head -1`,
-        )
-      ).replace('\n', '');
-      const lastCommitId = (
-        await promiseExec(`cd ${config.rootPath} && git rev-parse --short HEAD`)
-      ).replace('\n', '');
-      const branch = (
-        await promiseExec(
-          `cd ${config.rootPath} && git symbolic-ref --short HEAD`,
-        )
-      ).replace('\n', '');
+      const { version, changeLog, changeLogLink, publishTime } =
+        await parseVersion(config.versionFile);
 
       let isInitialized = true;
       if (
@@ -56,9 +51,8 @@ export default (app: Router) => {
         data: {
           isInitialized,
           version,
-          lastCommitTime: dayjs(lastCommitTime).unix(),
-          lastCommitId,
-          branch,
+          publishTime: dayjs(publishTime).unix(),
+          branch: process.env.QL_BRANCH || 'master',
           changeLog,
           changeLogLink,
         },
@@ -95,9 +89,7 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const systemService = Container.get(SystemService);
-        const result = await systemService.updateSystemConfig(
-          req.body,
-        );
+        const result = await systemService.updateSystemConfig(req.body);
         res.send(result);
       } catch (e) {
         return next(e);
@@ -133,6 +125,25 @@ export default (app: Router) => {
     },
   );
 
+  route.put(
+    '/reload',
+    celebrate({
+      body: Joi.object({
+        type: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem(req.body.type);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
   route.put(
     '/notify',
     celebrate({
@@ -163,7 +174,10 @@ export default (app: Router) => {
     async (req: Request, res: Response, next: NextFunction) => {
       try {
         const systemService = Container.get(SystemService);
-        const uniqPath = await getUniqPath(req.body.command);
+        const command = req.body.command
+        const idStr = `cat ${config.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
+        let id = await promiseExec(idStr);
+        const uniqPath = await getUniqPath(command, id);
         const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
         const logPath = `${uniqPath}/${logTime}.log`;
         res.setHeader('Content-type', 'application/octet-stream');
@@ -212,4 +226,43 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.put(
+    '/data/export',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        await systemService.exportData(res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/data/import',
+    upload.single('data'),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.importData();
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/log',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        await systemService.getSystemLog(res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
 };

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();
@@ -18,10 +17,12 @@ async function startServer() {
   const server = app
     .listen(config.port, () => {
       Logger.debug(`✌️ 后端服务启动成功！`);
+      console.debug(`✌️ 后端服务启动成功！`);
       process.send?.('ready');
     })
     .on('error', (err) => {
       Logger.error(err);
+      console.error(err);
       process.exit(1);
     });
 

back/config/index.ts

@@ -1,6 +1,6 @@
 import dotenv from 'dotenv';
 import path from 'path';
-import { createRandomString } from './util';
+import { createRandomString } from './share';
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
@@ -20,6 +20,8 @@ const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
 
 const dataPath = path.join(rootPath, 'data/');
+const shellPath = path.join(rootPath, 'shell/');
+const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
@@ -28,6 +30,7 @@ const logPath = path.join(dataPath, 'log/');
 const dbPath = path.join(dataPath, 'db/');
 const uploadPath = path.join(dataPath, 'upload/');
 const sshdPath = path.join(dataPath, 'ssh.d/');
+const systemLogPath = path.join(dataPath, 'syslog/');
 
 const envFile = path.join(configPath, 'env.sh');
 const confFile = path.join(configPath, 'config.sh');
@@ -42,6 +45,8 @@ const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
 const versionFile = path.join(rootPath, 'version.yaml');
+const dataTgzFile = path.join(tmpPath, 'data.tgz');
+const shareShellFile = path.join(shellPath, 'share.sh');
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");
@@ -59,6 +64,10 @@ export default {
     prefix: '/api',
   },
   rootPath,
+  tmpPath,
+  dataPath,
+  dataTgzFile,
+  shareShellFile,
   configString,
   loginFaild,
   authError,
@@ -102,4 +111,5 @@ export default {
   lastVersionFile,
   sqliteFile,
   sshdPath,
+  systemLogPath,
 };

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/share.ts

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

back/config/subscription.ts

@@ -34,9 +34,11 @@ export function formatCommand(doc: Subscription, url?: string) {
   if (type === 'file') {
     command += `raw "${_url}"`;
   } else {
-    command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${dependences || ''
-      }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}" "${isNil(autoAddCron) ? true : Boolean(autoAddCron)
-      }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
+    command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
+      dependences || ''
+    }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}" "${
+      isNil(autoAddCron) ? true : Boolean(autoAddCron)
+    }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
   }
   return command;
 }

back/config/util.ts

@@ -9,6 +9,9 @@ import { promisify } from 'util';
 import { load } from 'js-yaml';
 import config from './index';
 import { TASK_COMMAND } from './const';
+import Logger from '../loaders/logger';
+
+export * from './share';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -36,91 +39,6 @@ export function getLastModifyFilePath(dir: string) {
   return filePath;
 }
 
-export function createRandomString(min: number, max: number): string {
-  const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-  const english = [
-    'a',
-    'b',
-    'c',
-    'd',
-    'e',
-    'f',
-    'g',
-    'h',
-    'i',
-    'j',
-    'k',
-    'l',
-    'm',
-    'n',
-    'o',
-    'p',
-    'q',
-    'r',
-    's',
-    't',
-    'u',
-    'v',
-    'w',
-    'x',
-    'y',
-    'z',
-  ];
-  const ENGLISH = [
-    'A',
-    'B',
-    'C',
-    'D',
-    'E',
-    'F',
-    'G',
-    'H',
-    'I',
-    'J',
-    'K',
-    'L',
-    'M',
-    'N',
-    'O',
-    'P',
-    'Q',
-    'R',
-    'S',
-    'T',
-    'U',
-    'V',
-    'W',
-    'X',
-    'Y',
-    'Z',
-  ];
-  const special = ['-', '_'];
-  const config = num.concat(english).concat(ENGLISH).concat(special);
-
-  const arr = [];
-  arr.push(getOne(num));
-  arr.push(getOne(english));
-  arr.push(getOne(ENGLISH));
-  arr.push(getOne(special));
-
-  const len = min + Math.floor(Math.random() * (max - min + 1));
-
-  for (let i = 4; i < len; i++) {
-    arr.push(config[Math.floor(Math.random() * config.length)]);
-  }
-
-  const newArr = [];
-  for (let j = 0; j < len; j++) {
-    newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
-  }
-
-  function getOne(arr: any[]) {
-    return arr[Math.floor(Math.random() * arr.length)];
-  }
-
-  return newArr.join('');
-}
-
 export function getToken(req: any) {
   const { authorization = '' } = req.headers;
   if (authorization && authorization.split(' ')[0] === 'Bearer') {
@@ -166,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 })
@@ -307,22 +230,28 @@ interface IFile {
   type: 'directory' | 'file';
   parent: string;
   mtime: number;
+  size?: number;
   children?: IFile[];
 }
 
-export function dirSort(a: IFile, b: IFile) {
-  if (a.type !== b.type) return FileType[a.type] < FileType[b.type] ? -1 : 1;
-  else if (a.mtime !== b.mtime) return a.mtime > b.mtime ? -1 : 1;
+export function dirSort(a: IFile, b: IFile): number {
+  if (a.type !== b.type) {
+    return FileType[a.type] < FileType[b.type] ? -1 : 1
+  } else if (a.mtime !== b.mtime) {
+    return a.mtime > b.mtime ? -1 : 1
+  } else {
+    return 0;
+  }
 }
 
 export function readDirs(
   dir: string,
   baseDir: string = '',
   blacklist: string[] = [],
-) {
+): IFile[] {
   const relativePath = path.relative(baseDir, dir);
   const files = fs.readdirSync(dir);
-  const result: any = files
+  const result: IFile[] = files
     .filter((x) => !blacklist.includes(x))
     .map((file: string) => {
       const subPath = path.join(dir, file);
@@ -344,6 +273,7 @@ export function readDirs(
         isLeaf: true,
         key,
         parent: relativePath,
+        size: stats.size,
         mtime: stats.mtime.getTime(),
       };
     });
@@ -373,30 +303,40 @@ export function readDir(
   return result;
 }
 
-export function emptyDir(path: string) {
+export async function emptyDir(path: string) {
+  const pathExist = await fileExist(path);
+  if (!pathExist) {
+    return;
+  }
   const files = fs.readdirSync(path);
-  files.forEach((file) => {
+  for (const file of files) {
     const filePath = `${path}/${file}`;
     const stats = fs.statSync(filePath);
     if (stats.isDirectory()) {
-      emptyDir(filePath);
+      await emptyDir(filePath);
     } else {
       fs.unlinkSync(filePath);
     }
-  });
+  }
   fs.rmdirSync(path);
 }
 
-export function promiseExec(command: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    exec(
-      command,
-      { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
-      (err, stdout, stderr) => {
-        resolve(stdout || stderr || JSON.stringify(err));
-      },
-    );
-  });
+export async function promiseExec(command: string): Promise<string> {
+  try {
+    const { stderr, stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
+    return stdout || stderr;
+  } catch (error) {
+    return JSON.stringify(error);
+  }
+}
+
+export async function promiseExecSuccess(command: string): Promise<string> {
+  try {
+    const { stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
+    return stdout || '';
+  } catch (error) {
+    return '';
+  }
 }
 
 export function parseHeaders(headers: string) {
@@ -483,13 +423,13 @@ 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) {}
+    } catch (error) { }
   } else {
     process.kill(pid, 2);
   }
@@ -505,6 +445,7 @@ interface IVersion {
   version: string;
   changeLogLink: string;
   changeLog: string;
+  publishTime: string;
 }
 
 export async function parseVersion(path: string): Promise<IVersion> {
@@ -515,11 +456,8 @@ export async function parseContentVersion(content: string): Promise<IVersion> {
   return load(content) as IVersion;
 }
 
-export async function getUniqPath(command: string): Promise<string> {
-  const idStr = `cat ${config.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
-  let id = await promiseExec(idStr);
-
-  if (/^\d\d*\d$/.test(id)) {
+export async function getUniqPath(command: string, id: string): Promise<string> {
+  if (/^\d+$/.test(id)) {
     id = `_${id}`;
   } else {
     id = '';
@@ -551,3 +489,16 @@ export async function getUniqPath(command: string): Promise<string> {
 
   return `${str}${id}`;
 }
+
+export function safeJSONParse(value?: string) {
+  if (!value) {
+    return {};
+  }
+
+  try {
+    return JSON.parse(value);
+  } catch (error) {
+    Logger.error('[JSON.parse失败]', error)
+    return {};
+  }
+}

back/data/auth.ts

@@ -39,12 +39,14 @@ export interface LoginLogInfo {
   address?: string;
   ip?: string;
   platform?: string;
-  status?: LoginStatus,
+  status?: LoginStatus;
 }
 
-export type AuthModelInfo = SystemConfigInfo & Partial<NotificationInfo> & LoginLogInfo;
+export type AuthModelInfo = SystemConfigInfo &
+  Partial<NotificationInfo> &
+  LoginLogInfo;
 
-interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo { }
+export interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
 export const AuthModel = sequelize.define<AuthInstance>('Auth', {
   ip: DataTypes.STRING,
   type: DataTypes.STRING,

back/data/cron.ts

@@ -18,10 +18,13 @@ 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;
-    this.command = options.command;
+    this.command = options.command.trim();
     this.schedule = options.schedule;
     this.saved = options.saved;
     this.id = options.id;
@@ -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',
 }
 
-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/cronView.ts

@@ -39,7 +39,7 @@ export class CrontabView {
   }
 }
 
-interface CronViewInstance
+export interface CronViewInstance
   extends Model<CrontabView, CrontabView>,
     CrontabView {}
 export const CrontabViewModel = sequelize.define<CronViewInstance>(

back/data/dependence.ts

@@ -4,9 +4,9 @@ import { DataTypes, Model, ModelDefined } from 'sequelize';
 export class Dependence {
   timestamp?: string;
   id?: number;
-  status?: DependenceStatus;
-  type?: DependenceTypes;
-  name?: number;
+  status: DependenceStatus;
+  type: DependenceTypes;
+  name: string;
   log?: string[];
   remark?: string;
 
@@ -18,7 +18,7 @@ export class Dependence {
         : DependenceStatus.queued;
     this.type = options.type || DependenceTypes.nodejs;
     this.timestamp = new Date().toString();
-    this.name = options.name;
+    this.name = options.name.trim();
     this.log = options.log || [];
     this.remark = options.remark || '';
   }
@@ -42,17 +42,29 @@ export enum DependenceTypes {
 
 export enum InstallDependenceCommandTypes {
   'pnpm add -g',
-  'pip3 install',
-  'apk add',
+  'pip3 install --disable-pip-version-check --root-user-action=ignore',
+  'apk add --no-check-certificate',
+}
+
+export enum GetDependenceCommandTypes {
+  'pnpm ls -g ',
+  'pip3 show --disable-pip-version-check',
+  'apk info -es',
+}
+
+export enum versionDependenceCommandTypes {
+  '@',
+  '==',
+  '=',
 }
 
 export enum unInstallDependenceCommandTypes {
   'pnpm remove -g',
-  'pip3 uninstall -y',
+  'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
   'apk del',
 }
 
-interface DependenceInstance
+export interface DependenceInstance
   extends Model<Dependence, Dependence>,
     Dependence {}
 export const DependenceModel = sequelize.define<DependenceInstance>(

back/data/env.ts

@@ -34,7 +34,7 @@ export const initPosition = 4500000000000000;
 export const stepPosition = 10000000000;
 export const minPosition = 100;
 
-interface EnvInstance extends Model<Env, Env>, Env {}
+export interface EnvInstance extends Model<Env, Env>, Env {}
 export const EnvModel = sequelize.define<EnvInstance>('Env', {
   value: { type: DataTypes.STRING, unique: 'compositeIndex' },
   timestamp: DataTypes.STRING,

back/data/notify.ts

@@ -15,8 +15,10 @@ export enum NotificationMode {
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
   'email' = 'email',
+  'pushMe' = 'pushMe',
   'feishu' = 'feishu',
   'webhook' = 'webhook',
+  'chronocat' = 'Chronocat',
 }
 
 abstract class NotificationBaseInfo {
@@ -54,6 +56,8 @@ export class BarkNotification extends NotificationBaseInfo {
   public barkIcon = 'https://qn.whyour.cn/logo.png';
   public barkSound = '';
   public barkGroup = 'qinglong';
+  public barkLevel = 'active';
+  public barkUrl = '';
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -101,6 +105,16 @@ export class EmailNotification extends NotificationBaseInfo {
   public emailPass: string = '';
 }
 
+export class PushMeNotification extends NotificationBaseInfo {
+  public pushMeKey: string = '';
+}
+
+export class ChronocatNotification extends NotificationBaseInfo {
+  public chronocatURL: string = '';
+  public chronocatQQ: string = '';
+  public chronocatToekn: string = '';
+}
+
 export class WebhookNotification extends NotificationBaseInfo {
   public webhookHeaders: string = '';
   public webhookBody: string = '';
@@ -131,5 +145,8 @@ export interface NotificationInfo
     IGotNotification,
     PushPlusNotification,
     EmailNotification,
+    PushMeNotification,
     WebhookNotification,
+    ChronocatNotification,
     LarkNotification {}
+    

back/data/open.ts

@@ -26,7 +26,7 @@ export interface AppToken {
 
 export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs';
 
-interface AppInstance extends Model<App, App>, App {}
+export interface AppInstance extends Model<App, App>, App {}
 export const AppModel = sequelize.define<AppInstance>('App', {
   name: { type: DataTypes.STRING, unique: 'name' },
   scopes: DataTypes.JSON,

back/data/sock.ts

@@ -16,4 +16,5 @@ export type SockMessageType =
   | 'uninstallDependence'
   | 'updateSystemVersion'
   | 'manuallyRunScript'
-  | 'runSubscriptionEnd';
+  | 'runSubscriptionEnd'
+  | 'reloadSystem';

back/data/subscription.ts

@@ -70,7 +70,7 @@ export enum SubscriptionStatus {
   'queued',
 }
 
-interface SubscriptionInstance
+export interface SubscriptionInstance
   extends Model<Subscription, Subscription>,
     Subscription {}
 export const SubscriptionModel = sequelize.define<SubscriptionInstance>(

back/index.d.ts

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

back/loaders/app.ts

@@ -7,18 +7,28 @@ import linkDeps from './deps';
 import initTask from './initTask';
 
 export default async ({ expressApp }: { expressApp: Application }) => {
-  await depInjectorLoader();
-  Logger.info('✌️ Dependency Injector loaded');
-
-  await expressLoader({ app: expressApp });
-  Logger.info('✌️ Express loaded');
-
-  await initData();
-  Logger.info('✌️ init data loaded');
-
-  await linkDeps();
-  Logger.info('✌️ link deps loaded');
-
-  initTask();
-  Logger.info('✌️ init task loaded');
+  try {
+    depInjectorLoader();
+    Logger.info('✌️ Dependency Injector loaded');
+    console.log('✌️ Dependency Injector loaded');
+  
+    expressLoader({ app: expressApp });
+    Logger.info('✌️ Express loaded');
+    console.log('✌️ Express loaded');
+  
+    await initData();
+    Logger.info('✌️ init data loaded');
+    console.log('✌️ init data loaded');
+  
+    await linkDeps();
+    Logger.info('✌️ link deps loaded');
+    console.log('✌️ link deps loaded');
+  
+    initTask();
+    Logger.info('✌️ init task loaded');
+    console.log('✌️ init task loaded');
+  } catch (error) {
+    Logger.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`);
+    console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`);
+  }
 };

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');
@@ -122,9 +131,10 @@ export default async () => {
       });
     }
 
+    console.log('✌️ DB loaded');
     Logger.info('✌️ DB loaded');
   } catch (error) {
-    Logger.info('✌️ DB load failed');
-    Logger.info(error);
+    console.error('✌️ DB load failed');
+    Logger.error(error);
   }
 };

back/loaders/deps.ts

@@ -37,7 +37,7 @@ async function linkCommand() {
     if (fs.existsSync(target)) {
       fs.unlinkSync(target);
     }
-    fs.symlink(source, target, (err) => {});
+    fs.symlink(source, target, (err) => { });
   }
 }
 

back/loaders/express.ts

@@ -5,7 +5,7 @@ import routes from '../api';
 import config from '../config';
 import jwt, { UnauthorizedError } from 'express-jwt';
 import fs from 'fs';
-import { getPlatform, getToken } from '../config/util';
+import { getPlatform, getToken, safeJSONParse } from '../config/util';
 import Container from 'typedi';
 import OpenService from '../services/open';
 import rewrite from 'express-urlrewrite';
@@ -15,6 +15,7 @@ import { EnvModel } from '../data/env';
 import { errors } from 'celebrate';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { serveEnv } from '../config/serverEnv';
+import Logger from './logger';
 
 export default ({ app }: { app: Application }) => {
   app.enable('trust proxy');
@@ -25,9 +26,10 @@ export default ({ app }: { app: Application }) => {
   app.use(
     '/api/public',
     createProxyMiddleware({
-      target: `http://localhost:${config.publicPort}/api`,
+      target: `http://0.0.0.0:${config.publicPort}/api`,
       changeOrigin: true,
       pathRewrite: { '/api/public': '' },
+      logProvider: () => Logger
     }),
   );
 
@@ -36,7 +38,7 @@ export default ({ app }: { app: Application }) => {
 
   app.use(
     jwt({
-      secret: config.secret as string,
+      secret: config.secret,
       algorithms: ['HS384'],
     }).unless({
       path: [...config.apiWhiteList, /^\/open\//],
@@ -83,7 +85,7 @@ export default ({ app }: { app: Application }) => {
 
     const data = fs.readFileSync(config.authConfigFile, 'utf8');
     if (data && headerToken) {
-      const { token = '', tokens = {} } = JSON.parse(data);
+      const { token = '', tokens = {} } = safeJSONParse(data);
       if (headerToken === token || tokens[req.platform] === headerToken) {
         return next();
       }

back/loaders/initData.ts

@@ -30,15 +30,15 @@ export default async () => {
   });
 
   // 初始化更新所有任务状态为空闲
-  await CrontabModel.update(
-    { status: CrontabStatus.idle },
-    { where: {} },
-  );
+  await CrontabModel.update({ status: CrontabStatus.idle }, { where: {} });
 
   // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
   DependenceModel.findAll({
     where: {},
-    order: [['type', 'DESC']],
+    order: [
+      ['type', 'DESC'],
+      ['createdAt', 'DESC'],
+    ],
     raw: true,
   }).then(async (docs) => {
     await DependenceModel.update(

back/loaders/initFile.ts

@@ -5,7 +5,7 @@ import dotenv from 'dotenv';
 import Logger from './logger';
 import { fileExist } from '../config/util';
 
-const rootPath = process.env.QL_DIR as string;;
+const rootPath = process.env.QL_DIR as string;
 const dataPath = path.join(rootPath, 'data/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
@@ -28,6 +28,7 @@ const TaskAfterFile = path.join(configPath, 'task_after.sh');
 const homedir = os.homedir();
 const sshPath = path.resolve(homedir, '.ssh');
 const sshdPath = path.join(dataPath, 'ssh.d');
+const systemLogPath = path.join(dataPath, 'syslog');
 
 export default async () => {
   const authFileExist = await fileExist(authConfigFile);
@@ -39,6 +40,7 @@ export default async () => {
   const sshDirExist = await fileExist(sshPath);
   const bakDirExist = await fileExist(bakPath);
   const sshdDirExist = await fileExist(sshdPath);
+  const systemLogDirExist = await fileExist(systemLogPath);
   const tmpDirExist = await fileExist(tmpPath);
   const scriptNotifyJsFileExist = await fileExist(scriptNotifyJsFile);
   const scriptNotifyPyFileExist = await fileExist(scriptNotifyPyFile);
@@ -77,6 +79,10 @@ export default async () => {
     fs.mkdirSync(sshdPath);
   }
 
+  if (!systemLogDirExist) {
+    fs.mkdirSync(systemLogPath);
+  }
+
   // 初始化文件
   if (!authFileExist) {
     fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
@@ -105,4 +111,5 @@ export default async () => {
   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,
@@ -30,15 +30,15 @@ export default async () => {
 
   // 运行删除日志任务
   const data = await systemService.getSystemConfig();
-  if (data && data.info && data.info.frequency) {
+  if (data && data.info && data.info.logRemoveFrequency) {
     const rmlogCron = {
-      id: data.id,
+      id: data.id as number,
       name: '删除日志',
-      command: `ql rmlog ${data.info.frequency}`,
+      command: `ql rmlog ${data.info.logRemoveFrequency}`,
     };
     await scheduleService.cancelIntervalTask(rmlogCron);
     scheduleService.createIntervalTask(rmlogCron, {
-      days: data.info.frequency,
+      days: data.info.logRemoveFrequency,
     });
   }
 

back/loaders/logger.ts

@@ -1,32 +1,38 @@
 import winston from 'winston';
+import 'winston-daily-rotate-file';
 import config from '../config';
+import path from 'path';
 
-const transports = [];
-if (process.env.NODE_ENV !== 'development') {
-  transports.push(new winston.transports.Console());
-} else {
-  transports.push(
-    new winston.transports.Console({
-      format: winston.format.combine(
-        winston.format.cli(),
-        winston.format.splat(),
-      ),
-    }),
-  );
+const levelMap: Record<string, string> = {
+  info: '🔵',
+  warn: '🟡',
+  error: '🔴',
+  debug: '🔶'
 }
 
+const customFormat = winston.format.combine(
+  winston.format.splat(),
+  winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
+  winston.format.align(),
+  winston.format.printf((i) => `[${levelMap[i.level]}${i.level}] [${[i.timestamp]}]: ${i.message}`),
+);
+
+const defaultOptions = {
+  format: customFormat,
+  datePattern: "YYYY-MM-DD",
+  maxSize: "20m",
+  maxFiles: "7d",
+};
+
 const LoggerInstance = winston.createLogger({
   level: config.logs.level,
   levels: winston.config.npm.levels,
-  format: winston.format.combine(
-    winston.format.timestamp({
-      format: 'YYYY-MM-DD HH:mm:ss',
-    }),
-    winston.format.errors({ stack: true }),
-    winston.format.splat(),
-    winston.format.json(),
-  ),
-  transports,
+  transports: [
+    new winston.transports.DailyRotateFile({
+      filename: path.join(config.systemLogPath, '%DATE%.log'),
+      ...defaultOptions,
+    })
+  ],
 });
 
 export default LoggerInstance;

back/loaders/sentry.ts

@@ -29,4 +29,5 @@ export default async ({ expressApp }: { expressApp: Application }) => {
   expressApp.use(Sentry.Handlers.tracingHandler());
 
   Logger.info('✌️ Sentry loaded');
+  console.log('✌️ Sentry loaded');
 };

back/loaders/server.ts

@@ -5,18 +5,34 @@ import Sock from './sock';
 export default async ({ server }: { server: Server }) => {
   await Sock({ server });
   Logger.info('✌️ Sock loaded');
+  let exitTime = 0;
+  let timer: NodeJS.Timeout;
 
-  process.on('SIGINT', () => {
-    Logger.info('✌️ Server need close');
-    server.close(() => {
-      setTimeout(() => {
-        process.exit();
-      }, 10000);
-    });
-
-    setTimeout(() => {
-      console.log('Forcing server close !!!');
+  process.on('SIGINT', (singal) => {
+    Logger.warn(`Server need close, singal ${singal}`);
+    console.warn(`Server need close, singal ${singal}`);
+    exitTime++;
+    if (exitTime >= 3) {
+      Logger.warn('Forcing server close');
+      console.warn('Forcing server close');
+      clearTimeout(timer);
       process.exit(1);
-    }, 15000);
+    }
+    server.close(() => {
+      if (timer) {
+        clearTimeout(timer);
+      }
+      timer = setTimeout(() => {
+        process.exit();
+      }, 15000);
+    });
+  });
+
+  process.on('uncaughtException', (error) => {
+    Logger.error('Uncaught exception:', error);
+  });
+
+  process.on('unhandledRejection', (reason, promise) => {
+    Logger.error('Unhandled rejection:', reason, promise);
   });
 };

back/loaders/sock.ts

@@ -5,7 +5,7 @@ import { Container } from 'typedi';
 import SockService from '../services/sock';
 import config from '../config/index';
 import fs from 'fs';
-import { getPlatform } from '../config/util';
+import { getPlatform, safeJSONParse } from '../config/util';
 
 export default async ({ server }: { server: Server }) => {
   const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
@@ -20,7 +20,7 @@ export default async ({ server }: { server: Server }) => {
     const platform = getPlatform(conn.headers['user-agent'] || '') || 'desktop';
     const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
     if (data) {
-      const { token = '', tokens = {} } = JSON.parse(data);
+      const { token = '', tokens = {} } = safeJSONParse(data);
       if (headerToken === token || tokens[platform] === headerToken) {
         conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
         sockService.addClient(conn);

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/public.ts

@@ -6,14 +6,14 @@ import { credentials } from '@grpc/grpc-js';
 
 const app = express();
 const client = new HealthClient(
-  `localhost:${config.cronPort}`,
+  `0.0.0.0:${config.cronPort}`,
   credentials.createInsecure(),
 );
 
 app.get('/api/health', (req, res) => {
   client.check({ service: 'cron' }, (err, response) => {
     if (err) {
-      return res.status(500).send({ code: 500, error: err });
+      return res.status(200).send({ code: 500, error: err });
     }
     return res.status(200).send({ code: 200, data: response });
   });
@@ -25,9 +25,11 @@ app
     await require('./loaders/db').default();
 
     Logger.debug(`✌️ 公共服务启动成功！`);
+    console.debug(`✌️ 公共服务启动成功！`);
     process.send?.('ready');
   })
   .on('error', (err) => {
     Logger.error(err);
+    console.error(err);
     process.exit(1);
   });

back/schedule/addCron.ts

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

back/schedule/client.ts

@@ -10,7 +10,7 @@ import config from '../config';
 
 class Client {
   private client = new CronClient(
-    `localhost:${config.cronPort}`,
+    `0.0.0.0:${config.cronPort}`,
     credentials.createInsecure(),
   );
 

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

@@ -1,6 +1,7 @@
 import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
 import { DeleteCronRequest, DeleteCronResponse } from '../protos/cron';
 import { scheduleStacks } from './data';
+import Logger from '../loaders/logger';
 
 const delCron = (
   call: ServerUnaryCall<DeleteCronRequest, DeleteCronResponse>,
@@ -8,7 +9,11 @@ const delCron = (
 ) => {
   for (const id of call.request.ids) {
     if (scheduleStacks.has(id)) {
-      scheduleStacks.get(id)?.cancel();
+      Logger.info(
+        '[schedule][取消定时任务], 任务ID: %s',
+        id,
+      );
+      scheduleStacks.get(id)?.forEach(x => x.cancel());
       scheduleStacks.delete(id);
     }
   }

back/schedule/health.ts

@@ -10,7 +10,7 @@ const check = async (
   switch (call.request.service) {
     case 'cron':
       const res = await promiseExec(
-        `curl -s http://localhost:${config.port}/api/system`,
+        `curl -s http://0.0.0.0:${config.port}/api/system`,
       );
 
       if (res.includes('200')) {
@@ -24,7 +24,7 @@ const check = async (
         `tail -n 300 ~/.pm2/logs/schedule-error.log`,
       );
       return callback(
-        new Error(`${scheduleErrLog || ''}\n${panelErrLog || ''}\n${res}`),
+        new Error(`${scheduleErrLog || ''}\n${panelErrLog || ''}\n${res}`.trim()),
       );
 
     default:

back/schedule/index.ts

@@ -11,7 +11,7 @@ const server = new Server();
 server.addService(HealthService, { check });
 server.addService(CronService, { addCron, delCron });
 server.bindAsync(
-  `localhost:${config.cronPort}`,
+  `0.0.0.0:${config.cronPort}`,
   ServerCredentials.createInsecure(),
   (err, port) => {
     if (err) {
@@ -19,6 +19,7 @@ server.bindAsync(
     }
     server.start();
     Logger.debug(`✌️ 定时服务启动成功！`);
+    console.debug(`✌️ 定时服务启动成功！`);
     process.send?.('ready');
   },
 );

back/services/cron.ts

@@ -5,11 +5,7 @@ import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import { exec, execSync } from 'child_process';
 import fs from 'fs';
 import cron_parser from 'cron-parser';
-import {
-  getFileContentByName,
-  fileExist,
-  killTask,
-} from '../config/util';
+import { getFileContentByName, fileExist, killTask, getUniqPath, safeJSONParse } from '../config/util';
 import { promises, existsSync } from 'fs';
 import { Op, where, col as colFn, FindOptions, fn } from 'sequelize';
 import path from 'path';
@@ -17,6 +13,9 @@ import { TASK_PREFIX, QL_PREFIX } from '../config/const';
 import cronClient from '../schedule/client';
 import taskLimit from '../shared/pLimit';
 import { spawn } from 'cross-spawn';
+import dayjs from 'dayjs';
+import pickBy from 'lodash/pickBy';
+import omit from 'lodash/omit';
 
 @Service()
 export default class CronService {
@@ -24,7 +23,7 @@ export default class CronService {
 
   private isSixCron(cron: Crontab) {
     const { schedule } = cron;
-    if (schedule?.split(/ +/).length === 6) {
+    if (Number(schedule?.split(/ +/).length) > 5) {
       return true;
     }
     return false;
@@ -34,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();
@@ -55,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 || []
         },
       ]);
     }
@@ -91,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,
@@ -101,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[]) {
@@ -165,7 +172,7 @@ export default class CronService {
           case 'In':
             q[Op.or] = [
               {
-                [property]: value,
+                [property]: Array.isArray(value) ? value : [value],
               },
               property === 'status' && value.includes(2)
                 ? { isDisabled: 1 }
@@ -176,7 +183,7 @@ export default class CronService {
             q[Op.and] = [
               {
                 [property]: {
-                  [Op.notIn]: value,
+                  [Op.notIn]: Array.isArray(value) ? value : [value],
                 },
               },
               property === 'status' && value.includes(2)
@@ -312,9 +319,9 @@ export default class CronService {
     const searchText = params?.searchValue;
     const page = Number(params?.page || '0');
     const size = Number(params?.size || '0');
-    const viewQuery = JSON.parse(params?.queryString || '{}');
-    const filterQuery = JSON.parse(params?.filters || '{}');
-    const sorterQuery = JSON.parse(params?.sorter || '{}');
+    const viewQuery = safeJSONParse(params?.queryString);
+    const filterQuery = safeJSONParse(params?.filters);
+    const sorterQuery = safeJSONParse(params?.sorter);
 
     let query: any = {};
     let order = [
@@ -374,7 +381,7 @@ export default class CronService {
         try {
           await killTask(doc.pid);
         } catch (error) {
-          this.logger.silly(error);
+          this.logger.error(error);
         }
       }
     }
@@ -385,65 +392,47 @@ 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 absolutePath = path.resolve(config.logPath, `${log_path}`);
-        const logFileExist = log_path && (await fileExist(absolutePath));
-
-        this.logger.silly('Running job');
-        this.logger.silly('ID: ' + id);
-        this.logger.silly('Original command: ' + command);
-
-        let cmdStr = command;
-        if (!cmdStr.startsWith(TASK_PREFIX) && !cmdStr.startsWith(QL_PREFIX)) {
-          cmdStr = `${TASK_PREFIX}${cmdStr}`;
-        }
-        if (
-          cmdStr.endsWith('.js') ||
-          cmdStr.endsWith('.py') ||
-          cmdStr.endsWith('.pyc') ||
-          cmdStr.endsWith('.sh') ||
-          cmdStr.endsWith('.ts')
-        ) {
-          cmdStr = `${cmdStr} now`;
+        const uniqPath = await getUniqPath(command, `${id}`);
+        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
+        const logDirPath = path.resolve(config.logPath, `${uniqPath}`);
+        if (log_path?.split('/')?.every(x => x !== uniqPath)) {
+          fs.mkdirSync(logDirPath, { recursive: true });
         }
+        const logPath = `${uniqPath}/${logTime}.log`;
+        const absolutePath = path.resolve(config.logPath, `${logPath}`);
 
-        const cp = spawn(`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 },
+          { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
           { where: { id } },
         );
         cp.stderr.on('data', (data) => {
-          if (logFileExist) {
-            fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
-          }
+          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
         });
         cp.on('error', (err) => {
-          if (logFileExist) {
-            fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
-          }
+          fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
         });
 
-        cp.on('exit', async (code, signal) => {
-          this.logger.info(
-            `任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`,
-          );
-        });
-        cp.on('close', async (code) => {
+        cp.on('exit', async (code) => {
           await CrontabModel.update(
             { status: CrontabStatus.idle, pid: undefined },
             { where: { id } },
           );
-          resolve();
+          resolve({ ...params, pid: cp.pid, code });
         });
       });
     });
@@ -461,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();
@@ -506,14 +497,22 @@ export default class CronService {
     }
   }
 
-  private make_command(tab: Crontab) {
-    if (
-      !tab.command.startsWith(TASK_PREFIX) &&
-      !tab.command.startsWith(QL_PREFIX)
-    ) {
-      tab.command = `${TASK_PREFIX}${tab.command}`;
+  private makeCommand(tab: Crontab) {
+    let command = tab.command.trim();
+    if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
+      command = `${TASK_PREFIX}${tab.command}`;
     }
-    const crontab_job_string = `ID=${tab.id} ${tab.command}`;
+    let commandVariable = `no_tee=true ID=${tab.id} `
+    if (tab.task_before) {
+      commandVariable += `task_before='${tab.task_before.replace(/'/g, "'\\''")
+        .trim()}' `;
+    }
+    if (tab.task_after) {
+      commandVariable += `task_after='${tab.task_after.replace(/'/g, "'\\''")
+        .trim()}' `;
+    }
+
+    const crontab_job_string = `${commandVariable}${command}`;
     return crontab_job_string;
   }
 
@@ -522,21 +521,20 @@ 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';
       }
     });
 
-    this.logger.silly(crontab_string);
     fs.writeFileSync(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);
@@ -584,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/cronView.ts

@@ -32,7 +32,7 @@ export default class CronViewService {
   }
 
   public async update(payload: CrontabView): Promise<CrontabView> {
-    const doc = await this.getDb({ id: payload.id })
+    const doc = await this.getDb({ id: payload.id });
     const tab = new CrontabView({ ...doc, ...payload });
     const newDoc = await this.updateDb(tab);
     return newDoc;
@@ -59,7 +59,9 @@ export default class CronViewService {
     }
   }
 
-  public async getDb(query: FindOptions<CrontabView>['where']): Promise<CrontabView> {
+  public async getDb(
+    query: FindOptions<CrontabView>['where'],
+  ): Promise<CrontabView> {
     const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as CrontabView);
   }

back/services/dependence.ts

@@ -8,11 +8,13 @@ import {
   DependenceTypes,
   unInstallDependenceCommandTypes,
   DependenceModel,
+  GetDependenceCommandTypes,
+  versionDependenceCommandTypes,
 } from '../data/dependence';
 import { spawn } from 'cross-spawn';
 import SockService from './sock';
 import { FindOptions, Op } from 'sequelize';
-import { concurrentRun } from '../config/util';
+import { promiseExecSuccess } from '../config/util';
 import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';
 
@@ -21,7 +23,7 @@ export default class DependenceService {
   constructor(
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
-  ) { }
+  ) {}
 
   public async create(payloads: Dependence[]): Promise<Dependence[]> {
     const tabs = payloads.map((x) => {
@@ -137,9 +139,17 @@ export default class DependenceService {
   }
 
   private async updateLog(ids: number[], log: string): Promise<void> {
-    const doc = await DependenceModel.findOne({ where: { id: ids } });
-    const newLog = doc?.log ? [...doc.log, log] : [log];
-    await DependenceModel.update({ log: newLog }, { where: { id: ids } });
+    taskLimit.updateDepLog(async () => {
+      const docs = await DependenceModel.findAll({ where: { id: ids } });
+      for (const doc of docs) {
+        const newLog = doc?.log ? [...doc.log, log] : [log];
+        await DependenceModel.update(
+          { log: newLog },
+          { where: { id: doc.id } },
+        );
+      }
+      return null;
+    });
   }
 
   public installOrUninstallDependency(
@@ -155,15 +165,15 @@ export default class DependenceService {
           : DependenceStatus.removing;
         await DependenceModel.update({ status }, { where: { id: depIds } });
 
-        const socketMessageType = !force
+        const socketMessageType = isInstall
           ? 'installDependence'
           : 'uninstallDependence';
-        const depName = dependency.name;
+        let depName = dependency.name.trim();
         const depRunCommand = (
           isInstall
             ? InstallDependenceCommandTypes
             : unInstallDependenceCommandTypes
-        )[dependency.type as any];
+        )[dependency.type];
         const actionText = isInstall ? '安装' : '删除';
         const startTime = dayjs();
 
@@ -175,9 +185,64 @@ export default class DependenceService {
           message,
           references: depIds,
         });
-        await this.updateLog(depIds, message);
+        this.updateLog(depIds, message);
 
-        const cp = spawn(`${depRunCommand} ${depName}`, {
+        // 判断是否已经安装过依赖
+        if (isInstall) {
+          const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
+          const depVersionStr = versionDependenceCommandTypes[dependency.type];
+          let depVersion = '';
+          if (depName.includes(depVersionStr)) {
+            const symbolRegx = new RegExp(
+              `(.*)${depVersionStr}([0-9\\.\\-\\+a-zA-Z]*)`,
+            );
+            const [, _depName, _depVersion] = depName.match(symbolRegx) || [];
+            if (_depVersion && _depName) {
+              depName = _depName;
+              depVersion = _depVersion;
+            }
+          }
+          const isNodeDependence = dependency.type === DependenceTypes.nodejs;
+          const isLinuxDependence = dependency.type === DependenceTypes.linux;
+          const isPythonDependence =
+            dependency.type === DependenceTypes.python3;
+          const depInfo = (
+            await promiseExecSuccess(
+              isNodeDependence
+                ? `${getCommandPrefix} | grep "${depName}" | head -1`
+                : `${getCommandPrefix} ${depName}`,
+            )
+          )
+            .replace(/\s{2,}/, ' ')
+            .replace(/\s+$/, '');
+
+          if (
+            depInfo &&
+            ((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
+              (isLinuxDependence &&
+                depInfo.toLocaleLowerCase().includes('installed')) ||
+              isPythonDependence) &&
+            (!depVersion || depInfo.includes(depVersion))
+          ) {
+            const endTime = dayjs();
+            const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
+              'YYYY-MM-DD HH:mm:ss',
+            )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+            this.sockService.sendMessage({
+              type: socketMessageType,
+              message: _message,
+              references: depIds,
+            });
+            this.updateLog(depIds, _message);
+            await DependenceModel.update(
+              { status: DependenceStatus.installed },
+              { where: { id: depIds } },
+            );
+            return resolve(null);
+          }
+        }
+
+        const cp = spawn(`${depRunCommand} ${dependency.name.trim()}`, {
           shell: '/bin/bash',
         });
 
@@ -187,7 +252,7 @@ export default class DependenceService {
             message: data.toString(),
             references: depIds,
           });
-          await this.updateLog(depIds, data.toString());
+          this.updateLog(depIds, data.toString());
         });
 
         cp.stderr.on('data', async (data) => {
@@ -196,7 +261,7 @@ export default class DependenceService {
             message: data.toString(),
             references: depIds,
           });
-          await this.updateLog(depIds, data.toString());
+          this.updateLog(depIds, data.toString());
         });
 
         cp.on('error', async (err) => {
@@ -205,10 +270,10 @@ export default class DependenceService {
             message: JSON.stringify(err),
             references: depIds,
           });
-          await this.updateLog(depIds, JSON.stringify(err));
+          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 ? '成功' : '失败';
@@ -221,7 +286,7 @@ export default class DependenceService {
             message,
             references: depIds,
           });
-          await this.updateLog(depIds, message);
+          this.updateLog(depIds, message);
 
           let status = null;
           if (isSucceed) {

back/services/env.ts

@@ -202,11 +202,9 @@ export default class EnvService {
           let value = group
             .map((x) => x.value)
             .join('&')
-            .replace(/(\\)[^n]/g, '\\\\')
-            .replace(/(\\$)/, '\\\\')
-            .replace(/"/g, '\\"')
+            .replace(/'/g, "'\\''")
             .trim();
-          env_string += `export ${key}="${value}"\n`;
+          env_string += `export ${key}='${value}'\n`;
         }
       }
     }

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 {
@@ -28,8 +28,10 @@ export default class NotificationService {
     ['iGot', this.iGot],
     ['pushPlus', this.pushPlus],
     ['email', this.email],
+    ['pushMe', this.pushMe],
     ['webhook', this.webhook],
     ['lark', this.lark],
+    ['chronocat', this.chronocat],
   ]);
 
   private title = '';
@@ -194,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}`;
     }
@@ -202,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
@@ -303,7 +306,8 @@ export default class NotificationService {
   }
 
   private async weWorkBot() {
-    const { weWorkBotKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } = this.params;
+    const { weWorkBotKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } =
+      this.params;
     const url = `${weWorkOrigin}/cgi-bin/webhook/send?key=${weWorkBotKey}`;
     try {
       const res: any = await got
@@ -328,7 +332,8 @@ export default class NotificationService {
   }
 
   private async weWorkApp() {
-    const { weWorkAppKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } = this.params;
+    const { weWorkAppKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } =
+      this.params;
     const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] =
       weWorkAppKey.split(',');
     const url = `${weWorkOrigin}/cgi-bin/gettoken`;
@@ -561,6 +566,87 @@ export default class NotificationService {
     }
   }
 
+  private async pushMe() {
+    const { pushMeKey } = this.params;
+    try {
+      const res: any = await got.post(
+        `https://push.i-i.me/?push_key=${pushMeKey}`,
+        {
+          ...this.gotOption,
+          json: {
+            title: this.title,
+            content: this.content,
+          },
+          headers: { 'Content-Type': 'application/json' },
+        },
+      );
+      if (res.body === 'success') {
+        return true;
+      } else {
+        throw new Error(res.body);
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
+  private async chronocat() {
+    const { chronocatURL, chronocatQQ, chronocatToekn } = this.params;
+    try {
+      const user_ids = chronocatQQ
+        .match(/user_id=(\d+)/g)
+        ?.map((match: any) => match.split('=')[1]);
+      const group_ids = chronocatQQ
+        .match(/group_id=(\d+)/g)
+        ?.map((match: any) => match.split('=')[1]);
+
+      const url = `${chronocatURL}/api/message/send`;
+      const headers = {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${chronocatToekn}`,
+      };
+
+      for (const [chat_type, ids] of [
+        [1, user_ids],
+        [2, group_ids],
+      ]) {
+        if (!ids) {
+          continue;
+        }
+        let _ids: any = ids;
+        for (const chat_id of _ids) {
+          const data = {
+            peer: {
+              chatType: chat_type,
+              peerUin: chat_id,
+            },
+            elements: [
+              {
+                elementType: 1,
+                textElement: {
+                  content: `${this.title}\n\n${this.content}`,
+                },
+              },
+            ],
+          };
+          const res: any = await got.post(url, {
+            ...this.gotOption,
+            json: data,
+            headers,
+          });
+          if (res.body === 'success') {
+            return true;
+          } else {
+            throw new Error(res.body);
+          }
+        }
+      }
+      return false;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
   private async webhook() {
     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;
@@ -47,10 +47,17 @@ export default class ScheduleService {
   async runTask(
     command: string,
     callbacks: TaskCallbacks = {},
+    params: {
+      schedule?: string;
+      name?: string;
+      command?: string;
+    },
     completionTime: 'start' | 'end' = 'end',
   ) {
-    return taskLimit.runWithCpuLimit(() => {
+    return taskLimit.runWithCronLimit(() => {
       return new Promise(async (resolve, reject) => {
+        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify({ ...params, command })}`);
+
         try {
           const startTime = dayjs();
           await callbacks.onBefore?.(startTime);
@@ -66,9 +73,8 @@ export default class ScheduleService {
 
           cp.stderr.on('data', async (data) => {
             this.logger.info(
-              '[执行任务失败] %s，时间：%s, 错误信息：%j',
+              '[panel][执行任务失败] 命令: %s, 错误信息: %j',
               command,
-              new Date().toLocaleString(),
               data.toString(),
             );
             await callbacks.onError?.(data.toString());
@@ -76,40 +82,32 @@ export default class ScheduleService {
 
           cp.on('error', async (err) => {
             this.logger.error(
-              '[创建任务失败] %s，时间：%s, 错误信息：%j',
+              '[panel][创建任务失败] 命令: %s, 错误信息: %j',
               command,
-              new Date().toLocaleString(),
               err,
             );
             await callbacks.onError?.(JSON.stringify(err));
           });
 
-          cp.on('exit', async (code, signal) => {
-            this.logger.info(
-              `[任务退出] ${command} 进程id: ${cp.pid}，退出码 ${code}`,
-            );
-          });
-
-          cp.on('close', async (code) => {
+          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) {
-          await this.logger.error(
-            '执行任务%s失败，时间：%s, 错误信息：%j',
+          this.logger.error(
+            '[panel][执行任务失败] 命令: %s, 错误信息: %j',
             command,
-            new Date().toLocaleString(),
             error,
           );
           await callbacks.onError?.(JSON.stringify(error));
         }
       });
-    })
+    });
   }
 
   async createCronTask(
@@ -119,7 +117,7 @@ export default class ScheduleService {
   ) {
     const _id = this.formatId(id);
     this.logger.info(
-      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
+      '[panel][创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s',
       _id,
       schedule,
       name,
@@ -129,18 +127,26 @@ 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,
+      });
     }
   }
 
   async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
-    this.logger.info('[取消定时任务]，任务名：%s', name);
+    this.logger.info('[panel][取消定时任务], 任务名: %s', name);
     if (this.scheduleStacks.has(_id)) {
       this.scheduleStacks.get(_id)?.cancel();
       this.scheduleStacks.delete(_id);
@@ -155,7 +161,7 @@ export default class ScheduleService {
   ) {
     const _id = this.formatId(id);
     this.logger.info(
-      '[创建interval任务]，任务ID: %s，任务名: %s，执行命令: %s',
+      '[panel][创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s',
       _id,
       name,
       command,
@@ -163,13 +169,15 @@ export default class ScheduleService {
     const task = new Task(
       name,
       () => {
-        this.runTask(command, callbacks);
+        this.runTask(command, callbacks, {
+          name,
+          command,
+        });
       },
       (err) => {
         this.logger.error(
-          '执行任务%s失败，时间：%s, 错误信息：%j',
+          '[执行任务失败] 命令: %s, 错误信息: %j',
           command,
-          new Date().toLocaleString(),
           err,
         );
       },
@@ -184,13 +192,16 @@ export default class ScheduleService {
     this.intervalSchedule.addIntervalJob(job);
 
     if (runImmediately) {
-      this.runTask(command, callbacks);
+      this.runTask(command, callbacks, {
+        name,
+        command,
+      });
     }
   }
 
   async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
-    this.logger.info('[取消interval任务]，任务ID: %s，任务名：%s', _id, name);
+    this.logger.info('[取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
     this.intervalSchedule.removeById(_id);
   }
 

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

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/sshKey.ts

@@ -58,7 +58,7 @@ export default class SshKeyService {
 
   private generateSingleSshConfig(alias: string, host: string, proxy?: string) {
     if (host === 'github.com') {
-      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa\n    PubkeyAcceptedAlgorithms +ssh-rsa`;
+      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa`;
     }
     const proxyStr = proxy
       ? `    ProxyCommand nc -v -x ${proxy} %h %p 2>/dev/null\n`

back/services/subscription.ts

@@ -16,10 +16,11 @@ import {
   killTask,
   handleLogPath,
   promiseExec,
+  emptyDir,
 } from '../config/util';
 import { promises, existsSync } from 'fs';
 import { FindOptions, Op } from 'sequelize';
-import path from 'path';
+import path, { join } from 'path';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import { SimpleIntervalSchedule } from 'toad-scheduler';
 import SockService from './sock';
@@ -27,6 +28,8 @@ import SshKeyService from './sshKey';
 import dayjs from 'dayjs';
 import { LOG_END_SYMBOL } from '../config/const';
 import { formatCommand, formatUrl } from '../config/subscription';
+import { CrontabModel } from '../data/cron';
+import CrontabService from './cron';
 
 @Service()
 export default class SubscriptionService {
@@ -35,7 +38,8 @@ export default class SubscriptionService {
     private scheduleService: ScheduleService,
     private sockService: SockService,
     private sshKeyService: SshKeyService,
-  ) {}
+    private crontabService: CrontabService,
+  ) { }
 
   public async list(searchText?: string): Promise<Subscription[]> {
     let query = {};
@@ -253,13 +257,24 @@ export default class SubscriptionService {
     );
   }
 
-  public async remove(ids: number[]) {
+  public async remove(ids: number[], query: any) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       await this.handleTask(doc, false);
     }
     await SubscriptionModel.destroy({ where: { id: ids } });
     await this.setSshConfig();
+
+    if (query?.force === true) {
+      const crons = await CrontabModel.findAll({ where: { sub_id: ids } });
+      if (crons?.length) {
+        await this.crontabService.remove(crons.map(x => x.id!))
+      }
+      for (const doc of docs) {
+        const filePath = join(config.scriptPath, doc.alias);
+        emptyDir(filePath);
+      }
+    }
   }
 
   public async getDb(
@@ -286,17 +301,9 @@ export default class SubscriptionService {
         try {
           await killTask(doc.pid);
         } catch (error) {
-          this.logger.silly(error);
+          this.logger.error(error);
         }
       }
-      const absolutePath = await handleLogPath(doc.log_path as string);
-
-      fs.appendFileSync(
-        `${absolutePath}`,
-        `\n## 执行结束...  ${dayjs().format(
-          'YYYY-MM-DD HH:mm:ss',
-        )}${LOG_END_SYMBOL}`,
-      );
     }
 
     await SubscriptionModel.update(
@@ -313,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

@@ -1,8 +1,14 @@
+import { Response } from 'express';
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import * as fs from 'fs';
-import { AuthDataType, AuthInfo, AuthModel, AuthModelInfo } from '../data/auth';
+import {
+  AuthDataType,
+  AuthInfo,
+  AuthInstance,
+  AuthModel,
+  AuthModelInfo,
+} from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
 import ScheduleService, { TaskCallbacks } from './schedule';
@@ -14,9 +20,15 @@ import {
   killTask,
   parseContentVersion,
   parseVersion,
+  promiseExec,
+  readDirs,
 } from '../config/util';
 import { TASK_COMMAND } from '../config/const';
-import taskLimit from '../shared/pLimit'
+import taskLimit from '../shared/pLimit';
+import tar from 'tar';
+import path from 'path';
+import fs from 'fs';
+import sum from 'lodash/sum';
 
 @Service()
 export default class SystemService {
@@ -27,22 +39,22 @@ 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 });
-    return doc || {};
+    return doc || ({} as AuthInstance);
   }
 
-  private async updateAuthDb(payload: AuthInfo): Promise<any> {
+  private async updateAuthDb(payload: AuthInfo): Promise<AuthInstance> {
     await AuthModel.upsert({ ...payload });
     const doc = await this.getDb({ type: payload.type });
     return doc;
   }
 
-  public async getDb(query: any): Promise<any> {
+  public async getDb(query: any): Promise<AuthInstance> {
     const doc: any = await AuthModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as any);
+    return doc && doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -72,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}`,
       };
@@ -102,7 +114,7 @@ export default class SystemService {
           },
         );
         lastVersionContent = await parseContentVersion(result.body);
-      } catch (error) {}
+      } catch (error) { }
 
       if (!lastVersionContent) {
         lastVersionContent = currentVersionContent;
@@ -148,7 +160,7 @@ export default class SystemService {
   }
 
   public async updateSystem() {
-    const cp = spawn('ql -l update', { shell: '/bin/bash' });
+    const cp = spawn('ql -l update false', { shell: '/bin/bash' });
 
     cp.stdout.on('data', (data) => {
       this.sockService.sendMessage({
@@ -174,6 +186,33 @@ export default class SystemService {
     return { code: 200 };
   }
 
+  public async reloadSystem(target: 'system' | 'data') {
+    const cp = spawn(`ql -l reload ${target || ''}`, { shell: '/bin/bash' });
+
+    cp.stdout.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: data.toString(),
+      });
+    });
+
+    cp.stderr.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: data.toString(),
+      });
+    });
+
+    cp.on('error', (err) => {
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: JSON.stringify(err),
+      });
+    });
+
+    return { code: 200 };
+  }
+
   public async notify({ title, content }: { title: string; content: string }) {
     const isSuccess = await this.notificationService.notify(title, content);
     if (isSuccess) {
@@ -193,6 +232,9 @@ export default class SystemService {
     this.scheduleService.runTask(
       `real_log_path=${logPath} real_time=true ${command}`,
       callback,
+      {
+        command,
+      }
     );
   }
 
@@ -217,4 +259,51 @@ export default class SystemService {
       return { code: 400, message: '任务未找到' };
     }
   }
+
+  public async exportData(res: Response) {
+    try {
+      await tar.create(
+        { gzip: true, file: config.dataTgzFile, cwd: config.rootPath },
+        ['data'],
+      );
+      res.download(config.dataTgzFile);
+    } catch (error: any) {
+      return res.send({ code: 400, message: error.message });
+    }
+  }
+
+  public async importData() {
+    try {
+      await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
+      await tar.x({ file: config.dataTgzFile, cwd: config.tmpPath });
+      return { code: 200 };
+    } catch (error: any) {
+      return { code: 400, message: error.message };
+    }
+  }
+
+  public async getSystemLog(res: Response) {
+    const result = readDirs(config.systemLogPath, config.systemLogPath);
+    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+    res.set({
+      'Content-Length': sum(logs.map((x) => x.size)),
+    });
+    (function sendFiles(res, fileNames) {
+      if (fileNames.length === 0) {
+        res.end();
+        return;
+      }
+
+      const currentLog = fileNames.shift();
+      if (currentLog) {
+        const currentFileStream = fs.createReadStream(
+          path.join(config.systemLogPath, currentLog.title),
+        );
+        currentFileStream.on('end', () => {
+          sendFiles(res, fileNames);
+        });
+        currentFileStream.pipe(res, { end: false });
+      }
+    })(res, logs);
+  }
 }

back/services/user.ts

@@ -5,12 +5,19 @@ import {
   fileExist,
   getNetIp,
   getPlatform,
+  safeJSONParse,
 } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
-import { AuthDataType, AuthInfo, AuthModel, AuthModelInfo, LoginStatus } from '../data/auth';
+import {
+  AuthDataType,
+  AuthInfo,
+  AuthModel,
+  AuthModelInfo,
+  LoginStatus,
+} from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
 import { Request } from 'express';
@@ -27,7 +34,7 @@ export default class UserService {
     @Inject('logger') private logger: winston.Logger,
     private scheduleService: ScheduleService,
     private sockService: SockService,
-  ) { }
+  ) {}
 
   public async login(
     payloads: {
@@ -119,7 +126,8 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${req.platform
+          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+            req.platform
           }端 登录成功，ip地址 ${ip}`,
         );
         await this.getLoginLog();
@@ -147,7 +155,8 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${req.platform
+          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+            req.platform
           }端 登录失败，ip地址 ${ip}`,
         );
         await this.getLoginLog();
@@ -190,7 +199,9 @@ export default class UserService {
       where: { type: AuthDataType.loginLog },
     });
     if (docs && docs.length > 0) {
-      const result = docs.sort((a, b) => b.info!.timestamp! - a.info!.timestamp!);
+      const result = docs.sort(
+        (a, b) => b.info!.timestamp! - a.info!.timestamp!,
+      );
       if (result.length > 100) {
         await AuthModel.destroy({
           where: { id: result[result.length - 1].id },
@@ -317,7 +328,7 @@ export default class UserService {
 
   private getAuthInfo() {
     const content = fs.readFileSync(config.authConfigFile, 'utf8');
-    return JSON.parse(content || '{}');
+    return safeJSONParse(content);
   }
 
   private updateAuthInfo(authInfo: any, info: any) {

back/shared/pLimit.ts

@@ -1,36 +1,83 @@
-import pLimit from "p-limit";
+import PQueue, { QueueAddOptions } from 'p-queue-cjs';
 import os from 'os';
-import { AuthDataType, AuthModel } from "../data/auth";
+import { AuthDataType, AuthModel } from '../data/auth';
+import Logger from '../loaders/logger';
 
 class TaskLimit {
-  private oneLimit = 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 cronLimitActiveCount() {
+    return this.cronLimit.pending;
+  }
+
+  get cronLimitPendingCount() {
+    return this.cronLimit.size;
+  }
 
   constructor() {
     this.setCustomLimit();
+    this.handleEvents();
+  }
+
+  private handleEvents() {
+    this.cronLimit.on('add', () => {
+      Logger.info(
+        `[schedule][任务加入队列] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`,
+      );
+    })
+    this.cronLimit.on('active', () => {
+      Logger.info(
+        `[schedule][开始处理任务] 运行中任务数: ${this.cronLimitActiveCount + 1}, 等待中任务数: ${this.cronLimitPendingCount}`,
+      );
+    })
+    this.cronLimit.on('completed', (param) => {
+      Logger.info(
+        `[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`,
+      );
+    });
+    this.cronLimit.on('error', error => {
+      Logger.error(
+        `[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`,
+      );
+    });
+    this.cronLimit.on('next', () => {
+      Logger.info(
+        `[schedule][任务处理结束] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`,
+      );
+    });
+    this.cronLimit.on('idle', () => {
+      Logger.info(
+        `[schedule][任务队列] 空闲中...`,
+      );
+    });
   }
 
   public async setCustomLimit(limit?: number) {
     if (limit) {
-      this.cpuLimit = pLimit(limit);
+      this.cronLimit.concurrency = limit;
       return;
     }
-    const doc = await AuthModel.findOne({ where: { type: AuthDataType.systemConfig } });
+    await AuthModel.sync();
+    const doc = await AuthModel.findOne({
+      where: { type: AuthDataType.systemConfig },
+    });
     if (doc?.info?.cronConcurrency) {
-      this.cpuLimit = pLimit(doc?.info?.cronConcurrency);
+      this.cronLimit.concurrency = doc.info.cronConcurrency;
     }
   }
 
-  public runWithCpuLimit<T>(fn: () => Promise<T>): Promise<T> {
-    return this.cpuLimit(() => {
-      return 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(() => {
-      return 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>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+    return this.updateLogLimit.add(fn, options);
   }
 }
 

back/shared/runCron.ts

@@ -1,37 +1,31 @@
 import { spawn } from 'cross-spawn';
-import taskLimit from "./pLimit";
+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.silly('运行命令: ' + cmd);
-
+      Logger.info(`[schedule][开始执行任务] 参数 ${JSON.stringify({ ...options, command: cmd })}`);
       const cp = spawn(cmd, { shell: '/bin/bash' });
 
       cp.stderr.on('data', (data) => {
         Logger.info(
-          '[执行任务失败] %s，时间：%s, 错误信息：%j',
+          '[schedule][执行任务失败] 命令: %s, 错误信息: %j',
           cmd,
-          new Date().toLocaleString(),
           data.toString(),
         );
       });
       cp.on('error', (err) => {
         Logger.error(
-          '[创建任务失败] %s，时间：%s, 错误信息：%j',
+          '[schedule][创建任务失败] 命令: %s, 错误信息: %j',
           cmd,
-          new Date().toLocaleString(),
           err,
         );
       });
 
-      cp.on('close', async (code) => {
-        Logger.info(
-          `[任务退出] ${cmd} 进程id: ${cp.pid} 退出，退出码 ${code}`,
-        );
-        resolve();
+      cp.on('exit', async (code) => {
+        resolve({ ...options, command: cmd, pid: cp.pid, code });
       });
     });
-  })
-}
+  });
+}

docker/docker-entrypoint.sh

@@ -4,8 +4,6 @@ dir_shell=/ql/shell
 . $dir_shell/share.sh
 link_shell
 
-export isFirstStartServer=true
-
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
@@ -25,7 +23,10 @@ if [[ "$is_equal_registry" == "" ]]; then
   cd && pnpm config set registry $NpmMirror
   pnpm install -g
 fi
-update_depend
+if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+  cp -f $dir_sample/package.json $dir_scripts/package.json
+  npm_install_2 $dir_scripts
+fi
 echo
 
 echo -e "======================3. 启动nginx========================\n"

docker/front.conf

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

docker/nginx.conf

@@ -14,7 +14,7 @@ http {
 
   server_tokens off;
 
-  client_max_body_size 20m;
+  client_max_body_size 4096m;
   client_body_buffer_size 20m;
 
   keepalive_timeout 65;

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",
@@ -91,10 +91,12 @@
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
     "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
+    "tar": "^6.1.15",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
     "winston": "^3.6.0",
+    "winston-daily-rotate-file": "^4.7.1",
     "yargs": "^17.3.1"
   },
   "devDependencies": {
@@ -108,6 +110,7 @@
     "@types/cross-spawn": "^6.0.2",
     "@types/express": "^4.17.13",
     "@types/express-jwt": "^6.0.4",
+    "@types/file-saver": "^2.0.5",
     "@types/js-yaml": "^4.0.5",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/lodash": "^4.14.185",
@@ -123,15 +126,20 @@
     "@types/serve-handler": "^6.1.1",
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
+    "@types/tar": "^6.1.5",
     "@types/uuid": "^8.3.4",
-    "@umijs/max": "^4.0.55",
+    "@uiw/codemirror-extensions-langs": "^4.21.9",
+    "@uiw/react-codemirror": "^4.21.9",
+    "@umijs/max": "^4.0.72",
     "@umijs/ssr-darkreader": "^4.9.45",
+    "ahooks": "^3.7.8",
     "ansi-to-react": "^6.1.6",
     "antd": "^4.24.8",
     "antd-img-crop": "^4.2.3",
-    "codemirror": "^5.65.2",
+    "axios": "^1.4.0",
     "compression-webpack-plugin": "9.2.0",
     "concurrently": "^7.0.0",
+    "file-saver": "^2.0.5",
     "lint-staged": "^13.0.3",
     "monaco-editor": "0.33.0",
     "nodemon": "^2.0.15",
@@ -140,21 +148,21 @@
     "qrcode.react": "^1.0.1",
     "query-string": "^7.1.1",
     "rc-tween-one": "^3.0.6",
+    "rc-virtual-list": "3.5.3",
     "react": "18.2.0",
-    "react-codemirror2": "^7.2.1",
     "react-copy-to-clipboard": "^5.1.0",
     "react-diff-viewer": "^3.1.1",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
     "react-dom": "18.2.0",
+    "react-intl-universal": "^2.6.21",
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.6.0",
     "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
     "tsx": "^3.12.3",
-    "typescript": "4.8.4",
-    "umi-request": "^1.4.0",
+    "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",
     "webpack": "^5.70.0",

sample/config.sample.sh

@@ -168,4 +168,18 @@ export SMTP_PASSWORD=""
 ## smtp_name 填写 SMTP 收发件人姓名，可随意填写
 export SMTP_NAME=""
 
+## 15. PushMe
+## 官方说明文档：https://push.i-i.me/
+## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
+export PUSHME_KEY=""
+
+## 13. CHRONOCAT
+## CHRONOCAT_URL 推送 http://127.0.0.1:16530
+## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
+## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
+## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
+export CHRONOCAT_URL="" 
+export CHRONOCAT_QQ="" #
+export CHRONOCAT_TOKEN=""
+
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

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
@@ -141,6 +146,28 @@ let SMTP_EMAIL = '';
 let SMTP_PASSWORD = '';
 let SMTP_NAME = '';
 
+// =======================================PushMe通知设置区域===========================================
+//官方文档：https://push.i-i.me/
+//此处填你的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;
@@ -206,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 &&
@@ -288,6 +321,35 @@ if (process.env.SMTP_PASSWORD) {
 if (process.env.SMTP_NAME) {
   SMTP_NAME = 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;
+}
 //==========================云端环境变量的判断与接收=========================
 
 /**
@@ -336,6 +398,9 @@ async function sendNotify(
     aibotkNotify(text, desp), //智能微秘书
     fsBotNotify(text, desp), //飞书机器人
     smtpNotify(text, desp), //SMTP 邮件
+    PushMeNotify(text, desp, params), //PushMe
+    ChronocatNotify(text, desp), // Chronocat
+    webhookNotify(text, desp), //自定义通知
   ]);
 }
 
@@ -543,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: {
@@ -1117,6 +1182,255 @@ function smtpNotify(text, desp) {
   });
 }
 
+function PushMeNotify(text, desp, params = {}) {
+  return new Promise((resolve) => {
+    if (PUSHME_KEY) {
+      const options = {
+        url: `https://push.i-i.me?push_key=${PUSHME_KEY}`,
+        json: { title: text, content: desp, ...params },
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        timeout,
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('PushMeNotify发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            if (data === 'success') {
+              console.log('PushMe发送通知消息成功🎉\n');
+            } else {
+              console.log(`${data}\n`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
+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,                    # 控制台输出
 
@@ -98,6 +100,18 @@ push_config = {
     'SMTP_EMAIL': '',                   # SMTP 收发件邮箱，通知将会由自己发给自己
     'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
     'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
+
+    'PUSHME_KEY': '',                   # PushMe 酱的 PUSHME_KEY
+    
+    'CHRONOCAT_QQ': '',                 # qq号
+    'CHRONOCAT_TOKEN': '',              # CHRONOCAT 的token
+    'CHRONOCAT_URL': '',                # CHRONOCAT的url地址
+    
+    'WEBHOOK_URL': '',                  # 自定义通知 请求地址
+    'WEBHOOK_BODY': '',                 # 自定义通知 请求体
+    'WEBHOOK_HEADERS': '',              # 自定义通知 请求头
+    'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
+    'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
 }
 notify_function = []
 # fmt: on
@@ -128,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(
@@ -440,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",
@@ -454,7 +472,9 @@ class WeCom:
         return respone["errmsg"]
 
     def send_mpnews(self, title, message, media_id, touser="@all"):
-        send_url = f"https://{self.HOST}/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",
@@ -638,6 +658,179 @@ def smtp(title: str, content: str) -> None:
         print(f"SMTP 邮件 推送失败！{e}")
 
 
+def pushme(title: str, content: str) -> None:
+    """
+    使用 PushMe 推送消息。
+    """
+    if not push_config.get("PUSHME_KEY"):
+        print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送")
+        return
+    print("PushMe 服务启动")
+
+    url = f'https://push.i-i.me/?push_key={push_config.get("PUSHME_KEY")}'
+    data = {
+        "title": title,
+        "content": content,
+    }
+    response = requests.post(url, data=data)
+
+    if response.status_code == 200 and response.text == "success":
+        print("PushMe 推送成功！")
+    else:
+        print(f"PushMe 推送失败！{response.status_code} {response.text}")
+
+
+def chronocat(title: str, content: str) -> None:
+    """
+    使用 CHRONOCAT 推送消息。
+    """
+    if (
+        not push_config.get("CHRONOCAT_URL")
+        or not push_config.get("CHRONOCAT_QQ")
+        or not push_config.get("CHRONOCAT_TOKEN")
+    ):
+        print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送")
+        return
+
+    print("CHRONOCAT 服务启动")
+
+    user_ids = re.findall(r"user_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+    group_ids = re.findall(r"group_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+
+    url = f'{push_config.get("CHRONOCAT_URL")}/api/message/send'
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f'Bearer {push_config.get("CHRONOCAT_TOKEN")}',
+    }
+
+    for chat_type, ids in [(1, user_ids), (2, group_ids)]:
+        if not ids:
+            continue
+        for chat_id in ids:
+            data = {
+                "peer": {"chatType": chat_type, "peerUin": chat_id},
+                "elements": [
+                    {
+                        "elementType": 1,
+                        "textElement": {"content": f"{title}\n\n{content}"},
+                    }
+                ],
+            }
+            response = requests.post(url, headers=headers, data=json.dumps(data))
+            if response.status_code == 200:
+                if chat_type == 1:
+                    print(f"QQ个人消息:{ids}推送成功！")
+                else:
+                    print(f"QQ群消息:{ids}推送成功！")
+            else:
+                if chat_type == 1:
+                    print(f"QQ个人消息:{ids}推送失败！")
+                else:
+                    print(f"QQ群消息:{ids}推送失败！")
+
+
+def parse_headers(headers):
+    if not headers:
+        return {}
+
+    parsed = {}
+    lines = headers.split("\n")
+
+    for line in lines:
+        i = line.find(":")
+        if i == -1:
+            continue
+
+        key = line[:i].strip().lower()
+        val = line[i + 1 :].strip()
+        parsed[key] = parsed.get(key, "") + ", " + val if key in parsed else val
+
+    return parsed
+
+
+def parse_body(body, content_type):
+    if not body:
+        return ""
+
+    parsed = {}
+    lines = body.split("\n")
+
+    for line in lines:
+        i = line.find(":")
+        if i == -1:
+            continue
+
+        key = line[:i].strip().lower()
+        val = line[i + 1 :].strip()
+
+        if not key or key in parsed:
+            continue
+
+        try:
+            json_value = json.loads(val)
+            parsed[key] = json_value
+        except:
+            parsed[key] = val
+
+    if content_type == "application/x-www-form-urlencoded":
+        data = urlencode(parsed, doseq=True)
+        return data
+
+    if content_type == "application/json":
+        data = json.dumps(parsed)
+        return data
+
+    return parsed
+
+
+def format_notify_content(url, body, title, content):
+    if "$title" not in url and "$title" not in body:
+        return {}
+
+    formatted_url = url.replace("$title", urllib.parse.quote_plus(title)).replace(
+        "$content", urllib.parse.quote_plus(content)
+    )
+    formatted_body = body.replace("$title", title).replace("$content", content)
+
+    return formatted_url, formatted_body
+
+
+def custom_notify(title: str, content: str) -> None:
+    """
+    通过 自定义通知 推送消息。
+    """
+    if not push_config.get("WEBHOOK_URL") or not push_config.get("WEBHOOK_METHOD"):
+        print("自定义通知的 WEBHOOK_URL 或 WEBHOOK_METHOD 未设置!!\n取消推送")
+        return
+
+    print("自定义通知服务启动")
+
+    WEBHOOK_URL = push_config.get("WEBHOOK_URL")
+    WEBHOOK_METHOD = push_config.get("WEBHOOK_METHOD")
+    WEBHOOK_CONTENT_TYPE = push_config.get("WEBHOOK_CONTENT_TYPE")
+    WEBHOOK_BODY = push_config.get("WEBHOOK_BODY")
+    WEBHOOK_HEADERS = push_config.get("WEBHOOK_HEADERS")
+
+    formatUrl, formatBody = format_notify_content(
+        WEBHOOK_URL, WEBHOOK_BODY, title, content
+    )
+
+    if not formatUrl and not formatBody:
+        print("请求头或者请求体中必须包含 $title 和 $content")
+        return
+
+    headers = parse_headers(WEBHOOK_HEADERS)
+    body = parse_body(formatBody, WEBHOOK_CONTENT_TYPE)
+    response = requests.request(
+        method=WEBHOOK_METHOD, url=formatUrl, headers=headers, timeout=15, data=body
+    )
+
+    if response.status_code == 200:
+        print("自定义通知推送成功！")
+    else:
+        print(f"自定义通知推送失败！{response.status_code} {response.text}")
+
+
 def one() -> str:
     """
     获取一条一言。
@@ -692,6 +885,16 @@ if (
     and push_config.get("SMTP_NAME")
 ):
     notify_function.append(smtp)
+if push_config.get("PUSHME_KEY"):
+    notify_function.append(pushme)
+if (
+    push_config.get("CHRONOCAT_URL")
+    and push_config.get("CHRONOCAT_QQ")
+    and push_config.get("CHRONOCAT_TOKEN")
+):
+    notify_function.append(chronocat)
+if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
+    notify_function.append(custom_notify)
 
 
 def send(title: str, content: str) -> None:

shell/api.sh

@@ -36,7 +36,7 @@ add_cron_api() {
     local sub_id="$4"
   fi
 
-  if [[ ! $sub_id ]];then
+  if [[ ! $sub_id ]]; then
     sub_id="null"
   fi
 

shell/check.sh

@@ -79,8 +79,6 @@ main() {
   npm i -g pnpm@8.3.1
   patch_version
 
-  apk add procps netcat-openbsd
-
   if [[ $PipMirror ]]; then
     pip3 config set global.index-url $PipMirror
   fi

shell/otask.sh

@@ -86,10 +86,15 @@ check_server() {
   fi
 }
 
+env_str_to_array() {
+  local IFS="&"
+  read -ra array <<<"${!env_param}"
+}
+
 ## 正常运行单个脚本，$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
 
@@ -100,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 不会生效，即所有任务立即执行
@@ -113,8 +118,7 @@ run_concurrent() {
     exit 1
   fi
 
-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
+  env_str_to_array
   local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
   local runArr=($(eval echo $tempArr))
   runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
@@ -125,11 +129,13 @@ run_concurrent() {
     let n++
   done
 
-  local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+  local cookieStr=$(
+    IFS="&"
+    echo "${array_run[*]}"
+  )
+  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
 
-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
+  env_str_to_array
   single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%3N")
 
   cd $dir_scripts
@@ -139,9 +145,9 @@ run_concurrent() {
     file_param=${file_param/$relative_path\//}
   fi
   for i in "${!array[@]}"; do
-    export ${env_param}=${array[i]}
+    export "${env_param}=${array[i]}"
     single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-    eval $timeoutCmd $which_program $file_param &>$single_log_path &
+    eval $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
   done
 
   wait
@@ -161,8 +167,7 @@ run_designated() {
     exit 1
   fi
 
-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
+  env_str_to_array
   local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
   local runArr=($(eval echo $tempArr))
   runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
@@ -173,8 +178,11 @@ run_designated() {
     let n++
   done
 
-  local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+  local cookieStr=$(
+    IFS="&"
+    echo "${array_run[*]}"
+  )
+  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
 
   cd $dir_scripts
   local relative_path="${file_param%/*}"
@@ -182,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[@]}"
 }
 
 ## 运行其他命令
@@ -233,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

@@ -2,6 +2,7 @@
 
 ## 目录
 dir_root=$QL_DIR
+dir_tmp=$dir_root/.tmp
 dir_data=$dir_root/data
 dir_shell=$dir_root/shell
 dir_sample=$dir_root/sample
@@ -68,6 +69,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"}
@@ -98,9 +100,6 @@ set_proxy() {
 unset_proxy() {
   unset http_proxy
   unset https_proxy
-  unset ftp_proxy
-  unset all_proxy
-  unset no_proxy
 }
 
 make_dir() {
@@ -175,6 +174,7 @@ define_cmd() {
 }
 
 fix_config() {
+  make_dir $dir_tmp
   make_dir $dir_static
   make_dir $dir_data
   make_dir $dir_config
@@ -263,6 +263,7 @@ npm_install_sub() {
   else
     pnpm install --loglevel error --production
   fi
+  exit_status=$?
 }
 
 npm_install_2() {
@@ -283,90 +284,22 @@ diff_and_copy() {
   fi
 }
 
-update_depend() {
-  local dir_current=$(pwd)
-
-  if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
-    cp -f $dir_sample/package.json $dir_scripts/package.json
-    npm_install_2 $dir_scripts
-  fi
-
-  cd $dir_current
-}
-
 git_clone_scripts() {
   local url="$1"
   local dir="$2"
   local branch="$3"
   local proxy="$4"
   [[ $branch ]] && local part_cmd="-b $branch "
-  echo -e "开始拉取 $url 到 $dir\n"
+  echo -e "开始拉取仓库 ${uniq_path} 到 $dir\n"
 
   set_proxy "$proxy"
 
-  git clone --depth=1 $part_cmd $url $dir
+  git clone --depth=1 $part_cmd $url $dir 2>&1
   exit_status=$?
 
-  reset_branch "$branch" "$dir"
-
   unset_proxy
 }
 
-git_pull_scripts() {
-  local dir_current=$(pwd)
-  local dir_work="$1"
-  local branch="$2"
-  local proxy="$3"
-  cd $dir_work
-  echo -e "开始更新仓库：$dir_work"
-  set_proxy "$proxy"
-
-  if [[ ! $branch ]]; then
-    branch=$(cd $dir_work && git remote show origin | grep 'HEAD branch' | cut -d' ' -f5)
-  fi
-
-  local pre_commit_id=$(git rev-parse --short HEAD)
-  reset_branch "$branch" "$dir_work"
-
-  git fetch --depth 1 origin $branch
-  exit_status=$?
-
-  reset_branch "$branch" "$dir_work"
-  local cur_commit_id=$(git rev-parse --short HEAD)
-  if [[ $cur_commit_id != $pre_commit_id ]]; then
-    exit_status=0
-  fi
-
-  unset_proxy
-  cd $dir_current
-}
-
-reset_romote_url() {
-  local dir_current=$(pwd)
-  local dir_work=$1
-  local url=$2
-  local branch="$3"
-
-  cd $dir_work
-  if [[ -d "$dir_work/.git" ]]; then
-    [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
-    git remote set-url origin $url &>/dev/null
-  else
-    git init
-    git remote add origin $url &>/dev/null
-  fi
-
-  cd $dir_current
-}
-
-reset_branch() {
-  local branch="$1"
-  local part_cmd="origin/${branch}"
-  git remote set-branches origin $branch
-  git reset --hard $part_cmd &>/dev/null
-  git checkout -b $branch $part_cmd &>/dev/null
-}
-
 random_range() {
   local beg=$1
   local end=$2
@@ -375,10 +308,8 @@ random_range() {
 
 reload_pm2() {
   cd $dir_root
-  # 代理会影响 grpc 服务
-  unset_proxy
   pm2 flush &>/dev/null
-  pm2 startOrGracefulReload $file_ecosystem_js
+  env ALL_PROXY= HTTP_PROXY= HTTPS_PROXY= all_proxy= http_proxy= https_proxy= pm2 startOrGracefulReload $file_ecosystem_js --update-env
 }
 
 diff_time() {
@@ -471,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
@@ -481,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")
@@ -509,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,16 +5,16 @@ 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
 }
 
 ## 选择python3还是node
 define_program() {
   local file_param=$1
-  if [[ $file_param == *.js ]]; then
+  if [[ $file_param == *.js ]] || [[ $file_param == *.mjs ]]; then
     which_program="node"
   elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
     which_program="python3"
@@ -69,11 +69,11 @@ handle_log_path() {
   if [[ $real_log_path ]]; then
     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

@@ -31,7 +31,7 @@ output_list_add_drop() {
   local list=$1
   local type=$2
   if [[ -s $list ]]; then
-    echo -e "检测到有${type}的定时任务：\n"
+    echo -e "检测到有${type}的定时任务:"
     cat $list
     echo
   fi
@@ -134,10 +134,10 @@ update_repo() {
   git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新${repo_path}成功...\n"
+    echo -e "\n拉取 ${uniq_path} 成功...\n"
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
-    echo -e "\n更新${repo_path}失败，请检查网络...\n"
+    echo -e "\n拉取 ${uniq_path} 失败，请检查网络...\n"
   fi
 }
 
@@ -229,58 +229,99 @@ usage() {
   echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
 }
 
+reload_qinglong() {
+  local reload_target="${1}"
+  local primary_branch="master"
+  if [[ "${QL_BRANCH}" == "develop" ]]; then
+    primary_branch="develop"
+  fi
+
+  if [[ "$reload_target" == 'system' ]]; then
+    cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+    rm -rf $dir_static/*
+    cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+    cp -f $file_config_sample $dir_config/config.sample.sh
+  fi
+
+  if [[ "$reload_target" == 'data' ]]; then
+    cp -rf ${dir_tmp}/data ${dir_root}/
+  fi
+
+  reload_pm2
+}
+
 ## 更新qinglong
 update_qinglong() {
+  rm -rf ${dir_tmp}/*
   local mirror="gitee"
+  local downloadQLUrl="https://gitee.com/whyour/qinglong/repository/archive"
+  local downloadStaticUrl="https://gitee.com/whyour/qinglong-static/repository/archive"
   local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200)
   if [[ ! -z $githubStatus ]]; then
     mirror="github"
+    downloadQLUrl="https://github.com/whyour/qinglong/archive/refs/heads"
+    downloadStaticUrl="https://github.com/whyour/qinglong-static/archive/refs/heads"
   fi
   echo -e "使用 ${mirror} 源更新...\n"
-  export isFirstStartServer=false
 
   local primary_branch="master"
   if [[ "${QL_BRANCH}" == "develop" ]]; then
     primary_branch="develop"
   fi
-  [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
-  reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
-  git_pull_scripts $dir_root ${primary_branch}
+
+  wget -cqO "${dir_tmp}/ql.zip" "${downloadQLUrl}/${primary_branch}.zip"
+  exit_status=$?
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙源文件成功...\n"
-    cp -f $file_config_sample $dir_config/config.sample.sh
-    update_depend
+    echo -e "更新青龙源文件成功...\n"
 
-    [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
-    [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root
+    unzip -oq ${dir_tmp}/ql.zip -d ${dir_tmp}
 
-    update_qinglong_static "$1" "$primary_branch"
+    update_qinglong_static
   else
-    echo -e "\n更新青龙源文件失败，请检查网络...\n"
+    echo -e "更新青龙源文件失败，请检查网络...\n"
   fi
 }
 
 update_qinglong_static() {
-  local no_restart="$1"
-  local primary_branch="$2"
-  local url="https://${mirror}.com/whyour/qinglong-static.git"
-  rm -rf ${ql_static_repo} &>/dev/null
-  git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
+  wget -cqO "${dir_tmp}/static.zip" "${downloadStaticUrl}/${primary_branch}.zip"
+  exit_status=$?
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙静态资源成功...\n"
+    echo -e "更新青龙静态资源成功...\n"
+    unzip -oq ${dir_tmp}/static.zip -d ${dir_tmp}
+
+    check_update_dep
+  else
+    echo -e "更新青龙静态资源失败，请检查网络...\n"
+  fi
+}
+
+check_update_dep() {
+  echo -e "\n开始检测依赖...\n"
+  if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+    cp -f $dir_sample/package.json $dir_scripts/package.json
+    npm_install_2 $dir_scripts
+  fi
+
+  if [[ $(diff $dir_root/package.json ${dir_tmp}/qinglong-${primary_branch}/package.json) ]]; then
+    npm_install_2 "${dir_tmp}/qinglong-${primary_branch}"
+  fi
+
+  if [[ $exit_status -eq 0 ]]; then
+    echo -e "\n依赖检测安装成功...\n"
+    echo -e "更新包下载成功..."
+
+    if [[ "$needRestart" == 'true' ]]; then
+      cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+      rm -rf $dir_static/*
+      cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+      cp -f $file_config_sample $dir_config/config.sample.sh
 
-    rm -rf $dir_static/*
-    cp -rf $ql_static_repo/* $dir_static
-    if [[ $no_restart != "no-restart" ]]; then
-      nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
-      echo -e "重启面板中..."
-      sleep 3
       reload_pm2
     fi
   else
-    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+    echo -e "\n依赖检测安装失败，请检查网络...\n"
   fi
 }
 
@@ -456,7 +497,11 @@ main() {
   case $p1 in
   update)
     fix_config
-    eval update_qinglong "$2" $cmd
+    local needRestart=${p2:-"true"}
+    eval update_qinglong $cmd
+    ;;
+  reload)
+    eval reload_qinglong "$p2" $cmd
     ;;
   extra)
     eval run_extra_shell $cmd

src/app.ts

@@ -1,4 +1,26 @@
 const baseUrl = window.__ENV__QlBaseUrl || '/';
+import { setLocale } from '@umijs/max';
+import intl from 'react-intl-universal';
+
+export function rootContainer(container: any) {
+  const locales = {
+    'en': require('./locales/en-US.json'),
+    'zh': require('./locales/zh-CN.json'),
+  };
+  let currentLocale = intl.determineLocale({
+    urlLocaleKey: 'lang',
+    cookieLocaleKey: 'lang',
+    localStorageLocaleKey: 'lang',
+  }).slice(0, 2);
+
+  if (!currentLocale || !Object.keys(locales).includes(currentLocale)) {
+    currentLocale = 'zh';
+  }
+
+  intl.init({ currentLocale, locales });
+  setLocale(currentLocale === 'zh' ? 'zh-CN' : 'en-US');
+  return container;
+}
 
 export function modifyClientRenderOpts(memo: any) {
   return {

src/components/copy.tsx

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import React, { useRef, useState, useEffect } from 'react';
 import { Tooltip, Typography } from 'antd';
 import { CopyOutlined, CheckOutlined } from '@ant-design/icons';
@@ -28,7 +29,10 @@ const Copy = ({ text }: { text: string }) => {
   return (
     <Link onClick={copyText} style={{ marginLeft: 1 }}>
       <CopyToClipboard text={text}>
-        <Tooltip key="copy" title={copied ? '复制成功' : '复制'}>
+        <Tooltip
+          key="copy"
+          title={copied ? intl.get('复制成功') : intl.get('复制')}
+        >
           {copied ? <CheckOutlined /> : <CopyOutlined />}
         </Tooltip>
       </CopyToClipboard>

src/components/name.tsx

@@ -0,0 +1,22 @@
+import { useRequest } from 'ahooks';
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
+import { Spin, Typography } from 'antd';
+
+export default function Name<
+  TData extends { data?: { name: string } },
+  TParams,
+>({
+  service,
+  options,
+}: {
+  service: Service<TData, [TParams]>;
+  options: Options<TData, [TParams]>;
+}) {
+  const { loading, data } = useRequest(service, options);
+
+  return (
+    <Spin spinning={loading}>
+      <Typography.Text ellipsis={true}>{data?.data?.name}</Typography.Text>
+    </Spin>
+  );
+}

src/components/tag.tsx

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import { Tag, Input } from 'antd';
 import { TweenOneGroup } from 'rc-tween-one';
 import { PlusOutlined } from '@ant-design/icons';
@@ -101,7 +102,7 @@ const EditableTagGroup = ({
           onClick={showInput}
           style={{ borderStyle: 'dashed', cursor: 'pointer' }}
         >
-          <PlusOutlined /> 新建
+          <PlusOutlined /> {intl.get('新建')}
         </Tag>
       )}
     </>

src/components/vlist.tsx

@@ -1,404 +0,0 @@
-import React, {
-  useRef,
-  useEffect,
-  useContext,
-  createContext,
-  useReducer,
-  useState,
-  useMemo,
-} from 'react';
-import { throttle, isNumber, debounce } from 'lodash';
-
-const initialState = {
-  // 行高度
-  rowHeight: 0,
-  // 当前的scrollTop
-  curScrollTop: 0,
-  // 总行数
-  totalLen: 0,
-};
-
-function reducer(state, action) {
-  const { curScrollTop, totalLen, ifScrollTopClear, scrollTop } = action;
-
-  let stateScrollTop = state.curScrollTop;
-  switch (action.type) {
-    // 改变trs 即 改变渲染的列表trs
-    case 'changeTrs':
-      return {
-        ...state,
-        curScrollTop,
-      };
-    // 更改totalLen
-    case 'changeTotalLen':
-      if (totalLen === 0) {
-        stateScrollTop = 0;
-      }
-
-      return {
-        ...state,
-        totalLen,
-        curScrollTop: stateScrollTop,
-      };
-
-    case 'reset':
-      return {
-        ...state,
-        curScrollTop: ifScrollTopClear ? 0 : scrollTop ?? state.curScrollTop,
-      };
-    default:
-      throw new Error();
-  }
-}
-
-// ==============全局常量 ================== //
-const DEFAULT_VID = 'vtable';
-const vidMap = new Map();
-let preData = 0;
-
-// ===============context ============== //
-const ScrollContext = createContext({
-  dispatch: undefined,
-  renderLen: 1,
-  start: 0,
-  offsetStart: 0,
-  // =============
-  rowHeight: initialState.rowHeight,
-  totalLen: 0,
-  vid: DEFAULT_VID,
-});
-
-// =============组件 =================== //
-
-function VCell(props: any): JSX.Element {
-  const { children, ...restProps } = props;
-
-  return (
-    <td {...restProps}>
-      <div>{children[1]}</div>
-    </td>
-  );
-}
-
-function VRow(props: any, ref: any): JSX.Element {
-  const { rowHeight } = useContext(ScrollContext);
-
-  const { children, style, ...restProps } = props;
-
-  const trRef = useRef<HTMLTableRowElement>(null);
-
-  return (
-    <tr
-      {...restProps}
-      ref={Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef}
-      style={{
-        ...style,
-        height: rowHeight || 'auto',
-        boxSizing: 'border-box',
-      }}
-    >
-      {children}
-    </tr>
-  );
-}
-
-function VWrapper(props: any): JSX.Element {
-  const { children, ...restProps } = props;
-
-  const { renderLen, start, dispatch, vid, totalLen } =
-    useContext(ScrollContext);
-
-  const contents = useMemo(() => {
-    return children[1];
-  }, [children]);
-
-  const contentsLen = useMemo(() => {
-    return contents?.length ?? 0;
-  }, [contents]);
-
-  useEffect(() => {
-    if (totalLen !== contentsLen) {
-      dispatch({
-        type: 'changeTotalLen',
-        totalLen: contentsLen ?? 0,
-      });
-    }
-  }, [contentsLen, dispatch, vid, totalLen]);
-
-  let tempNode = null;
-  if (Array.isArray(contents) && contents.length) {
-    tempNode = [
-      children[0],
-      contents.slice(start, start + (renderLen ?? 1)).map((item) => {
-        if (Array.isArray(item)) {
-          // 兼容antd v4.3.5 --- rc-table 7.8.1及以下
-          return item[0];
-        }
-        // 处理antd ^v4.4.0  --- rc-table ^7.8.2
-        return item;
-      }),
-    ];
-  } else {
-    tempNode = children;
-  }
-
-  return <tbody {...restProps}>{tempNode}</tbody>;
-}
-
-function VTable(props: any, otherParams): JSX.Element {
-  const { style, children, ...rest } = props;
-  const { width, ...rest_style } = style;
-
-  const { vid, scrollY, resetScrollTopWhenDataChange, rowHeight, scrollTop } =
-    otherParams ?? {};
-
-  const [state, dispatch] = useReducer(reducer, {
-    ...initialState,
-    curScrollTop: scrollTop,
-    rowHeight,
-  });
-
-  const wrap_tableRef = useRef<HTMLDivElement>(null);
-  const tableRef = useRef<HTMLTableElement>(null);
-
-  const ifChangeRef = useRef(false);
-
-  // 数据的总条数
-  const [totalLen, setTotalLen] = useState<number>(
-    children[1]?.props?.data?.length ?? 0,
-  );
-
-  useEffect(() => {
-    setTotalLen(state.totalLen);
-  }, [state.totalLen]);
-
-  // 组件卸载的清除操作
-  useEffect(() => {
-    return () => {
-      vidMap.delete(vid);
-    };
-  }, [vid]);
-
-  // 数据变更
-  useEffect(() => {
-    ifChangeRef.current = true;
-    // console.log('数据变更')
-    if (isNumber(children[1]?.props?.data?.length)) {
-      dispatch({
-        type: 'changeTotalLen',
-        totalLen: children[1]?.props?.data?.length ?? 0,
-      });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [children[1].props.data]);
-
-  // table总高度
-  const tableHeight = useMemo<string | number>(() => {
-    let temp: string | number = 'auto';
-
-    if (rowHeight && totalLen) {
-      temp = rowHeight * totalLen;
-    }
-    return temp;
-  }, [totalLen]);
-
-  // table的scrollY值
-  const [tableScrollY, setTableScrollY] = useState(0);
-
-  // tableScrollY 随scrollY / tableHeight 进行变更
-  useEffect(() => {
-    let temp = 0;
-
-    if (typeof scrollY === 'string') {
-      temp =
-        (wrap_tableRef.current?.parentNode as HTMLElement)?.offsetHeight ?? 0;
-    } else {
-      temp = scrollY;
-    }
-
-    // if (isNumber(tableHeight) && tableHeight < temp) {
-    //   temp = tableHeight;
-    // }
-
-    // 处理tableScrollY <= 0的情况
-    if (temp <= 0) {
-      temp = 0;
-    }
-
-    setTableScrollY(temp);
-  }, [scrollY, tableHeight]);
-
-  // 渲染的条数
-  const renderLen = useMemo<number>(() => {
-    let temp = 1;
-    if (rowHeight && totalLen && tableScrollY) {
-      if (tableScrollY <= 0) {
-        temp = 0;
-      } else {
-        const tempRenderLen = ((tableScrollY / rowHeight) | 0) + 10;
-        // console.log('tempRenderLen', tempRenderLen)
-        // temp = tempRenderLen > totalLen ? totalLen : tempRenderLen;
-        temp = tempRenderLen;
-      }
-    }
-
-    return temp;
-  }, [totalLen, tableScrollY]);
-
-  // 渲染中的第一条
-  let start = rowHeight ? (state.curScrollTop / rowHeight) | 0 : 0;
-
-  start = start < 5 ? 0 : start - 5 + 1;
-
-  // 偏移量
-  let offsetStart = state.curScrollTop % (rowHeight * 5);
-
-  if (start > 0) {
-    offsetStart = offsetStart % rowHeight;
-  }
-  // console.log(offsetStart)
-  // offsetStart= offsetStart%rowHeight
-  // 用来优化向上滚动出现的空白
-  if (state.curScrollTop && state.curScrollTop >= rowHeight * 5) {
-    // start -= 1
-    // if (offsetStart >= rowHeight) {
-    //   offsetStart +=
-    // } else {
-    offsetStart += rowHeight * 4;
-    // }
-  } else {
-    start = 0;
-  }
-
-  // console.log(state.curScrollTop, start, offsetStart)
-
-  // 数据变更 操作scrollTop
-  useEffect(() => {
-    const scrollNode = wrap_tableRef.current?.parentNode as HTMLElement;
-    if (ifChangeRef?.current) {
-      // console.log(scrollNode)
-      ifChangeRef.current = false;
-
-      if (resetScrollTopWhenDataChange) {
-        // 重置scrollTop
-        if (scrollNode) {
-          scrollNode.scrollTop = 0;
-        }
-
-        dispatch({ type: 'reset', ifScrollTopClear: true });
-      } else {
-        // console.log(preData)
-        // scrollNode.scrollTop = preData+53
-        // 不重置scrollTop 不清空curScrollTop
-        dispatch({ type: 'reset', ifScrollTopClear: false });
-      }
-    }
-
-    if (vidMap.has(vid)) {
-      vidMap.set(vid, {
-        ...vidMap.get(vid),
-        scrollNode,
-      });
-    }
-  }, [totalLen, resetScrollTopWhenDataChange, vid, children]);
-
-  useEffect(() => {
-    const throttleScroll = throttle((e) => {
-      const scrollTop: number = e?.target?.scrollTop ?? 0;
-      // const scrollHeight: number = e?.target?.scrollHeight ?? 0
-      // const clientHeight: number = e?.target?.clientHeight ?? 0
-      if (scrollTop) {
-        preData = scrollTop;
-      }
-      // 到底了 没有滚动条就不会触发reachEnd. 建议设置scrolly高度少点或者数据量多点.
-      // 若renderLen大于totalLen, 置空curScrollTop. => table paddingTop会置空.
-      dispatch({
-        type: 'changeTrs',
-        curScrollTop: renderLen <= totalLen ? scrollTop : 0,
-      });
-    }, 60);
-
-    const ref = wrap_tableRef?.current?.parentNode as HTMLElement;
-
-    if (ref) {
-      ref.addEventListener('scroll', throttleScroll, { passive: true });
-    }
-
-    return () => {
-      ref.removeEventListener('scroll', throttleScroll);
-    };
-  }, [renderLen, totalLen]);
-
-  return (
-    <div
-      className="virtuallist"
-      ref={wrap_tableRef}
-      style={{
-        width: '100%',
-        position: 'relative',
-        height: tableHeight,
-        boxSizing: 'border-box',
-        paddingTop: state.curScrollTop,
-      }}
-    >
-      <ScrollContext.Provider
-        value={{
-          dispatch,
-          start,
-          offsetStart,
-          renderLen,
-          totalLen,
-          vid,
-          rowHeight,
-        }}
-      >
-        <table
-          {...rest}
-          ref={tableRef}
-          style={{
-            ...rest_style,
-            width,
-            position: 'relative',
-            transform: `translateY(-${offsetStart}px)`,
-          }}
-        >
-          {children}
-        </table>
-      </ScrollContext.Provider>
-    </div>
-  );
-}
-
-// ================导出===================
-export function VList(props: {
-  height: number;
-  // 唯一标识
-  vid?: string;
-  rowHeight: number | string;
-  reset?: boolean;
-  scrollTop?: number | string;
-}): any {
-  const { vid = DEFAULT_VID, rowHeight, height, reset, scrollTop } = props;
-
-  const resetScrollTopWhenDataChange = reset ?? true;
-
-  if (!vidMap.has(vid)) {
-    vidMap.set(vid, { _id: vid });
-  }
-
-  return {
-    table: (p) =>
-      VTable(p, {
-        vid,
-        scrollY: height,
-        rowHeight,
-        resetScrollTopWhenDataChange,
-        scrollTop,
-      }),
-    body: {
-      wrapper: VWrapper,
-      row: VRow,
-      cell: VCell,
-    },
-  };
-}

src/hooks/useScrollHeight.ts

@@ -0,0 +1,14 @@
+import { RefObject, useState } from 'react';
+import useResizeObserver from '@react-hook/resize-observer';
+
+export default <T extends HTMLElement>(target: RefObject<T>) => {
+  const [height, setHeight] = useState<number>(0);
+
+  useResizeObserver(target, (entry) => {
+    let _height = entry.target.clientHeight;
+    if (height !== _height) {
+      setHeight(_height);
+    }
+  });
+  return height;
+};

src/hooks/useTableScrollHeight.ts

@@ -1,9 +1,9 @@
-import { MutableRefObject, useLayoutEffect, useState } from 'react';
+import { RefObject, useState } from 'react';
 import useResizeObserver from '@react-hook/resize-observer';
 import { getTableScroll } from '@/utils';
 
 export default <T extends HTMLElement>(
-  target: MutableRefObject<T>,
+  target: RefObject<T>,
   extraHeight?: number,
 ) => {
   const [height, setHeight] = useState<number>(0);

src/layouts/defaultProps.tsx

@@ -1,14 +1,5 @@
-import {
-  FormOutlined,
-  FieldTimeOutlined,
-  DiffOutlined,
-  SettingOutlined,
-  CodeOutlined,
-  FolderOutlined,
-  RadiusSettingOutlined,
-  ControlOutlined,
-  ContainerOutlined,
-} from '@ant-design/icons';
+import intl from 'react-intl-universal';
+import { SettingOutlined } from '@ant-design/icons';
 import IconFont from '@/components/iconfont';
 import { BasicLayoutProps } from '@ant-design/pro-layout';
 
@@ -16,74 +7,74 @@ export default {
   route: {
     routes: [
       {
-        name: '登录',
+        name: intl.get('登录'),
         path: '/login',
         hideInMenu: true,
         component: '@/pages/login/index',
       },
       {
-        name: '初始化',
+        name: intl.get('初始化'),
         path: '/initialization',
         hideInMenu: true,
         component: '@/pages/initialization/index',
       },
       {
-        name: '错误',
+        name: intl.get('错误'),
         path: '/error',
         hideInMenu: true,
         component: '@/pages/error/index',
       },
       {
         path: '/crontab',
-        name: '定时任务',
+        name: intl.get('定时任务'),
         icon: <IconFont type="ql-icon-crontab" />,
         component: '@/pages/crontab/index',
       },
       {
         path: '/subscription',
-        name: '订阅管理',
+        name: intl.get('订阅管理'),
         icon: <IconFont type="ql-icon-subs" />,
         component: '@/pages/subscription/index',
       },
       {
         path: '/env',
-        name: '环境变量',
+        name: intl.get('环境变量'),
         icon: <IconFont type="ql-icon-env" />,
         component: '@/pages/env/index',
       },
       {
         path: '/config',
-        name: '配置文件',
+        name: intl.get('配置文件'),
         icon: <IconFont type="ql-icon-config" />,
         component: '@/pages/config/index',
       },
       {
         path: '/script',
-        name: '脚本管理',
+        name: intl.get('脚本管理'),
         icon: <IconFont type="ql-icon-script" />,
         component: '@/pages/script/index',
       },
       {
         path: '/dependence',
-        name: '依赖管理',
+        name: intl.get('依赖管理'),
         icon: <IconFont type="ql-icon-dependence" />,
         component: '@/pages/dependence/index',
       },
       {
         path: '/log',
-        name: '日志管理',
+        name: intl.get('日志管理'),
         icon: <IconFont type="ql-icon-log" />,
         component: '@/pages/log/index',
       },
       {
         path: '/diff',
-        name: '对比工具',
+        name: intl.get('对比工具'),
         icon: <IconFont type="ql-icon-diff" />,
         component: '@/pages/diff/index',
       },
       {
         path: '/setting',
-        name: '系统设置',
+        name: intl.get('系统设置'),
         icon: <SettingOutlined />,
         component: '@/pages/password/index',
       },

src/layouts/index.less

@@ -1,6 +1,5 @@
 @import '~antd/es/style/themes/default.less';
 @import '~@/styles/variable.less';
-@import '~codemirror/lib/codemirror.css';
 
 @font-face {
   font-family: 'Source Code Pro';
@@ -25,16 +24,35 @@ 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;
 }
 
 .log-modal {
-  .ant-modal {
-    padding-bottom: 0 !important;
-    width: 580px !important;
+  &.ant-modal {
+    max-width: 1000px !important;
+    width: 80vw !important;
+  }
+
+  .ant-modal-body {
+    overflow-y: auto;
+    min-height: 300px;
+    max-height: calc(80vh - 110px);
+    max-height: calc(80vh - var(--vh-offset, 110px));
+    padding: 0;
+    display: flex;
+
+    .log-container {
+      width: 100%;
+      padding: 24px;
+      overflow-y: auto;
+    }
   }
 
   pre {
@@ -87,10 +105,12 @@ body {
 }
 
 .ant-tooltip {
-  max-width: 500px !important;
+  max-width: 300px !important;
 
   .ant-tooltip-inner {
     word-break: break-all !important;
+    max-height: 300px !important;
+    overflow-y: auto !important;
   }
 }
 
@@ -165,6 +185,7 @@ body {
       .react-codemirror2,
       .CodeMirror {
         height: 100%;
+        overflow: auto;
       }
     }
   }
@@ -182,8 +203,14 @@ body {
     }
   }
 
+  .log-modal {
+    &.ant-modal {
+      width: calc(100vw - 16px) !important;
+    }
+  }
+
   .ant-tooltip {
-    max-width: 250px !important;
+    max-width: 300px !important;
   }
 }
 
@@ -332,6 +359,8 @@ select:-webkit-autofill:focus {
 }
 
 .ant-pro-sider-logo {
+  padding-inline: 5px !important;
+
   .title {
     display: flex;
     height: 32px;
@@ -366,9 +395,9 @@ select:-webkit-autofill:focus {
 }
 
 pre {
-  word-break: break-all !important;
-  white-space: break-spaces !important;
-  padding: 0 !important;
+  word-break: break-all;
+  white-space: break-spaces;
+  padding: 0;
 }
 
 .virtuallist {
@@ -418,3 +447,18 @@ body[data-mode='phone'] header {
   box-shadow: none;
   border-right: 1px solid #eee;
 }
+
+.ant-table.ant-table-middle .ant-table-title,
+.ant-table.ant-table-middle .ant-table-footer,
+.ant-table.ant-table-middle .ant-table-thead > tr > th,
+.ant-table.ant-table-middle .ant-table-tbody > tr > td,
+.ant-table.ant-table-middle tfoot > tr > th,
+.ant-table.ant-table-middle tfoot > tr > td {
+  padding: 12px 16px;
+}
+
+body[data-dark='true'] {
+  .ant-popover-arrow-content {
+    --antd-arrow-background-color: rgb(24, 26, 27);
+  }
+}

src/layouts/index.tsx

@@ -1,4 +1,5 @@
-import React, { useEffect, useState, useRef } from 'react';
+import intl from 'react-intl-universal';
+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';
@@ -28,12 +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 'codemirror/mode/javascript/javascript';
-import 'codemirror/mode/python/python';
-import 'codemirror/mode/shell/shell';
+import WebSocketManager from '../utils/websocket';
 
 export interface SharedContext {
   headerStyle: React.CSSProperties;
@@ -42,15 +40,13 @@ export interface SharedContext {
   user: any;
   reloadUser: (needLoading?: boolean) => void;
   reloadTheme: () => void;
-  socketMessage: any;
   systemInfo: TSystemInfo;
 }
 
 interface TSystemInfo {
   branch: 'develop' | 'master';
   isInitialized: boolean;
-  lastCommitId: string;
-  lastCommitTime: number;
+  publishTime: number;
   version: string;
   changeLog: string;
   changeLogLink: string;
@@ -63,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 {
@@ -183,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]);
 
@@ -249,7 +225,6 @@ export default function () {
             user,
             reloadUser,
             reloadTheme,
-            ws: ws.current,
           }}
         />
       );
@@ -265,7 +240,7 @@ export default function () {
   const menu: MenuProps = {
     items: [
       {
-        label: '退出登录',
+        label: intl.get('退出登录'),
         className: 'side-menu-user-drop-menu',
         onClick: logout,
         key: 'logout',
@@ -284,7 +259,7 @@ export default function () {
         <>
           <Image preview={false} src="https://qn.whyour.cn/logo.png" />
           <div className="title">
-            <span className="title">青龙</span>
+            <span className="title">{intl.get('青龙')}</span>
             <a
               href={systemInfo?.changeLogLink}
               target="_blank"
@@ -294,7 +269,11 @@ export default function () {
               }}
             >
               <Tooltip
-                title={systemInfo?.branch === 'develop' ? '开发版' : '正式版'}
+                title={
+                  systemInfo?.branch === 'develop'
+                    ? intl.get('开发版')
+                    : intl.get('正式版')
+                }
               >
                 <Badge size="small" dot={systemInfo?.branch === 'develop'}>
                   <span
@@ -327,8 +306,9 @@ export default function () {
       }}
       pageTitleRender={(props, pageName, info) => {
         const title =
-          (config.documentTitleMap as any)[location.pathname] || '未找到';
-        return `${title} - 青龙`;
+          (config.documentTitleMap as any)[location.pathname] ||
+          intl.get('未找到');
+        return `${title} - ${intl.get('青龙')}`;
       }}
       onCollapse={setCollapsed}
       collapsed={collapsed}
@@ -340,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>
@@ -362,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>
@@ -385,7 +365,6 @@ export default function () {
           user,
           reloadUser,
           reloadTheme,
-          socketMessage,
           systemInfo,
         }}
       />

src/locales/en-US.json

@@ -0,0 +1,470 @@
+{
+  "复制成功": "Copy successful",
+  "复制": "Copy",
+  "新建": "New",
+  "登录": "Login",
+  "初始化": "Initialize",
+  "错误": "Error",
+  "定时任务": "Scheduled Tasks",
+  "订阅管理": "Subscription Management",
+  "环境变量": "Environment Variables",
+  "配置文件": "Configuration Files",
+  "脚本管理": "Script Management",
+  "依赖管理": "Dependency Management",
+  "日志管理": "Log Management",
+  "对比工具": "Comparison Tool",
+  "系统设置": "System Settings",
+  "退出登录": "Logout",
+  "青龙": "Qinglong",
+  "返回首页": "Return to Home",
+  "保存": "Save",
+  "日志": "Log",
+  "脚本": "Script",
+  "确认保存文件": "Confirm to Save File",
+  "，保存后不可恢复": ", it can't be recovered after saving.",
+  "确认运行": "Confirm to Run",
+  "确认运行定时任务": "Confirm to Run Scheduled Task",
+  "吗": "?",
+  "确认停止": "Confirm to Stop",
+  "确认停止定时任务": "Confirm to Stop Scheduled Task",
+  "确认": "Confirm",
+  "任务": "Task",
+  "状态": "Status",
+  "空闲中": "Idle",
+  "运行中": "Running",
+  "队列中": "In Queue",
+  "已禁用": "Disabled",
+  "定时": "Schedule",
+  "最后运行时间": "Last Run Time",
+  "最后运行时长": "Last Run Duration",
+  "下次运行时间": "Next Run Time",
+  "名称": "Name",
+  "命令/脚本": "Command/Script",
+  "定时规则": "Schedule Rule",
+  "操作": "Action",
+  "确认删除": "Confirm to Delete",
+  "确认删除定时任务": "Confirm to Delete Scheduled Task",
+  "编辑": "Edit",
+  "删除": "Delete",
+  "确认删除选中的定时任务吗": "Confirm to delete the selected scheduled tasks?",
+  "选中的定时任务吗": "selected scheduled tasks?",
+  "创建视图": "Create View",
+  "视图管理": "View Management",
+  "请输入名称或者关键词": "Please enter a name or keyword",
+  "创建任务": "Create Task",
+  "更多": "More",
+  "批量删除": "Batch Delete",
+  "批量启用": "Batch Enable",
+  "批量禁用": "Batch Disable",
+  "批量运行": "Batch Run",
+  "批量停止": "Batch Stop",
+  "批量置顶": "Batch Top",
+  "批量取消置顶": "Batch Un-top",
+  "批量修改标签": "Batch Modify Tags",
+  "已选择": "Selected",
+  "项": "items",
+  "知道了": "Got it",
+  "请输入任务名称": "Please enter the task name",
+  "支持输入脚本路径/任意系统可执行命令/task 脚本路径": "Supports input of script paths / any system executable commands / task script paths",
+  "秒(可选) 分 时 天 月 周": "Seconds (optional) Minutes Hours Day Month Week",
+  "标签": "Tags",
+  "取消": "Cancel",
+  "添加": "Add",
+  "启用": "Enable",
+  "禁用": "Disable",
+  "运行": "Run",
+  "停止": "Stop",
+  "置顶": "Top",
+  "取消置顶": "Un-top",
+  "命令": "Command",
+  "包含": "Include",
+  "不包含": "Exclude",
+  "属于": "Belong to",
+  "不属于": "Not Belong to",
+  "顺序": "Order",
+  "倒序": "Reverse",
+  "且": "And",
+  "或": "Or",
+  "输入后回车增加自定义选项": "Press Enter to add custom options",
+  "视图名称": "View Name",
+  "请输入视图名称": "Please enter the view name",
+  "请输入内容": "Please enter the content",
+  "新增筛选条件": "Add Filter",
+  "新增排序方式": "Add Sort",
+  "类型": "Type",
+  "显示": "Display",
+  "确认删除视图": "Confirm to delete the view",
+  "安装中": "Installing",
+  "已安装": "Installed",
+  "安装失败": "Installation Failed",
+  "删除中": "Deleting",
+  "已删除": "Deleted",
+  "删除失败": "Deletion Failed",
+  "序号": "Number",
+  "备注": "Remarks",
+  "更新时间": "Update Time",
+  "创建时间": "Creation Time",
+  "确认删除依赖": "Confirm to delete the dependency",
+  "确认重新安装": "Confirm to reinstall",
+  "确认删除选中的依赖吗": "Confirm to delete the selected dependencies?",
+  "确认重新安装选中的依赖吗": "Confirm to reinstall the selected dependencies?",
+  "请输入名称": "Please enter a name",
+  "创建依赖": "Create Dependency",
+  "批量安装": "Batch Install",
+  "批量强制删除": "Batch Force Delete",
+  "日志 -": "Log -",
+  "依赖类型": "Dependency Type",
+  "自动拆分": "Auto Split",
+  "多个依赖是否换行分割": "Whether to separate multiple dependencies with new lines",
+  "是": "Yes",
+  "否": "No",
+  "请输入依赖名称，支持指定版本": "Please enter the dependency name, version specification is supported",
+  "请输入依赖名称": "Please enter the dependency name",
+  "请输入备注": "Please enter remarks",
+  "源文件": "Source File",
+  "当前文件": "Current File",
+  "修改环境变量名称": "Modify Environment Variable Name",
+  "请输入新的环境变量名称": "Please enter the new environment variable name",
+  "已启用": "Enabled",
+  "值": "Value",
+  "确认删除变量": "Confirm to delete the variable",
+  "确认删除选中的变量吗": "Confirm to delete the selected variables?",
+  "选中的变量吗": "selected variables?",
+  "请输入名称/值/备注": "Please enter name/value/remarks",
+  "导入": "Import",
+  "创建变量": "Create Variable",
+  "批量修改变量名称": "Batch Modify Variable Names",
+  "批量导出": "Batch Export",
+  "请输入环境变量名称": "Please enter the environment variable name",
+  "只能输入字母数字下划线，且不能以数字开头": "Only letters, numbers, and underscores are allowed, and cannot start with a number",
+  "请输入环境变量值": "Please enter the environment variable value",
+  "服务启动超时": "Service startup timeout",
+  "请先按如下方式修复：": "Please fix it as follows:",
+  "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>": "1. Execute 'docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower -cR <container_name>' on the host machine",
+  "2. 容器内执行 ql -l check、ql -l update": "2. Execute 'ql -l check' and 'ql -l update' inside the container",
+  "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果": "3. If the problem persists, execute 'pm2 logs' inside the container and copy the results",
+  "提交 issue": "Submit an issue",
+  "启动中，请稍后...": "Starting, please wait...",
+  "欢迎使用": "Welcome to use",
+  "欢迎使用青龙": "Welcome to use Qinglong",
+  "支持python3、javascript、shell、typescript 的定时任务管理面板": "A scheduling task management panel that supports python3, javascript, shell, and typescript",
+  "开始安装": "Start Installation",
+  "账户设置": "Account Settings",
+  "用户名": "Username",
+  "密码": "Password",
+  "密码不能为admin": "The password cannot be 'admin'",
+  "确认密码": "Confirm Password",
+  "您输入的两个密码不匹配！": "The two passwords you entered do not match!",
+  "提交": "Submit",
+  "通知设置": "Notification Settings",
+  "通知方式": "Notification Method",
+  "请选择通知方式": "Please select a notification method",
+  "跳过": "Skip",
+  "完成安装": "Installation Completed",
+  "恭喜安装完成！": "Congratulations, the installation is completed!",
+  "Telegram频道": "Telegram Channel",
+  "去登录": "Go to Login",
+  "初始化配置": "Initialize Configuration",
+  "文件": "File",
+  "，删除后不可恢复": ", it can't be recovered after deletion",
+  "请选择日志": "Please select a log",
+  "请输入日志名": "Please enter the log name",
+  "暂无日志": "No logs available",
+  "登录成功！": "Login successful!",
+  "上次登录时间：": "Last login time: ",
+  "上次登录地点：": "Last login location: ",
+  "上次登录IP：": "Last login IP: ",
+  "上次登录设备：": "Last login device: ",
+  "上次登录状态：": "Last login status: ",
+  "验证码": "Verification Code",
+  "验证码为6位数字": "Verification code is a 6-digit number",
+  "6位数字": "6-digit number",
+  "验证": "Verify",
+  "请": "Please",
+  "秒后重试": "Retry after seconds",
+  "在您的设备上打开两步验证应用程序以查看您的身份验证代码并验证您的身份。": "Open the two-factor authentication application on your device to view your authentication code and verify your identity.",
+  "请选择脚本文件": "Please select a script file",
+  "清空日志": "Clear Logs",
+  "设置": "Settings",
+  "退出": "Exit",
+  "空文件": "Empty File",
+  "本地文件": "Local File",
+  "文件夹": "Folder",
+  "文件名": "File Name",
+  "请输入文件名": "Please enter the file name",
+  "文件名不能包含斜杠": "File names cannot contain slashes",
+  "文件夹名": "Folder Name",
+  "请输入文件夹名": "Please enter the folder name",
+  "父目录": "Parent Directory",
+  "请选择父目录": "Please select a parent directory",
+  "点击或者拖拽文件到此区域上传": "Click or drag files here to upload",
+  "当前修改未保存，确定离开吗": "The current changes are not saved. Are you sure you want to leave?",
+  "退出编辑": "Exit Editing",
+  "重命名": "Rename",
+  "请选择脚本": "Please select a script",
+  "调试": "Debug",
+  "请输入脚本名": "Please enter the script name",
+  "暂无脚本": "No scripts available",
+  "请输入新名称": "Please enter a new name",
+  "保存文件": "Save File",
+  "保存目录": "Save Directory",
+  "请输入保存目录，默认scripts目录": "Please enter the save directory, default is 'scripts'",
+  "运行设置": "Run Settings",
+  "待开发": "To Be Developed",
+  "开发版": "Developer Edition",
+  "正式版": "Official Edition",
+  "版本": "Version",
+  "更新日志": "Changelog",
+  "查看": "View",
+  "提交BUG": "Submit Bug",
+  "名称不能为保留关键字": "The name cannot be a reserved keyword",
+  "请输入应用名称": "Please enter the application name",
+  "权限": "Permission",
+  "请选择模块权限": "Please select module permissions",
+  "更新": "Update",
+  "已经是最新版了！": "It is already the latest version!",
+  "是目前检测到的最新可用版本了。": "It is the latest available version currently detected.",
+  "重新下载": "Redownload",
+  "更新可用": "Update Available",
+  "新版本": "Create Version",
+  "可用，你使用的版本为": "available, the version you are using is",
+  "下载更新": "Download Update",
+  "以后再说": "Later",
+  "下载更新中...": "Downloading Update...",
+  "确认重启": "Confirm to Restart",
+  "系统安装包下载成功，确认重启": "System installation package downloaded successfully, confirm to restart",
+  "重启": "Restart",
+  "系统将在": "The system will restart in",
+  "秒后自动刷新": "seconds and automatically refresh",
+  "检查更新": "Check for Updates",
+  "确认删除应用": "Confirm to delete the application",
+  "确认重置": "Confirm to reset",
+  "确认重置应用": "Confirm to reset the application",
+  "的Secret吗": "'s Secret?",
+  "重置Secret会让当前应用所有token失效": "Resetting the Secret will invalidate all tokens for the current application",
+  "创建应用": "Create Application",
+  "安全设置": "Security Settings",
+  "应用设置": "Application Settings",
+  "登录日志": "Login Logs",
+  "其他设置": "Other Settings",
+  "关于": "About",
+  "成功": "Success",
+  "失败": "Failure",
+  "登录时间": "Login Time",
+  "登录地址": "Login Address",
+  "登录IP": "Login IP",
+  "登录设备": "Login Device",
+  "登录状态": "Login Status",
+  "亮色": "Light",
+  "暗色": "Dark",
+  "跟随系统": "Follow System",
+  "备份数据上传成功，确认覆盖数据": "Data backup uploaded successfully, confirm data overwrite",
+  "主题设置": "Theme Settings",
+  "日志删除频率": "Log Deletion Frequency",
+  "每x天自动删除x天以前的日志": "Automatically delete logs older than x days every x days",
+  "每": "Every",
+  "天": "day(s)",
+  "定时任务并发数": "Concurrent Scheduled Tasks",
+  "数据备份还原": "Data Backup & Restore",
+  "还原数据": "Restore Data",
+  "第一步": "Step 1",
+  "下载两步验证手机应用，比如 Google Authenticator 、": "Download a two-factor authentication mobile app, like Google Authenticator,",
+  "第二步": "Step 2",
+  "使用手机应用扫描二维码，或者输入秘钥": "Scan the QR code with the mobile app or enter the key",
+  "第三步": "Step 3",
+  "输入手机应用上的6位数字": "Enter the 6-digit code from the mobile app",
+  "完成设置": "Finish Setup",
+  "修改用户名密码": "Change Username and Password",
+  "两步验证": "Two-Factor Authentication",
+  "头像": "Profile Picture",
+  "更换头像": "Change Profile Picture",
+  "时": "hour(s)",
+  "分": "minute(s)",
+  "秒": "second(s)",
+  "私有仓库": "Private Repository",
+  "公开仓库": "Public Repository",
+  "单文件": "Single File",
+  "链接": "Link",
+  "分支": "Branch",
+  "确认删除定时订阅": "Confirm Deletion of Scheduled Subscription",
+  "定时订阅": "Scheduled Subscription",
+  "创建订阅": "Create Subscription",
+  "私钥": "Private Key",
+  "请输入私钥": "Please enter the private key",
+  "请输入认证用户名": "Please enter the authentication username",
+  "Github已不支持密码认证，请使用Token方式": "Github no longer supports password authentication. Please use the Token method.",
+  "密码/Token": "Password/Token",
+  "请输入密码或者Token": "Please enter the password or Token",
+  "支持拷贝 ql repo/raw 命令，粘贴导入": "Supports copying ql repo/raw command for import",
+  "请输入订阅链接": "Please enter the subscription link",
+  "请输入分支": "Please enter the branch",
+  "唯一值": "Unique Value",
+  "唯一值用于日志目录和私钥别名": "Unique value used for log directory and private key alias",
+  "自动生成": "Auto-generated",
+  "拉取方式": "Pull Method",
+  "用户名密码/Token": "Username/Password or Token",
+  "定时类型": "Schedule Type",
+  "白名单": "Whitelist",
+  "多个关键词竖线分割，支持正则表达式": "Multiple keywords separated by vertical lines (|), supports regular expressions",
+  "请输入脚本筛选白名单关键词，多个关键词竖线分割": "Please enter script filtering whitelist keywords, multiple keywords separated by vertical lines (|)",
+  "黑名单": "Blacklist",
+  "请输入脚本筛选黑名单关键词，多个关键词竖线分割": "Please enter script filtering blacklist keywords, multiple keywords separated by vertical lines (|)",
+  "依赖文件": "Dependency Files",
+  "请输入脚本依赖文件关键词，多个关键词竖线分割": "Please enter script dependency file keywords, multiple keywords separated by vertical lines (|)",
+  "文件后缀": "File Extension",
+  "仓库需要拉取的文件后缀，多个后缀空格分隔，默认使用配置文件中的RepoFileExtensions": "Repository requires pulling specific file extensions, multiple extensions separated by spaces, uses RepoFileExtensions from the configuration file by default",
+  "请输入文件后缀": "Please enter the file extension",
+  "执行前": "Before Execution",
+  "运行订阅前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "Run commands before executing the subscription, e.g., cp/mv/python3 xxx.py/node xxx.js",
+  "请输入运行订阅前要执行的命令": "Please enter the command to run before executing the subscription",
+  "执行后": "After Execution",
+  "运行订阅后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js": "Run commands after executing the subscription, e.g., cp/mv/python3 xxx.py/node xxx.js",
+  "请输入运行订阅后要执行的命令": "Please enter the command to run after executing the subscription",
+  "代理": "Proxy",
+  "公开仓库支持HTTP/SOCK5代理，私有仓库支持SOCK5代理": "Public repositories support HTTP/SOCK5 proxies, private repositories support SOCK5 proxies",
+  "自动添加任务": "Automatically Add Tasks",
+  "自动删除任务": "Automatically Delete Tasks",
+  "中文": "Chinese",
+  "系统信息": "System Information",
+  "Server酱": "ServerChan",
+  "Telegram机器人": "Telegram Bot",
+  "钉钉机器人": "DingTalk Bot",
+  "企业微信机器人": "WeChat Work Bot",
+  "企业微信应用": "WeChat Work App",
+  "智能微秘书": "Smart WeChat Assistant",
+  "群晖chat": "Synology Chat",
+  "邮箱": "Email",
+  "飞书机器人": "Feishu Bot",
+  "自定义通知": "Custom Notification",
+  "已关闭": "Disabled",
+  "gotify的url地址，例如 https://push.example.de:8080": "gotify URL address, e.g., https://push.example.de:8080",
+  "gotify的消息应用token码": "gotify message application token code",
+  "推送消息的优先级": "Priority of Push Messages",
+  "chat的url地址": "Chat URL address",
+  "chat的token码": "Chat token code",
+  "推送到个人QQ: http://127.0.0.1/send_private_msg，群：http://127.0.0.1/send_group_msg": "Push to personal QQ: http://127.0.0.1/send_private_msg, group: http://127.0.0.1/send_group_msg",
+  "访问密钥": "Access Key",
+  "如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群": "If GOBOT_URL is set to /send_private_msg, enter user_id=personal QQ; if set to /send_group_msg, enter group_id=QQ group",
+  "Server酱SENDKEY": "ServerChan SENDKEY",
+  "PushDeer的Key，https://github.com/easychen/pushdeer": "PushDeer Key, https://github.com/easychen/pushdeer",
+  "PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push": "PushDeer's self-hosted API endpoint, default is https://api2.pushdeer.com/message/push",
+  "Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX": "Bark information IP/device code, e.g., https://api.day.app/XXXXXXXX",
+  "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",
+  "代理端口": "Proxy Port",
+  "telegram代理配置认证参数，用户名与密码用英文冒号连接 user:password": "Telegram proxy configuration authentication parameters, connect username and password with a colon, e.g., user:password",
+  "telegram api自建的反向代理地址，默认tg官方api": "Telegram API's self-built reverse proxy address, default is official tg API",
+  "钉钉机器人webhook token，例如：5a544165465465645d0f31dca676e7bd07415asdasd": "DingTalk Bot webhook token, e.g., 5a544165465465645d0f31dca676e7bd07415asdasd",
+  "密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的字符串": "Secret key, shown below the signing section on the robot's security settings page, starts with SEC",
+  "企业微信机器人的webhook(详见文档 https://work.weixin.qq.com/api/doc/90000/90136/91770)，例如：693a91f6-7xxx-4bc4-97a0-0ec2sifa5aaa": "WeChat Work Bot webhook (see documentation at https://work.weixin.qq.com/api/doc/90000/90136/91770), e.g., 693a91f6-7xxx-4bc4-97a0-0ec2sifa5aaa",
+  "企业微信代理地址": "WeChat Work Proxy Address",
+  "corpid、corpsecret、touser(注:多个成员ID使用|隔开)、agentid、消息类型(选填，不填默认文本消息类型) 注意用,号隔开(英文输入法的逗号)，例如：wwcfrs,B-76WERQ,qinglong,1000001,2COat": "corpid, corpsecret, touser (note: separate multiple member IDs with |), agentid, message type (optional, defaults to text message type) – separated by commas (`,`), e.g., wwcfrs, B-76WERQ, qinglong, 1000001, 2COat",
+  "密钥key，智能微秘书个人中心获取apikey，申请地址：https://wechat.aibotk.com/signup?from=ql": "Key, obtain the API key from the Smart WeChat Assistant's personal center, apply at: https://wechat.aibotk.com/signup?from=ql",
+  "发送的目标，群组或者好友": "Recipient, group, or friend",
+  "请输入要发送的目标": "Please enter the recipient's name (group or friend)",
+  "群聊": "Group Chat",
+  "好友": "Friend",
+  "要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称": "Enter the recipient's nickname if it's a friend or the group name if it's a group",
+  "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot information push key, e.g., https://push.hellyw.com/XXXXXXXX",
+  "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "After WeChat scan login, one-to-one or one-to-many push using the provided token (your Token). If PUSH_PLUS_USER is not provided, it defaults to one-to-one push. See reference at https://www.pushplus.plus/",
+  "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "The 'group code' for one-to-many push (one-to-many push -> your group (if none, create one) -> group code). If you are the creator of the group, you need to click 'View QR code' to scan and bind, otherwise, you won't receive group messages.",
+  "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "Feishu group bot: https://www.feishu.cn/hc/zh-CN/articles/360024984973",
+  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://nodemailer.com/smtp/well-known/",
+  "邮箱地址": "Email Address",
+  "邮箱SMTP授权码": "Email SMTP Authorization Code",
+  "PushMe的Key，https://push.i-i.me/": "PushMe key, https://push.i-i.me/",
+  "请求方法": "Request Method",
+  "请求头Content-Type": "Request Header Content-Type",
+  "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "Request URL should start with http or https. URL or body must contain $title, $content is optional and corresponds to the API content position.",
+  "请求头格式Custom-Header1: Header1，多个换行分割": "Request header format: Custom-Header1: Header1 (separate multiple headers with line breaks)",
+  "请求体格式key1: value1，多个换行分割。url或者body中必须包含$title，$content可选，对应api内容的位置": "Request body format: key1: value1 (separate multiple keys with line breaks). URL or body must contain $title, $content is optional and corresponds to the API content position.",
+  "错误日志": "Error Log",
+  "执行结束": "Execution Finished",
+  "备份": "Backup",
+  "生成数据中...": "Generating data...",
+  "请选择日志文件": "Please select a log file",
+  "筛选条件": "Filter Conditions",
+  "系统": "System",
+  "个人": "Personal",
+  "重新安装": "Reinstall",
+  "强制删除": "Force Delete",
+  "全部任务": "All Tasks",
+  "关联订阅": "Associate Subscription",
+  "订阅": "Subscription",
+  "创建": "Create",
+  "同时删除关联任务和脚本": "Delete associated tasks and scripts as well",
+  "未找到": "Not Found",
+  "保存成功": "Saved successfully",
+  "删除成功": "Deleted successfully",
+  "批量删除成功": "Batch deleted successfully",
+  "启动中...": "Starting...",
+  "任务未运行": "Task not running",
+  "更新任务成功": "Task updated successfully",
+  "创建任务成功": "Task created successfully",
+  "编辑任务": "Edit Task",
+  "Cron表达式格式有误": "Incorrect Cron Expression Format",
+  "添加Labels成功": "Labels added successfully",
+  "删除Labels成功": "Labels deleted successfully",
+  "编辑视图": "Edit View",
+  "排序方式": "Sort Order",
+  "开始时间": "Start Time",
+  "安装": "Install",
+  "结束时间": "End Time",
+  "编辑依赖": "Edit Dependency",
+  "更新环境变量名称成功": "Environment Variable Name updated successfully",
+  "更新变量成功": "Variable updated successfully",
+  "创建变量成功": "Variable created successfully",
+  "编辑变量": "Edit Variable",
+  "加载中...": "Loading...",
+  "夹下所以日志": "Folder and All Subfiles",
+  "创建文件夹成功": "Folder created successfully",
+  "创建文件成功": "File created successfully",
+  "夹及其子文件": "Folder and Its Subfiles",
+  "更新名称成功": "Name updated successfully",
+  "保存文件成功": "File saved successfully",
+  "更新应用成功": "Application updated successfully",
+  "创建应用成功": "Application created successfully",
+  "编辑应用": "Edit Application",
+  "检查更新中...": "Checking for updates...",
+  "失败，请检查": "Failed, please check",
+  "更新失败，请检查网络及日志或稍后再试": "Update failed, please check network and logs or try again later",
+  "更新包下载成功": "Update package download successful",
+  "重置secret": "Reset secret",
+  "重置成功": "Reset successful",
+  "通知发送成功": "Notification sent successfully",
+  "通知关闭成功": "Notification closed successfully",
+  "测试中...": "Testing...",
+  "上传": "Upload",
+  "下载": "Download",
+  "更新成功": "Update successful",
+  "激活成功": "Activation successful",
+  "验证失败": "Validation failed",
+  "更新订阅成功": "Subscription updated successfully",
+  "创建订阅成功": "Subscription created successfully",
+  "编辑订阅": "Edit Subscription",
+  "Subscription表达式格式有误": "Incorrect Subscription Expression Format",
+  "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则新建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "The 'Group Code' for One-to-Many Push (Below One-to-Many Push->Your Group (if not, create one)->Group Code, if you are the creator of the group, you also need to click 'View QR Code' to scan and bind, otherwise you cannot receive group messages)",
+  "登录已过期，请重新登录": "Login session has expired, please log in again",
+  "系统日志": "System Logs",
+  "主题": "Theme",
+  "语言": "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

@@ -0,0 +1,470 @@
+{
+  "复制成功": "复制成功",
+  "复制": "复制",
+  "新建": "新建",
+  "登录": "登录",
+  "初始化": "初始化",
+  "错误": "错误",
+  "定时任务": "定时任务",
+  "订阅管理": "订阅管理",
+  "环境变量": "环境变量",
+  "配置文件": "配置文件",
+  "脚本管理": "脚本管理",
+  "依赖管理": "依赖管理",
+  "日志管理": "日志管理",
+  "对比工具": "对比工具",
+  "系统设置": "系统设置",
+  "退出登录": "退出登录",
+  "青龙": "青龙",
+  "返回首页": "返回首页",
+  "保存": "保存",
+  "日志": "日志",
+  "脚本": "脚本",
+  "确认保存文件": "确认保存文件",
+  "，保存后不可恢复": "，保存后不可恢复",
+  "确认运行": "确认运行",
+  "确认运行定时任务": "确认运行定时任务",
+  "吗": "吗",
+  "确认停止": "确认停止",
+  "确认停止定时任务": "确认停止定时任务",
+  "确认": "确认",
+  "任务": "任务",
+  "状态": "状态",
+  "空闲中": "空闲中",
+  "运行中": "运行中",
+  "队列中": "队列中",
+  "已禁用": "已禁用",
+  "定时": "定时",
+  "最后运行时间": "最后运行时间",
+  "最后运行时长": "最后运行时长",
+  "下次运行时间": "下次运行时间",
+  "名称": "名称",
+  "命令/脚本": "命令/脚本",
+  "定时规则": "定时规则",
+  "操作": "操作",
+  "确认删除": "确认删除",
+  "确认删除定时任务": "确认删除定时任务",
+  "编辑": "编辑",
+  "删除": "删除",
+  "确认删除选中的定时任务吗": "确认删除选中的定时任务吗",
+  "选中的定时任务吗": "选中的定时任务吗",
+  "创建视图": "创建视图",
+  "视图管理": "视图管理",
+  "请输入名称或者关键词": "请输入名称或者关键词",
+  "创建任务": "创建任务",
+  "更多": "更多",
+  "批量删除": "批量删除",
+  "批量启用": "批量启用",
+  "批量禁用": "批量禁用",
+  "批量运行": "批量运行",
+  "批量停止": "批量停止",
+  "批量置顶": "批量置顶",
+  "批量取消置顶": "批量取消置顶",
+  "批量修改标签": "批量修改标签",
+  "已选择": "已选择",
+  "项": "项",
+  "知道了": "知道了",
+  "请输入任务名称": "请输入任务名称",
+  "支持输入脚本路径/任意系统可执行命令/task 脚本路径": "支持输入脚本路径/任意系统可执行命令/task 脚本路径",
+  "秒(可选) 分 时 天 月 周": "秒(可选) 分 时 天 月 周",
+  "标签": "标签",
+  "取消": "取消",
+  "添加": "添加",
+  "启用": "启用",
+  "禁用": "禁用",
+  "运行": "运行",
+  "停止": "停止",
+  "置顶": "置顶",
+  "取消置顶": "取消置顶",
+  "命令": "命令",
+  "包含": "包含",
+  "不包含": "不包含",
+  "属于": "属于",
+  "不属于": "不属于",
+  "顺序": "顺序",
+  "倒序": "倒序",
+  "且": "且",
+  "或": "或",
+  "输入后回车增加自定义选项": "输入后回车增加自定义选项",
+  "视图名称": "视图名称",
+  "请输入视图名称": "请输入视图名称",
+  "请输入内容": "请输入内容",
+  "新增筛选条件": "新增筛选条件",
+  "新增排序方式": "新增排序方式",
+  "类型": "类型",
+  "显示": "显示",
+  "确认删除视图": "确认删除视图",
+  "安装中": "安装中",
+  "已安装": "已安装",
+  "安装失败": "安装失败",
+  "删除中": "删除中",
+  "已删除": "已删除",
+  "删除失败": "删除失败",
+  "序号": "序号",
+  "备注": "备注",
+  "更新时间": "更新时间",
+  "创建时间": "创建时间",
+  "确认删除依赖": "确认删除依赖",
+  "确认重新安装": "确认重新安装",
+  "确认删除选中的依赖吗": "确认删除选中的依赖吗",
+  "确认重新安装选中的依赖吗": "确认重新安装选中的依赖吗",
+  "请输入名称": "请输入名称",
+  "创建依赖": "创建依赖",
+  "批量安装": "批量安装",
+  "批量强制删除": "批量强制删除",
+  "日志 -": "日志 -",
+  "依赖类型": "依赖类型",
+  "自动拆分": "自动拆分",
+  "多个依赖是否换行分割": "多个依赖是否换行分割",
+  "是": "是",
+  "否": "否",
+  "请输入依赖名称，支持指定版本": "请输入依赖名称，支持指定版本",
+  "请输入依赖名称": "请输入依赖名称",
+  "请输入备注": "请输入备注",
+  "源文件": "源文件",
+  "当前文件": "当前文件",
+  "修改环境变量名称": "修改环境变量名称",
+  "请输入新的环境变量名称": "请输入新的环境变量名称",
+  "已启用": "已启用",
+  "值": "值",
+  "确认删除变量": "确认删除变量",
+  "确认删除选中的变量吗": "确认删除选中的变量吗",
+  "选中的变量吗": "选中的变量吗",
+  "请输入名称/值/备注": "请输入名称/值/备注",
+  "导入": "导入",
+  "创建变量": "创建变量",
+  "批量修改变量名称": "批量修改变量名称",
+  "批量导出": "批量导出",
+  "请输入环境变量名称": "请输入环境变量名称",
+  "只能输入字母数字下划线，且不能以数字开头": "只能输入字母数字下划线，且不能以数字开头",
+  "请输入环境变量值": "请输入环境变量值",
+  "服务启动超时": "服务启动超时",
+  "请先按如下方式修复：": "请先按如下方式修复：",
+  "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>": "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>",
+  "2. 容器内执行 ql -l check、ql -l update": "2. 容器内执行 ql -l check、ql -l update",
+  "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果": "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果",
+  "提交 issue": "提交 issue",
+  "启动中，请稍后...": "启动中，请稍后...",
+  "欢迎使用": "欢迎使用",
+  "欢迎使用青龙": "欢迎使用青龙",
+  "支持python3、javascript、shell、typescript 的定时任务管理面板": "支持python3、javascript、shell、typescript 的定时任务管理面板",
+  "开始安装": "开始安装",
+  "账户设置": "账户设置",
+  "用户名": "用户名",
+  "密码": "密码",
+  "密码不能为admin": "密码不能为admin",
+  "确认密码": "确认密码",
+  "您输入的两个密码不匹配！": "您输入的两个密码不匹配！",
+  "提交": "提交",
+  "通知设置": "通知设置",
+  "通知方式": "通知方式",
+  "请选择通知方式": "请选择通知方式",
+  "跳过": "跳过",
+  "完成安装": "完成安装",
+  "恭喜安装完成！": "恭喜安装完成！",
+  "Telegram频道": "Telegram频道",
+  "去登录": "去登录",
+  "初始化配置": "初始化配置",
+  "文件": "文件",
+  "，删除后不可恢复": "，删除后不可恢复",
+  "请选择日志": "请选择日志",
+  "请输入日志名": "请输入日志名",
+  "暂无日志": "暂无日志",
+  "登录成功！": "登录成功！",
+  "上次登录时间：": "上次登录时间：",
+  "上次登录地点：": "上次登录地点：",
+  "上次登录IP：": "上次登录IP：",
+  "上次登录设备：": "上次登录设备：",
+  "上次登录状态：": "上次登录状态：",
+  "验证码": "验证码",
+  "验证码为6位数字": "验证码为6位数字",
+  "6位数字": "6位数字",
+  "验证": "验证",
+  "请": "请",
+  "秒后重试": "秒后重试",
+  "在您的设备上打开两步验证应用程序以查看您的身份验证代码并验证您的身份。": "在您的设备上打开两步验证应用程序以查看您的身份验证代码并验证您的身份。",
+  "请选择脚本文件": "请选择脚本文件",
+  "清空日志": "清空日志",
+  "设置": "设置",
+  "退出": "退出",
+  "空文件": "空文件",
+  "本地文件": "本地文件",
+  "文件夹": "文件夹",
+  "文件名": "文件名",
+  "请输入文件名": "请输入文件名",
+  "文件名不能包含斜杠": "文件名不能包含斜杠",
+  "文件夹名": "文件夹名",
+  "请输入文件夹名": "请输入文件夹名",
+  "父目录": "父目录",
+  "请选择父目录": "请选择父目录",
+  "点击或者拖拽文件到此区域上传": "点击或者拖拽文件到此区域上传",
+  "当前修改未保存，确定离开吗": "当前修改未保存，确定离开吗",
+  "退出编辑": "退出编辑",
+  "重命名": "重命名",
+  "请选择脚本": "请选择脚本",
+  "调试": "调试",
+  "请输入脚本名": "请输入脚本名",
+  "暂无脚本": "暂无脚本",
+  "请输入新名称": "请输入新名称",
+  "保存文件": "保存文件",
+  "保存目录": "保存目录",
+  "请输入保存目录，默认scripts目录": "请输入保存目录，默认scripts目录",
+  "运行设置": "运行设置",
+  "待开发": "待开发",
+  "开发版": "开发版",
+  "正式版": "正式版",
+  "版本": "版本",
+  "更新日志": "更新日志",
+  "查看": "查看",
+  "提交BUG": "提交BUG",
+  "名称不能为保留关键字": "名称不能为保留关键字",
+  "请输入应用名称": "请输入应用名称",
+  "权限": "权限",
+  "请选择模块权限": "请选择模块权限",
+  "更新": "更新",
+  "已经是最新版了！": "已经是最新版了！",
+  "是目前检测到的最新可用版本了。": "是目前检测到的最新可用版本了。",
+  "重新下载": "重新下载",
+  "更新可用": "更新可用",
+  "新版本": "新版本",
+  "可用，你使用的版本为": "可用，你使用的版本为",
+  "下载更新": "下载更新",
+  "以后再说": "以后再说",
+  "下载更新中...": "下载更新中...",
+  "确认重启": "确认重启",
+  "系统安装包下载成功，确认重启": "系统安装包下载成功，确认重启",
+  "重启": "重启",
+  "系统将在": "系统将在",
+  "秒后自动刷新": "秒后自动刷新",
+  "检查更新": "检查更新",
+  "确认删除应用": "确认删除应用",
+  "确认重置": "确认重置",
+  "确认重置应用": "确认重置应用",
+  "的Secret吗": "的Secret吗",
+  "重置Secret会让当前应用所有token失效": "重置Secret会让当前应用所有token失效",
+  "创建应用": "创建应用",
+  "安全设置": "安全设置",
+  "应用设置": "应用设置",
+  "登录日志": "登录日志",
+  "其他设置": "其他设置",
+  "关于": "关于",
+  "成功": "成功",
+  "失败": "失败",
+  "登录时间": "登录时间",
+  "登录地址": "登录地址",
+  "登录IP": "登录IP",
+  "登录设备": "登录设备",
+  "登录状态": "登录状态",
+  "亮色": "亮色",
+  "暗色": "暗色",
+  "跟随系统": "跟随系统",
+  "备份数据上传成功，确认覆盖数据": "备份数据上传成功，确认覆盖数据",
+  "主题设置": "主题设置",
+  "日志删除频率": "日志删除频率",
+  "每x天自动删除x天以前的日志": "每x天自动删除x天以前的日志",
+  "每": "每",
+  "天": "天",
+  "定时任务并发数": "定时任务并发数",
+  "数据备份还原": "数据备份还原",
+  "还原数据": "还原数据",
+  "第一步": "第一步",
+  "下载两步验证手机应用，比如 Google Authenticator 、": "下载两步验证手机应用，比如 Google Authenticator 、",
+  "第二步": "第二步",
+  "使用手机应用扫描二维码，或者输入秘钥": "使用手机应用扫描二维码，或者输入秘钥",
+  "第三步": "第三步",
+  "输入手机应用上的6位数字": "输入手机应用上的6位数字",
+  "完成设置": "完成设置",
+  "修改用户名密码": "修改用户名密码",
+  "两步验证": "两步验证",
+  "头像": "头像",
+  "更换头像": "更换头像",
+  "时": "时",
+  "分": "分",
+  "秒": "秒",
+  "私有仓库": "私有仓库",
+  "公开仓库": "公开仓库",
+  "单文件": "单文件",
+  "链接": "链接",
+  "分支": "分支",
+  "确认删除定时订阅": "确认删除定时订阅",
+  "定时订阅": "定时订阅",
+  "创建订阅": "创建订阅",
+  "私钥": "私钥",
+  "请输入私钥": "请输入私钥",
+  "请输入认证用户名": "请输入认证用户名",
+  "Github已不支持密码认证，请使用Token方式": "Github已不支持密码认证，请使用Token方式",
+  "密码/Token": "密码/Token",
+  "请输入密码或者Token": "请输入密码或者Token",
+  "支持拷贝 ql repo/raw 命令，粘贴导入": "支持拷贝 ql repo/raw 命令，粘贴导入",
+  "请输入订阅链接": "请输入订阅链接",
+  "请输入分支": "请输入分支",
+  "唯一值": "唯一值",
+  "唯一值用于日志目录和私钥别名": "唯一值用于日志目录和私钥别名",
+  "自动生成": "自动生成",
+  "拉取方式": "拉取方式",
+  "用户名密码/Token": "用户名密码/Token",
+  "定时类型": "定时类型",
+  "白名单": "白名单",
+  "多个关键词竖线分割，支持正则表达式": "多个关键词竖线分割，支持正则表达式",
+  "请输入脚本筛选白名单关键词，多个关键词竖线分割": "请输入脚本筛选白名单关键词，多个关键词竖线分割",
+  "黑名单": "黑名单",
+  "请输入脚本筛选黑名单关键词，多个关键词竖线分割": "请输入脚本筛选黑名单关键词，多个关键词竖线分割",
+  "依赖文件": "依赖文件",
+  "请输入脚本依赖文件关键词，多个关键词竖线分割": "请输入脚本依赖文件关键词，多个关键词竖线分割",
+  "文件后缀": "文件后缀",
+  "仓库需要拉取的文件后缀，多个后缀空格分隔，默认使用配置文件中的RepoFileExtensions": "仓库需要拉取的文件后缀，多个后缀空格分隔，默认使用配置文件中的RepoFileExtensions",
+  "请输入文件后缀": "请输入文件后缀",
+  "执行前": "执行前",
+  "运行订阅前执行的命令，比如 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",
+  "请输入运行订阅后要执行的命令": "请输入运行订阅后要执行的命令",
+  "代理": "代理",
+  "公开仓库支持HTTP/SOCK5代理，私有仓库支持SOCK5代理": "公开仓库支持HTTP/SOCK5代理，私有仓库支持SOCK5代理",
+  "自动添加任务": "自动添加任务",
+  "自动删除任务": "自动删除任务",
+  "中文": "中文",
+  "系统信息": "系统信息",
+  "Server酱": "Server酱",
+  "Telegram机器人": "Telegram机器人",
+  "钉钉机器人": "钉钉机器人",
+  "企业微信机器人": "企业微信机器人",
+  "企业微信应用": "企业微信应用",
+  "智能微秘书": "智能微秘书",
+  "群晖chat": "群晖chat",
+  "邮箱": "邮箱",
+  "飞书机器人": "飞书机器人",
+  "自定义通知": "自定义通知",
+  "已关闭": "已关闭",
+  "gotify的url地址，例如 https://push.example.de:8080": "gotify的url地址，例如 https://push.example.de:8080",
+  "gotify的消息应用token码": "gotify的消息应用token码",
+  "推送消息的优先级": "推送消息的优先级",
+  "chat的url地址": "chat的url地址",
+  "chat的token码": "chat的token码",
+  "推送到个人QQ: http://127.0.0.1/send_private_msg，群：http://127.0.0.1/send_group_msg": "推送到个人QQ: http://127.0.0.1/send_private_msg，群：http://127.0.0.1/send_group_msg",
+  "访问密钥": "访问密钥",
+  "如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群": "如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群",
+  "Server酱SENDKEY": "Server酱SENDKEY",
+  "PushDeer的Key，https://github.com/easychen/pushdeer": "PushDeer的Key，https://github.com/easychen/pushdeer",
+  "PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push": "PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push",
+  "Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX": "Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX",
+  "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",
+  "代理端口": "代理端口",
+  "telegram代理配置认证参数，用户名与密码用英文冒号连接 user:password": "telegram代理配置认证参数, 用户名与密码用英文冒号连接 user:password",
+  "telegram api自建的反向代理地址，默认tg官方api": "telegram api自建的反向代理地址，默认tg官方api",
+  "钉钉机器人webhook token，例如：5a544165465465645d0f31dca676e7bd07415asdasd": "钉钉机器人webhook token，例如：5a544165465465645d0f31dca676e7bd07415asdasd",
+  "密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的字符串": "密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的字符串",
+  "企业微信机器人的webhook(详见文档 https://work.weixin.qq.com/api/doc/90000/90136/91770)，例如：693a91f6-7xxx-4bc4-97a0-0ec2sifa5aaa": "企业微信机器人的 webhook(详见文档 https://work.weixin.qq.com/api/doc/90000/90136/91770)，例如：693a91f6-7xxx-4bc4-97a0-0ec2sifa5aaa",
+  "企业微信代理地址": "企业微信代理地址",
+  "corpid、corpsecret、touser(注:多个成员ID使用|隔开)、agentid、消息类型(选填，不填默认文本消息类型) 注意用,号隔开(英文输入法的逗号)，例如：wwcfrs,B-76WERQ,qinglong,1000001,2COat": "corpid,corpsecret,touser(注:多个成员ID使用|隔开),agentid,消息类型(选填,不填默认文本消息类型) 注意用,号隔开(英文输入法的逗号)，例如：wwcfrs,B-76WERQ,qinglong,1000001,2COat",
+  "密钥key，智能微秘书个人中心获取apikey，申请地址：https://wechat.aibotk.com/signup?from=ql": "密钥key,智能微秘书个人中心获取apikey，申请地址：https://wechat.aibotk.com/signup?from=ql",
+  "发送的目标，群组或者好友": "发送的目标，群组或者好友",
+  "请输入要发送的目标": "请输入要发送的目标",
+  "群聊": "群聊",
+  "好友": "好友",
+  "要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称": "要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称",
+  "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX",
+  "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/",
+  "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）",
+  "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973",
+  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/",
+  "邮箱地址": "邮箱地址",
+  "邮箱SMTP授权码": "邮箱SMTP授权码",
+  "PushMe的Key，https://push.i-i.me/": "PushMe的Key，https://push.i-i.me/",
+  "请求方法": "请求方法",
+  "请求头Content-Type": "请求头Content-Type",
+  "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置",
+  "请求头格式Custom-Header1: Header1，多个换行分割": "请求头格式Custom-Header1: Header1，多个换行分割",
+  "请求体格式key1: value1，多个换行分割。url或者body中必须包含$title，$content可选，对应api内容的位置": "请求体格式key1: value1，多个换行分割。url或者body中必须包含$title，$content可选，对应api内容的位置",
+  "错误日志": "错误日志",
+  "执行结束": "执行结束",
+  "备份": "备份",
+  "生成数据中...": "生成数据中...",
+  "请选择日志文件": "请选择日志文件",
+  "筛选条件": "筛选条件",
+  "系统": "系统",
+  "个人": "个人",
+  "重新安装": "重新安装",
+  "强制删除": "强制删除",
+  "全部任务": "全部任务",
+  "关联订阅": "关联订阅",
+  "订阅": "订阅",
+  "创建": "创建",
+  "同时删除关联任务和脚本": "同时删除关联任务和脚本",
+  "未找到": "未找到",
+  "保存成功": "保存成功",
+  "删除成功": "删除成功",
+  "批量删除成功": "批量删除成功",
+  "启动中...": "启动中...",
+  "任务未运行": "任务未运行",
+  "更新任务成功": "更新任务成功",
+  "创建任务成功": "创建任务成功",
+  "编辑任务": "编辑任务",
+  "Cron表达式格式有误": "Cron表达式格式有误",
+  "添加Labels成功": "添加Labels成功",
+  "删除Labels成功": "删除Labels成功",
+  "编辑视图": "编辑视图",
+  "排序方式": "排序方式",
+  "开始时间": "开始时间",
+  "安装": "安装",
+  "结束时间": "结束时间",
+  "编辑依赖": "编辑依赖",
+  "更新环境变量名称成功": "更新环境变量名称成功",
+  "更新变量成功": "更新变量成功",
+  "创建变量成功": "创建变量成功",
+  "编辑变量": "编辑变量",
+  "加载中...": "加载中...",
+  "夹下所以日志": "夹下所以日志",
+  "创建文件夹成功": "创建文件夹成功",
+  "创建文件成功": "创建文件成功",
+  "夹及其子文件": "夹及其子文件",
+  "更新名称成功": "更新名称成功",
+  "保存文件成功": "保存文件成功",
+  "更新应用成功": "更新应用成功",
+  "创建应用成功": "创建应用成功",
+  "编辑应用": "编辑应用",
+  "检查更新中...": "检查更新中...",
+  "失败，请检查": "失败，请检查",
+  "更新失败，请检查网络及日志或稍后再试": "更新失败，请检查网络及日志或稍后再试",
+  "更新包下载成功": "更新包下载成功",
+  "重置secret": "重置secret",
+  "重置成功": "重置成功",
+  "通知发送成功": "通知发送成功",
+  "通知关闭成功": "通知关闭成功",
+  "测试中...": "测试中...",
+  "上传": "上传",
+  "下载": "下载",
+  "更新成功": "更新成功",
+  "激活成功": "激活成功",
+  "验证失败": "验证失败",
+  "更新订阅成功": "更新订阅成功",
+  "创建订阅成功": "创建订阅成功",
+  "编辑订阅": "编辑订阅",
+  "Subscription表达式格式有误": "Subscription表达式格式有误",
+  "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则新建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则新建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）",
+  "登录已过期，请重新登录": "登录已过期，请重新登录",
+  "系统日志": "系统日志",
+  "主题": "主题",
+  "语言": "语言",
+  "中...": "中...",
+  "请选择操作符": "请选择操作符",
+  "新增定时规则": "新增定时规则",
+  "运行任务前执行的命令，比如 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/404.tsx

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import React from 'react';
 import { Button, Result, Typography } from 'antd';
 
@@ -9,7 +10,7 @@ const NotFound: React.FC = () => (
     title="404"
     extra={
       <Button type="primary">
-        <Link href="/">返回首页</Link>
+        <Link href="/">{intl.get('返回首页')}</Link>
       </Button>
     }
   />

src/pages/config/index.tsx

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal'
 import React, {
   PureComponent,
   Fragment,
@@ -10,9 +11,10 @@ import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
 import { request } from '@/utils/http';
 import Editor from '@monaco-editor/react';
-import { Controlled as CodeMirror } from 'react-codemirror2';
+import CodeMirror from '@uiw/react-codemirror';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
+import { langs } from '@uiw/codemirror-extensions-langs';
 
 const Config = () => {
   const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
@@ -51,12 +53,10 @@ const Config = () => {
       : value;
 
     request
-      .post(`${config.apiPrefix}configs/save`, {
-        data: { content, name: select },
-      })
+      .post(`${config.apiPrefix}configs/save`, { content, name: select })
       .then(({ code, data }) => {
         if (code === 200) {
-          message.success('保存成功');
+          message.success(intl.get('保存成功'));
         }
         setConfirmLoading(false);
       });
@@ -95,7 +95,7 @@ const Config = () => {
           type="primary"
           onClick={updateConfig}
         >
-          保存
+          {intl.get('保存')}
         </Button>,
       ]}
       header={{
@@ -105,16 +105,11 @@ const Config = () => {
       {isPhone ? (
         <CodeMirror
           value={value}
-          options={{
-            lineNumbers: true,
-            styleActiveLine: true,
-            matchBrackets: true,
-            mode: 'shell',
-          }}
-          onBeforeChange={(editor, data, value) => {
+          theme={theme.includes('dark') ? 'dark' : 'light'}
+          extensions={[langs.shell()]}
+          onChange={(value) => {
             setValue(value);
           }}
-          onChange={(editor, data, value) => {}}
         />
       ) : (
         <Editor

src/pages/crontab/detail.tsx

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import React, { useEffect, useRef, useState } from 'react';
 import {
   Modal,
@@ -29,34 +30,29 @@ import config from '@/utils/config';
 import CronLogModal from './logModal';
 import Editor from '@monaco-editor/react';
 import IconFont from '@/components/iconfont';
-import { getCommandScript } from '@/utils';
+import { getCommandScript, getEditorMode } from '@/utils';
+import VirtualList from 'rc-virtual-list';
+import useScrollHeight from '@/hooks/useScrollHeight';
+import dayjs from 'dayjs';
 
 const { Text } = Typography;
 
 const tabList = [
   {
     key: 'log',
-    tab: '日志',
+    tab: intl.get('日志'),
   },
   {
     key: 'script',
-    tab: '脚本',
+    tab: intl.get('脚本'),
   },
 ];
-const LangMap: any = {
-  '.py': 'python',
-  '.js': 'javascript',
-  '.sh': 'shell',
-  '.ts': 'typescript',
-};
 
 interface LogItem {
   directory: string;
   filename: string;
 }
 
-const language = navigator.language || navigator.languages[0];
-
 const CronDetailModal = ({
   cron = {},
   handleCancel,
@@ -81,23 +77,32 @@ const CronDetailModal = ({
   const [logUrl, setLogUrl] = useState('');
   const [validTabs, setValidTabs] = useState(tabList);
   const [currentCron, setCurrentCron] = useState<any>({});
+  const listRef = useRef<HTMLDivElement>(null);
+  const tableScrollHeight = useScrollHeight(listRef);
 
   const contentList: any = {
     log: (
-      <List
-        dataSource={logs}
-        loading={loading}
-        renderItem={(item) => (
-          <List.Item className="log-item" onClick={() => onClickItem(item)}>
-            <FileOutlined style={{ marginRight: 10 }} />
-            {item.directory}/{item.filename}
-          </List.Item>
-        )}
-      />
+      <div ref={listRef}>
+        <List>
+          <VirtualList
+            data={logs}
+            height={tableScrollHeight}
+            itemHeight={47}
+            itemKey="filename"
+          >
+            {(item) => (
+              <List.Item className="log-item" onClick={() => onClickItem(item)}>
+                <FileOutlined style={{ marginRight: 10 }} />
+                {item.directory}/{item.filename}
+              </List.Item>
+            )}
+          </VirtualList>
+        </List>
+      </div>
     ),
     script: scriptInfo.filename && (
       <Editor
-        language={LangMap[scriptInfo.filename.slice(-3)] || ''}
+        language={getEditorMode(scriptInfo.filename)}
         theme={theme}
         value={value}
         options={{
@@ -115,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 || ''}`,
@@ -170,11 +176,11 @@ const CronDetailModal = ({
       title: `确认保存`,
       content: (
         <>
-          确认保存文件
+          {intl.get('确认保存文件')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {scriptInfo.filename}
           </Text>{' '}
-          ，保存后不可恢复
+          {intl.get('，保存后不可恢复')}
         </>
       ),
       onOk() {
@@ -184,11 +190,9 @@ const CronDetailModal = ({
         return new Promise((resolve, reject) => {
           request
             .put(`${config.apiPrefix}scripts`, {
-              data: {
-                filename: scriptInfo.filename,
-                path: scriptInfo.parent || '',
-                content,
-              },
+              filename: scriptInfo.filename,
+              path: scriptInfo.parent || '',
+              content,
             })
             .then(({ code, data }) => {
               if (code === 200) {
@@ -208,19 +212,19 @@ const CronDetailModal = ({
 
   const runCron = () => {
     Modal.confirm({
-      title: '确认运行',
+      title: intl.get('确认运行'),
       content: (
         <>
-          确认运行定时任务{' '}
+          {intl.get('确认运行定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {currentCron.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
         request
-          .put(`${config.apiPrefix}crons/run`, { data: [currentCron.id] })
+          .put(`${config.apiPrefix}crons/run`, [currentCron.id])
           .then(({ code, data }) => {
             if (code === 200) {
               setCurrentCron({ ...currentCron, status: CrontabStatus.running });
@@ -238,19 +242,19 @@ const CronDetailModal = ({
 
   const stopCron = () => {
     Modal.confirm({
-      title: '确认停止',
+      title: intl.get('确认停止'),
       content: (
         <>
-          确认停止定时任务{' '}
+          {intl.get('确认停止定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {currentCron.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
         request
-          .put(`${config.apiPrefix}crons/stop`, { data: [currentCron.id] })
+          .put(`${config.apiPrefix}crons/stop`, [currentCron.id])
           .then(({ code, data }) => {
             if (code === 200) {
               setCurrentCron({ ...currentCron, status: CrontabStatus.idle });
@@ -265,15 +269,18 @@ const CronDetailModal = ({
 
   const enabledOrDisabledCron = () => {
     Modal.confirm({
-      title: `确认${currentCron.isDisabled === 1 ? '启用' : '禁用'}`,
+      title: `确认${
+        currentCron.isDisabled === 1 ? intl.get('启用') : intl.get('禁用')
+      }`,
       content: (
         <>
-          确认{currentCron.isDisabled === 1 ? '启用' : '禁用'}
-          定时任务{' '}
+          {intl.get('确认')}
+          {currentCron.isDisabled === 1 ? intl.get('启用') : intl.get('禁用')}
+          {intl.get('定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {currentCron.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
@@ -282,9 +289,7 @@ const CronDetailModal = ({
             `${config.apiPrefix}crons/${
               currentCron.isDisabled === 1 ? 'enable' : 'disable'
             }`,
-            {
-              data: [currentCron.id],
-            },
+            [currentCron.id],
           )
           .then(({ code, data }) => {
             if (code === 200) {
@@ -303,15 +308,18 @@ const CronDetailModal = ({
 
   const pinOrUnPinCron = () => {
     Modal.confirm({
-      title: `确认${currentCron.isPinned === 1 ? '取消置顶' : '置顶'}`,
+      title: `确认${
+        currentCron.isPinned === 1 ? intl.get('取消置顶') : intl.get('置顶')
+      }`,
       content: (
         <>
-          确认{currentCron.isPinned === 1 ? '取消置顶' : '置顶'}
-          定时任务{' '}
+          {intl.get('确认')}
+          {currentCron.isPinned === 1 ? intl.get('取消置顶') : intl.get('置顶')}
+          {intl.get('定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {currentCron.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
@@ -320,9 +328,7 @@ const CronDetailModal = ({
             `${config.apiPrefix}crons/${
               currentCron.isPinned === 1 ? 'unpin' : 'pin'
             }`,
-            {
-              data: [currentCron.id],
-            },
+            [currentCron.id],
           )
           .then(({ code, data }) => {
             if (code === 200) {
@@ -373,7 +379,9 @@ const CronDetailModal = ({
           <div className="operations">
             <Tooltip
               title={
-                currentCron.status === CrontabStatus.idle ? '运行' : '停止'
+                currentCron.status === CrontabStatus.idle
+                  ? intl.get('运行')
+                  : intl.get('停止')
               }
             >
               <Button
@@ -391,7 +399,13 @@ const CronDetailModal = ({
                 }
               />
             </Tooltip>
-            <Tooltip title={currentCron.isDisabled === 1 ? '启用' : '禁用'}>
+            <Tooltip
+              title={
+                currentCron.isDisabled === 1
+                  ? intl.get('启用')
+                  : intl.get('禁用')
+              }
+            >
               <Button
                 type="link"
                 icon={
@@ -407,7 +421,13 @@ const CronDetailModal = ({
                 onClick={enabledOrDisabledCron}
               />
             </Tooltip>
-            <Tooltip title={currentCron.isPinned === 1 ? '取消置顶' : '置顶'}>
+            <Tooltip
+              title={
+                currentCron.isPinned === 1
+                  ? intl.get('取消置顶')
+                  : intl.get('置顶')
+              }
+            >
               <Button
                 type="link"
                 icon={
@@ -437,20 +457,20 @@ const CronDetailModal = ({
       <div className="card-wrapper">
         <Card>
           <div className="cron-detail-info-item">
-            <div className="cron-detail-info-title">任务</div>
+            <div className="cron-detail-info-title">{intl.get('任务')}</div>
             <div className="cron-detail-info-value">{currentCron.command}</div>
           </div>
         </Card>
         <Card style={{ marginTop: 10 }}>
           <div className="cron-detail-info-item">
-            <div className="cron-detail-info-title">状态</div>
+            <div className="cron-detail-info-title">{intl.get('状态')}</div>
             <div className="cron-detail-info-value">
               {(!currentCron.isDisabled ||
                 currentCron.status !== CrontabStatus.idle) && (
                 <>
                   {currentCron.status === CrontabStatus.idle && (
                     <Tag icon={<ClockCircleOutlined />} color="default">
-                      空闲中
+                      {intl.get('空闲中')}
                     </Tag>
                   )}
                   {currentCron.status === CrontabStatus.running && (
@@ -458,12 +478,12 @@ const CronDetailModal = ({
                       icon={<Loading3QuartersOutlined spin />}
                       color="processing"
                     >
-                      运行中
+                      {intl.get('运行中')}
                     </Tag>
                   )}
                   {currentCron.status === CrontabStatus.queued && (
                     <Tag icon={<FieldTimeOutlined />} color="default">
-                      队列中
+                      {intl.get('队列中')}
                     </Tag>
                   )}
                 </>
@@ -471,29 +491,36 @@ const CronDetailModal = ({
               {currentCron.isDisabled === 1 &&
                 currentCron.status === CrontabStatus.idle && (
                   <Tag icon={<CloseCircleOutlined />} color="error">
-                    已禁用
+                    {intl.get('已禁用')}
                   </Tag>
                 )}
             </div>
           </div>
           <div className="cron-detail-info-item">
-            <div className="cron-detail-info-title">定时</div>
-            <div className="cron-detail-info-value">{currentCron.schedule}</div>
+            <div className="cron-detail-info-title">{intl.get('定时')}</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">最后运行时间</div>
+            <div className="cron-detail-info-title">
+              {intl.get('最后运行时间')}
+            </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>
           <div className="cron-detail-info-item">
-            <div className="cron-detail-info-title">最后运行时长</div>
+            <div className="cron-detail-info-title">
+              {intl.get('最后运行时长')}
+            </div>
             <div className="cron-detail-info-value">
               {currentCron.last_running_time
                 ? diffTime(currentCron.last_running_time)
@@ -501,14 +528,12 @@ const CronDetailModal = ({
             </div>
           </div>
           <div className="cron-detail-info-item">
-            <div className="cron-detail-info-title">下次运行时间</div>
+            <div className="cron-detail-info-title">
+              {intl.get('下次运行时间')}
+            </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>
@@ -527,7 +552,7 @@ const CronDetailModal = ({
                   style={{ marginRight: 8 }}
                   onClick={saveFile}
                 >
-                  保存
+                  {intl.get('保存')}
                 </Button>
                 <Button
                   type="primary"

src/pages/crontab/index.less

@@ -10,6 +10,10 @@
         height: calc(90vh - 367px);
         height: calc(90vh - var(--vh-offset, 0px) - 367px);
         overflow-y: auto;
+
+        > div {
+          height: 100%;
+        }
       }
     }
   }
@@ -31,7 +35,7 @@
     overflow: auto;
 
     .ant-card-body {
-      min-width: 600px;
+      min-width: 1000px;
     }
 
     .cron-detail-info-item {
@@ -54,7 +58,7 @@
     .ant-card-body {
       display: flex;
       justify-content: space-between;
-      min-width: 600px;
+      min-width: 1000px;
     }
   }
 
@@ -74,7 +78,6 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-right: 32px;
 
     .operations {
       display: flex;
@@ -90,7 +93,7 @@
 .log-item {
   cursor: pointer;
   &:hover {
-    background: #fafafa;
+    background: #f2f2f2;
   }
 }
 
@@ -182,18 +185,6 @@ tr.drop-over-upward td {
   }
 }
 
-.log-modal {
-  .log-container {
-    overflow-y: auto;
-    min-height: 300px;
-    max-height: calc(80vh - 110px);
-    max-height: calc(80vh - var(--vh-offset, 110px));
-
-    padding: 24px;
-    margin: -24px;
-  }
-}
-
 body[data-mode='desktop'] {
   .crontab-wrapper {
     tbody .ant-table-cell {
@@ -201,3 +192,7 @@ body[data-mode='desktop'] {
     }
   }
 }
+
+.cron.pinned-cron > td {
+  background: #f2f2f2;
+}

src/pages/crontab/index.tsx

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import React, { useState, useEffect, useRef, useMemo } from 'react';
 import {
   Button,
@@ -42,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';
@@ -51,77 +51,53 @@ 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 = () => {
   const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
   const columns: ColumnProps<ICrontab>[] = [
     {
-      title: '名称',
+      title: intl.get('名称'),
       dataIndex: 'name',
       key: 'name',
-      width: 150,
+      fixed: 'left',
+      width: 120,
       render: (text: string, record: any) => (
-        <>
-          <a
+        <Paragraph
+          style={{
+            wordBreak: 'break-all',
+            marginBottom: 0,
+            color: '#1890ff'
+          }}
+          ellipsis={{ tooltip: text, rows: 2 }}
+        >
+          <Link
             onClick={() => {
               setDetailCron(record);
               setIsDetailModalVisible(true);
             }}
           >
-            {record.labels?.length > 0 && record.labels[0] !== '' && false ? (
-              <Popover
-                placement="right"
-                trigger={isPhone ? 'click' : 'hover'}
-                content={
-                  <div>
-                    {record.labels?.map((label: string) => (
-                      <Tag
-                        color="blue"
-                        key={label}
-                        style={{ cursor: 'point' }}
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          setSearchValue(`label:${label}`);
-                          setSearchText(`label:${label}`);
-                        }}
-                      >
-                        <a>{label}</a>
-                      </Tag>
-                    ))}
-                  </div>
-                }
-              >
-                {record.name || '-'}
-              </Popover>
-            ) : (
-              record.name || '-'
-            )}
-            {record.isPinned ? (
-              <span>
-                <PushpinOutlined />
-              </span>
-            ) : (
-              ''
-            )}
-          </a>
-        </>
+            {record.name || '-'}
+          </Link>
+        </Paragraph>
       ),
       sorter: {
         compare: (a, b) => a?.name?.localeCompare(b?.name),
       },
     },
     {
-      title: '命令/脚本',
+      title: intl.get('命令/脚本'),
       dataIndex: 'command',
       key: 'command',
-      width: 300,
+      width: 240,
       render: (text, record) => {
         return (
           <Paragraph
@@ -146,46 +122,98 @@ const Crontab = () => {
       },
     },
     {
-      title: '定时规则',
+      title: intl.get('状态'),
+      key: 'status',
+      dataIndex: 'status',
+      width: 100,
+      filters: [
+        {
+          text: intl.get('运行中'),
+          value: CrontabStatus.running,
+        },
+        {
+          text: intl.get('空闲中'),
+          value: CrontabStatus.idle,
+        },
+        {
+          text: intl.get('已禁用'),
+          value: CrontabStatus.disabled,
+        },
+        {
+          text: intl.get('队列中'),
+          value: CrontabStatus.queued,
+        },
+      ],
+      render: (text, record) => (
+        <>
+          {(!record.isDisabled || record.status !== CrontabStatus.idle) && (
+            <>
+              {record.status === CrontabStatus.idle && (
+                <Tag icon={<ClockCircleOutlined />} color="default">
+                  {intl.get('空闲中')}
+                </Tag>
+              )}
+              {record.status === CrontabStatus.running && (
+                <Tag
+                  icon={<Loading3QuartersOutlined spin />}
+                  color="processing"
+                >
+                  {intl.get('运行中')}
+                </Tag>
+              )}
+              {record.status === CrontabStatus.queued && (
+                <Tag icon={<FieldTimeOutlined />} color="default">
+                  {intl.get('队列中')}
+                </Tag>
+              )}
+            </>
+          )}
+          {record.isDisabled === 1 && record.status === CrontabStatus.idle && (
+            <Tag icon={<CloseCircleOutlined />} color="error">
+              {intl.get('已禁用')}
+            </Tag>
+          )}
+        </>
+      ),
+    },
+    {
+      title: intl.get('定时规则'),
       dataIndex: 'schedule',
       key: 'schedule',
-      width: 110,
+      width: 150,
       sorter: {
         compare: (a, b) => a.schedule.localeCompare(b.schedule),
       },
-    },
-    {
-      title: '最后运行时间',
-      dataIndex: 'last_execution_time',
-      key: 'last_execution_time',
-      width: 150,
-      sorter: {
-        compare: (a, b) => {
-          return (a.last_execution_time || 0) - (b.last_execution_time || 0);
-        },
-      },
       render: (text, record) => {
-        const language = navigator.language || navigator.languages[0];
         return (
-          <span
+          <Paragraph
             style={{
-              display: 'block',
+              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,
             }}
           >
-            {record.last_execution_time
-              ? new Date(record.last_execution_time * 1000)
-                  .toLocaleString(language, {
-                    hour12: false,
-                  })
-                  .replace(' 24:', ' 00:')
-              : '-'}
-          </span>
+            {text}
+          </Paragraph>
         );
       },
     },
     {
-      title: '最后运行时长',
-      width: 120,
+      title: intl.get('最后运行时长'),
+      width: 167,
       dataIndex: 'last_running_time',
       key: 'last_running_time',
       sorter: {
@@ -200,119 +228,95 @@ const Crontab = () => {
       },
     },
     {
-      title: '下次运行时间',
-      width: 150,
+      title: intl.get('最后运行时间'),
+      dataIndex: 'last_execution_time',
+      key: 'last_execution_time',
+      width: 141,
+      sorter: {
+        compare: (a, b) => {
+          return (a.last_execution_time || 0) - (b.last_execution_time || 0);
+        },
+      },
+      render: (text, record) => {
+        return (
+          <span
+            style={{
+              display: 'block',
+            }}
+          >
+            {record.last_execution_time
+              ? dayjs(record.last_execution_time * 1000).format(
+                  'YYYY-MM-DD HH:mm:ss',
+                )
+              : '-'}
+          </span>
+        );
+      },
+    },
+    {
+      title: intl.get('下次运行时间'),
+      width: 144,
       sorter: {
         compare: (a: any, b: any) => {
           return a.nextRunTime - b.nextRunTime;
         },
       },
       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');
       },
     },
     {
-      title: '状态',
-      key: 'status',
-      dataIndex: 'status',
-      width: 88,
-      filters: [
-        {
-          text: '运行中',
-          value: CrontabStatus.running,
-        },
-        {
-          text: '空闲中',
-          value: CrontabStatus.idle,
-        },
-        {
-          text: '已禁用',
-          value: CrontabStatus.disabled,
-        },
-        {
-          text: '队列中',
-          value: CrontabStatus.queued,
-        },
-      ],
-      render: (text, record) => (
-        <>
-          {(!record.isDisabled || record.status !== CrontabStatus.idle) && (
-            <>
-              {record.status === CrontabStatus.idle && (
-                <Tag icon={<ClockCircleOutlined />} color="default">
-                  空闲中
-                </Tag>
-              )}
-              {record.status === CrontabStatus.running && (
-                <Tag
-                  icon={<Loading3QuartersOutlined spin />}
-                  color="processing"
-                >
-                  运行中
-                </Tag>
-              )}
-              {record.status === CrontabStatus.queued && (
-                <Tag icon={<FieldTimeOutlined />} color="default">
-                  队列中
-                </Tag>
-              )}
-            </>
-          )}
-          {record.isDisabled === 1 && record.status === CrontabStatus.idle && (
-            <Tag icon={<CloseCircleOutlined />} color="error">
-              已禁用
-            </Tag>
-          )}
-        </>
-      ),
+      title: intl.get('关联订阅'),
+      width: 185,
+      render: (text, record: any) =>
+        record.sub_id ? (
+          <Name
+            service={() =>
+              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`)
+            }
+            options={{ ready: record?.sub_id, cacheKey: record.sub_id }}
+          />
+        ) : (
+          '-'
+        ),
     },
     {
-      title: '操作',
+      title: intl.get('操作'),
       key: 'action',
-      width: 130,
+      width: 140,
+      fixed: isPhone ? undefined : 'right',
       render: (text, record, index) => {
         const isPc = !isPhone;
         return (
           <Space size="middle">
             {record.status === CrontabStatus.idle && (
-              <Tooltip title={isPc ? '运行' : ''}>
-                <a
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    runCron(record, index);
-                  }}
-                >
-                  <PlayCircleOutlined />
-                </a>
-              </Tooltip>
-            )}
-            {record.status !== CrontabStatus.idle && (
-              <Tooltip title={isPc ? '停止' : ''}>
-                <a
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    stopCron(record, index);
-                  }}
-                >
-                  <PauseCircleOutlined />
-                </a>
-              </Tooltip>
-            )}
-            <Tooltip title={isPc ? '日志' : ''}>
               <a
                 onClick={(e) => {
                   e.stopPropagation();
-                  setLogCron({ ...record, timestamp: Date.now() });
+                  runCron(record, index);
                 }}
               >
-                <FileTextOutlined />
+                {intl.get('运行')}
               </a>
-            </Tooltip>
+            )}
+            {record.status !== CrontabStatus.idle && (
+              <a
+                onClick={(e) => {
+                  e.stopPropagation();
+                  stopCron(record, index);
+                }}
+              >
+                {intl.get('停止')}
+              </a>
+            )}
+            <a
+              onClick={(e) => {
+                e.stopPropagation();
+                setLogCron({ ...record, timestamp: Date.now() });
+              }}
+            >
+              {intl.get('日志')}
+            </a>
             <MoreBtn key="more" record={record} index={index} />
           </Space>
         );
@@ -347,8 +351,9 @@ const Crontab = () => {
   const [cronViews, setCronViews] = useState<any[]>([]);
   const [enabledCronViews, setEnabledCronViews] = useState<any[]>([]);
   const [moreMenuActive, setMoreMenuActive] = useState(false);
-  const tableRef = useRef<any>();
+  const tableRef = useRef<HTMLDivElement>(null);
   const tableScrollHeight = useTableScrollHeight(tableRef);
+  const [activeKey, setActiveKey] = useState('');
 
   const goToScriptManager = (record: any) => {
     const result = getCommandScript(record.command);
@@ -390,7 +395,7 @@ const Crontab = () => {
             data.map((x) => {
               return {
                 ...x,
-                nextRunTime: parseCrontab(x.schedule),
+                nextRunTime: getCrontabsNextDate(x.schedule, x.extra_schedules),
               };
             }),
           );
@@ -412,14 +417,14 @@ const Crontab = () => {
 
   const delCron = (record: any, index: number) => {
     Modal.confirm({
-      title: '确认删除',
+      title: intl.get('确认删除'),
       content: (
         <>
-          确认删除定时任务{' '}
+          {intl.get('确认删除定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {record.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
@@ -427,7 +432,7 @@ const Crontab = () => {
           .delete(`${config.apiPrefix}crons`, { data: [record.id] })
           .then(({ code, data }) => {
             if (code === 200) {
-              message.success('删除成功');
+              message.success(intl.get('删除成功'));
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
               if (i !== -1) {
@@ -445,19 +450,19 @@ const Crontab = () => {
 
   const runCron = (record: any, index: number) => {
     Modal.confirm({
-      title: '确认运行',
+      title: intl.get('确认运行'),
       content: (
         <>
-          确认运行定时任务{' '}
+          {intl.get('确认运行定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {record.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
         request
-          .put(`${config.apiPrefix}crons/run`, { data: [record.id] })
+          .put(`${config.apiPrefix}crons/run`, [record.id])
           .then(({ code, data }) => {
             if (code === 200) {
               const result = [...value];
@@ -480,19 +485,19 @@ const Crontab = () => {
 
   const stopCron = (record: any, index: number) => {
     Modal.confirm({
-      title: '确认停止',
+      title: intl.get('确认停止'),
       content: (
         <>
-          确认停止定时任务{' '}
+          {intl.get('确认停止定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {record.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
         request
-          .put(`${config.apiPrefix}crons/stop`, { data: [record.id] })
+          .put(`${config.apiPrefix}crons/stop`, [record.id])
           .then(({ code, data }) => {
             if (code === 200) {
               const result = [...value];
@@ -516,15 +521,18 @@ const Crontab = () => {
 
   const enabledOrDisabledCron = (record: any, index: number) => {
     Modal.confirm({
-      title: `确认${record.isDisabled === 1 ? '启用' : '禁用'}`,
+      title: `确认${
+        record.isDisabled === 1 ? intl.get('启用') : intl.get('禁用')
+      }`,
       content: (
         <>
-          确认{record.isDisabled === 1 ? '启用' : '禁用'}
-          定时任务{' '}
+          {intl.get('确认')}
+          {record.isDisabled === 1 ? intl.get('启用') : intl.get('禁用')}
+          {intl.get('定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {record.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
@@ -533,9 +541,7 @@ const Crontab = () => {
             `${config.apiPrefix}crons/${
               record.isDisabled === 1 ? 'enable' : 'disable'
             }`,
-            {
-              data: [record.id],
-            },
+            [record.id],
           )
           .then(({ code, data }) => {
             if (code === 200) {
@@ -560,15 +566,18 @@ const Crontab = () => {
 
   const pinOrUnPinCron = (record: any, index: number) => {
     Modal.confirm({
-      title: `确认${record.isPinned === 1 ? '取消置顶' : '置顶'}`,
+      title: `确认${
+        record.isPinned === 1 ? intl.get('取消置顶') : intl.get('置顶')
+      }`,
       content: (
         <>
-          确认{record.isPinned === 1 ? '取消置顶' : '置顶'}
-          定时任务{' '}
+          {intl.get('确认')}
+          {record.isPinned === 1 ? intl.get('取消置顶') : intl.get('置顶')}
+          {intl.get('定时任务')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {record.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
@@ -577,9 +586,7 @@ const Crontab = () => {
             `${config.apiPrefix}crons/${
               record.isPinned === 1 ? 'unpin' : 'pin'
             }`,
-            {
-              data: [record.id],
-            },
+            [record.id],
           )
           .then(({ code, data }) => {
             if (code === 200) {
@@ -604,16 +611,16 @@ const Crontab = () => {
 
   const getMenuItems = (record: any) => {
     return [
-      { label: '编辑', key: 'edit', icon: <EditOutlined /> },
+      { label: intl.get('编辑'), key: 'edit', icon: <EditOutlined /> },
       {
-        label: record.isDisabled === 1 ? '启用' : '禁用',
+        label: record.isDisabled === 1 ? intl.get('启用') : intl.get('禁用'),
         key: 'enableOrDisable',
         icon:
           record.isDisabled === 1 ? <CheckCircleOutlined /> : <StopOutlined />,
       },
-      { label: '删除', key: 'delete', icon: <DeleteOutlined /> },
+      { label: intl.get('删除'), key: 'delete', icon: <DeleteOutlined /> },
       {
-        label: record.isPinned === 1 ? '取消置顶' : '置顶',
+        label: record.isPinned === 1 ? intl.get('取消置顶') : intl.get('置顶'),
         key: 'pinOrUnPin',
         icon: record.isPinned === 1 ? <StopOutlined /> : <PushpinOutlined />,
       },
@@ -676,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,
@@ -700,14 +710,14 @@ const Crontab = () => {
 
   const delCrons = () => {
     Modal.confirm({
-      title: '确认删除',
-      content: <>确认删除选中的定时任务吗</>,
+      title: intl.get('确认删除'),
+      content: <>{intl.get('确认删除选中的定时任务吗')}</>,
       onOk() {
         request
           .delete(`${config.apiPrefix}crons`, { data: selectedRowIds })
           .then(({ code, data }) => {
             if (code === 200) {
-              message.success('批量删除成功');
+              message.success(intl.get('批量删除成功'));
               setSelectedRowIds([]);
               getCrons();
             }
@@ -722,12 +732,19 @@ const Crontab = () => {
   const operateCrons = (operationStatus: number) => {
     Modal.confirm({
       title: `确认${OperationName[operationStatus]}`,
-      content: <>确认{OperationName[operationStatus]}选中的定时任务吗</>,
+      content: (
+        <>
+          {intl.get('确认')}
+          {OperationName[operationStatus]}
+          {intl.get('选中的定时任务吗')}
+        </>
+      ),
       onOk() {
         request
-          .put(`${config.apiPrefix}crons/${OperationPath[operationStatus]}`, {
-            data: selectedRowIds,
-          })
+          .put(
+            `${config.apiPrefix}crons/${OperationPath[operationStatus]}`,
+            selectedRowIds,
+          )
           .then(({ code, data }) => {
             if (code === 200) {
               getCrons();
@@ -774,6 +791,9 @@ const Crontab = () => {
     if (pageConf.page && pageConf.size) {
       getCrons();
     }
+    if (viewConf && viewConf.id) {
+      setActiveKey(viewConf.id);
+    }
   }, [pageConf, viewConf]);
 
   useEffect(() => {
@@ -824,12 +844,12 @@ const Crontab = () => {
         type: 'divider' as 'group',
       },
       {
-        label: '新建视图',
+        label: intl.get('创建视图'),
         key: 'new',
         icon: <PlusOutlined />,
       },
       {
-        label: '视图管理',
+        label: intl.get('视图管理'),
         key: 'manage',
         icon: <SettingOutlined />,
       },
@@ -843,7 +863,12 @@ const Crontab = () => {
       .then(({ code, data }) => {
         if (code === 200) {
           setCronViews(data);
-          const firstEnableView = data.filter((x) => !x.isDisabled);
+          const firstEnableView = data
+            .filter((x) => !x.isDisabled)
+            .map((x) => ({
+              ...x,
+              name: x.name === '全部任务' ? intl.get('全部任务') : x.name,
+            }));
           setEnabledCronViews(firstEnableView);
           setPageConf({
             page: 1,
@@ -876,10 +901,10 @@ const Crontab = () => {
   return (
     <PageContainer
       className="ql-container-wrapper crontab-wrapper ql-container-wrapper-has-tab"
-      title="定时任务"
+      title={intl.get('定时任务')}
       extra={[
         <Search
-          placeholder="请输入名称或者关键词"
+          placeholder={intl.get('请输入名称或者关键词')}
           style={{ width: 'auto' }}
           enterButton
           allowClear
@@ -889,7 +914,7 @@ const Crontab = () => {
           onSearch={onSearch}
         />,
         <Button key="2" type="primary" onClick={() => addCron()}>
-          新建任务
+          {intl.get('创建任务')}
         </Button>,
       ]}
       header={{
@@ -899,6 +924,7 @@ const Crontab = () => {
       <Tabs
         defaultActiveKey="all"
         size="small"
+        activeKey={activeKey}
         tabPosition="top"
         className={`crontab-view ${moreMenuActive ? 'more-active' : ''}`}
         tabBarExtraContent={
@@ -909,7 +935,7 @@ const Crontab = () => {
           >
             <div className={`view-more ${moreMenuActive ? 'active' : ''}`}>
               <Space>
-                更多
+                {intl.get('更多')}
                 <DownOutlined />
               </Space>
               <div className="ant-tabs-ink-bar ant-tabs-ink-bar-animated"></div>
@@ -932,56 +958,57 @@ const Crontab = () => {
               style={{ marginBottom: 5 }}
               onClick={delCrons}
             >
-              批量删除
+              {intl.get('批量删除')}
             </Button>
             <Button
               type="primary"
               onClick={() => operateCrons(0)}
               style={{ marginLeft: 8, marginBottom: 5 }}
             >
-              批量启用
+              {intl.get('批量启用')}
             </Button>
             <Button
               type="primary"
               onClick={() => operateCrons(1)}
               style={{ marginLeft: 8, marginRight: 8 }}
             >
-              批量禁用
+              {intl.get('批量禁用')}
             </Button>
             <Button
               type="primary"
               style={{ marginRight: 8 }}
               onClick={() => operateCrons(2)}
             >
-              批量运行
+              {intl.get('批量运行')}
             </Button>
             <Button type="primary" onClick={() => operateCrons(3)}>
-              批量停止
+              {intl.get('批量停止')}
             </Button>
             <Button
               type="primary"
               onClick={() => operateCrons(4)}
               style={{ marginLeft: 8, marginRight: 8 }}
             >
-              批量置顶
+              {intl.get('批量置顶')}
             </Button>
             <Button
               type="primary"
               onClick={() => operateCrons(5)}
               style={{ marginLeft: 8, marginRight: 8 }}
             >
-              批量取消置顶
+              {intl.get('批量取消置顶')}
             </Button>
             <Button
               type="primary"
               onClick={() => setIsLabelModalVisible(true)}
               style={{ marginLeft: 8, marginRight: 8 }}
             >
-              批量修改标签
+              {intl.get('批量修改标签')}
             </Button>
             <span style={{ marginLeft: 8 }}>
-              已选择
-              <a>{selectedRowIds?.length}</a>项
+              {intl.get('已选择')}
+              <a>{selectedRowIds?.length}</a>
+              {intl.get('项')}
             </span>
           </div>
         )}
@@ -1002,12 +1029,12 @@ const Crontab = () => {
           dataSource={value}
           rowKey="id"
           size="middle"
-          scroll={{ x: 1000, y: tableScrollHeight }}
+          scroll={{ x: 1200, y: tableScrollHeight }}
           loading={loading}
           rowSelection={rowSelection}
           rowClassName={getRowClassName}
           onChange={onPageChange}
-          // components={isPhone ? undefined : vt}
+          components={isPhone || pageConf.size < 50 ? undefined : vt}
         />
       </div>
       <CronLogModal
@@ -1047,9 +1074,6 @@ const Crontab = () => {
         handleCancel={(data) => {
           setIsCreateViewModalVisible(false);
           getCronViews();
-          if (data && data.id === viewConf.id) {
-            setViewConf({ ...viewConf, ...data });
-          }
         }}
       />
       <ViewManageModal
@@ -1060,9 +1084,6 @@ const Crontab = () => {
         }}
         cronViewChange={(data) => {
           getCronViews();
-          if (data && data.id === viewConf.id) {
-            setViewConf({ ...viewConf, ...data });
-          }
         }}
       />
     </PageContainer>

src/pages/crontab/logModal.tsx

@@ -1,5 +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 {
@@ -9,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;
 
@@ -25,11 +35,12 @@ const CronLogModal = ({
   data?: string;
   logUrl?: string;
 }) => {
-  const [value, setValue] = useState<string>('启动中...');
+  const [value, setValue] = useState<string>(intl.get('启动中...'));
   const [loading, setLoading] = useState<any>(true);
   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) {
@@ -40,47 +51,26 @@ 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;
-          setValue(log || '暂无日志');
+          setValue(log || intl.get('暂无日志'));
           const hasNext = Boolean(
-            log &&
-              !logEnded(log) &&
-              !log.includes('重启面板') &&
-              !log.includes('任务未运行'),
+            log && !logEnded(log) && !log.includes('任务未运行'),
           );
+          if (!hasNext && !logEnded(value) && value !== intl.get('启动中...')) {
+            setTimeout(() => {
+              autoScroll();
+            });
+          }
           setExecuting(hasNext);
-          autoScroll();
           if (hasNext) {
             setTimeout(() => {
+              autoScroll();
               getCronLog();
             }, 2000);
           }
-          if (
-            log &&
-            log.includes('重启面板') &&
-            cron.status === CrontabStatus.running
-          ) {
-            message.warning({
-              content: (
-                <span>
-                  系统将在
-                  <Countdown
-                    className="inline-countdown"
-                    format="ss"
-                    value={Date.now() + 1000 * 30}
-                  />
-                  秒后自动刷新
-                </span>
-              ),
-              duration: 10,
-            });
-            setTimeout(() => {
-              window.location.reload();
-            }, 30000);
-          }
         }
       })
       .finally(() => {
@@ -99,7 +89,7 @@ const CronLogModal = ({
       document
         .querySelector('#log-flag')!
         .scrollIntoView({ behavior: 'smooth' });
-    }, 1000);
+    }, 600);
   };
 
   const cancel = () => {
@@ -107,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]);
 
@@ -149,15 +142,12 @@ const CronLogModal = ({
       open={visible}
       centered
       className="log-modal"
-      bodyStyle={{
-        minHeight: '300px',
-      }}
       forceRender
       onOk={() => cancel()}
       onCancel={() => cancel()}
       footer={[
         <Button type="primary" onClick={() => cancel()}>
-          知道了
+          {intl.get('知道了')}
         </Button>,
       ]}
     >
@@ -170,13 +160,12 @@ const CronLogModal = ({
               isPhone
                 ? {
                     fontFamily: 'Source Code Pro',
-                    width: 375,
                     zoom: 0.83,
                   }
                 : {}
             }
           >
-            {value}
+            <Ansi>{value}</Ansi>
           </pre>
         )}
         <div id="log-flag"></div>

src/pages/crontab/modal.tsx

@@ -1,9 +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,
@@ -25,12 +27,15 @@ const CronModal = ({
       payload.id = cron.id;
     }
     try {
-      const { code, data } = await request[method](`${config.apiPrefix}crons`, {
-        data: payload,
-      });
+      const { code, data } = await request[method](
+        `${config.apiPrefix}crons`,
+        payload,
+      );
 
       if (code === 200) {
-        message.success(cron ? '更新Cron成功' : '新建Cron成功');
+        message.success(
+          cron ? intl.get('更新任务成功') : intl.get('创建任务成功'),
+        );
         handleCancel(data);
       }
       setLoading(false);
@@ -45,7 +50,7 @@ const CronModal = ({
 
   return (
     <Modal
-      title={cron ? '编辑任务' : '新建任务'}
+      title={cron ? intl.get('编辑任务') : intl.get('创建任务')}
       open={visible}
       forceRender
       centered
@@ -69,23 +74,29 @@ const CronModal = ({
         name="form_in_modal"
         initialValues={cron}
       >
-        <Form.Item name="name" label="名称">
-          <Input placeholder="请输入任务名称" />
+        <Form.Item
+          name="name"
+          label={intl.get('名称')}
+          rules={[{ required: true, whitespace: true }]}
+        >
+          <Input placeholder={intl.get('请输入任务名称')} />
         </Form.Item>
         <Form.Item
           name="command"
-          label="命令/脚本"
+          label={intl.get('命令/脚本')}
           rules={[{ required: true, whitespace: true }]}
         >
           <Input.TextArea
             rows={4}
-            autoSize={true}
-            placeholder="支持输入脚本路径/任意系统可执行命令/task 脚本路径"
+            autoSize={{ minRows: 1, maxRows: 5 }}
+            placeholder={intl.get(
+              '支持输入脚本路径/任意系统可执行命令/task 脚本路径',
+            )}
           />
         </Form.Item>
         <Form.Item
           name="schedule"
-          label="定时规则"
+          label={intl.get('定时规则')}
           rules={[
             { required: true },
             {
@@ -93,17 +104,105 @@ const CronModal = ({
                 if (!value || cronParse.parseExpression(value).hasNext()) {
                   return Promise.resolve();
                 } else {
-                  return Promise.reject('Cron表达式格式有误');
+                  return Promise.reject(intl.get('Cron表达式格式有误'));
                 }
               },
             },
           ]}
         >
-          <Input placeholder="秒(可选) 分 时 天 月 周" />
+          <Input placeholder={intl.get('秒(可选) 分 时 天 月 周')} />
         </Form.Item>
-        <Form.Item name="labels" label="标签">
+        <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>
   );
@@ -130,14 +229,14 @@ const CronLabelModal = ({
         try {
           const { code, data } = await request[action](
             `${config.apiPrefix}crons/labels`,
-            {
-              data: payload,
-            },
+            payload,
           );
 
           if (code === 200) {
             message.success(
-              action === 'post' ? '添加Labels成功' : '删除Labels成功',
+              action === 'post'
+                ? intl.get('添加Labels成功')
+                : intl.get('删除Labels成功'),
             );
             handleCancel(true);
           }
@@ -156,18 +255,18 @@ const CronLabelModal = ({
   }, [ids, visible]);
 
   const buttons = [
-    <Button onClick={() => handleCancel(false)}>取消</Button>,
+    <Button onClick={() => handleCancel(false)}>{intl.get('取消')}</Button>,
     <Button type="primary" danger onClick={() => update('delete')}>
-      删除
+      {intl.get('删除')}
     </Button>,
     <Button type="primary" onClick={() => update('post')}>
-      添加
+      {intl.get('添加')}
     </Button>,
   ];
 
   return (
     <Modal
-      title="批量修改标签"
+      title={intl.get('批量修改标签')}
       open={visible}
       footer={buttons}
       centered
@@ -177,7 +276,7 @@ const CronLabelModal = ({
       confirmLoading={loading}
     >
       <Form form={form} layout="vertical" name="form_in_label_modal">
-        <Form.Item name="labels" label="标签">
+        <Form.Item name="labels" label={intl.get('标签')}>
           <EditableTagGroup />
         </Form.Item>
       </Form>

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

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import React, { useEffect, useState } from 'react';
 import {
   Modal,
@@ -13,15 +14,16 @@ import { request } from '@/utils/http';
 import config from '@/utils/config';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import IconFont from '@/components/iconfont';
-import get from 'lodash/get';
 import { CrontabStatus } from './type';
+import { useRequest } from 'ahooks';
 
 const PROPERTIES = [
-  { name: '命令', value: 'command' },
-  { name: '名称', value: 'name' },
-  { name: '定时规则', value: 'schedule' },
-  { name: '状态', value: 'status' },
-  { name: '标签', value: 'labels' },
+  { name: intl.get('命令'), value: 'command' },
+  { name: intl.get('名称'), value: 'name' },
+  { name: intl.get('定时规则'), value: 'schedule' },
+  { name: intl.get('状态'), value: 'status', onlySelect: true },
+  { name: intl.get('标签'), value: 'labels' },
+  { name: intl.get('订阅'), value: 'sub_id', onlySelect: true },
 ];
 
 const EOperation: any = {
@@ -31,10 +33,10 @@ const EOperation: any = {
   Nin: 'select',
 };
 const OPERATIONS = [
-  { name: '包含', value: 'Reg' },
-  { name: '不包含', value: 'NotReg' },
-  { name: '属于', value: 'In', type: 'select' },
-  { name: '不属于', value: 'Nin', type: 'select' },
+  { name: intl.get('包含'), value: 'Reg' },
+  { name: intl.get('不包含'), value: 'NotReg' },
+  { name: intl.get('属于'), value: 'In', type: 'select' },
+  { name: intl.get('不属于'), value: 'Nin', type: 'select' },
   // { name: '等于', value: 'Eq' },
   // { name: '不等于', value: 'Ne' },
   // { name: '为空', value: 'IsNull' },
@@ -42,18 +44,10 @@ const OPERATIONS = [
 ];
 
 const SORTTYPES = [
-  { name: '顺序', value: 'ASC' },
-  { name: '倒序', value: 'DESC' },
+  { name: intl.get('顺序'), value: 'ASC' },
+  { name: intl.get('倒序'), value: 'DESC' },
 ];
 
-const STATUS_MAP = {
-  status: [
-    { name: '运行中', value: CrontabStatus.running },
-    { name: '空闲中', value: CrontabStatus.idle },
-    { name: '已禁用', value: CrontabStatus.disabled },
-  ],
-};
-
 enum ViewFilterRelation {
   'and' = '且',
   'or' = '或',
@@ -72,6 +66,21 @@ const ViewCreateModal = ({
   const [loading, setLoading] = useState(false);
   const [filterRelation, setFilterRelation] = useState<'and' | 'or'>('and');
   const filtersValue = Form.useWatch('filters', form);
+  const { data } = useRequest(
+    () => request.get(`${config.apiPrefix}subscriptions`),
+    {
+      cacheKey: 'subscriptions',
+    },
+  );
+
+  const STATUS_MAP = {
+    status: [
+      { name: intl.get('运行中'), value: CrontabStatus.running },
+      { name: intl.get('空闲中'), value: CrontabStatus.idle },
+      { name: intl.get('已禁用'), value: CrontabStatus.disabled },
+    ],
+    sub_id: data?.data.map((x) => ({ name: x.name, value: x.id })),
+  };
 
   const handleOk = async (values: any) => {
     setLoading(true);
@@ -80,9 +89,7 @@ const ViewCreateModal = ({
     try {
       const { code, data } = await request[method](
         `${config.apiPrefix}crons/views`,
-        {
-          data: view ? { ...values, id: view.id } : values,
-        },
+        view ? { ...values, id: view.id } : values,
       );
 
       if (code === 200) {
@@ -100,20 +107,29 @@ const ViewCreateModal = ({
     }
     form.setFieldsValue(
       view || {
-        filters: [{ property: 'command', operation: 'Reg' }],
+        filters: [{ property: 'command' }],
       },
     );
   }, [view, visible]);
 
-  const operationElement = (
-    <Select style={{ width: 80 }}>
-      {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 (
@@ -139,7 +155,11 @@ const ViewCreateModal = ({
 
   const statusElement = (property: keyof typeof STATUS_MAP) => {
     return (
-      <Select mode="tags" allowClear placeholder="输入后回车增加自定义选项">
+      <Select
+        mode="tags"
+        allowClear
+        placeholder={intl.get('输入后回车增加自定义选项')}
+      >
         {STATUS_MAP[property]?.map((x) => (
           <Select.Option key={x.name} value={x.value}>
             {x.name}
@@ -151,7 +171,7 @@ const ViewCreateModal = ({
 
   return (
     <Modal
-      title={view ? '编辑视图' : '新建视图'}
+      title={view ? intl.get('编辑视图') : intl.get('创建视图')}
       open={visible}
       forceRender
       width={580}
@@ -173,13 +193,13 @@ const ViewCreateModal = ({
       <Form form={form} layout="vertical" name="env_modal">
         <Form.Item
           name="name"
-          label="视图名称"
-          rules={[{ required: true, message: '请输入视图名称' }]}
+          label={intl.get('视图名称')}
+          rules={[{ required: true, message: intl.get('请输入视图名称') }]}
         >
-          <Input placeholder="请输入视图名称" />
+          <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 ${
@@ -225,7 +245,7 @@ const ViewCreateModal = ({
               <div>
                 {fields.map(({ key, name, ...restField }) => (
                   <Form.Item
-                    label={name === 0 ? '筛选条件' : ''}
+                    label={name === 0 ? intl.get('筛选条件') : ''}
                     key={key}
                     style={{ marginBottom: 0 }}
                     required
@@ -240,25 +260,29 @@ const ViewCreateModal = ({
                         name={[name, 'property']}
                         rules={[{ required: true }]}
                       >
-                        {propertyElement(PROPERTIES, { width: 90 })}
+                        {propertyElement(PROPERTIES, { width: 120 })}
                       </Form.Item>
                       <Form.Item
                         {...restField}
                         name={[name, 'operation']}
-                        rules={[{ required: true }]}
+                        rules={[
+                          { required: true, message: intl.get('请选择操作符') },
+                        ]}
                       >
-                        {operationElement}
+                        <OperationElement name={name} />
                       </Form.Item>
                       <Form.Item
                         {...restField}
                         name={[name, 'value']}
-                        rules={[{ required: true, message: '请输入内容' }]}
+                        rules={[
+                          { required: true, message: intl.get('请输入内容') },
+                        ]}
                       >
                         {EOperation[filtersValue?.[name]['operation']] ===
                         'select' ? (
                           statusElement(filtersValue?.[name]['property'])
                         ) : (
-                          <Input placeholder="请输入内容" />
+                          <Input placeholder={intl.get('请输入内容')} />
                         )}
                       </Form.Item>
                       {name !== 0 && (
@@ -274,15 +298,16 @@ const ViewCreateModal = ({
                     }
                   >
                     <PlusOutlined />
-                    新增筛选条件
+                    {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 ${
@@ -322,7 +347,7 @@ const ViewCreateModal = ({
               <div>
                 {fields.map(({ key, name, ...restField }) => (
                   <Form.Item
-                    label={name === 0 ? '排序方式' : ''}
+                    label={name === 0 ? intl.get('排序方式') : ''}
                     key={key}
                     style={{ marginBottom: 0 }}
                     className="filter-item"
@@ -349,9 +374,10 @@ const ViewCreateModal = ({
                 <Form.Item>
                   <a onClick={() => add({ property: 'command', type: 'ASC' })}>
                     <PlusOutlined />
-                    新增排序方式
+                    {intl.get('新增排序方式')}
                   </a>
                 </Form.Item>
+                <Form.ErrorList errors={errors} />
               </div>
             </div>
           )}

src/pages/crontab/viewManageModal.tsx

@@ -1,3 +1,4 @@
+import intl from 'react-intl-universal';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import {
   Modal,
@@ -81,18 +82,19 @@ const ViewManageModal = ({
 
   const columns: any = [
     {
-      title: '名称',
+      title: intl.get('名称'),
       dataIndex: 'name',
       key: 'name',
+      render: (v) => (v === '全部任务' ? intl.get('全部任务') : v)
     },
     {
-      title: '类型',
+      title: intl.get('类型'),
       dataIndex: 'type',
       key: 'type',
-      render: (v) => (v === 1 ? '系统' : '个人'),
+      render: (v) => (v === 1 ? intl.get('系统') : intl.get('个人')),
     },
     {
-      title: '显示',
+      title: intl.get('显示'),
       key: 'isDisabled',
       dataIndex: 'isDisabled',
       width: 100,
@@ -107,7 +109,7 @@ const ViewManageModal = ({
       },
     },
     {
-      title: '操作',
+      title: intl.get('操作'),
       key: 'action',
       width: 100,
       render: (text: string, record: any, index: number) => {
@@ -140,14 +142,14 @@ const ViewManageModal = ({
 
   const deleteView = (record: any, index: number) => {
     Modal.confirm({
-      title: '确认删除',
+      title: intl.get('确认删除'),
       content: (
         <>
-          确认删除视图{' '}
+          {intl.get('确认删除视图')}{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {record.name}
           </Text>{' '}
-          吗
+          {intl.get('吗')}
         </>
       ),
       onOk() {
@@ -155,7 +157,7 @@ const ViewManageModal = ({
           .delete(`${config.apiPrefix}crons/views`, { data: [record.id] })
           .then(({ code, data }) => {
             if (code === 200) {
-              message.success('删除成功');
+              message.success(intl.get('删除成功'));
               cronViewChange();
             }
           });
@@ -168,9 +170,9 @@ const ViewManageModal = ({
 
   const onShowChange = (checked: boolean, record: any, index: number) => {
     request
-      .put(`${config.apiPrefix}crons/views/${checked ? 'enable' : 'disable'}`, {
-        data: [record.id],
-      })
+      .put(`${config.apiPrefix}crons/views/${checked ? 'enable' : 'disable'}`, [
+        record.id,
+      ])
       .then(({ code, data }) => {
         if (code === 200) {
           const _list = [...list];
@@ -195,7 +197,9 @@ const ViewManageModal = ({
       const dragRow = list[dragIndex];
       request
         .put(`${config.apiPrefix}crons/views/move`, {
-          data: { fromIndex: dragIndex, toIndex: hoverIndex, id: dragRow.id },
+          fromIndex: dragIndex,
+          toIndex: hoverIndex,
+          id: dragRow.id,
         })
         .then(({ code, data }) => {
           if (code === 200) {
@@ -216,7 +220,7 @@ const ViewManageModal = ({
 
   return (
     <Modal
-      title="视图管理"
+      title={intl.get('视图管理')}
       open={visible}
       centered
       width={620}
@@ -241,7 +245,7 @@ const ViewManageModal = ({
             setIsCreateViewModalVisible(true);
           }}
         >
-          新建视图
+          {intl.get('创建视图')}
         </Button>
       </Space>
       <DndProvider backend={HTML5Backend}>