更新版本 v2.17.4

更新 tsx 版本
修复脚本管理上传文件文件名乱码
2026-08-06 00:34:33 +08:00 · 2024-04-26 21:04:10 +08:00 · 2024-04-26 20:58:48 +08:00 · 2024-04-22 22:39:27 +08:00 · 2024-04-21 22:35:20 +08:00 · 2024-04-21 22:27:51 +08:00
35 changed files with 803 additions and 507 deletions
@@ -2,8 +2,15 @@ name: Build And Push Docker Image

 on:
  push:
+    paths-ignore:
+      - "*.md"
    branches:
-      - "npm-debug"
+      - "master"
+      - "develop"
+    tags:
+      - "v*"
+  schedule:
+    - cron: "00 20 * * *"
  workflow_dispatch:

 jobs:
@@ -156,8 +163,73 @@ jobs:
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=whyour/qinglong:cache
+          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max

      - name: Image digest
        run: |
          echo ${{ steps.docker_build.outputs.digest }}
-  
+  
+  build310:
+    if: ${{ github.ref_name == 'master' }}
+    needs: build-static
+
+    runs-on: ubuntu-20.04
+
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: "8.3.1"
+      - uses: actions/setup-node@v4
+        with:
+          cache: "pnpm"
+
+      - name: Setup timezone
+        uses: szenius/set-timezone@v1.2
+        with:
+          timezoneLinux: Asia/Shanghai
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push python3.10
+        id: docker_build_310
+        uses: docker/build-push-action@v5
+        with:
+          build-args: |
+            MAINTAINER=${{ github.repository_owner }}
+            QL_BRANCH=${{ github.ref_name }}
+            SOURCE_COMMIT=${{ github.sha }}
+          network: host
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
+          context: .
+          file: ./docker/310.Dockerfile
+          push: true
+          tags: whyour/qinglong:python3.10
+          cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
+          cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
+
+      - name: Image digest
+        run: |
+          echo ${{ steps.docker_build_310.outputs.digest }}
@@ -136,7 +136,7 @@ export default (app: Router) => {
        }

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

@@ -30,7 +30,7 @@ export async function getLastModifyFilePath(dir: string) {

    arr.forEach(async (item) => {
      const fullpath = path.join(dir, item);
-      const stats = await fs.stat(fullpath);
+      const stats = await fs.lstat(fullpath);
      if (stats.isFile()) {
        if (stats.mtimeMs >= 0) {
          filePath = fullpath;
@@ -257,7 +257,7 @@ export async function readDirs(

  for (const file of files) {
    const subPath = path.join(dir, file);
-    const stats = await fs.stat(subPath);
+    const stats = await fs.lstat(subPath);
    const key = path.join(relativePath, file);

    if (blacklist.includes(file) || stats.isSymbolicLink()) {
@@ -300,7 +300,7 @@ export async function readDir(
    .filter((x) => !blacklist.includes(x))
    .map(async (file: string) => {
      const subPath = path.join(dir, file);
-      const stats = await fs.stat(subPath);
+      const stats = await fs.lstat(subPath);
      const key = path.join(relativePath, file);
      return {
        title: file,
@@ -360,7 +360,10 @@ export function parseHeaders(headers: string) {
  return parsed;
 }

-function parseString(input: string): Record<string, string> {
+function parseString(
+  input: string,
+  valueFormatFn?: (v: string) => string,
+): Record<string, string> {
  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
  const matches: Record<string, string> = {};

@@ -372,9 +375,10 @@ function parseString(input: string): Record<string, string> {
      continue;
    }

-    const _value = value.trim();
+    let _value = value.trim();

    try {
+      _value = valueFormatFn ? valueFormatFn(_value) : _value;
      const jsonValue = JSON.parse(_value);
      matches[_key] = jsonValue;
    } catch (error) {
@@ -392,12 +396,13 @@ export function parseBody(
    | 'multipart/form-data'
    | 'application/x-www-form-urlencoded'
    | 'text/plain',
+  valueFormatFn?: (v: string) => string,
 ) {
  if (contentType === 'text/plain' || !body) {
-    return body;
+    return valueFormatFn && body ? valueFormatFn(body) : body;
  }

-  const parsed = parseString(body);
+  const parsed = parseString(body, valueFormatFn);

  switch (contentType) {
    case 'multipart/form-data':
@@ -5,28 +5,6 @@ import Sock from './sock';
 export default async ({ server }: { server: Server }) => {
  await Sock({ server });
  Logger.info('✌️ Sock loaded');
-  let exitTime = 0;
-  let timer: NodeJS.Timeout;
-
-  process.on('SIGINT', (singal) => {
-    Logger.warn(`Server need close, singal ${singal}`);
-    console.warn(`Server need close, singal ${singal}`);
-    exitTime++;
-    if (exitTime >= 3) {
-      Logger.warn('Forcing server close');
-      console.warn('Forcing server close');
-      clearTimeout(timer);
-      process.exit(1);
-    }
-    server.close(() => {
-      if (timer) {
-        clearTimeout(timer);
-      }
-      timer = setTimeout(() => {
-        process.exit();
-      }, 15000);
-    });
-  });

  process.on('uncaughtException', (error) => {
    Logger.error('Uncaught exception:', error);
@@ -4,9 +4,9 @@ import cors from 'cors';
 import { Application, NextFunction, Request, Response } from 'express';
 import jwt from 'express-jwt';
 import Container from 'typedi';
-import { Logger } from 'winston';
 import config from '../config';
 import SystemService from '../services/system';
+import Logger from './logger';

 export default ({ app }: { app: Application }) => {
  app.set('trust proxy', 'loopback');
@@ -22,30 +22,43 @@ export default ({ app }: { app: Application }) => {
    }),
  );

+  app.put(
+    '/api/reload',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem();
+        res.send(result);
+      } catch (e) {
+        Logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
  app.put(
    '/api/system',
    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
        const systemService = Container.get(SystemService);
        const result = await systemService.reloadSystem('system');
        res.send(result);
      } catch (e) {
-        logger.error('🔥 error: %o', e);
+        Logger.error('🔥 error: %o', e);
        return next(e);
      }
    },
  );
+
  app.put(
    '/api/data',
    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
        const systemService = Container.get(SystemService);
        const result = await systemService.reloadSystem('data');
        res.send(result);
      } catch (e) {
-        logger.error('🔥 error: %o', e);
+        Logger.error('🔥 error: %o', e);
        return next(e);
      }
    },
@@ -515,7 +515,7 @@ export default class CronService {
          files.map(async (x) => ({
            filename: x,
            directory: relativeDir.replace(config.logPath, ''),
-            time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
+            time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
          })),
        )
      ).sort((a, b) => b.time - a.time);
@@ -525,7 +525,7 @@ export default class NotificationService {
          headers: { 'Content-Type': 'application/json' },
        })
        .json();
-      if (res.StatusCode === 0) {
+      if (res.StatusCode === 0 || res.code === 0) {
        return true;
      } else {
        throw new Error(JSON.stringify(res));
@@ -656,17 +656,14 @@ export default class NotificationService {
      webhookContentType,
    } = this.params;

-    const { formatBody, formatUrl } = this.formatNotifyContent(
-      webhookUrl,
-      webhookBody,
-    );
-
-    if (!formatUrl && !formatBody) {
+    if (!webhookUrl.includes('$title') && !webhookBody.includes('$title')) {
      throw new Error('Url 或者 Body 中必须包含 $title');
    }

    const headers = parseHeaders(webhookHeaders);
-    const body = parseBody(formatBody, webhookContentType);
+    const body = parseBody(webhookBody, webhookContentType, (v) =>
+      v?.replaceAll('$title', this.title)?.replaceAll('$content', this.content),
+    );
    const bodyParam = this.formatBody(webhookContentType, body);
    const options = {
      method: webhookMethod,
@@ -676,6 +673,9 @@ export default class NotificationService {
      ...bodyParam,
    };
    try {
+      const formatUrl = webhookUrl
+        ?.replaceAll('$title', encodeURIComponent(this.title))
+        ?.replaceAll('$content', encodeURIComponent(this.content));
      const res = await got(formatUrl, options);
      if (String(res.statusCode).startsWith('20')) {
        return true;
@@ -700,19 +700,4 @@ export default class NotificationService {
    }
    return {};
  }
-
-  private formatNotifyContent(url: string, body: string) {
-    if (!url.includes('$title') && !body.includes('$title')) {
-      return {};
-    }
-
-    return {
-      formatUrl: url
-        ?.replaceAll('$title', encodeURIComponent(this.title))
-        ?.replaceAll('$content', encodeURIComponent(this.content)),
-      formatBody: body
-        ?.replaceAll('$title', this.title)
-        ?.replaceAll('$content', this.content),
-    };
-  }
 }
@@ -371,7 +371,7 @@ export default class SubscriptionService {
            files.map(async (x) => ({
              filename: x,
              directory: relativeDir.replace(config.logPath, ''),
-              time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
+              time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
            })),
          )
        ).sort((a, b) => b.time - a.time);
@@ -1,20 +1,13 @@
+import { spawn } from 'cross-spawn';
 import { Response } from 'express';
-import { Service, Inject } from 'typedi';
+import fs from 'fs';
+import got from 'got';
+import sum from 'lodash/sum';
+import path from 'path';
+import { Inject, Service } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import {
-  AuthDataType,
-  AuthInfo,
-  SystemInstance,
-  SystemModel,
-  SystemModelInfo,
-} from '../data/system';
-import { NotificationInfo } from '../data/notify';
-import NotificationService from './notify';
-import ScheduleService, { TaskCallbacks } from './schedule';
-import { spawn } from 'cross-spawn';
-import SockService from './sock';
-import got from 'got';
+import { TASK_COMMAND } from '../config/const';
 import {
  getPid,
  killTask,
@@ -23,13 +16,23 @@ import {
  promiseExec,
  readDirs,
 } from '../config/util';
-import { TASK_COMMAND } from '../config/const';
+import {
+  DependenceModel,
+  DependenceStatus,
+  DependenceTypes,
+} from '../data/dependence';
+import { NotificationInfo } from '../data/notify';
+import {
+  AuthDataType,
+  AuthInfo,
+  SystemInstance,
+  SystemModel,
+  SystemModelInfo,
+} from '../data/system';
 import taskLimit from '../shared/pLimit';
-import tar from 'tar';
-import path from 'path';
-import fs from 'fs';
-import sum from 'lodash/sum';
-import { DependenceModel, DependenceStatus, DependenceTypes } from '../data/dependence';
+import NotificationService from './notify';
+import ScheduleService, { TaskCallbacks } from './schedule';
+import SockService from './sock';

@Service()
 export default class SystemService {
@@ -139,7 +142,10 @@ export default class SystemService {
    }
    let command = `cd && ${cmd}`;
    const docs = await DependenceModel.findAll({
-      where: { type: DependenceTypes.nodejs, status: DependenceStatus.installed },
+      where: {
+        type: DependenceTypes.nodejs,
+        status: DependenceStatus.installed,
+      },
    });
    if (docs.length > 0) {
      command += ` && pnpm i -g`;
@@ -326,31 +332,10 @@ export default class SystemService {
    return { code: 200 };
  }

-  public async reloadSystem(target: 'system' | 'data') {
+  public async reloadSystem(target?: 'system' | 'data') {
    const cmd = `real_time=true ql reload ${target || ''}`;
    const cp = spawn(cmd, { 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),
-      });
-    });
-
+    cp.unref();
    return { code: 200 };
  }

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

  public async exportData(res: Response) {
    try {
-      await tar.create(
-        { gzip: true, file: config.dataTgzFile, cwd: config.rootPath },
-        ['data'],
-      );
+      await promiseExec(`cd ${config.rootPath} && tar -zcvf ${config.dataTgzFile} data/`);
      res.download(config.dataTgzFile);
    } catch (error: any) {
      return res.send({ code: 400, message: error.message });
@@ -416,8 +398,10 @@ export default class SystemService {
  public async importData() {
    try {
      await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
-      await tar.x({ file: config.dataTgzFile, cwd: config.tmpPath });
-      return { code: 200 };
+      const res = await promiseExec(
+        `cd ${config.tmpPath} && tar -zxvf data.tgz`,
+      );
+      return { code: 200, data: res };
    } catch (error: any) {
      return { code: 400, message: error.message };
    }
@@ -1,10 +1,13 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
 import config from './config';
 import express from 'express';
+import depInjectorLoader from './loaders/depInjector';
 import Logger from './loaders/logger';

+
 async function startServer() {
  const app = express();
+  depInjectorLoader();

  await require('./loaders/update').default({ app });

@@ -3,11 +3,11 @@ COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
  && apk update \
  && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 \
+  && npm i -g pnpm@8.3.1 pm2 tsx \
  && cd /tmp/build \
  && pnpm install --prod

-FROM python:3.10-alpine3.18
+FROM python:3.10-alpine

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

+VOLUME /ql/data
+  
+EXPOSE 5700
+
+COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=builder /usr/local/bin/. /usr/local/bin/
+
 RUN set -x \
  && apk update -f \
  && apk upgrade \
@@ -49,11 +56,9 @@ RUN set -x \
  && git config --global user.email "qinglong@@users.noreply.github.com" \
  && git config --global user.name "qinglong" \
  && git config --global http.postBuffer 524288000 \
-  && npm install -g pnpm@8.3.1 pm2 tsx \
  && rm -rf /root/.pnpm-store \
  && rm -rf /root/.local/share/pnpm/store \
  && rm -rf /root/.cache \
-  && rm -rf /root/.npm \
  && ulimit -c 0

 ARG SOURCE_COMMIT
@@ -21,6 +21,7 @@ nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"

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

 if [[ $AutoStartBot == true ]]; then
@@ -1,14 +1,5 @@
 module.exports = {
  apps: [
-    {
-      name: 'update',
-      max_restarts: 10,
-      kill_timeout: 15000,
-      wait_ready: true,
-      listen_timeout: 10000,
-      time: true,
-      script: 'static/build/update.js',
-    },
    {
      name: 'schedule',
      max_restarts: 10,
@@ -0,0 +1,13 @@
+module.exports = {
+  apps: [
+    {
+      name: 'update',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      time: true,
+      script: 'static/build/update.js',
+    },
+  ],
+};
@@ -92,7 +92,6 @@
    "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",
@@ -130,7 +129,6 @@
    "@types/serve-handler": "^6.1.1",
    "@types/sockjs": "^0.3.33",
    "@types/sockjs-client": "^1.5.1",
-    "@types/tar": "^6.1.5",
    "@types/uuid": "^8.3.4",
    "@types/request-ip": "0.0.41",
    "@uiw/codemirror-extensions-langs": "^4.21.9",
@@ -168,7 +166,7 @@
    "ts-node": "^10.6.0",
    "ts-proto": "^1.146.0",
    "tslib": "^2.4.0",
-    "tsx": "^3.12.3",
+    "tsx": "^4.7.3",
    "typescript": "5.2.2",
    "vh-check": "^2.0.5",
    "virtualizedtableforantd4": "1.3.0",
@@ -112,9 +112,6 @@ dependencies:
  sqlite3:
    specifier: git+https://github.com/whyour/node-sqlite3.git#v1.0.3
    version: github.com/whyour/node-sqlite3/3a00af0b5d7603b7f1b290032507320b18a6b741
-  tar:
-    specifier: ^6.1.15
-    version: 6.1.15
  toad-scheduler:
    specifier: ^1.6.0
    version: 1.6.1
@@ -219,9 +216,6 @@ devDependencies:
  '@types/sockjs-client':
    specifier: ^1.5.1
    version: 1.5.1
-  '@types/tar':
-    specifier: ^6.1.5
-    version: 6.1.5
  '@types/uuid':
    specifier: ^8.3.4
    version: 8.3.4
@@ -331,8 +325,8 @@ devDependencies:
    specifier: ^2.4.0
    version: 2.5.3
  tsx:
-    specifier: ^3.12.3
-    version: 3.12.7
+    specifier: ^4.7.3
+    version: 4.7.3
  typescript:
    specifier: 5.2.2
    version: 5.2.2
@@ -3384,7 +3378,7 @@ packages:
    resolution: {integrity: sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==}
    dependencies:
      '@esbuild-kit/core-utils': 3.1.0
-      get-tsconfig: 4.6.0
+      get-tsconfig: 4.7.3
    dev: true

  /@esbuild-kit/core-utils@3.1.0:
@@ -3398,9 +3392,18 @@ packages:
    resolution: {integrity: sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==}
    dependencies:
      '@esbuild-kit/core-utils': 3.1.0
-      get-tsconfig: 4.6.0
+      get-tsconfig: 4.7.3
    dev: true

+  /@esbuild/aix-ppc64@0.19.12:
+    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/android-arm64@0.17.19:
    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
    engines: {node: '>=12'}
@@ -3410,6 +3413,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/android-arm64@0.19.12:
+    resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/android-arm@0.17.19:
    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
    engines: {node: '>=12'}
@@ -3419,6 +3431,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/android-arm@0.19.12:
+    resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/android-x64@0.17.19:
    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
    engines: {node: '>=12'}
@@ -3428,6 +3449,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/android-x64@0.19.12:
+    resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/darwin-arm64@0.17.19:
    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
    engines: {node: '>=12'}
@@ -3437,6 +3467,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/darwin-arm64@0.19.12:
+    resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/darwin-x64@0.17.19:
    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
    engines: {node: '>=12'}
@@ -3446,6 +3485,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/darwin-x64@0.19.12:
+    resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/freebsd-arm64@0.17.19:
    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
    engines: {node: '>=12'}
@@ -3455,6 +3503,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/freebsd-arm64@0.19.12:
+    resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/freebsd-x64@0.17.19:
    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
    engines: {node: '>=12'}
@@ -3464,6 +3521,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/freebsd-x64@0.19.12:
+    resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-arm64@0.17.19:
    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
    engines: {node: '>=12'}
@@ -3473,6 +3539,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-arm64@0.19.12:
+    resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-arm@0.17.19:
    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
    engines: {node: '>=12'}
@@ -3482,6 +3557,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-arm@0.19.12:
+    resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-ia32@0.17.19:
    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
    engines: {node: '>=12'}
@@ -3491,6 +3575,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-ia32@0.19.12:
+    resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-loong64@0.17.19:
    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
    engines: {node: '>=12'}
@@ -3500,6 +3593,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-loong64@0.19.12:
+    resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-mips64el@0.17.19:
    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
    engines: {node: '>=12'}
@@ -3509,6 +3611,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-mips64el@0.19.12:
+    resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-ppc64@0.17.19:
    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
    engines: {node: '>=12'}
@@ -3518,6 +3629,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-ppc64@0.19.12:
+    resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-riscv64@0.17.19:
    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
    engines: {node: '>=12'}
@@ -3527,6 +3647,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-riscv64@0.19.12:
+    resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-s390x@0.17.19:
    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
    engines: {node: '>=12'}
@@ -3536,6 +3665,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-s390x@0.19.12:
+    resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/linux-x64@0.17.19:
    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
    engines: {node: '>=12'}
@@ -3545,6 +3683,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/linux-x64@0.19.12:
+    resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/netbsd-x64@0.17.19:
    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
    engines: {node: '>=12'}
@@ -3554,6 +3701,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/netbsd-x64@0.19.12:
+    resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/openbsd-x64@0.17.19:
    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
    engines: {node: '>=12'}
@@ -3563,6 +3719,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/openbsd-x64@0.19.12:
+    resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/sunos-x64@0.17.19:
    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
    engines: {node: '>=12'}
@@ -3572,6 +3737,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/sunos-x64@0.19.12:
+    resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/win32-arm64@0.17.19:
    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
    engines: {node: '>=12'}
@@ -3581,6 +3755,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/win32-arm64@0.19.12:
+    resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/win32-ia32@0.17.19:
    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
    engines: {node: '>=12'}
@@ -3590,6 +3773,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/win32-ia32@0.19.12:
+    resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@esbuild/win32-x64@0.17.19:
    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
    engines: {node: '>=12'}
@@ -3599,6 +3791,15 @@ packages:
    dev: true
    optional: true

+  /@esbuild/win32-x64@0.19.12:
+    resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@eslint-community/eslint-utils@4.4.0(eslint@8.35.0):
    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5128,13 +5329,6 @@ packages:
      '@types/node': 17.0.45
    dev: true

-  /@types/tar@6.1.5:
-    resolution: {integrity: sha512-qm2I/RlZij5RofuY7vohTpYNaYcrSQlN2MyjucQc7ZweDwaEWkdN/EeNh6e9zjK6uEm6PwjdMXkcj05BxZdX1Q==}
-    dependencies:
-      '@types/node': 17.0.45
-      minipass: 4.2.8
-    dev: true
-
  /@types/triple-beam@1.3.2:
    resolution: {integrity: sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==}
    dev: false
@@ -8452,6 +8646,37 @@ packages:
      '@esbuild/win32-x64': 0.17.19
    dev: true

+  /esbuild@0.19.12:
+    resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.19.12
+      '@esbuild/android-arm': 0.19.12
+      '@esbuild/android-arm64': 0.19.12
+      '@esbuild/android-x64': 0.19.12
+      '@esbuild/darwin-arm64': 0.19.12
+      '@esbuild/darwin-x64': 0.19.12
+      '@esbuild/freebsd-arm64': 0.19.12
+      '@esbuild/freebsd-x64': 0.19.12
+      '@esbuild/linux-arm': 0.19.12
+      '@esbuild/linux-arm64': 0.19.12
+      '@esbuild/linux-ia32': 0.19.12
+      '@esbuild/linux-loong64': 0.19.12
+      '@esbuild/linux-mips64el': 0.19.12
+      '@esbuild/linux-ppc64': 0.19.12
+      '@esbuild/linux-riscv64': 0.19.12
+      '@esbuild/linux-s390x': 0.19.12
+      '@esbuild/linux-x64': 0.19.12
+      '@esbuild/netbsd-x64': 0.19.12
+      '@esbuild/openbsd-x64': 0.19.12
+      '@esbuild/sunos-x64': 0.19.12
+      '@esbuild/win32-arm64': 0.19.12
+      '@esbuild/win32-ia32': 0.19.12
+      '@esbuild/win32-x64': 0.19.12
+    dev: true
+
  /escalade@3.1.1:
    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
    engines: {node: '>=6'}
@@ -9142,6 +9367,14 @@ packages:
    requiresBuild: true
    optional: true

+  /fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /ftp@0.3.10:
    resolution: {integrity: sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==}
    engines: {node: '>=0.8.0'}
@@ -9250,8 +9483,8 @@ packages:
      get-intrinsic: 1.2.1
    dev: true

-  /get-tsconfig@4.6.0:
-    resolution: {integrity: sha512-lgbo68hHTQnFddybKbbs/RDRJnJT5YyGy2kQzVwbq+g67X73i+5MVTval34QxGkOe9X5Ujf1UYpCaphLyltjEg==}
+  /get-tsconfig@4.7.3:
+    resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==}
    dependencies:
      resolve-pkg-maps: 1.0.0
    dev: true
@@ -10235,7 +10468,7 @@ packages:
      micromatch: 4.0.5
      walker: 1.0.8
    optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
    dev: true

  /jest-regex-util@29.4.3:
@@ -11090,11 +11323,6 @@ packages:
      yallist: 4.0.0
    dev: false

-  /minipass@4.2.8:
-    resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
-    engines: {node: '>=8'}
-    dev: true
-
  /minipass@5.0.0:
    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
    engines: {node: '>=8'}
@@ -14333,7 +14561,7 @@ packages:
    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
    hasBin: true
    optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
    dev: true

  /run-applescript@5.0.0:
@@ -15579,7 +15807,18 @@ packages:
      '@esbuild-kit/core-utils': 3.1.0
      '@esbuild-kit/esm-loader': 2.5.5
    optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
+    dev: true
+
+  /tsx@4.7.3:
+    resolution: {integrity: sha512-+fQnMqIp/jxZEXLcj6WzYy9FhcS5/Dfk8y4AtzJ6ejKcKqmfTF8Gso/jtrzDggCF2zTU20gJa6n8XqPYwDAUYQ==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+    dependencies:
+      esbuild: 0.19.12
+      get-tsconfig: 4.7.3
+    optionalDependencies:
+      fsevents: 2.3.3
    dev: true

  /tty-browserify@0.0.0:
@@ -16059,7 +16298,7 @@ packages:
      postcss: 8.4.24
      rollup: 3.24.0
    optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
    dev: true

  /vm-browserify@1.1.2:
@@ -148,6 +148,15 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""

+## 13. CHRONOCAT
+## CHRONOCAT_URL 推送 http://127.0.0.1:16530
+## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
+## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
+## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
+export CHRONOCAT_URL=""
+export CHRONOCAT_QQ=""
+export CHRONOCAT_TOKEN=""
+
 ## 14. SMTP
 ## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
 export SMTP_SERVICE=""
@@ -163,13 +172,15 @@ export SMTP_NAME=""
 ## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
 export PUSHME_KEY=""

-## 13. CHRONOCAT
-## CHRONOCAT_URL 推送 http://127.0.0.1:16530
-## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
-## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
-## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
-export CHRONOCAT_URL=""
-export CHRONOCAT_QQ=""
-export CHRONOCAT_TOKEN=""
+## 15. 自定义通知
+## 自定义通知 接收回调的URL
+export WEBHOOK_URL=""
+## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"
+export WEBHOOK_BODY=""
+export WEBHOOK_HEADERS=""
+## 支持 GET/POST/PUT
+export WEBHOOK_METHOD=""
+## 支持 text/plain、application/json、multipart/form-data、application/x-www-form-urlencoded
+export WEBHOOK_CONTENT_TYPE=""

 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可
@@ -819,11 +819,11 @@ function ChangeUserId(desp) {
 async function qywxamNotify(text, desp) {
  const MAX_LENGTH = 900;
  if (desp.length > MAX_LENGTH) {
-    let d = desp.substr(0, MAX_LENGTH) + "\n==More==";
+    let d = desp.substr(0, MAX_LENGTH) + '\n==More==';
    await do_qywxamNotify(text, d);
    await qywxamNotify(text, desp.substr(MAX_LENGTH));
  } else {
-    return await do_qywxamNotify(text,desp);
+    return await do_qywxamNotify(text, desp);
  }
 }

@@ -1121,7 +1121,7 @@ function fsBotNotify(text, desp) {
            console.log(err);
          } else {
            data = JSON.parse(data);
-            if (data.StatusCode === 0) {
+            if (data.StatusCode === 0 || data.code === 0) {
              console.log('飞书发送通知消息成功🎉\n');
            } else {
              console.log(`${data.msg}\n`);
@@ -1284,18 +1284,15 @@ function chronocatNotify(title, desp) {

 function webhookNotify(text, desp) {
  return new Promise((resolve) => {
-    const { formatBody, formatUrl } = formatNotifyContentFun(
-      WEBHOOK_URL,
-      WEBHOOK_BODY,
-      text,
-      desp,
-    );
-    if (!formatUrl && !formatBody) {
+    if (!WEBHOOK_URL.includes('$title') && !WEBHOOK_BODY.includes('$title')) {
      resolve();
      return;
    }
+
    const headers = parseHeaders(WEBHOOK_HEADERS);
-    const body = parseBody(formatBody, WEBHOOK_CONTENT_TYPE);
+    const body = parseBody(WEBHOOK_BODY, WEBHOOK_CONTENT_TYPE, (v) =>
+      v?.replaceAll('$title', text)?.replaceAll('$content', desp),
+    );
    const bodyParam = formatBodyFun(WEBHOOK_CONTENT_TYPE, body);
    const options = {
      method: WEBHOOK_METHOD,
@@ -1307,6 +1304,10 @@ function webhookNotify(text, desp) {
    };

    if (WEBHOOK_METHOD) {
+      const formatUrl = WEBHOOK_URL.replaceAll(
+        '$title',
+        encodeURIComponent(text),
+      ).replaceAll('$content', encodeURIComponent(desp));
      got(formatUrl, options).then((resp) => {
        try {
          if (resp.statusCode !== 200) {
@@ -1326,7 +1327,7 @@ function webhookNotify(text, desp) {
  });
 }

-function parseString(input) {
+function parseString(input, valueFormatFn) {
  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
  const matches = {};

@@ -1338,9 +1339,10 @@ function parseString(input) {
      continue;
    }

-    const _value = value.trim();
+    let _value = value.trim();

    try {
+      _value = valueFormatFn ? valueFormatFn(_value) : _value;
      const jsonValue = JSON.parse(_value);
      matches[_key] = jsonValue;
    } catch (error) {
@@ -1375,12 +1377,12 @@ function parseHeaders(headers) {
  return parsed;
 }

-function parseBody(body, contentType) {
+function parseBody(body, contentType, valueFormatFn) {
  if (contentType === 'text/plain' || !body) {
-    return body;
+    return valueFormatFn && body ? valueFormatFn(body) : body;
  }

-  const parsed = parseString(body);
+  const parsed = parseString(body, valueFormatFn);

  switch (contentType) {
    case 'multipart/form-data':
@@ -1405,6 +1407,7 @@ function formatBodyFun(contentType, body) {
    case 'multipart/form-data':
      return { form: body };
    case 'application/x-www-form-urlencoded':
+    case 'text/plain':
      return { body };
  }
  return {};
@@ -113,7 +113,6 @@ push_config = {
    'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
    'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
 }
-notify_function = []
 # fmt: on

 # 首先读取 面板变量 或者 github action 运行变量
@@ -123,19 +122,19 @@ for k in push_config:
        push_config[k] = v


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

    bark_params = {
        "BARK_ARCHIVE": "isArchive",
@@ -149,12 +148,11 @@ def bark(title: str, content: str, **kwargs) -> None:
    for pair in filter(
        lambda pairs: pairs[0].startswith("BARK_")
        and pairs[0] != "BARK_PUSH"
-        and (pairs[1] or kwargs.get(pairs[0]))
+        and pairs[1]
        and bark_params.get(pairs[0]),
        push_config.items(),
    ):
-        value = kwargs.get(pair[0], pair[1])
-        params += f"{bark_params.get(pair[0])}={value}&"
+        params += f"{bark_params.get(pair[0])}={pair[1]}&"
    if params:
        url = url + "?" + params.rstrip("&")
    response = requests.get(url).json()
@@ -165,37 +163,31 @@ def bark(title: str, content: str, **kwargs) -> None:
        print("bark 推送失败！")


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


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

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


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

-    if response.get("StatusCode") == 0:
+    if response.get("StatusCode") == 0 or response.get("code") == 0:
        print("飞书 推送成功！")
    else:
        print("飞书 推送失败！错误信息如下：\n", response)


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

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

    if response["status"] == "ok":
@@ -253,28 +237,20 @@ def go_cqhttp(title: str, content: str, **kwargs) -> None:
        print("go-cqhttp 推送失败！")


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

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

@@ -284,16 +260,16 @@ def gotify(title: str, content: str, **kwargs) -> None:
        print("gotify 推送失败！")


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


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

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

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


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

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

@@ -357,23 +328,16 @@ def pushdeer(title: str, content: str, **kwargs) -> None:
        print("PushDeer 推送失败！错误信息：", response)


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

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


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

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


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

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

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


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


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

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

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


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

-    if kwargs.get("TG_API_HOST") or push_config.get("TG_API_HOST"):
-        TG_API_HOST = kwargs.get("TG_API_HOST", push_config.get("TG_API_HOST"))
-        url = f"{TG_API_HOST}/bot{TG_BOT_TOKEN}/sendMessage"
+    if push_config.get("TG_API_HOST"):
+        url = f"{push_config.get('TG_API_HOST')}/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
    else:
        url = (
-            f"https://api.telegram.org/bot{TG_BOT_TOKEN}/sendMessage"
+            f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
        )
    headers = {"Content-Type": "application/x-www-form-urlencoded"}
    payload = {
-        "chat_id": str(TG_USER_ID),
+        "chat_id": str(push_config.get("TG_USER_ID")),
        "text": f"{title}\n\n{content}",
        "disable_web_page_preview": "true",
    }
    proxies = None
-    if not ((kwargs.get("TG_PROXY_HOST") and kwargs.get("TG_PROXY_PORT")) or (push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"))):
-        if kwargs.get("TG_PROXY_HOST") and kwargs.get("TG_PROXY_PORT"):
-            TG_PROXY_HOST = kwargs.get("TG_PROXY_HOST")
-            TG_PROXY_PORT = kwargs.get("TG_PROXY_PORT")
-        else:
-            TG_PROXY_HOST = kwargs.get("TG_PROXY_HOST")
-            TG_PROXY_PORT = kwargs.get("TG_PROXY_PORT")
-        if kwargs.get("TG_PROXY_AUTH") or push_config.get("TG_PROXY_AUTH"):
-            TG_PROXY_AUTH = kwargs.get("TG_PROXY_AUTH", push_config.get("TG_PROXY_AUTH"))
-        if TG_PROXY_AUTH is not None and "@" not in TG_PROXY_HOST:
-            TG_PROXY_HOST = (
-                TG_PROXY_AUTH
+    if push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"):
+        if push_config.get("TG_PROXY_AUTH") is not None and "@" not in push_config.get(
+            "TG_PROXY_HOST"
+        ):
+            push_config["TG_PROXY_HOST"] = (
+                push_config.get("TG_PROXY_AUTH")
                + "@"
-                + TG_PROXY_HOST
+                + push_config.get("TG_PROXY_HOST")
            )
        proxyStr = "http://{}:{}".format(
-            TG_PROXY_HOST, TG_PROXY_PORT
+            push_config.get("TG_PROXY_HOST"), push_config.get("TG_PROXY_PORT")
        )
        proxies = {"http": proxyStr, "https": proxyStr}
    response = requests.post(
@@ -629,48 +568,33 @@ def telegram_bot(title: str, content: str, **kwargs) -> None:
        print("tg 推送失败！")


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


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

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

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


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

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


-def chronocat(title: str, content: str, **kwargs) -> None:
+def chronocat(title: str, content: str) -> None:
    """
    使用 CHRONOCAT 推送消息。
    """
-    if not ((
-        push_config.get("CHRONOCAT_URL")
-        and push_config.get("CHRONOCAT_QQ")
-        and push_config.get("CHRONOCAT_TOKEN")
-    ) or (
-        push_config.get("CHRONOCAT_URL")
-        and push_config.get("CHRONOCAT_QQ")
-        and push_config.get("CHRONOCAT_TOKEN")
-    )):
+    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 服务启动")
-    if (
-        kwargs.get("CHRONOCAT_URL")
-        and kwargs.get("CHRONOCAT_QQ")
-        and kwargs.get("CHRONOCAT_TOKEN")
-    ):
-        CHRONOCAT_URL = kwargs.get("CHRONOCAT_URL")
-        CHRONOCAT_QQ = kwargs.get("CHRONOCAT_QQ")
-        CHRONOCAT_TOKEN = kwargs.get("CHRONOCAT_TOKEN")
-    else:
-        CHRONOCAT_URL = push_config.get("CHRONOCAT_URL")
-        CHRONOCAT_QQ = push_config.get("CHRONOCAT_QQ")
-        CHRONOCAT_TOKEN = push_config.get("CHRONOCAT_TOKEN")

-    user_ids = re.findall(r"user_id=(\d+)", CHRONOCAT_QQ)
-    group_ids = re.findall(r"group_id=(\d+)", CHRONOCAT_QQ)
+    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'{CHRONOCAT_URL}/api/message/send'
+    url = f'{push_config.get("CHRONOCAT_URL")}/api/message/send'
    headers = {
        "Content-Type": "application/json",
-        "Authorization": f'Bearer {CHRONOCAT_TOKEN}',
+        "Authorization": f'Bearer {push_config.get("CHRONOCAT_TOKEN")}',
    }

    for chat_type, ids in [(1, user_ids), (2, group_ids)]:
@@ -865,13 +749,14 @@ def parse_headers(headers):
    return parsed


-def parse_string(input_string):
+def parse_string(input_string, value_format_fn=None):
    matches = {}
-    pattern = r'(\w+):\s*((?:(?!\n\w+:).)*)'
+    pattern = r"(\w+):\s*((?:(?!\n\w+:).)*)"
    regex = re.compile(pattern)
    for match in regex.finditer(input_string):
        key, value = match.group(1).strip(), match.group(2).strip()
        try:
+            value = value_format_fn(value) if value_format_fn else value
            json_value = json.loads(value)
            matches[key] = json_value
        except:
@@ -879,14 +764,14 @@ def parse_string(input_string):
    return matches


-def parse_body(body, content_type):
+def parse_body(body, content_type, value_format_fn=None):
    if not body or content_type == "text/plain":
-        return body
+        return value_format_fn(body) if value_format_fn and body else body

-    parsed = parse_string(input_string)
+    parsed = parse_string(body, value_format_fn)

    if content_type == "application/x-www-form-urlencoded":
-        data = urlencode(parsed, doseq=True)
+        data = urllib.parse.urlencode(parsed, doseq=True)
        return data

    if content_type == "application/json":
@@ -896,18 +781,6 @@ def parse_body(body, content_type):
    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:
    """
    通过 自定义通知 推送消息。
@@ -924,18 +797,21 @@ def custom_notify(title: str, content: str) -> None:
    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:
+    if "$title" not in WEBHOOK_URL and "$title" not in WEBHOOK_BODY:
        print("请求头或者请求体中必须包含 $title 和 $content")
        return

    headers = parse_headers(WEBHOOK_HEADERS)
-    body = parse_body(formatBody, WEBHOOK_CONTENT_TYPE)
+    body = parse_body(
+        WEBHOOK_BODY,
+        WEBHOOK_CONTENT_TYPE,
+        lambda v: v.replace("$title", title).replace("$content", content),
+    )
+    formatted_url = WEBHOOK_URL.replace(
+        "$title", urllib.parse.quote_plus(title)
+    ).replace("$content", urllib.parse.quote_plus(content))
    response = requests.request(
-        method=WEBHOOK_METHOD, url=formatUrl, headers=headers, timeout=15, data=body
+        method=WEBHOOK_METHOD, url=formatted_url, headers=headers, timeout=15, data=body
    )

    if response.status_code == 200:
@@ -955,6 +831,7 @@ def one() -> str:


 def add_notify_function():
+    notify_function = []
    if push_config.get("BARK_PUSH"):
        notify_function.append(bark)
    if push_config.get("CONSOLE"):
@@ -1010,8 +887,19 @@ def add_notify_function():
    if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
        notify_function.append(custom_notify)

+    if not notify_function:
+        print(f"无推送渠道，请检查通知变量是否正确")
+    return notify_function
+
+
+def send(title: str, content: str, ignore_default_config: bool = False, **kwargs):
+    if kwargs:
+        global push_config
+        if ignore_default_config:
+            push_config = kwargs  # 清空从环境变量获取的配置
+        else:
+            push_config.update(kwargs)

-def send(title: str, content: str, **kwargs) -> None:
    if not content:
        print(f"{title} 推送内容为空！")
        return
@@ -1026,9 +914,9 @@ def send(title: str, content: str, **kwargs) -> None:
    hitokoto = push_config.get("HITOKOTO")
    content += "\n\n" + one() if hitokoto else ""

-    add_notify_function()
+    notify_function = add_notify_function()
    ts = [
-        threading.Thread(target=mode, args=(title, content),kwargs=kwargs, name=mode.__name__)
+        threading.Thread(target=mode, args=(title, content), name=mode.__name__)
        for mode in notify_function
    ]
    [t.start() for t in ts]
@@ -0,0 +1,8 @@
+/**
+ * 任务名称
+ * name: script name
+ * 定时规则
+ * cron: 1 9 * * *
+ */
+
+console.log('test scripts');
@@ -0,0 +1,8 @@
+"""
+任务名称
+name: script name
+定时规则
+cron: 1 9 * * *
+"""
+
+print("test script")
@@ -81,6 +81,7 @@ main() {
  check_ql
  check_nginx
  check_pm2
+  reload_update
  reload_pm2
  echo -e "\n=====> 检测结束\n"
 }
@@ -33,8 +33,12 @@ file_task_sample=$dir_sample/task.sample.sh
 file_extra_sample=$dir_sample/extra.sample.sh
 file_notify_js_sample=$dir_sample/notify.js
 file_notify_py_sample=$dir_sample/notify.py
+file_test_js_sample=$dir_sample/test.js
+file_test_py_sample=$dir_sample/test.py
 file_notify_py=$dir_scripts/notify.py
 file_notify_js=$dir_scripts/sendNotify.js
+file_test_js=$dir_scripts/test.js
+file_test_py=$dir_scripts/test.py
 nginx_app_conf=$dir_root/docker/front.conf
 nginx_conf=$dir_root/docker/nginx.conf
 dep_notify_py=$dir_dep/notify.py
@@ -234,6 +238,16 @@ fix_config() {
    echo
  fi

+  if [[ ! -s $file_test_js ]]; then
+    cp -fv $file_test_js_sample $file_test_js
+    echo
+  fi
+
+  if [[ ! -s $file_test_py ]]; then
+    cp -fv $file_test_py_sample $file_test_py
+    echo
+  fi
+
  if [[ -s /etc/nginx/conf.d/default.conf ]]; then
    echo -e "检测到默认nginx配置文件，清空...\n"
    cat /dev/null >/etc/nginx/conf.d/default.conf
@@ -293,7 +307,7 @@ git_clone_scripts() {

  set_proxy "$proxy"

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

  unset_proxy
@@ -305,6 +319,11 @@ random_range() {
  echo $((RANDOM % ($end - $beg) + $beg))
 }

+delete_pm2() {
+  cd $dir_root
+  pm2 delete ecosystem.config.js
+}
+
 reload_pm2() {
  cd $dir_root
  restore_env_vars
@@ -312,6 +331,13 @@ reload_pm2() {
  pm2 startOrGracefulReload ecosystem.config.js
 }

+reload_update() {
+  cd $dir_root
+  restore_env_vars
+  pm2 flush &>/dev/null
+  pm2 startOrGracefulReload other.config.js
+}
+
 diff_time() {
  local format="$1"
  local begin_time="$2"
@@ -34,7 +34,6 @@ output_list_add_drop() {
  if [[ -s $list ]]; then
    echo -e "检测到有${type}的定时任务:"
    cat $list
-    echo
  fi
 }

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

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

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

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

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

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

  reload_pm2
@@ -258,7 +261,7 @@ update_qinglong() {
  local mirror="gitee"
  local downloadQLUrl="https://gitee.com/whyour/qinglong/repository/archive"
  local downloadStaticUrl="https://gitee.com/whyour/qinglong-static/repository/archive"
-  local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200)
+  local githubStatus=$(curl -s --noproxy "*" -m 2 -IL "https://google.com" | grep 200)
  if [[ ! -z $githubStatus ]]; then
    mirror="github"
    downloadQLUrl="https://github.com/whyour/qinglong/archive/refs/heads"
@@ -310,9 +313,12 @@ check_update_dep() {
    echo -e "更新包下载成功..."

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

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

  for file in ${files}; do
+    dirPath=$(dirname "$file")
    filename=$(basename "$file")
-    cp -f $file "$dir_scripts/${uniq_path}/${filename}"
-    echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
+    filePath="${uniq_path}/${filename}"
+    if [[ $dirPath ]] && [[ $dirPath != '.' ]]; then
+      mkdir -p "${dir_scripts}/${uniq_path}/${dirPath}"
+      filePath="${uniq_path}/${dirPath}/${filename}"
+    fi
+    cp -f $file "${dir_scripts}/$filePath"
+    echo "$filePath" >>"$dir_list_tmp/${uniq_path}_scripts.list"
    # cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task.* ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
    # if [[ $cron_id ]]; then
    #   result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
@@ -426,7 +426,7 @@
  "创建变量成功": "Variable created successfully",
  "编辑变量": "Edit Variable",
  "加载中...": "Loading...",
-  "夹下所以日志": "Folder and All Subfiles",
+  "夹下所有日志": "Folder and All Subfiles",
  "创建文件夹成功": "Folder created successfully",
  "创建文件成功": "File created successfully",
  "夹及其子文件": "Folder and Its Subfiles",
@@ -426,7 +426,7 @@
  "创建变量成功": "创建变量成功",
  "编辑变量": "编辑变量",
  "加载中...": "加载中...",
-  "夹下所以日志": "夹下所以日志",
+  "夹下所有日志": "夹下所有日志",
  "创建文件夹成功": "创建文件夹成功",
  "创建文件成功": "创建文件成功",
  "夹及其子文件": "夹及其子文件",
@@ -173,8 +173,9 @@ const CronDetailModal = ({
        <>
          {intl.get('确认保存文件')}
          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {' '}
            {scriptInfo.filename}
-          </Text>{' '}
+          </Text>
          {intl.get('，保存后不可恢复')}
        </>
      ),
@@ -120,10 +120,11 @@ const Log = () => {
        <>
          {intl.get('确认删除')}
          <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {select}
+            {' '}
+            {select}{' '}
          </Text>
          {intl.get('文件')}
-          {currentNode.type === 'directory' ? intl.get('夹下所以日志') : ''}
+          {currentNode.type === 'directory' ? intl.get('夹下所有日志') : ''}
          {intl.get('，删除后不可恢复')}
        </>
      ),
@@ -39,8 +39,8 @@ const EditScriptNameModal = ({
    setLoading(true);
    const { path = '', filename: inputFilename, directory = '' } = values;
    const formData = new FormData();
-    formData.append('file', file as any);
-    formData.append('filename', inputFilename);
+    formData.append('file', file || '');
+    formData.append('filename', file?.name || inputFilename);
    formData.append('path', path);
    formData.append('content', '');
    formData.append('directory', directory);
@@ -218,8 +218,9 @@ const Script = () => {
        <>
          {intl.get('确认保存文件')}
          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {' '}
            {currentNode.title}
-          </Text>{' '}
+          </Text>
          {intl.get('，保存后不可恢复')}
        </>
      ),
@@ -258,7 +259,8 @@ const Script = () => {
        <>
          {intl.get('确认删除')}
          <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {select}
+            {' '}
+            {select}{' '}
          </Text>
          {intl.get('文件')}
          {currentNode.type === 'directory' ? intl.get('夹及其子文件') : ''}
@@ -1,10 +1,11 @@
-import intl from 'react-intl-universal';
-import React, { useEffect, useState, useRef, useCallback } from 'react';
-import { Statistic, Modal, Tag, Button, Spin, message } from 'antd';
-import { request } from '@/utils/http';
+import { disableBody } from '@/utils';
 import config from '@/utils/config';
+import { request } from '@/utils/http';
 import WebSocketManager from '@/utils/websocket';
 import Ansi from 'ansi-to-react';
+import { Button, Modal, Statistic, message } from 'antd';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import intl from 'react-intl-universal';

 const { Countdown } = Statistic;

@@ -132,6 +133,7 @@ const CheckUpdate = ({ systemInfo }: any) => {
          ),
          duration: 30,
        });
+        disableBody();
        setTimeout(() => {
          window.location.reload();
        }, 30000);
@@ -220,7 +222,7 @@ const CheckUpdate = ({ systemInfo }: any) => {
      </Button>
      <Button
        type="primary"
-        onClick={() => reloadSystem('system')}
+        onClick={() => reloadSystem('reload')}
        style={{ marginLeft: 8 }}
      >
        {intl.get('重新启动')}
@@ -22,6 +22,7 @@ import { UploadOutlined } from '@ant-design/icons';
 import Countdown from 'antd/lib/statistic/Countdown';
 import useProgress from './progress';
 import pick from 'lodash/pick';
+import { disableBody } from '@/utils';

 const dataMap = {
  'log-remove-frequency': 'logRemoveFrequency',
@@ -157,6 +158,7 @@ const Other = ({
              ),
              duration: 30,
            });
+            disableBody();
            setTimeout(() => {
              window.location.reload();
            }, 30000);
@@ -271,12 +273,18 @@ const Other = ({
          showUploadList={false}
          maxCount={1}
          action={`${config.apiPrefix}system/data/import`}
-          onChange={(e) => {
-            if (e.event?.percent) {
-              showUploadProgress(parseFloat(e.event?.percent.toFixed(1)));
-              if (e.event?.percent === 100) {
-                showReloadModal();
-              }
+          onChange={({ file, event }) => {
+            if (event?.percent) {
+              showUploadProgress(
+                Math.min(parseFloat(event?.percent.toFixed(1)), 99),
+              );
+            }
+            if (file.status === 'done') {
+              showUploadProgress(100);
+              showReloadModal();
+            }
+            if (file.status === 'error') {
+              message.error('上传失败');
            }
          }}
          name="data"
@@ -2,30 +2,42 @@ import intl from 'react-intl-universal';
 import { Modal, Progress } from 'antd';
 import { useRef } from 'react';

-export default function useProgress(title: string) {
-  const modalRef = useRef<ReturnType<typeof Modal.info>>();
+const ProgressElement = ({ percent }: { percent: number }) => (
+  <Progress
+    style={{ display: 'flex', justifyContent: 'center' }}
+    type="circle"
+    percent={percent}
+  />
+);

-  const ProgressElement = ({ percent }: { percent: number }) => (
-    <Progress
-      style={{ display: 'flex', justifyContent: 'center' }}
-      type="circle"
-      percent={percent}
-    />
-  );
+export default function useProgress(title: string) {
+  const modalRef = useRef<ReturnType<typeof Modal.info> | null>();

  const showProgress = (percent: number) => {
    if (modalRef.current) {
      modalRef.current.update({
-        title: `${title}${percent >= 100 ? intl.get('成功') : intl.get('中...')}`,
+        title: `${title}${
+          percent >= 100 ? intl.get('成功') : intl.get('中...')
+        }`,
        content: <ProgressElement percent={percent} />,
+        okButtonProps: { disabled: percent !== 100 },
      });
+      if (percent === 100) {
+        setTimeout(() => {
+          modalRef.current?.destroy();
+          modalRef.current = null;
+        });
+      }
    } else {
      modalRef.current = Modal.info({
        width: 600,
        maskClosable: false,
-        title: `${title}${percent >= 100 ? intl.get('成功') : intl.get('中...')}`,
+        title: `${title}${
+          percent >= 100 ? intl.get('成功') : intl.get('中...')
+        }`,
        centered: true,
        content: <ProgressElement percent={percent} />,
+        okButtonProps: { disabled: true },
      });
    }
  };
@@ -154,9 +154,9 @@ export default function browserType() {
    shell === 'none'
      ? {}
      : {
-        shell, // wechat qq uc 360 2345 sougou liebao maxthon
-        shellVs,
-      },
+          shell, // wechat qq uc 360 2345 sougou liebao maxthon
+          shellVs,
+        },
  );

  console.log(
@@ -335,20 +335,23 @@ export function parseCrontab(schedule: string): Date | null {
    if (time) {
      return time.next().toDate();
    }
-  } catch (error) { }
+  } catch (error) {}

  return null;
 }

-export function getCrontabsNextDate(schedule: string, extra_schedules: string[]): Date | null {
-  let date = parseCrontab(schedule)
+export function getCrontabsNextDate(
+  schedule: string,
+  extra_schedules: string[],
+): Date | null {
+  let date = parseCrontab(schedule);
  if (extra_schedules?.length) {
-    extra_schedules.forEach(x => {
-      const _date = parseCrontab(x)
+    extra_schedules.forEach((x) => {
+      const _date = parseCrontab(x);
      if (_date && (!date || _date < date)) {
        date = _date;
      }
-    })
+    });
  }
  return date;
 }
@@ -362,4 +365,23 @@ export function getExtension(filename: string) {
 export function getEditorMode(filename: string) {
  const extension = getExtension(filename) as keyof typeof LANG_MAP;
  return LANG_MAP[extension];
-}
+}
+
+export function disableBody() {
+  const overlay = document.createElement('div');
+  overlay.style.position = 'fixed';
+  overlay.style.top = '0px';
+  overlay.style.left = '0px';
+  overlay.style.width = '100%';
+  overlay.style.height = '100%';
+  overlay.style.backgroundColor = 'transparent';
+  overlay.style.zIndex = '9999';
+  document.body.appendChild(overlay);
+
+  overlay.addEventListener('click', function (event) {
+    event.stopPropagation();
+    event.preventDefault();
+  });
+
+  document.body.style.overflow = 'hidden';
+}
@@ -1,7 +1,11 @@
-version: 2.17.2
-changeLogLink: https://t.me/jiao_long/403
-publishTime: 2024-03-02 17:00
+version: 2.17.4
+changeLogLink: https://t.me/jiao_long/405
+publishTime: 2024-04-26 22:00
 changeLog: |
-  1. 依赖管理支持队列中依赖取消安装，支持状态筛选
-  2. 修复 webhook 通知 body 拆分逻辑
-  3. 企业微信有长度限制，超长的进行分段提交 https://github.com/pharaoh2012
+  1. 增加示例脚本
+  2. 修复上传脚本文件名乱码
+  3. 修复飞书通知结果校验
+  4. 修复删除日志提示
+  5. 修复自定义通知 text/plain 类型
+  6. 修复脚本和日志列表软连接循环报错
+  7. 修复 python 通知文件自定义 send
Author	SHA1	Message	Date
whyour	4ab24ea1b9	更新版本 v2.17.4	2024-04-26 21:04:10 +08:00
whyour	417f91207f	更新 tsx 版本	2024-04-26 20:58:48 +08:00
whyour	f723631647	修复脚本管理上传文件文件名乱码	2024-04-22 22:39:27 +08:00
whyour	6657ff0560	修改删除日志脚本提示	2024-04-21 22:35:20 +08:00
whyour	0593dae41d	增加示例脚本	2024-04-21 22:27:51 +08:00
whyour	445dee00f7	修复脚本和日志列表获取软链接循环失败	2024-04-21 21:59:02 +08:00
whyour	6ca28190b0	修复 text/plain body 格式化	2024-04-16 14:06:32 +08:00
whyour	510534ee0c	修复 text/plain 通知消息替换	2024-04-16 10:48:33 +08:00
whyour	2e7f3a1578	修复删除日志提示	2024-04-11 21:11:21 +08:00
Cp0204	591a17e7ee	改进自定义 send() 方法，修正自定义通知 body 解析笔误 (#2335 )	2024-04-11 21:07:49 +08:00
星野SKY	bd7c361300	更新飞书 bot 验证过程，兼容新状态码 (#2302 )	2024-04-11 19:13:39 +08:00
Yu Zhao	409b3281cc	更新飞书 bot 验证过程，兼容新状态码 (#2300 ) Co-authored-by: Yu Zhao <0+cmal@users.noreply.github.com>	2024-04-11 19:13:23 +08:00
whyour	ac6de4911a	更新版本 v2.17.3	2024-03-29 22:45:02 +08:00
whyour	1628e05ece	复制仓库任务时，保留任务原始目录层级	2024-03-28 23:42:05 +08:00
whyour	7b7e03b503	修改 git clone 参数	2024-03-28 23:00:49 +08:00
whyour	8d14c9dae1	修复配置文件默认参数	2024-03-25 23:41:39 +08:00
whyour	4d6d0a55e7	修改基础镜像 node 版本	2024-03-25 22:42:28 +08:00
whyour	8ab2dc3280	修复重启命令	2024-03-22 23:01:20 +08:00
whyour	3f54048127	修改压缩解压文件命令	2024-03-22 22:23:49 +08:00
whyour	47c2c61f33	增加自定义通知 header 和 body 环境变量填写提示	2024-03-16 14:50:38 +08:00
whyour	47d2fc24bc	修改系统 reload 分支	2024-03-16 13:25:42 +08:00
whyour	7a8a8ab9b3	修改系统重启逻辑	2024-03-14 17:37:52 +08:00
whyour	2ac4581d54	修改自定义通知 body 解析逻辑	2024-03-12 22:22:10 +08:00
whyour	68ad01e0e8	增加 update 服务	2024-03-10 22:07:06 +08:00