更新版本 v2.15.4

修改 pub 脚本
修改版本文件
2026-08-12 03:10:48 +08:00 · 2022-12-28 11:15:20 +08:00 · 2022-12-28 11:14:57 +08:00 · 2022-12-28 11:06:47 +08:00 · 2022-12-27 17:10:21 +08:00 · 2022-12-27 16:02:15 +08:00
117 changed files with 18472 additions and 3009 deletions
@@ -0,0 +1,42 @@
+name: "\U0001F41E Bug report"
+description: Create a report to help us improve
+body:
+  - type: input
+    id: version
+    attributes:
+      label: Qinglong version
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: |
+        What do we need to do after opening your repro in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner. Note that you can use [Markdown](https://guides.github.com/features/mastering-markdown/) to format lists and code.
+      placeholder: Steps to reproduce
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: What is expected?
+    validations:
+      required: true
+  - type: textarea
+    id: actually-happening
+    attributes:
+      label: What is actually happening?
+    validations:
+      required: true
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System Info
+      description: Output of `npx envinfo --system --binaries --browsers`
+      render: shell
+      placeholder: System, Binaries, Browsers
+  - type: textarea
+    id: additional-comments
+    attributes:
+      label: Any additional comments?
+      description: e.g. some background/context of how you ran into this bug.
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Telegram Chat
+    url: https://t.me/jiao_long
+    about: Ask questions and discuss with other Qinglong users in real time.
+  - name: Questions & Discussions
+    url: https://github.com/whyour/qinglong/discussions/new?category=q-a
+    about: Use GitHub discussions for message-board style questions and discussions.
@@ -0,0 +1,40 @@
+name: "\U0001F680 New feature proposal"
+description: Suggest an idea for this project
+labels: [":sparkles: feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your interest in the project and taking the time to fill out this feature report!
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Clear and concise description of the problem
+      description: "Explain your use case, context, and rationale behind this feature request. More importantly, what is the **end user experience** you are trying to build that led to the need for this feature?"
+    validations:
+      required: true
+  - type: textarea
+    id: suggested-solution
+    attributes:
+      label: Suggested solution
+      description: "In module [xy] we could provide following implementation..."
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: Alternative
+      description: Clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Any other context or screenshots about the feature request here.
+  - type: checkboxes
+    id: checkboxes
+    attributes:
+      label: Validations
+      description: Before submitting the issue, please make sure you do the following
+      options:
+        - label: Check that there isn't already an issue that request the same feature to avoid creating a duplicate.
+          required: true
@@ -0,0 +1,31 @@
+## PR Type
+What kind of change does this PR introduce?
+
+<!-- Please check the one that applies to this PR using "x". -->
+
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update (formatting, local variables)
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Other... Please describe:
+
+
+## What is the current behavior?
+<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
+
+Issue Number: N/A
+
+
+## What is the new behavior?
+
+
+## Does this PR introduce a breaking change?
+
+- [ ] Yes
+- [ ] No
+
+
+<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
+
+
+## Other information
@@ -0,0 +1,7 @@
+# Comment to be posted to on PRs from first time contributors in your repository
+newPRWelcomeComment: |
+  💖 Thanks for opening this pull request! 💖
+  Please be patient and we will get back to you as soon as we can.
+# Comment to be posted to on pull requests merged by a first time user
+firstPRMergeComment: >
+  Congrats on merging your first pull request! 🎉🎉🎉
@@ -17,16 +17,47 @@ on:
  workflow_dispatch:

 jobs:
+  to_gitlab:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: pixta-dev/repository-mirroring-action@v1
+        with:
+          target_repo_url:
+            git@gitlab.com:whyour/qinglong.git
+          ssh_private_key:
+            ${{ secrets.GITLAB_SSH_PK }}
+  
+  to_gitee:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: pixta-dev/repository-mirroring-action@v1
+        with:
+          target_repo_url:
+            git@gitee.com:whyour/qinglong.git
+          ssh_private_key:
+            ${{ secrets.GITLAB_SSH_PK }}
+
  build-static:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: latest
+
      - uses: actions/setup-node@v3
+        with:
+          cache: 'pnpm'

      - name: build front and back
        run: |
-          npm i -g pnpm
-          pnpm install
+          pnpm install --frozen-lockfile
          pnpm build:front
          pnpm build:back

@@ -34,6 +65,9 @@ jobs:
        env:
          GITHUB_REPO: github.com/${{ github.repository_owner }}/qinglong-static
          GITHUB_BRANCH: ${{ github.ref_name }}
+          REPO_GITEE: git@gitee.com:whyour/qinglong-static.git
+          REPO_GITLAB: git@gitlab.com:whyour/qinglong-static.git
+          PRIVATE_KEY: ${{ secrets.GITLAB_SSH_PK }}
        run: |
          mkdir -p tmp
          cd ./tmp
@@ -44,6 +78,16 @@ jobs:
          git commit --allow-empty -m "copy static at $(date +'%Y-%m-%d %H:%M:%S')"
          git push --force --quiet "https://${{ secrets.API_TOKEN }}@${GITHUB_REPO}.git" ${GITHUB_BRANCH}:${GITHUB_BRANCH}

+          mkdir -p ~/.ssh
+          echo "${PRIVATE_KEY}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+
+          export GIT_SSH_COMMAND="ssh -v -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -l git"
+          git remote add gitee "${REPO_GITEE}"
+          git remote add gitlab "${REPO_GITLAB}"
+          git push --force --quiet gitee ${GITHUB_BRANCH}:${GITHUB_BRANCH}
+          git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}
+
  build:
    needs: build-static

@@ -55,14 +99,17 @@ jobs:

    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-
-      - name: Set time zone
-        uses: szenius/set-timezone@v1.0
+      - uses: pnpm/action-setup@v2
        with:
-          timezoneLinux: "Asia/Shanghai"
-          timezoneMacos: "Asia/Shanghai"
-          timezoneWindows: "China Standard Time"
+          version: latest
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'pnpm'
+
+      - name: Setup timezone
+        uses: zcong1993/setup-timezone@master
+        with:
+          timezone: Asia/Shanghai

      - name: Login to DockerHub
        uses: docker/login-action@v2
@@ -100,7 +147,7 @@ jobs:

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
-
+      
      - name: Build and push
        id: docker_build
        uses: docker/build-push-action@v3
@@ -114,3 +161,6 @@ jobs:
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
+      
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
@@ -5,7 +5,6 @@
 /npm-debug.log*
 /yarn-error.log
 /yarn.lock
-/pnpm-lock.yaml
 /package-lock.json

 # production
@@ -1,20 +1,15 @@
-import { defineConfig } from 'umi';
+import { defineConfig } from '@umijs/max';
 const CompressionPlugin = require('compression-webpack-plugin');

 export default defineConfig({
  hash: true,
-  layout: false,
+  antd: {},
  outputPath: 'static/dist',
-  nodeModulesTransform: {
-    type: 'none',
+  fastRefresh: true,
+  favicons: ['/images/favicon.svg'],
+  mfsu: {
+    strategy: 'eager',
  },
-  fastRefresh: {},
-  esbuild: {},
-  webpack5: {},
-  dynamicImport: {
-    loading: '@/components/pageLoading',
-  },
-  favicon: '/images/favicon.svg',
  proxy: {
    '/api/public': {
      target: 'http://127.0.0.1:5400/',
@@ -26,7 +21,7 @@ export default defineConfig({
      ws: true,
    },
  },
-  chainWebpack: (config) => {
+  chainWebpack: ((config: any) => {
    config.plugin('compression-webpack-plugin').use(
      new CompressionPlugin({
        algorithm: 'gzip',
@@ -35,13 +30,13 @@ export default defineConfig({
        minRatio: 0.6,
      }),
    );
-  },
+  }) as any,
  externals: {
    react: 'window.React',
    'react-dom': 'window.ReactDOM',
  },
-  scripts: [
-    'https://gw.alipayobjects.com/os/lib/react/16.13.1/umd/react.production.min.js',
-    'https://gw.alipayobjects.com/os/lib/react-dom/16.13.1/umd/react-dom.production.min.js',
+  headScripts: [
+    'https://gw.alipayobjects.com/os/lib/react/18.2.0/umd/react.production.min.js',
+    'https://gw.alipayobjects.com/os/lib/react-dom/18.2.0/umd/react-dom.production.min.js',
  ],
 });
@@ -1,6 +1,6 @@
 <p align="center">
  <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
+    <img width="150" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
  </a>
 </p>

@@ -22,7 +22,7 @@ Timed task management panel with python3, javaScript, shell, typescript support
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 </div>

-[![](https://user-images.githubusercontent.com/22700758/161788855-c4e51cb8-d4e9-44fe-bb17-ee1a56c8549b.png)](https://whyour.cn)
+[![](https://user-images.githubusercontent.com/22700758/203243067-1a8a570d-b1b4-4837-9f12-d78d83e31f35.jpg)](https://whyour.cn)

 [简体中文](./README.md) | English

@@ -41,7 +41,7 @@ Timed task management panel with python3, javaScript, shell, typescript support
 ### Local Deployment

 ```bash
-# To be completed
+# To be refined, see the development steps first (not supported on windows yet)
 ```

 ### Podman Deployment
@@ -61,7 +61,6 @@ podman run -dit \
  -p 5700:5700 \
  --name qinglong \
  --hostname qinglong \
-  --restart unless-stopped \
  docker.io/whyour/qinglong:latest
 ```

@@ -161,7 +160,11 @@ task <file_path> now
 # the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
 task <file_path> conc <env_name> <account_number>(Optional) 
 # Specify the account to execute and run immediately regardless of whether a random delay is set 
-task <file_path> desi <env_name> <account_number>         
+task <file_path> desi <env_name> <account_number>       
+# Set task timeout   
+task -m <max_time> <file_path>
+# Print task log in real time, no need to carry this parameter when creating timed tasks
+task -l <file_path>  
 ```

 2. parameter description
@@ -176,6 +179,7 @@ task <file_path> desi <env_name> <account_number>
 * file_path: File path for task execution
 * env_name: The name of the environment variable that needs to be concurrent or specified at the time of task execution
 * account_number: Specify the account number of an environment variable to be executed when the task is executed
+* max_time: Timeout, suffix "s" for seconds (default), "m" for minutes, "h" for hours, "d" for days

 ## Links

@@ -183,7 +187,7 @@ task <file_path> desi <env_name> <account_number>
 - [crontab-ui](https://github.com/alseambusher/crontab-ui)
 - [Ant Design](https://ant.design)
 - [Ant Design Pro](https://pro.ant.design/)
- [Umijs3.0](https://umijs.org)
+- [Umijs](https://umijs.org)
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)

@@ -1,6 +1,6 @@
 <p align="center">
  <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
+    <img width="150" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
  </a>
 </p>

@@ -22,7 +22,7 @@
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 </div>

-[![](https://user-images.githubusercontent.com/22700758/161788855-c4e51cb8-d4e9-44fe-bb17-ee1a56c8549b.png)](https://whyour.cn)
+[![](https://user-images.githubusercontent.com/22700758/203243067-1a8a570d-b1b4-4837-9f12-d78d83e31f35.jpg)](https://whyour.cn)

 简体中文 | [English](./README-en.md)

@@ -41,7 +41,7 @@
 ### 本机部署

 ```bash
-# 待完善
+# 待完善，可先参考开发步骤 (windows暂时不支持)
 ```

 ### podman 部署
@@ -61,7 +61,6 @@ podman run -dit \
  -p 5700:5700 \
  --name qinglong \
  --hostname qinglong \
-  --restart unless-stopped \
  docker.io/whyour/qinglong:latest
 ```

@@ -160,7 +159,11 @@ task <file_path> now
 # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
 task <file_path> conc <env_name> <account_number>(可选的) 
 # 指定账号执行，无论是否设置了随机延迟，均立即运行 
-task <file_path> desi <env_name> <account_number>         
+task <file_path> desi <env_name> <account_number>      
+# 设置任务超时时间   
+task -m <max_time> <file_path>
+# 实时打印任务日志，创建定时任务时，不用携带此参数
+task -l <file_path>
 ```

 2. 参数说明
@@ -176,6 +179,7 @@ task <file_path> desi <env_name> <account_number>
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称
 * account_number: 任务执行时指定某个环境变量需要执行的账号序号
+* max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天

 ## 链接

@@ -183,7 +187,7 @@ task <file_path> desi <env_name> <account_number>
 - [crontab-ui](https://github.com/alseambusher/crontab-ui)
 - [Ant Design](https://ant.design)
 - [Ant Design Pro](https://pro.ant.design/)
- [Umijs3.0](https://umijs.org)
+- [Umijs](https://umijs.org)
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)

@@ -28,8 +28,9 @@ export default (app: Router) => {
    celebrate({
      body: Joi.object({
        name: Joi.string().required(),
-        sorts: Joi.array().optional(),
+        sorts: Joi.array().optional().allow(null),
        filters: Joi.array().optional(),
+        filterRelation: Joi.string().optional(),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
@@ -49,15 +50,20 @@ export default (app: Router) => {
      body: Joi.object({
        name: Joi.string().required(),
        id: Joi.number().required(),
-        sorts: Joi.array().optional(),
+        sorts: Joi.array().optional().allow(null),
        filters: Joi.array().optional(),
+        filterRelation: Joi.string().optional(),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
      try {
        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.update(req.body);
-        return res.send({ code: 200, data });
+        if (req.body.type === 1) {
+          return res.send({ code: 400, message: '参数错误' });
+        } else {
+          const data = await cronViewService.update(req.body);
+          return res.send({ code: 200, data });
+        }
      } catch (e) {
        return next(e);
      }
@@ -3,8 +3,21 @@ import { Container } from 'typedi';
 import EnvService from '../services/env';
 import { Logger } from 'winston';
 import { celebrate, Joi } from 'celebrate';
+import multer from 'multer';
+import config from '../config';
+import fs from 'fs';
 const route = Router();

+const storage = multer.diskStorage({
+  destination: function (req, file, cb) {
+    cb(null, config.scriptPath);
+  },
+  filename: function (req, file, cb) {
+    cb(null, file.originalname);
+  },
+});
+const upload = multer({ storage: storage });
+
 export default (app: Router) => {
  app.use('/envs', route);

@@ -26,7 +39,9 @@ export default (app: Router) => {
      body: Joi.array().items(
        Joi.object({
          value: Joi.string().required(),
-          name: Joi.string().required(),
+          name: Joi.string()
+            .required()
+            .pattern(/^[a-zA-Z_][0-9a-zA-Z_]*$/),
          remarks: Joi.string().optional().allow(''),
        }),
      ),
@@ -94,7 +109,6 @@ export default (app: Router) => {
      }),
    }),
    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
      try {
        const envService = Container.get(EnvService);
        const data = await envService.move(req.params.id, req.body);
@@ -177,4 +191,37 @@ export default (app: Router) => {
      }
    },
  );
+
+  route.post(
+    '/upload',
+    upload.single('env'),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const envService = Container.get(EnvService);
+        const fileContent = await fs.promises.readFile(req!.file!.path, 'utf8');
+        const parseContent = JSON.parse(fileContent);
+        const data = Array.isArray(parseContent)
+          ? parseContent
+          : [parseContent];
+        if (data.every((x) => x.name && x.value)) {
+          const result = await envService.create(
+            data.map((x) => ({
+              name: x.name,
+              value: x.value,
+              remarks: x.remarks,
+            })),
+          );
+          return res.send({ code: 200, data: result });
+        } else {
+          return res.send({
+            code: 400,
+            message: '文件缺少name或者value字段，参考导出文件格式',
+          });
+        }
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };
@@ -3,8 +3,9 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { getFileContentByName, readDirs } from '../config/util';
+import { emptyDir, getFileContentByName, readDirs } from '../config/util';
 import { join } from 'path';
+import { celebrate, Joi } from 'celebrate';
 const route = Router();
 const blacklist = ['.tmp'];

@@ -45,4 +46,34 @@ export default (app: Router) => {
      }
    },
  );
+
+  route.delete(
+    '/',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().allow(''),
+        type: Joi.string().optional()
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        let { filename, path, type } = req.body as {
+          filename: string;
+          path: string;
+          type: string;
+        };
+        const filePath = join(config.logPath, path, filename);
+        if (type === 'directory') {
+          emptyDir(filePath);          
+        } else {
+          fs.unlinkSync(filePath);
+        }
+        res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
 };
@@ -4,6 +4,7 @@ import {
  readDirs,
  getLastModifyFilePath,
  readDir,
+  emptyDir,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
@@ -77,12 +78,14 @@ export default (app: Router) => {
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
      try {
-        let { filename, path, content, originFilename } = req.body as {
-          filename: string;
-          path: string;
-          content: string;
-          originFilename: string;
-        };
+        let { filename, path, content, originFilename, directory } =
+          req.body as {
+            filename: string;
+            path: string;
+            content: string;
+            originFilename: string;
+            directory: string;
+          };

        if (!path) {
          path = config.scriptPath;
@@ -105,11 +108,19 @@ export default (app: Router) => {
          return res.send({ code: 200 });
        }

+        if (directory) {
+          fs.mkdirSync(join(path, directory), { recursive: true });
+          return res.send({ code: 200 });
+        }
+
        if (!originFilename) {
          originFilename = filename;
        }
-        const originFilePath = `${path}${originFilename.replace(/\//g, '')}`;
-        const filePath = `${path}${filename.replace(/\//g, '')}`;
+        const originFilePath = join(
+          path,
+          `${originFilename.replace(/\//g, '')}`,
+        );
+        const filePath = join(path, `${filename.replace(/\//g, '')}`);
        if (fs.existsSync(originFilePath)) {
          fs.copyFileSync(
            originFilePath,
@@ -159,17 +170,23 @@ export default (app: Router) => {
      body: Joi.object({
        filename: Joi.string().required(),
        path: Joi.string().allow(''),
+        type: Joi.string().optional(),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
      try {
-        let { filename, path } = req.body as {
+        let { filename, path, type } = req.body as {
          filename: string;
          path: string;
+          type: string;
        };
        const filePath = join(config.scriptPath, path, filename);
-        fs.unlinkSync(filePath);
+        if (type === 'directory') {
+          emptyDir(filePath);
+        } else {
+          fs.unlinkSync(filePath);
+        }
        res.send({ code: 200 });
      } catch (e) {
        return next(e);
@@ -238,23 +255,50 @@ export default (app: Router) => {
    celebrate({
      body: Joi.object({
        filename: Joi.string().required(),
-        content: Joi.string().optional().allow(''),
        path: Joi.string().optional().allow(''),
+        pid: Joi.number().optional().allow(''),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
      try {
-        let { filename, content, path } = req.body;
+        let { filename, path, pid } = req.body;
        const { name, ext } = parse(filename);
        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);

        const scriptService = Container.get(ScriptService);
-        const result = await scriptService.stopScript(filePath);
+        const result = await scriptService.stopScript(filePath, pid);
        res.send(result);
      } catch (e) {
        return next(e);
      }
    },
  );
+
+  route.put(
+    '/rename',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().allow(''),
+        newFilename: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        let { filename, path, type, newFilename } = req.body as {
+          filename: string;
+          path: string;
+          type: string;
+          newFilename: string;
+        };
+        const filePath = join(config.scriptPath, path, filename);
+        const newPath = join(config.scriptPath, path, newFilename);
+        fs.renameSync(filePath, newPath);
+        res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };
@@ -49,6 +49,7 @@ export default (app: Router) => {
        sub_after: Joi.string().optional().allow('').allow(null),
        schedule_type: Joi.string().required(),
        alias: Joi.string().required(),
+        proxy: Joi.string().optional().allow('').allow(null),
      }),
    }),
    async (req: Request, res: Response, next: NextFunction) => {
@@ -177,6 +178,7 @@ export default (app: Router) => {
        sub_before: Joi.string().optional().allow('').allow(null),
        sub_after: Joi.string().optional().allow('').allow(null),
        alias: Joi.string().required(),
+        proxy: Joi.string().optional().allow('').allow(null),
        id: Joi.number().required(),
      }),
    }),
@@ -7,6 +7,9 @@ import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
 import { EnvModel } from '../data/env';
+import { parseVersion, promiseExec } from '../config/util';
+import dayjs from 'dayjs';
+
 const route = Router();

 export default (app: Router) => {
@@ -18,10 +21,22 @@ export default (app: Router) => {
      const userService = Container.get(UserService);
      const authInfo = await userService.getUserInfo();
      const envCount = await EnvModel.count();
-      const versionRegx = /.*export const version = \'(.*)\'\;/;
-
-      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
-      const version = currentVersionFile.match(versionRegx)![1];
+      const { version, changeLog, changeLogLink } = await parseVersion(
+        config.versionFile,
+      );
+      const lastCommitTime = (
+        await promiseExec(
+          `cd ${config.rootPath} && git show -s --format=%ai | head -1`,
+        )
+      ).replace('\n', '');
+      const lastCommitId = (
+        await promiseExec(`cd ${config.rootPath} && git rev-parse --short HEAD`)
+      ).replace('\n', '');
+      const branch = (
+        await promiseExec(
+          `cd ${config.rootPath} && git symbolic-ref --short HEAD`,
+        )
+      ).replace('\n', '');

      let isInitialized = true;
      if (
@@ -37,6 +52,11 @@ export default (app: Router) => {
        data: {
          isInitialized,
          version,
+          lastCommitTime: dayjs(lastCommitTime).unix(),
+          lastCommitId,
+          branch,
+          changeLog,
+          changeLogLink,
        },
      });
    } catch (e) {
@@ -17,7 +17,7 @@ async function startServer() {

  const server = app
    .listen(config.port, () => {
-      Logger.debug(`✌️ Back server launched on port ${config.port}`);
+      Logger.debug(`✌️ 后端服务启动成功！`);
    })
    .on('error', (err) => {
      Logger.error(err);
@@ -0,0 +1 @@
+export const LOG_END_SYMBOL = '\n　　　　　　　　　　';
@@ -11,10 +11,10 @@ if (!process.env.QL_DIR) {
  if (qlHomePath.endsWith('/static/')) {
    qlHomePath = path.join(qlHomePath, '../');
  }
-  process.env.QL_DIR = qlHomePath;
+  process.env.QL_DIR = qlHomePath.replace(/\/$/g, '');
 }

-const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;
+const lastVersionFile = `https://qn.whyour.cn/version.yaml`;

 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
@@ -40,7 +40,7 @@ const sqliteFile = path.join(samplePath, 'database.sqlite');
 const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
-const versionFile = path.join(rootPath, 'src/version.ts');
+const versionFile = path.join(rootPath, 'version.yaml');

 if (envFound.error) {
  throw new Error("⚠️  Couldn't find .env file  ⚠️");
@@ -3,6 +3,10 @@ import * as path from 'path';
 import got from 'got';
 import iconv from 'iconv-lite';
 import { exec } from 'child_process';
+import FormData from 'form-data';
+import psTreeFun from 'pstree.remy';
+import { promisify } from 'util';
+import { load } from 'js-yaml';

 export function getFileContentByName(fileName: string) {
  if (fs.existsSync(fileName)) {
@@ -283,6 +287,20 @@ enum FileType {
  'file',
 }

+interface IFile {
+  title: string;
+  key: string;
+  type: 'directory' | 'file';
+  parent: string;
+  mtime: number;
+  children?: IFile[];
+}
+
+export function dirSort(a: IFile, b: IFile) {
+  if (a.type !== b.type) return FileType[a.type] < FileType[b.type] ? -1 : 1;
+  else if (a.mtime !== b.mtime) return a.mtime > b.mtime ? -1 : 1;
+}
+
 export function readDirs(
  dir: string,
  baseDir: string = '',
@@ -301,24 +319,21 @@ export function readDirs(
          title: file,
          key,
          type: 'directory',
-          disabled: true,
          parent: relativePath,
-          children: readDirs(subPath, baseDir).sort(
-            (a: any, b: any) =>
-              (FileType as any)[a.type] - (FileType as any)[b.type],
-          ),
+          mtime: stats.mtime.getTime(),
+          children: readDirs(subPath, baseDir).sort(dirSort),
        };
      }
      return {
        title: file,
        type: 'file',
+        isLeaf: true,
        key,
        parent: relativePath,
+        mtime: stats.mtime.getTime(),
      };
    });
-  return result.sort(
-    (a: any, b: any) => (FileType as any)[a.type] - (FileType as any)[b.type],
-  );
+  return result.sort(dirSort);
 }

 export function readDir(
@@ -344,6 +359,20 @@ export function readDir(
  return result;
 }

+export function emptyDir(path: string) {
+  const files = fs.readdirSync(path);
+  files.forEach((file) => {
+    const filePath = `${path}/${file}`;
+    const stats = fs.statSync(filePath);
+    if (stats.isDirectory()) {
+      emptyDir(filePath);
+    } else {
+      fs.unlinkSync(filePath);
+    }
+  });
+  fs.rmdirSync(path);
+}
+
 export function promiseExec(command: string): Promise<string> {
  return new Promise((resolve, reject) => {
    exec(
@@ -355,3 +384,116 @@ export function promiseExec(command: string): Promise<string> {
    );
  });
 }
+
+export function parseHeaders(headers: string) {
+  if (!headers) return {};
+
+  const parsed: any = {};
+  let key;
+  let val;
+  let i;
+
+  headers &&
+    headers.split('\n').forEach(function parser(line) {
+      i = line.indexOf(':');
+      key = line.substring(0, i).trim().toLowerCase();
+      val = line.substring(i + 1).trim();
+
+      if (!key) {
+        return;
+      }
+
+      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+    });
+
+  return parsed;
+}
+
+export function parseBody(
+  body: string,
+  contentType:
+    | 'application/json'
+    | 'multipart/form-data'
+    | 'application/x-www-form-urlencoded',
+) {
+  if (!body) return '';
+
+  const parsed: any = {};
+  let key;
+  let val;
+  let i;
+
+  body &&
+    body.split('\n').forEach(function parser(line) {
+      i = line.indexOf(':');
+      key = line.substring(0, i).trim().toLowerCase();
+      val = line.substring(i + 1).trim();
+
+      if (!key || parsed[key]) {
+        return;
+      }
+
+      try {
+        const jsonValue = JSON.parse(val);
+        parsed[key] = jsonValue;
+      } catch (error) {
+        parsed[key] = val;
+      }
+    });
+
+  switch (contentType) {
+    case 'multipart/form-data':
+      return Object.keys(parsed).reduce((p, c) => {
+        p.append(c, parsed[c]);
+        return p;
+      }, new FormData());
+    case 'application/x-www-form-urlencoded':
+      return Object.keys(parsed).reduce((p, c) => {
+        return p ? `${p}&${c}=${parsed[c]}` : `${c}=${parsed[c]}`;
+      });
+  }
+
+  return parsed;
+}
+
+export function psTree(pid: number): Promise<number[]> {
+  return new Promise((resolve, reject) => {
+    psTreeFun(pid, (err: any, pids: number[]) => {
+      if (err) {
+        reject(err);
+      }
+      resolve(pids.filter((x) => !isNaN(x)));
+    });
+  });
+}
+
+export async function killTask(pid: number) {
+  const pids = await psTree(pid);
+  // SIGALRM 14 时钟信号
+  if (pids.length) {
+    process.kill(pids[0], 14);
+  } else {
+    process.kill(pid, 14);
+  }
+}
+
+export async function getPid(name: string) {
+  let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
+  const execAsync = promisify(exec);
+  let pid = (await execAsync(taskCommand)).stdout;
+  return Number(pid);
+}
+
+interface IVersion {
+  version: string;
+  changeLogLink: string;
+  changeLog: string;
+}
+
+export async function parseVersion(path: string): Promise<IVersion> {
+  return load(await promisify(fs.readFile)(path, 'utf8')) as IVersion;
+}
+
+export async function parseContentVersion(content: string): Promise<IVersion> {
+  return load(content) as IVersion;
+}
@@ -1,13 +1,19 @@
 import { sequelize } from '.';
 import { DataTypes, Model } from 'sequelize';

+export enum CronViewType {
+  '系统' = 1,
+  '个人',
+}
+
 interface SortType {
  type: 'ASC' | 'DESC';
  value: string;
 }

 interface FilterType {
-  type: 'or' | 'and';
+  property: string;
+  operation: string;
  value: string;
 }

@@ -18,6 +24,8 @@ export class CrontabView {
  isDisabled?: 1 | 0;
  filters?: FilterType[];
  sorts?: SortType[];
+  filterRelation?: 'and' | 'or';
+  type?: CronViewType;

  constructor(options: CrontabView) {
    this.name = options.name;
@@ -26,6 +34,8 @@ export class CrontabView {
    this.isDisabled = options.isDisabled || 0;
    this.filters = options.filters;
    this.sorts = options.sorts;
+    this.filterRelation = options.filterRelation;
+    this.type = options.type || CronViewType.个人;
  }
 }

@@ -43,5 +53,10 @@ export const CrontabViewModel = sequelize.define<CronViewInstance>(
    isDisabled: DataTypes.NUMBER,
    filters: DataTypes.JSON,
    sorts: DataTypes.JSON,
+    filterRelation: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
+    type: DataTypes.NUMBER,
  },
 );
@@ -26,7 +26,10 @@ export enum EnvStatus {
  'disabled',
 }

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

 interface EnvInstance extends Model<Env, Env>, Env {}
 export const EnvModel = sequelize.define<EnvInstance>('Env', {
@@ -1,15 +1,22 @@
-import { Sequelize } from 'sequelize';
+import { Sequelize, Transaction } from 'sequelize';
 import config from '../config/index';

 export const sequelize = new Sequelize({
  dialect: 'sqlite',
  storage: `${config.dbPath}database.sqlite`,
  logging: false,
-  pool: {
-    max: 6,
-    min: 0,
-    idle: 30000,
+  retry: {
+    max: 10,
+    match: ['SQLITE_BUSY: database is locked'],
  },
+  pool: {
+    max: 5,
+    min: 2,
+    idle: 30000,
+    acquire: 30000,
+    evict: 10000,
+  },
+  transactionType: Transaction.TYPES.IMMEDIATE,
 });

 export type ResponseType<T> = { code: number; data?: T; message?: string };
@@ -1,16 +1,22 @@
+import { IncomingHttpHeaders } from 'http';
+
 export enum NotificationMode {
  'gotify' = 'gotify',
  'goCqHttpBot' = 'goCqHttpBot',
  'serverChan' = 'serverChan',
  'pushDeer' = 'pushDeer',
  'bark' = 'bark',
+  'chat' = 'chat',
  'telegramBot' = 'telegramBot',
  'dingtalkBot' = 'dingtalkBot',
  'weWorkBot' = 'weWorkBot',
  'weWorkApp' = 'weWorkApp',
+  'aibotk' = 'aibotk',
  'iGot' = 'iGot',
  'pushPlus' = 'pushPlus',
  'email' = 'email',
+  'feishu' = 'feishu',
+  'webhook' = 'webhook',
 }

 abstract class NotificationBaseInfo {
@@ -35,11 +41,17 @@ export class ServerChanNotification extends NotificationBaseInfo {

 export class PushDeerNotification extends NotificationBaseInfo {
  public pushDeerKey = '';
+  public pushDeerUrl = '';
+}
+
+export class ChatNotification extends NotificationBaseInfo {
+  public chatUrl = '';
+  public chatToken = '';
 }

 export class BarkNotification extends NotificationBaseInfo {
  public barkPush = '';
-  public barkIcon = 'http://qn.whyour.cn/logo.png';
+  public barkIcon = 'https://qn.whyour.cn/logo.png';
  public barkSound = '';
  public barkGroup = 'qinglong';
 }
@@ -66,6 +78,12 @@ export class WeWorkAppNotification extends NotificationBaseInfo {
  public weWorkAppKey = '';
 }

+export class AibotkNotification extends NotificationBaseInfo {
+  public aibotkKey: string = '';
+  public aibotkType: 'room' | 'contact' = 'room';
+  public aibotkName: string = '';
+}
+
 export class IGotNotification extends NotificationBaseInfo {
  public iGotPushKey = '';
 }
@@ -81,16 +99,35 @@ export class EmailNotification extends NotificationBaseInfo {
  public emailPass: string = '';
 }

+export class WebhookNotification extends NotificationBaseInfo {
+  public webhookHeaders: string = '';
+  public webhookBody: string = '';
+  public webhookUrl: string = '';
+  public webhookMethod: 'GET' | 'POST' | 'PUT' = 'GET';
+  public webhookContentType:
+    | 'application/json'
+    | 'multipart/form-data'
+    | 'application/x-www-form-urlencoded' = 'application/json';
+}
+
+export class LarkNotification extends NotificationBaseInfo {
+  public larkKey = '';
+}
+
 export interface NotificationInfo
  extends GoCqHttpBotNotification,
    GotifyNotification,
    ServerChanNotification,
    PushDeerNotification,
+    ChatNotification,
    BarkNotification,
    TelegramBotNotification,
    DingtalkBotNotification,
    WeWorkBotNotification,
    WeWorkAppNotification,
+    AibotkNotification,
    IGotNotification,
    PushPlusNotification,
-    EmailNotification {}
+    EmailNotification,
+    WebhookNotification,
+    LarkNotification {}
@@ -28,6 +28,7 @@ export class Subscription {
  extensions?: string;
  sub_before?: string;
  sub_after?: string;
+  proxy?: string;

  constructor(options: Subscription) {
    this.id = options.id;
@@ -54,6 +55,7 @@ export class Subscription {
    this.extensions = options.extensions;
    this.sub_before = options.sub_before;
    this.sub_after = options.sub_after;
+    this.proxy = options.proxy;
  }
 }

@@ -102,5 +104,6 @@ export const SubscriptionModel = sequelize.define<SubscriptionInstance>(
    log_path: DataTypes.STRING,
    schedule_type: DataTypes.STRING,
    alias: { type: DataTypes.STRING, unique: 'alias' },
+    proxy: { type: DataTypes.STRING, allowNull: true },
  },
 );
@@ -10,6 +10,7 @@ import { fileExist } from '../config/util';
 import { SubscriptionModel } from '../data/subscription';
 import { CrontabViewModel } from '../data/cronView';
 import config from '../config';
+import { sequelize } from '../data';

 export default async () => {
  try {
@@ -21,12 +22,20 @@ export default async () => {
    await SubscriptionModel.sync();
    await CrontabViewModel.sync();

-    // try {
-    //   const queryInterface = sequelize.getQueryInterface();
-    //   await queryInterface.addIndex('Crontabs', ['command'], { unique: true });
-    //   await queryInterface.addIndex('Envs', ['name', 'value'], { unique: true });
-    //   await queryInterface.addIndex('Apps', ['name'], { unique: true });
-    // } catch (error) { }
+    // 初始化新增字段
+    try {
+      await sequelize.query(
+        'alter table CrontabViews add column filterRelation VARCHAR(255)',
+      );
+    } catch (error) {}
+    try {
+      await sequelize.query(
+        'alter table Subscriptions add column proxy VARCHAR(255)',
+      );
+    } catch (error) {}
+    try {
+      await sequelize.query('alter table CrontabViews add column type NUMBER');
+    } catch (error) {}

    // 2.10-2.11 升级
    const cronDbFile = path.join(config.rootPath, 'db/crontab.db');
@@ -3,7 +3,7 @@ import bodyParser from 'body-parser';
 import cors from 'cors';
 import routes from '../api';
 import config from '../config';
-import jwt from 'express-jwt';
+import jwt, { UnauthorizedError } from 'express-jwt';
 import fs from 'fs';
 import { getPlatform, getToken } from '../config/util';
 import Container from 'typedi';
@@ -75,22 +75,24 @@ export default ({ app }: { app: Application }) => {
    if (
      !headerToken &&
      originPath &&
-      config.apiWhiteList.includes(originPath) &&
-      originPath !== '/api/crons/status'
+      config.apiWhiteList.includes(originPath)
    ) {
      return next();
    }

    const data = fs.readFileSync(config.authConfigFile, 'utf8');
-    if (data) {
+    if (data && headerToken) {
      const { token = '', tokens = {} } = JSON.parse(data);
      if (headerToken === token || tokens[req.platform] === headerToken) {
        return next();
      }
    }

-    const err: any = new Error('UnauthorizedError');
-    err.status = 401;
+    const errorCode = headerToken ? 'invalid_token' : 'credentials_required';
+    const errorMessage = headerToken
+      ? 'jwt malformed'
+      : 'No authorization token was found';
+    const err = new UnauthorizedError(errorCode, { message: errorMessage });
    next(err);
  });

@@ -168,7 +170,17 @@ export default ({ app }: { app: Application }) => {
    },
  );

-  app.use(Sentry.Handlers.errorHandler());
+  app.use(
+    Sentry.Handlers.errorHandler({
+      shouldHandleError(error) {
+        // 排除 SequelizeUniqueConstraintError / NotFound
+        return (
+          !['SequelizeUniqueConstraintError'].includes(error.name) ||
+          !['Not Found'].includes(error.message)
+        );
+      },
+    }),
+  );

  app.use(
    (
@@ -4,16 +4,32 @@ import { Container } from 'typedi';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import CronService from '../services/cron';
 import EnvService from '../services/env';
-import _ from 'lodash';
+import groupBy from 'lodash/groupBy';
 import { DependenceModel } from '../data/dependence';
 import { Op } from 'sequelize';
 import config from '../config';
+import { CrontabViewModel, CronViewType } from '../data/cronView';
+import { initPosition } from '../data/env';

 export default async () => {
  const cronService = Container.get(CronService);
  const envService = Container.get(EnvService);
  const dependenceService = Container.get(DependenceService);

+  // 初始化新增默认全部任务视图
+  CrontabViewModel.findAll({
+    where: { type: CronViewType.系统, name: '全部任务' },
+    raw: true,
+  }).then((docs) => {
+    if (docs.length === 0) {
+      CrontabViewModel.create({
+        name: '全部任务',
+        type: CronViewType.系统,
+        position: initPosition / 2,
+      });
+    }
+  });
+
  // 初始化更新所有任务状态为空闲
  await CrontabModel.update(
    { status: CrontabStatus.idle },
@@ -26,7 +42,7 @@ export default async () => {
    order: [['type', 'DESC']],
    raw: true,
  }).then(async (docs) => {
-    const groups = _.groupBy(docs, 'type');
+    const groups = groupBy(docs, 'type');
    const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
    for (const key of keys) {
      const group = groups[key];
@@ -1,5 +1,4 @@
 import { Container } from 'typedi';
-import _ from 'lodash';
 import SystemService from '../services/system';
 import ScheduleService from '../services/schedule';
 import SubscriptionService from '../services/subscription';
@@ -13,18 +12,17 @@ export default async () => {

  // 生成内置token
  let tokenCommand = `ts-node-transpile-only ${config.rootPath}/back/token.ts`;
-  const tokenFile = `${config.rootPath}/static/build/token.js`;
+  const tokenFile = `${config.rootPath}static/build/token.js`;
  if (await fileExist(tokenFile)) {
    tokenCommand = `node ${tokenFile}`;
  }
  const cron = {
-    id: 'token',
+    id: NaN,
    name: '生成token',
    command: tokenCommand,
  };
-  scheduleService.createIntervalTask(cron as any, {
+  scheduleService.createIntervalTask(cron, {
    days: 28,
-    runImmediately: true,
  });

  // 运行删除日志任务
@@ -37,7 +35,6 @@ export default async () => {
    };
    scheduleService.createIntervalTask(cron, {
      days: data.info.frequency,
-      runImmediately: true,
    });
  }

@@ -2,16 +2,21 @@ import { Application } from 'express';
 import * as Sentry from '@sentry/node';
 import * as Tracing from '@sentry/tracing';
 import Logger from './logger';
+import config from '../config';
+import fs from 'fs';
+import { parseVersion } from '../config/util';
+
+export default async ({ expressApp }: { expressApp: Application }) => {
+  const { version } = await parseVersion(config.versionFile);

-export default ({ expressApp }: { expressApp: Application }) => {
  Sentry.init({
    dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
    integrations: [
      new Sentry.Integrations.Http({ tracing: true }),
      new Tracing.Integrations.Express({ app: expressApp }),
    ],
-
-    tracesSampleRate: 1.0,
+    tracesSampleRate: 0.1,
+    release: version,
  });

  expressApp.use(Sentry.Handlers.requestHandler());
@@ -22,7 +22,7 @@ app
    await require('./loaders/sentry').default({ expressApp: app });
    await require('./loaders/db').default();

-    Logger.debug(`✌️ Back server launched on port ${config.publicPort}`);
+    Logger.debug(`✌️ 公共服务启动成功！`);
  })
  .on('error', (err) => {
    Logger.error(err);
@@ -18,14 +18,15 @@ const run = async () => {
            _schedule &&
            _schedule.length > 5 &&
            task.status !== CrontabStatus.disabled &&
-            !task.isDisabled
+            !task.isDisabled &&
+            task.schedule
          ) {
            schedule.scheduleJob(task.schedule, function () {
              let command = task.command as string;
              if (!command.includes('task ') && !command.includes('ql ')) {
                command = `task ${command}`;
              }
-              exec(command);
+              exec(`ID=${task.id} ${command}`);
            });
          }
        }
@@ -43,11 +44,7 @@ app
    await require('./loaders/db').default();

    await run();
-    Logger.info(`
-      ################################################
-      🛡️  Schedule listening on port: ${config.cronPort} 🛡️
-      ################################################
-    `);
+    Logger.debug('定时任务服务启动成功！');
  })
  .on('error', (err) => {
    Logger.error(err);
@@ -5,12 +5,15 @@ import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import { exec, execSync, spawn } from 'child_process';
 import fs from 'fs';
 import cron_parser from 'cron-parser';
-import { getFileContentByName, concurrentRun, fileExist } from '../config/util';
+import {
+  getFileContentByName,
+  concurrentRun,
+  fileExist,
+  killTask,
+} from '../config/util';
 import { promises, existsSync } from 'fs';
-import { promisify } from 'util';
-import { Op } from 'sequelize';
+import { Op, where, col as colFn } from 'sequelize';
 import path from 'path';
-import dayjs from 'dayjs';

@Service()
 export default class CronService {
@@ -115,18 +118,26 @@ export default class CronService {

  private formatViewQuery(query: any, viewQuery: any) {
    if (viewQuery.filters && viewQuery.filters.length > 0) {
+      const primaryOperate = viewQuery.filterRelation === 'or' ? Op.or : Op.and;
+      if (!query[primaryOperate]) {
+        query[primaryOperate] = [];
+      }
      for (const col of viewQuery.filters) {
        const { property, value, operation } = col;
+        let q: any = {};
+        let operate2 = null;
        let operate = null;
        switch (operation) {
          case 'Reg':
            operate = Op.like;
+            operate2 = Op.or;
            break;
          case 'NotReg':
            operate = Op.notLike;
+            operate2 = Op.and;
            break;
          case 'In':
-            query[Op.or] = [
+            q[Op.or] = [
              {
                [property]: value,
              },
@@ -136,7 +147,7 @@ export default class CronService {
            ];
            break;
          case 'Nin':
-            query[Op.and] = [
+            q[Op.and] = [
              {
                [property]: {
                  [Op.notIn]: value,
@@ -150,20 +161,39 @@ export default class CronService {
          default:
            break;
        }
-        if (operate) {
-          query[property] = {
+        if (operate && operate2) {
+          q[property] = {
            [Op.or]: [
-              { [operate]: `%${value}%` },
-              { [operate]: `%${encodeURIComponent(value)}%` },
+              {
+                [operate2]: [
+                  { [operate]: `%${value}%` },
+                  { [operate]: `%${encodeURIComponent(value)}%` },
+                ],
+              },
+              {
+                [operate2]: [
+                  where(colFn(property), operate, `%${value}%`),
+                  where(
+                    colFn(property),
+                    operate,
+                    `%${encodeURIComponent(value)}%`,
+                  ),
+                ],
+              },
            ],
          };
        }
+        query[primaryOperate].push(q);
      }
    }
  }

  private formatSearchText(query: any, searchText: string | undefined) {
    if (searchText) {
+      if (!query[Op.and]) {
+        query[Op.and] = [];
+      }
+      let q: any = {};
      const textArray = searchText.split(':');
      switch (textArray[0]) {
        case 'name':
@@ -171,13 +201,11 @@ export default class CronService {
        case 'schedule':
        case 'label':
          const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-          query = {
-            [column]: {
-              [Op.or]: [
-                { [Op.like]: `%${textArray[1]}%` },
-                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
-              ],
-            },
+          q[column] = {
+            [Op.or]: [
+              { [Op.like]: `%${textArray[1]}%` },
+              { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
+            ],
          };
          break;
        default:
@@ -187,24 +215,39 @@ export default class CronService {
              { [Op.like]: `%${encodeURIComponent(searchText)}%` },
            ],
          };
-          query = {
-            [Op.or]: [
-              {
-                name: reg,
-              },
-              {
-                command: reg,
-              },
-              {
-                schedule: reg,
-              },
-              {
-                labels: reg,
-              },
-            ],
-          };
+          q[Op.or] = [
+            {
+              name: reg,
+            },
+            {
+              command: reg,
+            },
+            {
+              schedule: reg,
+            },
+            {
+              labels: reg,
+            },
+          ];
          break;
      }
+      query[Op.and].push(q);
+    }
+  }
+
+  private formatFilterQuery(query: any, filterQuery: any) {
+    if (filterQuery) {
+      if (!query[Op.and]) {
+        query[Op.and] = [];
+      }
+      const filterKeys: any = Object.keys(filterQuery);
+      for (const key of filterKeys) {
+        let q: any = {};
+        if (filterKeys[key]) {
+          q[key] = filterKeys[key];
+        }
+        query[Op.and].push(q);
+      }
    }
  }

@@ -220,16 +263,16 @@ export default class CronService {
    searchValue: string;
    page: string;
    size: string;
-    sortField: string;
-    sortType: string;
+    sorter: string;
+    filters: string;
    queryString: string;
  }): Promise<{ data: Crontab[]; total: number }> {
    const searchText = params?.searchValue;
    const page = Number(params?.page || '0');
    const size = Number(params?.size || '0');
-    const sortField = params?.sortField || '';
-    const sortType = params?.sortType || '';
    const viewQuery = JSON.parse(params?.queryString || '{}');
+    const filterQuery = JSON.parse(params?.filters || '{}');
+    const sorterQuery = JSON.parse(params?.sorter || '{}');

    let query: any = {};
    let order = [
@@ -241,10 +284,14 @@ export default class CronService {

    this.formatViewQuery(query, viewQuery);
    this.formatSearchText(query, searchText);
+    this.formatFilterQuery(query, filterQuery);
    this.formatViewSort(order, viewQuery);

-    if (sortType && sortField) {
-      order.unshift([sortField, sortType]);
+    if (sorterQuery) {
+      const { field, type } = sorterQuery;
+      if (field && type) {
+        order.unshift([field, type]);
+      }
    }
    let condition: any = {
      where: query,
@@ -284,31 +331,11 @@ export default class CronService {
    for (const doc of docs) {
      if (doc.pid) {
        try {
-          process.kill(-doc.pid);
+          await killTask(doc.pid);
        } catch (error) {
          this.logger.silly(error);
        }
      }
-      const err = await this.killTask(doc.command);
-      const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
-      const logFileExist = doc.log_path && (await fileExist(absolutePath));
-
-      const endTime = dayjs();
-      const diffTimeStr = doc.last_execution_time
-        ? `，耗时 ${endTime.diff(
-            dayjs(doc.last_execution_time * 1000),
-            'second',
-          )}`
-        : '';
-      if (logFileExist) {
-        const str = err ? `\n${err}` : '';
-        fs.appendFileSync(
-          `${absolutePath}`,
-          `${str}\n## 执行结束... ${endTime.format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}${diffTimeStr}`,
-        );
-      }
    }

    await CrontabModel.update(
@@ -317,42 +344,6 @@ export default class CronService {
    );
  }

-  public async killTask(name: string) {
-    let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
-    const execAsync = promisify(exec);
-    try {
-      let pid = (await execAsync(taskCommand)).stdout;
-      if (pid) {
-        pid = (await execAsync(`pstree -p ${pid}`)).stdout;
-      } else {
-        return;
-      }
-      let pids = pid.match(/\(\d+/g);
-      const killLogs = [];
-      if (pids && pids.length > 0) {
-        // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
-        pids = pids.slice(0, 3);
-        for (const id of pids) {
-          const c = `kill -9 ${id.slice(1)}`;
-          try {
-            const { stdout, stderr } = await execAsync(c);
-            if (stderr) {
-              killLogs.push(stderr);
-            }
-            if (stdout) {
-              killLogs.push(stdout);
-            }
-          } catch (error: any) {
-            killLogs.push(error.message);
-          }
-        }
-      }
-      return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
-    } catch (e) {
-      return JSON.stringify(e);
-    }
-  }
-
  private async runSingle(cronId: number): Promise<number> {
    return new Promise(async (resolve: any) => {
      const cron = await this.getDb({ id: cronId });
@@ -383,7 +374,7 @@ export default class CronService {
        cmdStr = `${cmdStr} now`;
      }

-      const cp = spawn(cmdStr, { shell: '/bin/bash' });
+      const cp = spawn(`ID=${id} ${cmdStr}`, { shell: '/bin/bash' });

      await CrontabModel.update(
        { status: CrontabStatus.running, pid: cp.pid },
@@ -391,7 +382,7 @@ export default class CronService {
      );
      cp.stderr.on('data', (data) => {
        if (logFileExist) {
-          fs.appendFileSync(`${absolutePath}`, `${data}`);
+          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
        }
      });
      cp.on('error', (err) => {
@@ -1,14 +1,19 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import { CrontabView, CrontabViewModel } from '../data/cronView';
-import { initEnvPosition } from '../data/env';
+import {
+  initPosition,
+  maxPosition,
+  minPosition,
+  stepPosition,
+} from '../data/env';

@Service()
 export default class CronViewService {
  constructor(@Inject('logger') private logger: winston.Logger) {}

  public async create(payload: CrontabView): Promise<CrontabView> {
-    let position = initEnvPosition;
+    let position = initPosition;
    const views = await this.list();
    if (views && views.length > 0 && views[views.length - 1].position) {
      position = views[views.length - 1].position as number;
@@ -16,6 +21,8 @@ export default class CronViewService {
    position = position / 2;
    const tab = new CrontabView({ ...payload, position });
    const doc = await this.insert(tab);
+
+    await this.checkPosition(tab.position!);
    return doc;
  }

@@ -62,6 +69,22 @@ export default class CronViewService {
    await CrontabViewModel.update({ isDisabled: 0 }, { where: { id: ids } });
  }

+  private async checkPosition(position: number) {
+    const precisionPosition = parseFloat(position.toPrecision(16));
+    if (precisionPosition < minPosition || precisionPosition > maxPosition) {
+      const envs = await this.list();
+      let position = initPosition;
+      for (const env of envs) {
+        position = position - stepPosition;
+        await this.updateDb({ id: env.id, position });
+      }
+    }
+  }
+
+  private getPrecisionPosition(position: number): number {
+    return parseFloat(position.toPrecision(16));
+  }
+
  public async move({
    id,
    fromIndex,
@@ -76,17 +99,19 @@ export default class CronViewService {
    const views = await this.list();
    if (toIndex === 0 || toIndex === views.length - 1) {
      targetPosition = isUpward
-        ? views[0].position * 2
-        : views[toIndex].position / 2;
+        ? views[0].position! * 2
+        : views[toIndex].position! / 2;
    } else {
      targetPosition = isUpward
-        ? (views[toIndex].position + views[toIndex - 1].position) / 2
-        : (views[toIndex].position + views[toIndex + 1].position) / 2;
+        ? (views[toIndex].position! + views[toIndex - 1].position!) / 2
+        : (views[toIndex].position! + views[toIndex + 1].position!) / 2;
    }
    const newDoc = await this.update({
      id,
-      position: targetPosition,
+      position: this.getPrecisionPosition(targetPosition),
    });
+
+    await this.checkPosition(targetPosition);
    return newDoc;
  }
 }
@@ -9,7 +9,6 @@ import {
  unInstallDependenceCommandTypes,
  DependenceModel,
 } from '../data/dependence';
-import _ from 'lodash';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import { Op } from 'sequelize';
@@ -125,8 +124,11 @@ export default class DependenceService {
    return docs;
  }

-  private async find(query: any, sort?: any): Promise<Dependence[]> {
-    const docs = await DependenceModel.findAll({ where: { ...query } });
+  private async find(query: any, sort: any = []): Promise<Dependence[]> {
+    const docs = await DependenceModel.findAll({
+      where: { ...query },
+      order: [...sort, ['createdAt', 'DESC']],
+    });
    return docs;
  }

@@ -1,10 +1,17 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import { getFileContentByName } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
-import { Env, EnvModel, EnvStatus, initEnvPosition } from '../data/env';
-import _ from 'lodash';
+import {
+  Env,
+  EnvModel,
+  EnvStatus,
+  initPosition,
+  maxPosition,
+  minPosition,
+  stepPosition,
+} from '../data/env';
+import groupBy from 'lodash/groupBy';
 import { Op } from 'sequelize';

@Service()
@@ -13,17 +20,22 @@ export default class EnvService {

  public async create(payloads: Env[]): Promise<Env[]> {
    const envs = await this.envs();
-    let position = initEnvPosition;
-    if (envs && envs.length > 0 && envs[envs.length - 1].position) {
-      position = envs[envs.length - 1].position as number;
+    let position = initPosition;
+    if (
+      envs &&
+      envs.length > 0 &&
+      typeof envs[envs.length - 1].position === 'number'
+    ) {
+      position = envs[envs.length - 1].position!;
    }
    const tabs = payloads.map((x) => {
-      position = position / 2;
+      position = position - stepPosition;
      const tab = new Env({ ...x, position });
      return tab;
    });
    const docs = await this.insert(tabs);
    await this.set_envs();
+    await this.checkPosition(tabs[tabs.length - 1].position!);
    return docs;
  }

@@ -67,25 +79,40 @@ export default class EnvService {
    const envs = await this.envs();
    if (toIndex === 0 || toIndex === envs.length - 1) {
      targetPosition = isUpward
-        ? envs[0].position * 2
-        : envs[toIndex].position / 2;
+        ? envs[0].position! + stepPosition
+        : envs[toIndex].position! - stepPosition;
    } else {
      targetPosition = isUpward
-        ? (envs[toIndex].position + envs[toIndex - 1].position) / 2
-        : (envs[toIndex].position + envs[toIndex + 1].position) / 2;
+        ? (envs[toIndex].position! + envs[toIndex - 1].position!) / 2
+        : (envs[toIndex].position! + envs[toIndex + 1].position!) / 2;
    }
+
    const newDoc = await this.update({
      id,
-      position: targetPosition,
+      position: this.getPrecisionPosition(targetPosition),
    });
+
+    await this.checkPosition(targetPosition);
    return newDoc;
  }

-  public async envs(
-    searchText: string = '',
-    sort: any = { position: -1 },
-    query: any = {},
-  ): Promise<Env[]> {
+  private async checkPosition(position: number) {
+    const precisionPosition = parseFloat(position.toPrecision(16));
+    if (precisionPosition < minPosition || precisionPosition > maxPosition) {
+      const envs = await this.envs();
+      let position = initPosition;
+      for (const env of envs) {
+        position = position - stepPosition;
+        await this.updateDb({ id: env.id, position });
+      }
+    }
+  }
+
+  private getPrecisionPosition(position: number): number {
+    return parseFloat(position.toPrecision(16));
+  }
+
+  public async envs(searchText: string = '', query: any = {}): Promise<Env[]> {
    let condition = { ...query };
    if (searchText) {
      const encodeText = encodeURIComponent(searchText);
@@ -112,7 +139,11 @@ export default class EnvService {
      };
    }
    try {
-      const result = await this.find(condition, [['position', 'DESC']]);
+      const result = await this.find(condition, [
+        ['status', 'ASC'],
+        ['position', 'DESC'],
+        ['createdAt', 'ASC'],
+      ]);
      return result as any;
    } catch (error) {
      throw error;
@@ -151,22 +182,20 @@ export default class EnvService {
  }

  public async set_envs() {
-    const envs = await this.envs(
-      '',
-      { position: -1 },
-      { name: { [Op.not]: null } },
-    );
-    const groups = _.groupBy(envs, 'name');
+    const envs = await this.envs('', {
+      name: { [Op.not]: null },
+      status: EnvStatus.normal,
+    });
+    const groups = groupBy(envs, 'name');
    let env_string = '';
    for (const key in groups) {
      if (Object.prototype.hasOwnProperty.call(groups, key)) {
        const group = groups[key];

        // 忽略不符合bash要求的环境变量名称
-        if (/^[a-zA-Z_][0-9a-zA-Z_]+$/.test(key)) {
-          let value = _(group)
-            .filter((x) => x.status !== EnvStatus.disabled)
-            .map('value')
+        if (/^[a-zA-Z_][0-9a-zA-Z_]*$/.test(key)) {
+          let value = group
+            .map((x) => x.value)
            .join('&')
            .replace(/(\\)[^n]/g, '\\\\')
            .replace(/(\\$)/, '\\\\')
@@ -6,6 +6,7 @@ import got from 'got';
 import nodemailer from 'nodemailer';
 import crypto from 'crypto';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
+import { parseBody, parseHeaders } from '../config/util';

@Service()
 export default class NotificationService {
@@ -17,20 +18,27 @@ export default class NotificationService {
    ['goCqHttpBot', this.goCqHttpBot],
    ['serverChan', this.serverChan],
    ['pushDeer', this.pushDeer],
+    ['chat', this.chat],
    ['bark', this.bark],
    ['telegramBot', this.telegramBot],
    ['dingtalkBot', this.dingtalkBot],
    ['weWorkBot', this.weWorkBot],
    ['weWorkApp', this.weWorkApp],
+    ['aibotk', this.aibotk],
    ['iGot', this.iGot],
    ['pushPlus', this.pushPlus],
    ['email', this.email],
+    ['webhook', this.webhook],
+    ['lark', this.lark],
  ]);

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

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

@@ -73,8 +81,7 @@ export default class NotificationService {
    const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
    const res: any = await got
      .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        body: `title=${encodeURIComponent(
          this.title,
        )}&message=${encodeURIComponent(
@@ -92,8 +99,7 @@ export default class NotificationService {
    const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
    const res: any = await got
      .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        json: { message: `${this.title}\n${this.content}` },
        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
      })
@@ -108,8 +114,7 @@ export default class NotificationService {
      : `https://sc.ftqq.com/${serverChanKey}.send`;
    const res: any = await got
      .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        body: `title=${this.title}&desp=${this.content}`,
        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
      })
@@ -118,12 +123,11 @@ export default class NotificationService {
  }

  private async pushDeer() {
-    const { pushDeerKey } = this.params;
-    const url = `https://api2.pushdeer.com/message/push`;
+    const { pushDeerKey, pushDeerUrl } = this.params;
+    const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
    const res: any = await got
      .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
          this.title,
        )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
@@ -135,6 +139,19 @@ export default class NotificationService {
    );
  }

+  private async chat() {
+    const { chatUrl, chatToken } = this.params;
+    const url = `${chatUrl}${chatToken}`;
+    const res: any = await got
+      .post(url, {
+        ...this.gotOption,
+        body: `payload={"text":"${this.title}\n${this.content}"}`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+    return res.success;
+  }
+
  private async bark() {
    let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
    if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
@@ -147,8 +164,7 @@ export default class NotificationService {
    )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
    const res: any = await got
      .get(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
      })
      .json();
@@ -186,8 +202,7 @@ export default class NotificationService {
    }
    const res: any = await got
      .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
        agent,
@@ -209,8 +224,7 @@ export default class NotificationService {
    const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
    const res: any = await got
      .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        json: {
          msgtype: 'text',
          text: {
@@ -227,8 +241,7 @@ export default class NotificationService {
    const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
    const res: any = await got
      .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        json: {
          msgtype: 'text',
          text: {
@@ -247,8 +260,7 @@ export default class NotificationService {
    const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
    const tokenRes: any = await got
      .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        json: {
          corpid,
          corpsecret,
@@ -298,8 +310,7 @@ export default class NotificationService {
      .post(
        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
        {
-          timeout: this.timeout,
-          retry: 0,
+          ...this.gotOption,
          json: {
            touser,
            agentid,
@@ -313,13 +324,53 @@ export default class NotificationService {
    return res.errcode === 0;
  }

+  private async aibotk() {
+    const { aibotkKey, aibotkType, aibotkName } = this.params;
+    let url = '';
+    let json = {};
+    switch (aibotkType) {
+      case 'room':
+        url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
+        json = {
+          apiKey: `${aibotkKey}`,
+          roomName: `${aibotkName}`,
+          message: {
+            type: 1,
+            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+          },
+        };
+        break;
+      case 'contact':
+        url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
+        json = {
+          apiKey: `${aibotkKey}`,
+          name: `${aibotkName}`,
+          message: {
+            type: 1,
+            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+          },
+        };
+        break;
+    }
+
+    const res: any = await got
+      .post(url, {
+        ...this.gotOption,
+        json: {
+          ...json,
+        },
+      })
+      .json();
+
+    return res.code === 0;
+  }
+
  private async iGot() {
    const { iGotPushKey } = this.params;
    const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
    const res: any = await got
      .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        body: `title=${this.title}&content=${this.content}`,
        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
      })
@@ -333,8 +384,7 @@ export default class NotificationService {
    const url = `https://www.pushplus.plus/send`;
    const res: any = await got
      .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
        json: {
          token: `${pushPlusToken}`,
          title: `${this.title}`,
@@ -347,6 +397,21 @@ export default class NotificationService {
    return res.code === 200;
  }

+  private async lark() {
+    const { larkKey } = this.params;
+    const res: any = await got
+      .post(`https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`, {
+        ...this.gotOption,
+        json: {
+          msg_type: 'text',
+          content: { text: `${this.title}\n\n${this.content}` },
+        },
+        headers: { 'Content-Type': 'application/json' },
+      })
+      .json();
+    return res.StatusCode === 0;
+  }
+
  private async email() {
    const { emailPass, emailService, emailUser } = this.params;
    const transporter = nodemailer.createTransport({
@@ -368,4 +433,62 @@ export default class NotificationService {

    return !!info.messageId;
  }
+
+  private async webhook() {
+    const {
+      webhookUrl,
+      webhookBody,
+      webhookHeaders,
+      webhookMethod,
+      webhookContentType,
+    } = this.params;
+
+    const { formatBody, formatUrl } = this.formatNotifyContent(
+      webhookUrl,
+      webhookBody,
+    );
+    if (!formatUrl && !formatBody) {
+      return false;
+    }
+    const headers = parseHeaders(webhookHeaders);
+    const body = parseBody(formatBody, webhookContentType);
+    const bodyParam = this.formatBody(webhookContentType, body);
+    const options = {
+      method: webhookMethod,
+      headers,
+      ...this.gotOption,
+      allowGetBody: true,
+      ...bodyParam,
+    };
+    const res = await got(formatUrl, options);
+    return String(res.statusCode).startsWith('20');
+  }
+
+  private formatBody(contentType: string, body: any): object {
+    if (!body) return {};
+    switch (contentType) {
+      case 'application/json':
+        return { json: body };
+      case 'multipart/form-data':
+        return { form: body };
+      case 'application/x-www-form-urlencoded':
+        return { body };
+    }
+    return {};
+  }
+
+  private formatNotifyContent(url: string, body: string) {
+    if (!url.includes('$title') && !body.includes('$title')) {
+      return {};
+    }
+
+    return {
+      formatUrl: url
+        .replaceAll('$title', encodeURIComponent(this.title))
+        .replaceAll('$content', encodeURIComponent(this.content)),
+      formatBody: body
+        .replaceAll('$title', this.title)
+        .replaceAll('$content', this.content),
+    };
+  }
 }
@@ -119,7 +119,7 @@ export default class OpenService {
        (x) => x.expiration >= timestamp,
      );
      let tokens = invalidTokens;
-      if (invalidTokens.length > 5) {
+      if (invalidTokens.length >= 5) {
        tokens = [
          ...invalidTokens.slice(0, 4),
          { ...invalidTokens[4], expiration },
@@ -42,7 +42,11 @@ export default class ScheduleService {

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

-  async runTask(command: string, callbacks: TaskCallbacks = {}) {
+  async runTask(
+    command: string,
+    callbacks: TaskCallbacks = {},
+    completionTime: 'start' | 'end' = 'end',
+  ) {
    return new Promise(async (resolve, reject) => {
      try {
        const startTime = dayjs();
@@ -52,6 +56,7 @@ export default class ScheduleService {

        // TODO:
        callbacks.onStart?.(cp, startTime);
+        completionTime === 'start' && resolve(cp.pid);

        cp.stdout.on('data', async (data) => {
          await callbacks.onLog?.(data.toString());
@@ -100,7 +105,6 @@ export default class ScheduleService {
          error,
        );
        await callbacks.onError?.(JSON.stringify(error));
-        resolve(null);
      }
    });
  }
@@ -6,6 +6,8 @@ import SockService from './sock';
 import CronService from './cron';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import config from '../config';
+import { LOG_END_SYMBOL } from '../config/const';
+import { getPid, killTask } from '../config/util';

@Service()
 export default class ScriptService {
@@ -41,22 +43,24 @@ export default class ScriptService {
  public async runScript(filePath: string) {
    const relativePath = path.relative(config.scriptPath, filePath);
    const command = `task -l ${relativePath} now`;
-    this.scheduleService.runTask(command, this.taskCallbacks(filePath));
+    const pid = await this.scheduleService.runTask(
+      command,
+      this.taskCallbacks(filePath),
+      'start',
+    );

-    return { code: 200 };
+    return { code: 200, data: pid };
  }

-  public async stopScript(filePath: string) {
-    const relativePath = path.relative(config.scriptPath, filePath);
-    const err = await this.cronService.killTask(`task -l ${relativePath} now`);
-
-    const str = err ? `\n${err}` : '';
-    this.sockService.sendMessage({
-      type: 'manuallyRunScript',
-      message: `${str}\n## 执行结束...  ${new Date()
-        .toLocaleString('zh', { hour12: false })
-        .replace(' 24:', ' 00:')} `,
-    });
+  public async stopScript(filePath: string, pid: number) {
+    let str = '';
+    if (!pid) {
+      const relativePath = path.relative(config.scriptPath, filePath);
+      pid = await getPid(`task -l ${relativePath} now`);
+    }
+    try {
+      await killTask(pid);
+    } catch (error) {}

    return { code: 200 };
  }
@@ -14,7 +14,7 @@ export default class SshKeyService {

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

-  private generateSingleSshConfig(alias: string, host: string): string {
-    return `\nHost ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no`;
+  private generateSingleSshConfig(
+    alias: string,
+    host: string,
+    proxy?: string,
+  ): string {
+    if (host === 'github.com') {
+      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa\n    PubkeyAcceptedAlgorithms +ssh-rsa`;
+    }
+    const proxyStr = proxy ? `    ProxyCommand nc -v -x ${proxy} %h %p\n` : '';
+    return `\nHost ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no\n${proxyStr}`;
  }

  private generateSshConfig(configs: string[]) {
@@ -69,16 +77,21 @@ export default class SshKeyService {
    }
  }

-  public addSSHKey(key: string, alias: string, host: string): void {
+  public addSSHKey(
+    key: string,
+    alias: string,
+    host: string,
+    proxy?: string,
+  ): void {
    this.generatePrivateKeyFile(alias, key);
-    const config = this.generateSingleSshConfig(alias, host);
+    const config = this.generateSingleSshConfig(alias, host, proxy);
    this.removeSshConfig(alias);
    this.generateSshConfig([config]);
  }

-  public removeSSHKey(alias: string, host: string): void {
+  public removeSSHKey(alias: string, host: string, proxy?: string): void {
    this.removePrivateKeyFile(alias);
-    const config = this.generateSingleSshConfig(alias, host);
+    const config = this.generateSingleSshConfig(alias, host, proxy);
    this.removeSshConfig(config);
  }
 }
@@ -19,9 +19,9 @@ import {
  concurrentRun,
  fileExist,
  createFile,
+  killTask,
 } from '../config/util';
 import { promises, existsSync } from 'fs';
-import { promisify } from 'util';
 import { Op } from 'sequelize';
 import path from 'path';
 import ScheduleService, { TaskCallbacks } from './schedule';
@@ -29,6 +29,7 @@ import { SimpleIntervalSchedule } from 'toad-scheduler';
 import SockService from './sock';
 import SshKeyService from './sshKey';
 import dayjs from 'dayjs';
+import { LOG_END_SYMBOL } from '../config/const';

@Service()
 export default class SubscriptionService {
@@ -62,7 +63,10 @@ export default class SubscriptionService {
    try {
      const result = await SubscriptionModel.findAll({
        where: query,
-        order: [['createdAt', 'DESC']],
+        order: [
+          ['is_disabled', 'ASC'],
+          ['createdAt', 'DESC'],
+        ],
      });
      return result as any;
    } catch (error) {
@@ -73,13 +77,21 @@ export default class SubscriptionService {
  private formatCommand(doc: Subscription, url?: string) {
    let command = 'ql ';
    let _url = url || this.formatUrl(doc).url;
-    const { type, whitelist, blacklist, dependences, branch, extensions } = doc;
+    const {
+      type,
+      whitelist,
+      blacklist,
+      dependences,
+      branch,
+      extensions,
+      proxy,
+    } = doc;
    if (type === 'file') {
      command += `raw "${_url}"`;
    } else {
      command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
        dependences || ''
-      }" "${branch || ''}" "${extensions || ''}"`;
+      }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}"`;
    }
    return command;
  }
@@ -113,9 +125,10 @@ export default class SubscriptionService {
          (doc.pull_option as any).private_key,
          doc.alias,
          host,
+          doc.proxy,
        );
      } else {
-        this.sshKeyService.removeSSHKey(doc.alias, host);
+        this.sshKeyService.removeSSHKey(doc.alias, host, doc.proxy);
      }
    }

@@ -229,7 +242,7 @@ export default class SubscriptionService {
          absolutePath,
          `\n## 执行结束... ${endTime.format(
            'YYYY-MM-DD HH:mm:ss',
-          )}  耗时 ${diff} 秒`,
+          )}  耗时 ${diff} 秒${LOG_END_SYMBOL}`,
        );

        await SubscriptionModel.update(
@@ -338,19 +351,18 @@ export default class SubscriptionService {
    for (const doc of docs) {
      if (doc.pid) {
        try {
-          process.kill(-doc.pid);
+          await killTask(doc.pid);
        } catch (error) {
          this.logger.silly(error);
        }
      }
-      const command = this.formatCommand(doc);
-      const err = await this.killTask(command);
      const absolutePath = await this.handleLogPath(doc.log_path as string);
-      const str = err ? `\n${err}` : '';

      fs.appendFileSync(
        `${absolutePath}`,
-        `${str}\n## 执行结束...  ${dayjs().format('YYYY-MM-DD HH:mm:ss')} `,
+        `\n## 执行结束...  ${dayjs().format(
+          'YYYY-MM-DD HH:mm:ss',
+        )}${LOG_END_SYMBOL}`,
      );
    }

@@ -360,41 +372,6 @@ export default class SubscriptionService {
    );
  }

-  public async killTask(name: string) {
-    let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
-    const execAsync = promisify(exec);
-    try {
-      let pid = (await execAsync(taskCommand)).stdout;
-      if (pid) {
-        pid = (await execAsync(`pstree -p ${pid}`)).stdout;
-      } else {
-        return;
-      }
-      let pids = pid.match(/\(\d+/g);
-      const killLogs = [];
-      if (pids && pids.length > 0) {
-        // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
-        for (const id of pids) {
-          const c = `kill -9 ${id.slice(1)}`;
-          try {
-            const { stdout, stderr } = await execAsync(c);
-            if (stderr) {
-              killLogs.push(stderr);
-            }
-            if (stdout) {
-              killLogs.push(stdout);
-            }
-          } catch (error: any) {
-            killLogs.push(error.message);
-          }
-        }
-      }
-      return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
-    } catch (e) {
-      return JSON.stringify(e);
-    }
-  }
-
  private async runSingle(subscriptionId: number) {
    const subscription = await this.getDb({ id: subscriptionId });
    if (subscription.status !== SubscriptionStatus.queued) {
@@ -2,7 +2,6 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
 import * as fs from 'fs';
-import _ from 'lodash';
 import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
@@ -10,6 +9,7 @@ import ScheduleService from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import got from 'got';
+import { parseContentVersion, parseVersion } from '../config/util';

@Service()
 export default class SystemService {
@@ -70,9 +70,8 @@ export default class SystemService {
    };
    await this.scheduleService.cancelIntervalTask(cron);
    if (frequency > 0) {
-      await this.scheduleService.createIntervalTask(cron, {
+      this.scheduleService.createIntervalTask(cron, {
        days: frequency,
-        runImmediately: true,
      });
    }
    return { code: 200, data: { ...cron } };
@@ -80,32 +79,33 @@ export default class SystemService {

  public async checkUpdate() {
    try {
-      const versionRegx = /.*export const version = \'(.*)\'\;/;
-      const logRegx = /.*export const changeLog = \`((.*\n.*)+)\`;/;
+      const currentVersionContent = await parseVersion(config.versionFile);

-      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
-      const currentVersion = currentVersionFile.match(versionRegx)![1];
-
-      let lastVersion = '';
-      let lastLog = '';
+      let lastVersionContent;
      try {
-        const result = await got.get(config.lastVersionFile, {
-          timeout: 6000,
-          retry: 0,
-        });
-        const lastVersionFileContent = result.body;
-        lastVersion = lastVersionFileContent.match(versionRegx)![1];
-        lastLog = lastVersionFileContent.match(logRegx)
-          ? lastVersionFileContent.match(logRegx)![1]
-          : '';
+        const result = await got.get(
+          `${config.lastVersionFile}?t=${Date.now()}`,
+          {
+            timeout: 30000,
+          },
+        );
+        lastVersionContent = await parseContentVersion(result.body);
      } catch (error) {}

+      if (!lastVersionContent) {
+        lastVersionContent = currentVersionContent;
+      }
+
      return {
        code: 200,
        data: {
-          hasNewVersion: this.checkHasNewVersion(currentVersion, lastVersion),
-          lastVersion,
-          lastLog,
+          hasNewVersion: this.checkHasNewVersion(
+            currentVersionContent.version,
+            lastVersionContent.version,
+          ),
+          lastVersion: lastVersionContent.version,
+          lastLog: lastVersionContent.changeLog,
+          lastLogLink: lastVersionContent.changeLogLink,
        },
      };
    } catch (error: any) {
@@ -138,10 +138,6 @@ export default class SystemService {
  public async updateSystem() {
    const cp = spawn('ql -l update', { shell: '/bin/bash' });

-    this.sockService.sendMessage({
-      type: 'updateSystemVersion',
-      message: `开始更新系统`,
-    });
    cp.stdout.on('data', (data) => {
      this.sockService.sendMessage({
        type: 'updateSystemVersion',
@@ -3,7 +3,6 @@ import winston from 'winston';
 import { createRandomString, getNetIp, getPlatform } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
-import _ from 'lodash';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
@@ -65,32 +64,37 @@ export default class UserService {
        return this.initAuthInfo();
      }

-      if (retries > 2 && Date.now() - lastlogon < Math.pow(3, retries) * 1000) {
+      const retriesTime = Math.pow(3, retries) * 1000;
+      if (retries > 2 && timestamp - lastlogon < retriesTime) {
+        const waitTime = Math.ceil(
+          (retriesTime - (timestamp - lastlogon)) / 1000,
+        );
        return {
          code: 410,
-          message: `失败次数过多，请${Math.round(
-            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
-          )}秒后重试`,
-          data: Math.round(
-            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
-          ),
+          message: `失败次数过多，请${waitTime}秒后重试`,
+          data: waitTime,
+        };
+      }
+
+      if (
+        username === cUsername &&
+        password === cPassword &&
+        twoFactorActivated &&
+        needTwoFactor
+      ) {
+        this.updateAuthInfo(content, {
+          isTwoFactorChecking: true,
+        });
+        return {
+          code: 420,
+          message: '',
        };
      }

      const { ip, address } = await getNetIp(req);
      if (username === cUsername && password === cPassword) {
-        if (twoFactorActivated && needTwoFactor) {
-          this.updateAuthInfo(content, {
-            isTwoFactorChecking: true,
-          });
-          return {
-            code: 420,
-            message: '请输入两步验证token',
-          };
-        }
-
        const data = createRandomString(50, 100);
-        const expiration = twoFactorActivated ? 30 : 3;
+        const expiration = twoFactorActivated ? 60 : 20;
        let token = jwt.sign({ data }, config.secret as any, {
          expiresIn: 60 * 60 * 24 * expiration,
          algorithm: 'HS384',
@@ -155,7 +159,16 @@ export default class UserService {
            status: LoginStatus.fail,
          },
        });
-        return { code: 400, message: config.authError };
+        if (retries > 2) {
+          const waitTime = Math.round(Math.pow(3, retries + 1));
+          return {
+            code: 410,
+            message: `失败次数过多，请${waitTime}秒后重试`,
+            data: waitTime,
+          };
+        } else {
+          return { code: 400, message: config.authError };
+        }
      }
    } else {
      return this.initAuthInfo();
@@ -5,6 +5,7 @@ import LoggerInstance from './loaders/logger';
 import fs from 'fs';
 import config from './config';
 import path from 'path';
+import os from 'os';

 const tokenFile = path.join(config.configPath, 'token.json');

@@ -25,9 +26,14 @@ async function getToken() {

 async function writeFile(data: any) {
  return new Promise<void>((resolve, reject) => {
-    fs.writeFile(tokenFile, JSON.stringify(data), { encoding: 'utf8' }, () => {
-      resolve();
-    });
+    fs.writeFile(
+      tokenFile,
+      `${JSON.stringify(data)}${os.EOL}`,
+      { encoding: 'utf8' },
+      () => {
+        resolve();
+      },
+    );
  });
 }

@@ -1,4 +1,4 @@
-FROM python:alpine
+FROM python:3.10-alpine

 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -4,6 +4,8 @@ dir_shell=/ql/shell
 . $dir_shell/share.sh
 link_shell

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

 echo -e "======================2. 安装依赖========================\n"
@@ -38,13 +42,13 @@ echo -e "定时任务启动成功...\n"

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

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

@@ -2,16 +2,16 @@
  "private": true,
  "scripts": {
    "start": "concurrently -n w: npm:start:*",
-    "start:front": "umi dev",
+    "start:front": "max dev",
    "start:back": "nodemon",
-    "start:public": "ts-node back/public.ts",
-    "build:front": "umi build",
+    "start:public": "ts-node --transpile-only ./back/public.ts",
+    "build:front": "max build",
    "build:back": "tsc -p tsconfig.back.json",
    "panel": "npm run build:back && node static/build/app.js",
    "schedule": "npm run build:back && node static/build/schedule.js",
    "public": "npm run build:back && node static/build/public.js",
    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "postinstall": "umi generate tmp 2>/dev/null || true",
+    "postinstall": "max setup 2>/dev/null || true",
    "test": "umi-test",
    "test:coverage": "umi-test --coverage"
  },
@@ -28,16 +28,33 @@
  },
  "pnpm": {
    "peerDependencyRules": {
+      "ignoreMissing": [
+        "react",
+        "react-dom",
+        "antd",
+        "dva",
+        "postcss",
+        "webpack",
+        "eslint",
+        "stylelint",
+        "redux",
+        "@babel/core",
+        "monaco-editor",
+        "rc-field-form",
+        "@types/lodash.merge",
+        "rollup"
+      ],
      "allowedVersions": {
-        "react": "17",
-        "react-dom": "17"
+        "react": "18",
+        "react-dom": "18",
+        "dva-core": "2"
      }
    }
  },
  "dependencies": {
    "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^7.0.0",
-    "@sentry/tracing": "^7.0.0",
+    "@sentry/node": "^7.12.1",
+    "@sentry/tracing": "^7.12.1",
    "body-parser": "^1.19.2",
    "celebrate": "^15.0.1",
    "chokidar": "^3.5.3",
@@ -48,18 +65,20 @@
    "express": "^4.17.3",
    "express-jwt": "^6.1.1",
    "express-urlrewrite": "^1.4.0",
+    "form-data": "^4.0.0",
    "got": "^11.8.2",
    "hpagent": "^0.1.2",
    "iconv-lite": "^0.6.3",
+    "js-yaml": "^4.1.0",
    "jsonwebtoken": "^8.5.1",
    "lodash": "^4.17.21",
    "multer": "^1.4.4",
    "nedb": "^1.8.0",
    "node-schedule": "^2.1.0",
    "nodemailer": "^6.7.2",
-    "p-queue": "7.2.0",
+    "pstree.remy": "^1.1.8",
    "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.20.1",
+    "sequelize": "^6.25.5",
    "serve-handler": "^6.1.3",
    "sockjs": "^0.3.24",
    "sqlite3": "npm:@louislam/sqlite3@^15.0.6",
@@ -72,54 +91,54 @@
  "devDependencies": {
    "@ant-design/icons": "^4.7.0",
    "@ant-design/pro-layout": "^6.33.1",
-    "@monaco-editor/react": "^4.3.1",
-    "@sentry/react": "^7.0.0",
+    "@monaco-editor/react": "4.2.1",
+    "@react-hook/resize-observer": "^1.2.6",
+    "@sentry/react": "^7.12.1",
    "@types/body-parser": "^1.19.2",
    "@types/cors": "^2.8.12",
    "@types/express": "^4.17.13",
    "@types/express-jwt": "^6.0.4",
+    "@types/js-yaml": "^4.0.5",
    "@types/jsonwebtoken": "^8.5.8",
-    "@types/lodash": "^4.14.179",
+    "@types/lodash": "^4.14.185",
    "@types/multer": "^1.4.7",
    "@types/nedb": "^1.8.12",
    "@types/node": "^17.0.21",
    "@types/node-schedule": "^1.3.2",
    "@types/nodemailer": "^6.4.4",
    "@types/qrcode.react": "^1.0.2",
-    "@types/react": "^17.0.39",
-    "@types/react-dom": "^17.0.13",
+    "@types/react": "^18.0.20",
+    "@types/react-dom": "^18.0.6",
    "@types/serve-handler": "^6.1.1",
    "@types/sockjs": "^0.3.33",
    "@types/sockjs-client": "^1.5.1",
    "@types/uuid": "^8.3.4",
-    "@umijs/plugin-antd": "^0.15.0",
-    "@umijs/plugin-esbuild": "^1.4.1",
+    "@umijs/max": "^4.0.21",
    "@umijs/ssr-darkreader": "^4.9.45",
-    "@umijs/test": "^3.5.21",
    "ansi-to-react": "^6.1.6",
-    "antd": "^4.20.5",
+    "antd": "^4.23.0",
    "antd-img-crop": "^4.2.3",
    "codemirror": "^5.65.2",
    "compression-webpack-plugin": "9.2.0",
    "concurrently": "^7.0.0",
-    "lint-staged": "^12.3.4",
+    "lint-staged": "^13.0.3",
    "nodemon": "^2.0.15",
    "prettier": "^2.5.1",
    "qiniu": "^7.4.0",
    "qrcode.react": "^1.0.1",
+    "query-string": "^7.1.1",
    "rc-tween-one": "^3.0.6",
-    "react": "17.x",
+    "react": "18.2.0",
    "react-codemirror2": "^7.2.1",
    "react-diff-viewer": "^3.1.1",
    "react-dnd": "^14.0.2",
    "react-dnd-html5-backend": "^14.0.0",
-    "react-dom": "17.x",
+    "react-dom": "18.2.0",
    "react-split-pane": "^0.1.92",
    "sockjs-client": "^1.6.0",
    "ts-node": "^10.6.0",
    "tslib": "^2.4.0",
-    "typescript": "^4.6.2",
-    "umi": "^3.5.21",
+    "typescript": "4.8.4",
    "umi-request": "^1.4.0",
    "vh-check": "^2.0.5",
    "webpack": "^5.70.0",
@@ -16,9 +16,14 @@ DefaultCronRule=""
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
 RepoFileExtensions="js py"

-## 代理地址，支持http/https/socks，例如 http://127.0.0.1:7890
+## 代理地址，支持HTTP/SOCK5，例如 http://127.0.0.1:7890
 ProxyUrl=""

+## 资源告警阙值，默认CPU 80%、内存80%、磁盘90%
+CpuWarn=80
+MemoryWarn=80
+DiskWarn=90
+
 ## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 CommandTimeoutTime="1h"

@@ -46,9 +51,12 @@ AutoStartBot=""
 ## 是否使用第三方bot，默认不使用，使用时填入仓库地址，存到ql/repo目录下，文件夹命名为diybot
 BotRepoUrl=""

-## 安装bot依赖时指定pip源，默认使用清华源，如不需要源，设置此参数为空
+## 安装python依赖时指定pip源
 PipMirror="https://pypi.doubanio.com/simple/"

+## 安装node依赖时指定npm源
+NpmMirror="https://registry.npmmirror.com"
+
 ## 通知环境变量
 ## 1. Server酱
 ## https://sct.ftqq.com
@@ -59,7 +67,7 @@ export PUSH_KEY=""
 ## 下方填写app提供的设备码，例如：https://api.day.app/123 那么此处的设备码就是123
 export BARK_PUSH=""
 ## 下方填写推送图标设置，自定义推送图标(需iOS15或以上)
-export BARK_ICON="http://qn.whyour.cn/logo.png"
+export BARK_ICON="https://qn.whyour.cn/logo.png"
 ## 下方填写推送声音设置，例如choo，具体值请在bark-推送铃声-查看所有铃声
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
@@ -137,4 +145,19 @@ export GOTIFY_PRIORITY=0
 ## deer_key 填写PushDeer的key
 export DEER_KEY=""

+## 12. Chat
+## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
+## chat_token 填写后面的token
+export CHAT_URL=""
+export CHAT_TOKEN=""
+
+## 13. aibotk
+## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
+## aibotk_key (必填)填写智能微秘书个人中心的apikey
+export AIBOTK_KEY=""
+## aibotk_type (必填)填写发送的目标 room 或 contact, 填其他的不生效
+export AIBOTK_TYPE=""
+## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
+export AIBOTK_NAME=""
+
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可
@@ -38,12 +38,19 @@ let SCKEY = '';
 //此处填你申请的PushDeer KEY.
 //(环境变量名 DEER_KEY)
 let PUSHDEER_KEY = '';
+let PUSHDEER_URL = '';
+
+// =======================================Synology Chat通知设置区域===========================================
+//此处填你申请的CHAT_URL与CHAT_TOKEN
+//(环境变量名 CHAT_URL CHAT_TOKEN)
+let CHAT_URL = '';
+let CHAT_TOKEN = '';

 // =======================================Bark App通知设置区域===========================================
 //此处填你BarkAPP的信息(IP/设备码，例如：https://api.day.app/XXXXXXXX)
 let BARK_PUSH = '';
 //BARK app推送图标,自定义推送图标(需iOS15或以上)
-let BARK_ICON = 'http://qn.whyour.cn/logo.png';
+let BARK_ICON = 'https://qn.whyour.cn/logo.png';
 //BARK app推送铃声,铃声列表去APP查看复制填写
 let BARK_SOUND = '';
 //BARK app推送消息的分组, 默认为"QingLong"
@@ -104,6 +111,20 @@ let PUSH_PLUS_USER = '';
 let QQ_SKEY = '';
 let QQ_MODE = '';

+// =======================================智能微秘书设置区域=======================================
+//官方文档：http://wechat.aibotk.com/docs/about
+//AIBOTK_KEY： 填写智能微秘书个人中心的apikey
+//AIBOTK_TYPE：填写发送的目标 room 或 contact, 填其他的不生效
+//AIBOTK_NAME: 填写群名或用户昵称，和上面的type类型要对应
+let AIBOTK_KEY = '';
+let AIBOTK_TYPE = '';
+let AIBOTK_NAME = '';
+
+// =======================================飞书机器人设置区域=======================================
+//官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
+//FSKEY 飞书机器人的 FSKEY
+let FSKEY = '';
+
 //==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
  GOTIFY_URL = process.env.GOTIFY_URL;
@@ -131,6 +152,15 @@ if (process.env.PUSH_KEY) {

 if (process.env.DEER_KEY) {
  PUSHDEER_KEY = process.env.DEER_KEY;
+  PUSHDEER_URL = process.env.DEER_URL;
+}
+
+if (process.env.CHAT_URL) {
+  CHAT_URL = process.env.CHAT_URL;
+}
+
+if (process.env.CHAT_TOKEN) {
+  CHAT_TOKEN = process.env.CHAT_TOKEN;
 }

 if (process.env.QQ_SKEY) {
@@ -206,6 +236,20 @@ if (process.env.PUSH_PLUS_TOKEN) {
 if (process.env.PUSH_PLUS_USER) {
  PUSH_PLUS_USER = process.env.PUSH_PLUS_USER;
 }
+
+if (process.env.AIBOTK_KEY) {
+  AIBOTK_KEY = process.env.AIBOTK_KEY;
+}
+if (process.env.AIBOTK_TYPE) {
+  AIBOTK_TYPE = process.env.AIBOTK_TYPE;
+}
+if (process.env.AIBOTK_NAME) {
+  AIBOTK_NAME = process.env.AIBOTK_NAME;
+}
+
+if (process.env.FSKEY) {
+  FSKEY = process.env.FSKEY;
+}
 //==========================云端环境变量的判断与接收=========================

 /**
@@ -239,6 +283,10 @@ async function sendNotify(
    iGotNotify(text, desp, params), //iGot
    gobotNotify(text, desp), //go-cqhttp
    gotifyNotify(text, desp), //gotify
+    ChatNotify(text, desp), //synolog chat
+    PushDeerNotify(text, desp), //PushDeer
+    aibotkNotify(text, desp), //智能微秘书
+    fsBotNotify(text, desp), //飞书机器人
  ]);
 }

@@ -279,7 +327,7 @@ function gotifyNotify(text, desp) {
  });
 }

-function gobotNotify(text, desp, time = 2100) {
+function gobotNotify(text, desp) {
  return new Promise((resolve) => {
    if (GOBOT_URL) {
      const options = {
@@ -290,38 +338,34 @@ function gobotNotify(text, desp, time = 2100) {
        },
        timeout,
      };
-      setTimeout(() => {
-        $.post(options, (err, resp, data) => {
-          try {
-            if (err) {
-              console.log('发送go-cqhttp通知调用API失败！！\n');
-              console.log(err);
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送go-cqhttp通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.retcode === 0) {
+              console.log('go-cqhttp发送通知消息成功🎉\n');
+            } else if (data.retcode === 100) {
+              console.log(`go-cqhttp发送通知消息异常: ${data.errmsg}\n`);
            } else {
-              data = JSON.parse(data);
-              if (data.retcode === 0) {
-                console.log('go-cqhttp发送通知消息成功🎉\n');
-              } else if (data.retcode === 100) {
-                console.log(`go-cqhttp发送通知消息异常: ${data.errmsg}\n`);
-              } else {
-                console.log(
-                  `go-cqhttp发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
+              console.log(`go-cqhttp发送通知消息异常\n${JSON.stringify(data)}`);
            }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
          }
-        });
-      }, time);
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
    } else {
      resolve();
    }
  });
 }

-function serverNotify(text, desp, time = 2100) {
+function serverNotify(text, desp) {
  return new Promise((resolve) => {
    if (SCKEY) {
      //微信server酱推送通知一个\n不会换行，需要两个\n才能换行，故做此替换
@@ -336,152 +380,104 @@ function serverNotify(text, desp, time = 2100) {
        },
        timeout,
      };
-      setTimeout(() => {
-        $.post(options, (err, resp, data) => {
-          try {
-            if (err) {
-              console.log('发送通知调用API失败！！\n');
-              console.log(err);
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            //server酱和Server酱·Turbo版的返回json格式不太一样
+            if (data.errno === 0 || data.data.errno === 0) {
+              console.log('server酱发送通知消息成功🎉\n');
+            } else if (data.errno === 1024) {
+              // 一分钟内发送相同的内容会触发
+              console.log(`server酱发送通知消息异常: ${data.errmsg}\n`);
            } else {
-              data = JSON.parse(data);
-              //server酱和Server酱·Turbo版的返回json格式不太一样
-              if (data.errno === 0 || data.data.errno === 0) {
-                console.log('server酱发送通知消息成功🎉\n');
-              } else if (data.errno === 1024) {
-                // 一分钟内发送相同的内容会触发
-                console.log(`server酱发送通知消息异常: ${data.errmsg}\n`);
-              } else {
-                console.log(
-                  `server酱发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
+              console.log(`server酱发送通知消息异常\n${JSON.stringify(data)}`);
            }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
          }
-        });
-      }, time);
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
    } else {
      resolve();
    }
  });
 }

-function PushDeerNotify(text, desp, time = 2100) {
+function PushDeerNotify(text, desp) {
  return new Promise((resolve) => {
    if (PUSHDEER_KEY) {
      // PushDeer 建议对消息内容进行 urlencode
      desp = encodeURI(desp);
      const options = {
-        url: `https://api2.pushdeer.com/message/push`,
+        url: PUSHDEER_URL || `https://api2.pushdeer.com/message/push`,
        body: `pushkey=${PUSHDEER_KEY}&text=${text}&desp=${desp}&type=markdown`,
        headers: {
          'Content-Type': 'application/x-www-form-urlencoded',
        },
        timeout,
      };
-      setTimeout(() => {
-        $.post(options, (err, resp, data) => {
-          try {
-            if (err) {
-              console.log('发送通知调用API失败！！\n');
-              console.log(err);
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            // 通过返回的result的长度来判断是否成功
+            if (
+              data.content.result.length !== undefined &&
+              data.content.result.length > 0
+            ) {
+              console.log('PushDeer发送通知消息成功🎉\n');
            } else {
-              data = JSON.parse(data);
-              // 通过返回的result的长度来判断是否成功
-              if (
-                data.content.result.length !== undefined &&
-                data.content.result.length > 0
-              ) {
-                console.log('PushDeer发送通知消息成功🎉\n');
-              } else {
-                console.log(
-                  `PushDeer发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
+              console.log(`PushDeer发送通知消息异常\n${JSON.stringify(data)}`);
            }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
          }
-        });
-      }, time);
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
    } else {
      resolve();
    }
  });
 }

-function CoolPush(text, desp) {
+function ChatNotify(text, desp) {
  return new Promise((resolve) => {
-    if (QQ_SKEY) {
-      let options = {
-        url: `https://push.xuthus.cc/${QQ_MODE}/${QQ_SKEY}`,
+    if (CHAT_URL && CHAT_TOKEN) {
+      // 对消息内容进行 urlencode
+      desp = encodeURI(desp);
+      const options = {
+        url: `${CHAT_URL}${CHAT_TOKEN}`,
+        body: `payload={"text":"${text}\n${desp}"}`,
        headers: {
-          'Content-Type': 'application/json',
+          'Content-Type': 'application/x-www-form-urlencoded',
        },
      };
-
-      // 已知敏感词
-      text = text.replace(/京豆/g, '豆豆');
-      desp = desp.replace(/京豆/g, '');
-      desp = desp.replace(/🐶/g, '');
-      desp = desp.replace(/红包/g, 'H包');
-
-      switch (QQ_MODE) {
-        case 'email':
-          options.json = {
-            t: text,
-            c: desp,
-          };
-          break;
-        default:
-          options.body = `${text}\n\n${desp}`;
-      }
-
-      let pushMode = function (t) {
-        switch (t) {
-          case 'send':
-            return '个人';
-          case 'group':
-            return 'QQ群';
-          case 'wx':
-            return '微信';
-          case 'ww':
-            return '企业微信';
-          case 'email':
-            return '邮件';
-          default:
-            return '未知方式';
-        }
-      };
-
      $.post(options, (err, resp, data) => {
        try {
          if (err) {
-            console.log(`发送${pushMode(QQ_MODE)}通知调用API失败！！\n`);
+            console.log('发送通知调用API失败！！\n');
            console.log(err);
          } else {
            data = JSON.parse(data);
-            if (data.code === 200) {
-              console.log(`酷推发送${pushMode(QQ_MODE)}通知消息成功🎉\n`);
-            } else if (data.code === 400) {
-              console.log(
-                `QQ酷推(Cool Push)发送${pushMode(QQ_MODE)}推送失败：${
-                  data.msg
-                }\n`,
-              );
-            } else if (data.code === 503) {
-              console.log(`QQ酷推出错，${data.message}：${data.data}\n`);
+            if (data.success) {
+              console.log('Chat发送通知消息成功🎉\n');
            } else {
-              console.log(`酷推推送异常: ${JSON.stringify(data)}`);
+              console.log(`Chat发送通知消息异常\n${JSON.stringify(data)}`);
            }
          }
        } catch (e) {
-          $.logErr(e, resp);
+          $.logErr(e);
        } finally {
          resolve(data);
        }
@@ -594,7 +590,7 @@ function ddBotNotify(text, desp) {
      json: {
        msgtype: 'text',
        text: {
-          content: ` ${text}\n\n${desp}`,
+          content: `${text}\n\n${desp}`,
        },
      },
      headers: {
@@ -661,7 +657,7 @@ function qywxBotNotify(text, desp) {
      json: {
        msgtype: 'text',
        text: {
-          content: ` ${text}\n\n${desp}`,
+          content: `${text}\n\n${desp}`,
        },
      },
      headers: {
@@ -928,6 +924,104 @@ function pushPlusNotify(text, desp) {
  });
 }

+function aibotkNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (AIBOTK_KEY && AIBOTK_TYPE && AIBOTK_NAME) {
+      let json = {};
+      let url = '';
+      switch (AIBOTK_TYPE) {
+        case 'room':
+          url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
+          json = {
+            apiKey: `${AIBOTK_KEY}`,
+            roomName: `${AIBOTK_NAME}`,
+            message: {
+              type: 1,
+              content: `【青龙快讯】\n\n${text}\n${desp}`,
+            },
+          };
+          break;
+        case 'contact':
+          url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
+          json = {
+            apiKey: `${AIBOTK_KEY}`,
+            name: `${AIBOTK_NAME}`,
+            message: {
+              type: 1,
+              content: `【青龙快讯】\n\n${text}\n${desp}`,
+            },
+          };
+          break;
+      }
+      const options = {
+        url: url,
+        json,
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        timeout,
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('智能微秘书发送通知消息失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.code === 0) {
+              console.log('智能微秘书发送通知消息成功🎉。\n');
+            } else {
+              console.log(`${data.error}\n`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
+function fsBotNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (FSKEY) {
+      const options = {
+        url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
+        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        timeout,
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.StatusCode === 0) {
+              console.log('飞书发送通知消息成功🎉\n');
+            } else {
+              console.log(`${data.msg}\n`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
 module.exports = {
  sendNotify,
  BARK_PUSH,
@@ -61,7 +61,11 @@ push_config = {
    'PUSH_KEY': '',                     # server 酱的 PUSH_KEY，兼容旧版与 Turbo 版

    'DEER_KEY': '',                     # PushDeer 的 PUSHDEER_KEY
-    
+    'DEER_URL': '',                     # PushDeer 的 PUSHDEER_URL
+  
+    'CHAT_URL': '',                     # synology chat url
+    'CHAT_TOKEN': '',                   # synology chat token
+  
    'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
    'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码

@@ -78,6 +82,10 @@ push_config = {
    'TG_PROXY_AUTH': '',                # tg 代理认证参数
    'TG_PROXY_HOST': '',                # tg 机器人的 TG_PROXY_HOST
    'TG_PROXY_PORT': '',                # tg 机器人的 TG_PROXY_PORT
+
+    'AIBOTK_KEY': '',                   # 智能微秘书 个人中心的apikey 文档地址：http://wechat.aibotk.com/docs/about
+    'AIBOTK_TYPE': '',                  # 智能微秘书 发送目标 room 或 contact
+    'AIBOTK_NAME': '',                  # 智能微秘书  发送群名 或者好友昵称和type要对应好
 }
 notify_function = []
 # fmt: on
@@ -273,14 +281,36 @@ def pushdeer(title: str, content: str) -> None:
    print("PushDeer 服务启动")
    data = {"text": title, "desp": content, "type": "markdown", "pushkey": push_config.get("DEER_KEY")}
    url = 'https://api2.pushdeer.com/message/push'
+    if push_config.get("DEER_URL"):
+      url = push_config.get("DEER_URL")
+      
    response = requests.post(url, data=data).json()
    
    if len(response.get("content").get("result")) > 0:
        print("PushDeer 推送成功！")
    else:
        print("PushDeer 推送失败！错误信息：", response)
-    

+        
+def chat(title: str, content: str) -> None:
+    """
+    通过Chat 推送消息
+    """
+    if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
+        print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
+        return
+    print("chat 服务启动")
+    data = 'payload=' + json.dumps({'text': title + '\n' + content})
+    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
+    response = requests.post(url, data=data)
+    
+    if response.status_code == 200:
+        print("Chat 推送成功！")
+    else:
+        print("Chat 推送失败！错误信息：", response)    
+
+        
+        
 def pushplus_bot(title: str, content: str) -> None:
    """
    通过 push+ 推送消息。
@@ -499,6 +529,39 @@ def telegram_bot(title: str, content: str) -> None:
        print("tg 推送失败！")


+def aibotk(title: str, content: str) -> None:
+    """
+    使用 智能微秘书 推送消息。
+    """
+    if not push_config.get("AIBOTK_KEY") or not push_config.get("AIBOTK_TYPE") or not push_config.get("AIBOTK_NAME"):
+        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
+        return
+    print("智能微秘书 服务启动")
+
+    if push_config.get("AIBOTK_TYPE") == 'room':
+        url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
+        data = {
+            "apiKey": push_config.get("AIBOTK_KEY"),
+            "roomName": push_config.get("AIBOTK_NAME"),
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+        }
+    else:
+        url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
+        data = {
+            "apiKey": push_config.get("AIBOTK_KEY"),
+            "name": push_config.get("AIBOTK_NAME"),
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+        }
+    body = json.dumps(data).encode(encoding="utf-8")
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, data=body, headers=headers).json()
+    print(response)
+    if response["code"] == 0:
+        print("智能微秘书 推送成功！")
+    else:
+        print(f'智能微秘书 推送失败！{response["error"]}')
+
+
 def one() -> str:
    """
    获取一条一言。
@@ -527,6 +590,8 @@ if push_config.get("PUSH_KEY"):
    notify_function.append(serverJ)
 if push_config.get("DEER_KEY"):
    notify_function.append(pushdeer)
+if push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"):
+    notify_function.append(chat)
 if push_config.get("PUSH_PLUS_TOKEN"):
    notify_function.append(pushplus_bot)
 if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"):
@@ -537,6 +602,8 @@ if push_config.get("QYWX_KEY"):
    notify_function.append(wecom_bot)
 if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
    notify_function.append(telegram_bot)
+if push_config.get("AIBOTK_KEY") and push_config.get("AIBOTK_TYPE") and push_config.get("AIBOTK_NAME"):
+    notify_function.append(aibotk)    


 def send(title: str, content: str) -> None:
@@ -5,14 +5,14 @@ const envFound = dotenv.config();
 const accessKey = process.env.QINIU_AK;
 const secretKey = process.env.QINIU_SK;
 const mac = new qiniu.auth.digest.Mac(accessKey, secretKey);
-const key = 'version.ts';
+const key = 'version.yaml';
 const options = {
  scope: `${process.env.QINIU_SCOPE}:${key}`,
 };
 const putPolicy = new qiniu.rs.PutPolicy(options);
 const uploadToken = putPolicy.uploadToken(mac);

-const localFile = 'src/version.ts';
+const localFile = 'version.yaml';
 const config = new qiniu.conf.Config({ zone: qiniu.zone.Zone_z1 });
 const formUploader = new qiniu.form_up.FormUploader(config);
 const putExtra = new qiniu.form_up.PutExtra(
@@ -1,187 +1,196 @@
 #!/usr/bin/env bash

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

 add_cron_api() {
-    local currentTimeStamp=$(date +%s)
-    if [[ $# -eq 1 ]]; then
-        local schedule=$(echo "$1" | awk -F ":" '{print $1}')
-        local command=$(echo "$1" | awk -F ":" '{print $2}')
-        local name=$(echo "$1" | awk -F ":" '{print $3}')
-    else
-        local schedule=$1
-        local command=$2
-        local name=$3
-    fi
+  local currentTimeStamp=$(date +%s)
+  if [[ $# -eq 1 ]]; then
+    local schedule=$(echo "$1" | awk -F ":" '{print $1}')
+    local command=$(echo "$1" | awk -F ":" '{print $2}')
+    local name=$(echo "$1" | awk -F ":" '{print $3}')
+  else
+    local schedule=$1
+    local command=$2
+    local name=$3
+  fi

-    local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
-            -H "Accept: application/json" \
-            -H "Authorization: Bearer $token" \
-            -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
-            -H "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
-            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\"}" \
-            --compressed
-    )
-    code=$(echo $api | jq -r .code)
-    message=$(echo $api | jq -r .message)
-    if [[ $code == 200 ]]; then
-        echo -e "$name -> 添加成功"
-    else
-        echo -e "$name -> 添加失败(${message})"
-    fi
+  local api=$(
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+      -H "Accept: application/json" \
+      -H "Authorization: Bearer $token" \
+      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -H "Origin: http://0.0.0.0:5700" \
+      -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\"}" \
+      --compressed
+  )
+  code=$(echo $api | jq -r .code)
+  message=$(echo $api | jq -r .message)
+  if [[ $code == 200 ]]; then
+    echo -e "$name -> 添加成功"
+  else
+    echo -e "$name -> 添加失败(${message})"
+  fi
 }

 update_cron_api() {
-    local currentTimeStamp=$(date +%s)
-    if [[ $# -eq 1 ]]; then
-        local schedule=$(echo "$1" | awk -F ":" '{print $1}')
-        local command=$(echo "$1" | awk -F ":" '{print $2}')
-        local name=$(echo "$1" | awk -F ":" '{print $3}')
-        local id=$(echo "$1" | awk -F ":" '{print $4}')
-    else
-        local schedule=$1
-        local command=$2
-        local name=$3
-        local id=$4
-    fi
+  local currentTimeStamp=$(date +%s)
+  if [[ $# -eq 1 ]]; then
+    local schedule=$(echo "$1" | awk -F ":" '{print $1}')
+    local command=$(echo "$1" | awk -F ":" '{print $2}')
+    local name=$(echo "$1" | awk -F ":" '{print $3}')
+    local id=$(echo "$1" | awk -F ":" '{print $4}')
+  else
+    local schedule=$1
+    local command=$2
+    local name=$3
+    local id=$4
+  fi

-    local 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 "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
-            -H "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
-            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
-            --compressed
-    )
-    code=$(echo $api | jq -r .code)
-    message=$(echo $api | jq -r .message)
-    if [[ $code == 200 ]]; then
-        echo -e "$name -> 更新成功"
-    else
-        echo -e "$name -> 更新失败(${message})"
-    fi
+  local 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 "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -H "Origin: http://0.0.0.0:5700" \
+      -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
+      --compressed
+  )
+  code=$(echo $api | jq -r .code)
+  message=$(echo $api | jq -r .message)
+  if [[ $code == 200 ]]; then
+    echo -e "$name -> 更新成功"
+  else
+    echo -e "$name -> 更新失败(${message})"
+  fi
 }

 update_cron_command_api() {
-    local currentTimeStamp=$(date +%s)
-    if [[ $# -eq 1 ]]; then
-        local command=$(echo "$1" | awk -F ":" '{print $1}')
-        local id=$(echo "$1" | awk -F ":" '{print $2}')
-    else
-        local command=$1
-        local id=$2
-    fi
+  local currentTimeStamp=$(date +%s)
+  if [[ $# -eq 1 ]]; then
+    local command=$(echo "$1" | awk -F ":" '{print $1}')
+    local id=$(echo "$1" | awk -F ":" '{print $2}')
+  else
+    local command=$1
+    local id=$2
+  fi

-    local 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 "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
-            -H "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
-            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
-            --compressed
-    )
-    code=$(echo $api | jq -r .code)
-    message=$(echo $api | jq -r .message)
-    if [[ $code == 200 ]]; then
-        echo -e "$command -> 更新成功"
-    else
-        echo -e "$command -> 更新失败(${message})"
-    fi
+  local 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 "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -H "Origin: http://0.0.0.0:5700" \
+      -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
+      --compressed
+  )
+  code=$(echo $api | jq -r .code)
+  message=$(echo $api | jq -r .message)
+  if [[ $code == 200 ]]; then
+    echo -e "$command -> 更新成功"
+  else
+    echo -e "$command -> 更新失败(${message})"
+  fi
 }

 del_cron_api() {
-    local ids=$1
-    local currentTimeStamp=$(date +%s)
-    local 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 "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
-            -H "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
-            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "[$ids]" \
-            --compressed
-    )
-    code=$(echo $api | jq -r .code)
-    message=$(echo $api | jq -r .message)
-    if [[ $code == 200 ]]; then
-        echo -e "成功"
-    else
-        echo -e "失败(${message})"
-    fi
+  local ids=$1
+  local currentTimeStamp=$(date +%s)
+  local 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 "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -H "Origin: http://0.0.0.0:5700" \
+      -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      --data-raw "[$ids]" \
+      --compressed
+  )
+  code=$(echo $api | jq -r .code)
+  message=$(echo $api | jq -r .message)
+  if [[ $code == 200 ]]; then
+    echo -e "成功"
+  else
+    echo -e "失败(${message})"
+  fi
 }

 update_cron() {
-    local ids="$1"
-    local status="$2"
-    local pid="${3:-''}"
-    local logPath="$4"
-    local lastExecutingTime="${5:-0}"
-    local runningTime="${6:-0}"
-    local currentTimeStamp=$(date +%s)
-    local api=$(
-        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 "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
-            -H "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
-            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
-            --compressed
-    )
-    code=$(echo $api | jq -r .code)
-    message=$(echo $api | jq -r .message)
-    if [[ $code != 200 ]]; then
-        echo -e "\n## 更新任务状态失败(${message})\n" >> $dir_log/$log_path
-    fi
+  local ids="$1"
+  local status="$2"
+  local pid="${3:-''}"
+  local logPath="$4"
+  local lastExecutingTime="${5:-0}"
+  local runningTime="${6:-0}"
+  local currentTimeStamp=$(date +%s)
+  local api=$(
+    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 "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -H "Origin: http://0.0.0.0:5700" \
+      -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
+      --compressed
+  )
+  code=$(echo $api | jq -r .code)
+  message=$(echo $api | jq -r .message)
+  if [[ $code != 200 ]]; then
+    echo -e "\n## 更新任务状态失败(${message})\n" >>$dir_log/$log_path
+  fi
 }

 notify_api() {
-    local title=$1
-    local content=$2
-    local currentTimeStamp=$(date +%s)
-    local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
-            -X 'PUT' \
-            -H "Accept: application/json" \
-            -H "Authorization: Bearer $token" \
-            -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
-            -H "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
-            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
-            --compressed
-    )
-    code=$(echo $api | jq -r .code)
-    message=$(echo $api | jq -r .message)
-    if [[ $code == 200 ]]; then
-        echo -e "通知发送成功"
-    else
-        echo -e "通知失败(${message})"
-    fi
+  local title=$1
+  local content=$2
+  local currentTimeStamp=$(date +%s)
+  local api=$(
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
+      -X 'PUT' \
+      -H "Accept: application/json" \
+      -H "Authorization: Bearer $token" \
+      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -H "Origin: http://0.0.0.0:5700" \
+      -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
+      --compressed
+  )
+  code=$(echo $api | jq -r .code)
+  message=$(echo $api | jq -r .message)
+  if [[ $code == 200 ]]; then
+    echo -e "通知发送成功"
+  else
+    echo -e "通知失败(${message})"
+  fi
 }

 get_token
@@ -35,11 +35,10 @@ fi
 cp -f "$repo_path/jbot/requirements.txt" "$dir_data"

 cd $dir_data
-cat requirements.txt | while read LREAD
-do
-if [[ ! $(pip3 show "${LREAD%%=*}" 2>/dev/null) ]]; then
-  pip3 --default-timeout=100 install ${LREAD}
-fi
+cat requirements.txt | while read LREAD; do
+  if [[ ! $(pip3 show "${LREAD%%=*}" 2>/dev/null) ]]; then
+    pip3 --default-timeout=100 install ${LREAD}
+  fi
 done

 echo -e "\npython3依赖安装成功...\n"
@@ -87,10 +87,18 @@ check_pm2() {
  fi
 }

+start_public() {
+  echo -e "=====> 启动公开服务\n"
+  pm2 delete public --source-map-support --time &>/dev/null
+  pm2 start $dir_static/build/public.js -n public --source-map-support --time &>/dev/null
+}
+
 main() {
  echo -e "=====> 开始检测"
  npm i -g pnpm
  pnpm add -g pm2
+  patch_version
+  start_public
  copy_dep
  check_ql
  check_nginx
@@ -0,0 +1,279 @@
+#!/usr/bin/env bash
+
+## 导入通用变量与函数
+dir_shell=$QL_DIR/shell
+. $dir_shell/share.sh
+. $dir_shell/api.sh
+
+trap "single_hanle" 2 20 15 14
+single_hanle() {
+  handle_task_after "$@"
+  exit 1
+}
+
+random_delay() {
+  local random_delay_max=$RandomDelay
+  if [[ $random_delay_max ]] && [[ $random_delay_max -gt 0 ]]; then
+    local file_param=$1
+    local file_extensions=${RandomDelayFileExtensions-"js"}
+    local ignored_minutes=${RandomDelayIgnoredMinutes-"0 30"}
+
+    if [[ -n $file_extensions ]]; then
+      if ! echo "$file_param" | grep -qE "\.${file_extensions// /$|\\.}$"; then
+        # echo -e "\n当前文件需要准点运行, 放弃随机延迟\n"
+        return
+      fi
+    fi
+
+    local current_min
+    current_min=$(date "+%-M")
+    for minute in $ignored_minutes; do
+      if [[ $current_min -eq $minute ]]; then
+        # echo -e "\n当前时间需要准点运行, 放弃随机延迟\n"
+        return
+      fi
+    done
+
+    local delay_second=$(($(gen_random_num "$random_delay_max") + 1))
+    echo -e "\n命令未添加 \"now\"，随机延迟 $delay_second 秒后再执行任务，如需立即终止，请按 CTRL+C...\n"
+    sleep $delay_second
+  fi
+}
+
+## scripts目录下所有可运行脚本数组
+gen_array_scripts() {
+  local dir_current=$(pwd)
+  local i="-1"
+  cd $dir_scripts
+  for file in $(ls); do
+    if [[ -f $file ]] && [[ $file == *.js && $file != sendNotify.js ]]; then
+      let i++
+      array_scripts[i]=$(echo "$file" | perl -pe "s|$dir_scripts/||g")
+      array_scripts_name[i]=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1)
+      [[ -z ${array_scripts_name[i]} ]] && array_scripts_name[i]="<未识别出活动名称>"
+    fi
+  done
+  cd $dir_current
+}
+
+## 使用说明
+usage() {
+  gen_array_scripts
+  echo -e "task命令运行本程序自动添加进crontab的脚本，需要输入脚本的绝对路径或去掉 “$dir_scripts/” 目录后的相对路径（定时任务中请写作相对路径），用法为："
+  echo -e "1.$cmd_task <file_name>                                             # 依次执行，如果设置了随机延迟，将随机延迟一定秒数"
+  echo -e "2.$cmd_task <file_name> now                                         # 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日志，同时记录在日志文件中"
+  echo -e "3.$cmd_task <file_name> conc <环境变量名称> <账号编号，空格分隔>(可选的)  # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日志，直接记录在日志文件中，且可指定账号执行"
+  echo -e "4.$cmd_task <file_name> desi <环境变量名称> <账号编号，空格分隔>         # 指定账号执行，无论是否设置了随机延迟，均立即运行"
+  if [[ ${#array_scripts[*]} -gt 0 ]]; then
+    echo -e "\n当前有以下脚本可以运行:"
+    for ((i = 0; i < ${#array_scripts[*]}; i++)); do
+      echo -e "$(($i + 1)). ${array_scripts_name[i]}：${array_scripts[i]}"
+    done
+  else
+    echo -e "\n暂无脚本可以执行"
+  fi
+}
+
+## run nohup，$1：文件名，不含路径，带后缀
+run_nohup() {
+  local file_name=$1
+  nohup node $file_name &>$log_path &
+}
+
+check_server() {
+  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 ]] || [[ $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
+}
+
+handle_task_before() {
+  begin_time=$(format_time "$time_format" "$time")
+  begin_timestamp=$(format_timestamp "$time_format" "$time")
+
+  echo -e "## 开始执行... $begin_time\n"
+
+  [[ $is_macos -eq 0 ]] && check_server
+
+  if [[ -s $task_error_log_path ]]; then
+    eval cat $task_error_log_path $cmd
+    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
+    eval echo $cmd
+  fi
+
+  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
+  . $file_task_before "$@"
+}
+
+handle_task_after() {
+  . $file_task_after "$@"
+
+  local etime=$(date "+$time_format")
+  local end_time=$(format_time "$time_format" "$etime")
+  local end_timestamp=$(format_timestamp "$time_format" "$etime")
+  local diff_time=$(($end_timestamp - $begin_timestamp))
+
+  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+  echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒"
+  echo -e "\n　　　　　"
+}
+
+## 正常运行单个脚本，$1：传入参数
+run_normal() {
+  local file_param=$1
+  if [[ $# -eq 1 ]]; then
+    random_delay "$file_param"
+  fi
+
+  cd $dir_scripts
+  local relative_path="${file_param%/*}"
+  if [[ ${file_param} != /* ]] && [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+    cd ${relative_path}
+    file_param=${file_param/$relative_path\//}
+  fi
+
+  $timeoutCmd $which_program $file_param
+}
+
+## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
+run_concurrent() {
+  local file_param="$1"
+  local env_param="$2"
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
+  if [[ ! $env_param ]]; then
+    echo -e "\n 缺少并发运行的环境变量参数"
+    exit 1
+  fi
+
+  local envs=$(eval echo "\$${env_param}")
+  local array=($(echo $envs | sed 's/&/ /g'))
+  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=$(echo ${array_run[*]} | sed 's/\ /\&/g')
+  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+
+  local envs=$(eval echo "\$${env_param}")
+  local array=($(echo $envs | sed 's/&/ /g'))
+  single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
+
+  cd $dir_scripts
+  local relative_path="${file_param%/*}"
+  if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+    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 &>$single_log_path &
+  done
+
+  wait
+  for i in "${!array[@]}"; do
+    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
+    cat $single_log_path
+    [[ -f $single_log_path ]] && rm -f $single_log_path
+  done
+}
+
+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"
+    exit 1
+  fi
+
+  local envs=$(eval echo "\$${env_param}")
+  local array=($(echo $envs | sed 's/&/ /g'))
+  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=$(echo ${array_run[*]} | sed 's/\ /\&/g')
+  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+
+  cd $dir_scripts
+  local relative_path="${file_param%/*}"
+  if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+    cd ${relative_path}
+    file_param=${file_param/$relative_path\//}
+  fi
+  $timeoutCmd $which_program $file_param
+}
+
+## 运行其他命令
+run_else() {
+  local file_param="$1"
+
+  cd $dir_scripts
+  local relative_path="${file_param%/*}"
+  if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+    cd ${relative_path}
+    file_param=${file_param/$relative_path\//}
+  fi
+
+  shift
+
+  $timeoutCmd $which_program $file_param "$@"
+}
+
+## 命令检测
+main() {
+  if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
+    case $# in
+    1)
+      run_normal "$1"
+      ;;
+    *)
+      case $2 in
+      now)
+        run_normal "$1" "$2"
+        ;;
+      conc)
+        run_concurrent "$1" "$3" "$*"
+        ;;
+      desi)
+        run_designated "$1" "$3" "$*"
+        ;;
+      *)
+        run_else "$@"
+        ;;
+      esac
+      ;;
+    esac
+  elif [[ $# -eq 0 ]]; then
+    echo
+    usage
+  else
+    run_else "$@"
+  fi
+}
+
+handle_task_before "$@"
+main "$@"
+handle_task_after "$@"
@@ -13,7 +13,7 @@ git push
 echo -e "更新cdn文件"
 ts-node sample/tool.ts

-string=$(cat src/version.ts | grep "version" | egrep "[^\']*" -o | egrep "\d\.*")
+string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"
 echo -e "当前版本$version"

@@ -29,4 +29,4 @@ git tag -a "$version" -m "release $version"
 echo -e "提交tag"
 git push --tags

-echo -e "完成发布"
+echo -e "完成发布"
@@ -8,35 +8,35 @@ days=$1

 ## 删除运行js脚本的旧日志
 remove_js_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
-            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
-            [[ $diff_time -gt $((${days} * 86400)) ]] && rm -vf $log
-        fi
-    done
+  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
+      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
+      [[ $diff_time -gt $((${days} * 86400)) ]] && rm -vf $log
+    fi
+  done
 }

 ## 删除空文件夹
 remove_empty_dir() {
-    cd $dir_log
-    for dir in $(ls); do
-        if [[ -d $dir ]] && [[ -z $(ls $dir) ]]; then
-            rm -rf $dir
-        fi
-    done
+  cd $dir_log
+  for dir in $(ls); do
+    if [[ -d $dir ]] && [[ -z $(ls $dir) ]]; then
+      rm -rf $dir
+    fi
+  done
 }

 ## 运行
 if [[ ${days} ]]; then
-    echo -e "查找旧日志文件中...\n"
-    remove_js_log
-    remove_empty_dir
-    echo -e "删除旧日志执行完毕\n"
+  echo -e "查找旧日志文件中...\n"
+  remove_js_log
+  remove_empty_dir
+  echo -e "删除旧日志执行完毕\n"
 fi
@@ -50,379 +50,437 @@ list_own_drop=$dir_list_tmp/own_drop.list

 ## 软连接及其原始文件对应关系
 link_name=(
-    task
-    ql
+  task
+  ql
 )
 original_name=(
-    task.sh
-    update.sh
+  task.sh
+  update.sh
 )

 init_env() {
-    export 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
-    export PYTHONUNBUFFERED=1
+  export 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
+  export PYTHONUNBUFFERED=1
 }

 import_config() {
-    [[ -f $file_config_user ]] && . $file_config_user
-    [[ -f $file_env ]] && . $file_env
+  [[ -f $file_config_user ]] && . $file_config_user
+  [[ -f $file_env ]] && . $file_env

-    ql_base_url=${QlBaseUrl:-""}
-    command_timeout_time=${CommandTimeoutTime:-"1h"}
-    proxy_url=${ProxyUrl:-""}
-    file_extensions=${RepoFileExtensions:-"js py"}
-    current_branch=${QL_BRANCH}
+  ql_base_url=${QlBaseUrl:-""}
+  command_timeout_time=${CommandTimeoutTime:-"1h"}
+  proxy_url=${ProxyUrl:-""}
+  file_extensions=${RepoFileExtensions:-"js py"}
+  current_branch=${QL_BRANCH}

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

 set_proxy() {
-    if [[ $proxy_url ]]; then
-        export http_proxy="${proxy_url}"
-        export https_proxy="${proxy_url}"
-    fi
+  local proxy="$1"
+  if [[ $proxy ]]; then
+    proxy_url="$proxy"
+  fi
+  if [[ $proxy_url ]]; then
+    export http_proxy="${proxy_url}"
+    export https_proxy="${proxy_url}"
+  fi
 }

 unset_proxy() {
-    unset http_proxy
-    unset https_proxy
+  unset http_proxy
+  unset https_proxy
 }

 make_dir() {
-    local dir=$1
-    if [[ ! -d $dir ]]; then
-        mkdir -p $dir
-    fi
+  local dir=$1
+  if [[ ! -d $dir ]]; then
+    mkdir -p $dir
+  fi
 }

 detect_termux() {
-    if [[ $PATH == *com.termux* ]]; then
-        is_termux=1
-    else
-        is_termux=0
-    fi
+  if [[ $PATH == *com.termux* ]]; then
+    is_termux=1
+  else
+    is_termux=0
+  fi
 }

 detect_macos() {
-    [[ $(uname -s) == Darwin ]] && is_macos=1 || is_macos=0
+  [[ $(uname -s) == Darwin ]] && is_macos=1 || is_macos=0
 }

 gen_random_num() {
-    local divi=$1
-    echo $((${RANDOM} % $divi))
+  local divi=$1
+  echo $((${RANDOM} % $divi))
 }

 link_shell_sub() {
-    local link_path="$1"
-    local original_path="$2"
-    if [[ ! -L $link_path ]] || [[ $(readlink -f $link_path) != $original_path ]]; then
-        rm -f $link_path 2>/dev/null
-        ln -sf $original_path $link_path
-    fi
+  local link_path="$1"
+  local original_path="$2"
+  if [[ ! -L $link_path ]] || [[ $(readlink -f $link_path) != $original_path ]]; then
+    rm -f $link_path 2>/dev/null
+    ln -sf $original_path $link_path
+  fi
 }

 link_shell() {
-    if [[ $is_termux -eq 1 ]]; then
-        local path="/data/data/com.termux/files/usr/bin/"
-    elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
-        local path="/usr/local/bin/"
-    else
-        local path=""
-        echo -e "脚本功能受限，请自行添加命令的软连接...\n"
-    fi
-    if [[ $path ]]; then
-        for ((i = 0; i < ${#link_name[*]}; i++)); do
-            link_shell_sub "$path${link_name[i]}" "$dir_shell/${original_name[i]}"
-        done
-    fi
+  if [[ $is_termux -eq 1 ]]; then
+    local path="/data/data/com.termux/files/usr/bin/"
+  elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
+    local path="/usr/local/bin/"
+  else
+    local path=""
+    echo -e "脚本功能受限，请自行添加命令的软连接...\n"
+  fi
+  if [[ $path ]]; then
+    for ((i = 0; i < ${#link_name[*]}; i++)); do
+      link_shell_sub "$path${link_name[i]}" "$dir_shell/${original_name[i]}"
+    done
+  fi
 }

 define_cmd() {
-    local cmd_prefix cmd_suffix
-    if type task &>/dev/null; then
-        cmd_suffix=""
-        if [[ -f "$dir_shell/task.sh" ]]; then
-            cmd_prefix=""
-        else
-            cmd_prefix="bash "
-        fi
+  local cmd_prefix cmd_suffix
+  if type task &>/dev/null; then
+    cmd_suffix=""
+    if [[ -f "$dir_shell/task.sh" ]]; then
+      cmd_prefix=""
    else
-        cmd_suffix=".sh"
-        if [[ -f "$dir_shell/task.sh" ]]; then
-            cmd_prefix="$dir_shell/"
-        else
-            cmd_prefix="bash $dir_shell/"
-        fi
+      cmd_prefix="bash "
    fi
-    for ((i = 0; i < ${#link_name[*]}; i++)); do
-        export cmd_${link_name[i]}="${cmd_prefix}${link_name[i]}${cmd_suffix}"
-    done
+  else
+    cmd_suffix=".sh"
+    if [[ -f "$dir_shell/task.sh" ]]; then
+      cmd_prefix="$dir_shell/"
+    else
+      cmd_prefix="bash $dir_shell/"
+    fi
+  fi
+  for ((i = 0; i < ${#link_name[*]}; i++)); do
+    export cmd_${link_name[i]}="${cmd_prefix}${link_name[i]}${cmd_suffix}"
+  done
 }

 fix_config() {
-    make_dir $dir_static
-    make_dir $dir_data
-    make_dir $dir_config
-    make_dir $dir_log
-    make_dir $dir_db
-    make_dir $dir_scripts
-    make_dir $dir_list_tmp
-    make_dir $dir_repo
-    make_dir $dir_raw
-    make_dir $dir_update_log
-    make_dir $dir_dep
+  make_dir $dir_static
+  make_dir $dir_data
+  make_dir $dir_config
+  make_dir $dir_log
+  make_dir $dir_db
+  make_dir $dir_scripts
+  make_dir $dir_list_tmp
+  make_dir $dir_repo
+  make_dir $dir_raw
+  make_dir $dir_update_log
+  make_dir $dir_dep

-    if [[ ! -s $file_config_user ]]; then
-        echo -e "复制一份 $file_config_sample 为 $file_config_user，随后请按注释编辑你的配置文件：$file_config_user\n"
-        cp -fv $file_config_sample $file_config_user
-        echo
-    fi
+  if [[ ! -s $file_config_user ]]; then
+    echo -e "复制一份 $file_config_sample 为 $file_config_user，随后请按注释编辑你的配置文件：$file_config_user\n"
+    cp -fv $file_config_sample $file_config_user
+    echo
+  fi

-    if [[ ! -f $file_env ]]; then
-        echo -e "检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...\n"
-        touch $file_env
-        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
-        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
+    echo
+  fi

-    if [[ ! -f $file_task_after ]]; then
-        echo -e "复制一份 $file_task_sample 为 $file_task_after\n"
-        cp -fv $file_task_sample $file_task_after
-        echo
-    fi
+  if [[ ! -f $file_task_after ]]; then
+    echo -e "复制一份 $file_task_sample 为 $file_task_after\n"
+    cp -fv $file_task_sample $file_task_after
+    echo
+  fi

-    if [[ ! -f $file_extra_shell ]]; then
-        echo -e "复制一份 $file_extra_sample 为 $file_extra_shell\n"
-        cp -fv $file_extra_sample $file_extra_shell
-        echo
-    fi
+  if [[ ! -f $file_extra_shell ]]; then
+    echo -e "复制一份 $file_extra_sample 为 $file_extra_shell\n"
+    cp -fv $file_extra_sample $file_extra_shell
+    echo
+  fi

-    if [[ ! -s $file_auth_user ]]; then
-        echo -e "复制一份 $file_auth_sample 为 $file_auth_user\n"
-        cp -fv $file_auth_sample $file_auth_user
-        echo
-    fi
+  if [[ ! -s $file_auth_user ]]; then
+    echo -e "复制一份 $file_auth_sample 为 $file_auth_user\n"
+    cp -fv $file_auth_sample $file_auth_user
+    echo
+  fi

-    if [[ ! -s $file_notify_py ]]; then
-        echo -e "复制一份 $file_notify_py_sample 为 $file_notify_py\n"
-        cp -fv $file_notify_py_sample $file_notify_py
-        echo
-    fi
+  if [[ ! -s $file_notify_py ]]; then
+    echo -e "复制一份 $file_notify_py_sample 为 $file_notify_py\n"
+    cp -fv $file_notify_py_sample $file_notify_py
+    echo
+  fi

-    if [[ ! -s $file_notify_js ]]; then
-        echo -e "复制一份 $file_notify_js_sample 为 $file_notify_js\n"
-        cp -fv $file_notify_js_sample $file_notify_js
-        echo
-    fi
+  if [[ ! -s $file_notify_js ]]; then
+    echo -e "复制一份 $file_notify_js_sample 为 $file_notify_js\n"
+    cp -fv $file_notify_js_sample $file_notify_js
+    echo
+  fi

-    if [[ -s /etc/nginx/conf.d/default.conf ]]; then
-        echo -e "检测到默认nginx配置文件，清空...\n"
-        cat /dev/null >/etc/nginx/conf.d/default.conf
-        echo
-    fi
+  if [[ -s /etc/nginx/conf.d/default.conf ]]; then
+    echo -e "检测到默认nginx配置文件，清空...\n"
+    cat /dev/null >/etc/nginx/conf.d/default.conf
+    echo
+  fi

-    if [[ ! -s $dep_notify_js ]]; then
-        echo -e "复制一份 $file_notify_js_sample 为 $dep_notify_js\n"
-        cp -fv $file_notify_js_sample $dep_notify_js
-        echo
-    fi
+  if [[ ! -s $dep_notify_js ]]; then
+    echo -e "复制一份 $file_notify_js_sample 为 $dep_notify_js\n"
+    cp -fv $file_notify_js_sample $dep_notify_js
+    echo
+  fi

-    if [[ ! -s $dep_notify_py ]]; then
-        echo -e "复制一份 $file_notify_py_sample 为 $dep_notify_py\n"
-        cp -fv $file_notify_py_sample $dep_notify_py
-        echo
-    fi
+  if [[ ! -s $dep_notify_py ]]; then
+    echo -e "复制一份 $file_notify_py_sample 为 $dep_notify_py\n"
+    cp -fv $file_notify_py_sample $dep_notify_py
+    echo
+  fi

 }

 npm_install_sub() {
-    set_proxy
-    if [ $is_termux -eq 1 ]; then
-        npm install --production --no-bin-links --registry=https://registry.npmmirror.com || npm install --production --no-bin-links
-    elif ! type pnpm &>/dev/null; then
-        npm install --production --registry=https://registry.npmmirror.com || npm install --production
-    else
-        pnpm install --loglevel error --production --registry=https://registry.npmmirror.com || pnpm install --production --loglevel error
-    fi
-    unset_proxy
+  if [ $is_termux -eq 1 ]; then
+    npm install --production --no-bin-links
+  elif ! type pnpm &>/dev/null; then
+    npm install --production
+  else
+    pnpm install --loglevel error --production
+  fi
 }

 npm_install_1() {
-    local dir_current=$(pwd)
-    local dir_work=$1
+  local dir_current=$(pwd)
+  local dir_work=$1

-    cd $dir_work
-    echo -e "运行 npm install...\n"
-    npm_install_sub
-    [[ $? -ne 0 ]] && echo -e "\nnpm install 运行不成功，请进入 $dir_work 目录后手动运行 npm install...\n"
-    cd $dir_current
+  cd $dir_work
+  echo -e "运行 npm install...\n"
+  npm_install_sub
+  [[ $? -ne 0 ]] && echo -e "\nnpm install 运行不成功，请进入 $dir_work 目录后手动运行 npm install...\n"
+  cd $dir_current
 }

 npm_install_2() {
-    local dir_current=$(pwd)
-    local dir_work=$1
+  local dir_current=$(pwd)
+  local dir_work=$1

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

 diff_and_copy() {
-    local copy_source=$1
-    local copy_to=$2
-    if [[ ! -s $copy_to ]] || [[ $(diff $copy_source $copy_to) ]]; then
-        cp -f $copy_source $copy_to
-    fi
+  local copy_source=$1
+  local copy_to=$2
+  if [[ ! -s $copy_to ]] || [[ $(diff $copy_source $copy_to) ]]; then
+    cp -f $copy_source $copy_to
+  fi
 }

 update_depend() {
-    local dir_current=$(pwd)
+  local dir_current=$(pwd)

-    if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
-        cp -f $dir_sample/package.json $dir_scripts/package.json
-        npm_install_2 $dir_scripts
-    fi
+  if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+    cp -f $dir_sample/package.json $dir_scripts/package.json
+    npm_install_2 $dir_scripts
+  fi

-    cd $dir_current
+  cd $dir_current
 }

 git_clone_scripts() {
-    local url=$1
-    local dir=$2
-    local branch=$3
-    [[ $branch ]] && local part_cmd="-b $branch "
-    echo -e "开始克隆仓库 $url 到 $dir\n"
+  local url="$1"
+  local dir="$2"
+  local branch="$3"
+  local proxy="$4"
+  [[ $branch ]] && local part_cmd="-b $branch "
+  echo -e "开始克隆仓库 $url 到 $dir\n"

-    set_proxy
-    git clone $part_cmd $url $dir
-    exit_status=$?
-    unset_proxy
+  set_proxy "$proxy"
+  git clone $part_cmd $url $dir
+  exit_status=$?
+  unset_proxy
 }

 git_pull_scripts() {
-    local dir_current=$(pwd)
-    local dir_work="$1"
-    local branch="$2"
-    cd $dir_work
-    echo -e "开始更新仓库：$dir_work\n"
+  local dir_current=$(pwd)
+  local dir_work="$1"
+  local branch="$2"
+  local proxy="$3"
+  cd $dir_work
+  echo -e "开始更新仓库：$dir_work\n"

-    set_proxy
-    git fetch --all
-    exit_status=$?
-    git pull &>/dev/null
-    unset_proxy
-    reset_branch "$branch"
+  set_proxy "$proxy"
+  git fetch --all
+  exit_status=$?
+  git pull &>/dev/null
+  unset_proxy

-    cd $dir_current
+  cd $dir_current
 }

 reset_romote_url() {
-    local dir_current=$(pwd)
-    local dir_work=$1
-    local url=$2
-    local branch="$3"
+  local dir_current=$(pwd)
+  local dir_work=$1
+  local url=$2
+  local branch="$3"

-    if [[ -d "$dir_work/.git" ]]; then
-        cd $dir_work
-        [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
-        git remote set-url origin $url &>/dev/null
-
-        local part_cmd=""
-        reset_branch "$branch"
-        cd $dir_current
-    fi
+  cd $dir_work
+  if [[ -d "$dir_work/.git" ]]; then
+    [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
+    git remote set-url origin $url &>/dev/null
+  else
+    git init
+    git remote add origin $url &>/dev/null
+  fi
+  reset_branch "$branch"
+  cd $dir_current
 }

 reset_branch() {
-    local branch="$1"
-    if [[ $branch ]]; then
-        part_cmd="origin/${branch}"
-        git checkout -B "$branch"
-        git branch --set-upstream-to=$part_cmd $branch
-    fi
-    git reset --hard $part_cmd &>/dev/null
+  local branch="$1"
+  local part_cmd=""
+  if [[ $branch ]]; then
+    part_cmd="origin/${branch}"
+    git checkout -B "$branch" &>/dev/null
+    git branch --set-upstream-to=$part_cmd $branch &>/dev/null
+  fi
+  git reset --hard $part_cmd &>/dev/null
 }

 random_range() {
-    local beg=$1
-    local end=$2
-    echo $((RANDOM % ($end - $beg) + $beg))
+  local beg=$1
+  local end=$2
+  echo $((RANDOM % ($end - $beg) + $beg))
 }

 reload_pm2() {
-    pm2 l &>/dev/null
+  pm2 l &>/dev/null

-    echo -e "启动面板服务\n"
-    pm2 delete panel --source-map-support --time &>/dev/null
-    pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
+  echo -e "启动面板服务\n"
+  pm2 delete panel --source-map-support --time &>/dev/null
+  pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null

-    echo -e "启动定时任务服务\n"
-    pm2 delete schedule --source-map-support --time &>/dev/null
-    pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
-
-    echo -e "启动公开服务\n"
-    pm2 delete public --source-map-support --time &>/dev/null
-    pm2 start $dir_static/build/public.js -n public --source-map-support --time &>/dev/null
+  echo -e "启动定时任务服务\n"
+  pm2 delete schedule --source-map-support --time &>/dev/null
+  pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
 }

 diff_time() {
-    local format="$1"
-    local begin_time="$2"
-    local end_time="$3"
+  local format="$1"
+  local begin_time="$2"
+  local end_time="$3"

-    if [[ $is_macos -eq 1 ]]; then
-        diff_time=$(($(date -j -f "$format" "$end_time" +%s) - $(date -j -f "$format" "$begin_time" +%s)))
-    else
-        diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    fi
-    echo "$diff_time"
+  if [[ $is_macos -eq 1 ]]; then
+    diff_time=$(($(date -j -f "$format" "$end_time" +%s) - $(date -j -f "$format" "$begin_time" +%s)))
+  else
+    diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
+  fi
+  echo "$diff_time"
 }

 format_time() {
-    local format="$1"
-    local time="$2"
+  local format="$1"
+  local time="$2"

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

 format_log_time() {
-    local format="$1"
-    local time="$2"
+  local format="$1"
+  local time="$2"

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

 format_timestamp() {
-    local format="$1"
-    local time="$2"
+  local format="$1"
+  local time="$2"

-    if [[ $is_macos -eq 1 ]]; then
-        echo $(date -j -f "$format" "$time" "+%s")
-    else
-        echo $(date -d "$time" "+%s")
-    fi
+  if [[ $is_macos -eq 1 ]]; then
+    echo $(date -j -f "$format" "$time" "+%s")
+  else
+    echo $(date -d "$time" "+%s")
+  fi
+}
+
+patch_version() {
+  if [[ $PipMirror ]]; then
+    pip3 config set global.index-url $PipMirror
+  fi
+  if [[ $NpmMirror ]]; then
+    npm config set registry $NpmMirror
+  fi
+
+  # 兼容pnpm@7
+  pnpm setup &>/dev/null
+  source ~/.bashrc
+  pnpm install -g &>/dev/null
+
+  if [[ -f "$dir_root/db/cookie.db" ]]; then
+    echo -e "检测到旧的db文件，拷贝为新db...\n"
+    mv $dir_root/db/cookie.db $dir_root/db/env.db
+    rm -rf $dir_root/db/cookie.db
+    echo
+  fi
+
+  if ! type ts-node &>/dev/null; then
+    pnpm add -g ts-node typescript tslib
+  fi
+
+  git config --global pull.rebase false
+
+  cp -f $dir_root/.env.example $dir_root/.env
+
+  if [[ -d "$dir_root/db" ]]; then
+    echo -e "检测到旧的db目录，拷贝到data目录...\n"
+    cp -rf $dir_root/config $dir_root/data
+    echo
+  fi
+
+  if [[ -d "$dir_root/scripts" ]]; then
+    echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
+    cp -rf $dir_root/scripts $dir_root/data
+    echo
+  fi
+
+  if [[ -d "$dir_root/log" ]]; then
+    echo -e "检测到旧的log目录，拷贝到data目录...\n"
+    cp -rf $dir_root/log $dir_root/data
+    echo
+  fi
+
+  if [[ -d "$dir_root/config" ]]; then
+    echo -e "检测到旧的config目录，拷贝到data目录...\n"
+    cp -rf $dir_root/config $dir_root/data
+    echo
+  fi
 }

 init_env
@@ -431,4 +489,4 @@ detect_macos
 define_cmd
 fix_config

-import_config $1 >$task_error_log_path 2>&1
+import_config $1 2>$task_error_log_path
@@ -7,401 +7,81 @@ dir_shell=$QL_DIR/shell

 ## 选择python3还是node
 define_program() {
-    local file_param=$1
-    if [[ $file_param == *.js ]]; then
-        which_program="node"
-    elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
-        which_program="python3"
-    elif [[ $file_param == *.sh ]]; then
-        which_program="bash"
-    elif [[ $file_param == *.ts ]]; then
-        which_program="ts-node-transpile-only"
+  local file_param=$1
+  if [[ $file_param == *.js ]]; then
+    which_program="node"
+  elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
+    which_program="python3"
+  elif [[ $file_param == *.sh ]]; then
+    which_program="bash"
+  elif [[ $file_param == *.ts ]]; then
+    which_program="ts-node-transpile-only"
+  else
+    which_program=""
+  fi
+}
+
+handle_log_path() {
+  local file_param=$1
+
+  if [[ -z $file_param ]];then
+    file_param="task"
+  fi
+
+  local suffix=""
+  if [[ ! -z $ID ]]; then
+    suffix="_${ID}"
+  fi
+  time=$(date "+$time_format")
+  log_time=$(format_log_time "$time_format" "$time")
+  log_dir_tmp="${file_param##*/}"
+  if [[ $file_param =~ "/" ]]; then
+    if [[ $file_param == /* ]]; then
+      log_dir_tmp_path="${file_param:1}"
    else
-        which_program=""
+      log_dir_tmp_path="${file_param}"
    fi
+  fi
+  log_dir_tmp_path="${log_dir_tmp_path%/*}"
+  log_dir_tmp_path="${log_dir_tmp_path##*/}"
+  [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
+  log_dir="${log_dir_tmp%.*}${suffix}"
+  log_path="$log_dir/$log_time.log"
+  cmd=">> $dir_log/$log_path 2>&1"
+  [[ "$show_log" == "true" ]] && cmd=""
+  make_dir "$dir_log/$log_dir"
 }

-random_delay() {
-    local random_delay_max=$RandomDelay
-    if [[ $random_delay_max ]] && [[ $random_delay_max -gt 0 ]]; then
-        local file_param=$1
-        local file_extensions=${RandomDelayFileExtensions-"js"}
-        local ignored_minutes=${RandomDelayIgnoredMinutes-"0 30"}
-
-        if [[ -n $file_extensions ]]; then
-            if ! echo "$file_param" | grep -qE "\.${file_extensions// /$|\\.}$"; then
-                # echo -e "\n当前文件需要准点运行, 放弃随机延迟\n"
-                return
-            fi
-        fi
-
-        local current_min
-        current_min=$(date "+%-M")
-        for minute in $ignored_minutes; do
-            if [[ $current_min -eq $minute ]]; then
-                # echo -e "\n当前时间需要准点运行, 放弃随机延迟\n"
-                return
-            fi
-        done
-
-        local delay_second=$(($(gen_random_num "$random_delay_max") + 1))
-        echo -e "\n命令未添加 \"now\"，随机延迟 $delay_second 秒后再执行任务，如需立即终止，请按 CTRL+C...\n"
-        sleep $delay_second
-    fi
+format_params() {
+  time_format="%Y-%m-%d %H:%M:%S"
+  timeoutCmd=""
+  if type timeout &>/dev/null; then
+    timeoutCmd="timeout --foreground -s 14 -k 10s $command_timeout_time "
+  fi
+  params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
 }

-## scripts目录下所有可运行脚本数组
-gen_array_scripts() {
-    local dir_current=$(pwd)
-    local i="-1"
-    cd $dir_scripts
-    for file in $(ls); do
-        if [[ -f $file ]] && [[ $file == *.js && $file != sendNotify.js ]]; then
-            let i++
-            array_scripts[i]=$(echo "$file" | perl -pe "s|$dir_scripts/||g")
-            array_scripts_name[i]=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1)
-            [[ -z ${array_scripts_name[i]} ]] && array_scripts_name[i]="<未识别出活动名称>"
-        fi
-    done
-    cd $dir_current
-}
+while getopts ":lm:" opt; do
+  case $opt in
+  l)
+    show_log="true"
+    ;;
+  m)
+    max_time="$OPTARG"
+    ;;
+  esac
+done
+[[ $show_log ]] && shift $(($OPTIND - 1))
+if [[ $max_time ]]; then
+  shift $(($OPTIND - 1))
+  command_timeout_time="$max_time"
+fi

-## 使用说明
-usage() {
-    define_cmd
-    gen_array_scripts
-    echo -e "task命令运行本程序自动添加进crontab的脚本，需要输入脚本的绝对路径或去掉 “$dir_scripts/” 目录后的相对路径（定时任务中请写作相对路径），用法为："
-    echo -e "1.$cmd_task <file_name>                                             # 依次执行，如果设置了随机延迟，将随机延迟一定秒数"
-    echo -e "2.$cmd_task <file_name> now                                         # 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日志，同时记录在日志文件中"
-    echo -e "3.$cmd_task <file_name> conc <环境变量名称> <账号编号，空格分隔>(可选的)  # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日志，直接记录在日志文件中，且可指定账号执行"
-    echo -e "4.$cmd_task <file_name> desi <环境变量名称> <账号编号，空格分隔>         # 指定账号执行，无论是否设置了随机延迟，均立即运行"
-    if [[ ${#array_scripts[*]} -gt 0 ]]; then
-        echo -e "\n当前有以下脚本可以运行:"
-        for ((i = 0; i < ${#array_scripts[*]}; i++)); do
-            echo -e "$(($i + 1)). ${array_scripts_name[i]}：${array_scripts[i]}"
-        done
-    else
-        echo -e "\n暂无脚本可以执行"
-    fi
-}
+format_params "$@"
+define_program "$@"
+handle_log_path "$@"

-## run nohup，$1：文件名，不含路径，带后缀
-run_nohup() {
-    local file_name=$1
-    nohup node $file_name &>$log_path &
-}
-
-## 正常运行单个脚本，$1：传入参数
-run_normal() {
-    local file_param=$1
-    define_program "$file_param"
-    if [[ $# -eq 1 ]]; then
-        random_delay "$file_param"
-    fi
-
-    local time=$(date "+$time_format")
-    log_time=$(format_log_time "$time_format" "$time")
-    log_dir_tmp="${file_param##*/}"
-    if [[ $file_param =~ "/" ]]; then
-        if [[ $file_param == /* ]]; then
-            log_dir_tmp_path="${file_param:1}"
-        else
-            log_dir_tmp_path="${file_param}"
-        fi
-    fi
-    log_dir_tmp_path="${log_dir_tmp_path%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="${log_dir_tmp%.*}"
-    log_path="$log_dir/$log_time.log"
-    cmd=">> $dir_log/$log_path 2>&1"
-    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$dir_log/$log_dir"
-
-    local begin_time=$(format_time "$time_format" "$time")
-    local begin_timestamp=$(format_timestamp "$time_format" "$time")
-    
-    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-    local 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}')
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
-    eval . $file_task_before "$@" $cmd
-
-    cd $dir_scripts
-    local relative_path="${file_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
-        cd ${relative_path}
-        file_param=${file_param/$relative_path\//}
-    fi
-    
-    eval $timeoutCmd $which_program $file_param $cmd
-
-    eval . $file_task_after "$@" $cmd
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(expr $end_timestamp - $begin_timestamp)
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-}
-
-## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
-run_concurrent() {
-    local file_param="$1"
-    local env_param="$2"
-    local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
-    if [[ ! $env_param ]]; then
-        echo -e "\n 缺少并发运行的环境变量参数"
-        exit 1
-    fi
-
-    local envs=$(eval echo "\$${env_param}")
-    local array=($(echo $envs | sed 's/&/ /g'))
-    local tempArr=$(echo $num_param | 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=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
-
-    define_program "$file_param"
-    local time=$(date "+$time_format")
-    log_time=$(format_log_time "$time_format" "$time")
-    log_dir_tmp="${file_param##*/}"
-    if [[ $file_param =~ "/" ]]; then
-        if [[ $file_param == /* ]]; then
-            log_dir_tmp_path="${file_param:1}"
-        else
-            log_dir_tmp_path="${file_param}"
-        fi
-    fi
-    log_dir_tmp_path="${log_dir_tmp_path%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="${log_dir_tmp%.*}"
-    log_path="$log_dir/$log_time.log"
-    cmd=">> $dir_log/$log_path 2>&1"
-    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$dir_log/$log_dir"
-
-    local begin_time=$(format_time "$time_format" "$time")
-    local begin_timestamp=$(format_timestamp "$time_format" "$time")
-
-    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-    local 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}')
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
-    eval . $file_task_before "$@" $cmd
-
-    local envs=$(eval echo "\$${env_param}")
-    local array=($(echo $envs | sed 's/&/ /g'))
-    single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
-
-    cd $dir_scripts
-    local relative_path="${file_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
-        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 &>$single_log_path &
-    done
-
-    wait
-    for i in "${!array[@]}"; do
-        single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-        eval cat $single_log_path $cmd
-        [[ -f $single_log_path ]] && rm -f $single_log_path
-    done
-
-    eval . $file_task_after "$@" $cmd
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(( $end_timestamp - $begin_timestamp ))
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-}
-
-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"
-        exit 1
-    fi
-
-    define_program "$file_param"
-    local time=$(date "+$time_format")
-    log_time=$(format_log_time "$time_format" "$time")
-    log_dir_tmp="${file_param##*/}"
-    if [[ $file_param =~ "/" ]]; then
-        if [[ $file_param == /* ]]; then
-            log_dir_tmp_path="${file_param:1}"
-        else
-            log_dir_tmp_path="${file_param}"
-        fi
-    fi
-    log_dir_tmp_path="${log_dir_tmp_path%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="${log_dir_tmp%.*}"
-    log_path="$log_dir/$log_time.log"
-    cmd=">> $dir_log/$log_path 2>&1"
-    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$dir_log/$log_dir"
-
-    local begin_time=$(format_time "$time_format" "$time")
-    local begin_timestamp=$(format_timestamp "$time_format" "$time")
-
-    local envs=$(eval echo "\$${env_param}")
-    local array=($(echo $envs | sed 's/&/ /g'))
-    local tempArr=$(echo $num_param | 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=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
-
-    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-    local 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}')
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
-    eval . $file_task_before "$@" $cmd
-
-    cd $dir_scripts
-    local relative_path="${file_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
-        cd ${relative_path}
-        file_param=${file_param/$relative_path\//}
-    fi
-    eval $timeoutCmd $which_program $file_param $cmd
-
-    eval . $file_task_after "$@" $cmd
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(( $end_timestamp - $begin_timestamp ))
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-}
-
-## 运行其他命令
-run_else() {
-    local file_param="$1"
-    define_program "$file_param"
-    local time=$(date "+$time_format")
-    log_time=$(format_log_time "$time_format" "$time")
-    log_dir_tmp="${file_param##*/}"
-    if [[ $file_param =~ "/" ]]; then
-        if [[ $file_param == /* ]]; then
-            log_dir_tmp_path="${file_param:1}"
-        else
-            log_dir_tmp_path="${file_param}"
-        fi
-    fi
-    log_dir_tmp_path="${log_dir_tmp_path%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="${log_dir_tmp%.*}"
-    log_path="$log_dir/$log_time.log"
-    cmd=">> $dir_log/$log_path 2>&1"
-    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$dir_log/$log_dir"
-
-    local begin_time=$(format_time "$time_format" "$time")
-    local begin_timestamp=$(format_timestamp "$time_format" "$time")
-
-    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $@" | perl -pe "s|.*ID=(.*) $cmd_task $@\.*|\1|" | head -1 | awk -F " " '{print $1}')
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
-    eval . $file_task_before "$@" $cmd
-
-    cd $dir_scripts
-    local relative_path="${file_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
-        cd ${relative_path}
-        file_param=${file_param/$relative_path\//}
-    fi
-
-    shift
-    eval $timeoutCmd $which_program "$file_param" "$@" $cmd
-
-    eval . $file_task_after "$file_param" "$@" $cmd
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(( $end_timestamp - $begin_timestamp ))
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-}
-
-## 命令检测
-main() {
-    show_log="false"
-    while getopts ":l" opt
-    do
-        case $opt in
-            l)
-                show_log="true"
-                ;;
-        esac
-    done
-    [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
-
-    timeoutCmd=""
-    if type timeout &>/dev/null; then
-        timeoutCmd="timeout -k 10s $command_timeout_time "
-    fi
-
-    time_format="%Y-%m-%d %H:%M:%S"
-    if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
-        case $# in
-        1)
-            run_normal "$1"
-            ;;
-        *)
-            case $2 in
-            now)
-                run_normal "$1" "$2"
-                ;;
-            conc)
-                run_concurrent "$1" "$3" "$*"
-                ;;
-            desi)
-                run_designated "$1" "$3" "$*"
-                ;;
-            *)
-                run_else "$@"
-                ;;
-            esac
-            ;;
-        esac
-        [[ -f "$dir_log/$log_path" ]] && cat "$dir_log/$log_path"
-    elif [[ $# -eq 0 ]]; then
-        echo
-        usage
-    else
-        run_else "$@"
-    fi
-}
-
-main "$@"
+eval . $dir_shell/otask.sh "$params" "$cmd"
+[[ -f "$dir_log/$log_path" ]] && cat "$dir_log/$log_path"

 exit 0
@@ -8,544 +8,502 @@ send_mark=$dir_shell/send_mark

 ## 检测cron的差异，$1：脚本清单文件路径，$2：cron任务清单文件路径，$3：增加任务清单文件路径，$4：删除任务清单文件路径
 diff_cron() {
-    local list_scripts="$1"
-    local list_task="$2"
-    local list_add="$3"
-    local list_drop="$4"
-    if [[ -s $list_task ]] && [[ -s $list_scripts ]]; then
-        grep -vwf $list_task $list_scripts >$list_add
-        grep -vwf $list_scripts $list_task >$list_drop
-    fi
+  local list_scripts="$1"
+  local list_task="$2"
+  local list_add="$3"
+  local list_drop="$4"
+  if [[ -s $list_task ]] && [[ -s $list_scripts ]]; then
+    grep -vwf $list_task $list_scripts >$list_add
+    grep -vwf $list_scripts $list_task >$list_drop
+  fi

-    if [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
-        cp -f $list_scripts $list_add
-    fi
+  if [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
+    cp -f $list_scripts $list_add
+  fi

-    if [[ ! -s $list_scripts ]] && [[ -s $list_task ]]; then
-        cp -f $list_task $list_drop
-    fi
-}
-
-## 检测配置文件版本
-detect_config_version() {
-    ## 识别出两个文件的版本号
-    ver_config_sample=$(grep " Version: " $file_config_sample | perl -pe "s|.+v((\d+\.?){3})|\1|")
-    [[ -f $file_config_user ]] && ver_config_user=$(grep " Version: " $file_config_user | perl -pe "s|.+v((\d+\.?){3})|\1|")
-
-    ## 删除旧的发送记录文件
-    [[ -f $send_mark ]] && [[ $(cat $send_mark) != $ver_config_sample ]] && rm -f $send_mark
-
-    ## 识别出更新日期和更新内容
-    update_date=$(grep " Date: " $file_config_sample | awk -F ": " '{print $2}')
-    update_content=$(grep " Update Content: " $file_config_sample | awk -F ": " '{print $2}')
-
-    ## 如果是今天，并且版本号不一致，则发送通知
-    if [[ -f $file_config_user ]] && [[ $ver_config_user != $ver_config_sample ]] && [[ $update_date == $(date "+%Y-%m-%d") ]]; then
-        if [[ ! -f $send_mark ]]; then
-            local notify_title="配置文件更新通知"
-            local notify_content="更新日期: $update_date\n用户版本: $ver_config_user\n新的版本: $ver_config_sample\n更新内容: $update_content\n更新说明: 如需使用新功能请对照config.sample.sh，将相关新参数手动增加到你自己的config.sh中，否则请无视本消息。本消息只在该新版本配置文件更新当天发送一次。\n"
-            echo -e $notify_content
-            notify_api "$notify_title" "$notify_content"
-            [[ $? -eq 0 ]] && echo $ver_config_sample >$send_mark
-        fi
-    else
-        [[ -f $send_mark ]] && rm -f $send_mark
-    fi
+  if [[ ! -s $list_scripts ]] && [[ -s $list_task ]]; then
+    cp -f $list_task $list_drop
+  fi
 }

 ## 输出是否有新的或失效的定时任务，$1：新的或失效的任务清单文件路径，$2：新/失效
 output_list_add_drop() {
-    local list=$1
-    local type=$2
-    if [[ -s $list ]]; then
-        echo -e "检测到有$type的定时任务：\n"
-        cat $list
-        echo
-    fi
+  local list=$1
+  local type=$2
+  if [[ -s $list ]]; then
+    echo -e "检测到有$type的定时任务：\n"
+    cat $list
+    echo
+  fi
 }

 ## 自动删除失效的脚本与定时任务，需要：1.AutoDelCron 设置为 true；2.正常更新js脚本，没有报错；3.存在失效任务
 ## $1：失效任务清单文件路径
 del_cron() {
-    local list_drop=$1
-    local path=$2
-    local detail=""
-    local ids=""
-    echo -e "开始尝试自动删除失效的定时任务...\n"
-    for cron in $(cat $list_drop); do
-        local id=$(cat $list_crontab_user | grep -E "$cmd_task $cron" | perl -pe "s|.*ID=(.*) $cmd_task $cron\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
-        if [[ $ids ]]; then
-            ids="$ids,\"$id\""
-        else
-            ids="\"$id\""
-        fi
-        cron_file="$dir_scripts/${cron}"
-        if [[ -f $cron_file ]]; then
-            cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
-            rm -f $cron_file
-        fi
-        [[ -z $cron_name ]] && cron_name="$cron"
-        if [[ $detail ]]; then
-            detail="${detail}\n${cron_name}"
-        else
-            detail="${cron_name}"
-        fi
-    done
+  local list_drop=$1
+  local path=$2
+  local detail=""
+  local ids=""
+  echo -e "开始尝试自动删除失效的定时任务...\n"
+  for cron in $(cat $list_drop); do
+    local id=$(cat $list_crontab_user | grep -E "$cmd_task $cron" | perl -pe "s|.*ID=(.*) $cmd_task $cron\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
    if [[ $ids ]]; then
-        result=$(del_cron_api "$ids")
-        notify_api "$path 删除任务${result}" "$detail"
+      ids="$ids,\"$id\""
+    else
+      ids="\"$id\""
    fi
+    cron_file="$dir_scripts/${cron}"
+    if [[ -f $cron_file ]]; then
+      cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      rm -f $cron_file
+    fi
+    [[ -z $cron_name ]] && cron_name="$cron"
+    if [[ $detail ]]; then
+      detail="${detail}\n${cron_name}"
+    else
+      detail="${cron_name}"
+    fi
+  done
+  if [[ $ids ]]; then
+    result=$(del_cron_api "$ids")
+    notify_api "$path 删除任务${result}" "$detail"
+  fi
 }

 ## 自动增加定时任务，需要：1.AutoAddCron 设置为 true；2.正常更新js脚本，没有报错；3.存在新任务；4.crontab.list存在并且不为空
 ## $1：新任务清单文件路径
 add_cron() {
-    local list_add=$1
-    local path=$2
-    echo -e "开始尝试自动添加定时任务...\n"
-    local detail=""
-    cd $dir_scripts
-    for file in $(cat $list_add); do
-        local file_name=${file/${path}\//}
-        file_name=${file_name/${path}\_/}
-        if [[ -f $file ]]; then
-            cron_line=$(
-                perl -ne "{
+  local list_add=$1
+  local path=$2
+  echo -e "开始尝试自动添加定时任务...\n"
+  local detail=""
+  cd $dir_scripts
+  for file in $(cat $list_add); do
+    local file_name=${file/${path}\//}
+    file_name=${file_name/${path}\_/}
+    if [[ -f $file ]]; then
+      cron_line=$(
+        perl -ne "{
                        print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$file_name/
                    }" $file |
-                    perl -pe "{
+          perl -pe "{
                        s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$file_name.*|\1|g;
                        s|\*([\d\*])(.*)|\1\2|g;
                        s|  | |g;
                    }" | sort -u | head -1
-            )
-            cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
-            [[ -z $cron_name ]] && cron_name="$file_name"
-            [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
-            [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
-            [[ -z $cron_line ]] && cron_line="$default_cron"
-            result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name")
-            echo -e "$result"
-            if [[ $detail ]]; then
-                detail="${detail}${result}\n"
-            else
-                detail="${result}\n"
-            fi
-        fi
-    done
-    notify_api "$path 新增任务" "$detail"
+      )
+      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      [[ -z $cron_name ]] && cron_name="$file_name"
+      [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
+      [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
+      [[ -z $cron_line ]] && cron_line="$default_cron"
+      result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name")
+      echo -e "$result"
+      if [[ $detail ]]; then
+        detail="${detail}${result}\n"
+      else
+        detail="${result}\n"
+      fi
+    fi
+  done
+  notify_api "$path 新增任务" "$detail"
 }

 ## 更新仓库
 update_repo() {
-    local url="$1"
-    local path="$2"
-    local blackword="$3"
-    local dependence="$4"
-    local branch="$5"
-    local extensions="$6"
-    local tmp="${url%/*}"
-    local authorTmp1="${tmp##*/}"
-    local authorTmp2="${authorTmp1##*:}"
-    local author="${authorTmp2##*.}"
+  local url="$1"
+  local path="$2"
+  local blackword="$3"
+  local dependence="$4"
+  local branch="$5"
+  local extensions="$6"
+  local proxy="$7"
+  local tmp="${url%/*}"
+  local authorTmp1="${tmp##*/}"
+  local authorTmp2="${authorTmp1##*:}"
+  local author="${authorTmp2##*.}"

-    local repo_path="${dir_repo}/${uniq_path}"
+  local repo_path="${dir_repo}/${uniq_path}"

-    make_dir "${dir_scripts}/${uniq_path}"
+  make_dir "${dir_scripts}/${uniq_path}"

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

 ## 更新所有 raw 文件
 update_raw() {
-    echo -e "--------------------------------------------------------------\n"
-    local url="$1"
-    local raw_url="$url"
-    local suffix="${raw_url##*.}"
-    local raw_file_name="${uniq_path}.${suffix}"
-    echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"
+  echo -e "--------------------------------------------------------------\n"
+  local url="$1"
+  local raw_url="$url"
+  local suffix="${raw_url##*.}"
+  local raw_file_name="${uniq_path}.${suffix}"
+  echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"

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

-    if [[ $? -eq 0 ]]; then
-        mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
-        echo -e "下载 ${raw_file_name} 成功...\n"
-        cd $dir_raw
-        local filename="raw_${raw_file_name}"
-        local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task $filename" | perl -pe "s|.*ID=(.*) $cmd_task $filename\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
-        cp -f $raw_file_name $dir_scripts/${filename}
-        cron_line=$(
-            perl -ne "{
+  if [[ $? -eq 0 ]]; then
+    mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
+    echo -e "下载 ${raw_file_name} 成功...\n"
+    cd $dir_raw
+    local filename="raw_${raw_file_name}"
+    local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* $filename" | perl -pe "s|.*ID=(.*) $cmd_task.* $filename\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
+    cp -f $raw_file_name $dir_scripts/${filename}
+    cron_line=$(
+      perl -ne "{
                    print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
                }" $raw_file_name |
-                perl -pe "{
+        perl -pe "{
                    s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g;
                    s|\*([\d\*])(.*)|\1\2|g;
                    s|  | |g;
                }" | sort -u | head -1
-        )
-        cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
-        [[ -z $cron_name ]] && cron_name="$raw_file_name"
-        [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
-        [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
-        [[ -z $cron_line ]] && cron_line="$default_cron"
-        if [[ -z $cron_id ]]; then
-            result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
-            echo -e "$result\n"
-            notify_api "新增任务通知" "\n$result"
-            # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
-        fi
-    else
-        echo -e "下载 ${raw_file_name} 失败，保留之前正常下载的版本...\n"
-        [[ -f "$dir_raw/${raw_file_name}.new" ]] && rm -f "$dir_raw/${raw_file_name}.new"
+    )
+    cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+    [[ -z $cron_name ]] && cron_name="$raw_file_name"
+    [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
+    [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
+    [[ -z $cron_line ]] && cron_line="$default_cron"
+    if [[ -z $cron_id ]]; then
+      result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
+      echo -e "$result\n"
+      notify_api "新增任务通知" "\n$result"
+      # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
    fi
+  else
+    echo -e "下载 ${raw_file_name} 失败，保留之前正常下载的版本...\n"
+    [[ -f "$dir_raw/${raw_file_name}.new" ]] && rm -f "$dir_raw/${raw_file_name}.new"
+  fi

 }

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

 ## 脚本用法
 usage() {
-    echo -e "本脚本用法："
-    echo -e "1. $cmd_update update                                                                  # 更新并重启青龙"
-    echo -e "2. $cmd_update extra                                                                   # 运行自定义脚本"
-    echo -e "3. $cmd_update raw <fileurl>                                                           # 更新单个脚本文件"
-    echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch> <extensions>    # 更新单个仓库的脚本"
-    echo -e "5. $cmd_update rmlog <days>                                                            # 删除旧日志"
-    echo -e "6. $cmd_update bot                                                                     # 启动tg-bot"
-    echo -e "7. $cmd_update check                                                                   # 检测青龙环境并修复"
-    echo -e "8. $cmd_update resetlet                                                                # 重置登录错误次数"
-    echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
+  echo -e "ql命令使用方法："
+  echo -e "1. $cmd_update update                                                                  # 更新并重启青龙"
+  echo -e "2. $cmd_update extra                                                                   # 运行自定义脚本"
+  echo -e "3. $cmd_update raw <fileurl>                                                            # 更新单个脚本文件"
+  echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch> <extensions>    # 更新单个仓库的脚本"
+  echo -e "5. $cmd_update rmlog <days>                                                            # 删除旧日志"
+  echo -e "6. $cmd_update bot                                                                     # 启动tg-bot"
+  echo -e "7. $cmd_update check                                                                   # 检测青龙环境并修复"
+  echo -e "8. $cmd_update resetlet                                                                # 重置登录错误次数"
+  echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
 }

 ## 更新qinglong
 update_qinglong() {
-    patch_version
+  local mirror="github"
+  local githubStatus=$(curl -s -m 2 -IL "https://github.com" | grep 200)
+  if [ "$githubStatus" == "" ]; then
+    mirror="gitee"
+  fi
+  echo -e "\n使用 ${mirror} 源更新...\n"
+  export isFirstStartServer=false

-    local no_restart="$1"
-    local all_branch=$(git branch -a)
-    local primary_branch="master"
-    if [[ "${all_branch}" =~ "${current_branch}" ]]; then
-        primary_branch="${current_branch}"
-    fi
-    [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
-    reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" ${primary_branch}
-    git_pull_scripts $dir_root ${primary_branch}
+  local all_branch=$(cd ${dir_root} && git branch -a)
+  local primary_branch="master"
+  if [[ "${all_branch}" =~ "${current_branch}" ]]; then
+    primary_branch="${current_branch}"
+  fi
+  [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
+  reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
+  git_pull_scripts $dir_root ${primary_branch}

-    if [[ $exit_status -eq 0 ]]; then
-        echo -e "\n更新青龙源文件成功...\n"
-        cp -f $file_config_sample $dir_config/config.sample.sh
-        detect_config_version
-        update_depend
+  if [[ $exit_status -eq 0 ]]; then
+    echo -e "\n更新青龙源文件成功...\n"
+    cp -f $file_config_sample $dir_config/config.sample.sh
+    update_depend

-        [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
-        [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root
-    else
-        echo -e "\n更新青龙源文件失败，请检查原因...\n"
-    fi
-
-    local url="https://github.com/whyour/qinglong-static.git"
-    if [[ -d ${ql_static_repo}/.git ]]; then
-        reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
-        git_pull_scripts ${ql_static_repo} ${primary_branch}
-    else
-        git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
-    fi
-    if [[ $exit_status -eq 0 ]]; then
-        echo -e "\n更新青龙静态资源成功...\n"
-        local static_version=$(cat $dir_root/src/version.ts | perl -pe "s|.*\'(.*)\';\.*|\1|" | head -1)
-        echo -e "\n当前版本 $static_version...\n"
-        
-        rm -rf $dir_static/*
-        cp -rf $ql_static_repo/* $dir_static
-        if [[ $no_restart != "no-restart" ]]; then
-            nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
-            echo -e "重启面板中..."
-            sleep 3
-            reload_pm2
-        fi
-    else
-        echo -e "\n更新青龙静态资源失败，请检查原因...\n"
-    fi
+    [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
+    [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root

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

-patch_version() {
-    if [[ -f "$dir_root/db/cookie.db" ]]; then
-        echo -e "检测到旧的db文件，拷贝为新db...\n"
-        mv $dir_root/db/cookie.db $dir_root/db/env.db
-        rm -rf $dir_root/db/cookie.db
-        echo
+update_qinglong_static() {
+  local no_restart="$1"
+  local primary_branch="$2"
+  local url="https://${mirror}.com/whyour/qinglong-static.git"
+  if [[ -d ${ql_static_repo}/.git ]]; then
+    reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
+    git_pull_scripts ${ql_static_repo} ${primary_branch}
+  else
+    rm -rf ${ql_static_repo} &>/dev/null
+    git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
+  fi
+  if [[ $exit_status -eq 0 ]]; then
+    echo -e "\n更新青龙静态资源成功...\n"
+
+    rm -rf $dir_static/*
+    cp -rf $ql_static_repo/* $dir_static
+    if [[ $no_restart != "no-restart" ]]; then
+      nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
+      echo -e "重启面板中..."
+      sleep 3
+      reload_pm2
    fi
-
-    if ! type ts-node &>/dev/null; then
-        pnpm i -g ts-node typescript tslib
-    fi
-
-    # 兼容pnpm@7 
-    pnpm setup
-    source ~/.bashrc
-
-    git config --global pull.rebase false
-
-    cp -f $dir_root/.env.example $dir_root/.env
-
-    if [[ -d "$dir_root/db" ]]; then
-        echo -e "检测到旧的db目录，拷贝到data目录...\n"
-        cp -rf $dir_root/config $dir_root/data
-        echo
-    fi
-
-    if [[ -d "$dir_root/scripts" ]]; then
-        echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-        cp -rf $dir_root/scripts $dir_root/data
-        echo
-    fi
-
-    if [[ -d "$dir_root/log" ]]; then
-        echo -e "检测到旧的log目录，拷贝到data目录...\n"
-        cp -rf $dir_root/log $dir_root/data
-        echo
-    fi
-
-    if [[ -d "$dir_root/config" ]]; then
-        echo -e "检测到旧的config目录，拷贝到data目录...\n"
-        cp -rf $dir_root/config $dir_root/data
-        echo
-    fi
-
+  else
+    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+  fi
 }

 ## 对比脚本
 diff_scripts() {
-    local dir_current=$(pwd)
-    local repo_path="$1"
-    local author="$2"
-    local path="$3"
-    local blackword="$4"
-    local dependence="$5"
-    local extensions="$6"
+  local dir_current=$(pwd)
+  local repo_path="$1"
+  local author="$2"
+  local path="$3"
+  local blackword="$4"
+  local dependence="$5"
+  local extensions="$6"

-    gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions"
+  gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions"

-    local list_add="$dir_list_tmp/${uniq_path}_add.list"
-    local list_drop="$dir_list_tmp/${uniq_path}_drop.list"
-    diff_cron "$dir_list_tmp/${uniq_path}_scripts.list" "$dir_list_tmp/${uniq_path}_user.list" $list_add $list_drop
+  local list_add="$dir_list_tmp/${uniq_path}_add.list"
+  local list_drop="$dir_list_tmp/${uniq_path}_drop.list"
+  diff_cron "$dir_list_tmp/${uniq_path}_scripts.list" "$dir_list_tmp/${uniq_path}_user.list" $list_add $list_drop

-    if [[ -s $list_drop ]]; then
-        output_list_add_drop $list_drop "失效"
-        if [[ ${AutoDelCron} == true ]]; then
-            del_cron $list_drop $uniq_path
-        fi
+  if [[ -s $list_drop ]]; then
+    output_list_add_drop $list_drop "失效"
+    if [[ ${AutoDelCron} == true ]]; then
+      del_cron $list_drop $uniq_path
    fi
-    if [[ -s $list_add ]]; then
-        output_list_add_drop $list_add "新"
-        if [[ ${AutoAddCron} == true ]]; then
-            add_cron $list_add $uniq_path
-        fi
+  fi
+  if [[ -s $list_add ]]; then
+    output_list_add_drop $list_add "新"
+    if [[ ${AutoAddCron} == true ]]; then
+      add_cron $list_add $uniq_path
    fi
-    cd $dir_current
+  fi
+  cd $dir_current
 }

 ## 生成脚本的路径清单文件
 gen_list_repo() {
-    local dir_current=$(pwd)
-    local repo_path="$1"
-    local author="$2"
-    local path="$3"
-    local blackword="$4"
-    local dependence="$5"
+  local dir_current=$(pwd)
+  local repo_path="$1"
+  local author="$2"
+  local path="$3"
+  local blackword="$4"
+  local dependence="$5"

-    rm -f $dir_list_tmp/${uniq_path}*.list &>/dev/null
+  rm -f $dir_list_tmp/${uniq_path}*.list &>/dev/null

+  cd ${repo_path}
+
+  local cmd="find ."
+  local index=0
+  if [[ $6 ]]; then
+    file_extensions="$6"
+    if [[ $file_extensions =~ "|" ]]; then
+      file_extensions=$(echo $file_extensions | sed 's/|/ /g')
+    fi
+  fi
+  for extension in $file_extensions; do
+    if [[ $index -eq 0 ]]; then
+      cmd="${cmd} -name \"*.${extension}\""
+    else
+      cmd="${cmd} -o -name \"*.${extension}\""
+    fi
+    let index+=1
+  done
+  files=$(eval $cmd | sed 's/^..//')
+  if [[ $path ]]; then
+    files=$(echo "$files" | egrep $path)
+  fi
+  if [[ $blackword ]]; then
+    files=$(echo "$files" | egrep -v $blackword)
+  fi
+
+  cp -f $file_notify_js "${dir_scripts}/${uniq_path}"
+  cp -f $file_notify_py "${dir_scripts}/${uniq_path}"
+
+  if [[ $dependence ]]; then
    cd ${repo_path}
-
-    local cmd="find ."
-    local index=0
-    if [[ $6 ]]; then
-        file_extensions="$6"
-        if [[ $file_extensions =~ "|" ]]; then
-            file_extensions=$(echo $file_extensions | sed 's/|/ /g')
-        fi
-    fi
-    for extension in $file_extensions; do
-        if [[ $index -eq 0 ]]; then
-            cmd="${cmd} -name \"*.${extension}\""
-        else
-            cmd="${cmd} -o -name \"*.${extension}\""
-        fi
-        let index+=1
+    results=$(eval $cmd | sed 's/^..//' | egrep $dependence)
+    for _file in ${results}; do
+      file_path=$(dirname $_file)
+      make_dir "${dir_scripts}/${uniq_path}/${file_path}"
+      cp -f $_file "${dir_scripts}/${uniq_path}/${file_path}"
    done
-    files=$(eval $cmd | sed 's/^..//')
-    if [[ $path ]]; then
-        files=$(echo "$files" | egrep $path)
-    fi
-    if [[ $blackword ]]; then
-        files=$(echo "$files" | egrep -v $blackword)
-    fi
+  fi

-    cp -f $file_notify_js "${dir_scripts}/${uniq_path}"
-    cp -f $file_notify_py "${dir_scripts}/${uniq_path}"
+  if [[ -d $dir_dep ]]; then
+    cp -rf $dir_dep/* "${dir_scripts}/${uniq_path}" &>/dev/null
+  fi

-    if [[ $dependence ]]; then
-        cd ${repo_path}
-        results=$(eval $cmd | sed 's/^..//' | egrep $dependence)
-        for _file in ${results}; do
-            file_path=$(dirname $_file)
-            make_dir "${dir_scripts}/${uniq_path}/${file_path}"
-            cp -f $_file "${dir_scripts}/${uniq_path}/${file_path}"
-        done
-    fi
-    
-    if [[ -d $dir_dep ]]; then
-        cp -rf $dir_dep/* "${dir_scripts}/${uniq_path}" &>/dev/null
-    fi
-
-    for file in ${files}; do
-        filename=$(basename $file)
-        cp -f $file "$dir_scripts/${uniq_path}/${filename}"
-        echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
-        cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
-        if [[ $cron_id ]]; then
-            result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
-        fi
-    done
-    grep -E "${cmd_task} ${uniq_path}" ${list_crontab_user} | perl -pe "s|.*ID=(.*) ${cmd_task} (${uniq_path}.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${uniq_path}_user.list"
-    cd $dir_current
+  for file in ${files}; do
+    filename=$(basename $file)
+    cp -f $file "$dir_scripts/${uniq_path}/${filename}"
+    echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
+    # cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task.* ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
+    # if [[ $cron_id ]]; then
+    #   result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
+    # fi
+  done
+  grep -E "${cmd_task}.* ${uniq_path}" ${list_crontab_user} | perl -pe "s|.*ID=(.*) ${cmd_task}.* (${uniq_path}.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${uniq_path}_user.list"
+  cd $dir_current
 }

 get_uniq_path() {
-    local url="$1"
-    local branch="$2"
-    local urlTmp="${url%*/}"
-    local repoTmp="${urlTmp##*/}"
-    local repo="${repoTmp%.*}"
-    local tmp="${url%/*}"
-    local authorTmp1="${tmp##*/}"
-    local authorTmp2="${authorTmp1##*:}"
-    local author="${authorTmp2##*.}"
+  local url="$1"
+  local branch="$2"
+  local urlTmp="${url%*/}"
+  local repoTmp="${urlTmp##*/}"
+  local repo="${repoTmp%.*}"
+  local tmp="${url%/*}"
+  local authorTmp1="${tmp##*/}"
+  local authorTmp2="${authorTmp1##*:}"
+  local author="${authorTmp2##*.}"

-    uniq_path="${author}_${repo}"
-    [[ $branch ]] && uniq_path="${uniq_path}_${branch}"
+  uniq_path="${author}_${repo}"
+  [[ $branch ]] && uniq_path="${uniq_path}_${branch}"
 }

 main() {
-    ## for ql update
-    show_log="false"
-    while getopts ":l" opt
-    do
-        case $opt in
-            l)
-                show_log="true"
-                ;;
-        esac
-    done
-    [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
-
-    local p1=$1
-    local p2=$2
-    local p3=$3
-    local p4=$4
-    local p5=$5
-    local p6=$6
-    local p7=$7
-    local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    local log_path="$dir_log/update/${log_time}_$p1.log"
-    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-
-    case $p1 in
-    update)
-        cmd=">> $log_path 2>&1"
-        [[ "$show_log" == "true" ]] && cmd=""
-        eval echo -e "## 开始执行... $begin_time\n" $cmd
-        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-        eval update_qinglong "$2" $cmd
-        ;;
-    extra)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
-        run_extra_shell >>$log_path
-        ;;
-    repo)
-        get_uniq_path "$p2" "$p6"
-        if [[ -n $p2 ]]; then
-            update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7"
-        else
-            echo -e "命令输入错误...\n"
-            usage
-        fi
-        ;;
-    raw)
-        get_uniq_path "$p2"
-        if [[ -n $p2 ]]; then
-            update_raw "$p2"
-        else
-            echo -e "命令输入错误...\n"
-            usage
-        fi
-        ;;
-    rmlog)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
-        . $dir_shell/rmlog.sh "$p2" >>$log_path
-        ;;
-    bot)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
-        . $dir_shell/bot.sh >>$log_path
-        ;;
-    check)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
-        . $dir_shell/check.sh >>$log_path
-        ;;
-    resetlet)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
-        echo -e "重置登录错误次数成功 \n $auth_value" >>$log_path
-        echo "$auth_value" >$file_auth_user
-        ;;
-    resettfa)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
-        echo -e "禁用两步验证成功 \n $auth_value" >>$log_path
-        echo "$auth_value" >$file_auth_user
-        ;;
-    *)
-        echo -e "命令输入错误...\n"
-        usage
-        ;;
+  ## for ql update
+  show_log="false"
+  while getopts ":l" opt; do
+    case $opt in
+    l)
+      show_log="true"
+      ;;
    esac
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local diff_time=$(diff_time "%Y-%m-%d %H:%M:%S" "$begin_time" "$end_time")
-    if [[ $p1 != "repo" ]] && [[ $p1 != "raw" ]]; then
-        echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >>$log_path
-        cat $log_path
+  done
+  [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
+
+  local p1=$1
+  local p2=$2
+  local p3=$3
+  local p4=$4
+  local p5=$5
+  local p6=$6
+  local p7=$7
+  local log_dir="${p1}"
+  make_dir "$dir_log/$log_dir"
+  local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
+  local log_path="${log_dir}/${log_time}.log"
+  local file_path="$dir_log/$log_path"
+
+  cmd=">> $file_path 2>&1"
+  [[ "$show_log" == "true" ]] && cmd=""
+
+  local time_format="%Y-%m-%d %H:%M:%S"
+  local time=$(date "+$time_format")
+  local begin_timestamp=$(format_timestamp "$time_format" "$time")
+  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
+
+  local begin_time=$(format_time "$time_format" "$time")
+
+  if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
+    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+  fi
+
+  if [[ -s $task_error_log_path ]]; then
+    eval cat $task_error_log_path $cmd
+    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
+    eval echo $cmd
+  fi
+
+  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
+    eval echo -e "请移除 -l 参数" $cmd
+    exit 1
+  fi
+
+  case $p1 in
+  update)
+    eval update_qinglong "$2" $cmd
+    ;;
+  extra)
+    eval run_extra_shell $cmd
+    ;;
+  repo)
+    get_uniq_path "$p2" "$p6"
+    if [[ -n $p2 ]]; then
+      update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7" "$p8"
+    else
+      eval echo -e "命令输入错误...\\\n" $cmd
+      eval usage $cmd
    fi
+    ;;
+  raw)
+    get_uniq_path "$p2"
+    if [[ -n $p2 ]]; then
+      update_raw "$p2"
+    else
+      eval echo -e "命令输入错误...\\\n" $cmd
+      eval usage $cmd
+    fi
+    ;;
+  rmlog)
+    eval . $dir_shell/rmlog.sh "$p2" $cmd
+    ;;
+  bot)
+    eval . $dir_shell/bot.sh $cmd
+    ;;
+  check)
+    eval . $dir_shell/check.sh $cmd
+    ;;
+  resetlet)
+    auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
+    echo "$auth_value" >$file_auth_user
+    eval echo -e "重置登录错误次数成功" $cmd
+    ;;
+  resettfa)
+    auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
+    echo "$auth_value" >$file_auth_user
+    eval echo -e "禁用两步验证成功" $cmd
+    ;;
+  *)
+    eval echo -e "命令输入错误...\\\n" $cmd
+    eval usage $cmd
+    ;;
+  esac
+
+  local etime=$(date "+$time_format")
+  local end_time=$(format_time "$time_format" "$etime")
+  local end_timestamp=$(format_timestamp "$time_format" "$etime")
+  local diff_time=$(($end_timestamp - $begin_timestamp))
+  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+
+  if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
+    eval echo -e "\\\n　　　　　　　　　　" $cmd
+  fi
+
+  if [[ -f $file_path ]]; then
+    cat $file_path
+  fi
 }

 main "$@"
@@ -1,7 +1,7 @@
 import { createFromIconfontCN } from '@ant-design/icons';

 const IconFont = createFromIconfontCN({
-  scriptUrl: ['//at.alicdn.com/t/font_3354854_ds8pa06q1qa.js'],
+  scriptUrl: ['//at.alicdn.com/t/c/font_3354854_ob5y15ewlyq.js'],
 });

 export default IconFont;
@@ -50,6 +50,7 @@ const EditableTagGroup = ({
        {tag}
      </Tag>
    );
+
    return (
      <span key={tag} style={{ display: 'inline-block', marginBottom: 8 }}>
        {tagElem}
@@ -0,0 +1,48 @@
+import { useMemo, useState } from 'react';
+
+export default (
+  treeData: any[],
+  searchValue: string,
+  {
+    treeNodeFilterProp,
+  }: {
+    treeNodeFilterProp: string;
+  },
+) => {
+  return useMemo(() => {
+    const keys: string[] = [];
+
+    if (!searchValue) {
+      return { treeData, keys };
+    }
+
+    const upperStr = searchValue.toUpperCase();
+    function filterOptionFunc(_: string, dataNode: any[]) {
+      const value = dataNode[treeNodeFilterProp as any];
+
+      return String(value).toUpperCase().includes(upperStr);
+    }
+
+    function dig(list: any[], keepAll: boolean = false): any[] {
+      return list
+        .map((dataNode) => {
+          const children = dataNode.children;
+
+          const match = keepAll || filterOptionFunc!(searchValue, dataNode);
+          const childList = dig(children || [], match);
+
+          if (match || childList.length) {
+            childList.length && keys.push(dataNode.key);
+            return {
+              ...dataNode,
+              children: childList,
+            };
+          }
+          return null;
+        })
+        .filter((node) => node);
+    }
+
+    return { treeData: dig(treeData), keys };
+  }, [treeData, searchValue, treeNodeFilterProp]);
+};
@@ -0,0 +1,16 @@
+import { MutableRefObject, useLayoutEffect, useState } from 'react';
+import useResizeObserver from '@react-hook/resize-observer'
+import { getTableScroll } from '@/utils';
+
+export default <T extends HTMLElement>(target: MutableRefObject<T>, extraHeight?: number) => {
+  const [height, setHeight] = useState<number>()
+
+  useResizeObserver(target, (entry) => {
+    let _targe = entry.target as any
+    if (!_targe.classList.contains('ant-table-wrapper')) {
+      _targe = entry.target.querySelector('.ant-table-wrapper')
+    }
+    setHeight(getTableScroll({ extraHeight, target: _targe as HTMLElement }))
+  })
+  return height
+}
@@ -68,18 +68,18 @@ export default {
        icon: <IconFont type="ql-icon-dependence" />,
        component: '@/pages/dependence/index',
      },
+      {
+        path: '/log',
+        name: '日志管理',
+        icon: <IconFont type="ql-icon-log" />,
+        component: '@/pages/log/index',
+      },
      {
        path: '/diff',
        name: '对比工具',
        icon: <IconFont type="ql-icon-diff" />,
        component: '@/pages/diff/index',
      },
-      {
-        path: '/log',
-        name: '任务日志',
-        icon: <IconFont type="ql-icon-log" />,
-        component: '@/pages/log/index',
-      },
      {
        path: '/setting',
        name: '系统设置',
@@ -10,8 +10,8 @@
 }

 .ant-modal-body {
-  max-height: calc(85vh - 110px);
-  max-height: calc(85vh - var(--vh-offset, 110px));
+  max-height: calc(80vh - 110px);
+  max-height: calc(80vh - var(--vh-offset, 110px));
  overflow-y: auto;
 }

@@ -161,7 +161,7 @@
    &.env-wrapper,
    &.config-wrapper {
      .CodeMirror {
-        width: calc(100vw - 80px);
+        width: calc(100vw - 24px);
      }
    }
  }
@@ -179,8 +179,8 @@

 .Resizer {
  background: @component-background;
-  opacity: 0.2;
-  z-index: 1;
+  opacity: 0.8;
+  z-index: 100;
  -moz-box-sizing: border-box;
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
@@ -243,31 +243,29 @@
  font-size: 13px;
 }

-[data-dark='true'] {
-  /* Change autocomplete styles in WebKit */
-  input:-webkit-autofill,
-  input:-webkit-autofill:hover,
-  input:-webkit-autofill:focus,
-  textarea:-webkit-autofill,
-  textarea:-webkit-autofill:hover,
-  textarea:-webkit-autofill:focus,
-  select:-webkit-autofill,
-  select:-webkit-autofill:hover,
-  select:-webkit-autofill:focus {
-    border: 1px solid @border-color-base;
-    box-shadow: none;
-    transition: background-color 5000s ease-in-out 0s;
-    -webkit-text-fill-color: @text-color;
-    caret-color: #e8e6f3 !important;
-  }
+/* Change autocomplete styles in WebKit */
+input:-webkit-autofill,
+input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
+textarea:-webkit-autofill,
+textarea:-webkit-autofill:hover,
+textarea:-webkit-autofill:focus,
+select:-webkit-autofill,
+select:-webkit-autofill:hover,
+select:-webkit-autofill:focus {
+  box-shadow: none;
+  transition: background-color 5000s ease-in-out 0s;
+  -webkit-text-fill-color: @text-color;
+  caret-color: @text-color;
+  color: @text-color;
+}

-  ::placeholder {
-    opacity: 0.5 !important;
-  }
+::placeholder {
+  opacity: 0.5 !important;
+}

-  .ant-select-selection-placeholder {
-    opacity: 0.5 !important;
-  }
+.ant-select-selection-placeholder {
+  opacity: 0.5 !important;
 }

 .ant-pro-basicLayout-content {
@@ -326,10 +324,6 @@
  background-color: #373739;
 }

-.ant-layout-sider {
-  border-right: 1px solid rgba(0, 0, 0, 0.06) !important;
-}
-
 .ant-pro-sider-logo {
  padding: 16px 8px !important;

@@ -349,3 +343,8 @@
    width: auto !important;
  }
 }
+
+pre {
+  word-break: break-all !important;
+  white-space: break-spaces !important;
+}
@@ -2,7 +2,7 @@ import React, { useEffect, useState, useRef } from 'react';
 import ProLayout, { PageLoading } from '@ant-design/pro-layout';
 import * as DarkReader from '@umijs/ssr-darkreader';
 import defaultProps from './defaultProps';
-import { Link, history } from 'umi';
+import { Link, history, Outlet, useLocation } from '@umijs/max';
 import {
  LogoutOutlined,
  MenuFoldOutlined,
@@ -13,23 +13,59 @@ import config from '@/utils/config';
 import { request } from '@/utils/http';
 import './index.less';
 import vhCheck from 'vh-check';
-import { version, changeLogLink, changeLog } from '../version';
 import { useCtx, useTheme } from '@/utils/hooks';
-import { message, Badge, Modal, Avatar, Dropdown, Menu, Image } from 'antd';
+import {
+  message,
+  Badge,
+  Modal,
+  Avatar,
+  Dropdown,
+  Menu,
+  Image,
+  Popover,
+  Descriptions,
+  Tooltip,
+} from 'antd';
 // @ts-ignore
 import SockJS from 'sockjs-client';
 import * as Sentry from '@sentry/react';
 import { init } from '../utils/init';
+import 'codemirror/mode/javascript/javascript';
+import 'codemirror/mode/python/python';
+import 'codemirror/mode/shell/shell';

-export default function (props: any) {
+export interface SharedContext {
+  headerStyle: React.CSSProperties;
+  isPhone: boolean;
+  theme: 'vs' | 'vs-dark';
+  user: any;
+  reloadUser: (needLoading?: boolean) => void;
+  reloadTheme: () => void;
+  socketMessage: any;
+  systemInfo: TSystemInfo;
+}
+
+interface TSystemInfo {
+  branch: 'develop' | 'master';
+  isInitialized: boolean;
+  lastCommitId: string;
+  lastCommitTime: number;
+  version: string;
+  changeLog: string;
+  changeLogLink: string;
+}
+
+export default function () {
+  const location = useLocation();
  const ctx = useCtx();
  const { theme, reloadTheme } = useTheme();
  const [user, setUser] = useState<any>({});
  const [loading, setLoading] = useState<boolean>(true);
-  const [systemInfo, setSystemInfo] = useState<{ isInitialized: boolean }>();
+  const [systemInfo, setSystemInfo] = useState<TSystemInfo>();
  const ws = useRef<any>(null);
  const [socketMessage, setSocketMessage] = useState<any>();
  const [collapsed, setCollapsed] = useState(false);
+  const [initLoading, setInitLoading] = useState<boolean>(true);
  const {
    enable: enableDarkMode,
    disable: disableDarkMode,
@@ -53,17 +89,16 @@ export default function (props: any) {
          setSystemInfo(data);
          if (!data.isInitialized) {
            history.push('/initialization');
-            setLoading(false);
          } else {
+            init(data.version);
            getUser();
          }
-        } else {
-          message.error(data);
        }
      })
      .catch((error) => {
        console.log(error);
-      });
+      })
+      .finally(() => setInitLoading(false));
  };

  const getUser = (needLoading = true) => {
@@ -73,11 +108,9 @@ export default function (props: any) {
      .then(({ code, data }) => {
        if (code === 200 && data.username) {
          setUser(data);
-          if (props.location.pathname === '/') {
+          if (location.pathname === '/') {
            history.push('/crontab');
          }
-        } else {
-          message.error(data);
        }
        needLoading && setLoading(false);
      })
@@ -94,7 +127,7 @@ export default function (props: any) {
    if (systemInfo && systemInfo.isInitialized && !user) {
      getUser();
    }
-  }, [props.location.pathname]);
+  }, [location.pathname]);

  useEffect(() => {
    if (!systemInfo) {
@@ -112,7 +145,6 @@ export default function (props: any) {

  useEffect(() => {
    vhCheck();
-    init();

    const _theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
    if (typeof window === 'undefined') return;
@@ -136,9 +168,11 @@ export default function (props: any) {
  }, []);

  useEffect(() => {
-    if (!user) return;
+    if (!user || !user.username) return;
    ws.current = new SockJS(
-      `${location.origin}/api/ws?token=${localStorage.getItem(config.authKey)}`,
+      `${window.location.origin}/api/ws?token=${localStorage.getItem(
+        config.authKey,
+      )}`,
    );

    ws.current.onmessage = (e: any) => {
@@ -146,9 +180,9 @@ export default function (props: any) {
        const data = JSON.parse(e.data);
        if (data.type === 'ping') {
          if (data && data.message === 'hanhh') {
-            console.log('websocket连接成功', e);
+            console.log('WS connection succeeded !!!');
          } else {
-            console.log('websocket连接失败', e);
+            console.log('WS connection Failed !!!', e);
          }
        }
        setSocketMessage(data);
@@ -183,29 +217,31 @@ export default function (props: any) {
    };
  }, []);

-  if (
-    ['/login', '/initialization', '/error'].includes(props.location.pathname)
-  ) {
-    document.title = `${(config.documentTitleMap as any)[props.location.pathname]
-      } - 控制面板`;
-    if (
-      systemInfo?.isInitialized &&
-      props.location.pathname === '/initialization'
-    ) {
+  if (initLoading) {
+    return <PageLoading />;
+  }
+
+  if (['/login', '/initialization', '/error'].includes(location.pathname)) {
+    document.title = `${
+      (config.documentTitleMap as any)[location.pathname]
+    } - 控制面板`;
+    if (systemInfo?.isInitialized && location.pathname === '/initialization') {
      history.push('/crontab');
    }

-    if (systemInfo || props.location.pathname === '/error') {
-      return React.Children.map(props.children, (child) => {
-        return React.cloneElement(child, {
-          ...ctx,
-          theme,
-          user,
-          reloadUser,
-          reloadTheme,
-          ws: ws.current,
-        });
-      });
+    if (systemInfo || location.pathname === '/error') {
+      return (
+        <Outlet
+          context={{
+            ...ctx,
+            theme,
+            user,
+            reloadUser,
+            reloadTheme,
+            ws: ws.current,
+          }}
+        />
+      );
    }
  }

@@ -226,32 +262,38 @@ export default function (props: any) {
    <PageLoading />
  ) : (
    <ProLayout
-      selectedKeys={[props.location.pathname]}
+      selectedKeys={[location.pathname]}
      loading={loading}
      ErrorBoundary={Sentry.ErrorBoundary}
-      logo={<Image preview={false} src="http://qn.whyour.cn/logo.png" />}
+      logo={<Image preview={false} src="https://qn.whyour.cn/logo.png" />}
      title={
        <>
          <span style={{ fontSize: 16 }}>控制面板</span>
          <a
-            href={changeLogLink}
+            href={systemInfo?.changeLogLink}
            target="_blank"
            rel="noopener noreferrer"
            onClick={(e) => {
              e.stopPropagation();
            }}
          >
-            <span
-              style={{
-                fontSize: isFirefox ? 9 : 12,
-                color: '#666',
-                marginLeft: 2,
-                zoom: isSafari ? 0.66 : 0.8,
-                letterSpacing: isQQBrowser ? -2 : 0,
-              }}
+            <Tooltip
+              title={systemInfo?.branch === 'develop' ? '开发版' : '正式版'}
            >
-              v{version}
-            </span>
+              <Badge size="small" dot={systemInfo?.branch === 'develop'}>
+                <span
+                  style={{
+                    fontSize: isFirefox ? 9 : 12,
+                    color: '#666',
+                    marginLeft: 2,
+                    zoom: isSafari ? 0.66 : 0.8,
+                    letterSpacing: isQQBrowser ? -2 : 0,
+                  }}
+                >
+                  v{systemInfo?.version}
+                </span>
+              </Badge>
+            </Tooltip>
          </a>
        </>
      }
@@ -319,16 +361,17 @@ export default function (props: any) {
      )}
      {...defaultProps}
    >
-      {React.Children.map(props.children, (child) => {
-        return React.cloneElement(child, {
+      <Outlet
+        context={{
          ...ctx,
          theme,
          user,
          reloadUser,
          reloadTheme,
          socketMessage,
-        });
-      })}
+          systemInfo,
+        }}
+      />
    </ProLayout>
  );
 }
@@ -11,8 +11,11 @@ import { PageContainer } from '@ant-design/pro-layout';
 import { request } from '@/utils/http';
 import Editor from '@monaco-editor/react';
 import { Controlled as CodeMirror } from 'react-codemirror2';
+import { useOutletContext } from '@umijs/max';
+import { SharedContext } from '@/layouts';

-const Config = ({ headerStyle, isPhone, theme }: any) => {
+const Config = () => {
+  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
  const [value, setValue] = useState('');
  const [loading, setLoading] = useState(true);
  const [title, setTitle] = useState('config.sh');
@@ -22,8 +25,10 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
  const [confirmLoading, setConfirmLoading] = useState(false);

  const getConfig = (name: string) => {
-    request.get(`${config.apiPrefix}configs/${name}`).then((data: any) => {
-      setValue(data.data);
+    request.get(`${config.apiPrefix}configs/${name}`).then(({ code, data }) => {
+      if (code === 200) {
+        setValue(data);
+      }
    });
  };

@@ -31,8 +36,10 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
    setLoading(true);
    request
      .get(`${config.apiPrefix}configs/files`)
-      .then((data: any) => {
-        setData(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setData(data);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -47,8 +54,10 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
      .post(`${config.apiPrefix}configs/save`, {
        data: { content, name: select },
      })
-      .then((data: any) => {
-        message.success(data.message);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          message.success('保存成功');
+        }
        setConfirmLoading(false);
      });
  };
@@ -71,6 +80,7 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
      loading={loading}
      extra={[
        <TreeSelect
+          treeExpandAction="click"
          className="config-select"
          value={select}
          dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
@@ -29,6 +29,7 @@ import config from '@/utils/config';
 import CronLogModal from './logModal';
 import Editor from '@monaco-editor/react';
 import IconFont from '@/components/iconfont';
+import { getCommandScript } from '@/utils';

 const { Text } = Typography;

@@ -103,7 +104,6 @@ const CronDetailModal = ({
          fontSize: 12,
          lineNumbersMinChars: 3,
          fontFamily: 'Source Code Pro',
-          folding: false,
          glyphMargin: false,
          wordWrap: 'on',
        }}
@@ -123,9 +123,11 @@ const CronDetailModal = ({
      .get(
        `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
      )
-      .then((data) => {
-        setLog(data.data);
-        setIsLogModalVisible(true);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setLog(data);
+          setIsLogModalVisible(true);
+        }
      });
  };

@@ -137,34 +139,28 @@ const CronDetailModal = ({
    setLoading(true);
    request
      .get(`${config.apiPrefix}crons/${cron.id}/logs`)
-      .then((data: any) => {
-        if (data.code === 200) {
-          setLogs(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setLogs(data);
        }
      })
      .finally(() => setLoading(false));
  };

  const getScript = () => {
-    const cmd = cron.command.split(' ') as string[];
-    if (cmd[0] === 'task') {
+    const result = getCommandScript(cron.command);
+    if (Array.isArray(result)) {
      setValidTabs(validTabs);
-      if (cmd[1].startsWith('/ql/data/scripts')) {
-        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
-      }
-
-      let [p, s] = cmd[1].split('/');
-      if (!s) {
-        s = p;
-        p = '';
-      }
+      const [s, p] = result;
      setScriptInfo({ parent: p, filename: s });
      request
        .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
-        .then((data) => {
-          setValue(data.data);
+        .then(({ code, data }) => {
+          if (code === 200) {
+            setValue(data);
+          }
        });
-    } else {
+    } else if (result) {
      setValidTabs([validTabs[0]]);
    }
  };
@@ -194,12 +190,10 @@ const CronDetailModal = ({
                content,
              },
            })
-            .then((_data: any) => {
-              if (_data.code === 200) {
+            .then(({ code, data }) => {
+              if (code === 200) {
                setValue(content);
                message.success(`保存成功`);
-              } else {
-                message.error(_data);
              }
              resolve(null);
            })
@@ -227,14 +221,12 @@ const CronDetailModal = ({
      onOk() {
        request
          .put(`${config.apiPrefix}crons/run`, { data: [currentCron.id] })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              setCurrentCron({ ...currentCron, status: CrontabStatus.running });
              setTimeout(() => {
                getLogs();
              }, 1000);
-            } else {
-              message.error(data);
            }
          });
      },
@@ -259,11 +251,9 @@ const CronDetailModal = ({
      onOk() {
        request
          .put(`${config.apiPrefix}crons/stop`, { data: [currentCron.id] })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              setCurrentCron({ ...currentCron, status: CrontabStatus.idle });
-            } else {
-              message.error(data);
            }
          });
      },
@@ -296,14 +286,12 @@ const CronDetailModal = ({
              data: [currentCron.id],
            },
          )
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              setCurrentCron({
                ...currentCron,
                isDisabled: currentCron.isDisabled === 1 ? 0 : 1,
              });
-            } else {
-              message.error(data);
            }
          });
      },
@@ -336,14 +324,12 @@ const CronDetailModal = ({
              data: [currentCron.id],
            },
          )
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              setCurrentCron({
                ...currentCron,
                isPinned: currentCron.isPinned === 1 ? 0 : 1,
              });
-            } else {
-              message.error(data);
            }
          });
      },
@@ -378,7 +364,7 @@ const CronDetailModal = ({
            {currentCron.labels?.length > 0 &&
              currentCron.labels[0] !== '' &&
              currentCron.labels?.map((label: string, i: number) => (
-                <Tag color="blue" style={{ marginRight: 5 }}>
+                <Tag key={label} color="blue" style={{ marginRight: 5 }}>
                  {label}
                </Tag>
              ))}
@@ -441,7 +427,7 @@ const CronDetailModal = ({
        </div>
      }
      centered
-      visible={visible}
+      open={visible}
      forceRender
      footer={false}
      onCancel={() => handleCancel()}
@@ -2,21 +2,12 @@
  margin-bottom: 0 !important;
 }

-.cron {
-  &:hover {
-    cursor: pointer;
-  }
-}
-
 .crontab-detail {
  .card-wrapper {
-    height: 80vh;
-    height: calc(80vh - var(--vh-offset, 0px));
-
    .ant-card:last-child {
      .ant-card-body {
-        height: calc(80vh - 238px);
-        height: calc(80vh - var(--vh-offset, 0px) - 238px);
+        height: calc(80vh - 367px);
+        height: calc(80vh - var(--vh-offset, 0px) - 367px);
        overflow-y: auto;
      }
    }
@@ -161,6 +152,14 @@
  }
 }

+.view-create-modal-sorts {
+  display: flex;
+
+  .ant-space-item:nth-child(2) {
+    flex: 1;
+  }
+}
+
 tr.drop-over-downward td {
  border-bottom: 2px dashed #1890ff;
 }
@@ -174,3 +173,9 @@ tr.drop-over-upward td {
    padding-top: 10px;
  }
 }
+
+.view-filters-container.active {
+  .filter-item > div > .ant-form-item-control {
+    margin-left: 40px;
+  }
+}
@@ -1,4 +1,4 @@
-import React, { PureComponent, Fragment, useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import {
  Button,
  message,
@@ -43,13 +43,14 @@ import CronLogModal from './logModal';
 import CronDetailModal from './detail';
 import cron_parser from 'cron-parser';
 import { diffTime } from '@/utils/date';
-import { getTableScroll } from '@/utils/index';
-import { history } from 'umi';
+import { history, useOutletContext } from '@umijs/max';
 import './index.less';
 import ViewCreateModal from './viewCreateModal';
 import ViewManageModal from './viewManageModal';
-import pagination from 'antd/lib/pagination';
 import { FilterValue, SorterResult } from 'antd/lib/table/interface';
+import { SharedContext } from '@/layouts';
+import useTableScrollHeight from '@/hooks/useTableScrollHeight';
+import { getCommandScript } from '@/utils';

 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -81,7 +82,8 @@ enum OperationPath {
  'unpin',
 }

-const Crontab = ({ headerStyle, isPhone, theme }: any) => {
+const Crontab = () => {
+  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
  const columns: any = [
    {
      title: '名称',
@@ -93,10 +95,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
        <>
          <a
            onClick={() => {
-              goToScriptManager(record);
+              setDetailCron(record);
+              setIsDetailModalVisible(true);
            }}
          >
-            {record.labels?.length > 0 && record.labels[0] !== '' ? (
+            {record.labels?.length > 0 && record.labels[0] !== '' && false ? (
              <Popover
                placement="right"
                trigger={isPhone ? 'click' : 'hover'}
@@ -105,10 +108,12 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                    {record.labels?.map((label: string) => (
                      <Tag
                        color="blue"
+                        key={label}
                        style={{ cursor: 'point' }}
                        onClick={(e) => {
                          e.stopPropagation();
                          setSearchValue(`label:${label}`);
+                          setSearchText(`label:${label}`);
                        }}
                      >
                        <a>{label}</a>
@@ -140,7 +145,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      title: '命令',
      dataIndex: 'command',
      key: 'command',
-      width: 250,
+      width: 300,
      align: 'center' as const,
      render: (text: string, record: any) => {
        return (
@@ -152,7 +157,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
            }}
            ellipsis={{ tooltip: text, rows: 2 }}
          >
-            {text}
+            <a
+              onClick={() => {
+                goToScriptManager(record);
+              }}
+            >
+              {text}
+            </a>
          </Paragraph>
        );
      },
@@ -173,6 +184,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
    {
      title: '最后运行时间',
      align: 'center' as const,
+      dataIndex: 'last_execution_time',
+      key: 'last_execution_time',
      width: 150,
      sorter: {
        compare: (a: any, b: any) => {
@@ -202,6 +215,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      title: '最后运行时长',
      align: 'center' as const,
      width: 120,
+      dataIndex: 'last_running_time',
+      key: 'last_running_time',
      sorter: {
        compare: (a: any, b: any) => {
          return a.last_running_time - b.last_running_time;
@@ -358,9 +373,9 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
    page: number;
    size: number;
    sorter: any;
+    filters: any;
  }>({} as any);
  const [viewConf, setViewConf] = useState<any>();
-  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
  const [isDetailModalVisible, setIsDetailModalVisible] = useState(false);
  const [detailCron, setDetailCron] = useState<any>();
  const [searchValue, setSearchValue] = useState('');
@@ -372,56 +387,58 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
  const [cronViews, setCronViews] = useState<any[]>([]);
  const [enabledCronViews, setEnabledCronViews] = useState<any[]>([]);
  const [moreMenuActive, setMoreMenuActive] = useState(false);
+  const tableRef = useRef<any>();
+  const tableScrollHeight = useTableScrollHeight(tableRef);

  const goToScriptManager = (record: any) => {
-    const cmd = record.command.split(' ') as string[];
-    if (cmd[0] === 'task') {
-      if (cmd[1].startsWith('/ql/data/scripts')) {
-        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
-      }
-
-      let [p, s] = cmd[1].split('/');
-      if (!s) {
-        s = p;
-        p = '';
-      }
+    const result = getCommandScript(record.command);
+    if (Array.isArray(result)) {
+      const [s, p] = result;
      history.push(`/script?p=${p}&s=${s}`);
-    } else if (cmd[1] === 'repo') {
-      location.href = cmd[2];
+    } else if (result) {
+      location.href = result;
    }
  };

  const getCrons = () => {
    setLoading(true);
-    const { page, size, sorter } = pageConf;
-    let url = `${config.apiPrefix}crons?searchValue=${searchText}&page=${page}&size=${size}`;
+    const { page, size, sorter, filters } = pageConf;
+    let url = `${
+      config.apiPrefix
+    }crons?searchValue=${searchText}&page=${page}&size=${size}&filters=${JSON.stringify(
+      filters,
+    )}`;
    if (sorter && sorter.field) {
-      url += `&sortField=${sorter.field}&sortType=${
-        sorter.order === 'ascend' ? 'ASC' : 'DESC'
-      }`;
+      url += `&sorter=${JSON.stringify({
+        field: sorter.field,
+        type: sorter.order === 'ascend' ? 'ASC' : 'DESC',
+      })}`;
    }
    if (viewConf) {
      url += `&queryString=${JSON.stringify({
        filters: viewConf.filters,
        sorts: viewConf.sorts,
+        filterRelation: viewConf.filterRelation || 'and',
      })}`;
    }
    request
      .get(url)
-      .then((_data: any) => {
-        const { data, total } = _data.data;
-        setValue(
-          data.map((x) => {
-            return {
-              ...x,
-              nextRunTime: cron_parser
-                .parseExpression(x.schedule)
-                .next()
-                .toDate(),
-            };
-          }),
-        );
-        setTotal(total);
+      .then(({ code, data: _data }) => {
+        if (code === 200) {
+          const { data, total } = _data;
+          setValue(
+            data.map((x) => {
+              return {
+                ...x,
+                nextRunTime: cron_parser
+                  .parseExpression(x.schedule)
+                  .next()
+                  .toDate(),
+              };
+            }),
+          );
+          setTotal(total);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -451,8 +468,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      onOk() {
        request
          .delete(`${config.apiPrefix}crons`, { data: [record.id] })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              message.success('删除成功');
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
@@ -460,8 +477,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                result.splice(i, 1);
                setValue(result);
              }
-            } else {
-              message.error(data);
            }
          });
      },
@@ -486,8 +501,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      onOk() {
        request
          .put(`${config.apiPrefix}crons/run`, { data: [record.id] })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
              if (i !== -1) {
@@ -497,8 +512,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                });
                setValue(result);
              }
-            } else {
-              message.error(data);
            }
          });
      },
@@ -523,8 +536,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      onOk() {
        request
          .put(`${config.apiPrefix}crons/stop`, { data: [record.id] })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
              if (i !== -1) {
@@ -535,8 +548,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                });
                setValue(result);
              }
-            } else {
-              message.error(data);
            }
          });
      },
@@ -569,8 +580,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
              data: [record.id],
            },
          )
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              const newStatus = record.isDisabled === 1 ? 0 : 1;
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
@@ -581,8 +592,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                });
                setValue(result);
              }
-            } else {
-              message.error(data);
            }
          });
      },
@@ -615,8 +624,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
              data: [record.id],
            },
          )
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              const newStatus = record.isPinned === 1 ? 0 : 1;
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
@@ -627,8 +636,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                });
                setValue(result);
              }
-            } else {
-              message.error(data);
            }
          });
      },
@@ -730,19 +737,21 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
  const getCronDetail = (cron: any) => {
    request
      .get(`${config.apiPrefix}crons/${cron.id}`)
-      .then((data: any) => {
-        const index = value.findIndex((x) => x.id === cron.id);
-        const result = [...value];
-        data.data.nextRunTime = cron_parser
-          .parseExpression(data.data.schedule)
-          .next()
-          .toDate();
-        if (index !== -1) {
-          result.splice(index, 1, {
-            ...cron,
-            ...data.data,
-          });
-          setValue(result);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          const index = value.findIndex((x) => x.id === cron.id);
+          const result = [...value];
+          data.nextRunTime = cron_parser
+            .parseExpression(data.schedule)
+            .next()
+            .toDate();
+          if (index !== -1) {
+            result.splice(index, 1, {
+              ...cron,
+              ...data,
+            });
+            setValue(result);
+          }
        }
      })
      .finally(() => setLoading(false));
@@ -750,16 +759,10 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {

  const onSelectChange = (selectedIds: any[]) => {
    setSelectedRowIds(selectedIds);
-
-    setTimeout(() => {
-      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll());
-      }
-    });
  };

  const rowSelection = {
-    selectedRowIds,
+    selectedRowKeys: selectedRowIds,
    onChange: onSelectChange,
  };

@@ -770,13 +773,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      onOk() {
        request
          .delete(`${config.apiPrefix}crons`, { data: selectedRowIds })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              message.success('批量删除成功');
              setSelectedRowIds([]);
              getCrons();
-            } else {
-              message.error(data);
            }
          });
      },
@@ -795,11 +796,9 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
          .put(`${config.apiPrefix}crons/${OperationPath[operationStatus]}`, {
            data: selectedRowIds,
          })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              getCrons();
-            } else {
-              message.error(data);
            }
          });
      },
@@ -815,7 +814,12 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
    sorter: SorterResult<any> | SorterResult<any>[],
  ) => {
    const { current, pageSize } = pagination;
-    setPageConf({ page: current as number, size: pageSize as number, sorter });
+    setPageConf({
+      page: current as number,
+      size: pageSize as number,
+      sorter,
+      filters,
+    });
    localStorage.setItem('pageSize', String(pageSize));
  };

@@ -842,7 +846,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {

  useEffect(() => {
    if (viewConf && enabledCronViews && enabledCronViews.length > 0) {
-      const view = enabledCronViews.slice(2).find((x) => x.id === viewConf.id);
+      const view = enabledCronViews.slice(4).find((x) => x.id === viewConf.id);
      setMoreMenuActive(!!view);
    }
  }, [viewConf, enabledCronViews]);
@@ -852,105 +856,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      page: 1,
      size: parseInt(localStorage.getItem('pageSize') || '20'),
      sorter: {},
-    });
-    setTimeout(() => {
-      setTableScrollHeight(getTableScroll());
+      filters: {},
    });
    getCronViews();
  }, []);

-  const panelContent = (
-    <>
-      {selectedRowIds.length > 0 && (
-        <div style={{ marginBottom: 16 }}>
-          <Button type="primary" style={{ marginBottom: 5 }} onClick={delCrons}>
-            批量删除
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateCrons(0)}
-            style={{ marginLeft: 8, marginBottom: 5 }}
-          >
-            批量启用
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateCrons(1)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量禁用
-          </Button>
-          <Button
-            type="primary"
-            style={{ marginRight: 8 }}
-            onClick={() => operateCrons(2)}
-          >
-            批量运行
-          </Button>
-          <Button type="primary" onClick={() => operateCrons(3)}>
-            批量停止
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateCrons(4)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量置顶
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateCrons(5)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量取消置顶
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => setIsLabelModalVisible(true)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量修改标签
-          </Button>
-          <span style={{ marginLeft: 8 }}>
-            已选择
-            <a>{selectedRowIds?.length}</a>项
-          </span>
-        </div>
-      )}
-      <Table
-        columns={columns}
-        pagination={{
-          current: pageConf.page,
-          pageSize: pageConf.size,
-          showSizeChanger: true,
-          simple: isPhone,
-          total,
-          showTotal: (total: number, range: number[]) =>
-            `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
-          pageSizeOptions: [10, 20, 50, 100, 200, 500, total || 10000].sort(
-            (a, b) => a - b,
-          ),
-        }}
-        onRow={(record) => {
-          return {
-            onClick: (event) => {
-              setDetailCron(record);
-              setIsDetailModalVisible(true);
-            },
-          };
-        }}
-        dataSource={value}
-        rowKey="id"
-        size="middle"
-        scroll={{ x: 1000, y: tableScrollHeight }}
-        loading={loading}
-        rowSelection={rowSelection}
-        rowClassName={getRowClassName}
-        onChange={onPageChange}
-      />
-    </>
-  );
-
  const viewAction = (key: string) => {
    switch (key) {
      case 'new':
@@ -973,7 +883,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
        viewAction(key);
      }}
      items={[
-        ...[...enabledCronViews].slice(2).map((x) => ({
+        ...[...enabledCronViews].slice(4).map((x) => ({
          label: (
            <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
              <span>{x.name}</span>
@@ -1006,9 +916,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
    setLoading(true);
    request
      .get(`${config.apiPrefix}crons/views`)
-      .then((data: any) => {
-        setCronViews(data.data);
-        setEnabledCronViews(data.data.filter((x) => !x.isDisabled));
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setCronViews(data);
+          setEnabledCronViews(data.filter((x) => !x.isDisabled));
+        }
      })
      .finally(() => {
        setLoading(false);
@@ -1017,6 +929,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {

  const tabClick = (key: string) => {
    const view = enabledCronViews.find((x) => x.id == key);
+    setSelectedRowIds([]);
+    setPageConf({ ...pageConf, page: 1 });
    setViewConf(view ? view : null);
  };

@@ -1064,16 +978,98 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
          </Dropdown>
        }
        onTabClick={tabClick}
-      >
-        <Tabs.TabPane tab="全部任务" key="all">
-          {panelContent}
-        </Tabs.TabPane>
-        {[...enabledCronViews].slice(0, 2).map((x) => (
-          <Tabs.TabPane tab={x.name} key={x.id}>
-            {panelContent}
-          </Tabs.TabPane>
-        ))}
-      </Tabs>
+        items={[
+          ...[...enabledCronViews].slice(0, 4).map((x) => ({
+            key: x.id,
+            label: x.name,
+          })),
+        ]}
+      />
+      <div ref={tableRef}>
+        {selectedRowIds.length > 0 && (
+          <div style={{ marginBottom: 16 }}>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5 }}
+              onClick={delCrons}
+            >
+              批量删除
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(0)}
+              style={{ marginLeft: 8, marginBottom: 5 }}
+            >
+              批量启用
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(1)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量禁用
+            </Button>
+            <Button
+              type="primary"
+              style={{ marginRight: 8 }}
+              onClick={() => operateCrons(2)}
+            >
+              批量运行
+            </Button>
+            <Button type="primary" onClick={() => operateCrons(3)}>
+              批量停止
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(4)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量置顶
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(5)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量取消置顶
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => setIsLabelModalVisible(true)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量修改标签
+            </Button>
+            <span style={{ marginLeft: 8 }}>
+              已选择
+              <a>{selectedRowIds?.length}</a>项
+            </span>
+          </div>
+        )}
+        <Table
+          columns={columns}
+          pagination={{
+            current: pageConf.page,
+            pageSize: pageConf.size,
+            showSizeChanger: true,
+            simple: isPhone,
+            total,
+            showTotal: (total: number, range: number[]) =>
+              `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
+            pageSizeOptions: [10, 20, 50, 100, 200, 500, total || 10000].sort(
+              (a, b) => a - b,
+            ),
+          }}
+          dataSource={value}
+          rowKey="id"
+          size="middle"
+          scroll={{ x: 1000, y: tableScrollHeight }}
+          loading={loading}
+          rowSelection={rowSelection}
+          rowClassName={getRowClassName}
+          onChange={onPageChange}
+        />
+      </div>
      <CronLogModal
        visible={isLogModalVisible}
        handleCancel={() => {
@@ -7,6 +7,7 @@ import {
  CheckCircleOutlined,
 } from '@ant-design/icons';
 import { PageLoading } from '@ant-design/pro-layout';
+import { logEnded } from '@/utils';

 enum CrontabStatus {
  'running',
@@ -41,14 +42,17 @@ const CronLogModal = ({
    }
    request
      .get(logUrl ? logUrl : `${config.apiPrefix}crons/${cron.id}/log`)
-      .then((data: any) => {
-        if (localStorage.getItem('logCron') === String(cron.id)) {
-          const log = data.data as string;
+      .then(({ code, data }) => {
+        if (
+          code === 200 &&
+          localStorage.getItem('logCron') === String(cron.id)
+        ) {
+          const log = data as string;
          setValue(log || '暂无日志');
          setExecuting(
-            log && !log.includes('执行结束') && !log.includes('重启面板'),
+            log && !logEnded(log) && !log.includes('重启面板'),
          );
-          if (log && !log.includes('执行结束') && !log.includes('重启面板')) {
+          if (log && !logEnded(log) && !log.includes('重启面板')) {
            setTimeout(() => {
              getCronLog();
            }, 2000);
@@ -119,7 +123,7 @@ const CronLogModal = ({
  return (
    <Modal
      title={titleElement()}
-      visible={visible}
+      open={visible}
      centered
      className="log-modal"
      bodyStyle={{
@@ -28,13 +28,12 @@ const CronModal = ({
      const { code, data } = await request[method](`${config.apiPrefix}crons`, {
        data: payload,
      });
+
      if (code === 200) {
        message.success(cron ? '更新Cron成功' : '新建Cron成功');
-      } else {
-        message.error(data);
+        handleCancel(data);
      }
      setLoading(false);
-      handleCancel(data);
    } catch (error: any) {
      setLoading(false);
    }
@@ -47,7 +46,7 @@ const CronModal = ({
  return (
    <Modal
      title={cron ? '编辑任务' : '新建任务'}
-      visible={visible}
+      open={visible}
      forceRender
      centered
      maskClosable={false}
@@ -128,21 +127,24 @@ const CronLabelModal = ({
      .then(async (values) => {
        setLoading(true);
        const payload = { ids, labels: values.labels };
-        const { code, data } = await request[action](
-          `${config.apiPrefix}crons/labels`,
-          {
-            data: payload,
-          },
-        );
-        if (code === 200) {
-          message.success(
-            action === 'post' ? '添加Labels成功' : '删除Labels成功',
+        try {
+          const { code, data } = await request[action](
+            `${config.apiPrefix}crons/labels`,
+            {
+              data: payload,
+            },
          );
-        } else {
-          message.error(data);
+
+          if (code === 200) {
+            message.success(
+              action === 'post' ? '添加Labels成功' : '删除Labels成功',
+            );
+            handleCancel(true);
+          }
+          setLoading(false);
+        } catch (error) {
+          setLoading(false);
        }
-        setLoading(false);
-        handleCancel(true);
      })
      .catch((info) => {
        console.log('Validate Failed:', info);
@@ -166,7 +168,7 @@ const CronLabelModal = ({
  return (
    <Modal
      title="批量修改标签"
-      visible={visible}
+      open={visible}
      footer={buttons}
      centered
      maskClosable={false}
@@ -12,19 +12,28 @@ import {
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import IconFont from '@/components/iconfont';
+import get from 'lodash/get';

 const PROPERTIES = [
  { name: '命令', value: 'command' },
  { name: '名称', value: 'name' },
  { name: '定时规则', value: 'schedule' },
  { name: '状态', value: 'status' },
+  { name: '标签', value: 'labels' },
 ];

+const EOperation: any = {
+  Reg: '',
+  NotReg: '',
+  In: 'select',
+  Nin: 'select',
+};
 const OPERATIONS = [
  { name: '包含', value: 'Reg' },
  { name: '不包含', value: 'NotReg' },
-  { name: '属于', value: 'In' },
-  { name: '不属于', value: 'Nin' },
+  { name: '属于', value: 'In', type: 'select' },
+  { name: '不属于', value: 'Nin', type: 'select' },
  // { name: '等于', value: 'Eq' },
  // { name: '不等于', value: 'Ne' },
  // { name: '为空', value: 'IsNull' },
@@ -36,11 +45,18 @@ const SORTTYPES = [
  { name: '倒序', value: 'DESC' },
 ];

-const STATUS = [
-  { name: '运行中', value: 0 },
-  { name: '空闲中', value: 1 },
-  { name: '已禁用', value: 2 },
-];
+const STATUS_MAP = {
+  status: [
+    { name: '运行中', value: 0 },
+    { name: '空闲中', value: 1 },
+    { name: '已禁用', value: 2 },
+  ],
+};
+
+enum ViewFilterRelation {
+  'and' = '且',
+  'or' = '或',
+}

 const ViewCreateModal = ({
  view,
@@ -53,10 +69,11 @@ const ViewCreateModal = ({
 }) => {
  const [form] = Form.useForm();
  const [loading, setLoading] = useState(false);
-  const [operationMap, setOperationMap] = useState<any>();
+  const [filterRelation, setFilterRelation] = useState<'and' | 'or'>('and');

  const handleOk = async (values: any) => {
    setLoading(true);
+    values.filterRelation = filterRelation;
    const method = view ? 'put' : 'post';
    try {
      const { code, data } = await request[method](
@@ -65,11 +82,11 @@ const ViewCreateModal = ({
          data: view ? { ...values, id: view.id } : values,
        },
      );
-      if (code !== 200) {
-        message.error(data);
+
+      if (code === 200) {
+        handleCancel(data);
      }
      setLoading(false);
-      handleCancel(data);
    } catch (error: any) {
      setLoading(false);
    }
@@ -87,12 +104,7 @@ const ViewCreateModal = ({
  }, [view, visible]);

  const operationElement = (
-    <Select
-      style={{ width: 100 }}
-      onChange={() => {
-        setOperationMap({});
-      }}
-    >
+    <Select style={{ width: 80 }}>
      {OPERATIONS.map((x) => (
        <Select.Option key={x.name} value={x.value}>
          {x.name}
@@ -101,9 +113,9 @@ const ViewCreateModal = ({
    </Select>
  );

-  const propertyElement = (props: any) => {
+  const propertyElement = (props: any, style: React.CSSProperties = {}) => {
    return (
-      <Select style={{ width: 120 }}>
+      <Select style={style}>
        {props.map((x) => (
          <Select.Option key={x.name} value={x.value}>
            {x.name}
@@ -114,7 +126,7 @@ const ViewCreateModal = ({
  };

  const typeElement = (
-    <Select style={{ width: 120 }}>
+    <Select>
      {SORTTYPES.map((x) => (
        <Select.Option key={x.name} value={x.value}>
          {x.name}
@@ -123,20 +135,22 @@ const ViewCreateModal = ({
    </Select>
  );

-  const statusElement = (
-    <Select mode="multiple" allowClear placeholder="请选择状态">
-      {STATUS.map((x) => (
-        <Select.Option key={x.name} value={x.value}>
-          {x.name}
-        </Select.Option>
-      ))}
-    </Select>
-  );
+  const statusElement = (property: keyof typeof STATUS_MAP) => {
+    return (
+      <Select mode="tags" allowClear placeholder="输入后回车增加自定义选项">
+        {STATUS_MAP[property]?.map((x) => (
+          <Select.Option key={x.name} value={x.value}>
+            {x.name}
+          </Select.Option>
+        ))}
+      </Select>
+    );
+  };

  return (
    <Modal
      title={view ? '编辑视图' : '新建视图'}
-      visible={visible}
+      open={visible}
      forceRender
      width={580}
      centered
@@ -164,56 +178,145 @@ const ViewCreateModal = ({
        </Form.Item>
        <Form.List name="filters">
          {(fields, { add, remove }) => (
-            <>
-              {fields.map(({ key, name, ...restField }, index) => (
-                <Form.Item
-                  label={index === 0 ? '筛选条件' : ''}
-                  key={key}
-                  style={{ marginBottom: 0 }}
+            <div
+              style={{ position: 'relative' }}
+              className={`view-filters-container ${
+                fields.length > 1 ? 'active' : ''
+              }`}
+            >
+              {fields.length > 1 && (
+                <div
+                  style={{
+                    position: 'absolute',
+                    width: 50,
+                    borderRadius: 10,
+                    border: '1px solid rgb(190, 220, 255)',
+                    borderRight: 'none',
+                    height: 56 * (fields.length - 1),
+                    top: 46,
+                    left: 15,
+                  }}
                >
-                  <Space className="view-create-modal-filters" align="baseline">
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'property']}
-                      rules={[{ required: true }]}
+                  <Button
+                    type="primary"
+                    size="small"
+                    style={{
+                      position: 'absolute',
+                      top: '50%',
+                      translate: '-50% -50%',
+                      padding: '0 0 0 3px',
+                      cursor: 'pointer',
+                    }}
+                    onClick={() => {
+                      setFilterRelation(
+                        filterRelation === 'and' ? 'or' : 'and',
+                      );
+                    }}
+                  >
+                    <>
+                      <span>{ViewFilterRelation[filterRelation]}</span>
+                      <IconFont type="ql-icon-d-caret" />
+                    </>
+                  </Button>
+                </div>
+              )}
+              <div>
+                {fields.map(({ key, name, ...restField }, index) => (
+                  <Form.Item
+                    label={index === 0 ? '筛选条件' : ''}
+                    key={key}
+                    style={{ marginBottom: 0 }}
+                    required
+                    className="filter-item"
+                  >
+                    <Space
+                      className="view-create-modal-filters"
+                      align="baseline"
+                      style={
+                        fields.length > 1 ? { width: 'calc(100% - 40px)' } : {}
+                      }
                    >
-                      {propertyElement(PROPERTIES)}
-                    </Form.Item>
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'operation']}
-                      rules={[{ required: true }]}
-                    >
-                      {operationElement}
-                    </Form.Item>
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'value']}
-                      rules={[{ required: true, message: '请输入内容' }]}
-                    >
-                      {['In', 'Nin'].includes(
-                        form.getFieldValue(['filters', index, 'operation']),
-                      ) ? (
-                        statusElement
-                      ) : (
-                        <Input placeholder="请输入内容" />
+                      <Form.Item
+                        {...restField}
+                        name={[name, 'property']}
+                        rules={[{ required: true }]}
+                      >
+                        {propertyElement(PROPERTIES, { width: 90 })}
+                      </Form.Item>
+                      <Form.Item
+                        {...restField}
+                        name={[name, 'operation']}
+                        rules={[{ required: true }]}
+                      >
+                        {operationElement}
+                      </Form.Item>
+                      <Form.Item
+                        noStyle
+                        shouldUpdate={(prevValues, nextValues) => {
+                          const preOperation =
+                            EOperation[
+                              get(prevValues, ['filters', name, 'operation'])
+                            ];
+                          const nextOperation =
+                            EOperation[
+                              get(nextValues, ['filters', name, 'operation'])
+                            ];
+                          const flag = preOperation !== nextOperation;
+                          if (flag) {
+                            form.setFieldValue(
+                              ['filters', name, 'value'],
+                              nextOperation === 'select' ? [] : '',
+                            );
+                          }
+                          return flag;
+                        }}
+                      >
+                        {() => {
+                          const property = form.getFieldValue([
+                            'filters',
+                            index,
+                            'property',
+                          ]) as 'status';
+                          const operate = form.getFieldValue([
+                            'filters',
+                            name,
+                            'operation',
+                          ]);
+                          return (
+                            <Form.Item
+                              {...restField}
+                              name={[name, 'value']}
+                              rules={[
+                                { required: true, message: '请输入内容' },
+                              ]}
+                            >
+                              {EOperation[operate] === 'select' ? (
+                                statusElement(property)
+                              ) : (
+                                <Input placeholder="请输入内容" />
+                              )}
+                            </Form.Item>
+                          );
+                        }}
+                      </Form.Item>
+                      {index !== 0 && (
+                        <MinusCircleOutlined onClick={() => remove(name)} />
                      )}
-                    </Form.Item>
-                    {index !== 0 && (
-                      <MinusCircleOutlined onClick={() => remove(name)} />
-                    )}
-                  </Space>
+                    </Space>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <a
+                    onClick={() =>
+                      add({ property: 'command', operation: 'Reg' })
+                    }
+                  >
+                    <PlusOutlined />
+                    新增筛选条件
+                  </a>
                </Form.Item>
-              ))}
-              <Form.Item>
-                <a
-                  onClick={() => add({ property: 'command', operation: 'Reg' })}
-                >
-                  <PlusOutlined />
-                  新增筛选条件
-                </a>
-              </Form.Item>
-            </>
+              </div>
+            </div>
          )}
        </Form.List>
        <Form.List name="sorts">
@@ -225,13 +328,13 @@ const ViewCreateModal = ({
                  key={key}
                  style={{ marginBottom: 0 }}
                >
-                  <Space className="view-create-modal-filters" align="baseline">
+                  <Space className="view-create-modal-sorts" align="baseline">
                    <Form.Item
                      {...restField}
                      name={[name, 'property']}
                      rules={[{ required: true }]}
                    >
-                      {propertyElement(PROPERTIES)}
+                      {propertyElement(PROPERTIES, { width: 240 })}
                    </Form.Item>
                    <Form.Item
                      {...restField}
@@ -240,9 +343,7 @@ const ViewCreateModal = ({
                    >
                      {typeElement}
                    </Form.Item>
-                    {index !== 0 && (
-                      <MinusCircleOutlined onClick={() => remove(name)} />
-                    )}
+                    <MinusCircleOutlined onClick={() => remove(name)} />
                  </Space>
                </Form.Item>
              ))}
@@ -81,6 +81,16 @@ const ViewManageModal = ({
      dataIndex: 'name',
      key: 'name',
      align: 'center' as const,
+      render: (text) => (
+        <div style={{ textAlign: 'left', paddingLeft: 30 }}>{text}</div>
+      ),
+    },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center' as const,
+      render: (v) => (v === 1 ? '系统' : '个人'),
    },
    {
      title: '显示',
@@ -100,10 +110,10 @@ const ViewManageModal = ({
    {
      title: '操作',
      key: 'action',
-      width: 140,
+      width: 100,
      align: 'center' as const,
      render: (text: string, record: any, index: number) => {
-        return (
+        return record.type !== 1 ? (
          <Space size="middle">
            <a onClick={() => editView(record, index)}>
              <EditOutlined />
@@ -112,6 +122,8 @@ const ViewManageModal = ({
              <DeleteOutlined />
            </a>
          </Space>
+        ) : (
+          '-'
        );
      },
    },
@@ -141,12 +153,10 @@ const ViewManageModal = ({
      onOk() {
        request
          .delete(`${config.apiPrefix}crons/views`, { data: [record.id] })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              message.success('删除成功');
              cronViewChange();
-            } else {
-              message.error(data);
            }
          });
      },
@@ -162,14 +172,12 @@ const ViewManageModal = ({
      .put(`${config.apiPrefix}crons/views/${checked ? 'enable' : 'disable'}`, {
        data: [record.id],
      })
-      .then((data: any) => {
-        if (data.code === 200) {
+      .then(({ code, data }) => {
+        if (code === 200) {
          const _list = [...list];
          _list.splice(index, 1, { ...list[index], isDisabled: !checked });
          setList(_list);
          cronViewChange();
-        } else {
-          message.error(data);
        }
      });
  };
@@ -190,15 +198,13 @@ const ViewManageModal = ({
        .put(`${config.apiPrefix}crons/views/move`, {
          data: { fromIndex: dragIndex, toIndex: hoverIndex, id: dragRow.id },
        })
-        .then((data: any) => {
-          if (data.code === 200) {
+        .then(({ code, data }) => {
+          if (code === 200) {
            const newData = [...list];
            newData.splice(dragIndex, 1);
-            newData.splice(hoverIndex, 0, { ...dragRow, ...data.data });
+            newData.splice(hoverIndex, 0, { ...dragRow, ...data });
            setList(newData);
            cronViewChange();
-          } else {
-            message.error(data);
          }
        });
    },
@@ -212,7 +218,7 @@ const ViewManageModal = ({
  return (
    <Modal
      title="视图管理"
-      visible={visible}
+      open={visible}
      centered
      width={620}
      onCancel={() => handleCancel()}
@@ -231,7 +237,10 @@ const ViewManageModal = ({
        <Button
          key="2"
          type="primary"
-          onClick={() => setIsCreateViewModalVisible(true)}
+          onClick={() => {
+            setEditedView(null);
+            setIsCreateViewModalVisible(true);
+          }}
        >
          新建视图
        </Button>
@@ -258,8 +267,8 @@ const ViewManageModal = ({
        view={editedView}
        visible={isCreateViewModalVisible}
        handleCancel={(data) => {
-          cronViewChange(data);
          setIsCreateViewModalVisible(false);
+          cronViewChange(data);
        }}
      />
    </Modal>
@@ -27,8 +27,11 @@ import DependenceModal from './modal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
-import { getTableScroll } from '@/utils/index';
 import DependenceLogModal from './logModal';
+import { useOutletContext } from '@umijs/max';
+import { SharedContext } from '@/layouts';
+import useTableScrollHeight from '@/hooks/useTableScrollHeight';
+

 const { Text } = Typography;
 const { Search } = Input;
@@ -48,7 +51,9 @@ enum StatusColor {
  'error',
 }

-const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
+const Dependence = () => {
+  const { headerStyle, isPhone, socketMessage } =
+    useOutletContext<SharedContext>();
  const columns: any = [
    {
      title: '序号',
@@ -160,10 +165,11 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
  const [editedDependence, setEditedDependence] = useState();
  const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
  const [searchText, setSearchText] = useState('');
-  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
  const [logDependence, setLogDependence] = useState<any>();
  const [isLogModalVisible, setIsLogModalVisible] = useState(false);
  const [type, setType] = useState('nodejs');
+  const tableRef = useRef<any>();
+  const tableScrollHeight = useTableScrollHeight(tableRef, 59)

  const getDependencies = () => {
    setLoading(true);
@@ -171,8 +177,10 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
      .get(
        `${config.apiPrefix}dependencies?searchValue=${searchText}&type=${type}`,
      )
-      .then((data: any) => {
-        setValue(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setValue(data);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -208,18 +216,14 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
          .delete(`${config.apiPrefix}dependencies${force ? '/force' : ''}`, {
            data: [record.id],
          })
-          .then((data: any) => {
-            if (data.code === 200) {
-              if (force) {
-                const i = value.findIndex((x) => x.id === data.data[0].id);
-                if (i !== -1) {
-                  const result = [...value];
-                  result.splice(i, 1);
-                  setValue(result);
-                }
+          .then(({ code, data }) => {
+            if (code === 200 && force) {
+              const i = value.findIndex((x) => x.id === data.data[0].id);
+              if (i !== -1) {
+                const result = [...value];
+                result.splice(i, 1);
+                setValue(result);
              }
-            } else {
-              message.error(data);
            }
          });
      },
@@ -246,11 +250,9 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
          .put(`${config.apiPrefix}dependencies/reinstall`, {
            data: [record.id],
          })
-          .then((data: any) => {
-            if (data.code === 200) {
-              handleDependence(data.data[0]);
-            } else {
-              message.error(data);
+          .then(({ code, data }) => {
+            if (code === 200) {
+              handleDependence(data[0]);
            }
          });
      },
@@ -282,16 +284,10 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {

  const onSelectChange = (selectedIds: any[]) => {
    setSelectedRowIds(selectedIds);
-
-    setTimeout(() => {
-      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-      }
-    });
  };

  const rowSelection = {
-    selectedRowIds,
+    selectedRowKeys: selectedRowIds,
    onChange: onSelectChange,
  };

@@ -305,12 +301,32 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
          .delete(`${config.apiPrefix}dependencies${forceUrl}`, {
            data: selectedRowIds,
          })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
+              setSelectedRowIds([]);
+              getDependencies();
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const handlereInstallDependencies = () => {
+    Modal.confirm({
+      title: '确认重新安装',
+      content: <>确认重新安装选中的依赖吗</>,
+      onOk() {
+        request
+          .put(`${config.apiPrefix}dependencies/reinstall`, {
+            data: selectedRowIds,
+          })
+          .then(({ code, data }) => {
+            if (code === 200) {
              setSelectedRowIds([]);
              getDependencies();
-            } else {
-              message.error(data);
            }
          });
      },
@@ -323,15 +339,17 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
  const getDependenceDetail = (dependence: any) => {
    request
      .get(`${config.apiPrefix}dependencies/${dependence.id}`)
-      .then((data: any) => {
-        const index = value.findIndex((x) => x.id === dependence.id);
-        const result = [...value];
-        if (index !== -1) {
-          result.splice(index, 1, {
-            ...dependence,
-            ...data.data,
-          });
-          setValue(result);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          const index = value.findIndex((x) => x.id === dependence.id);
+          const result = [...value];
+          if (index !== -1) {
+            result.splice(index, 1, {
+              ...dependence,
+              ...data,
+            });
+            setValue(result);
+          }
        }
      })
      .finally(() => setLoading(false));
@@ -345,12 +363,6 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
    getDependencies();
  }, [searchText, type]);

-  useEffect(() => {
-    setTimeout(() => {
-      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-    });
-  }, []);
-
  useEffect(() => {
    if (logDependence) {
      localStorage.setItem('logDependence', logDependence.id);
@@ -399,46 +411,8 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
    }
  }, [socketMessage]);

-  const panelContent = () => (
-    <>
-      {selectedRowIds.length > 0 && (
-        <div style={{ marginBottom: 16 }}>
-          <Button
-            type="primary"
-            style={{ marginBottom: 5, marginLeft: 8 }}
-            onClick={() => delDependencies(false)}
-          >
-            批量删除
-          </Button>
-          <Button
-            type="primary"
-            style={{ marginBottom: 5, marginLeft: 8 }}
-            onClick={() => delDependencies(true)}
-          >
-            批量强制删除
-          </Button>
-          <span style={{ marginLeft: 8 }}>
-            已选择
-            <a>{selectedRowIds?.length}</a>项
-          </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}
-        />
-      </DndProvider>
-    </>
-  );
-
  const onTabChange = (activeKey: string) => {
+    setSelectedRowIds([]);
    setType(activeKey);
  };

@@ -467,17 +441,64 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
        size="small"
        tabPosition="top"
        onChange={onTabChange}
-      >
-        <Tabs.TabPane tab="NodeJs" key="nodejs">
-          {panelContent()}
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="Python3" key="python3">
-          {panelContent()}
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="Linux" key="linux">
-          {panelContent()}
-        </Tabs.TabPane>
-      </Tabs>
+        items={[
+          {
+            key: 'nodejs',
+            label: 'NodeJs',
+          },
+          {
+            key: 'python3',
+            label: 'Python3',
+          },
+          {
+            key: 'linux',
+            label: 'Linux',
+          },
+        ]}
+      />
+      <div ref={tableRef}>
+        {selectedRowIds.length > 0 && (
+          <div style={{ marginBottom: 16 }}>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5, marginLeft: 8 }}
+              onClick={() => handlereInstallDependencies()}
+            >
+              批量安装
+            </Button>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5, marginLeft: 8 }}
+              onClick={() => delDependencies(false)}
+            >
+              批量删除
+            </Button>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5, marginLeft: 8 }}
+              onClick={() => delDependencies(true)}
+            >
+              批量强制删除
+            </Button>
+            <span style={{ marginLeft: 8 }}>
+              已选择
+              <a>{selectedRowIds?.length}</a>项
+            </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}
+          />
+        </DndProvider>
+      </div>
      <DependenceModal
        visible={isModalVisible}
        handleCancel={handleCancel}
@@ -48,9 +48,12 @@ const DependenceLogModal = ({
    setLoading(true);
    request
      .get(`${config.apiPrefix}dependencies/${dependence.id}`)
-      .then((data: any) => {
-        if (localStorage.getItem('logDependence') === String(dependence.id)) {
-          const log = (data.data.log || []).join('') as string;
+      .then(({ code, data }) => {
+        if (
+          code === 200 &&
+          localStorage.getItem('logDependence') === String(dependence.id)
+        ) {
+          const log = (data.log || []).join('') as string;
          setValue(log);
          setExecuting(!log.includes('结束时间'));
          setIsRemoveFailed(log.includes('删除失败'));
@@ -67,8 +70,10 @@ const DependenceLogModal = ({
      .delete(`${config.apiPrefix}dependencies/force`, {
        data: [dependence.id],
      })
-      .then((data: any) => {
-        cancel(true);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          cancel(true);
+        }
      })
      .finally(() => {
        setRemoveLoading(false);
@@ -112,7 +117,7 @@ const DependenceLogModal = ({
  return (
    <Modal
      title={titleElement()}
-      visible={visible}
+      open={visible}
      centered
      className="log-modal"
      bodyStyle={{
@@ -52,11 +52,11 @@ const DependenceModal = ({
          data: payload,
        },
      );
-      if (code !== 200) {
-        message.error(data);
+
+      if (code === 200) {
+        handleCancel(data);
      }
      setLoading(false);
-      handleCancel(data);
    } catch (error) {
      setLoading(false);
    }
@@ -69,7 +69,7 @@ const DependenceModal = ({
  return (
    <Modal
      title={dependence ? '编辑依赖' : '新建依赖'}
-      visible={visible}
+      open={visible}
      forceRender
      centered
      maskClosable={false}
@@ -99,7 +99,9 @@ const DependenceModal = ({
        >
          <Select>
            {config.dependenceTypes.map((x, i) => (
-              <Option value={i}>{x}</Option>
+              <Option key={i} value={i}>
+                {x}
+              </Option>
            ))}
          </Select>
        </Form.Item>
@@ -17,4 +17,8 @@
  .ant-form-item {
    margin-bottom: 8px;
  }
+
+  + section {
+    height: calc(100% - 40px) !important;
+  }
 }
@@ -6,10 +6,13 @@ import { request } from '@/utils/http';
 import './index.less';
 import { DiffEditor } from '@monaco-editor/react';
 import ReactDiffViewer from 'react-diff-viewer';
+import { useOutletContext } from '@umijs/max';
+import { SharedContext } from '@/layouts';

 const { Option } = Select;

-const Diff = ({ headerStyle, isPhone, theme }: any) => {
+const Diff = () => {
+  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
  const [origin, setOrigin] = useState('config.sample.sh');
  const [current, setCurrent] = useState('config.sh');
  const [originValue, setOriginValue] = useState('');
@@ -19,15 +22,23 @@ const Diff = ({ headerStyle, isPhone, theme }: any) => {
  const editorRef = useRef<any>(null);

  const getConfig = () => {
-    request.get(`${config.apiPrefix}configs/${current}`).then((data) => {
-      setCurrentValue(data.data);
-    });
+    request
+      .get(`${config.apiPrefix}configs/${current}`)
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setCurrentValue(data);
+        }
+      });
  };

  const getSample = () => {
-    request.get(`${config.apiPrefix}configs/${origin}`).then((data) => {
-      setOriginValue(data.data);
-    });
+    request
+      .get(`${config.apiPrefix}configs/${origin}`)
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setOriginValue(data);
+        }
+      });
  };

  const updateConfig = () => {
@@ -39,8 +50,10 @@ const Diff = ({ headerStyle, isPhone, theme }: any) => {
      .post(`${config.apiPrefix}configs/save`, {
        data: { content, name: current },
      })
-      .then((data: any) => {
-        message.success(data.message);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          message.success('保存成功');
+        }
      });
  };

@@ -48,8 +61,10 @@ const Diff = ({ headerStyle, isPhone, theme }: any) => {
    setLoading(true);
    request
      .get(`${config.apiPrefix}configs/files`)
-      .then((data: any) => {
-        setFiles(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setFiles(data);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -95,7 +110,9 @@ const Diff = ({ headerStyle, isPhone, theme }: any) => {
          <Form.Item label="源文件">
            <Select value={origin} onChange={originFileChange}>
              {files.map((x) => (
-                <Option value={x.value}>{x.title}</Option>
+                <Option key={x.value} value={x.value}>
+                  {x.title}
+                </Option>
              ))}
            </Select>
          </Form.Item>
@@ -104,7 +121,9 @@ const Diff = ({ headerStyle, isPhone, theme }: any) => {
          <Form.Item label="当前文件">
            <Select value={current} onChange={currentFileChange}>
              {files.map((x) => (
-                <Option value={x.value}>{x.title}</Option>
+                <Option key={x.value} value={x.value}>
+                  {x.title}
+                </Option>
              ))}
            </Select>
          </Form.Item>
@@ -17,19 +17,22 @@ const EditNameModal = ({

  const handleOk = async (values: any) => {
    setLoading(true);
-    const { code, data } = await request.put(`${config.apiPrefix}envs/name`, {
-      data: {
-        ids,
-        name: values.name,
-      },
-    });
-    if (code === 200) {
-      message.success('更新环境变量名称成功');
-    } else {
-      message.error(data);
+    try {
+      const { code, data } = await request.put(`${config.apiPrefix}envs/name`, {
+        data: {
+          ids,
+          name: values.name,
+        },
+      });
+
+      if (code === 200) {
+        message.success('更新环境变量名称成功');
+        handleCancel();
+      }
+      setLoading(false);
+    } catch (error) {
+      setLoading(false);
    }
-    setLoading(false);
-    handleCancel();
  };

  useEffect(() => {
@@ -39,7 +42,7 @@ const EditNameModal = ({
  return (
    <Modal
      title="修改环境变量名称"
-      visible={visible}
+      open={visible}
      forceRender
      centered
      maskClosable={false}
@@ -9,6 +9,8 @@ import {
  Typography,
  Tooltip,
  Input,
+  UploadProps,
+  Upload,
 } from 'antd';
 import {
  EditOutlined,
@@ -16,6 +18,7 @@ import {
  SyncOutlined,
  CheckCircleOutlined,
  StopOutlined,
+  UploadOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -25,7 +28,10 @@ import EditNameModal from './editNameModal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
-import { exportJson, getTableScroll } from '@/utils/index';
+import { exportJson } from '@/utils/index';
+import { useOutletContext } from '@umijs/max';
+import { SharedContext } from '@/layouts';
+import useTableScrollHeight from '@/hooks/useTableScrollHeight';

 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -96,7 +102,8 @@ const DragableBodyRow = ({
  );
 };

-const Env = ({ headerStyle, isPhone, theme }: any) => {
+const Env = () => {
+  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
  const columns: any = [
    {
      title: '序号',
@@ -128,6 +135,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
              textAlign: 'left',
            }}
            ellipsis={{ tooltip: text, rows: 2 }}
+            copyable
          >
            {text}
          </Paragraph>
@@ -246,14 +254,18 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
  const [editedEnv, setEditedEnv] = useState();
  const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
  const [searchText, setSearchText] = useState('');
-  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
+  const [importLoading, setImportLoading] = useState(false);
+  const tableRef = useRef<any>();
+  const tableScrollHeight = useTableScrollHeight(tableRef, 59)

  const getEnvs = () => {
    setLoading(true);
    request
      .get(`${config.apiPrefix}envs?searchValue=${searchText}`)
-      .then((data: any) => {
-        setValue(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setValue(data);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -274,15 +286,14 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
      onOk() {
        request
          .put(
-            `${config.apiPrefix}envs/${
-              record.status === Status.已禁用 ? 'enable' : 'disable'
+            `${config.apiPrefix}envs/${record.status === Status.已禁用 ? 'enable' : 'disable'
            }`,
            {
              data: [record.id],
            },
          )
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              message.success(
                `${record.status === Status.已禁用 ? '启用' : '禁用'}成功`,
              );
@@ -294,8 +305,6 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
                status: newStatus,
              });
              setValue(result);
-            } else {
-              message.error(data);
            }
          });
      },
@@ -330,14 +339,12 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
      onOk() {
        request
          .delete(`${config.apiPrefix}envs`, { data: [record.id] })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              message.success('删除成功');
              const result = [...value];
              result.splice(index, 1);
              setValue(result);
-            } else {
-              message.error(data);
            }
          });
      },
@@ -387,14 +394,12 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
        .put(`${config.apiPrefix}envs/${dragRow.id}/move`, {
          data: { fromIndex: dragIndex, toIndex: hoverIndex },
        })
-        .then((data: any) => {
-          if (data.code === 200) {
+        .then(({ code, data }) => {
+          if (code === 200) {
            const newData = [...value];
            newData.splice(dragIndex, 1);
            newData.splice(hoverIndex, 0, { ...dragRow, ...data.data });
            setValue([...newData]);
-          } else {
-            message.error(data);
          }
        });
    },
@@ -403,16 +408,10 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {

  const onSelectChange = (selectedIds: any[]) => {
    setSelectedRowIds(selectedIds);
-
-    setTimeout(() => {
-      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-      }
-    });
  };

  const rowSelection = {
-    selectedRowIds,
+    selectedRowKeys: selectedRowIds,
    onChange: onSelectChange,
  };

@@ -423,13 +422,11 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
      onOk() {
        request
          .delete(`${config.apiPrefix}envs`, { data: selectedRowIds })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              message.success('批量删除成功');
              setSelectedRowIds([]);
              getEnvs();
-            } else {
-              message.error(data);
            }
          });
      },
@@ -448,11 +445,9 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
          .put(`${config.apiPrefix}envs/${OperationPath[operationStatus]}`, {
            data: selectedRowIds,
          })
-          .then((data: any) => {
-            if (data.code === 200) {
+          .then(({ code, data }) => {
+            if (code === 200) {
              getEnvs();
-            } else {
-              message.error(data);
            }
          });
      },
@@ -477,16 +472,37 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
    setSearchText(value.trim());
  };

+  const uploadProps: UploadProps = {
+    accept: 'application/json',
+    beforeUpload: async (file) => {
+      const formData = new FormData();
+      formData.append('env', file);
+      setImportLoading(true);
+      try {
+        const { code, data } = await request.post(
+          `${config.apiPrefix}envs/upload`,
+          {
+            data: formData,
+          },
+        );
+
+        if (code === 200) {
+          message.success(`成功上传${data.length}个环境变量`);
+          getEnvs();
+        }
+        setImportLoading(false);
+      } catch (error: any) {
+        setImportLoading(false);
+      }
+      return false;
+    },
+    fileList: [],
+  };
+
  useEffect(() => {
    getEnvs();
  }, [searchText]);

-  useEffect(() => {
-    setTimeout(() => {
-      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-    });
-  }, []);
-
  return (
    <PageContainer
      className="ql-container-wrapper env-wrapper"
@@ -499,6 +515,15 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
          loading={loading}
          onSearch={onSearch}
        />,
+        <Upload {...uploadProps}>
+          <Button
+            type="primary"
+            icon={<UploadOutlined />}
+            loading={importLoading}
+          >
+            导入
+          </Button>
+        </Upload>,
        <Button key="2" type="primary" onClick={() => addEnv()}>
          新建变量
        </Button>,
@@ -552,6 +577,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
      )}
      <DndProvider backend={HTML5Backend}>
        <Table
+          ref={tableRef}
          columns={columns}
          rowSelection={rowSelection}
          pagination={false}
@@ -561,7 +587,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
          scroll={{ x: 1000, y: tableScrollHeight }}
          components={components}
          loading={loading}
-          onRow={(record: any, index: number) => {
+          onRow={(record: any, index: number | undefined) => {
            return {
              index,
              moveRow,
@@ -40,13 +40,12 @@ const EnvModal = ({
      const { code, data } = await request[method](`${config.apiPrefix}envs`, {
        data: payload,
      });
+
      if (code === 200) {
        message.success(env ? '更新变量成功' : '新建变量成功');
-      } else {
-        message.error(data);
+        handleCancel(data);
      }
      setLoading(false);
-      handleCancel(data);
    } catch (error: any) {
      setLoading(false);
    }
@@ -59,7 +58,7 @@ const EnvModal = ({
  return (
    <Modal
      title={env ? '编辑变量' : '新建变量'}
-      visible={visible}
+      open={visible}
      forceRender
      centered
      maskClosable={false}
@@ -3,11 +3,13 @@ import config from '@/utils/config';
 import { request } from '@/utils/http';
 import Terminal, { ColorMode, LineType } from '../../components/terminal';
 import { PageLoading } from '@ant-design/pro-layout';
-import { history } from 'umi';
+import { history, useOutletContext } from '@umijs/max';
 import Ansi from 'ansi-to-react';
 import './index.less';
+import { SharedContext } from '@/layouts';

-const Error = ({ user, theme }: any) => {
+const Error = () => {
+  const { user, theme } = useOutletContext<SharedContext>();
  const [loading, setLoading] = useState(false);
  const [data, setData] = useState('暂无日志');

@@ -15,8 +17,10 @@ const Error = ({ user, theme }: any) => {
    setLoading(true);
    request
      .get(`${config.apiPrefix}public/panel/log`)
-      .then((data: any) => {
-        setData(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setData(data);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -10,7 +10,7 @@ import {
  Select,
 } from 'antd';
 import config from '@/utils/config';
-import { history } from 'umi';
+import { history } from '@umijs/max';
 import styles from './index.less';
 import { request } from '@/utils/http';

@@ -41,11 +41,9 @@ const Initialization = () => {
          password: values.password,
        },
      })
-      .then((data) => {
-        if (data.code === 200) {
+      .then(({ code, data }) => {
+        if (code === 200) {
          next();
-        } else {
-          message.error(data.message);
        }
      })
      .finally(() => setLoading(false));
@@ -59,11 +57,9 @@ const Initialization = () => {
          ...values,
        },
      })
-      .then((_data: any) => {
-        if (_data && _data.code === 200) {
+      .then(({ code, data }) => {
+        if (code === 200) {
          next();
-        } else {
-          message.error(_data.message);
        }
      })
      .finally(() => setLoading(false));
@@ -116,12 +112,15 @@ const Initialization = () => {
              {config.notificationModes
                .filter((x) => x.value !== 'closed')
                .map((x) => (
-                  <Option value={x.value}>{x.label}</Option>
+                  <Option key={x.value} value={x.value}>
+                    {x.label}
+                  </Option>
                ))}
            </Select>
          </Form.Item>
          {fields.map((x) => (
            <Form.Item
+              key={x.label}
              label={x.label}
              name={x.label}
              extra={x.tip}
@@ -233,7 +232,7 @@ const Initialization = () => {
          <img
            alt="logo"
            className={styles.logo}
-            src="http://qn.whyour.cn/logo.png"
+            src="https://qn.whyour.cn/logo.png"
          />
          <span className={styles.title}>初始化配置</span>
        </div>
@@ -6,8 +6,7 @@
    overflow: hidden;
    position: relative;
    background-color: @component-background;
-    height: calc(100vh - 128px);
-    height: calc(100vh - var(--vh-offset, 0px) - 128px);
+    height: 100%;
    display: flex;
    flex-direction: column;
  }
@@ -1,5 +1,15 @@
 import { useState, useEffect, useCallback, Key, useRef } from 'react';
-import { TreeSelect, Tree, Input, Empty } from 'antd';
+import {
+  TreeSelect,
+  Tree,
+  Input,
+  Empty,
+  Button,
+  message,
+  Modal,
+  Tooltip,
+  Typography,
+} from 'antd';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
 import Editor from '@monaco-editor/react';
@@ -7,53 +17,36 @@ import { request } from '@/utils/http';
 import styles from './index.module.less';
 import { Controlled as CodeMirror } from 'react-codemirror2';
 import SplitPane from 'react-split-pane';
+import { useOutletContext } from '@umijs/max';
+import { SharedContext } from '@/layouts';
+import { DeleteOutlined } from '@ant-design/icons';
+import { depthFirstSearch } from '@/utils';
+import debounce from 'lodash/debounce';
+import uniq from 'lodash/uniq';
+import useFilterTreeData from '@/hooks/useFilterTreeData';

-function getFilterData(keyword: string, data: any) {
-  const expandedKeys: string[] = [];
-  if (keyword) {
-    const tree: any = [];
-    data.forEach((item: any) => {
-      if (item.title.toLocaleLowerCase().includes(keyword)) {
-        tree.push(item);
-      } else {
-        const children: any[] = [];
-        (item.children || []).forEach((subItem: any) => {
-          if (subItem.title.toLocaleLowerCase().includes(keyword)) {
-            children.push(subItem);
-          }
-        });
-        if (children.length > 0) {
-          tree.push({
-            ...item,
-            children,
-          });
-          expandedKeys.push(item.key);
-        }
-      }
-    });
-    return { tree, expandedKeys };
-  }
-  return { tree: data, expandedKeys };
-}
+const { Text } = Typography;

-const Log = ({ headerStyle, isPhone, theme }: any) => {
-  const [title, setTitle] = useState('请选择日志文件');
+const Log = () => {
+  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
  const [value, setValue] = useState('请选择日志文件');
-  const [select, setSelect] = useState<any>();
+  const [select, setSelect] = useState<string>('');
  const [data, setData] = useState<any[]>([]);
-  const [filterData, setFilterData] = useState<any[]>([]);
  const [loading, setLoading] = useState(false);
  const [height, setHeight] = useState<number>();
  const treeDom = useRef<any>();
  const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
+  const [currentNode, setCurrentNode] = useState<any>();
+  const [searchValue, setSearchValue] = useState('');

  const getLogs = () => {
    setLoading(true);
    request
      .get(`${config.apiPrefix}logs`)
-      .then((data) => {
-        setData(data.data);
-        setFilterData(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setData(data);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -61,18 +54,27 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
  const getLog = (node: any) => {
    request
      .get(`${config.apiPrefix}logs/${node.title}?path=${node.parent || ''}`)
-      .then((data) => {
-        setValue(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setValue(data);
+        }
      });
  };

  const onSelect = (value: any, node: any) => {
+    setCurrentNode(node);
+    setSelect(value);
+
    if (node.key === select || !value) {
      return;
    }
+
+    if (node.type === 'directory') {
+      setValue('请选择日志文件');
+      return;
+    }
+
    setValue('加载中...');
-    setSelect(value);
-    setTitle(node.key);
    getLog(node);
  };

@@ -83,41 +85,130 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
  const onSearch = useCallback(
    (e) => {
      const keyword = e.target.value;
-      const { tree, expandedKeys } = getFilterData(
-        keyword.toLocaleLowerCase(),
-        data,
-      );
-      setFilterData(tree);
-      setExpandedKeys(expandedKeys);
+      debounceSearch(keyword);
    },
-    [data, setFilterData],
+    [data],
+  );
+
+  const debounceSearch = useCallback(
+    debounce((keyword) => {
+      setSearchValue(keyword);
+    }, 300),
+    [data],
+  );
+
+  const { treeData: filterData, keys: searchExpandedKeys } = useFilterTreeData(
+    data,
+    searchValue,
+    { treeNodeFilterProp: 'title' },
  );

+  useEffect(() => {
+    setExpandedKeys(uniq([...expandedKeys, ...searchExpandedKeys]));
+  }, [searchExpandedKeys]);
+
+  const deleteFile = () => {
+    Modal.confirm({
+      title: `确认删除`,
+      content: (
+        <>
+          确认删除
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {select}
+          </Text>
+          文件{currentNode.type === 'directory' ? '夹下所以日志' : ''}
+          ，删除后不可恢复
+        </>
+      ),
+      onOk() {
+        request
+          .delete(`${config.apiPrefix}logs`, {
+            data: {
+              filename: currentNode.title,
+              path: currentNode.parent || '',
+              type: currentNode.type,
+            },
+          })
+          .then(({ code }) => {
+            if (code === 200) {
+              message.success(`删除成功`);
+              let newData = [...data];
+              if (currentNode.parent) {
+                newData = depthFirstSearch(
+                  newData,
+                  (c) => c.key === currentNode.key,
+                );
+              } else {
+                const index = newData.findIndex(
+                  (x) => x.key === currentNode.key,
+                );
+                if (index !== -1) {
+                  newData.splice(index, 1);
+                }
+              }
+              setData(newData);
+              initState();
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const initState = () => {
+    setSelect('');
+    setCurrentNode(null);
+    setValue('请选择脚本文件');
+  };
+
+  const onExpand = (expKeys: any) => {
+    setExpandedKeys(expKeys);
+  };
+
  useEffect(() => {
    getLogs();
-    if (treeDom && treeDom.current) {
+  }, []);
+
+  useEffect(() => {
+    if (treeDom.current) {
      setHeight(treeDom.current.clientHeight);
    }
-  }, []);
+  }, [treeDom.current, data]);

  return (
    <PageContainer
      className="ql-container-wrapper log-wrapper"
-      title={title}
+      title={select}
      loading={loading}
      extra={
-        isPhone && [
-          <TreeSelect
-            className="log-select"
-            value={select}
-            dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-            treeData={data}
-            placeholder="请选择日志"
-            fieldNames={{ value: 'key', label: 'title' }}
-            showSearch
-            onSelect={onSelect}
-          />,
-        ]
+        isPhone
+          ? [
+              <TreeSelect
+                treeExpandAction="click"
+                className="log-select"
+                value={select}
+                dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+                treeData={data}
+                placeholder="请选择日志"
+                fieldNames={{ value: 'key' }}
+                treeNodeFilterProp="title"
+                showSearch
+                allowClear
+                onSelect={onSelect}
+              />,
+            ]
+          : [
+              <Tooltip title="删除">
+                <Button
+                  type="primary"
+                  disabled={!select}
+                  onClick={deleteFile}
+                  icon={<DeleteOutlined />}
+                />
+              </Tooltip>,
+            ]
      }
      header={{
        style: headerStyle,
@@ -125,6 +216,7 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
    >
      <div className={`${styles['log-container']} log-container`}>
        {!isPhone && (
+          /*// @ts-ignore*/
          <SplitPane split="vertical" size={200} maxSize={-100}>
            <div className={styles['left-tree-container']}>
              {data.length > 0 ? (
@@ -137,6 +229,7 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
                  ></Input.Search>
                  <div className={styles['left-tree-scroller']} ref={treeDom}>
                    <Tree
+                      expandAction="click"
                      className={styles['left-tree']}
                      treeData={filterData}
                      showIcon={true}
@@ -144,6 +237,8 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
                      selectedKeys={[select]}
                      showLine={{ showLeafIcon: true }}
                      onSelect={onTreeSelect}
+                      expandedKeys={expandedKeys}
+                      onExpand={onExpand}
                    ></Tree>
                  </div>
                </>
@@ -9,16 +9,18 @@ import {
  Statistic,
 } from 'antd';
 import config from '@/utils/config';
-import { history, Link } from 'umi';
+import { history, useOutletContext } from '@umijs/max';
 import styles from './index.less';
 import { request } from '@/utils/http';
 import { useTheme } from '@/utils/hooks';
 import { MobileOutlined } from '@ant-design/icons';
+import { SharedContext } from '@/layouts';

 const FormItem = Form.Item;
 const { Countdown } = Statistic;

-const Login = ({ reloadUser }: any) => {
+const Login = () => {
+  const { reloadUser } = useOutletContext<SharedContext>();
  const [loading, setLoading] = useState(false);
  const [waitTime, setWaitTime] = useState<any>();
  const { theme } = useTheme();
@@ -38,15 +40,7 @@ const Login = ({ reloadUser }: any) => {
        },
      })
      .then((data) => {
-        if (data.code === 420) {
-          setLoginInfo({
-            username: values.username,
-            password: values.password,
-          });
-          setTwoFactor(true);
-        } else {
-          checkResponse(data);
-        }
+        checkResponse(data, values);
        setLoading(false);
      })
      .catch(function (error) {
@@ -62,11 +56,7 @@ const Login = ({ reloadUser }: any) => {
        data: { ...loginInfo, code: values.code },
      })
      .then((data: any) => {
-        if (data.code === 430) {
-          message.error(data.message);
-        } else {
-          checkResponse(data);
-        }
+        checkResponse(data);
        setVerifying(false);
      })
      .catch((error: any) => {
@@ -75,8 +65,11 @@ const Login = ({ reloadUser }: any) => {
      });
  };

-  const checkResponse = (data: any) => {
-    if (data.code === 200) {
+  const checkResponse = (
+    { code, data, message: _message }: any,
+    values?: any,
+  ) => {
+    if (code === 200) {
      const {
        token,
        lastip,
@@ -84,7 +77,7 @@ const Login = ({ reloadUser }: any) => {
        lastlogon,
        retries = 0,
        platform,
-      } = data.data;
+      } = data;
      localStorage.setItem(config.authKey, token);
      notification.success({
        message: '登录成功！',
@@ -103,13 +96,14 @@ const Login = ({ reloadUser }: any) => {
      });
      reloadUser(true);
      history.push('/crontab');
-    } else if (data.code === 100) {
-      message.warn(data.message);
-    } else if (data.code === 410) {
-      message.error(data.message);
-      setWaitTime(data.data);
-    } else {
-      message.error(data.message);
+    } else if (code === 410) {
+      setWaitTime(data);
+    } else if (code === 420) {
+      setLoginInfo({
+        username: values.username,
+        password: values.password,
+      });
+      setTwoFactor(true);
    }
  };

@@ -135,7 +129,7 @@ const Login = ({ reloadUser }: any) => {
          <img
            alt="logo"
            className={styles.logo}
-            src="http://qn.whyour.cn/logo.png"
+            src="https://qn.whyour.cn/logo.png"
          />
          <span className={styles.title}>
            {twoFactor ? '两步验证' : config.siteName}
@@ -7,6 +7,7 @@ import Editor from '@monaco-editor/react';
 import SaveModal from './saveModal';
 import SettingModal from './setting';
 import { useTheme } from '@/utils/hooks';
+import { logEnded } from '@/utils';

 const { Option } = Select;
 const LangMap: any = {
@@ -48,6 +49,7 @@ const EditModal = ({
  const { theme } = useTheme();
  const editorRef = useRef<any>(null);
  const [isRunning, setIsRunning] = useState(false);
+  const [currentPid, setCurrentPid] = useState(null);

  const cancel = () => {
    handleCancel();
@@ -57,6 +59,11 @@ const EditModal = ({
    if (node.key === selectedKey || !value) {
      return;
    }
+
+    if (node.type === 'directory') {
+      return;
+    }
+
    const newMode = LangMap[value.slice(-3)] || '';
    setCNode(node);
    setLanguage(newMode);
@@ -67,8 +74,10 @@ const EditModal = ({
  const getDetail = (node: any) => {
    request
      .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`)
-      .then((data) => {
-        setValue(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setValue(data);
+        }
      });
  };

@@ -83,8 +92,11 @@ const EditModal = ({
          content,
        },
      })
-      .then((data) => {
-        setIsRunning(true);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setIsRunning(true);
+          setCurrentPid(data);
+        }
      });
  };

@@ -92,17 +104,18 @@ const EditModal = ({
    if (!cNode || !cNode.title) {
      return;
    }
-    const content = editorRef.current.getValue().replace(/\r\n/g, '\n');
    request
      .put(`${config.apiPrefix}scripts/stop`, {
        data: {
          filename: cNode.title,
          path: cNode.parent || '',
-          content,
+          pid: currentPid,
        },
      })
-      .then((data) => {
-        setIsRunning(false);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setIsRunning(false);
+        }
      });
  };

@@ -117,7 +130,7 @@ const EditModal = ({
      return;
    }

-    if (_message.includes('执行结束')) {
+    if (logEnded(_message)) {
      setTimeout(() => {
        setIsRunning(false);
      }, 300);
@@ -130,10 +143,13 @@ const EditModal = ({
  }, [socketMessage]);

  useEffect(() => {
+    setLog('');
    if (currentNode) {
      setCNode(currentNode);
      setValue(content as string);
      setSelectedKey(currentNode.key);
+      const newMode = LangMap[currentNode.title.slice(-3)] || '';
+      setLanguage(newMode);
    }
  }, [content, currentNode]);

@@ -144,6 +160,7 @@ const EditModal = ({
      title={
        <>
          <TreeSelect
+            treeExpandAction="click"
            style={{ marginRight: 8, width: 150 }}
            value={selectedKey}
            dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
@@ -214,8 +231,9 @@ const EditModal = ({
      width={'100%'}
      headerStyle={{ padding: '11px 24px' }}
      onClose={cancel}
-      visible={visible}
+      open={visible}
    >
+      {/* @ts-ignore */}
      <SplitPane
        split="vertical"
        minSize={200}
@@ -236,7 +254,14 @@ const EditModal = ({
            editorRef.current = editor;
          }}
        />
-        <pre style={{ height: '100%', whiteSpace: 'break-spaces' }}>{log}</pre>
+        <pre
+          style={{
+            height: '100%',
+            padding: '0 15px',
+          }}
+        >
+          {log}
+        </pre>
      </SplitPane>
      <SaveModal
        visible={saveModalVisible}
@@ -247,7 +272,7 @@ const EditModal = ({
          content:
            editorRef.current &&
            editorRef.current.getValue().replace(/\r\n/g, '\n'),
-          filename: cNode?.title,
+          ...cNode,
        }}
      />
      <SettingModal
@@ -32,32 +32,31 @@ const EditScriptNameModal = ({
  const [loading, setLoading] = useState(false);
  const [dirs, setDirs] = useState<any[]>([]);
  const [file, setFile] = useState<File>();
-  const [type, setType] = useState<'blank' | 'upload'>('blank');
+  const [type, setType] = useState<'blank' | 'upload' | 'directory'>('blank');

  const handleOk = async (values: any) => {
    setLoading(true);
-    values.path = values.path || '';
+    const { path = '', filename: inputFilename, directory = '' } = values;
    const formData = new FormData();
    formData.append('file', file as any);
-    formData.append('filename', values.filename);
-    formData.append('path', values.path);
+    formData.append('filename', inputFilename);
+    formData.append('path', path);
    formData.append('content', '');
+    formData.append('directory', directory);
    request
      .post(`${config.apiPrefix}scripts`, {
        data: formData,
      })
      .then(({ code, data }) => {
        if (code === 200) {
-          message.success('新建文件成功');
-          const key = values.path ? `${values.path}/` : '';
-          const filename = file ? file.name : values.filename;
+          message.success(directory ? '新建文件夹成功' : '新建文件成功');
+          const key = path ? `${path}/` : '';
+          const filename = file ? file.name : inputFilename;
          handleCancel({
            filename,
-            path: values.path,
+            path,
            key: `${key}${filename}`,
          });
-        } else {
-          message.error(data);
        }
        setLoading(false);
      })
@@ -99,8 +98,8 @@ const EditScriptNameModal = ({

  return (
    <Modal
-      title="新建脚本"
-      visible={visible}
+      title="新建"
+      open={visible}
      forceRender
      centered
      maskClosable={false}
@@ -126,18 +125,36 @@ const EditScriptNameModal = ({
        >
          <Radio.Group onChange={typeChange}>
            <Radio value="blank">空文件</Radio>
-            <Radio value="upload">本地上传</Radio>
+            <Radio value="upload">本地文件</Radio>
+            <Radio value="directory">文件夹</Radio>
          </Radio.Group>
        </Form.Item>
        {type === 'blank' && (
          <Form.Item
            name="filename"
            label="文件名"
-            rules={[{ required: true, message: '请输入文件名' }]}
+            rules={[
+              { required: true, message: '请输入文件名' },
+              {
+                validator: (_, value) =>
+                  value.includes('/')
+                    ? Promise.reject(new Error('文件名不能包含斜杠'))
+                    : Promise.resolve(),
+              },
+            ]}
          >
            <Input placeholder="请输入文件名" />
          </Form.Item>
        )}
+        {type === 'directory' && (
+          <Form.Item
+            name="directory"
+            label="文件夹名"
+            rules={[{ required: true, message: '请输入文件夹名' }]}
+          >
+            <Input placeholder="请输入文件夹名" />
+          </Form.Item>
+        )}
        <Form.Item label="父目录" name="path">
          <TreeSelect
            allowClear
@@ -6,8 +6,7 @@
    overflow: hidden;
    position: relative;
    background-color: @component-background;
-    height: calc(100vh - 128px);
-    height: calc(100vh - var(--vh-offset, 0px) - 128px);
+    height: 100%;
    display: flex;
    flex-direction: column;
  }
@@ -33,38 +33,17 @@ import {
 } from '@ant-design/icons';
 import EditScriptNameModal from './editNameModal';
 import debounce from 'lodash/debounce';
-import { history } from 'umi';
+import { history, useOutletContext, useLocation } from '@umijs/max';
+import { parse } from 'query-string';
+import { depthFirstSearch } from '@/utils';
+import { SharedContext } from '@/layouts';
+import useFilterTreeData from '@/hooks/useFilterTreeData';
+import uniq from 'lodash/uniq';
+import IconFont from '@/components/iconfont';
+import RenameModal from './renameModal';

 const { Text } = Typography;

-function getFilterData(keyword: string, data: any) {
-  const expandedKeys: string[] = [];
-  if (keyword) {
-    const tree: any = [];
-    data.forEach((item: any) => {
-      if (item.title.toLocaleLowerCase().includes(keyword)) {
-        tree.push(item);
-      } else {
-        const children: any[] = [];
-        (item.children || []).forEach((subItem: any) => {
-          if (subItem.title.toLocaleLowerCase().includes(keyword)) {
-            children.push(subItem);
-          }
-        });
-        if (children.length > 0) {
-          tree.push({
-            ...item,
-            children,
-          });
-          expandedKeys.push(item.key);
-        }
-      }
-    });
-    return { tree, expandedKeys };
-  }
-  return { tree: data, expandedKeys };
-}
-
 const LangMap: any = {
  '.py': 'python',
  '.js': 'javascript',
@@ -72,12 +51,12 @@ const LangMap: any = {
  '.ts': 'typescript',
 };

-const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
-  const [title, setTitle] = useState('请选择脚本文件');
+const Script = () => {
+  const { headerStyle, isPhone, theme, socketMessage } =
+    useOutletContext<SharedContext>();
  const [value, setValue] = useState('请选择脚本文件');
-  const [select, setSelect] = useState<any>();
+  const [select, setSelect] = useState<string>('');
  const [data, setData] = useState<any[]>([]);
-  const [filterData, setFilterData] = useState<any[]>([]);
  const [loading, setLoading] = useState(false);
  const [mode, setMode] = useState('');
  const [height, setHeight] = useState<number>();
@@ -87,31 +66,40 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
  const [isEditing, setIsEditing] = useState(false);
  const editorRef = useRef<any>(null);
  const [isAddFileModalVisible, setIsAddFileModalVisible] = useState(false);
+  const [isRenameFileModalVisible, setIsRenameFileModalVisible] = useState(false);
  const [currentNode, setCurrentNode] = useState<any>();
  const [expandedKeys, setExpandedKeys] = useState<string[]>([]);

-  const getScripts = () => {
-    setLoading(true);
+  const getScripts = (needLoading: boolean = true) => {
+    needLoading && setLoading(true);
    request
      .get(`${config.apiPrefix}scripts`)
-      .then((data) => {
-        setData(data.data);
-        setFilterData(data.data);
-        initGetScript();
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setData(data);
+          initState();
+          initGetScript();
+        }
      })
-      .finally(() => setLoading(false));
+      .finally(() => needLoading && setLoading(false));
  };

  const getDetail = (node: any) => {
    request
-      .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`)
-      .then((data) => {
-        setValue(data.data);
+      .get(
+        `${config.apiPrefix}scripts/${encodeURIComponent(node.title)}?path=${
+          node.parent || ''
+        }`,
+      )
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setValue(data);
+        }
      });
  };

  const initGetScript = () => {
-    const { p, s } = history.location.query as any;
+    const { p, s } = parse(history.location.search);
    if (s) {
      const vkey = `${p}/${s}`;
      const obj = {
@@ -127,22 +115,24 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
  };

  const onSelect = (value: any, node: any) => {
+    setSelect(node.key);
+    setCurrentNode(node);
+
    if (node.key === select || !value) {
      return;
    }
-    setValue('加载中...');
+
+    if (node.type === 'directory') {
+      setValue('请选择脚本文件');
+      return;
+    }
+
    const newMode = value ? LangMap[value.slice(-3)] : '';
    setMode(isPhone && newMode === 'typescript' ? 'javascript' : newMode);
-    setSelect(node.key);
-    setTitle(node.key);
-    setCurrentNode(node);
+    setValue('加载中...');
    getDetail(node);
  };

-  const onExpand = (expKeys: any) => {
-    setExpandedKeys(expKeys);
-  };
-
  const onTreeSelect = useCallback(
    (keys: Key[], e: any) => {
      const content = editorRef.current
@@ -173,22 +163,30 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
      const keyword = e.target.value;
      debounceSearch(keyword);
    },
-    [data, setFilterData],
+    [data],
  );

  const debounceSearch = useCallback(
    debounce((keyword) => {
      setSearchValue(keyword);
-      const { tree, expandedKeys } = getFilterData(
-        keyword.toLocaleLowerCase(),
-        data,
-      );
-      setExpandedKeys(expandedKeys);
-      setFilterData(tree);
    }, 300),
-    [data, setFilterData],
+    [data],
  );

+  const { treeData: filterData, keys: searchExpandedKeys } = useFilterTreeData(
+    data,
+    searchValue,
+    { treeNodeFilterProp: 'title' },
+  );
+
+  useEffect(() => {
+    setExpandedKeys(uniq([...expandedKeys, ...searchExpandedKeys]));
+  }, [searchExpandedKeys]);
+
+  const onExpand = (expKeys: any) => {
+    setExpandedKeys(expKeys);
+  };
+
  const editFile = () => {
    setTimeout(() => {
      setIsEditing(true);
@@ -226,13 +224,11 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                content,
              },
            })
-            .then((_data: any) => {
-              if (_data.code === 200) {
+            .then(({ code, data }) => {
+              if (code === 200) {
                message.success(`保存成功`);
                setValue(content);
                setIsEditing(false);
-              } else {
-                message.error(_data);
              }
              resolve(null);
            })
@@ -250,10 +246,11 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
      title: `确认删除`,
      content: (
        <>
-          确认删除文件
+          确认删除
          <Text style={{ wordBreak: 'break-all' }} type="warning">
            {select}
-          </Text>{' '}
+          </Text>
+          文件{currentNode.type === 'directory' ? '夹及其子文件' : ''}
          ，删除后不可恢复
        </>
      ),
@@ -263,24 +260,18 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
            data: {
              filename: currentNode.title,
              path: currentNode.parent || '',
+              type: currentNode.type,
            },
          })
-          .then((_data: any) => {
-            if (_data.code === 200) {
+          .then(({ code }) => {
+            if (code === 200) {
              message.success(`删除成功`);
              let newData = [...data];
              if (currentNode.parent) {
-                const parentNodeIndex = newData.findIndex(
-                  (x) => x.key === currentNode.parent,
+                newData = depthFirstSearch(
+                  newData,
+                  (c) => c.key === currentNode.key,
                );
-                const parentNode = newData[parentNodeIndex];
-                const index = parentNode.children.findIndex(
-                  (y) => y.key === currentNode.key,
-                );
-                if (index !== -1 && parentNodeIndex !== -1) {
-                  parentNode.children.splice(index, 1);
-                  newData.splice(parentNodeIndex, 1, { ...parentNode });
-                }
              } else {
                const index = newData.findIndex(
                  (x) => x.key === currentNode.key,
@@ -290,8 +281,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                }
              }
              setData(newData);
-            } else {
-              message.error(_data);
+              initState();
            }
          });
      },
@@ -301,6 +291,15 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
    });
  };

+  const renameFile = () => {
+    setIsRenameFileModalVisible(true);
+  }
+
+  const handleRenameFileCancel = () => {
+    setIsRenameFileModalVisible(false);
+    getScripts(false);
+  }
+
  const addFile = () => {
    setIsAddFileModalVisible(true);
  };
@@ -313,20 +312,17 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
    },
  ) => {
    if (filename) {
-      const newData = [...data];
+      let newData = [...data];
      const _file = { title: filename, key, parent: path };
      if (path) {
-        // TODO: 更新左侧树数据
-        const parentNodeIndex = newData.findIndex((x) => x.key === path);
-        if (parentNodeIndex !== -1) {
-          const parentNode = newData[parentNodeIndex];
-          if (parentNode.children && parentNode.children.length > 0) {
-            parentNode.children.unshift(_file);
-          } else {
-            parentNode.children = [_file];
-          }
-          newData.splice(parentNodeIndex, 1, { ...parentNode });
-        }
+        newData = depthFirstSearch(newData, (c) => c.key === path, _file);
+        const keys = path.split('/');
+        const sKeys: string[] = [];
+        keys.reduce((p, c) => {
+          sKeys.push(p);
+          return `${p}/${c}`;
+        });
+        setExpandedKeys([...expandedKeys, ...sKeys, path]);
      } else {
        newData.unshift(_file);
      }
@@ -344,34 +340,35 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
          filename: currentNode.title,
        },
      })
-      .then((_data: any) => {
-        const blob = new Blob([_data], { type: 'application/json' });
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = currentNode.title;
-        document.documentElement.appendChild(a);
-        a.click();
-        document.documentElement.removeChild(a);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          const blob = new Blob([data], { type: 'application/json' });
+          const url = URL.createObjectURL(blob);
+          const a = document.createElement('a');
+          a.href = url;
+          a.download = currentNode.title;
+          document.documentElement.appendChild(a);
+          a.click();
+          document.documentElement.removeChild(a);
+        }
      });
  };

-  useEffect(() => {
-    const word = searchValue || '';
-    const { tree } = getFilterData(word.toLocaleLowerCase(), data);
-    setFilterData(tree);
+  const initState = () => {
    setSelect('');
    setCurrentNode(null);
-    setTitle('请选择脚本文件');
    setValue('请选择脚本文件');
-  }, [data]);
+  };

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

  const action = (key: string | number) => {
    switch (key) {
@@ -397,6 +394,9 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
      case 'delete':
        deleteFile();
        break;
+      case 'rename':
+        renameFile();
+        break;
      default:
        break;
    }
@@ -423,6 +423,12 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
          icon: <EditOutlined />,
          disabled: !select,
        },
+        {
+          label: '重命名',
+          key: 'rename',
+          icon: <IconFont type="ql-icon-rename" />,
+          disabled: !select,
+        },
        {
          label: '删除',
          key: 'delete',
@@ -440,19 +446,22 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
  return (
    <PageContainer
      className="ql-container-wrapper log-wrapper"
-      title={title}
+      title={select}
      loading={loading}
      extra={
        isPhone
          ? [
              <TreeSelect
+                treeExpandAction="click"
                className="log-select"
                value={select}
                dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
                treeData={data}
                placeholder="请选择脚本"
-                fieldNames={{ value: 'key', label: 'title' }}
+                fieldNames={{ value: 'key' }}
+                treeNodeFilterProp="title"
                showSearch
+                allowClear
                onSelect={onSelect}
              />,
              <Dropdown overlay={menu} trigger={['click']}>
@@ -484,6 +493,14 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                  icon={<EditOutlined />}
                />
              </Tooltip>,
+              <Tooltip title="重命名">
+                <Button
+                  disabled={!select}
+                  type="primary"
+                  onClick={renameFile}
+                  icon={<IconFont type="ql-icon-rename" />}
+                />
+              </Tooltip>,
              <Tooltip title="删除">
                <Button
                  type="primary"
@@ -508,6 +525,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
    >
      <div className={`${styles['log-container']} log-container`}>
        {!isPhone && (
+          /*// @ts-ignore*/
          <SplitPane split="vertical" size={200} maxSize={-100}>
            <div className={styles['left-tree-container']}>
              {data.length > 0 ? (
@@ -520,6 +538,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                  ></Input.Search>
                  <div className={styles['left-tree-scroller']} ref={treeDom}>
                    <Tree
+                      expandAction="click"
                      className={styles['left-tree']}
                      treeData={filterData}
                      showIcon={true}
@@ -556,7 +575,6 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                readOnly: !isEditing,
                fontSize: 12,
                lineNumbersMinChars: 3,
-                folding: false,
                glyphMargin: false,
              }}
              onMount={(editor) => {
@@ -597,6 +615,11 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
          treeData={data}
          handleCancel={addFileModalClose}
        />
+        <RenameModal
+          visible={isRenameFileModalVisible}
+          handleCancel={handleRenameFileCancel}
+          currentNode={currentNode}
+        />
      </div>
    </PageContainer>
  );
@@ -0,0 +1,79 @@
+import React, { useEffect, useState } from 'react';
+import { Modal, message, Input, Form } from 'antd';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+
+const RenameModal = ({
+  currentNode,
+  handleCancel,
+  visible,
+}: {
+  currentNode?: any;
+  visible: boolean;
+  handleCancel: () => void;
+}) => {
+  console.log(currentNode);
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+
+  const handleOk = async (values: any) => {
+    setLoading(true);
+    try {
+      const { code, data } = await request.put(
+        `${config.apiPrefix}scripts/rename`,
+        {
+          data: {
+            filename: currentNode.title,
+            path: currentNode.parent || '',
+            newFilename: values.name,
+          },
+        },
+      );
+
+      if (code === 200) {
+        message.success('更新名称成功');
+        handleCancel();
+      }
+      setLoading(false);
+    } catch (error) {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    form.resetFields();
+  }, [currentNode, visible]);
+
+  return (
+    <Modal
+      title="重命名"
+      open={visible}
+      forceRender
+      centered
+      maskClosable={false}
+      onOk={() => {
+        form
+          .validateFields()
+          .then((values) => {
+            handleOk(values);
+          })
+          .catch((info) => {
+            console.log('Validate Failed:', info);
+          });
+      }}
+      onCancel={() => handleCancel()}
+      confirmLoading={loading}
+    >
+      <Form form={form} layout="vertical" name="edit_name_modal">
+        <Form.Item
+          name="name"
+          rules={[{ required: true, message: '请输入新名称' }]}
+        >
+          <Input placeholder="请输入新名称" />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default RenameModal;
@@ -17,7 +17,7 @@ const SaveModal = ({

  const handleOk = async (values: any) => {
    setLoading(true);
-    const payload = { ...file, ...values, originFilename: file.filename };
+    const payload = { ...file, ...values, originFilename: file.title };
    request
      .post(`${config.apiPrefix}scripts`, {
        data: payload,
@@ -26,8 +26,6 @@ const SaveModal = ({
        if (code === 200) {
          message.success('保存文件成功');
          handleCancel(data);
-        } else {
-          message.error(data);
        }
        setLoading(false);
      });
@@ -41,7 +39,7 @@ const SaveModal = ({
  return (
    <Modal
      title="保存文件"
-      visible={visible}
+      open={visible}
      forceRender
      centered
      maskClosable={false}
@@ -62,7 +60,7 @@ const SaveModal = ({
        form={form}
        layout="vertical"
        name="script_modal"
-        initialValues={file}
+        initialValues={{ filename: file?.title, path: file?.parent || '' }}
      >
        <Form.Item
          name="filename"
@@ -26,8 +26,6 @@ const SettingModal = ({
        if (code === 200) {
          message.success('保存文件成功');
          handleCancel(data);
-        } else {
-          message.error(data);
        }
        setLoading(false);
      });
@@ -41,7 +39,7 @@ const SettingModal = ({
  return (
    <Modal
      title="运行设置"
-      visible={visible}
+      open={visible}
      forceRender
      centered
      onCancel={() => handleCancel()}
@@ -1,16 +1,23 @@
 import React, { useEffect, useState } from 'react';
-import { Typography, Input, Form, Button, message } from 'antd';
+import { Typography, Input, Form, Button, message, Descriptions } from 'antd';
 import styles from './index.less';
+import { SharedContext } from '@/layouts';
+import dayjs from 'dayjs';

 const { Link } = Typography;

-const About = () => {
+enum TVersion {
+  'develop' = '开发版',
+  'master' = '正式版',
+}
+
+const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
  return (
    <div className={styles.container}>
      <img
        alt="logo"
        style={{ width: 140, marginRight: 20 }}
-        src="http://qn.whyour.cn/logo.png"
+        src="https://qn.whyour.cn/logo.png"
      />
      <div className={styles.right}>
        <span className={styles.title}>青龙</span>
@@ -19,6 +26,27 @@ const About = () => {
          task management panel that supports typescript, javaScript, python3,
          and shell.）
        </span>
+        <Descriptions>
+          <Descriptions.Item label="版本" span={3}>
+            {TVersion[systemInfo.branch]} v{systemInfo.version}
+          </Descriptions.Item>
+          <Descriptions.Item label="更新时间" span={3}>
+            {dayjs(systemInfo.lastCommitTime * 1000).format(
+              'YYYY-MM-DD HH:mm:ss',
+            )}
+          </Descriptions.Item>
+          <Descriptions.Item label="更新ID" span={3}>
+            {systemInfo.lastCommitId}
+          </Descriptions.Item>
+          <Descriptions.Item label="更新日志" span={3}>
+            <Link
+              href={`https://qn.whyour.cn/version.yaml?t=${Date.now()}`}
+              target="_blank"
+            >
+              查看
+            </Link>
+          </Descriptions.Item>
+        </Descriptions>
        <div>
          <Link
            href="https://github.com/whyour/qinglong"
@@ -22,16 +22,19 @@ const AppModal = ({
    if (app) {
      payload.id = app.id;
    }
-    const { code, data } = await request[method](`${config.apiPrefix}apps`, {
-      data: payload,
-    });
-    if (code === 200) {
-      message.success(app ? '更新应用成功' : '新建应用成功');
-    } else {
-      message.error(data);
+    try {
+      const { code, data } = await request[method](`${config.apiPrefix}apps`, {
+        data: payload,
+      });
+
+      if (code === 200) {
+        message.success(app ? '更新应用成功' : '新建应用成功');
+        handleCancel(data);
+      }
+      setLoading(false);
+    } catch (error) {
+      setLoading(false);
    }
-    setLoading(false);
-    handleCancel(data);
  };

  useEffect(() => {
@@ -41,7 +44,7 @@ const AppModal = ({
  return (
    <Modal
      title={app ? '编辑应用' : '新建应用'}
-      visible={visible}
+      open={visible}
      forceRender
      centered
      maskClosable={false}
@@ -64,7 +67,18 @@ const AppModal = ({
        name="form_app_modal"
        initialValues={app}
      >
-        <Form.Item name="name" label="名称">
+        <Form.Item
+          name="name"
+          label="名称"
+          rules={[
+            {
+              validator: (_, value) =>
+                ['system'].includes(value)
+                  ? Promise.reject(new Error('名称不能为保留关键字'))
+                  : Promise.resolve(),
+            },
+          ]}
+        >
          <Input placeholder="请输入应用名称" />
        </Form.Item>
        <Form.Item name="scopes" label="权限" rules={[{ required: true }]}>
@@ -75,7 +89,11 @@ const AppModal = ({
            style={{ width: '100%' }}
          >
            {config.scopes.map((x) => {
-              return <Select.Option value={x.value}>{x.name}</Select.Option>;
+              return (
+                <Select.Option key={x.value} value={x.value}>
+                  {x.name}
+                </Select.Option>
+              );
            })}
          </Select>
        </Form.Item>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
whyour	e93cad91b4	更新版本 v2.15.4	2022-12-28 11:15:20 +08:00
whyour	08ee61b179	修改 pub 脚本	2022-12-28 11:14:57 +08:00
whyour	0ab756665e	修改版本文件	2022-12-28 11:06:47 +08:00
whyour	3570cddce0	关于增加更新日志查看	2022-12-27 17:10:21 +08:00
whyour	a2d9f1a5db	脚本管理支持重命名文件/文件夹	2022-12-27 16:02:15 +08:00
whyour	0c6a214e55	修复启动public服务命令	2022-12-27 12:24:24 +08:00
whyour	095fcdbe69	修复任务脚本快捷跳转	2022-12-17 12:46:26 +08:00
whyour	3afb1d18f6	更新版本 v2.15.3	2022-12-10 19:06:39 +08:00
whyour	4526c84330	任务视图支持标签筛选	2022-12-10 19:00:03 +08:00
whyour	a9cc1cb4b9	修改token获取逻辑	2022-12-10 17:12:45 +08:00
whyour	7acf1eace3	修改添加任务视图筛选条件交互	2022-12-09 23:34:23 +08:00
whyour	bb2e8cb287	修复调试保存文件默认目录和任务视图创建	2022-12-09 22:59:38 +08:00
whyour	3b389259c1	修复调试脚本日志	2022-12-06 00:22:05 +08:00
whyour	310ce55b09	修改默认基础镜像	2022-12-05 23:49:33 +08:00
CoolBoyandwhyour	4662e3fec2	修复notify.js中智能微秘书 (#1736 )	2022-12-05 23:44:34 +08:00
whyour	10fab9d415	修改进程默认退出信号	2022-12-05 21:00:14 +08:00
whyour	acecf01cbe	修复 killTask 返回值	2022-12-05 15:38:21 +08:00
whyour	b95fb9cda4	修改退出进程逻辑	2022-12-05 15:26:22 +08:00
whyour	23fd595582	修改 timeout 命令默认信号	2022-12-05 13:18:10 +08:00
whyour	468d05cb10	更新版本 v2.15.2	2022-12-02 18:07:54 +08:00
whyour	88c2e5d160	更新 readme	2022-12-02 18:07:21 +08:00
whyour	8cf491b802	task 命令增加 -m 参数，支持设置任务超时时间	2022-12-01 18:26:24 +08:00
whyour	5886e78299	修复获取更新分支	2022-12-01 16:25:02 +08:00
whyour	591ef9781c	修改获取 cpu 占用	2022-12-01 16:16:17 +08:00
whyour	52fef96c1c	修改check逻辑	2022-11-30 21:29:58 +08:00
whyour	d5fd9c57ec	修复shell语法	2022-11-29 22:50:11 +08:00
whyour	8a7d6a1c13	修改资源检查逻辑	2022-11-29 21:01:28 +08:00
whyour	1745c72981	修改 check/update 逻辑	2022-11-29 00:05:50 +08:00
whyour	b98b7646cb	修复日志样式	2022-11-28 23:59:23 +08:00
whyour	1446e925ec	任务视图增加系统视图	2022-11-26 20:34:07 +08:00
whyour	799cda1e3e	移除未使用依赖	2022-11-24 22:09:33 +08:00
whyour	d2e0231341	修改 workflow node_modules 缓存	2022-11-22 21:33:03 +08:00
whyour	9e0aa655a0	修改 workflow 依赖缓存	2022-11-22 21:00:53 +08:00
whyour	e303c73d44	workflow 增加 digest 打印	2022-11-22 20:03:56 +08:00
whyour	e5e8e66d6b	增加 docker action 缓存	2022-11-22 19:53:02 +08:00
whyour	0bb3381122	修复拉去仓库逻辑	2022-11-22 16:51:57 +08:00
whyour	2c5bf2bd6b	更新 readme	2022-11-22 14:42:27 +08:00
whyour	83763b00ae	上传 pnpm-lock	2022-11-22 13:41:39 +08:00
whyour	47fc795c97	增加action缓存	2022-11-22 13:37:44 +08:00
whyour	6a59bf7af3	更新版本 v2.15.1	2022-11-20 21:04:58 +08:00
whyour	6f185570d6	pushDeer支持自架版	2022-11-20 20:05:02 +08:00
whyour	8b8336d9d0	系统升级增加gitee源	2022-11-17 22:01:47 +08:00
whyour	a1e1d6ed3f	更新 readme	2022-11-17 11:47:44 +08:00
whyour	df3e209534	修改 workflow	2022-11-17 11:37:45 +08:00
whyour	851408860e	修复 workflow	2022-11-17 11:18:15 +08:00
whyour	d92ea23b0e	修改 workflow	2022-11-17 11:11:05 +08:00
whyour	d83641db92	修复workflow	2022-11-17 00:28:28 +08:00
whyour	48f262e1f3	增加 workflow	2022-11-17 00:23:24 +08:00
whyour	bc49a7db50	同步gitee	2022-11-16 23:04:39 +08:00
whyour	49975b461c	修改typescript版本	2022-11-16 22:52:34 +08:00
whyour	3ccb635956	修复移动端最后更新时间展示	2022-11-16 22:34:28 +08:00
whyour	074a90e0ac	修改同步gitlab私钥	2022-11-16 00:02:40 +08:00
whyour	526f927436	增加 gitlab workflow	2022-11-15 23:55:28 +08:00
whyour	fae7fad915	更新版本 v2.15.0	2022-11-15 12:15:06 +08:00
whyour	56132ceb8b	修复初始化新增字段	2022-11-15 12:14:33 +08:00
whyour	3c3fce0a5a	修复初始化表字段	2022-11-15 11:32:42 +08:00
whyour	8139384961	移除filterRelation默认值	2022-11-14 23:31:27 +08:00
whyour	734cc94048	修改filterRelation字段限制	2022-11-14 22:59:01 +08:00
whyour	91dbb7770d	修改订阅github ssh生成逻辑	2022-11-14 22:00:16 +08:00
whyour	707709837d	初始化更新不存在filterRelation的任务视图	2022-11-14 21:36:31 +08:00
whyour	e868e65208	修改日志管理默认排序	2022-11-14 15:12:17 +08:00
whyour	b19ad2a13b	修复debounce方法引入错误	2022-11-14 11:35:51 +08:00
whyour	98ccccf6ab	修复openapi token生成逻辑	2022-11-14 09:28:30 +08:00
whyour	0a6166c557	订阅增加代理参数	2022-11-13 23:58:42 +08:00
whyour	5ee00e52a8	修复新建视图筛选条件样式	2022-11-13 22:12:03 +08:00
whyour	ff2b4e0b2f	订阅支持添加代理	2022-11-12 22:45:46 +08:00
whyour	8fdd8db51b	修改创建任务视图样式	2022-11-11 15:03:27 +08:00
whyour	f113eb7ba8	修改系统设置样式	2022-11-11 14:55:09 +08:00
whyour	40bc25ed5f	修复获取最后commit时间	2022-11-10 10:52:57 +08:00
whyour	cd3eab5d35	修复版本信息展示	2022-11-10 01:34:18 +08:00
whyour	7038e15ad2	支持定时任务视图筛选条件关系切换	2022-11-10 01:31:21 +08:00
whyour	c72abd29ec	任务视图筛选条件增加条件关系	2022-11-09 20:43:22 +08:00
whyour	5efc3d2228	更新版本 v2.14.12	2022-11-05 16:43:28 +08:00
whyour	8ac3f83c79	修复可能出现移动或者创建环境变量出错	2022-11-05 16:41:19 +08:00
whyour	b31b054d0c	更新版本 v2.14.11	2022-11-05 15:24:16 +08:00
whyour	fb4a87f5ce	修复版本文件缓存	2022-11-05 15:23:17 +08:00
whyour	049c73880b	修改pre样式	2022-11-05 14:57:21 +08:00
whyour	7b2c54f6a6	修改版本信息获取	2022-11-05 12:14:46 +08:00
whyour	23bda39812	关于增加版本信息展示	2022-11-05 11:01:58 +08:00
whyour	90af5801ee	修复表格滚动	2022-11-04 19:14:03 +08:00
whyour	543c241bc6	更新版本 v2.14.10	2022-11-03 21:16:46 +08:00
whyour	19a58a3510	环境变量值增加复制功能	2022-11-03 17:34:36 +08:00
whyour	73c6fd18ed	修复资源预警通知	2022-11-03 13:42:14 +08:00
whyour	409297c6aa	修改调试日志样式	2022-11-02 19:54:49 +08:00
whyour	4272b9ea35	修复task命令参数	2022-11-02 19:40:16 +08:00
whyour	3c5c5b0bbc	修复&符号转义	2022-11-02 19:25:03 +08:00
whyour	802b2d722e	修复任务命令中的&和引号	2022-11-02 18:51:09 +08:00
whyour	8f90d3f8ff	修复环境变量位置计算逻辑	2022-11-02 00:02:15 +08:00
whyour	f93cbbf508	修复 notify.js 飞书通知	2022-10-30 18:59:48 +08:00
whyour	2ba8756bd3	修改cdn协议	2022-10-30 12:00:12 +08:00
whyour	8013de56c9	修改sqlite配置	2022-10-30 10:54:39 +08:00
whyour	4af9b22442	更新版本 v2.14.9	2022-10-29 18:50:16 +08:00
whyour	8a392170cf	webhook通知支持嵌套body	2022-10-29 18:43:16 +08:00
whyour	6385e053ae	增加飞书机器人通知	2022-10-29 16:41:37 +08:00
Leo_chenandGitHub	2789119882	添加智能微秘书通知 (#1680 )	2022-10-29 15:45:16 +08:00
whyour	3e0553c3e8	修改登陆逻辑	2022-10-29 10:05:54 +08:00
whyour	5e16ace1e7	修改检查更新日志	2022-10-27 10:34:55 +08:00
whyour	0ca23cc4ca	修改环境变量默认排序	2022-10-27 00:02:50 +08:00
whyour	4949457001	修复ql命令日志打印	2022-10-26 23:50:07 +08:00
whyour	8ae13fe823	增加 -max 指定环境变量	2022-10-26 14:27:14 +08:00
whyour	fdf672092a	修改获取version文件超时时间	2022-10-25 23:52:30 +08:00
whyour	48dd6ea826	修复表格滚动高度	2022-10-25 23:12:38 +08:00
whyour	68bb4f15e2	修复shell获取磁盘使用量	2022-10-24 22:45:06 +08:00
whyour	9c6d9ec22d	更新版本 v2.14.8	2022-10-22 18:36:38 +08:00
whyour	ac075ace73	修复调试脚本语言判断	2022-10-22 00:31:34 +08:00
whyour	eb58774ee9	优化task.sh	2022-10-22 00:25:54 +08:00
whyour	04613bf9a9	修复tsconfig	2022-10-20 15:30:22 +08:00
whyour	4194f1964d	修改日志结束符判定	2022-10-20 15:16:17 +08:00
whyour	42c64c82d7	修复 ql 命令日志目录	2022-10-16 21:59:19 +08:00
whyour	d44a8966f2	修复环境变量名称验证	2022-10-16 09:22:37 +08:00
whyour	ff44330aa1	修复 ql 命令日志目录	2022-10-15 18:40:15 +08:00
whyour	ed259e8168	修复 task 命令执行时参数引号丢失	2022-10-15 18:29:34 +08:00
whyour	444836975d	修改 ql 命令打印日志逻辑	2022-10-14 23:02:20 +08:00
whyour	3756fa93e4	修复 ql 命令	2022-10-14 21:17:04 +08:00
whyour	064b52b306	修改 timezone action	2022-10-14 20:55:58 +08:00
whyour	648dc51474	更新ql指令	2022-10-14 15:17:37 +08:00
whyour	7c0bc32759	修改环境变量导入	2022-10-13 23:41:54 +08:00
whyour	d4b6cc5e4d	修复调试脚本选择脚本	2022-10-13 23:39:28 +08:00
whyour	75fca715e3	增加环境变量导入	2022-10-11 22:16:36 +08:00
whyour	6e9a4a29ef	修复shell语法	2022-10-09 13:49:19 +08:00
whyour	78f643c50f	更新版本v2.14.7	2022-10-01 23:12:57 +08:00
whyour	2db4f1ba87	修改资源判定逻辑	2022-10-01 23:04:12 +08:00
whyour	5741dbb78c	修复获取task_before参数	2022-09-30 15:32:42 +08:00
whyour	88cf671465	更新版本v2.14.6	2022-09-29 23:06:31 +08:00
whyour	29f082dea2	增加config资源配置	2022-09-29 23:03:22 +08:00
whyour	9a55968ed6	修改资源异常推送	2022-09-29 13:29:22 +08:00
whyour	6ec6e25855	修改资源提示	2022-09-29 00:59:27 +08:00
whyour	af48bc378b	修复获取cpu占用	2022-09-29 00:57:31 +08:00
whyour	3f5ae4bcb9	修复 echo	2022-09-29 00:44:07 +08:00
whyour	c6624e9001	增加资源占用提示	2022-09-29 00:43:07 +08:00
whyour	5530ce76e3	添加系统资源消耗提示	2022-09-29 00:32:17 +08:00
whyour	654b51e476	修复脚本和日志搜索逻辑	2022-09-25 21:03:11 +08:00
whyour	6428ac3624	修复SplitPane类型错误	2022-09-25 14:02:27 +08:00
whyour	c36450f436	修复ant-tree高度获取	2022-09-25 13:38:10 +08:00
whyour	dcea231249	更新版本 v2.14.5	2022-09-24 21:00:47 +08:00
whyour	f236119bd6	修改输入框自动填充样式	2022-09-24 14:40:13 +08:00
whyour	cb870fad85	修改检查更新逻辑	2022-09-24 14:20:35 +08:00
whyour	44e2caedfc	修改更新日志清除评率	2022-09-24 13:59:56 +08:00
whyour	c0b5192296	修改移动端脚本高亮	2022-09-24 11:27:16 +08:00
whyour	ba43882c0b	修复脚本管理删除	2022-09-23 23:16:57 +08:00
whyour	dfc706e16d	日志管理支持删除日志文件和目录	2022-09-23 20:09:10 +08:00
whyour	25b03d4345	脚本管理支持删除文件夹	2022-09-23 19:12:51 +08:00
whyour	4e8f36d9a4	修复登录错误提示	2022-09-23 17:44:48 +08:00
whyour	8f4d67ffa7	修改task命令ID获取	2022-09-23 14:37:56 +08:00
whyour	ad47277149	修复登录验证	2022-09-23 12:15:15 +08:00
whyour	98c2a37ab6	修复初始化逻辑	2022-09-23 00:17:53 +08:00
whyour	f2fea47336	重构前端错误提示	2022-09-22 23:59:23 +08:00
whyour	e274d3e2f9	sentry增加版本号	2022-09-22 12:14:42 +08:00
whyour	36f4c3c02c	修改任务启动参数	2022-09-21 21:28:31 +08:00
whyour	ae891f8e55	修复docker启动逻辑	2022-09-21 17:42:13 +08:00
whyour	c874dc9705	更新readme	2022-09-21 16:03:53 +08:00
whyour	23bfbeb995	修改新建订阅提示	2022-09-21 14:54:45 +08:00
whyour	a75df03243	更新版本 2.14.4	2022-09-20 19:59:51 +08:00
whyour	e44a2b5995	修改tsconfig	2022-09-20 19:43:49 +08:00
whyour	f23e7a9e49	修复自定义通知	2022-09-20 19:13:11 +08:00
whyour	e08f0cd308	修复设置自定义通知	2022-09-20 18:00:36 +08:00
whyour	1ebcfd8001	修复自定义通知	2022-09-20 17:34:36 +08:00
whyour	5168b044a3	修复遍历key值	2022-09-20 01:23:33 +08:00
whyour	931638b687	增加自定义hook通知	2022-09-20 01:16:36 +08:00
whyour	4d9bbcfd3f	升级antd	2022-09-19 18:45:56 +08:00
whyour	b0e3b26369	修改环境变量默认排序	2022-09-18 20:47:42 +08:00
whyour	1e55f4065d	升级umi4.0，修复新建脚本	2022-09-18 20:40:59 +08:00
whyour	518e8903a3	兼容Modal属性	2022-09-17 22:50:58 +08:00
whyour	6e56a55f6f	修改弹框表单逻辑	2022-09-16 00:28:04 +08:00
whyour	967071ad4e	脚本管理支持新增文件夹	2022-09-16 00:14:10 +08:00
whyour	d23fcfaa5a	修复创建应用	2022-09-15 23:45:12 +08:00
whyour	a2f2306430	增加批量重新安装依赖	2022-09-11 22:47:43 +08:00
whyour	144b543091	修改依赖管理默认排序	2022-09-11 22:26:33 +08:00
whyour	e4ad8f512e	修改订阅默认排序	2022-09-11 22:10:17 +08:00
whyour	591a5006da	修复运行任务shell	2022-09-11 19:53:57 +08:00
whyour	281ed6cfba	修改任务执行日志目录规则	2022-09-11 19:43:37 +08:00
whyour	7354a61184	修改config配置说明	2022-09-10 14:23:16 +08:00
whyour	04037f29e5	更新版本 v2.14.3	2022-09-10 14:12:26 +08:00
whyour	6b124bad89	修复pnpm registry兼容	2022-09-09 00:21:10 +08:00
whyour	54d99a4954	更新版本 v2.14.2	2022-09-07 19:30:19 +08:00
whyour	9947594366	更新issue模板	2022-09-07 17:28:57 +08:00
whyour	d7ff934336	增加github issue模版	2022-09-07 16:03:15 +08:00
whyour	dc27856441	修复定时任务状态筛选	2022-09-07 11:30:11 +08:00
whyour	bd28682769	排除认证失败错误上报	2022-09-06 23:57:21 +08:00
whyour	2060e62da4	更新sentry版本	2022-09-06 21:50:03 +08:00
whyour	70eac1e747	修改pnpm安装全局模块命令	2022-09-06 15:53:21 +08:00
whyour	6f5a5fe066	修改定时任务打开详情交互	2022-09-06 14:49:42 +08:00
景大侠andGitHub	8d24949202	修复#1614 正确解析多级目录的脚本路径 (#1616 )	2022-09-06 13:25:12 +08:00
whyour	f7b6237355	修复新建任务视图交互	2022-09-06 00:40:06 +08:00
景大侠andGitHub	daf6f94c51	修复任务视图bug (#1612 ) * 修复了视图无排序时无法再次修改的问题 * 修复在视图管理中编辑、新建视图点击确定后不能关闭页面的问题 * 修复#1611 避免查询条件被覆盖 * 修复视图筛选不能正确处理`不包含`	2022-09-06 00:25:05 +08:00
whyour	687d16e21b	增加npm镜像源配置	2022-09-06 00:21:53 +08:00
whyour	70571a9d34	更新版本 v2.14.1	2022-09-04 18:28:28 +08:00
whyour	4da8d8fe1e	修复node pushdeer通知	2022-09-04 18:25:40 +08:00
AppoipandGitHub	952cdc0e3f	添加群晖synology chat通知推送 (#1610 )	2022-09-04 18:10:20 +08:00
whyour	2de189d189	修复视图切换页码初始值	2022-09-03 18:27:52 +08:00
whyour	3edc6e83d7	修复定时任务搜索	2022-09-03 18:23:35 +08:00
				`@@ -0,0 +1 @@`
				`export const LOG_END_SYMBOL = '\n　　　　　　　　　　';`