更新版本 v2.17.12

定时任务外漏标签改为 10 个
移除任务执行前后的脚本参数
2026-08-05 08:14:32 +08:00 · 2024-10-26 14:59:36 +08:00 · 2024-10-26 14:49:02 +08:00 · 2024-10-26 14:12:58 +08:00 · 2024-10-23 16:38:51 +08:00 · 2024-10-22 21:49:07 +08:00
77 changed files with 3578 additions and 1053 deletions
@@ -103,7 +103,7 @@ jobs:
          cache: "pnpm"

      - name: Setup timezone
-        uses: szenius/set-timezone@v1.2
+        uses: szenius/set-timezone@v2.0
        with:
          timezoneLinux: Asia/Shanghai

@@ -149,7 +149,7 @@ jobs:

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
        with:
          build-args: |
            MAINTAINER=${{ github.repository_owner }}
@@ -190,7 +190,7 @@ jobs:
          cache: "pnpm"

      - name: Setup timezone
-        uses: szenius/set-timezone@v1.2
+        uses: szenius/set-timezone@v2.0
        with:
          timezoneLinux: Asia/Shanghai

@@ -215,7 +215,7 @@ jobs:

      - name: Build and push python3.10
        id: docker_build_310
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
        with:
          build-args: |
            MAINTAINER=${{ github.repository_owner }}
@@ -22,4 +22,8 @@
 .env
 .history
 .version.ts
-/.tmp
+/.tmp
+__pycache__
+/shell/preload/env.*
+/shell/preload/notify.*
+/shell/preload/*-notify.json
@@ -2,7 +2,6 @@
 **/*.svg
 **/*.ejs
 **/*.html
-package.json
 .umi
 .umi-production
 .umi-test
@@ -18,9 +18,9 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong

-[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+[Demo](http://demo.ninesix.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)

-[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
+[演示](http://demo.ninesix.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>

 ![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
@@ -74,6 +74,14 @@ docker run -dit \
  whyour/qinglong:latest
 ```

+### BaoTa Panel one-click deployment (Recommended)
+
+1. To install Pagoda Panel, go to the official website of [BaoTa Panel](https://www.bt.cn/u/EcDAFU), select the official version of the script to download and install.
+
+2. After installation, login to Pagoda Panel, click `Docker` in the menu bar, the first time you enter, you will be prompted to install `Docker` service, click Install Now, follow the prompts to complete the installation.
+
+3. After the installation is complete, find `Qinglong Panel` in the app shop, click Install, configure the domain name and other basic information to complete the installation.
+
 ### Docker-compose (Recommended)

 ```bash
@@ -105,7 +113,7 @@ podman run -dit \
  docker.io/whyour/qinglong:latest
 ```

-### Npm
+### Npm (Local)

 It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3/pnpm yourself

@@ -20,9 +20,9 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong

-[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+[Demo](http://demo.ninesix.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)

-[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
+[演示](http://demo.ninesix.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>

 ![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
@@ -76,6 +76,14 @@ docker run -dit \
  whyour/qinglong:latest
 ```

+### 宝塔面板一键部署（推荐）
+
+1. 安装宝塔面板，前往 [宝塔面板](https://www.bt.cn/u/EcDAFU) 官网，选择正式版的脚本下载安装
+
+2. 安装后登录宝塔面板，在菜单栏中点击 `Docker`，首次进入会提示安装`Docker`服务，点击立即安装，按提示完成安装
+
+3. 安装完成后在应用商店中找到`青龙面板`，点击安装，配置域名等基本信息即可完成安装
+
 ### docker-compose (推荐)

 ```bash
@@ -107,7 +115,7 @@ podman run -dit \
  docker.io/whyour/qinglong:latest
 ```

-### npm
+### npm (本地)

 建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3/pnpm

@@ -1,4 +1,3 @@
-import { getFileContentByName, getLastModifyFilePath } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
@@ -1,10 +1,9 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
-import * as fs from 'fs';
 import config from '../config';
 import { getFileContentByName, readDirs, rmPath } from '../config/util';
-import { join } from 'path';
+import { join, resolve } from 'path';
 import { celebrate, Joi } from 'celebrate';
 const route = Router();
 const blacklist = ['.tmp'];
@@ -30,15 +29,19 @@ export default (app: Router) => {
    '/detail',
    async (req: Request, res: Response, next: NextFunction) => {
      try {
-        if (blacklist.includes(req.path)) {
+        const finalPath = resolve(
+          config.logPath,
+          (req.query.path as string) || '',
+          (req.query.file as string) || '',
+        );
+
+        if (
+          blacklist.includes(req.query.path as string) ||
+          !finalPath.startsWith(config.logPath)
+        ) {
          return res.send({ code: 403, message: '暂无权限' });
        }
-        const filePath = join(
-          config.logPath,
-          (req.query.path || '') as string,
-          req.query.file as string,
-        );
-        const content = await getFileContentByName(filePath);
+        const content = await getFileContentByName(finalPath);
        res.send({ code: 200, data: content });
      } catch (e) {
        return next(e);
@@ -50,15 +53,18 @@ export default (app: Router) => {
    '/:file',
    async (req: Request, res: Response, next: NextFunction) => {
      try {
-        if (blacklist.includes(req.path)) {
+        const finalPath = resolve(
+          config.logPath,
+          (req.query.path as string) || '',
+          (req.params.file as string) || '',
+        );
+        if (
+          blacklist.includes(req.path) ||
+          !finalPath.startsWith(config.logPath)
+        ) {
          return res.send({ code: 403, message: '暂无权限' });
        }
-        const filePath = join(
-          config.logPath,
-          (req.query.path || '') as string,
-          req.params.file,
-        );
-        const content = await getFileContentByName(filePath);
+        const content = await getFileContentByName(finalPath);
        res.send({ code: 200, data: content });
      } catch (e) {
        return next(e);
@@ -1,11 +1,4 @@
-import {
-  fileExist,
-  getFileContentByName,
-  readDirs,
-  getLastModifyFilePath,
-  readDir,
-  rmPath,
-} from '../config/util';
+import { fileExist, readDirs, readDir, rmPath } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
@@ -15,6 +15,7 @@ export default (app: Router) => {
      const subscriptionService = Container.get(SubscriptionService);
      const data = await subscriptionService.list(
        req.query.searchValue as string,
+        req.query.ids as string,
      );
      return res.send({ code: 200, data });
    } catch (e) {
@@ -212,8 +213,8 @@ export default (app: Router) => {
      body: Joi.array().items(Joi.number().required()),
      query: Joi.object({
        force: Joi.boolean().optional(),
-        t: Joi.number()
-      })
+        t: Joi.number(),
+      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
@@ -340,12 +340,41 @@ export default (app: Router) => {
    },
  );

-  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);
-    }
-  });
+  route.get(
+    '/log',
+    celebrate({
+      query: {
+        startTime: Joi.string().allow('').optional(),
+        endTime: Joi.string().allow('').optional(),
+        t: Joi.string().optional(),
+      },
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        await systemService.getSystemLog(
+          res,
+          req.query as {
+            startTime?: string;
+            endTime?: string;
+          },
+        );
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.delete(
+    '/log',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        await systemService.deleteSystemLog();
+        res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };
@@ -1,3 +1,4 @@
+import './loaders/sentry'
 import 'reflect-metadata'; // We need this in order to use @Decorators
 import config from './config';
 import express from 'express';
@@ -10,8 +11,6 @@ async function startServer() {

  await require('./loaders/initFile').default();

-  await require('./loaders/sentry').default({ expressApp: app });
-
  await require('./loaders/app').default({ expressApp: app });

  const server = app
@@ -26,10 +26,12 @@ if (process.env.QL_DATA_DIR) {
 }

 const shellPath = path.join(rootPath, 'shell/');
+const preloadPath = path.join(shellPath, 'preload/');
 const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
+const repoPath = path.join(dataPath, 'repo/');
 const bakPath = path.join(dataPath, 'bak/');
 const logPath = path.join(dataPath, 'log/');
 const dbPath = path.join(dataPath, 'db/');
@@ -37,9 +39,11 @@ 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 jsEnvFile = path.join(configPath, 'env.js');
-const pyEnvFile = path.join(configPath, 'env.py');
+const envFile = path.join(preloadPath, 'env.sh');
+const jsEnvFile = path.join(preloadPath, 'env.js');
+const pyEnvFile = path.join(preloadPath, 'env.py');
+const jsNotifyFile = path.join(preloadPath, 'notify.js');
+const pyNotifyFile = path.join(preloadPath, 'notify.py');
 const confFile = path.join(configPath, 'config.sh');
 const crontabFile = path.join(configPath, 'crontab.list');
 const authConfigFile = path.join(configPath, 'auth.json');
@@ -47,6 +51,7 @@ const extraFile = path.join(configPath, 'extra.sh');
 const confBakDir = path.join(dataPath, 'config/bak/');
 const sampleFile = path.join(samplePath, 'config.sample.sh');
 const sqliteFile = path.join(samplePath, 'database.sqlite');
+const systemNotifyFile = path.join(preloadPath, 'system-notify.json');

 const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
@@ -91,10 +96,13 @@ export default {
  envFile,
  jsEnvFile,
  pyEnvFile,
+  jsNotifyFile,
+  pyNotifyFile,
  dbPath,
  uploadPath,
  configPath,
  scriptPath,
+  repoPath,
  samplePath,
  blackFileList: [
    'auth.json',
@@ -127,4 +135,5 @@ export default {
  sqliteFile,
  sshdPath,
  systemLogPath,
+  systemNotifyFile,
 };
@@ -5,13 +5,13 @@ let pickedEnv: Record<string, string>;

 function getPickedEnv() {
  if (pickedEnv) return pickedEnv;
-  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv']);
+  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv', 'QL_DIR']);
  if (picked.QlBaseUrl) {
    if (!picked.QlBaseUrl.startsWith('/')) {
-      picked.QlBaseUrl = `/${picked.QlBaseUrl}`
+      picked.QlBaseUrl = `/${picked.QlBaseUrl}`;
    }
    if (!picked.QlBaseUrl.endsWith('/')) {
-      picked.QlBaseUrl = `${picked.QlBaseUrl}/`
+      picked.QlBaseUrl = `${picked.QlBaseUrl}/`;
    }
  }
  pickedEnv = picked as Record<string, string>;
@@ -461,7 +461,7 @@ export async function parseVersion(path: string): Promise<IVersion> {
  return load(await fs.readFile(path, 'utf8')) as IVersion;
 }

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

@@ -469,13 +469,18 @@ export async function getUniqPath(
  command: string,
  id: string,
 ): Promise<string> {
+  let suffix = '';
  if (/^\d+$/.test(id)) {
-    id = `_${id}`;
-  } else {
-    id = '';
+    suffix = `_${id}`;
+  }
+
+  let items = command.split(/ +/);
+
+  const maxTimeCommandIndex = items.findIndex((x) => x === '-m');
+  if (maxTimeCommandIndex !== -1) {
+    items = items.slice(maxTimeCommandIndex + 2);
  }

-  const items = command.split(/ +/);
  let str = items[0];
  if (items[0] === TASK_COMMAND) {
    str = items[1];
@@ -499,7 +504,7 @@ export async function getUniqPath(
    str = `${tempStr}_${str.slice(slashIndex + 1)}`;
  }

-  return `${str}${id}`;
+  return `${str}${suffix}`;
 }

 export function safeJSONParse(value?: string) {
@@ -20,6 +20,7 @@ export enum NotificationMode {
  'feishu' = 'feishu',
  'webhook' = 'webhook',
  'chronocat' = 'Chronocat',
+  'ntfy' = 'ntfy',
 }

 abstract class NotificationBaseInfo {
@@ -139,6 +140,11 @@ export class LarkNotification extends NotificationBaseInfo {
  public larkKey = '';
 }

+export class NtfyNotification extends NotificationBaseInfo {
+  public ntfyUrl = '';
+  public ntfyTopic = '';
+  public ntfyPriority = '';
+}
 export interface NotificationInfo
  extends GoCqHttpBotNotification,
    GotifyNotification,
@@ -158,5 +164,6 @@ export interface NotificationInfo
    PushMeNotification,
    WebhookNotification,
    ChronocatNotification,
-    LarkNotification {}
+    LarkNotification,
+    NtfyNotification {}

@@ -133,6 +133,8 @@ export default ({ app }: { app: Application }) => {

  app.use(errors());

+  Sentry.setupExpressErrorHandler(app);
+
  app.use(
    (
      err: Error & { status: number },
@@ -178,8 +180,6 @@ export default ({ app }: { app: Application }) => {
      res: Response,
      next: NextFunction,
    ) => {
-      Sentry.captureException(err);
-
      res.status(err.status || 500);
      res.json({
        code: err.status || 500,
@@ -11,17 +11,24 @@ import { CrontabViewModel, CronViewType } from '../data/cronView';
 import { initPosition } from '../data/env';
 import { AuthDataType, SystemModel } from '../data/system';
 import SystemService from '../services/system';
+import UserService from '../services/user';
+import { writeFile } from 'fs/promises';

 export default async () => {
  const cronService = Container.get(CronService);
  const envService = Container.get(EnvService);
  const dependenceService = Container.get(DependenceService);
  const systemService = Container.get(SystemService);
+  const userService = Container.get(UserService);

  // 初始化增加系统配置
  await SystemModel.upsert({ type: AuthDataType.systemConfig });
  await SystemModel.upsert({ type: AuthDataType.notification });

+  // 初始化通知配置
+  const notifyConfig = await userService.getNotificationMode();
+  await writeFile(config.systemNotifyFile, JSON.stringify(notifyConfig));
+
  const installDependencies = () => {
    // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
    DependenceModel.findAll({
@@ -11,6 +11,7 @@ if (process.env.QL_DATA_DIR) {
  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
 }

+const preloadPath = path.join(rootPath, 'shell/preload/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');
@@ -27,7 +28,11 @@ const sampleNotifyJsFile = path.join(samplePath, 'notify.js');
 const sampleNotifyPyFile = path.join(samplePath, 'notify.py');
 const scriptNotifyJsFile = path.join(scriptPath, 'sendNotify.js');
 const scriptNotifyPyFile = path.join(scriptPath, 'notify.py');
+const jsNotifyFile = path.join(preloadPath, 'notify.js');
+const pyNotifyFile = path.join(preloadPath, 'notify.py');
 const TaskBeforeFile = path.join(configPath, 'task_before.sh');
+const TaskBeforeJsFile = path.join(configPath, 'task_before.js');
+const TaskBeforePyFile = path.join(configPath, 'task_before.py');
 const TaskAfterFile = path.join(configPath, 'task_after.sh');
 const homedir = os.homedir();
 const sshPath = path.resolve(homedir, '.ssh');
@@ -38,6 +43,7 @@ export default async () => {
  const authFileExist = await fileExist(authConfigFile);
  const confFileExist = await fileExist(confFile);
  const scriptDirExist = await fileExist(scriptPath);
+  const preloadDirExist = await fileExist(preloadPath);
  const logDirExist = await fileExist(logPath);
  const configDirExist = await fileExist(configPath);
  const uploadDirExist = await fileExist(uploadPath);
@@ -49,6 +55,8 @@ export default async () => {
  const scriptNotifyJsFileExist = await fileExist(scriptNotifyJsFile);
  const scriptNotifyPyFileExist = await fileExist(scriptNotifyPyFile);
  const TaskBeforeFileExist = await fileExist(TaskBeforeFile);
+  const TaskBeforeJsFileExist = await fileExist(TaskBeforeJsFile);
+  const TaskBeforePyFileExist = await fileExist(TaskBeforePyFile);
  const TaskAfterFileExist = await fileExist(TaskAfterFile);

  if (!configDirExist) {
@@ -59,6 +67,10 @@ export default async () => {
    await fs.mkdir(scriptPath);
  }

+  if (!preloadDirExist) {
+    await fs.mkdir(preloadPath);
+  }
+
  if (!logDirExist) {
    await fs.mkdir(logPath);
  }
@@ -96,6 +108,9 @@ export default async () => {
    await fs.writeFile(confFile, await fs.readFile(sampleConfigFile));
  }

+  await fs.writeFile(jsNotifyFile, await fs.readFile(sampleNotifyJsFile));
+  await fs.writeFile(pyNotifyFile, await fs.readFile(sampleNotifyPyFile));
+
  if (!scriptNotifyJsFileExist) {
    await fs.writeFile(
      scriptNotifyJsFile,
@@ -114,6 +129,20 @@ export default async () => {
    await fs.writeFile(TaskBeforeFile, await fs.readFile(sampleTaskShellFile));
  }

+  if (!TaskBeforeJsFileExist) {
+    await fs.writeFile(
+      TaskBeforeJsFile,
+      '// The JavaScript code that executes before the JavaScript task execution will execute.',
+    );
+  }
+
+  if (!TaskBeforePyFileExist) {
+    await fs.writeFile(
+      TaskBeforePyFile,
+      '# The Python code that executes before the Python task execution will execute.',
+    );
+  }
+
  if (!TaskAfterFileExist) {
    await fs.writeFile(TaskAfterFile, await fs.readFile(sampleTaskShellFile));
  }
@@ -12,7 +12,10 @@ export default async () => {
  const subscriptionService = Container.get(SubscriptionService);

  // 生成内置token
-  let tokenCommand = `tsx ${join(config.rootPath, 'back/token.ts')}`;
+  let tokenCommand = `ts-node-transpile-only ${join(
+    config.rootPath,
+    'back/token.ts',
+  )}`;
  const tokenFile = join(config.rootPath, 'static/build/token.js');

  if (await fileExist(tokenFile)) {
@@ -22,11 +25,16 @@ export default async () => {
    id: NaN,
    name: '生成token',
    command: tokenCommand,
+    runOrigin: 'system',
  } as ScheduleTaskType;
  await scheduleService.cancelIntervalTask(cron);
-  scheduleService.createIntervalTask(cron, {
-    days: 28,
-  });
+  scheduleService.createIntervalTask(
+    cron,
+    {
+      days: 28,
+    },
+    true,
+  );

  // 运行删除日志任务
  const data = await systemService.getSystemConfig();
@@ -35,17 +43,21 @@ export default async () => {
      id: data.id as number,
      name: '删除日志',
      command: `ql rmlog ${data.info.logRemoveFrequency}`,
+      runOrigin: 'system' as const,
    };
    await scheduleService.cancelIntervalTask(rmlogCron);
-    scheduleService.createIntervalTask(rmlogCron, {
-      days: data.info.logRemoveFrequency,
-    });
+    scheduleService.createIntervalTask(
+      rmlogCron,
+      {
+        days: data.info.logRemoveFrequency,
+      },
+      true,
+    );
  }

-  // 运行所有订阅
  await subscriptionService.setSshConfig();
  const subs = await subscriptionService.list();
  for (const sub of subs) {
-    subscriptionService.handleTask(sub, !sub.is_disabled, !sub.is_disabled);
+    subscriptionService.handleTask(sub.get({ plain: true }), !sub.is_disabled);
  }
 };
@@ -4,10 +4,10 @@ import config from '../config';
 import path from 'path';

 const levelMap: Record<string, string> = {
-  info: '🔵',
-  warn: '🟡',
-  error: '🔴',
-  debug: '🔶'
+  info: '\ue6f5',
+  warn: '\ue880',
+  error: '\ue602',
+  debug: '\ue67f'
 }

 const customFormat = winston.format.combine(
@@ -1,32 +1,26 @@
-import { Application } from 'express';
 import * as Sentry from '@sentry/node';
 import Logger from './logger';
-import config from '../config';
 import fs from 'fs';
-import { parseVersion } from '../config/util';
+import config from '../config';
+import { parseContentVersion } from '../config/util';

-export default async ({ expressApp }: { expressApp: Application }) => {
-  const { version } = await parseVersion(config.versionFile);
+let version = '1.0.0';
+try {
+  const content = fs.readFileSync(config.versionFile, 'utf-8');
+  ({ version } = parseContentVersion(content));
+} catch (error) {}

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

-  expressApp.use(Sentry.Handlers.requestHandler());
-  expressApp.use(Sentry.Handlers.tracingHandler());
-
-  Logger.info('✌️ Sentry loaded');
-  console.log('✌️ Sentry loaded');
-};
+Logger.info('✌️ Sentry loaded');
+console.log('✌️ Sentry loaded');
@@ -21,7 +21,6 @@ export default async ({ server }: { server: Server }) => {
    if (data) {
      const { token = '', tokens = {} } = safeJSONParse(data);
      if (headerToken === token || tokens[platform] === headerToken) {
-        conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
        sockService.addClient(conn);

        conn.on('data', (message) => {
@@ -33,8 +32,6 @@ export default async ({ server }: { server: Server }) => {
        });

        return;
-      } else {
-        conn.write(JSON.stringify({ type: 'ping', message: 'whyour' }));
      }
    }

@@ -22,7 +22,6 @@ app.get('/api/health', (req, res) => {

 app
  .listen(config.publicPort, '0.0.0.0', async () => {
-    await require('./loaders/sentry').default({ expressApp: app });
    await require('./loaders/db').default();

    Logger.debug(`✌️ 公共服务启动成功！`);
@@ -24,7 +24,7 @@ const addCron = (
    );

    if (extraSchedules?.length) {
-      extraSchedules.forEach(x => {
+      extraSchedules.forEach((x) => {
        Logger.info(
          '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
          id,
@@ -32,21 +32,21 @@ const addCron = (
          x.schedule,
          command,
        );
-      })
+      });
    }

    scheduleStacks.set(id, [
      nodeSchedule.scheduleJob(id, schedule, async () => {
        Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
-        runCron(command, { name, schedule, extraSchedules });
+        runCron(command, item);
      }),
      ...(extraSchedules?.length
        ? extraSchedules.map((x) =>
-          nodeSchedule.scheduleJob(id, x.schedule, async () => {
-            Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
-            runCron(command, { name, schedule, extraSchedules });
-          }),
-        )
+            nodeSchedule.scheduleJob(id, x.schedule, async () => {
+              Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
+              runCron(command, item);
+            }),
+          )
        : []),
    ]);
  }
@@ -11,9 +11,21 @@ export default class ConfigService {

  public async getFile(filePath: string, res: Response) {
    let content = '';
-    if (config.blackFileList.includes(filePath) || !filePath) {
-      res.send({ code: 403, message: '文件无法访问' });
+    const avaliablePath = [config.rootPath, config.configPath].map((x) =>
+      path.resolve(x, filePath),
+    );
+
+    if (
+      config.blackFileList.includes(filePath) ||
+      avaliablePath.every(
+        (x) =>
+          !x.startsWith(config.scriptPath) && !x.startsWith(config.configPath),
+      ) ||
+      !filePath
+    ) {
+      return res.send({ code: 403, message: '文件无法访问' });
    }
+
    if (filePath.startsWith('sample/')) {
      const res = await got.get(
        `https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`,
@@ -12,7 +12,7 @@ import {
  getUniqPath,
  safeJSONParse,
 } from '../config/util';
-import { Op, where, col as colFn, FindOptions, fn } from 'sequelize';
+import { Op, where, col as colFn, FindOptions, fn, Order } from 'sequelize';
 import path from 'path';
 import { TASK_PREFIX, QL_PREFIX } from '../config/const';
 import cronClient from '../schedule/client';
@@ -362,9 +362,9 @@ export default class CronService {
        order.unshift([field, type]);
      }
    }
-    let condition: any = {
+    let condition: FindOptions<Crontab> = {
      where: query,
-      order: order,
+      order: order as Order,
    };
    if (page && size) {
      condition.offset = (page - 1) * size;
@@ -431,7 +431,7 @@ export default class CronService {
        }

        this.logger.info(
-          `[panel][开始执行任务] 参数 ${JSON.stringify(params)}`,
+          `[panel][开始执行任务] 参数: ${JSON.stringify(params)}`,
        );

        let { id, command, log_path } = cron;
@@ -459,13 +459,28 @@ export default class CronService {
          await fs.appendFile(absolutePath, data.toString());
        });
        cp.stderr.on('data', async (data) => {
+          this.logger.info(
+            '[panel][执行任务失败] 命令: %s, 错误信息: %j',
+            command,
+            data.toString(),
+          );
          await fs.appendFile(absolutePath, data.toString());
        });
        cp.on('error', async (err) => {
+          this.logger.error(
+            '[panel][创建任务失败] 命令: %s, 错误信息: %j',
+            command,
+            err,
+          );
          await fs.appendFile(absolutePath, JSON.stringify(err));
        });

        cp.on('exit', async (code) => {
+          this.logger.info(
+            '[panel][执行任务结束] 参数: %s, 退出码: %j',
+            JSON.stringify(params),
+            code,
+          );
          await CrontabModel.update(
            { status: CrontabStatus.idle, pid: undefined },
            { where: { id } },
@@ -549,11 +564,13 @@ export default class CronService {
    if (tab.task_before) {
      commandVariable += `task_before='${tab.task_before
        .replace(/'/g, "'\\''")
+        .replace(/;? *\n/g, ';')
        .trim()}' `;
    }
    if (tab.task_after) {
      commandVariable += `task_after='${tab.task_after
        .replace(/'/g, "'\\''")
+        .replace(/;? *\n/g, ';')
        .trim()}' `;
    }

@@ -210,13 +210,18 @@ export default class EnvService {
            .replace(/'/g, "'\\''")
            .trim();
          env_string += `export ${key}='${value}'\n`;
-          const _env_value = `'${group
+          const _env_value = `${group
            .map((x) => x.value)
            .join('&')
-            .replace(/\\/g, '\\\\')
-            .replace(/'/g, "\\'")}'`;
-          js_env_string += `process.env.${key}=${_env_value};\n`;
-          py_env_string += `os.environ['${key}']=${_env_value}\n`;
+            .replace(/\\/g, '\\\\')}`;
+          js_env_string += `process.env.${key}=\`${_env_value.replace(
+            /\`/g,
+            '\\`',
+          )}\`;\n`;
+          py_env_string += `os.environ['${key}']='''${_env_value.replace(
+            /\'/g,
+            "\\'",
+          )}'''\n`;
        }
      }
    }
@@ -4,9 +4,11 @@ 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 { parseBody, parseHeaders, safeJSONParse } from '../config/util';
 import { NotificationInfo } from '../data/notify';
 import UserService from './user';
+import { readFile } from 'fs/promises';
+import config from '../config';

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

  private title = '';
@@ -43,7 +46,28 @@ export default class NotificationService {
    retry: 1,
  };

-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor() {}
+
+  public async externalNotify(
+    title: string,
+    content: string,
+  ): Promise<boolean | undefined> {
+    const { type, ...rest } = safeJSONParse(
+      await readFile(config.systemNotifyFile, 'utf-8'),
+    );
+    if (type) {
+      this.title = title;
+      this.content = content;
+      this.params = rest;
+      const notificationModeAction = this.modeMap.get(type);
+      try {
+        return await notificationModeAction?.call(this);
+      } catch (error: any) {
+        throw error;
+      }
+    }
+    return false;
+  }

  public async notify(
    title: string,
@@ -128,14 +152,16 @@ export default class NotificationService {

  private async serverChan() {
    const { serverChanKey } = this.params;
-    const url = serverChanKey.startsWith('SCT')
-      ? `https://sctapi.ftqq.com/${serverChanKey}.send`
-      : `https://sc.ftqq.com/${serverChanKey}.send`;
+    const matchResult = serverChanKey.match(/^sctp(\d+)t/i);
+    const url = matchResult && matchResult[1]
+      ? `https://${matchResult[1]}.push.ft07.com/send/${serverChanKey}.send`
+      : `https://sctapi.ftqq.com/${serverChanKey}.send`;
+
    try {
      const res: any = await got
        .post(url, {
          ...this.gotOption,
-          body: `title=${this.title}&desp=${this.content}`,
+          body: `title=${encodeURIComponent(this.title)}&desp=${encodeURIComponent(this.content)}`,
          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
        })
        .json();
@@ -493,7 +519,7 @@ export default class NotificationService {
    } catch (error: any) {
      throw new Error(error.response ? error.response.body : error);
    }
-  }
+ }

  private async pushPlus() {
    const { pushPlusToken, pushPlusUser } = this.params;
@@ -638,6 +664,32 @@ export default class NotificationService {
    }
  }

+  private async ntfy() {
+    const { ntfyUrl, ntfyTopic, ntfyPriority } = this.params;
+    // 编码函数
+    const encodeRfc2047 = (text: string, charset: string = 'UTF-8'): string => {
+      const encodedText = Buffer.from(text).toString('base64');
+      return `=?${charset}?B?${encodedText}?=`;
+  };
+    try {
+        const encodedTitle = encodeRfc2047(this.title);
+        const res: any = await got
+          .post(`${ntfyUrl || 'https://ntfy.sh'}/${ntfyTopic}`, {
+              ...this.gotOption,
+              body: `${this.content}`,
+              headers: { 'Title': encodedTitle, 'Priority': `${ntfyPriority || '3'}` },
+          });
+          if (res.statusCode === 200) {
+            return true;
+          } else {
+            throw new Error(JSON.stringify(res));
+          }
+    } catch (error: any) {
+        throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
+  
  private async chronocat() {
    const { chronocatURL, chronocatQQ, chronocatToken } = this.params;
    try {
@@ -17,6 +17,7 @@ export interface ScheduleTaskType {
  command: string;
  name?: string;
  schedule?: string;
+  runOrigin: 'subscription' | 'system' | 'script';
 }

 export interface TaskCallbacks {
@@ -40,9 +41,13 @@ export default class ScheduleService {

  private intervalSchedule = new ToadScheduler();

-  private maxBuffer = 200 * 1024 * 1024;
+  private taskLimitMap = {
+    system: 'runWithSystemLimit' as const,
+    script: 'runWithScriptLimit' as const,
+    subscription: 'runWithSubscriptionLimit' as const,
+  };

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

  async runTask(
    command: string,
@@ -51,12 +56,21 @@ export default class ScheduleService {
      schedule?: string;
      name?: string;
      command?: string;
+      id: string;
+      runOrigin: 'subscription' | 'system' | 'script';
    },
    completionTime: 'start' | 'end' = 'end',
  ) {
-    return taskLimit.runWithCronLimit(() => {
+    const { runOrigin, ...others } = params;
+
+    return taskLimit[this.taskLimitMap[runOrigin]](others, () => {
      return new Promise(async (resolve, reject) => {
-        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify({ ...params, command })}`);
+        this.logger.info(
+          `[panel][开始执行任务] 参数: ${JSON.stringify({
+            ...others,
+            command,
+          })}`,
+        );

        try {
          const startTime = dayjs();
@@ -90,13 +104,21 @@ export default class ScheduleService {
          });

          cp.on('exit', async (code) => {
+            this.logger.info(
+              '[panel][执行任务结束] 参数: %s, 退出码: %j',
+              JSON.stringify({
+                ...others,
+                command,
+              }),
+              code,
+            );
            const endTime = dayjs();
            await callbacks.onEnd?.(
              cp,
              endTime,
              endTime.diff(startTime, 'seconds'),
            );
-            resolve({ ...params, pid: cp.pid, code });
+            resolve({ ...others, pid: cp.pid, code });
          });
        } catch (error) {
          this.logger.error(
@@ -111,7 +133,7 @@ export default class ScheduleService {
  }

  async createCronTask(
-    { id = 0, command, name, schedule = '' }: ScheduleTaskType,
+    { id = 0, command, name, schedule = '', runOrigin }: ScheduleTaskType,
    callbacks?: TaskCallbacks,
    runImmediately = false,
  ) {
@@ -131,6 +153,8 @@ export default class ScheduleService {
          name,
          schedule,
          command,
+          id: _id,
+          runOrigin,
        });
      }),
    );
@@ -140,6 +164,8 @@ export default class ScheduleService {
        name,
        schedule,
        command,
+        id: _id,
+        runOrigin,
      });
    }
  }
@@ -154,7 +180,7 @@ export default class ScheduleService {
  }

  async createIntervalTask(
-    { id = 0, command, name = '' }: ScheduleTaskType,
+    { id = 0, command, name = '', runOrigin }: ScheduleTaskType,
    schedule: SimpleIntervalSchedule,
    runImmediately = true,
    callbacks?: TaskCallbacks,
@@ -172,11 +198,13 @@ export default class ScheduleService {
        this.runTask(command, callbacks, {
          name,
          command,
+          id: _id,
+          runOrigin,
        });
      },
      (err) => {
        this.logger.error(
-          '[执行任务失败] 命令: %s, 错误信息: %j',
+          '[panel][执行任务失败] 命令: %s, 错误信息: %j',
          command,
          err,
        );
@@ -195,13 +223,19 @@ export default class ScheduleService {
      this.runTask(command, callbacks, {
        name,
        command,
+        id: _id,
+        runOrigin,
      });
    }
  }

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

@@ -7,6 +7,7 @@ import ScheduleService, { TaskCallbacks } from './schedule';
 import config from '../config';
 import { TASK_COMMAND } from '../config/const';
 import { getFileContentByName, getPid, killTask, rmPath } from '../config/util';
+import taskLimit from '../shared/pLimit';

@Service()
 export default class ScriptService {
@@ -43,7 +44,7 @@ export default class ScriptService {
    const pid = await this.scheduleService.runTask(
      `real_time=true ${command}`,
      this.taskCallbacks(filePath),
-      { command },
+      { command, id: relativePath.replace(/ /g, '-'), runOrigin: 'script' },
      'start',
    );

@@ -53,6 +54,7 @@ export default class ScriptService {
  public async stopScript(filePath: string, pid: number) {
    if (!pid) {
      const relativePath = path.relative(config.scriptPath, filePath);
+      taskLimit.removeQueuedCron(relativePath.replace(/ /g, '-'));
      pid = (await getPid(`${TASK_COMMAND} ${relativePath} now`)) as number;
    }
    try {
@@ -63,11 +65,13 @@ export default class ScriptService {
  }

  public async getFile(filePath: string, fileName: string) {
-    let _filePath = join(config.scriptPath, filePath, fileName);
-    if (filePath.startsWith(config.dataPath)) {
-      _filePath = join(filePath, fileName);
+    const finalPath = path.resolve(config.scriptPath, filePath, fileName);
+
+    if (!finalPath.startsWith(config.scriptPath)) {
+      return '';
    }
-    const content = await getFileContentByName(_filePath);
+
+    const content = await getFileContentByName(finalPath);
    return content;
  }
 }
@@ -3,6 +3,7 @@ import winston from 'winston';
 import config from '../config';
 import {
  Subscription,
+  SubscriptionInstance,
  SubscriptionModel,
  SubscriptionStatus,
 } from '../data/subscription';
@@ -29,6 +30,7 @@ import { LOG_END_SYMBOL } from '../config/const';
 import { formatCommand, formatUrl } from '../config/subscription';
 import { CrontabModel } from '../data/cron';
 import CrontabService from './cron';
+import taskLimit from '../shared/pLimit';

@Service()
 export default class SubscriptionService {
@@ -40,8 +42,12 @@ export default class SubscriptionService {
    private crontabService: CrontabService,
  ) {}

-  public async list(searchText?: string): Promise<Subscription[]> {
+  public async list(
+    searchText?: string,
+    ids?: string,
+  ): Promise<SubscriptionInstance[]> {
    let query = {};
+    const subIds = JSON.parse(ids || '[]');
    if (searchText) {
      const reg = {
        [Op.or]: [
@@ -62,7 +68,7 @@ export default class SubscriptionService {
    }
    try {
      const result = await SubscriptionModel.findAll({
-        where: query,
+        where: { ...query, ...(ids ? { id: subIds } : undefined) },
        order: [
          ['is_disabled', 'ASC'],
          ['createdAt', 'DESC'],
@@ -87,7 +93,7 @@ export default class SubscriptionService {
      this.scheduleService.cancelCronTask(doc as any);
      needCreate &&
        (await this.scheduleService.createCronTask(
-          doc as any,
+          { ...doc, runOrigin: 'subscription' } as any,
          this.taskCallbacks(doc),
          runImmediately,
        ));
@@ -96,7 +102,7 @@ export default class SubscriptionService {
      const { type, value } = doc.interval_schedule;
      needCreate &&
        (await this.scheduleService.createIntervalTask(
-          doc as any,
+          { ...doc, runOrigin: 'subscription' } as any,
          { [type]: value } as SimpleIntervalSchedule,
          runImmediately,
          this.taskCallbacks(doc),
@@ -202,12 +208,12 @@ export default class SubscriptionService {
  public async create(payload: Subscription): Promise<Subscription> {
    const tab = new Subscription(payload);
    const doc = await this.insert(tab);
-    await this.handleTask(doc);
+    await this.handleTask(doc.get({ plain: true }));
    await this.setSshConfig();
    return doc;
  }

-  public async insert(payload: Subscription): Promise<Subscription> {
+  public async insert(payload: Subscription): Promise<SubscriptionInstance> {
    return await SubscriptionModel.create(payload, { returning: true });
  }

@@ -259,7 +265,7 @@ export default class SubscriptionService {
  public async remove(ids: number[], query: { force?: boolean }) {
    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
    for (const doc of docs) {
-      await this.handleTask(doc, false);
+      await this.handleTask(doc.get({ plain: true }), false);
    }
    await SubscriptionModel.destroy({ where: { id: ids } });
    await this.setSshConfig();
@@ -271,7 +277,9 @@ export default class SubscriptionService {
      }
      for (const doc of docs) {
        const filePath = join(config.scriptPath, doc.alias);
+        const repoPath = join(config.repoPath, doc.alias);
        await rmPath(filePath);
+        await rmPath(repoPath);
      }
    }
  }
@@ -326,6 +334,8 @@ export default class SubscriptionService {
      name: subscription.name,
      schedule: subscription.schedule,
      command,
+      id: String(subscription.id),
+      runOrigin: 'subscription',
    });
  }

@@ -334,7 +344,7 @@ export default class SubscriptionService {
    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
    await this.setSshConfig();
    for (const doc of docs) {
-      await this.handleTask(doc, false);
+      await this.handleTask(doc.get({ plain: true }), false);
    }
  }

@@ -343,7 +353,7 @@ export default class SubscriptionService {
    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
    await this.setSshConfig();
    for (const doc of docs) {
-      await this.handleTask(doc);
+      await this.handleTask(doc.get({ plain: true }));
    }
  }

@@ -15,6 +15,7 @@ import {
  parseVersion,
  promiseExec,
  readDirs,
+  rmPath,
 } from '../config/util';
 import {
  DependenceModel,
@@ -33,6 +34,8 @@ import taskLimit from '../shared/pLimit';
 import NotificationService from './notify';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import SockService from './sock';
+import os from 'os';
+import dayjs from 'dayjs';

@Service()
 export default class SystemService {
@@ -89,17 +92,22 @@ export default class SystemService {
      info: { ...oDoc.info, ...info },
    });
    const cron = {
-      id: result.id || NaN,
+      id: result.id as number,
      name: '删除日志',
      command: `ql rmlog ${info.logRemoveFrequency}`,
+      runOrigin: 'system' as const,
    };
    if (oDoc.info?.logRemoveFrequency) {
      await this.scheduleService.cancelIntervalTask(cron);
    }
    if (info.logRemoveFrequency && info.logRemoveFrequency > 0) {
-      this.scheduleService.createIntervalTask(cron, {
-        days: info.logRemoveFrequency,
-      });
+      this.scheduleService.createIntervalTask(
+        cron,
+        {
+          days: info.logRemoveFrequency,
+        },
+        true,
+      );
    }
    return { code: 200, data: info };
  }
@@ -175,6 +183,8 @@ export default class SystemService {
      },
      {
        command,
+        id: 'update-node-mirror',
+        runOrigin: 'system',
      },
    );
  }
@@ -205,6 +215,9 @@ export default class SystemService {
    });
    let defaultDomain = 'https://dl-cdn.alpinelinux.org';
    let targetDomain = 'https://dl-cdn.alpinelinux.org';
+    if (os.platform() !== 'linux') {
+      return;
+    }
    const content = await fs.promises.readFile('/etc/apk/repositories', {
      encoding: 'utf-8',
    });
@@ -246,6 +259,8 @@ export default class SystemService {
      },
      {
        command,
+        id: 'update-linux-mirror',
+        runOrigin: 'system',
      },
    );
  }
@@ -262,7 +277,7 @@ export default class SystemService {
            timeout: 30000,
          },
        );
-        lastVersionContent = await parseContentVersion(result.body);
+        lastVersionContent = parseContentVersion(result.body);
      } catch (error) {}

      if (!lastVersionContent) {
@@ -357,6 +372,8 @@ export default class SystemService {
    }
    this.scheduleService.runTask(`real_time=true ${command}`, callback, {
      command,
+      id: command.replace(/ /g, '-'),
+      runOrigin: 'system',
    });
  }

@@ -405,9 +422,25 @@ export default class SystemService {
    }
  }

-  public async getSystemLog(res: Response) {
+  public async getSystemLog(
+    res: Response,
+    query: {
+      startTime?: string;
+      endTime?: string;
+    },
+  ) {
+    const startTime = dayjs(query.startTime || undefined)
+      .startOf('d')
+      .valueOf();
+    const endTime = dayjs(query.endTime || undefined)
+      .endOf('d')
+      .valueOf();
    const result = await readDirs(config.systemLogPath, config.systemLogPath);
-    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+    const logs = result
+      .reverse()
+      .filter((x) => x.title.endsWith('.log'))
+      .filter((x) => x.mtime >= startTime && x.mtime <= endTime);
+
    res.set({
      'Content-Length': sum(logs.map((x) => x.size)),
    });
@@ -429,4 +462,12 @@ export default class SystemService {
      }
    })(res, logs);
  }
+
+  public async deleteSystemLog() {
+    const result = await readDirs(config.systemLogPath, config.systemLogPath);
+    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+    for (const log of logs) {
+      await rmPath(path.join(config.systemLogPath, log.title));
+    }
+  }
 }
@@ -154,6 +154,7 @@ export default class UserService {
            status: LoginStatus.success,
          },
        });
+        this.getLoginLog();
        return {
          code: 200,
          data: { token, lastip, lastaddr, lastlogon, retries, platform },
@@ -182,6 +183,7 @@ export default class UserService {
            status: LoginStatus.fail,
          },
        });
+        this.getLoginLog();
        if (retries > 2) {
          const waitTime = Math.round(Math.pow(3, retries + 1));
          return {
@@ -215,8 +217,9 @@ export default class UserService {
        (a, b) => b.info!.timestamp! - a.info!.timestamp!,
      );
      if (result.length > 100) {
+        const ids = result.slice(100).map((x) => x.id!);
        await SystemModel.destroy({
-          where: { id: result[result.length - 1].id },
+          where: { id: ids },
        });
      }
      return result.map((x) => x.info);
@@ -0,0 +1,33 @@
+import { Dependence } from '../data/dependence';
+import { ICron } from '../protos/cron';
+
+export type Override<
+  T,
+  K extends Partial<{ [P in keyof T]: any }> | string,
+> = K extends string
+  ? Omit<T, K> & { [P in keyof T]: T[P] | unknown }
+  : Omit<T, keyof K> & K;
+
+export type TCron = Override<Partial<ICron>, { id: string }>;
+
+export interface IDependencyFn<T> {
+  (): Promise<T>;
+  dependency?: Dependence;
+}
+
+export interface ICronFn<T> {
+  (): Promise<T>;
+  cron?: TCron;
+}
+
+export interface ISchedule {
+  schedule?: string;
+  name?: string;
+  command?: string;
+  id: string;
+}
+
+export interface IScheduleFn<T> {
+  (): Promise<T>;
+  schedule?: ISchedule;
+}
@@ -3,14 +3,20 @@ import os from 'os';
 import { AuthDataType, SystemModel } from '../data/system';
 import Logger from '../loaders/logger';
 import { Dependence } from '../data/dependence';
+import NotificationService from '../services/notify';
+import {
+  ICronFn,
+  IDependencyFn,
+  ISchedule,
+  IScheduleFn,
+  TCron,
+} from './interface';

-interface IDependencyFn<T> {
-  (): Promise<T>;
-  dependency?: Dependence;
-}
 class TaskLimit {
  private dependenyLimit = new PQueue({ concurrency: 1 });
  private queuedDependencyIds = new Set<number>([]);
+  private queuedCrons = new Map<string, ICronFn<any>[]>();
+  private repeatCronNotifyMap = new Map<string, number>();
  private updateLogLimit = new PQueue({ concurrency: 1 });
  private cronLimit = new PQueue({
    concurrency: Math.max(os.cpus().length, 4),
@@ -18,6 +24,15 @@ class TaskLimit {
  private manualCronoLimit = new PQueue({
    concurrency: Math.max(os.cpus().length, 4),
  });
+  private subscriptionLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
+  private scriptLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
+  private systemLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });

  get cronLimitActiveCount() {
    return this.cronLimit.pending;
@@ -31,6 +46,8 @@ class TaskLimit {
    return [...this.queuedDependencyIds.values()][0];
  }

+  private notificationService: NotificationService = new NotificationService();
+
  constructor() {
    this.setCustomLimit();
    this.handleEvents();
@@ -71,6 +88,16 @@ class TaskLimit {
    }
  }

+  public removeQueuedCron(id: string) {
+    if (this.queuedCrons.has(id)) {
+      const runs = this.queuedCrons.get(id);
+      if (runs && runs.length > 0) {
+        runs.pop();
+        this.queuedCrons.set(id, runs);
+      }
+    }
+  }
+
  public async setCustomLimit(limit?: number) {
    if (limit) {
      this.cronLimit.concurrency = limit;
@@ -88,9 +115,26 @@ class TaskLimit {
  }

  public async runWithCronLimit<T>(
-    fn: () => Promise<T>,
+    cron: TCron,
+    fn: ICronFn<T>,
    options?: Partial<QueueAddOptions>,
  ): Promise<T | void> {
+    fn.cron = cron;
+    let runs = this.queuedCrons.get(cron.id);
+    const result = runs?.length ? [...runs, fn] : [fn];
+    const repeatTimes = this.repeatCronNotifyMap.get(cron.id) || 0;
+    if (result?.length > 5) {
+      if (repeatTimes < 3) {
+        this.repeatCronNotifyMap.set(cron.id, repeatTimes + 1);
+        this.notificationService.externalNotify(
+          '任务重复运行',
+          `任务：${cron.name}，命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 5 个，请检查定时设置`,
+        );
+      }
+      Logger.warn(`[schedule][任务重复运行] 参数 ${JSON.stringify(cron)}`);
+      return;
+    }
+    this.queuedCrons.set(cron.id, result);
    return this.cronLimit.add(fn, options);
  }

@@ -101,6 +145,33 @@ class TaskLimit {
    return this.manualCronoLimit.add(fn, options);
  }

+  public async runWithSubscriptionLimit<T>(
+    schedule: TCron,
+    fn: IScheduleFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    fn.schedule = schedule;
+    return this.subscriptionLimit.add(fn, options);
+  }
+
+  public async runWithSystemLimit<T>(
+    schedule: TCron,
+    fn: IScheduleFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    fn.schedule = schedule;
+    return this.systemLimit.add(fn, options);
+  }
+
+  public async runWithScriptLimit<T>(
+    schedule: ISchedule,
+    fn: IScheduleFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    fn.schedule = schedule;
+    return this.scriptLimit.add(fn, options);
+  }
+
  public runDependeny<T>(
    dependency: Dependence,
    fn: IDependencyFn<T>,
@@ -1,11 +1,17 @@
 import { spawn } from 'cross-spawn';
 import taskLimit from './pLimit';
 import Logger from '../loaders/logger';
+import { ICron } from '../protos/cron';

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

      cp.stderr.on('data', (data) => {
@@ -24,7 +30,16 @@ export function runCron(cmd: string, options?: { schedule: string; extraSchedule
      });

      cp.on('exit', async (code) => {
-        resolve({ ...options, command: cmd, pid: cp.pid, code });
+        taskLimit.removeQueuedCron(cron.id);
+        Logger.info(
+          '[schedule][执行任务结束] 参数: %s, 退出码: %j',
+          JSON.stringify({
+            ...cron,
+            command: cmd,
+          }),
+          code,
+        );
+        resolve({ ...cron, command: cmd, pid: cp.pid, code });
      });
    });
  });
@@ -1,9 +1,9 @@
-FROM python:3.10-alpine3.18 as builder
+FROM python:3.10-alpine3.18 AS builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
  && apk update \
  && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 pm2 tsx \
+  && npm i -g pnpm@8.3.1 pm2 ts-node \
  && cd /tmp/build \
  && pnpm install --prod

@@ -15,7 +15,7 @@ ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop

 ENV PNPM_HOME=/root/.local/share/pnpm \
-  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \
  NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
  LANG=C.UTF-8 \
  SHELL=/bin/bash \
@@ -59,7 +59,8 @@ RUN set -x \
  && rm -rf /root/.pnpm-store \
  && rm -rf /root/.local/share/pnpm/store \
  && rm -rf /root/.cache \
-  && ulimit -c 0
+  && ulimit -c 0 \
+  && pip3 install requests

 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
@@ -1,9 +1,9 @@
-FROM python:3.11-alpine3.18 as builder
+FROM python:3.11-alpine3.18 AS builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
  && apk update \
  && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 pm2 tsx \
+  && npm i -g pnpm@8.3.1 pm2 ts-node \
  && cd /tmp/build \
  && pnpm install --prod

@@ -15,7 +15,7 @@ ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop

 ENV PNPM_HOME=/root/.local/share/pnpm \
-  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \
  NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
  LANG=C.UTF-8 \
  SHELL=/bin/bash \
@@ -59,7 +59,8 @@ RUN set -x \
  && rm -rf /root/.pnpm-store \
  && rm -rf /root/.local/share/pnpm/store \
  && rm -rf /root/.cache \
-  && ulimit -c 0
+  && ulimit -c 0 \
+  && pip3 install requests

 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
@@ -1,10 +1,11 @@
 #!/bin/bash

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

 echo -e "======================1. 检测配置文件========================\n"
+import_config "$@"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
 init_nginx
@@ -2,11 +2,11 @@
  "private": true,
  "scripts": {
    "start": "concurrently -n w: npm:start:*",
-    "start:front": "max dev",
-    "start:back": "nodemon",
    "start:update": "ts-node -P tsconfig.back.json ./back/update.ts",
    "start:public": "ts-node -P tsconfig.back.json ./back/public.ts",
    "start:rpc": "ts-node -P tsconfig.back.json ./back/schedule/index.ts",
+    "start:back": "nodemon",
+    "start:front": "max dev",
    "build:front": "max build",
    "build:back": "tsc -p tsconfig.back.json",
    "panel": "npm run build:back && node static/build/app.js",
@@ -59,7 +59,7 @@
  "dependencies": {
    "@grpc/grpc-js": "^1.8.13",
    "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^7.12.1",
+    "@sentry/node": "^8.26.0",
    "body-parser": "^1.19.2",
    "celebrate": "^15.0.1",
    "chokidar": "^3.5.3",
@@ -103,11 +103,15 @@
    "ip2region": "2.3.0"
  },
  "devDependencies": {
+    "moment": "2.30.1",
    "@ant-design/icons": "^4.7.0",
    "@ant-design/pro-layout": "6.38.22",
+    "@codemirror/view": "^6.34.1",
+    "@codemirror/state": "^6.4.1",
    "@monaco-editor/react": "4.2.1",
    "@react-hook/resize-observer": "^1.2.6",
-    "@sentry/react": "^7.12.1",
+    "react-router-dom": "6.26.1",
+    "@sentry/react": "^8.26.0",
    "@types/body-parser": "^1.19.2",
    "@types/cors": "^2.8.12",
    "@types/cross-spawn": "^6.0.2",
@@ -163,10 +167,9 @@
    "react-intl-universal": "^2.6.21",
    "react-split-pane": "^0.1.92",
    "sockjs-client": "^1.6.0",
-    "ts-node": "^10.6.0",
+    "ts-node": "^10.9.2",
    "ts-proto": "^1.146.0",
    "tslib": "^2.4.0",
-    "tsx": "^4.7.3",
    "typescript": "5.2.2",
    "vh-check": "^2.0.5",
    "virtualizedtableforantd4": "1.3.0",
@@ -8,7 +8,7 @@ AutoAddCron="true"
 DefaultCronRule=""

 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
-RepoFileExtensions="js py"
+RepoFileExtensions="js mjs py pyc"

 ## 代理地址，支持HTTP/SOCK5，例如 http://127.0.0.1:7890
 ProxyUrl=""
@@ -43,7 +43,7 @@ BotRepoUrl=""

 ## 通知环境变量
 ## 1. Server酱
-## https://sct.ftqq.com
+## https://sct.ftqq.com/r/13363
 ## 下方填写 SCHKEY 值或 SendKey 值
 export PUSH_KEY=""

@@ -175,8 +175,16 @@ export CHRONOCAT_QQ=""
 export CHRONOCAT_TOKEN=""

 ## 16. SMTP
+## JavaScript 参数
 ## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
 export SMTP_SERVICE=""
+
+## Python 参数
+## SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
+export SMTP_SERVER=""
+## SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false
+export SMTP_SSL=""
+
 ## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
 export SMTP_EMAIL=""
 ## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
@@ -203,7 +211,17 @@ export FSKEY=""
 export QMSG_KEY=""
 export QMSG_TYPE=""

-## 20. 自定义通知
+## 20.Ntfy
+## 官方文档: https://docs.ntfy.sh
+## ntfy_url 填写ntfy地址,如https://ntfy.sh
+## ntfy_topic 填写ntfy的消息应用topic
+## ntfy_priority 填写推送消息优先级,默认为3
+export NTFY_URL=""
+export NTFY_TOPIC=""
+export NTFY_PRIORITY="3"
+
+
+## 21. 自定义通知
 ## 自定义通知 接收回调的URL
 export WEBHOOK_URL=""
 ## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"
@@ -95,6 +95,10 @@ const push_config = {
  WEBHOOK_HEADERS: '', // 自定义通知 请求头
  WEBHOOK_METHOD: '', // 自定义通知 请求方法
  WEBHOOK_CONTENT_TYPE: '', // 自定义通知 content-type
+
+  NTFY_URL: '', // ntfy地址,如https://ntfy.sh,默认为https://ntfy.sh
+  NTFY_TOPIC: '', // ntfy的消息应用topic
+  NTFY_PRIORITY: '3', // 推送消息优先级,默认为3
 };

 for (const key in push_config) {
@@ -224,11 +228,13 @@ function serverNotify(text, desp) {
    if (PUSH_KEY) {
      // 微信server酱推送通知一个\n不会换行，需要两个\n才能换行，故做此替换
      desp = desp.replace(/[\n\r]/g, '\n\n');
+
+      const matchResult = PUSH_KEY.match(/^sctp(\d+)t/i);
      const options = {
-        url: PUSH_KEY.includes('SCT')
-          ? `https://sctapi.ftqq.com/${PUSH_KEY}.send`
-          : `https://sc.ftqq.com/${PUSH_KEY}.send`,
-        body: `text=${text}&desp=${desp}`,
+        url: matchResult && matchResult[1]
+        ? `https://${matchResult[1]}.push.ft07.com/send/${PUSH_KEY}.send`
+        : `https://sctapi.ftqq.com/${PUSH_KEY}.send`,
+        body: `text=${encodeURIComponent(text)}&desp=${encodeURIComponent(desp)}`,
        headers: {
          'Content-Type': 'application/x-www-form-urlencoded',
        },
@@ -817,7 +823,7 @@ function wePlusBotNotify(text, desp) {
    const { WE_PLUS_BOT_TOKEN, WE_PLUS_BOT_RECEIVER, WE_PLUS_BOT_VERSION } =
      push_config;
    if (WE_PLUS_BOT_TOKEN) {
-      const template = 'txt';
+      let template = 'txt';
      if (desp.length > 800) {
        desp = desp.replace(/[\n\r]/g, '<br>');
        template = 'html';
@@ -1143,14 +1149,20 @@ function webhookNotify(text, desp) {
      WEBHOOK_CONTENT_TYPE,
      WEBHOOK_METHOD,
    } = push_config;
-    if (!WEBHOOK_URL.includes('$title') && !WEBHOOK_BODY.includes('$title')) {
+    if (
+      !WEBHOOK_METHOD ||
+      !WEBHOOK_URL ||
+      (!WEBHOOK_URL.includes('$title') && !WEBHOOK_BODY.includes('$title'))
+    ) {
      resolve();
      return;
    }

    const headers = parseHeaders(WEBHOOK_HEADERS);
    const body = parseBody(WEBHOOK_BODY, WEBHOOK_CONTENT_TYPE, (v) =>
-      v?.replaceAll('$title', text)?.replaceAll('$content', desp),
+      v
+        ?.replaceAll('$title', text?.replaceAll('\n', '\\n'))
+        ?.replaceAll('$content', desp?.replaceAll('\n', '\\n')),
    );
    const bodyParam = formatBodyFun(WEBHOOK_CONTENT_TYPE, body);
    const options = {
@@ -1162,22 +1174,59 @@ function webhookNotify(text, desp) {
      retry: 1,
    };

-    if (WEBHOOK_METHOD) {
-      const formatUrl = WEBHOOK_URL.replaceAll(
-        '$title',
-        encodeURIComponent(text),
-      ).replaceAll('$content', encodeURIComponent(desp));
-      got(formatUrl, options).then((resp) => {
+    const formatUrl = WEBHOOK_URL.replaceAll(
+      '$title',
+      encodeURIComponent(text),
+    ).replaceAll('$content', encodeURIComponent(desp));
+    got(formatUrl, options).then((resp) => {
+      try {
+        if (resp.statusCode !== 200) {
+          console.log(`自定义发送通知消息失败😞 ${resp.body}\n`);
+        } else {
+          console.log(`自定义发送通知消息成功🎉 ${resp.body}\n`);
+        }
+      } catch (e) {
+        $.logErr(e, resp);
+      } finally {
+        resolve(resp.body);
+      }
+    });
+  });
+}
+
+function ntfyNotify(text, desp) {
+  function encodeRFC2047(text) {
+    const encodedBase64 = Buffer.from(text).toString('base64');
+    return `=?utf-8?B?${encodedBase64}?=`;
+  }
+
+  return new Promise((resolve) => {
+    const { NTFY_URL, NTFY_TOPIC, NTFY_PRIORITY } = push_config;
+    if (NTFY_TOPIC) {
+      const options = {
+        url: `${NTFY_URL || 'https://ntfy.sh'}/${NTFY_TOPIC}`,
+        body: `${desp}`, 
+        headers: {
+          'Title': `${encodeRFC2047(text)}`,
+          'Priority': NTFY_PRIORITY || '3'
+        },
+        timeout,
+      };
+      $.post(options, (err, resp, data) => {
        try {
-          if (resp.statusCode !== 200) {
-            console.log(`自定义发送通知消息失败😞 ${resp.body}\n`);
+          if (err) {
+            console.log('Ntfy 通知调用API失败😞\n', err);
          } else {
-            console.log(`自定义发送通知消息成功🎉 ${resp.body}\n`);
+            if (data.id) {
+              console.log('Ntfy 发送通知消息成功🎉\n');
+            } else {
+              console.log(`Ntfy 发送通知消息异常 ${JSON.stringify(data)}`);
+            }
          }
        } catch (e) {
          $.logErr(e, resp);
        } finally {
-          resolve(resp.body);
+          resolve(data);
        }
      });
    } else {
@@ -1186,6 +1235,7 @@ function webhookNotify(text, desp) {
  });
 }

+
 function parseString(input, valueFormatFn) {
  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
  const matches = {};
@@ -1314,6 +1364,7 @@ async function sendNotify(text, desp, params = {}) {
    chronocatNotify(text, desp), // Chronocat
    webhookNotify(text, desp), // 自定义通知
    qmsgNotify(text, desp), // 自定义通知
+    ntfyNotify(text, desp), // Ntfy
  ]);
 }

@@ -116,7 +116,11 @@ push_config = {
    'WEBHOOK_BODY': '',                 # 自定义通知 请求体
    'WEBHOOK_HEADERS': '',              # 自定义通知 请求头
    'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
-    'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
+    'WEBHOOK_CONTENT_TYPE': '',         # 自定义通知 content-type
+
+    'NTFY_URL': '',                     # ntfy地址,如https://ntfy.sh
+    'NTFY_TOPIC': '',                   # ntfy的消息应用topic
+    'NTFY_PRIORITY':'3',                # 推送消息优先级,默认为3
 }
 # fmt: on

@@ -298,10 +302,14 @@ def serverJ(title: str, content: str) -> None:
    print("serverJ 服务启动")

    data = {"text": title, "desp": content.replace("\n", "\n\n")}
-    if push_config.get("PUSH_KEY").find("SCT") != -1:
-        url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+
+    match = re.match(r'sctp(\d+)t', push_config.get("PUSH_KEY"))
+    if match:
+        num = match.group(1)
+        url = f'https://{num}.push.ft07.com/send/{push_config.get("PUSH_KEY")}.send'
    else:
-        url = f'https://sc.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+        url = f'https://sctapi.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:
@@ -777,6 +785,42 @@ def chronocat(title: str, content: str) -> None:
                    print(f"QQ群消息:{ids}推送失败！")


+def ntfy(title: str, content: str) -> None:
+    """
+    通过 Ntfy 推送消息
+    """
+    def encode_rfc2047(text: str) -> str:
+        """将文本编码为符合 RFC 2047 标准的格式"""
+        encoded_bytes = base64.b64encode(text.encode('utf-8'))
+        encoded_str = encoded_bytes.decode('utf-8')
+        return f'=?utf-8?B?{encoded_str}?='
+
+    if not push_config.get("NTFY_TOPIC"):
+        print("ntfy 服务的 NTFY_TOPIC 未设置!!\n取消推送")
+        return
+    print("ntfy 服务启动")
+    priority = '3'
+    if not push_config.get("NTFY_PRIORITY"):
+        print("ntfy 服务的NTFY_PRIORITY 未设置!!默认设置为3")
+    else:
+        priority = push_config.get("NTFY_PRIORITY")
+    
+    # 使用 RFC 2047 编码 title
+    encoded_title = encode_rfc2047(title)
+
+    data = content.encode(encoding='utf-8')
+    headers = {
+        "Title": encoded_title,  # 使用编码后的 title
+        "Priority": priority
+    }
+    
+    url = push_config.get("NTFY_URL") + "/" + push_config.get("NTFY_TOPIC")
+    response = requests.post(url, data=data, headers=headers)
+    if response.status_code == 200:  # 使用 response.status_code 进行检查
+        print("Ntfy 推送成功！")
+    else:
+        print("Ntfy 推送失败！错误信息：", response.text)
+
 def parse_headers(headers):
    if not headers:
        return {}
@@ -852,7 +896,9 @@ def custom_notify(title: str, content: str) -> None:
    body = parse_body(
        WEBHOOK_BODY,
        WEBHOOK_CONTENT_TYPE,
-        lambda v: v.replace("$title", title).replace("$content", content),
+        lambda v: v.replace("$title", title.replace("\n", "\\n")).replace(
+            "$content", content.replace("\n", "\\n")
+        ),
    )
    formatted_url = WEBHOOK_URL.replace(
        "$title", urllib.parse.quote_plus(title)
@@ -935,7 +981,8 @@ def add_notify_function():
        notify_function.append(chronocat)
    if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
        notify_function.append(custom_notify)
-
+    if push_config.get("NTFY_TOPIC"):
+        notify_function.append(ntfy)
    if not notify_function:
        print(f"无推送渠道，请检查通知变量是否正确")
    return notify_function
@@ -977,4 +1024,4 @@ def main():


 if __name__ == "__main__":
-    main()
+    main()
@@ -4,8 +4,6 @@
 * 定时规则
 * cron: 1 9 * * *
 */
-const { sendNotify } = require('./sendNotify.js'); // commonjs
-// import { sendNotify } from './sendNotify'; // es6
-
 console.log('test scripts');
-sendNotify('test scripts', 'test desc');
+QLAPI.notify('test scripts', 'test desc');
+console.log('test desc');
@@ -4,7 +4,6 @@ name: script name
 定时规则
 cron: 1 9 * * *
 """
-import notify
-
 print("test script")
-notify.send('test script', 'test desc')
+QLAPI.notify('test script', 'test desc')
+print("test desc")
@@ -1,17 +1,17 @@
 #!/usr/bin/env bash

 create_token() {
-  local token_command="tsx ${dir_root}/back/token.ts"
+  local token_command="ts-node-transpile-only ${dir_root}/back/token.ts"
  local token_file="${dir_root}/static/build/token.js"
  if [[ -f $token_file ]]; then
    token_command="node ${token_file}"
  fi
-  token=$(eval "$token_command")
+  __ql_token__=$(eval "$token_command")
 }

 get_token() {
  if [[ -f $file_auth_token ]]; then
-    token=$(cat $file_auth_token | jq -r .value)
+    __ql_token__=$(cat $file_auth_token | jq -r .value)
    local expiration=$(cat $file_auth_token | jq -r .expiration)
    local currentTimeStamp=$(date +%s)
    if [[ $currentTimeStamp -ge $expiration ]]; then
@@ -43,7 +43,7 @@ add_cron_api() {
  local api=$(
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
      -H "Content-Type: application/json;charset=UTF-8" \
      -H "Origin: http://0.0.0.0:5700" \
@@ -79,7 +79,7 @@ update_cron_api() {
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
      -H "Content-Type: application/json;charset=UTF-8" \
      -H "Origin: http://0.0.0.0:5700" \
@@ -111,7 +111,7 @@ update_cron_command_api() {
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
      -H "Content-Type: application/json;charset=UTF-8" \
      -H "Origin: http://0.0.0.0:5700" \
@@ -136,7 +136,7 @@ del_cron_api() {
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
      -X 'DELETE' \
      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
      -H "Content-Type: application/json;charset=UTF-8" \
      -H "Origin: http://0.0.0.0:5700" \
@@ -166,7 +166,7 @@ update_cron() {
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
      -H "Content-Type: application/json;charset=UTF-8" \
      -H "Origin: http://0.0.0.0:5700" \
@@ -190,7 +190,7 @@ notify_api() {
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
      -H "Content-Type: application/json;charset=UTF-8" \
      -H "Origin: http://0.0.0.0:5700" \
@@ -214,7 +214,7 @@ find_cron_api() {
  local api=$(
    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
      -H "Content-Type: application/json;charset=UTF-8" \
      -H "Origin: http://0.0.0.0:5700" \
@@ -73,7 +73,7 @@ check_pm2() {

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

  reset_env
@@ -69,26 +69,18 @@ run_nohup() {
  nohup node $file_name &>$log_path &
 }

-check_server() {
-  if [[ $cpu_warn ]] && [[ $mem_warn ]] && [[ $disk_warn ]]; then
-    local top_result=$(top -b -n 1)
-    cpu_use=$(echo "$top_result" | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
-
-    mem_free=$(free -m | grep "Mem" | awk '{print $3}' | head -n 1)
-    mem_total=$(free -m | grep "Mem" | awk '{print $2}' | head -n 1)
-    mem_use=$(printf "%d%%" $((mem_free * 100 / mem_total)) | cut -f 1 -d "%" | head -n 1)
-
-    disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%" | head -n 1)
-    if [[ $cpu_use -gt $cpu_warn ]] && [[ $cpu_warn ]] || [[ $mem_free -lt $mem_warn ]] || [[ $disk_use -gt $disk_warn ]]; then
-      local resource=$(echo "$top_result" | grep -v -E 'grep|Mem|idle|Load|tr' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10 | tr '\n' '|' | sed s/\|/\\\\n/g)
-      notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource"
-    fi
-  fi
-}
-
 env_str_to_array() {
+  . $file_env
  local IFS="&"
  read -ra array <<<"${!env_param}"
+  array_length=${#array[@]}
+  clear_env
+}
+
+clear_non_sh_env() {
+  if [[ $file_param != *.sh ]]; then
+    clear_env
+  fi
 }

 ## 正常运行单个脚本，$1：传入参数
@@ -105,38 +97,36 @@ run_normal() {
    file_param=${file_param/$relative_path\//}
  fi

+  if [[ $isJsOrPythonFile == 'false' ]]; then
+    clear_non_sh_env
+  fi
  $timeoutCmd $which_program $file_param "${script_params[@]}"
 }

+handle_env_split() {
+  if [[ ! $num_param ]]; then
+    num_param="1-max"
+  fi
+
+  env_str_to_array
+  local tempArr=$(echo $num_param | sed "s/-max/-${array_length}/g" | sed "s/max-/${array_length}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local runArr=($(eval echo $tempArr))
+  array_run=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
+}
+
 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
 run_concurrent() {
  local file_param="$1"
  local env_param="$2"
-  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|" | awk '{$1=$1};1')
  if [[ ! $env_param ]]; then
    echo -e "\n 缺少并发运行的环境变量参数"
    exit 1
  fi

-  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[@]}))
-
-  local n=0
-  for i in ${runArr[@]}; do
-    array_run[n]=${array[$i - 1]}
-    let n++
-  done
-
-  local cookieStr=$(
-    IFS="&"
-    echo "${array_run[*]}"
-  )
-  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
-
-  env_str_to_array
-  single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%3N")
+  handle_env_split
+  time=$(date "+$mtime_format")
+  single_log_time=$(format_log_time "$mtime_format" "$time")

  cd $dir_scripts
  local relative_path="${file_param%/*}"
@@ -144,15 +134,24 @@ run_concurrent() {
    cd ${relative_path}
    file_param=${file_param/$relative_path\//}
  fi
-  for i in "${!array[@]}"; do
-    export "${env_param}=${array[i]}"
-    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-    eval $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
+
+  local j=0
+  for i in ${array_run[@]}; do
+    single_log_path="$dir_log/$log_dir/${single_log_time}_$((j + 1)).log"
+    let j++
+
+    if [[ $isJsOrPythonFile == 'false' ]]; then
+      export "${env_param}=${array[$i - 1]}"
+      clear_non_sh_env
+    fi
+    eval envParam="${env_param}" numParam="${i}" $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
  done

  wait
-  for i in "${!array[@]}"; do
-    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
+  local k=0
+  for i in ${array_run[@]}; do
+    single_log_path="$dir_log/$log_dir/${single_log_time}_$((k + 1)).log"
+    let k++
    cat $single_log_path
    [[ -f $single_log_path ]] && rm -f $single_log_path
  done
@@ -161,28 +160,27 @@ run_concurrent() {
 run_designated() {
  local file_param="$1"
  local env_param="$2"
-  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
-  if [[ ! $env_param ]] || [[ ! $num_param ]]; then
-    echo -e "\n 缺少单独运行的参数 task xxx.js desi Test 1 3"
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|" | awk '{$1=$1};1')
+  if [[ ! $env_param ]]; then
+    echo -e "\n 缺少单独运行的参数 task xxx.js desi Test"
    exit 1
  fi

-  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[@]}))
+  handle_env_split

-  local n=0
-  for i in ${runArr[@]}; do
-    array_run[n]=${array[$i - 1]}
-    let n++
-  done
-
-  local cookieStr=$(
-    IFS="&"
-    echo "${array_run[*]}"
-  )
-  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
+  if [[ $isJsOrPythonFile == 'false' ]]; then
+    local n=0
+    for i in ${array_run[@]}; do
+      array_str[n]=${array[$i - 1]}
+      let n++
+    done
+    local envStr=$(
+      IFS="&"
+      echo "${array_str[*]}"
+    )
+    [[ ! -z $envStr ]] && export "${env_param}=${envStr}"
+    clear_non_sh_env
+  fi

  cd $dir_scripts
  local relative_path="${file_param%/*}"
@@ -190,7 +188,8 @@ run_designated() {
    cd ${relative_path}
    file_param=${file_param/$relative_path\//}
  fi
-  $timeoutCmd $which_program $file_param "${script_params[@]}"
+
+  envParam="${env_param}" numParam="${num_param}" $timeoutCmd $which_program $file_param "${script_params[@]}"
 }

 ## 运行其他命令
@@ -206,12 +205,48 @@ run_else() {

  shift

+  clear_non_sh_env
  $timeoutCmd $which_program $file_param "$@"
 }

-## 命令检测
+check_file() {
+  isJsOrPythonFile="false"
+  if [[ $1 == *.js ]] || [[ $1 == *.mjs ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.ts ]]; then
+    isJsOrPythonFile="true"
+  fi
+  if [[ -f $file_env ]]; then
+    get_env_array
+    if [[ $isJsOrPythonFile == 'true' ]]; then
+      export PREV_NODE_OPTIONS="${NODE_OPTIONS:=}"
+      export PREV_PYTHONPATH="${PYTHONPATH:=}"
+      if [[ $1 == *.js ]] || [[ $1 == *.ts ]] || [[ $1 == *.mjs ]]; then
+        export NODE_OPTIONS="-r ${file_preload_js} ${NODE_OPTIONS}"
+      else
+        export PYTHONPATH="${dir_preload}:${dir_config}:${PYTHONPATH}"
+      fi
+    else
+      . $file_env
+    fi
+  fi
+}
+
+check_nounset() {
+  local output=$(set -o)
+  while read -r line; do
+    if [[ "$line" =~ "nounset" ]] && [[ "$line" =~ "on" ]]; then
+      set_u_on="true"
+      set +u
+      break
+    fi
+  done <<<"$output"
+}
+
 main() {
  if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
+    if [[ $1 == *.sh ]]; then
+      timeoutCmd=""
+    fi
+
    case $# in
    1)
      run_normal "$1"
@@ -242,7 +277,20 @@ main() {
 }

 handle_task_start "${task_shell_params[@]}"
-run_task_before "${task_shell_params[@]}"
+check_file "${task_shell_params[@]}"
+if [[ $isJsOrPythonFile == 'false' ]]; then
+  run_task_before "${task_shell_params[@]}"
+fi
+set_u_on="false"
+check_nounset
 main "${task_shell_params[@]}"
+if [[ "$set_u_on" == 'true' ]]; then
+  set -u
+fi
+if [[ $isJsOrPythonFile == 'true' ]]; then
+  export NODE_OPTIONS="${PREV_NODE_OPTIONS}"
+  export PYTHONPATH="${PREV_PYTHONPATH}"
+fi
 run_task_after "${task_shell_params[@]}"
+clear_env
 handle_task_end "${task_shell_params[@]}"
@@ -0,0 +1,100 @@
+const { execSync } = require('child_process');
+require(`./env.js`);
+
+function expandRange(rangeStr, max) {
+  const tempRangeStr = rangeStr
+    .trim()
+    .replace(/-max/g, `-${max}`)
+    .replace(/max-/g, `${max}-`);
+
+  return tempRangeStr.split(' ').flatMap((part) => {
+    const rangeMatch = part.match(/^(\d+)([-~_])(\d+)$/);
+    if (rangeMatch) {
+      const [, start, , end] = rangeMatch.map(Number);
+      const step = start < end ? 1 : -1;
+      return Array.from(
+        { length: Math.abs(end - start) + 1 },
+        (_, i) => start + i * step,
+      );
+    }
+    return Number(part);
+  });
+}
+
+function run() {
+  const {
+    envParam,
+    numParam,
+    file_task_before,
+    file_task_before_js,
+    dir_scripts,
+    task_before,
+    PREV_NODE_OPTIONS,
+  } = process.env;
+
+  try {
+    process.env.NODE_OPTIONS = PREV_NODE_OPTIONS;
+
+    const splitStr = '__sitecustomize__';
+    const fileName = process.argv[1].replace(`${dir_scripts}/`, '');
+    let command = `bash -c "source ${file_task_before} ${fileName}`;
+    if (task_before) {
+      const escapeTaskBefore = task_before
+        .replace(/"/g, '\\"')
+        .replace(/\$/g, '\\$');
+      command = `${command} && eval '${escapeTaskBefore}'`;
+      console.log('执行前置命令\n');
+    }
+    const res = execSync(
+      `${command} && echo -e '${splitStr}' && node -p 'JSON.stringify(process.env)'"`,
+      {
+        encoding: 'utf-8',
+      },
+    );
+    const [output, envStr] = res.split(splitStr);
+    const newEnvObject = JSON.parse(envStr.trim());
+    for (const key in newEnvObject) {
+      process.env[key] = newEnvObject[key];
+    }
+    console.log(output);
+    if (task_before) {
+      console.log('执行前置命令结束\n');
+    }
+  } catch (error) {
+    if (!error.message.includes('spawnSync /bin/sh E2BIG')) {
+      console.log(`\ue926 run task before error: `, error);
+    } else {
+      console.log(
+        `\ue926 The environment variable is too large. It is recommended to use task_before.js instead of task_before.sh\n`,
+      );
+    }
+    if (task_before) {
+      console.log('执行前置命令结束\n');
+    }
+  }
+
+  require(file_task_before_js);
+
+  if (envParam && numParam) {
+    const array = (process.env[envParam] || '').split('&');
+    const runArr = expandRange(numParam, array.length);
+    const arrayRun = runArr.map((i) => array[i - 1]);
+    const envStr = arrayRun.join('&');
+    process.env[envParam] = envStr;
+  }
+}
+
+try {
+  if (!process.argv[1]) {
+    return;
+  }
+
+  run();
+
+  const { sendNotify } = require('./notify.js');
+  global.QLAPI = {
+    notify: sendNotify,
+  };
+} catch (error) {
+  console.log(`run builtin code error: `, error, '\n');
+}
@@ -0,0 +1,110 @@
+import os
+import re
+import subprocess
+import json
+import builtins
+import sys
+import env
+
+
+def try_parse_int(value):
+    try:
+        return int(value)
+    except ValueError:
+        return None
+
+
+def expand_range(range_str, max_value):
+    temp_range_str = (
+        range_str.strip()
+        .replace("-max", f"-{max_value}")
+        .replace("max-", f"{max_value}-")
+    )
+
+    result = []
+    for part in temp_range_str.split(" "):
+        range_match = re.match(r"^(\d+)([-~_])(\d+)$", part)
+        if range_match:
+            start, _, end = map(try_parse_int, range_match.groups())
+            step = 1 if start < end else -1
+            result.extend(range(start, end + step, step))
+        else:
+            result.append(int(part))
+
+    return result
+
+
+def run():
+    try:
+        prev_pythonpath = os.getenv("PREV_PYTHONPATH", "")
+        os.environ["PYTHONPATH"] = prev_pythonpath
+
+        split_str = "__sitecustomize__"
+        file_name = sys.argv[0].replace(f"{os.getenv('dir_scripts')}/", "")
+        command = f'bash -c "source {os.getenv("file_task_before")} {file_name}'
+        task_before = os.getenv("task_before")
+
+        if task_before:
+            escape_task_before = task_before.replace('"', '\\"').replace("$", "\\$")
+            command += f" && eval '{escape_task_before}'"
+            print("执行前置命令\n")
+
+        prev_pythonpath = os.getenv("PREV_PYTHONPATH", "")
+        python_command = (
+            "python3 -c 'import os, json; print(json.dumps(dict(os.environ)))'"
+        )
+        command += f" && echo -e '{split_str}' && {python_command}\""
+
+        res = subprocess.check_output(command, shell=True, encoding="utf-8")
+        output, env_str = res.split(split_str)
+
+        env_json = json.loads(env_str.strip())
+
+        for key, value in env_json.items():
+            os.environ[key] = value
+
+        print(output)
+        if task_before:
+            print("执行前置命令结束")
+
+    except subprocess.CalledProcessError as error:
+        print(f"run task before error: {error}")
+    except OSError as error:
+        error_message = str(error)
+        if "Argument list too long" not in error_message:
+            print(f"\ue926 run task before error: {error}")
+        else:
+            print(
+                "\ue926 The environment variable is too large. It is recommended to use task_before.py instead of task_before.sh\n"
+            )
+        if task_before:
+            print("执行前置命令结束")
+    except Exception as error:
+        print(f"run task before error: {error}")
+
+    import task_before
+
+    env_param = os.getenv("envParam")
+    num_param = os.getenv("numParam")
+
+    if env_param and num_param:
+        array = (os.getenv(env_param) or "").split("&")
+        run_arr = expand_range(num_param, len(array))
+        array_run = [array[i - 1] for i in run_arr if i - 1 < len(array) and i > 0]
+        env_str = "&".join(array_run)
+        os.environ[env_param] = env_str
+
+
+try:
+    run()
+
+    from notify import send
+
+    class BaseApi:
+        def notify(self, *args, **kwargs):
+            return send(*args, **kwargs)
+
+    QLAPI = BaseApi()
+    builtins.QLAPI = QLAPI
+except Exception as error:
+    print(f"run builtin code error: {error}\n")
@@ -11,7 +11,7 @@ echo -e "提交master代码"
 git push

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

 string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"
@@ -2,34 +2,37 @@

 days=$1

-## 删除运行脚本的旧日志
 remove_js_log() {
-  local log_full_path_list=$(find $dir_log/ -name "*.log")
+  local log_full_path_list=$(find $dir_log -name "*.log")
  local diff_time
  for log in $log_full_path_list; do
-    local log_date=$(echo $log | awk -F "/" '{print $NF}' | cut -c1-10) #文件名比文件属性获得的日期要可靠
-    if [[ $(date +%s -d $log_date 2>/dev/null) ]]; then
+    local log_date=$(echo $log | awk -F "/" '{print $NF}' | cut -c1-10)
+    if ! [[ $log_date =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]]; then
      if [[ $is_macos -eq 1 ]]; then
-        diff_time=$(($(date +%s) - $(date -j -f "%Y-%m-%d" "$log_date" +%s)))
+        log_date=$(stat -f %Sm -t "%Y-%m-%d" "$log")
      else
-        diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
+        log_date=$(stat -c %y "$log" | cut -d ' ' -f 1)
      fi
-      if [[ $diff_time -gt $((${days} * 86400)) ]]; then
-        local log_path=$(echo "$log" | sed "s,${dir_log}/,,g")
-        local result=$(find_cron_api "log_path=$log_path")
-        echo -e "查询文件 $log_path"
-        if [[ -z $result ]]; then
-          echo -e "删除中~"
-          rm -vf $log
-        else
-          echo -e "正在被 $result 使用，跳过~"
-        fi
+    fi
+    if [[ $is_macos -eq 1 ]]; then
+      diff_time=$(($(date +%s) - $(date -j -f "%Y-%m-%d" "$log_date" +%s)))
+    else
+      diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
+    fi
+    if [[ $diff_time -gt $((${days} * 86400)) ]]; then
+      local log_path=$(echo "$log" | sed "s,${dir_log}/,,g")
+      local result=$(find_cron_api "log_path=$log_path")
+      echo -e "查询文件 $log_path"
+      if [[ -z $result ]]; then
+        echo -e "删除中~"
+        rm -vf $log
+      else
+        echo -e "正在被 $result 使用，跳过~"
      fi
    fi
  done
 }

-## 删除空文件夹
 remove_empty_dir() {
  cd $dir_log
  for dir in $(ls); do
@@ -39,7 +42,6 @@ remove_empty_dir() {
  done
 }

-## 运行
 if [[ ${days} ]]; then
  echo -e "查找旧日志文件中...\n"
  remove_js_log
@@ -1,53 +1,57 @@
 #!/usr/bin/env bash

 ## 目录
-dir_root=$QL_DIR
-dir_tmp=$dir_root/.tmp
-dir_data=$dir_root/data
+export dir_root=$QL_DIR
+export dir_tmp=$dir_root/.tmp
+export dir_data=$dir_root/data

-if [[ $QL_DATA_DIR ]]; then
-  dir_data="${QL_DATA_DIR%/}"
+if [[ ${QL_DATA_DIR:=} ]]; then
+  export dir_data="${QL_DATA_DIR%/}"
 fi

-dir_shell=$dir_root/shell
-dir_sample=$dir_root/sample
-dir_static=$dir_root/static
-dir_config=$dir_data/config
-dir_scripts=$dir_data/scripts
-dir_repo=$dir_data/repo
-dir_raw=$dir_data/raw
-dir_log=$dir_data/log
-dir_db=$dir_data/db
-dir_dep=$dir_data/deps
-dir_list_tmp=$dir_log/.tmp
-dir_update_log=$dir_log/update
-ql_static_repo=$dir_repo/static
+export dir_shell=$dir_root/shell
+export dir_preload=$dir_shell/preload
+export dir_sample=$dir_root/sample
+export dir_static=$dir_root/static
+export dir_config=$dir_data/config
+export dir_scripts=$dir_data/scripts
+export dir_repo=$dir_data/repo
+export dir_raw=$dir_data/raw
+export dir_log=$dir_data/log
+export dir_db=$dir_data/db
+export dir_dep=$dir_data/deps
+export dir_list_tmp=$dir_log/.tmp
+export dir_update_log=$dir_log/update
+export ql_static_repo=$dir_repo/static

 ## 文件
-file_config_sample=$dir_sample/config.sample.sh
-file_env=$dir_config/env.sh
-file_sharecode=$dir_config/sharecode.sh
-file_config_user=$dir_config/config.sh
-file_auth_sample=$dir_sample/auth.sample.json
-file_auth_user=$dir_config/auth.json
-file_auth_token=$dir_config/token.json
-file_extra_shell=$dir_config/extra.sh
-file_task_before=$dir_config/task_before.sh
-file_task_after=$dir_config/task_after.sh
-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/ql_sample.js
-file_test_py_sample=$dir_sample/ql_sample.py
-file_notify_py=$dir_scripts/notify.py
-file_notify_js=$dir_scripts/sendNotify.js
-file_test_js=$dir_scripts/ql_sample.js
-file_test_py=$dir_scripts/ql_sample.py
-nginx_app_conf=$dir_root/docker/front.conf
-nginx_conf=$dir_root/docker/nginx.conf
-dep_notify_py=$dir_dep/notify.py
-dep_notify_js=$dir_dep/sendNotify.js
+export file_config_sample=$dir_sample/config.sample.sh
+export file_env=$dir_preload/env.sh
+export file_preload_js=$dir_preload/sitecustomize.js
+export file_sharecode=$dir_config/sharecode.sh
+export file_config_user=$dir_config/config.sh
+export file_auth_sample=$dir_sample/auth.sample.json
+export file_auth_user=$dir_config/auth.json
+export file_auth_token=$dir_config/token.json
+export file_extra_shell=$dir_config/extra.sh
+export file_task_before=$dir_config/task_before.sh
+export file_task_before_js=$dir_config/task_before.js
+export file_task_before_py=$dir_config/task_before.py
+export file_task_after=$dir_config/task_after.sh
+export file_task_sample=$dir_sample/task.sample.sh
+export file_extra_sample=$dir_sample/extra.sample.sh
+export file_notify_js_sample=$dir_sample/notify.js
+export file_notify_py_sample=$dir_sample/notify.py
+export file_test_js_sample=$dir_sample/ql_sample.js
+export file_test_py_sample=$dir_sample/ql_sample.py
+export file_notify_py=$dir_scripts/notify.py
+export file_notify_js=$dir_scripts/sendNotify.js
+export file_test_js=$dir_scripts/ql_sample.js
+export file_test_py=$dir_scripts/ql_sample.py
+export nginx_app_conf=$dir_root/docker/front.conf
+export nginx_conf=$dir_root/docker/nginx.conf
+export dep_notify_py=$dir_dep/notify.py
+export dep_notify_js=$dir_dep/sendNotify.js

 ## 清单文件
 list_crontab_user=$dir_config/crontab.list
@@ -74,26 +78,19 @@ init_env() {

 import_config() {
  [[ -f $file_config_user ]] && . $file_config_user
-  if [[ $LOAD_ENV != 'false' ]] && [[ -f $file_env ]]; then
-    . $file_env
-  fi

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

  if [[ -n "${DefaultCronRule}" ]]; then
    default_cron="${DefaultCronRule}"
  else
    default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
  fi
-
-  cpu_warn=${CpuWarn}
-  mem_warn=${MemoryWarn}
-  disk_warn=${DiskWarn}
 }

 set_proxy() {
@@ -178,12 +175,6 @@ fix_config() {
    echo
  fi

-  if [[ ! -f $file_env ]]; then
-    echo -e "检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...\n"
-    touch $file_env
-    echo
-  fi
-
  if [[ ! -f $file_task_before ]]; then
    echo -e "复制一份 $file_task_sample 为 $file_task_before\n"
    cp -fv $file_task_sample $file_task_before
@@ -349,7 +340,7 @@ format_log_time() {
  local time="$2"

  if [[ $is_macos -eq 1 ]]; then
-    echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
+    echo $(python3 -c 'from datetime import datetime; print(datetime.now().strftime("%Y-%m-%d-%H-%M-%S-%f")[:-3])')
  else
    echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
  fi
@@ -439,19 +430,30 @@ init_nginx() {
  sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf
 }

+get_env_array() {
+  exported_variables=()
+  while IFS= read -r line; do
+    exported_variables+=("$line")
+  done < <(grep '^export ' $file_env | awk '{print $2}' | cut -d= -f1)
+}
+
+clear_env() {
+  for var in "${exported_variables[@]}"; do
+    unset "$var"
+  done
+}
+
 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
+  if [[ ${task_before:=} ]]; then
    echo -e "执行前置命令\n"
-    eval "$task_before"
+    eval "${task_before%;}"
    echo -e "\n执行前置命令结束\n"
  fi
 }
@@ -459,9 +461,9 @@ run_task_before() {
 run_task_after() {
  . $file_task_after "$@"

-  if [[ $task_after ]]; then
+  if [[ ${task_after:=} ]]; then
    echo -e "\n执行后置命令\n"
-    eval "$task_after"
+    eval "${task_after%;}"
    echo -e "\n执行后置命令结束"
  fi
 }
@@ -482,5 +484,3 @@ init_env
 detect_termux
 detect_macos
 define_cmd
-
-import_config $1
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash

-## 导入通用变量与函数
 dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
@@ -11,7 +10,6 @@ single_hanle() {
  exit 1
 }

-## 选择python3还是node
 define_program() {
  local file_param=$1
  if [[ $file_param == *.js ]] || [[ $file_param == *.mjs ]]; then
@@ -19,13 +17,9 @@ define_program() {
  elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
    which_program="python3"
  elif [[ $file_param == *.sh ]]; then
-    which_program="bash"
+    which_program="."
  elif [[ $file_param == *.ts ]]; then
-    if ! type tsx &>/dev/null; then
-      which_program="ts-node-transpile-only"
-    else
-      which_program="tsx"
-    fi
+    which_program="ts-node-transpile-only"
  else
    which_program=""
  fi
@@ -38,7 +32,7 @@ handle_log_path() {
    file_param="task"
  fi

-  if [[ -z $ID ]]; then
+  if [[ -z ${ID:=} ]]; then
    ID=$(cat $list_crontab_user | grep -E "$cmd_task.* $file_param" | perl -pe "s|.*ID=(.*) $cmd_task.* $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
  fi
  local suffix=""
@@ -66,17 +60,17 @@ handle_log_path() {
  log_dir="${log_dir_tmp%.*}${suffix}"
  log_path="$log_dir/$log_time.log"

-  if [[ $real_log_path ]]; then
+  if [[ ${real_log_path:=} ]]; then
    log_path="$real_log_path"
  fi

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

-  if [[ "$real_time" == "true" ]]; then
+  if [[ "${real_time:=}" == "true" ]]; then
    cmd=""
  fi
 }
@@ -117,6 +111,7 @@ init_begin_time() {
  begin_timestamp=$(format_timestamp "$time_format" "$time")
 }

+import_config "$@"
 while getopts ":lm:" opt; do
  case $opt in
  l)
@@ -127,8 +122,8 @@ while getopts ":lm:" opt; do
    ;;
  esac
 done
-[[ $show_log ]] && shift $(($OPTIND - 1))
-if [[ $max_time ]]; then
+[[ ${show_log:=} ]] && shift $(($OPTIND - 1))
+if [[ ${max_time:=} ]]; then
  shift $(($OPTIND - 1))
  command_timeout_time="$max_time"
 fi
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash

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

 send_mark=$dir_shell/send_mark

@@ -563,6 +563,7 @@ main() {
  fi
 }

+import_config "$@"
 main "$@"

 exit 0
@@ -8,6 +8,13 @@
    url('../assets/fonts/SourceCodePro-Regular.ttf') format('truetype');
 }

+@font-face {
+  font-family: Log;
+  src: url('../assets/fonts/log.woff2') format('woff2'),
+    url('../assets/fonts/log.woff') format('woff'),
+    url('../assets/fonts/log.ttf') format('truetype');
+}
+
 body {
  // 禁止手机页面下拉刷新
  overflow: hidden;
@@ -52,6 +59,11 @@ body {
      width: 100%;
      padding: 24px;
      overflow-y: auto;
+      code,
+      span {
+        font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo,
+          Courier, monospace, Log;
+      }
    }
  }

@@ -63,6 +75,10 @@ body {
  }
 }

+.ͼ1 .cm-scroller {
+  font-family: monospace, Log;
+}
+
 .monaco-editor:not(.rename-box) {
  height: calc(100vh - 128px) !important;
  height: calc(100vh - var(--vh-offset, 0px) - 128px) !important;
@@ -462,3 +478,8 @@ body[data-dark='true'] {
    --antd-arrow-background-color: rgb(24, 26, 27);
  }
 }
+
+.ant-tabs-content-holder {
+  flex: 1;
+  overflow-y: auto;
+}
@@ -349,7 +349,7 @@
  "推送到个人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",
+  "Server酱SENDKEY": "ServerChan SENDKEY, https://sct.ftqq.com/r/13363",
  "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",
@@ -388,6 +388,8 @@
  "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "The SMTP login password may also be a special passphrase, depending on the specific email service provider's instructions",
  "PushMe的Key，https://push.i-i.me/": "PushMe key, https://push.i-i.me/",
  "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口": "The self built PushMeServer message interface address, for example: http://127.0.0.1:3010 If left blank, use the official message interface",
+  "ntfy的url地址，例如 https://ntfy.sh'": "The URL address of ntfy, for example, https://ntfy.sh.",
+  "ntfy的消息应用topic": "The topic for ntfy's messaging application.",
  "请求方法": "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.",
@@ -349,7 +349,7 @@
  "推送到个人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",
+  "Server酱SENDKEY": "Server 酱 SENDKEY，https://sct.ftqq.com/r/13363",
  "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",
@@ -388,6 +388,8 @@
  "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",
  "PushMe的Key，https://push.i-i.me/": "PushMe的Key，https://push.i-i.me/",
  "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口": "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口",
+  "ntfy的url地址，例如 https://ntfy.sh": "ntfy的url地址，例如 https://ntfy.sh",
+  "ntfy的消息应用topic": "ntfy的消息应用topic",
  "请求方法": "请求方法",
  "请求头Content-Type": "请求头Content-Type",
  "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置",
@@ -36,6 +36,7 @@ import {
  PlusOutlined,
  UnorderedListOutlined,
  CheckOutlined,
+  CopyOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -57,10 +58,11 @@ import { useVT } from 'virtualizedtableforantd4';
 import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type';
 import Name from '@/components/name';
 import dayjs from 'dayjs';
-import { noop } from 'lodash';
+import { noop, omit } from 'lodash';

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

 const Crontab = () => {
  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
@@ -267,22 +269,7 @@ const Crontab = () => {
    {
      title: intl.get('关联订阅'),
      width: 185,
-      render: (text, record: any) =>
-        record.sub_id ? (
-          <Name
-            service={() =>
-              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`, {
-                onError: noop,
-              })
-            }
-            options={{
-              ready: record?.sub_id,
-              cacheKey: record.sub_id,
-            }}
-          />
-        ) : (
-          '-'
-        ),
+      render: (text, record: any) => record?.subscription?.name || '-',
    },
    {
      title: intl.get('操作'),
@@ -392,14 +379,27 @@ const Crontab = () => {
    }
    request
      .get(url)
-      .then(({ code, data: _data }) => {
+      .then(async ({ code, data: _data }) => {
        if (code === 200) {
          const { data, total } = _data;
+          const subscriptions = await request.get(
+            `${config.apiPrefix}subscriptions?ids=${JSON.stringify([
+              ...new Set(data.map((x) => x.sub_id).filter(Boolean)),
+            ])}`,
+            {
+              onError: noop,
+            },
+          );
+          const subscriptionMap = Object.fromEntries(
+            subscriptions?.data?.map((x) => [x.id, x]),
+          );
+
          setValue(
            data.map((x) => {
              return {
                ...x,
                nextRunTime: getCrontabsNextDate(x.schedule, x.extra_schedules),
+                subscription: subscriptionMap?.[x.sub_id],
              };
            }),
          );
@@ -622,6 +622,7 @@ const Crontab = () => {
        icon:
          record.isDisabled === 1 ? <CheckCircleOutlined /> : <StopOutlined />,
      },
+      { label: intl.get('复制'), key: 'copy', icon: <CopyOutlined /> },
      { label: intl.get('删除'), key: 'delete', icon: <DeleteOutlined /> },
      {
        label: record.isPinned === 1 ? intl.get('取消置顶') : intl.get('置顶'),
@@ -657,6 +658,9 @@ const Crontab = () => {
      case 'edit':
        editCron(record, index);
        break;
+      case 'copy':
+        editCron(omit(record, 'id'), index);
+        break;
      case 'enableOrDisable':
        enabledOrDisabledCron(record, index);
        break;
@@ -802,7 +806,7 @@ const Crontab = () => {

  useEffect(() => {
    if (viewConf && enabledCronViews && enabledCronViews.length > 0) {
-      const view = enabledCronViews.slice(4).find((x) => x.id === viewConf.id);
+      const view = enabledCronViews.slice(SHOW_TAB_COUNT).find((x) => x.id === viewConf.id);
      setMoreMenuActive(!!view);
    }
  }, [viewConf, enabledCronViews]);
@@ -832,7 +836,7 @@ const Crontab = () => {
      viewAction(key);
    },
    items: [
-      ...[...enabledCronViews].slice(4).map((x) => ({
+      ...[...enabledCronViews].slice(SHOW_TAB_COUNT).map((x) => ({
        label: (
          <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
            <span>{x.name}</span>
@@ -858,6 +862,10 @@ const Crontab = () => {
        icon: <SettingOutlined />,
      },
    ],
+    style: {
+      maxHeight: 350,
+      overflowY: 'auto',
+    },
  };

  const getCronViews = () => {
@@ -948,7 +956,7 @@ const Crontab = () => {
        }
        onTabClick={tabClick}
        items={[
-          ...[...enabledCronViews].slice(0, 4).map((x) => ({
+          ...[...enabledCronViews].slice(0, SHOW_TAB_COUNT).map((x) => ({
            key: x.id,
            label: x.name,
          })),
@@ -21,9 +21,9 @@ const CronModal = ({

  const handleOk = async (values: any) => {
    setLoading(true);
-    const method = cron ? 'put' : 'post';
+    const method = cron?.id ? 'put' : 'post';
    const payload = { ...values };
-    if (cron) {
+    if (cron?.id) {
      payload.id = cron.id;
    }
    try {
@@ -34,7 +34,7 @@ const CronModal = ({

      if (code === 200) {
        message.success(
-          cron ? intl.get('更新任务成功') : intl.get('创建任务成功'),
+          cron?.id ? intl.get('更新任务成功') : intl.get('创建任务成功'),
        );
        handleCancel(data);
      }
@@ -50,7 +50,7 @@ const CronModal = ({

  return (
    <Modal
-      title={cron ? intl.get('编辑任务') : intl.get('创建任务')}
+      title={cron?.id ? intl.get('编辑任务') : intl.get('创建任务')}
      open={visible}
      forceRender
      centered
@@ -39,6 +39,7 @@ import dayjs from 'dayjs';
 import WebSocketManager from '@/utils/websocket';
 import { DependenceStatus, Status } from './type';
 import IconFont from '@/components/iconfont';
+import useResizeObserver from '@react-hook/resize-observer';

 const { Text } = Typography;
 const { Search } = Input;
@@ -240,7 +241,19 @@ const Dependence = () => {
  const [isLogModalVisible, setIsLogModalVisible] = useState(false);
  const [type, setType] = useState('nodejs');
  const tableRef = useRef<HTMLDivElement>(null);
-  const tableScrollHeight = useTableScrollHeight(tableRef, 59);
+  const [height, setHeight] = useState<number>(0);
+
+  useResizeObserver(tableRef, (entry) => {
+    const _height =
+      entry.target?.parentElement?.parentElement?.parentElement?.offsetHeight;
+    let threshold = 113;
+    if (selectedRowIds.length) {
+      threshold += 53;
+    }
+    if (_height && height !== _height - threshold) {
+      setHeight(_height - threshold);
+    }
+  });

  const getDependencies = (status?: number[]) => {
    setLoading(true);
@@ -528,6 +541,56 @@ const Dependence = () => {
    setType(activeKey);
  };

+  const children = (
+    <div ref={tableRef}>
+      {selectedRowIds.length > 0 && (
+        <div style={{ marginBottom: 16 }}>
+          <Button
+            type="primary"
+            style={{ marginBottom: 5, marginLeft: 8 }}
+            onClick={() => handlereInstallDependencies()}
+          >
+            {intl.get('批量安装')}
+          </Button>
+          <Button
+            type="primary"
+            style={{ marginBottom: 5, marginLeft: 8 }}
+            onClick={() => delDependencies(false)}
+          >
+            {intl.get('批量删除')}
+          </Button>
+          <Button
+            type="primary"
+            style={{ marginBottom: 5, marginLeft: 8 }}
+            onClick={() => delDependencies(true)}
+          >
+            {intl.get('批量强制删除')}
+          </Button>
+          <span style={{ marginLeft: 8 }}>
+            {intl.get('已选择')}
+            <a>{selectedRowIds?.length}</a>
+            {intl.get('项')}
+          </span>
+        </div>
+      )}
+      <DndProvider backend={HTML5Backend}>
+        <Table
+          columns={columns}
+          rowSelection={rowSelection}
+          pagination={false}
+          dataSource={value}
+          rowKey="id"
+          size="middle"
+          scroll={{ x: 768, y: height }}
+          loading={loading}
+          onChange={(pagination, filters) => {
+            getDependencies(filters?.status as number[]);
+          }}
+        />
+      </DndProvider>
+    </div>
+  );
+
  return (
    <PageContainer
      className="ql-container-wrapper dependence-wrapper ql-container-wrapper-has-tab"
@@ -552,6 +615,7 @@ const Dependence = () => {
        defaultActiveKey="nodejs"
        size="small"
        tabPosition="top"
+        destroyInactiveTabPane
        onChange={onTabChange}
        items={[
          {
@@ -568,53 +632,7 @@ const Dependence = () => {
          },
        ]}
      />
-      <div ref={tableRef}>
-        {selectedRowIds.length > 0 && (
-          <div style={{ marginBottom: 16 }}>
-            <Button
-              type="primary"
-              style={{ marginBottom: 5, marginLeft: 8 }}
-              onClick={() => handlereInstallDependencies()}
-            >
-              {intl.get('批量安装')}
-            </Button>
-            <Button
-              type="primary"
-              style={{ marginBottom: 5, marginLeft: 8 }}
-              onClick={() => delDependencies(false)}
-            >
-              {intl.get('批量删除')}
-            </Button>
-            <Button
-              type="primary"
-              style={{ marginBottom: 5, marginLeft: 8 }}
-              onClick={() => delDependencies(true)}
-            >
-              {intl.get('批量强制删除')}
-            </Button>
-            <span style={{ marginLeft: 8 }}>
-              {intl.get('已选择')}
-              <a>{selectedRowIds?.length}</a>
-              {intl.get('项')}
-            </span>
-          </div>
-        )}
-        <DndProvider backend={HTML5Backend}>
-          <Table
-            columns={columns}
-            rowSelection={rowSelection}
-            pagination={false}
-            dataSource={value}
-            rowKey="id"
-            size="middle"
-            scroll={{ x: 768, y: tableScrollHeight }}
-            loading={loading}
-            onChange={(pagination, filters) => {
-              getDependencies(filters?.status as number[]);
-            }}
-          />
-        </DndProvider>
-      </div>
+      {children}
      <DependenceModal
        visible={isModalVisible}
        handleCancel={handleCancel}
@@ -34,7 +34,7 @@ const EditModal = ({
  handleCancel: () => void;
 }) => {
  const [value, setValue] = useState('');
-  const [language, setLanguage] = useState<string>('javascript');
+  const [language, setLanguage] = useState<string>();
  const [cNode, setCNode] = useState<any>();
  const [selectedKey, setSelectedKey] = useState<string>();
  const [saveModalVisible, setSaveModalVisible] = useState<boolean>(false);
@@ -242,7 +242,7 @@ const EditModal = ({
            minimap: { enabled: false },
            lineNumbersMinChars: 3,
            glyphMargin: false,
-            accessibilitySupport: 'off'
+            accessibilitySupport: 'off',
          }}
          onMount={(editor) => {
            editorRef.current = editor;
@@ -108,6 +108,7 @@ const Script = () => {
      };
      const item = findNode(_data, (c) => c.key === obj.node.key);
      if (item) {
+        obj.node = item;
        setExpandedKeys([p as string]);
        onTreeSelect([vkey], obj);
      }
@@ -377,7 +378,7 @@ const Script = () => {

  useEffect(() => {
    if (treeDom.current) {
-      setHeight(treeDom.current.clientHeight);
+      setHeight(treeDom.current.clientHeight - 6);
    }
  }, [treeDom.current, data]);

@@ -643,7 +644,7 @@ const Script = () => {
                fontSize: 12,
                lineNumbersMinChars: 3,
                glyphMargin: false,
-                accessibilitySupport: 'off'
+                accessibilitySupport: 'off',
              }}
              onMount={(editor) => {
                editorRef.current = editor;
@@ -124,15 +124,14 @@ const Setting = () => {
  const [editedApp, setEditedApp] = useState<any>();
  const [tabActiveKey, setTabActiveKey] = useState('security');
  const [loginLogData, setLoginLogData] = useState<any[]>([]);
-  const [systemLogData, setSystemLogData] = useState<string>('');
  const [notificationInfo, setNotificationInfo] = useState<any>();
  const containergRef = useRef<HTMLDivElement>(null);
  const [height, setHeight] = useState<number>(0);

  useResizeObserver(containergRef, (entry) => {
-    const _height = entry.target.parentElement?.parentElement?.offsetHeight;
-    if (_height && height !== _height - 66) {
-      setHeight(_height - 66);
+    const _height = (entry.target as HTMLElement)?.offsetHeight;
+    if (_height && height !== _height - 101) {
+      setHeight(_height - 101);
    }
  });

@@ -253,19 +252,6 @@ const Setting = () => {
      });
  };

-  const getSystemLog = () => {
-    request
-      .get<Blob>(`${config.apiPrefix}system/log`, {
-        responseType: 'blob',
-      })
-      .then(async (res) => {
-        setSystemLogData(await res.text());
-      })
-      .catch((error: any) => {
-        console.log(error);
-      });
-  };
-
  const tabChange = (activeKey: string) => {
    setTabActiveKey(activeKey);
    if (activeKey === 'app') {
@@ -274,8 +260,6 @@ const Setting = () => {
      getLoginLog();
    } else if (activeKey === 'notification') {
      getNotification();
-    } else if (activeKey === 'syslog') {
-      getSystemLog();
    }
  };

@@ -315,12 +299,14 @@ const Setting = () => {
          : []
      }
    >
-      <div ref={containergRef}>
+      <div ref={containergRef} style={{ height: '100%' }}>
        <Tabs
+          style={{ height: '100%' }}
          defaultActiveKey="security"
          size="small"
          tabPosition="top"
          onChange={tabChange}
+          destroyInactiveTabPane
          items={[
            ...(!isDemoEnv
              ? [
@@ -343,7 +329,7 @@ const Setting = () => {
                  dataSource={dataSource}
                  rowKey="id"
                  size="middle"
-                  scroll={{ x: 1000 }}
+                  scroll={{ x: 1000, y: height }}
                  loading={loading}
                />
              ),
@@ -356,14 +342,12 @@ const Setting = () => {
            {
              key: 'syslog',
              label: intl.get('系统日志'),
-              children: (
-                <SystemLog data={systemLogData} height={height} theme={theme} />
-              ),
+              children: <SystemLog height={height} theme={theme} />,
            },
            {
              key: 'login',
              label: intl.get('登录日志'),
-              children: <LoginLog data={loginLogData} />,
+              children: <LoginLog height={height} data={loginLogData} />,
            },
            {
              key: 'dependence',
@@ -383,7 +367,7 @@ const Setting = () => {
              children: <About systemInfo={systemInfo} />,
            },
          ]}
-        ></Tabs>
+        />
      </div>
      <AppModal
        visible={isModalVisible}
@@ -67,7 +67,13 @@ const columns = [
  },
 ];

-const LoginLog = ({ data }: any) => {
+const LoginLog = ({
+  data,
+  height,
+}: {
+  data: Array<object>;
+  height: number;
+}) => {
  return (
    <>
      <Table
@@ -76,8 +82,7 @@ const LoginLog = ({ data }: any) => {
        dataSource={data}
        rowKey="id"
        size="middle"
-        scroll={{ x: 1000 }}
-        sticky
+        scroll={{ x: 1000, y: height }}
      />
    </>
  );
@@ -1,13 +1,47 @@
-import React, { useRef } from 'react';
+import intl from 'react-intl-universal';
+import React, { useRef, useState } from 'react';
 import CodeMirror from '@uiw/react-codemirror';
-import { Button } from 'antd';
+import { Button, DatePicker, Empty, message, Spin } from 'antd';
 import {
  VerticalAlignBottomOutlined,
  VerticalAlignTopOutlined,
 } from '@ant-design/icons';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+import { useRequest } from 'ahooks';
+import moment from 'moment';
+import {
+  systemLogDebugHighlightPlugin,
+  systemLogErrorHighlightPlugin,
+  systemLogInfoHighlightPlugin,
+  systemLogTheme,
+  systemLogWarnHighlightPlugin,
+} from '@/utils/codemirror/systemLog';

-const SystemLog = ({ data, height, theme }: any) => {
+const { RangePicker } = DatePicker;
+
+const SystemLog = ({ height, theme }: any) => {
  const editorRef = useRef<any>(null);
+  const panelVisiableRef = useRef<[string, string] | false>();
+  const [range, setRange] = useState<string[]>(['', '']);
+  const [systemLogData, setSystemLogData] = useState<string>('');
+
+  const { loading, refresh } = useRequest(
+    () => {
+      return request.get<Blob>(
+        `${config.apiPrefix}system/log?startTime=${range[0]}&endTime=${range[1]}`,
+        {
+          responseType: 'blob',
+        },
+      );
+    },
+    {
+      refreshDeps: [range],
+      async onSuccess(res) {
+        setSystemLogData(await res.text());
+      },
+    },
+  );

  const scrollTo = (position: 'start' | 'end') => {
    editorRef.current.scrollDOM.scrollTo({
@@ -15,42 +49,100 @@ const SystemLog = ({ data, height, theme }: any) => {
    });
  };

+  const deleteLog = () => {
+    request.delete(`${config.apiPrefix}system/log`).then((x) => {
+      message.success('删除成功');
+      refresh();
+    });
+  };
+
  return (
    <div style={{ position: 'relative' }}>
-      <CodeMirror
-        maxHeight={`${height}px`}
-        value={data}
-        onCreateEditor={(view) => {
-          editorRef.current = view;
-        }}
-        readOnly={true}
-        theme={theme.includes('dark') ? 'dark' : 'light'}
-      />
-      <div
-        style={{
-          position: 'absolute',
-          bottom: 20,
-          right: 20,
-          display: 'flex',
-          flexDirection: 'column',
-          gap: 10,
-        }}
-      >
-        <Button
-          size='small'
-          icon={<VerticalAlignTopOutlined />}
-          onClick={() => {
-            scrollTo('start');
+      <div>
+        <RangePicker
+          style={{ marginBottom: 12, marginRight: 12 }}
+          disabledDate={(date) =>
+            date > moment() || date < moment().subtract(7, 'days')
+          }
+          defaultValue={[moment(), moment()]}
+          onOpenChange={(v) => {
+            panelVisiableRef.current = v ? ['', ''] : false;
+          }}
+          onCalendarChange={(_, dates, { range }) => {
+            if (
+              !panelVisiableRef.current ||
+              typeof panelVisiableRef.current === 'boolean'
+            ) {
+              return;
+            }
+            if (range === 'start') {
+              panelVisiableRef.current[0] = dates[0];
+            }
+            if (range === 'end') {
+              panelVisiableRef.current[1] = dates[1];
+            }
+            if (panelVisiableRef.current[0] && panelVisiableRef.current[1]) {
+              setRange(dates);
+            }
          }}
        />
        <Button
-          size='small'
-          icon={<VerticalAlignBottomOutlined />}
          onClick={() => {
-            scrollTo('end');
+            deleteLog();
          }}
-        />
+        >
+          {intl.get('清空日志')}
+        </Button>
      </div>
+      {systemLogData ? (
+        <>
+          <CodeMirror
+            maxHeight={`${height}px`}
+            value={systemLogData}
+            onCreateEditor={(view) => {
+              editorRef.current = view;
+            }}
+            extensions={[
+              systemLogDebugHighlightPlugin,
+              systemLogErrorHighlightPlugin,
+              systemLogInfoHighlightPlugin,
+              systemLogWarnHighlightPlugin,
+              systemLogTheme,
+            ]}
+            readOnly={true}
+            theme={theme.includes('dark') ? 'dark' : 'light'}
+          />
+          <div
+            style={{
+              position: 'absolute',
+              bottom: 20,
+              right: 20,
+              display: 'flex',
+              flexDirection: 'column',
+              gap: 10,
+            }}
+          >
+            <Button
+              size="small"
+              icon={<VerticalAlignTopOutlined />}
+              onClick={() => {
+                scrollTo('start');
+              }}
+            />
+            <Button
+              size="small"
+              icon={<VerticalAlignBottomOutlined />}
+              onClick={() => {
+                scrollTo('end');
+              }}
+            />
+          </div>
+        </>
+      ) : loading ? (
+        <Spin />
+      ) : (
+        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+      )}
    </div>
  );
 };
@@ -0,0 +1,174 @@
+import {
+  Decoration,
+  EditorView,
+  ViewPlugin,
+  ViewUpdate,
+} from '@codemirror/view';
+import { RangeSet, RangeSetBuilder } from '@codemirror/state';
+
+const infoWord = /\[\ue6f5info\]/g;
+const debugWord = /\[\ue67fdebug\]/g;
+const warnWord = /\[\ue880warn\]/g;
+const errorWord = /\[\ue602error\]/g;
+
+const customWordClassMap = {
+  info: 'system-log-info',
+  warn: 'system-warn-info',
+  error: 'system-error-info',
+  debug: 'system-debug-info',
+};
+
+export const systemLogInfoHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: RangeSet<Decoration>;
+
+    constructor(view: EditorView) {
+      this.decorations = this.getDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged) {
+        this.decorations = this.getDecorations(update.view);
+      }
+    }
+
+    getDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+      const doc = view.state.doc.toString();
+      let match;
+
+      while ((match = infoWord.exec(doc)) !== null) {
+        const deco = Decoration.mark({
+          class: customWordClassMap.info,
+        });
+
+        builder.add(match.index, match.index + match[0].length, deco);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+export const systemLogWarnHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: RangeSet<Decoration>;
+
+    constructor(view: EditorView) {
+      this.decorations = this.getDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged) {
+        this.decorations = this.getDecorations(update.view);
+      }
+    }
+
+    getDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+      const doc = view.state.doc.toString();
+      let match;
+
+      while ((match = warnWord.exec(doc)) !== null) {
+        const deco = Decoration.mark({
+          class: customWordClassMap.warn,
+        });
+
+        builder.add(match.index, match.index + match[0].length, deco);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+export const systemLogDebugHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: RangeSet<Decoration>;
+
+    constructor(view: EditorView) {
+      this.decorations = this.getDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged) {
+        this.decorations = this.getDecorations(update.view);
+      }
+    }
+
+    getDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+      const doc = view.state.doc.toString();
+      let match;
+
+      while ((match = debugWord.exec(doc)) !== null) {
+        const deco = Decoration.mark({
+          class: customWordClassMap.debug,
+        });
+
+        builder.add(match.index, match.index + match[0].length, deco);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+export const systemLogErrorHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: RangeSet<Decoration>;
+
+    constructor(view: EditorView) {
+      this.decorations = this.getDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged) {
+        this.decorations = this.getDecorations(update.view);
+      }
+    }
+
+    getDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+      const doc = view.state.doc.toString();
+      let match;
+
+      while ((match = errorWord.exec(doc)) !== null) {
+        const deco = Decoration.mark({
+          class: customWordClassMap.error,
+        });
+
+        builder.add(match.index, match.index + match[0].length, deco);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+export const systemLogTheme = EditorView.baseTheme({
+  '.system-log-info': {
+    color: '#2196F3',
+  },
+  '.system-warn-info': {
+    color: '#FFB827',
+  },
+  '.system-error-info': {
+    color: '#FA5151',
+  },
+  '.system-debug-info': {
+    color: '#009A29',
+  },
+});
@@ -84,6 +84,7 @@ export default {
  },
  notificationModes: [
    { value: 'gotify', label: 'Gotify' },
+    { value: 'ntfy', label: 'Ntfy' },
    { value: 'goCqHttpBot', label: 'GoCqHttpBot' },
    { value: 'serverChan', label: intl.get('Server酱') },
    { value: 'pushDeer', label: 'PushDeer' },
@@ -118,6 +119,19 @@ export default {
      },
      { label: 'gotifyPriority', tip: intl.get('推送消息的优先级') },
    ],
+    ntfy: [
+      {
+        label: 'ntfyUrl',
+        tip: intl.get('ntfy的url地址，例如 https://ntfy.sh'),
+        required: true,
+      },
+      {
+        label: 'ntfyTopic',
+        tip: intl.get('ntfy的消息应用topic'),
+        required: true,
+      },
+      { label: 'ntfyPriority', tip: intl.get('推送消息的优先级') },
+    ],
    chat: [
      {
        label: 'chatUrl',
@@ -313,8 +313,9 @@ export function getCommandScript(
    ['.js', '.ts', '.sh', '.py'].some((y) => x.endsWith(y)),
  );
  if (!scriptsPart) return;
-  if (scriptsPart.startsWith('/ql/data/scripts')) {
-    scriptsPart = scriptsPart.replace('/ql/data/scripts/', '');
+  const scriptDir = `${window.__ENV__QL_DIR}/data/scripts`;
+  if (scriptsPart.startsWith(scriptDir)) {
+    scriptsPart = scriptsPart.replace(scriptDir, '');
  }

  let p: string, s: string;
@@ -1,27 +1,40 @@
 import * as Sentry from '@sentry/react';
 import { loader } from '@monaco-editor/react';
 import config from './config';
+import { useEffect } from 'react';
+import {
+  createRoutesFromChildren,
+  matchRoutes,
+  useLocation,
+  useNavigationType,
+} from 'react-router-dom';

 export function init(version: string) {
  // sentry监控 init
  Sentry.init({
    dsn: 'https://49b9ad1a6201bfe027db296ab7c6d672@o1098464.ingest.sentry.io/6122818',
    integrations: [
-      new Sentry.BrowserTracing({
-        shouldCreateSpanForRequest(url) {
-          return !url.includes('/api/ws') && !url.includes('/api/static');
-        },
+      Sentry.reactRouterV6BrowserTracingIntegration({
+        useEffect,
+        useLocation,
+        useNavigationType,
+        createRoutesFromChildren,
+        matchRoutes,
      }),
+      Sentry.replayIntegration(),
    ],
-    release: version,
-    tracesSampleRate: 0.1,
-    beforeBreadcrumb(breadcrumb, hint?) {
+    beforeBreadcrumb(breadcrumb) {
      if (breadcrumb.data && breadcrumb.data.url) {
        const url = breadcrumb.data.url.replace(/token=.*/, '');
        breadcrumb.data.url = url;
      }
      return breadcrumb;
    },
+    tracesSampleRate: 0.1,
+    tracePropagationTargets: [/^(?!\/api\/(ws|static)).*$/],
+    replaysSessionSampleRate: 0.1,
+    replaysOnErrorSampleRate: 0.1,
+    release: version,
  });

  // monaco 编辑器配置cdn和locale
@@ -12,4 +12,5 @@ declare module '*.svg' {
 interface Window {
  __ENV__QlBaseUrl: string;
  __ENV__DeployEnv: string;
+  __ENV__QL_DIR: string;
 }
@@ -1,8 +1,11 @@
-version: 2.17.7
-changeLogLink: https://t.me/jiao_long/408
-publishTime: 2024-06-30 16:00
+version: 2.17.12
+changeLogLink: https://t.me/jiao_long/422
+publishTime: 2024-10-26 15:30
 changeLog: |
-  1. 修复更新任务状态错误
-  2. 修复查询系统 health 状态错误
-  3. 修复更新 linux 镜像源错误
-  4. npm 包支持 alpine 和 debian、ubuntu，修复 linux 依赖安装命令
+  1. 定时任务支持复制
+  2. 增加 ntfy 通知
+  3. 适配Server酱APP分支（Server酱³），移除已废弃的旧版api入口
+  4. 修复任务命令带有 -m 参数时，日志目录生成异常
+  5. 修复登录日志无法自动保存
+  6. 移除任务执行前后的脚本参数
+  7. 定时任务外漏视图改为 10 个
Author	SHA1	Message	Date
whyour	b733937691	更新版本 v2.17.12	2024-10-26 14:59:36 +08:00
whyour	0d9eba4b6e	定时任务外漏标签改为 10 个	2024-10-26 14:49:02 +08:00
whyour	20c6a1e8bf	移除任务执行前后的脚本参数	2024-10-26 14:12:58 +08:00
qiaoyun680	56bc2f0b1d	改进ntfy通知，将中文标题进行编码后发送 (#2541 ) * 1.改进ntfy通知，将中文标题进行编码后发送，可以直接展示中文标题；2.改进notify.py和notify.js中ntfy的推送; --------- Co-authored-by: qiaoyun680 <qiaoyun680>	2024-10-23 16:38:51 +08:00
Easy	ecc55883f0	优化Server酱Key相关的逻辑 (#2538 ) * 优化sendkey的兼容 * 对title和desp encode	2024-10-22 21:49:07 +08:00
qiaoyun680	185fd2ff91	增加 ntfy 通知 (#2537 ) Co-authored-by: qiaoyun680 <qiaoyun680>	2024-10-22 21:47:38 +08:00
whyour	3822c37fa0	修复登录日志保存	2024-10-19 00:18:24 +08:00
whyour	4244502949	增加 log 图标样式	2024-10-13 21:24:17 +08:00
Easy	71dd82f74e	适配Server酱APP分支（Server酱³），移除已废弃的旧版api入口 (#2524 )	2024-10-10 22:09:00 +08:00
whyour	6ea8d361fd	修复 mac 时间格式化	2024-09-29 22:47:57 +08:00
whyour	3f71f9acdb	修复任务命令带有 -m 参数时，日志目录生成异常	2024-09-29 22:27:52 +08:00
whyour	418695c4aa	定时任务支持复制	2024-09-24 23:33:04 +08:00
whyour	4c5223ba11	更新版本 v2.17.11	2024-09-16 21:35:38 +08:00
whyour	2f70e10be7	修复 shell 检查 nounset 变量	2024-09-16 21:35:36 +08:00
whyour	66706ce150	修复任务视图过多无法选到视图管理	2024-09-10 22:50:33 +08:00
whyour	3d719baa54	修复任务执行初始化环境变量 PYTHONPATH 和 NODE_OPTIONS 被清空	2024-09-10 22:41:39 +08:00
whyour	926ad067c1	修复通知文件换行符解析错误	2024-09-09 23:19:58 +08:00
whyour	ff98c3a499	修复任务跳转脚本未显示文件大小，订阅删除未删除 repo 目录	2024-09-08 21:08:15 +08:00
whyour	69fcf45231	修复任务执行前命令错误提示	2024-09-08 17:58:37 +08:00
whyour	c3704502bf	更新 readme	2024-09-05 22:35:14 +08:00
whyour	a0613d0f39	修复文件越权访问	2024-09-04 23:25:48 +08:00
whyour	8c0f46420e	更新 readme	2024-09-04 22:27:03 +08:00
whyour	ea4b474b83	更新版本 v2.17.10	2024-09-01 23:42:38 +08:00
whyour	53ef0fe296	修复订阅任务参数	2024-09-01 23:42:36 +08:00
whyour	c573186e34	修复启动无法创建订阅任务	2024-09-01 22:47:29 +08:00
whyour	c229eca315	修复依赖管理和脚本管理样式	2024-08-31 23:46:29 +08:00
whyour	a41dd74048	修复 task_before/task_after 中换行后 crontab 不识别	2024-08-31 20:46:00 +08:00
whyour	459f465f3b	修复 shell 未定义变量错误	2024-08-31 20:23:37 +08:00
whyour	b508e97dc1	修复依赖列表样式	2024-08-31 14:59:54 +08:00
whyour	7414a9d33d	执行任务增加结束日志	2024-08-31 14:43:44 +08:00
whyour	a48d100b2d	修复表格样式	2024-08-30 00:30:31 +08:00
whyour	a3044f9d29	修复 node 内置脚本运行错误	2024-08-28 00:28:25 +08:00
whyour	19cfc9e351	修复任务重复运行提示	2024-08-26 23:05:53 +08:00
whyour	6c61ac5106	修复 dockerfile	2024-08-26 00:56:55 +08:00
whyour	65f7483688	修复任务频繁运行通知	2024-08-25 16:28:32 +08:00
whyour	8b042d90f3	修复删除日志命令	2024-08-24 22:43:09 +08:00
whyour	4e5ad6d5f3	定时服务区分系统、订阅、脚本任务	2024-08-23 23:06:50 +08:00
whyour	8b8eae211b	增加任务重复运行提醒	2024-08-23 09:37:26 +08:00
whyour	f4cb3eacf8	系统日志增加时间筛选和清空	2024-08-22 00:47:24 +08:00
whyour	f6021c8157	增加内置 Python requests 模块	2024-08-19 23:06:16 +08:00
whyour	73601ca853	修复任务执行前命令字符转义	2024-08-19 22:27:09 +08:00
whyour	8218d4ba94	修复 Dockerfile	2024-08-18 17:26:33 +08:00
whyour	d47f835531	更新 docker action	2024-08-18 17:03:49 +08:00
whyour	230a8f61b8	修复 smtp python 参数说明	2024-08-18 16:31:39 +08:00
whyour	af5de8372c	修复 shell 变量初始化检查，更新 sentry 版本	2024-08-18 14:19:45 +08:00
whyour	a743aa8115	更新版本 v2.17.9	2024-07-28 18:40:10 +08:00
whyour	fe4516df00	修复执行 task_before 环境变量加载顺序	2024-07-28 18:40:02 +08:00
whyour	be2da98674	修复任务中 task_before 参数双引号解析	2024-07-26 11:30:03 +08:00
whyour	0da8155bac	修复 desi 和 conc 命令参数解析	2024-07-25 20:53:11 +08:00
whyour	eddd258614	修复 node 前置逻辑	2024-07-24 23:30:18 +08:00
whyour	2ad6437672	更新 config.sample	2024-07-22 23:37:51 +08:00
whyour	162bd9d8cc	修复 config 引入顺序	2024-07-22 23:29:08 +08:00
whyour	e694570f1a	增加 task_before.js 和 task_before.py 文件，在执行任务前执行，避免环境变量过大报错	2024-07-22 01:07:00 +08:00
whyour	eb5cc3943d	Javascript 和 Python 增加内置函数 QLAPI.notify	2024-07-21 01:15:16 +08:00
whyour	1b39d3ab48	JavaScript 和 Python 执行脚本前执行 task_before	2024-07-20 17:28:48 +08:00
whyour	f47a788184	更新版本 v2.17.8	2024-07-13 23:54:06 +08:00
whyour	738fe04ce4	修复 js py 变量分割	2024-07-13 23:53:59 +08:00
whyour	a2812d9c03	移除 ts-node dependence	2024-07-13 00:49:23 +08:00
whyour	5c53ae4993	修改仓库默认拉取文件后缀，支持运行 cjs pyc	2024-07-12 01:40:37 +08:00
whyour	e191aca41f	修改环境变量加载逻辑	2024-07-10 23:29:44 +08:00