更新版本 v2.15.13

.env.example

@@ -9,4 +9,5 @@ SECRET='whyour'
 
 QINIU_AK=''
 QINIU_SK=''
-QINIU_SCOPE=''
+QINIU_SCOPE=''
+TEMP=''

.github/workflows/build_docker_image.yml

@@ -5,28 +5,55 @@ on:
     branches:
       - 'master'
       - 'develop'
-    # Sequence of patterns matched against refs/tags
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
   schedule:
     # 参考 https://jasonet.co/posts/scheduled-actions/
-    # note: 这里是GMT时间，北京时间减去八小时即可。如北京时间 22:30 => GMT 14:30
+    - cron: '00 14 * * *' # GMT 15:00 => 北京时间 23:00
-    # minute hour day month dayOfWeek
-    - cron: '00 14 * * *' # GMT 14:00 => 北京时间 22:00
-    #- cron: '30 16 * * *' # GMT 16:30（前一天） => 北京时间 00:30
   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 --frozen-lockfile
-          pnpm install
           pnpm build:front
           pnpm build:back
 
@@ -34,6 +61,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,7 +74,19 @@ 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:
+    if: github.ref != 'refs/heads/master'
+
     needs: build-static
 
     runs-on: ubuntu-latest
@@ -55,7 +97,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: latest
       - uses: actions/setup-node@v3
+        with:
+          cache: 'pnpm'
 
       - name: Setup timezone
         uses: zcong1993/setup-timezone@master
@@ -98,7 +145,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
@@ -106,9 +153,16 @@ jobs:
           build-args: |
             MAINTAINER=${{ github.repository_owner }}
             QL_BRANCH=${{ github.ref_name }}
+            SOURCE_COMMIT=${{ github.sha }}
           network: host
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
-          context: docker/
+          context: .
+          file: ./docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=whyour/qinglong:cache
+          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
+      
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

@@ -5,7 +5,6 @@
 /npm-debug.log*
 /yarn-error.log
 /yarn.lock
-/pnpm-lock.yaml
 /package-lock.json
 
 # production

.umirc.ts

@@ -6,14 +6,16 @@ export default defineConfig({
   antd: {},
   outputPath: 'static/dist',
   fastRefresh: true,
-  favicons: ['/images/favicon.svg'],
+  favicons: ['./images/favicon.svg'],
   mfsu: {
     strategy: 'eager',
   },
+  publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
   proxy: {
     '/api/public': {
       target: 'http://127.0.0.1:5400/',
       changeOrigin: true,
+      pathRewrite: { '^/api/public': '/api/' },
     },
     '/api': {
       target: 'http://127.0.0.1:5600/',

README-en.md

@@ -8,7 +8,7 @@
 
 <div align="center">
 
-Timed task management panel with python3, javaScript, shell, typescript support
+Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 
 [![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
 
@@ -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/229290661-03aabe84-8780-4ef0-8e75-2146f4636130.jpeg)](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
@@ -160,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
@@ -175,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
 

README.md

@@ -8,7 +8,7 @@
 
 <div align="center">
 
-支持python3、javaScript、shell、typescript 的定时任务管理面板
+支持 Python3、JavaScript、Shell、Typescript 的定时任务管理平台
 
 [![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
 
@@ -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/229290661-03aabe84-8780-4ef0-8e75-2146f4636130.jpeg)](https://whyour.cn)
 
 简体中文 | [English](./README-en.md)
 
@@ -41,7 +41,7 @@
 ### 本机部署
 
 ```bash
-# 待完善
+# 待完善，可先参考开发步骤 (windows暂时不支持)
 ```
 
 ### podman 部署
@@ -73,7 +73,6 @@ sudo curl -sSL get.docker.com | sh
 ```
 
 2. 配置国内镜像源
-Configure domestic mirror sources
 
 ```bash
 mkdir -p /etc/docker
@@ -159,7 +158,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. 参数说明
@@ -175,6 +178,7 @@ task <file_path> desi <env_name> <account_number>
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称
 * account_number: 任务执行时指定某个环境变量需要执行的账号序号
+* max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 
 ## 链接
 

back/api/cron.ts

@@ -30,6 +30,7 @@ export default (app: Router) => {
         name: Joi.string().required(),
         sorts: Joi.array().optional().allow(null),
         filters: Joi.array().optional(),
+        filterRelation: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -51,13 +52,18 @@ export default (app: Router) => {
         id: Joi.number().required(),
         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);
+        if (req.body.type === 1) {
-        return res.send({ code: 200, data });
+          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);
       }
@@ -146,6 +152,21 @@ export default (app: Router) => {
     }
   });
 
+  route.get(
+    '/detail',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronService = Container.get(CronService);
+        const data = await cronService.find(req.query as any);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
   route.post(
     '/',
     celebrate({
@@ -154,6 +175,7 @@ export default (app: Router) => {
         schedule: Joi.string().required(),
         name: Joi.string().optional(),
         labels: Joi.array().optional(),
+        sub_id: Joi.number().optional().allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -310,6 +332,7 @@ export default (app: Router) => {
         command: Joi.string().required(),
         schedule: Joi.string().required(),
         name: Joi.string().optional().allow(null),
+        sub_id: Joi.number().optional().allow(null),
         id: Joi.number().required(),
       }),
     }),

back/api/env.ts

@@ -109,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);

back/api/script.ts

@@ -170,7 +170,7 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().allow(''),
-        type: Joi.string().optional()
+        type: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -183,7 +183,7 @@ export default (app: Router) => {
         };
         const filePath = join(config.scriptPath, path, filename);
         if (type === 'directory') {
-          emptyDir(filePath);          
+          emptyDir(filePath);
         } else {
           fs.unlinkSync(filePath);
         }
@@ -255,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);
+      }
+    },
+  );
 };

back/api/subscription.ts

@@ -49,6 +49,9 @@ 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),
+        autoAddCron: Joi.boolean().optional().allow('').allow(null),
+        autoDelCron: Joi.boolean().optional().allow('').allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -177,6 +180,9 @@ 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),
+        autoAddCron: Joi.boolean().optional().allow('').allow(null),
+        autoDelCron: Joi.boolean().optional().allow('').allow(null),
         id: Joi.number().required(),
       }),
     }),

back/api/system.ts

@@ -7,6 +7,14 @@ import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
 import { EnvModel } from '../data/env';
+import {
+  getUniqPath,
+  handleLogPath,
+  parseVersion,
+  promiseExec,
+} from '../config/util';
+import dayjs from 'dayjs';
+
 const route = Router();
 
 export default (app: Router) => {
@@ -18,10 +26,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 { version, changeLog, changeLogLink } = await parseVersion(
-
+        config.versionFile,
-      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
+      );
-      const version = currentVersionFile.match(versionRegx)![1];
+      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 +57,11 @@ export default (app: Router) => {
         data: {
           isInitialized,
           version,
+          lastCommitTime: dayjs(lastCommitTime).unix(),
+          lastCommitId,
+          branch,
+          changeLog,
+          changeLogLink,
         },
       });
     } catch (e) {
@@ -127,4 +152,60 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.put(
+    '/command-run',
+    celebrate({
+      body: Joi.object({
+        command: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const uniqPath = await getUniqPath(req.body.command);
+        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
+        const logPath = `${uniqPath}/${logTime}.log`;
+        res.setHeader('Content-type', 'application/octet-stream');
+        await systemService.run(
+          { ...req.body, logPath },
+          {
+            onEnd: async (cp, endTime, diff) => {
+              res.end();
+            },
+            onError: async (message: string) => {
+              res.write(`\n${message}`);
+              const absolutePath = await handleLogPath(logPath);
+              fs.appendFileSync(absolutePath, `\n${message}`);
+            },
+            onLog: async (message: string) => {
+              res.write(`\n${message}`);
+              const absolutePath = await handleLogPath(logPath);
+              fs.appendFileSync(absolutePath, `\n${message}`);
+            },
+          },
+        );
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/command-stop',
+    celebrate({
+      body: Joi.object({
+        command: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.stop(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };

back/config/const.ts

@@ -1 +1,7 @@
-export const LOG_END_SYMBOL = '\n　　　　　　　　　　';
+export const LOG_END_SYMBOL = '　　　　　';
+
+export const TASK_COMMAND = 'task';
+export const QL_COMMAND = 'ql';
+
+export const TASK_PREFIX = `${TASK_COMMAND} `;
+export const QL_PREFIX = `${QL_COMMAND} `;

back/config/index.ts

@@ -14,7 +14,7 @@ if (!process.env.QL_DIR) {
   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') });
@@ -27,6 +27,7 @@ const bakPath = path.join(dataPath, 'bak/');
 const logPath = path.join(dataPath, 'log/');
 const dbPath = path.join(dataPath, 'db/');
 const uploadPath = path.join(dataPath, 'upload/');
+const sshdPath = path.join(dataPath, 'ssh.d/');
 
 const envFile = path.join(configPath, 'env.sh');
 const confFile = path.join(configPath, 'config.sh');
@@ -40,7 +41,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  ⚠️");
@@ -95,4 +96,5 @@ export default {
   versionFile,
   lastVersionFile,
   sqliteFile,
+  sshdPath,
 };

back/config/subscription.ts

@@ -0,0 +1,42 @@
+import { Subscription } from '../data/subscription';
+import isNil from 'lodash/isNil';
+
+export function formatUrl(doc: Subscription) {
+  let url = doc.url;
+  let host = '';
+  if (doc.type === 'private-repo') {
+    if (doc.pull_type === 'ssh-key') {
+      host = doc.url!.replace(/.*\@([^\:]+)\:.*/, '$1');
+      url = doc.url!.replace(host, doc.alias);
+    } else {
+      host = doc.url!.replace(/.*\:\/\/([^\/]+)\/.*/, '$1');
+      const { username, password } = doc.pull_option as any;
+      url = doc.url!.replace(host, `${username}:${password}@${host}`);
+    }
+  }
+  return { url, host };
+}
+
+export function formatCommand(doc: Subscription, url?: string) {
+  let command = `SUB_ID=${doc.id} ql `;
+  let _url = url || formatUrl(doc).url;
+  const {
+    type,
+    whitelist,
+    blacklist,
+    dependences,
+    branch,
+    extensions,
+    proxy,
+    autoAddCron,
+    autoDelCron,
+  } = doc;
+  if (type === 'file') {
+    command += `raw "${_url}"`;
+  } else {
+    command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${dependences || ''
+      }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}" "${isNil(autoAddCron) ? true : Boolean(autoAddCron)
+      }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
+  }
+  return command;
+}

back/config/util.ts

@@ -4,6 +4,11 @@ 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';
+import config from './index';
+import { TASK_COMMAND } from './const';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -242,6 +247,18 @@ export async function createFile(file: string, data: string = '') {
   });
 }
 
+export async function handleLogPath(
+  logPath: string,
+  data: string = '',
+): Promise<string> {
+  const absolutePath = path.resolve(config.logPath, logPath);
+  const logFileExist = await fileExist(absolutePath);
+  if (!logFileExist) {
+    await createFile(absolutePath, data);
+  }
+  return absolutePath;
+}
+
 export async function concurrentRun(
   fnList: Array<() => Promise<any>> = [],
   max = 5,
@@ -284,6 +301,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 = '',
@@ -303,10 +334,8 @@ export function readDirs(
           key,
           type: 'directory',
           parent: relativePath,
-          children: readDirs(subPath, baseDir).sort(
+          mtime: stats.mtime.getTime(),
-            (a: any, b: any) =>
+          children: readDirs(subPath, baseDir).sort(dirSort),
-              (FileType as any)[a.type] - (FileType as any)[b.type],
-          ),
         };
       }
       return {
@@ -315,11 +344,10 @@ export function readDirs(
         isLeaf: true,
         key,
         parent: relativePath,
+        mtime: stats.mtime.getTime(),
       };
     });
-  return result.sort(
+  return result.sort(dirSort);
-    (a: any, b: any) => (FileType as any)[a.type] - (FileType as any)[b.type],
-  );
 }
 
 export function readDir(
@@ -441,3 +469,85 @@ export function parseBody(
 
   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);
+  // SIGINT 2 程序终止(interrupt)信号，不会打印额外信息
+  if (pids.length) {
+    try {
+      [pid, ...pids].forEach((x) => {
+        process.kill(x, 2);
+      });
+    } catch (error) {}
+  } else {
+    process.kill(pid, 2);
+  }
+}
+
+export async function getPid(name: string) {
+  const taskCommand = `ps -eo pid,command | grep "${name}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
+  const pid = await promiseExec(taskCommand);
+  return pid ? Number(pid) : undefined;
+}
+
+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;
+}
+
+export async function getUniqPath(command: string): Promise<string> {
+  const idStr = `cat ${config.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
+  let id = await promiseExec(idStr);
+
+  if (/^\d\d*\d$/.test(id)) {
+    id = `_${id}`;
+  } else {
+    id = '';
+  }
+
+  const items = command.split(/ +/);
+  let str = items[0];
+  if (items[0] === TASK_COMMAND) {
+    str = items[1];
+  }
+
+  const dotIndex = str.lastIndexOf('.');
+
+  if (dotIndex !== -1) {
+    str = str.slice(0, dotIndex);
+  }
+
+  const slashIndex = str.lastIndexOf('/');
+
+  let tempStr = '';
+  if (slashIndex !== -1) {
+    tempStr = str.slice(0, slashIndex);
+    const _slashIndex = tempStr.lastIndexOf('/');
+    if (_slashIndex !== -1) {
+      tempStr = tempStr.slice(_slashIndex + 1);
+    }
+    str = `${tempStr}_${str.slice(slashIndex + 1)}`;
+  }
+
+  return `${str}${id}`;
+}

back/data/cron.ts

@@ -17,6 +17,7 @@ export class Crontab {
   labels?: string[];
   last_running_time?: number;
   last_execution_time?: number;
+  sub_id?: number;
 
   constructor(options: Crontab) {
     this.name = options.name;
@@ -25,7 +26,7 @@ export class Crontab {
     this.saved = options.saved;
     this.id = options.id;
     this.status =
-      options.status && CrontabStatus[options.status]
+      typeof options.status === 'number' && CrontabStatus[options.status]
         ? options.status
         : CrontabStatus.idle;
     this.timestamp = new Date().toString();
@@ -37,6 +38,7 @@ export class Crontab {
     this.labels = options.labels || [];
     this.last_running_time = options.last_running_time || 0;
     this.last_execution_time = options.last_execution_time || 0;
+    this.sub_id = options.sub_id;
   }
 }
 
@@ -72,4 +74,5 @@ export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
   labels: DataTypes.JSON,
   last_running_time: DataTypes.NUMBER,
   last_execution_time: DataTypes.NUMBER,
+  sub_id: { type: DataTypes.NUMBER, allowNull: true },
 });

back/data/cronView.ts

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

back/data/dependence.ts

@@ -12,7 +12,10 @@ export class Dependence {
 
   constructor(options: Dependence) {
     this.id = options.id;
-    this.status = options.status || DependenceStatus.installing;
+    this.status =
+      typeof options.status === 'number' && DependenceStatus[options.status]
+        ? options.status
+        : DependenceStatus.installing;
     this.type = options.type || DependenceTypes.nodejs;
     this.timestamp = new Date().toString();
     this.name = options.name;
@@ -28,6 +31,7 @@ export enum DependenceStatus {
   'removing',
   'removed',
   'removeFailed',
+  'queued',
 }
 
 export enum DependenceTypes {

back/data/env.ts

@@ -13,7 +13,10 @@ export class Env {
   constructor(options: Env) {
     this.value = options.value;
     this.id = options.id;
-    this.status = options.status || EnvStatus.normal;
+    this.status =
+      typeof options.status === 'number' && EnvStatus[options.status]
+        ? options.status
+        : EnvStatus.normal;
     this.timestamp = new Date().toString();
     this.position = options.position;
     this.name = options.name;
@@ -26,7 +29,10 @@ export enum EnvStatus {
   'disabled',
 }
 
-export const initEnvPosition = 9999999999;
+export const maxPosition = 9000000000000000;
+export const initPosition = 4500000000000000;
+export const stepPosition = 10000000000;
+export const minPosition = 100;
 
 interface EnvInstance extends Model<Env, Env>, Env {}
 export const EnvModel = sequelize.define<EnvInstance>('Env', {

back/data/index.ts

@@ -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: {
+  retry: {
-    max: 6,
+    max: 10,
-    min: 0,
+    match: ['SQLITE_BUSY: database is locked'],
-    idle: 30000,
   },
+  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 };

back/data/notify.ts

@@ -41,6 +41,7 @@ export class ServerChanNotification extends NotificationBaseInfo {
 
 export class PushDeerNotification extends NotificationBaseInfo {
   public pushDeerKey = '';
+  public pushDeerUrl = '';
 }
 
 export class ChatNotification extends NotificationBaseInfo {
@@ -50,7 +51,7 @@ export class ChatNotification extends NotificationBaseInfo {
 
 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';
 }

back/data/subscription.ts

@@ -28,14 +28,17 @@ export class Subscription {
   extensions?: string;
   sub_before?: string;
   sub_after?: string;
+  proxy?: string;
+  autoAddCron?: 1 | 0;
+  autoDelCron?: 1 | 0;
 
   constructor(options: Subscription) {
     this.id = options.id;
     this.name = options.name || options.alias;
     this.type = options.type;
     this.schedule = options.schedule;
-    this.status =
+    this.status = this.status =
-      options.status && SubscriptionStatus[options.status]
+      typeof options.status === 'number' && SubscriptionStatus[options.status]
         ? options.status
         : SubscriptionStatus.idle;
     this.url = options.url;
@@ -54,6 +57,9 @@ export class Subscription {
     this.extensions = options.extensions;
     this.sub_before = options.sub_before;
     this.sub_after = options.sub_after;
+    this.proxy = options.proxy;
+    this.autoAddCron = options.autoAddCron ? 1 : 0;
+    this.autoDelCron = options.autoDelCron ? 1 : 0;
   }
 }
 
@@ -102,5 +108,8 @@ 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 },
+    autoAddCron: { type: DataTypes.NUMBER, allowNull: true },
+    autoDelCron: { type: DataTypes.NUMBER, allowNull: true },
   },
 );

back/loaders/db.ts

@@ -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,33 @@ export default async () => {
     await SubscriptionModel.sync();
     await CrontabViewModel.sync();
 
-    // try {
+    // 初始化新增字段
-    //   const queryInterface = sequelize.getQueryInterface();
+    try {
-    //   await queryInterface.addIndex('Crontabs', ['command'], { unique: true });
+      await sequelize.query(
-    //   await queryInterface.addIndex('Envs', ['name', 'value'], { unique: true });
+        'alter table CrontabViews add column filterRelation VARCHAR(255)',
-    //   await queryInterface.addIndex('Apps', ['name'], { unique: true });
+      );
-    // } catch (error) { }
+    } 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) {}
+    try {
+      await sequelize.query(
+        'alter table Subscriptions add column autoAddCron NUMBER',
+      );
+    } catch (error) {}
+    try {
+      await sequelize.query(
+        'alter table Subscriptions add column autoDelCron NUMBER',
+      );
+    } catch (error) {}
+    try {
+      await sequelize.query('alter table Crontabs add column sub_id NUMBER');
+    } catch (error) {}
 
     // 2.10-2.11 升级
     const cronDbFile = path.join(config.rootPath, 'db/crontab.db');

back/loaders/initData.ts

@@ -4,16 +4,31 @@ 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 { DependenceModel, DependenceStatus } from '../data/dependence';
-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,16 +41,14 @@ export default async () => {
     order: [['type', 'DESC']],
     raw: true,
   }).then(async (docs) => {
-    const groups = _.groupBy(docs, 'type');
+    await DependenceModel.update(
-    const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
+      { status: DependenceStatus.queued, log: [] },
-    for (const key of keys) {
+      { where: { id: docs.map((x) => x.id!) } },
-      const group = groups[key];
+    );
-      const depIds = group.map((x) => x.id);
+    dependenceService.installDependenceOneByOne(docs);
-      await dependenceService.reInstall(depIds as number[]);
-    }
   });
 
-  // 初始化时执行一次所有的ql repo 任务
+  // 初始化时执行一次所有的 ql repo 任务
   CrontabModel.findAll({
     where: {
       isDisabled: { [Op.ne]: 1 },

back/loaders/initFile.ts

@@ -19,6 +19,7 @@ const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
 const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
 const homedir = os.homedir();
 const sshPath = path.resolve(homedir, '.ssh');
+const sshdPath = path.join(dataPath, 'ssh.d');
 
 export default async () => {
   const authFileExist = await fileExist(authConfigFile);
@@ -29,6 +30,7 @@ export default async () => {
   const uploadDirExist = await fileExist(uploadPath);
   const sshDirExist = await fileExist(sshPath);
   const bakDirExist = await fileExist(bakPath);
+  const sshdDirExist = await fileExist(sshdPath);
 
   if (!configDirExist) {
     fs.mkdirSync(configPath);
@@ -62,6 +64,10 @@ export default async () => {
     fs.mkdirSync(bakPath);
   }
 
+  if (!sshdDirExist) {
+    fs.mkdirSync(sshdPath);
+  }
+
   dotenv.config({ path: confFile });
 
   Logger.info('✌️ Init file down');

back/loaders/initTask.ts

@@ -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';
@@ -12,7 +11,7 @@ export default async () => {
   const subscriptionService = Container.get(SubscriptionService);
 
   // 生成内置token
-  let tokenCommand = `ts-node-transpile-only ${config.rootPath}/back/token.ts`;
+  let tokenCommand = `tsx ${config.rootPath}/back/token.ts`;
   const tokenFile = `${config.rootPath}static/build/token.js`;
   if (await fileExist(tokenFile)) {
     tokenCommand = `node ${tokenFile}`;
@@ -22,6 +21,7 @@ export default async () => {
     name: '生成token',
     command: tokenCommand,
   };
+  await scheduleService.cancelIntervalTask(cron);
   scheduleService.createIntervalTask(cron, {
     days: 28,
   });
@@ -29,24 +29,21 @@ export default async () => {
   // 运行删除日志任务
   const data = await systemService.getLogRemoveFrequency();
   if (data && data.info && data.info.frequency) {
-    const cron = {
+    const rmlogCron = {
       id: data.id,
       name: '删除日志',
       command: `ql rmlog ${data.info.frequency}`,
     };
-    scheduleService.createIntervalTask(cron, {
+    await scheduleService.cancelIntervalTask(rmlogCron);
+    scheduleService.createIntervalTask(rmlogCron, {
       days: data.info.frequency,
     });
   }
 
   // 运行所有订阅
+  await subscriptionService.setSshConfig();
   const subs = await subscriptionService.list();
   for (const sub of subs) {
-    await subscriptionService.handleTask(
+    subscriptionService.handleTask(sub, !sub.is_disabled, !sub.is_disabled);
-      sub,
-      !sub.is_disabled,
-      true,
-      !sub.is_disabled,
-    );
   }
 };

back/loaders/sentry.ts

@@ -4,13 +4,11 @@ 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 ({ expressApp }: { expressApp: Application }) => {
+export default async ({ expressApp }: { expressApp: Application }) => {
-  const versionRegx = /.*export const version = \'(.*)\'\;/;
+  const { version } = await parseVersion(config.versionFile);
 
-  const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
-  const currentVersion = currentVersionFile.match(versionRegx)![1];
-  
   Sentry.init({
     dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
     integrations: [
@@ -18,7 +16,7 @@ export default ({ expressApp }: { expressApp: Application }) => {
       new Tracing.Integrations.Express({ app: expressApp }),
     ],
     tracesSampleRate: 0.1,
-    release: currentVersion,
+    release: version,
   });
 
   expressApp.use(Sentry.Handlers.requestHandler());

back/protos/cron.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package com.ql.cron;
+
+service Cron {
+  rpc addCron(AddCronRequest) returns (AddCronResponse);
+  rpc delCron(DeleteCronRequest) returns (DeleteCronResponse);
+}
+
+message ICron {
+  string id = 1;
+  string schedule = 2;
+  string command = 3;
+}
+
+message AddCronRequest { repeated ICron crons = 1; }
+
+message AddCronResponse {}
+
+message DeleteCronRequest { repeated string ids = 1; }
+
+message DeleteCronResponse {}

back/protos/cron.ts

@@ -0,0 +1,482 @@
+/* eslint-disable */
+import {
+  CallOptions,
+  ChannelCredentials,
+  Client,
+  ClientOptions,
+  ClientUnaryCall,
+  handleUnaryCall,
+  makeGenericClientConstructor,
+  Metadata,
+  ServiceError,
+  UntypedServiceImplementation,
+} from '@grpc/grpc-js';
+import _m0 from 'protobufjs/minimal';
+
+export const protobufPackage = 'com.ql.cron';
+
+export interface ICron {
+  id: string;
+  schedule: string;
+  command: string;
+}
+
+export interface AddCronRequest {
+  crons: ICron[];
+}
+
+export interface AddCronResponse {}
+
+export interface DeleteCronRequest {
+  ids: string[];
+}
+
+export interface DeleteCronResponse {}
+
+function createBaseICron(): ICron {
+  return { id: '', schedule: '', command: '' };
+}
+
+export const ICron = {
+  encode(message: ICron, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.id !== '') {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.schedule !== '') {
+      writer.uint32(18).string(message.schedule);
+    }
+    if (message.command !== '') {
+      writer.uint32(26).string(message.command);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ICron {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseICron();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag != 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        case 2:
+          if (tag != 18) {
+            break;
+          }
+
+          message.schedule = reader.string();
+          continue;
+        case 3:
+          if (tag != 26) {
+            break;
+          }
+
+          message.command = reader.string();
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ICron {
+    return {
+      id: isSet(object.id) ? String(object.id) : '',
+      schedule: isSet(object.schedule) ? String(object.schedule) : '',
+      command: isSet(object.command) ? String(object.command) : '',
+    };
+  },
+
+  toJSON(message: ICron): unknown {
+    const obj: any = {};
+    message.id !== undefined && (obj.id = message.id);
+    message.schedule !== undefined && (obj.schedule = message.schedule);
+    message.command !== undefined && (obj.command = message.command);
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<ICron>, I>>(base?: I): ICron {
+    return ICron.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<ICron>, I>>(object: I): ICron {
+    const message = createBaseICron();
+    message.id = object.id ?? '';
+    message.schedule = object.schedule ?? '';
+    message.command = object.command ?? '';
+    return message;
+  },
+};
+
+function createBaseAddCronRequest(): AddCronRequest {
+  return { crons: [] };
+}
+
+export const AddCronRequest = {
+  encode(
+    message: AddCronRequest,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    for (const v of message.crons) {
+      ICron.encode(v!, writer.uint32(10).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronRequest {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAddCronRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag != 10) {
+            break;
+          }
+
+          message.crons.push(ICron.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AddCronRequest {
+    return {
+      crons: Array.isArray(object?.crons)
+        ? object.crons.map((e: any) => ICron.fromJSON(e))
+        : [],
+    };
+  },
+
+  toJSON(message: AddCronRequest): unknown {
+    const obj: any = {};
+    if (message.crons) {
+      obj.crons = message.crons.map((e) => (e ? ICron.toJSON(e) : undefined));
+    } else {
+      obj.crons = [];
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AddCronRequest>, I>>(
+    base?: I,
+  ): AddCronRequest {
+    return AddCronRequest.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(
+    object: I,
+  ): AddCronRequest {
+    const message = createBaseAddCronRequest();
+    message.crons = object.crons?.map((e) => ICron.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseAddCronResponse(): AddCronResponse {
+  return {};
+}
+
+export const AddCronResponse = {
+  encode(
+    _: AddCronResponse,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronResponse {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAddCronResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): AddCronResponse {
+    return {};
+  },
+
+  toJSON(_: AddCronResponse): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(
+    base?: I,
+  ): AddCronResponse {
+    return AddCronResponse.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(
+    _: I,
+  ): AddCronResponse {
+    const message = createBaseAddCronResponse();
+    return message;
+  },
+};
+
+function createBaseDeleteCronRequest(): DeleteCronRequest {
+  return { ids: [] };
+}
+
+export const DeleteCronRequest = {
+  encode(
+    message: DeleteCronRequest,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    for (const v of message.ids) {
+      writer.uint32(10).string(v!);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronRequest {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseDeleteCronRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag != 10) {
+            break;
+          }
+
+          message.ids.push(reader.string());
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): DeleteCronRequest {
+    return {
+      ids: Array.isArray(object?.ids)
+        ? object.ids.map((e: any) => String(e))
+        : [],
+    };
+  },
+
+  toJSON(message: DeleteCronRequest): unknown {
+    const obj: any = {};
+    if (message.ids) {
+      obj.ids = message.ids.map((e) => e);
+    } else {
+      obj.ids = [];
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
+    base?: I,
+  ): DeleteCronRequest {
+    return DeleteCronRequest.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
+    object: I,
+  ): DeleteCronRequest {
+    const message = createBaseDeleteCronRequest();
+    message.ids = object.ids?.map((e) => e) || [];
+    return message;
+  },
+};
+
+function createBaseDeleteCronResponse(): DeleteCronResponse {
+  return {};
+}
+
+export const DeleteCronResponse = {
+  encode(
+    _: DeleteCronResponse,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronResponse {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseDeleteCronResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): DeleteCronResponse {
+    return {};
+  },
+
+  toJSON(_: DeleteCronResponse): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
+    base?: I,
+  ): DeleteCronResponse {
+    return DeleteCronResponse.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
+    _: I,
+  ): DeleteCronResponse {
+    const message = createBaseDeleteCronResponse();
+    return message;
+  },
+};
+
+export type CronService = typeof CronService;
+export const CronService = {
+  addCron: {
+    path: '/com.ql.cron.Cron/addCron',
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: AddCronRequest) =>
+      Buffer.from(AddCronRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => AddCronRequest.decode(value),
+    responseSerialize: (value: AddCronResponse) =>
+      Buffer.from(AddCronResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => AddCronResponse.decode(value),
+  },
+  delCron: {
+    path: '/com.ql.cron.Cron/delCron',
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: DeleteCronRequest) =>
+      Buffer.from(DeleteCronRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => DeleteCronRequest.decode(value),
+    responseSerialize: (value: DeleteCronResponse) =>
+      Buffer.from(DeleteCronResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => DeleteCronResponse.decode(value),
+  },
+} as const;
+
+export interface CronServer extends UntypedServiceImplementation {
+  addCron: handleUnaryCall<AddCronRequest, AddCronResponse>;
+  delCron: handleUnaryCall<DeleteCronRequest, DeleteCronResponse>;
+}
+
+export interface CronClient extends Client {
+  addCron(
+    request: AddCronRequest,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  addCron(
+    request: AddCronRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  addCron(
+    request: AddCronRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    callback: (
+      error: ServiceError | null,
+      response: DeleteCronResponse,
+    ) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    metadata: Metadata,
+    callback: (
+      error: ServiceError | null,
+      response: DeleteCronResponse,
+    ) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (
+      error: ServiceError | null,
+      response: DeleteCronResponse,
+    ) => void,
+  ): ClientUnaryCall;
+}
+
+export const CronClient = makeGenericClientConstructor(
+  CronService,
+  'com.ql.cron.Cron',
+) as unknown as {
+  new (
+    address: string,
+    credentials: ChannelCredentials,
+    options?: Partial<ClientOptions>,
+  ): CronClient;
+  service: typeof CronService;
+};
+
+type Builtin =
+  | Date
+  | Function
+  | Uint8Array
+  | string
+  | number
+  | boolean
+  | undefined;
+
+export type DeepPartial<T> = T extends Builtin
+  ? T
+  : T extends Array<infer U>
+  ? Array<DeepPartial<U>>
+  : T extends ReadonlyArray<infer U>
+  ? ReadonlyArray<DeepPartial<U>>
+  : T extends {}
+  ? { [K in keyof T]?: DeepPartial<T[K]> }
+  : Partial<T>;
+
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin
+  ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
+      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+    };
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}

back/protos/health.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package com.ql.health;
+
+message HealthCheckRequest {
+  string service = 1;
+}
+
+message HealthCheckResponse {
+  enum ServingStatus {
+    UNKNOWN = 0;
+    SERVING = 1;
+    NOT_SERVING = 2;
+    SERVICE_UNKNOWN = 3;
+  }
+  ServingStatus status = 1;
+}
+
+service Health {
+  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
+  rpc Watch(HealthCheckRequest) returns (stream HealthCheckResponse);
+}

back/protos/health.ts

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

back/public.ts

@@ -2,19 +2,22 @@ import express from 'express';
 import { exec } from 'child_process';
 import Logger from './loaders/logger';
 import config from './config';
+import { HealthClient } from './protos/health';
+import { credentials } from '@grpc/grpc-js';
 
 const app = express();
+const client = new HealthClient(
+  `localhost:${config.cronPort}`,
+  credentials.createInsecure(),
+);
 
-app.get('/api/public/panel/log', (req, res) => {
+app.get('/api/health', (req, res) => {
-  exec(
+  client.check({ service: 'cron' }, (err, response) => {
-    'pm2 logs panel --lines 500 --nostream --timestamp',
+    if (err) {
-    (err, stdout, stderr) => {
+      return res.status(500).send({ error: err });
-      if (err || stderr) {
+    }
-        return res.send({ code: 400, message: (err && err.message) || stderr });
+    return res.status(200).send({ data: response });
-      }
+  });
-      return res.send({ code: 200, data: stdout });
-    },
-  );
 });
 
 app

back/schedule.ts

@@ -1,52 +0,0 @@
-import schedule from 'node-schedule';
-import express from 'express';
-import { exec } from 'child_process';
-import Logger from './loaders/logger';
-import { CrontabModel, CrontabStatus } from './data/cron';
-import config from './config';
-
-const app = express();
-
-const run = async () => {
-  CrontabModel.findAll({ where: {} })
-    .then((docs) => {
-      if (docs && docs.length > 0) {
-        for (let i = 0; i < docs.length; i++) {
-          const task = docs[i];
-          const _schedule = task.schedule && task.schedule.split(/ +/);
-          if (
-            _schedule &&
-            _schedule.length > 5 &&
-            task.status !== CrontabStatus.disabled &&
-            !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(`ID=${task.id} ${command}`);
-            });
-          }
-        }
-      }
-    })
-    .catch((err) => {
-      Logger.error(err);
-      process.exit(1);
-    });
-};
-
-app
-  .listen(config.cronPort, async () => {
-    await require('./loaders/sentry').default({ expressApp: app });
-    await require('./loaders/db').default();
-
-    await run();
-    Logger.debug('定时任务服务启动成功！');
-  })
-  .on('error', (err) => {
-    Logger.error(err);
-    process.exit(1);
-  });

back/schedule/addCron.ts

@@ -0,0 +1,27 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { AddCronRequest, AddCronResponse } from '../protos/cron';
+import nodeSchedule from 'node-schedule';
+import { scheduleStacks } from './data';
+import { exec } from 'child_process';
+
+const addCron = (
+  call: ServerUnaryCall<AddCronRequest, AddCronResponse>,
+  callback: sendUnaryData<AddCronResponse>,
+) => {
+  for (const item of call.request.crons) {
+    const { id, schedule, command } = item;
+    if (scheduleStacks.has(id)) {
+      scheduleStacks.get(id)?.cancel();
+    }
+    scheduleStacks.set(
+      id,
+      nodeSchedule.scheduleJob(id, schedule, async () => {
+        exec(`ID=${id} ${command}`);
+      }),
+    );
+  }
+
+  callback(null, null);
+};
+
+export { addCron };

back/schedule/client.ts

@@ -0,0 +1,40 @@
+import { credentials } from '@grpc/grpc-js';
+import {
+  AddCronRequest,
+  AddCronResponse,
+  CronClient,
+  DeleteCronRequest,
+  DeleteCronResponse,
+} from '../protos/cron';
+import config from '../config';
+
+class Client {
+  private client = new CronClient(
+    `localhost:${config.cronPort}`,
+    credentials.createInsecure(),
+  );
+
+  addCron(request: AddCronRequest['crons']): Promise<AddCronResponse> {
+    return new Promise((resolve, reject) => {
+      this.client.addCron({ crons: request }, (err, res) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(res);
+      });
+    });
+  }
+
+  delCron(request: DeleteCronRequest['ids']): Promise<DeleteCronResponse> {
+    return new Promise((resolve, reject) => {
+      this.client.delCron({ ids: request }, (err, res) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(res);
+      });
+    });
+  }
+}
+
+export default new Client();

back/schedule/data.ts

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

back/schedule/delCron.ts

@@ -0,0 +1,19 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { DeleteCronRequest, DeleteCronResponse } from '../protos/cron';
+import { scheduleStacks } from './data';
+
+const delCron = (
+  call: ServerUnaryCall<DeleteCronRequest, DeleteCronResponse>,
+  callback: sendUnaryData<DeleteCronResponse>,
+) => {
+  for (const id of call.request.ids) {
+    if (scheduleStacks.has(id)) {
+      scheduleStacks.get(id)?.cancel();
+      scheduleStacks.delete(id);
+    }
+  }
+
+  callback(null, null);
+};
+
+export { delCron };

back/schedule/health.ts

@@ -0,0 +1,30 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { HealthCheckRequest, HealthCheckResponse } from '../protos/health';
+import { exec } from 'child_process';
+import config from '../config';
+import { promiseExec } from '../config/util';
+
+const check = async (
+  call: ServerUnaryCall<HealthCheckRequest, HealthCheckResponse>,
+  callback: sendUnaryData<HealthCheckResponse>,
+) => {
+  switch (call.request.service) {
+    case 'cron':
+      const res = await promiseExec(
+        `curl -sf http://localhost:${config.port}/api/system`,
+      );
+
+      if (res.includes('200')) {
+        return callback(null, { status: 1 });
+      }
+      const errLog = await promiseExec(
+        `tail -n 300 ~/.pm2/logs/panel-error.log`,
+      );
+      return callback(new Error(errLog));
+
+    default:
+      return callback(null, { status: 1 });
+  }
+};
+
+export { check };

back/schedule/index.ts

@@ -0,0 +1,20 @@
+import { Server, ServerCredentials } from '@grpc/grpc-js';
+import { CronService } from '../protos/cron';
+import { addCron } from './addCron';
+import { delCron } from './delCron';
+import { HealthService } from '../protos/health';
+import { check } from './health';
+import config from '../config';
+import Logger from '../loaders/logger';
+
+const server = new Server();
+server.addService(HealthService, { check });
+server.addService(CronService, { addCron, delCron });
+server.bindAsync(
+  `localhost:${config.cronPort}`,
+  ServerCredentials.createInsecure(),
+  () => {
+    server.start();
+    Logger.debug(`✌️ 定时服务启动成功！`);
+  },
+);

back/services/cron.ts

@@ -5,17 +5,21 @@ 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, where, col as colFn, FindOptions } from 'sequelize';
-import { Op } from 'sequelize';
 import path from 'path';
-import dayjs from 'dayjs';
+import { TASK_PREFIX, QL_PREFIX } from '../config/const';
-import { LOG_END_SYMBOL } from '../config/const';
+import cronClient from '../schedule/client';
 
 @Service()
 export default class CronService {
-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor(@Inject('logger') private logger: winston.Logger) { }
 
   private isSixCron(cron: Crontab) {
     const { schedule } = cron;
@@ -29,7 +33,12 @@ export default class CronService {
     const tab = new Crontab(payload);
     tab.saved = false;
     const doc = await this.insert(tab);
-    await this.set_crontab(this.isSixCron(doc));
+    if (this.isSixCron(doc)) {
+      await cronClient.addCron([
+        { id: String(doc.id), schedule: doc.schedule!, command: doc.command },
+      ]);
+    }
+    await this.set_crontab();
     return doc;
   }
 
@@ -38,9 +47,26 @@ export default class CronService {
   }
 
   public async update(payload: Crontab): Promise<Crontab> {
-    payload.saved = false;
+    const doc = await this.getDb({ id: payload.id });
-    const newDoc = await this.updateDb(payload);
+    const tab = new Crontab({ ...doc, ...payload });
-    await this.set_crontab(this.isSixCron(newDoc));
+    tab.saved = false;
+    const newDoc = await this.updateDb(tab);
+    if (doc.isDisabled === 1) {
+      return newDoc;
+    }
+    if (this.isSixCron(doc)) {
+      await cronClient.delCron([String(newDoc.id)]);
+    }
+    if (this.isSixCron(newDoc)) {
+      await cronClient.addCron([
+        {
+          id: String(newDoc.id),
+          schedule: newDoc.schedule!,
+          command: newDoc.command,
+        },
+      ]);
+    }
+    await this.set_crontab();
     return newDoc;
   }
 
@@ -79,7 +105,8 @@ export default class CronService {
 
   public async remove(ids: number[]) {
     await CrontabModel.destroy({ where: { id: ids } });
-    await this.set_crontab(true);
+    await cronClient.delCron(ids.map(String));
+    await this.set_crontab();
   }
 
   public async pin(ids: number[]) {
@@ -116,8 +143,9 @@ export default class CronService {
 
   private formatViewQuery(query: any, viewQuery: any) {
     if (viewQuery.filters && viewQuery.filters.length > 0) {
-      if (!query[Op.and]) {
+      const primaryOperate = viewQuery.filterRelation === 'or' ? Op.or : Op.and;
-        query[Op.and] = [];
+      if (!query[primaryOperate]) {
+        query[primaryOperate] = [];
       }
       for (const col of viewQuery.filters) {
         const { property, value, operation } = col;
@@ -160,13 +188,27 @@ export default class CronService {
         }
         if (operate && operate2) {
           q[property] = {
-            [operate2]: [
+            [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[Op.and].push(q);
+        query[primaryOperate].push(q);
       }
     }
   }
@@ -226,8 +268,15 @@ export default class CronService {
       const filterKeys: any = Object.keys(filterQuery);
       for (const key of filterKeys) {
         let q: any = {};
-        if (filterKeys[key]) {
+        if (!filterQuery[key]) continue;
-          q[key] = filterKeys[key];
+        if (key === 'status') {
+          if (filterQuery[key].includes(2)) {
+            q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] };
+          } else {
+            q = { [Op.and]: [{ [key]: filterQuery[key] }, { isDisabled: 0 }] };
+          }
+        } else {
+          q[key] = filterQuery[key];
         }
         query[Op.and].push(q);
       }
@@ -242,6 +291,19 @@ export default class CronService {
     }
   }
 
+  public async find({
+    log_path,
+  }: {
+    log_path: string;
+  }): Promise<Crontab | null> {
+    try {
+      const result = await CrontabModel.findOne({ where: { log_path } });
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  }
+
   public async crontabs(params?: {
     searchValue: string;
     page: string;
@@ -293,7 +355,7 @@ export default class CronService {
     }
   }
 
-  public async getDb(query: any): Promise<Crontab> {
+  public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Crontab);
   }
@@ -314,31 +376,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}${LOG_END_SYMBOL}`,
-        );
-      }
     }
 
     await CrontabModel.update(
@@ -347,42 +389,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 });
@@ -400,8 +406,8 @@ export default class CronService {
       this.logger.silly('Original command: ' + command);
 
       let cmdStr = command;
-      if (!cmdStr.includes('task ') && !cmdStr.includes('ql ')) {
+      if (!cmdStr.startsWith(TASK_PREFIX) && !cmdStr.startsWith(QL_PREFIX)) {
-        cmdStr = `task ${cmdStr}`;
+        cmdStr = `${TASK_PREFIX}${cmdStr}`;
       }
       if (
         cmdStr.endsWith('.js') ||
@@ -447,12 +453,22 @@ export default class CronService {
 
   public async disabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
-    await this.set_crontab(true);
+    await cronClient.delCron(ids.map(String));
+    await this.set_crontab();
   }
 
   public async enabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
-    await this.set_crontab(true);
+    const docs = await CrontabModel.findAll({ where: { id: ids } });
+    const sixCron = docs
+      .filter((x) => this.isSixCron(x))
+      .map((doc) => ({
+        id: String(doc.id),
+        schedule: doc.schedule!,
+        command: doc.command,
+      }));
+    await cronClient.addCron(sixCron);
+    await this.set_crontab();
   }
 
   public async log(id: number) {
@@ -465,69 +481,26 @@ export default class CronService {
     const logFileExist = doc.log_path && (await fileExist(absolutePath));
     if (logFileExist) {
       return getFileContentByName(`${absolutePath}`);
-    }
-    const [, commandStr, url] = doc.command.split(/ +/);
-    let logPath = this.getKey(commandStr);
-    const isQlCommand = doc.command.startsWith('ql ');
-    const key =
-      (url && ['repo', 'raw'].includes(commandStr) && this.getKey(url)) ||
-      logPath;
-    if (isQlCommand) {
-      logPath = 'update';
-    }
-    let logDir = `${config.logPath}${logPath}`;
-    if (existsSync(logDir)) {
-      let files = await promises.readdir(logDir);
-      if (isQlCommand) {
-        files = files.filter((x) => x.includes(key));
-      }
-      return getFileContentByName(`${logDir}/${files[files.length - 1]}`);
     } else {
-      return '';
+      return '任务未运行';
     }
   }
 
   public async logs(id: number) {
     const doc = await this.getDb({ id });
-    if (!doc) {
+    if (!doc || !doc.log_path) {
       return [];
     }
 
-    if (doc.log_path) {
+    const relativeDir = path.dirname(`${doc.log_path}`);
-      const relativeDir = path.dirname(`${doc.log_path}`);
+    const dir = path.resolve(config.logPath, relativeDir);
-      const dir = path.resolve(config.logPath, relativeDir);
+    if (existsSync(dir)) {
-      if (existsSync(dir)) {
+      let files = await promises.readdir(dir);
-        let files = await promises.readdir(dir);
-        return files
-          .map((x) => ({
-            filename: x,
-            directory: relativeDir.replace(config.logPath, ''),
-            time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
-          }))
-          .sort((a, b) => b.time - a.time);
-      }
-    }
-
-    const [, commandStr, url] = doc.command.split(/ +/);
-    let logPath = this.getKey(commandStr);
-    const isQlCommand = doc.command.startsWith('ql ');
-    const key =
-      (url && ['repo', 'raw'].includes(commandStr) && this.getKey(url)) ||
-      logPath;
-    if (isQlCommand) {
-      logPath = 'update';
-    }
-    let logDir = `${config.logPath}${logPath}`;
-    if (existsSync(logDir)) {
-      let files = await promises.readdir(logDir);
-      if (isQlCommand) {
-        files = files.filter((x) => x.includes(key));
-      }
       return files
         .map((x) => ({
           filename: x,
-          directory: logPath,
+          directory: relativeDir.replace(config.logPath, ''),
-          time: fs.statSync(`${logDir}/${x}`).mtime.getTime(),
+          time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
         }))
         .sort((a, b) => b.time - a.time);
     } else {
@@ -535,35 +508,19 @@ export default class CronService {
     }
   }
 
-  private getKey(command: string): string {
-    const start =
-      command.lastIndexOf('/') !== -1 ? command.lastIndexOf('/') + 1 : 0;
-    const end =
-      command.lastIndexOf('.') !== -1
-        ? command.lastIndexOf('.')
-        : command.length;
-
-    const tmpStr = command.substring(0, start - 1);
-    let index = 0;
-    if (tmpStr.lastIndexOf('/') !== -1 && tmpStr.startsWith('http')) {
-      index = tmpStr.lastIndexOf('/');
-    } else if (tmpStr.lastIndexOf(':') !== -1 && tmpStr.startsWith('git@')) {
-      index = tmpStr.lastIndexOf(':');
-    }
-    if (index) {
-      return `${tmpStr.substring(index + 1)}_${command.substring(start, end)}`;
-    } else {
-      return command.substring(start, end);
-    }
-  }
-
   private make_command(tab: Crontab) {
+    if (
+      !tab.command.startsWith(TASK_PREFIX) &&
+      !tab.command.startsWith(QL_PREFIX)
+    ) {
+      tab.command = `${TASK_PREFIX}${tab.command}`;
+    }
     const crontab_job_string = `ID=${tab.id} ${tab.command}`;
     return crontab_job_string;
   }
 
-  private async set_crontab(needReloadSchedule: boolean = false) {
+  private async set_crontab(data?: { data: Crontab[]; total: number }) {
-    const tabs = await this.crontabs();
+    const tabs = data ?? (await this.crontabs());
     var crontab_string = '';
     tabs.data.forEach((tab) => {
       const _schedule = tab.schedule && tab.schedule.split(/ +/);
@@ -585,9 +542,6 @@ export default class CronService {
     fs.writeFileSync(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);
-    if (needReloadSchedule) {
-      exec(`pm2 reload schedule`);
-    }
     await CrontabModel.update({ saved: true }, { where: {} });
   }
 
@@ -625,7 +579,17 @@ export default class CronService {
     });
   }
 
-  public autosave_crontab() {
+  public async autosave_crontab() {
-    return this.set_crontab();
+    const tabs = await this.crontabs();
+    this.set_crontab(tabs);
+
+    const sixCron = tabs.data
+      .filter((x) => this.isSixCron(x) && x.isDisabled !== 1)
+      .map((doc) => ({
+        id: String(doc.id),
+        schedule: doc.schedule!,
+        command: doc.command,
+      }));
+    await cronClient.addCron(sixCron);
   }
 }

back/services/cronView.ts

@@ -1,14 +1,20 @@
 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';
+import { FindOptions } from 'sequelize';
 
 @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 +22,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;
   }
 
@@ -24,7 +32,9 @@ export default class CronViewService {
   }
 
   public async update(payload: CrontabView): Promise<CrontabView> {
-    const newDoc = await this.updateDb(payload);
+    const doc = await this.getDb({ id: payload.id })
+    const tab = new CrontabView({ ...doc, ...payload });
+    const newDoc = await this.updateDb(tab);
     return newDoc;
   }
 
@@ -49,7 +59,7 @@ export default class CronViewService {
     }
   }
 
-  public async getDb(query: any): Promise<CrontabView> {
+  public async getDb(query: FindOptions<CrontabView>['where']): Promise<CrontabView> {
     const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as CrontabView);
   }
@@ -62,6 +72,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,
@@ -85,8 +111,10 @@ export default class CronViewService {
     }
     const newDoc = await this.update({
       id,
-      position: targetPosition,
+      position: this.getPrecisionPosition(targetPosition),
     });
+
+    await this.checkPosition(targetPosition);
     return newDoc;
   }
 }

back/services/dependence.ts

@@ -9,10 +9,9 @@ import {
   unInstallDependenceCommandTypes,
   DependenceModel,
 } from '../data/dependence';
-import _ from 'lodash';
 import { spawn } from 'child_process';
 import SockService from './sock';
-import { Op } from 'sequelize';
+import { FindOptions, Op } from 'sequelize';
 import { concurrentRun } from '../config/util';
 import dayjs from 'dayjs';
 
@@ -25,7 +24,7 @@ export default class DependenceService {
 
   public async create(payloads: Dependence[]): Promise<Dependence[]> {
     const tabs = payloads.map((x) => {
-      const tab = new Dependence({ ...x, status: DependenceStatus.installing });
+      const tab = new Dependence({ ...x, status: DependenceStatus.queued });
       return tab;
     });
     const docs = await this.insert(tabs);
@@ -46,7 +45,7 @@ export default class DependenceService {
     const tab = new Dependence({
       ...doc,
       ...other,
-      status: DependenceStatus.installing,
+      status: DependenceStatus.queued,
     });
     const newDoc = await this.updateDb(tab);
     this.installDependenceOneByOne([newDoc]);
@@ -60,7 +59,7 @@ export default class DependenceService {
 
   public async remove(ids: number[], force = false): Promise<Dependence[]> {
     await DependenceModel.update(
-      { status: DependenceStatus.removing, log: [] },
+      { status: DependenceStatus.queued, log: [] },
       { where: { id: ids } },
     );
     const docs = await DependenceModel.findAll({ where: { id: ids } });
@@ -100,23 +99,30 @@ export default class DependenceService {
     }
   }
 
-  private installDependenceOneByOne(
+  public installDependenceOneByOne(
     docs: Dependence[],
     isInstall: boolean = true,
     force: boolean = false,
   ) {
     concurrentRun(
-      docs.map(
+      docs.map((dep) => async () => {
-        (dep) => async () =>
+        const status = isInstall
-          await this.installOrUninstallDependencies([dep], isInstall, force),
+          ? DependenceStatus.installing
-      ),
+          : DependenceStatus.removing;
+        await DependenceModel.update({ status }, { where: { id: dep.id } });
+        return await this.installOrUninstallDependencies(
+          [dep],
+          isInstall,
+          force,
+        );
+      }),
       1,
     );
   }
 
   public async reInstall(ids: number[]): Promise<Dependence[]> {
     await DependenceModel.update(
-      { status: DependenceStatus.installing, log: [] },
+      { status: DependenceStatus.queued, log: [] },
       { where: { id: ids } },
     );
 
@@ -133,7 +139,9 @@ export default class DependenceService {
     return docs;
   }
 
-  public async getDb(query: any): Promise<Dependence> {
+  public async getDb(
+    query: FindOptions<Dependence>['where'],
+  ): Promise<Dependence> {
     const doc: any = await DependenceModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Dependence);
   }

back/services/env.ts

@@ -1,11 +1,18 @@
 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 {
-import _ from 'lodash';
+  Env,
-import { Op } from 'sequelize';
+  EnvModel,
+  EnvStatus,
+  initPosition,
+  maxPosition,
+  minPosition,
+  stepPosition,
+} from '../data/env';
+import groupBy from 'lodash/groupBy';
+import { FindOptions, Op } from 'sequelize';
 
 @Service()
 export default class EnvService {
@@ -13,17 +20,22 @@ export default class EnvService {
 
   public async create(payloads: Env[]): Promise<Env[]> {
     const envs = await this.envs();
-    let position = initEnvPosition;
+    let position = initPosition;
-    if (envs && envs.length > 0 && envs[envs.length - 1].position) {
+    if (
-      position = envs[envs.length - 1].position as number;
+      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;
   }
 
@@ -37,7 +49,9 @@ export default class EnvService {
   }
 
   public async update(payload: Env): Promise<Env> {
-    const newDoc = await this.updateDb(payload);
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new Env({ ...doc, ...payload });
+    const newDoc = await this.updateDb(tab);
     await this.set_envs();
     return newDoc;
   }
@@ -67,25 +81,44 @@ export default class EnvService {
     const envs = await this.envs();
     if (toIndex === 0 || toIndex === envs.length - 1) {
       targetPosition = isUpward
-        ? envs[0].position! * 2
+        ? envs[0].position! + stepPosition
-        : envs[toIndex].position! / 2;
+        : envs[toIndex].position! - stepPosition;
     } else {
       targetPosition = isUpward
         ? (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, envs[toIndex].position!);
     return newDoc;
   }
 
-  public async envs(
+  private async checkPosition(position: number, edge: number = 0) {
-    searchText: string = '',
+    const precisionPosition = parseFloat(position.toPrecision(16));
-    sort: any = { position: -1 },
+    if (
-    query: any = {},
+      precisionPosition < minPosition ||
-  ): Promise<Env[]> {
+      precisionPosition > maxPosition ||
+      Math.abs(precisionPosition - edge) < minPosition
+    ) {
+      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);
@@ -113,7 +146,6 @@ export default class EnvService {
     }
     try {
       const result = await this.find(condition, [
-        ['status', 'ASC'],
         ['position', 'DESC'],
         ['createdAt', 'ASC'],
       ]);
@@ -131,7 +163,7 @@ export default class EnvService {
     return docs;
   }
 
-  public async getDb(query: any): Promise<Env> {
+  public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
     const doc: any = await EnvModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Env);
   }
@@ -155,12 +187,11 @@ export default class EnvService {
   }
 
   public async set_envs() {
-    const envs = await this.envs(
+    const envs = await this.envs('', {
-      '',
+      name: { [Op.not]: null },
-      { position: -1 },
+      status: EnvStatus.normal,
-      { name: { [Op.not]: null }, status: EnvStatus.normal },
+    });
-    );
+    const groups = groupBy(envs, 'name');
-    const groups = _.groupBy(envs, 'name');
     let env_string = '';
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
@@ -168,8 +199,8 @@ export default class EnvService {
 
         // 忽略不符合bash要求的环境变量名称
         if (/^[a-zA-Z_][0-9a-zA-Z_]*$/.test(key)) {
-          let value = _(group)
+          let value = group
-            .map('value')
+            .map((x) => x.value)
             .join('&')
             .replace(/(\\)[^n]/g, '\\\\')
             .replace(/(\\$)/, '\\\\')

back/services/notify.ts

@@ -36,7 +36,7 @@ export default class NotificationService {
   private content = '';
   private params!: Omit<NotificationInfo, 'type'>;
   private gotOption = {
-    timeout: 30000,
+    timeout: 10000,
     retry: 1,
   };
 
@@ -78,33 +78,41 @@ export default class NotificationService {
   }
 
   private async gotify() {
-    const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
+    const { gotifyUrl, gotifyToken, gotifyPriority = 1 } = this.params;
-    const res: any = await got
+    try {
-      .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        body: `title=${encodeURIComponent(
+          ...this.gotOption,
-          this.title,
+          body: `title=${encodeURIComponent(
-        )}&message=${encodeURIComponent(
+            this.title,
-          this.content,
+          )}&message=${encodeURIComponent(
-        )}&priority=${gotifyPriority}`,
+            this.content,
-        headers: {
+          )}&priority=${gotifyPriority}`,
-          'Content-Type': 'application/x-www-form-urlencoded',
+          headers: {
-        },
+            'Content-Type': 'application/x-www-form-urlencoded',
-      })
+          },
-      .json();
+        })
-    return typeof res.id === 'number';
+        .json();
+      return typeof res.id === 'number';
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async goCqHttpBot() {
     const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
-    const res: any = await got
+    try {
-      .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        json: { message: `${this.title}\n${this.content}` },
+          ...this.gotOption,
-        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+          json: { message: `${this.title}\n${this.content}` },
-      })
+          headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
-      .json();
+        })
-    return res.retcode === 0;
+        .json();
+      return res.retcode === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async serverChan() {
@@ -112,63 +120,80 @@ export default class NotificationService {
     const url = serverChanKey.startsWith('SCT')
       ? `https://sctapi.ftqq.com/${serverChanKey}.send`
       : `https://sc.ftqq.com/${serverChanKey}.send`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `title=${this.title}&desp=${this.content}`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `title=${this.title}&desp=${this.content}`,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
-    return res.errno === 0 || res.data.errno === 0;
+        .json();
+      return res.errno === 0 || res.data.errno === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async pushDeer() {
-    const { pushDeerKey } = this.params;
+    const { pushDeerKey, pushDeerUrl } = this.params;
-    const url = `https://api2.pushdeer.com/message/push`;
+    const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
+          ...this.gotOption,
-          this.title,
+          body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
-        )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
+            this.title,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
-    return (
+        .json();
-      res.content.result.length !== undefined && res.content.result.length > 0
+      return (
-    );
+        res.content.result.length !== undefined && res.content.result.length > 0
+      );
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async chat() {
     const { chatUrl, chatToken } = this.params;
     const url = `${chatUrl}${chatToken}`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `payload={"text":"${this.title}\n${this.content}"}`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `payload={"text":"${this.title}\n${this.content}"}`,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
-    return res.success;
+        .json();
+      return res.success;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async bark() {
     let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
-    if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
+    if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
     const url = `${barkPush}/${encodeURIComponent(
       this.title,
     )}/${encodeURIComponent(
       this.content,
-    )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
+    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}`;
-    const res: any = await got
+
-      .get(url, {
+    try {
-        ...this.gotOption,
+      const res: any = await got
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        .get(url, {
-      })
+          ...this.gotOption,
-      .json();
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    return res.code === 200;
+        })
+        .json();
+      return res.code === 200;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async telegramBot() {
@@ -200,15 +225,19 @@ export default class NotificationService {
         https: httpsAgent,
       };
     }
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
-        agent,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
+          agent,
-      .json();
+        })
-    return !!res.ok;
+        .json();
+      return !!res.ok;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async dingtalkBot() {
@@ -222,35 +251,43 @@ export default class NotificationService {
       secretParam = `&timestamp=${dateNow}&sign=${result}`;
     }
     const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          msgtype: 'text',
+          json: {
-          text: {
+            msgtype: 'text',
-            content: ` ${this.title}\n\n${this.content}`,
+            text: {
+              content: ` ${this.title}\n\n${this.content}`,
+            },
           },
-        },
+        })
-      })
+        .json();
-      .json();
+      return res.errcode === 0;
-    return res.errcode === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async weWorkBot() {
     const { weWorkBotKey } = this.params;
     const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          msgtype: 'text',
+          json: {
-          text: {
+            msgtype: 'text',
-            content: ` ${this.title}\n\n${this.content}`,
+            text: {
+              content: ` ${this.title}\n\n${this.content}`,
+            },
           },
-        },
+        })
-      })
+        .json();
-      .json();
+      return res.errcode === 0;
-    return res.errcode === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async weWorkApp() {
@@ -306,22 +343,26 @@ export default class NotificationService {
         break;
     }
 
-    const res: any = await got
+    try {
-      .post(
+      const res: any = await got
-        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
+        .post(
-        {
+          `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
-          ...this.gotOption,
+          {
-          json: {
+            ...this.gotOption,
-            touser,
+            json: {
-            agentid,
+              touser,
-            safe: '0',
+              agentid,
-            ...options,
+              safe: '0',
+              ...options,
+            },
           },
-        },
+        )
-      )
+        .json();
-      .json();
 
-    return res.errcode === 0;
+      return res.errcode === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async aibotk() {
@@ -353,85 +394,111 @@ export default class NotificationService {
         break;
     }
 
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          ...json,
+          json: {
-        },
+            ...json,
-      })
+          },
-      .json();
+        })
+        .json();
 
-    return res.code === 0;
+      return res.code === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async iGot() {
     const { iGotPushKey } = this.params;
     const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `title=${this.title}&content=${this.content}`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `title=${this.title}&content=${this.content}`,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
+        .json();
 
-    return res.ret === 0;
+      return res.ret === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async pushPlus() {
     const { pushPlusToken, pushPlusUser } = this.params;
     const url = `https://www.pushplus.plus/send`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          token: `${pushPlusToken}`,
+          json: {
-          title: `${this.title}`,
+            token: `${pushPlusToken}`,
-          content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
+            title: `${this.title}`,
-          topic: `${pushPlusUser || ''}`,
+            content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
-        },
+            topic: `${pushPlusUser || ''}`,
-      })
+          },
-      .json();
+        })
+        .json();
 
-    return res.code === 200;
+      return res.code === 200;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async lark() {
-    const { larkKey } = this.params;
+    let { larkKey } = this.params;
-    const res: any = await got
+
-      .post(`https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`, {
+    if (!larkKey.startsWith('http')) {
-        ...this.gotOption,
+      larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
-        json: {
+    }
-          msg_type: 'text',
+
-          content: { text: `${this.title}\n\n${this.content}` },
+    try {
-        },
+      const res: any = await got
-        headers: { 'Content-Type': 'application/json' },
+        .post(larkKey, {
-      })
+          ...this.gotOption,
-      .json();
+          json: {
-    return res.StatusCode === 0;
+            msg_type: 'text',
+            content: { text: `${this.title}\n\n${this.content}` },
+          },
+          headers: { 'Content-Type': 'application/json' },
+        })
+        .json();
+      return res.StatusCode === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async email() {
     const { emailPass, emailService, emailUser } = this.params;
-    const transporter = nodemailer.createTransport({
-      service: emailService,
-      auth: {
-        user: emailUser,
-        pass: emailPass,
-      },
-    });
 
-    const info = await transporter.sendMail({
+    try {
-      from: `"青龙快讯" <${emailUser}>`,
+      const transporter = nodemailer.createTransport({
-      to: `${emailUser}`,
+        service: emailService,
-      subject: `${this.title}`,
+        auth: {
-      html: `${this.content.replace(/\n/g, '<br/>')}`,
+          user: emailUser,
-    });
+          pass: emailPass,
+        },
+      });
 
-    transporter.close();
+      const info = await transporter.sendMail({
+        from: `"青龙快讯" <${emailUser}>`,
+        to: `${emailUser}`,
+        subject: `${this.title}`,
+        html: `${this.content.replace(/\n/g, '<br/>')}`,
+      });
 
-    return !!info.messageId;
+      transporter.close();
+
+      return !!info.messageId;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async webhook() {
@@ -460,8 +527,12 @@ export default class NotificationService {
       allowGetBody: true,
       ...bodyParam,
     };
-    const res = await got(formatUrl, options);
+    try {
-    return String(res.statusCode).startsWith('20');
+      const res = await got(formatUrl, options);
+      return String(res.statusCode).startsWith('20');
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private formatBody(contentType: string, body: any): object {
@@ -484,11 +555,11 @@ export default class NotificationService {
 
     return {
       formatUrl: url
-        .replaceAll('$title', encodeURIComponent(this.title))
+        ?.replaceAll('$title', encodeURIComponent(this.title))
-        .replaceAll('$content', encodeURIComponent(this.content)),
+        ?.replaceAll('$content', encodeURIComponent(this.content)),
       formatBody: body
-        .replaceAll('$title', this.title)
+        ?.replaceAll('$title', this.title)
-        .replaceAll('$content', this.content),
+        ?.replaceAll('$content', this.content),
     };
   }
 }

back/services/open.ts

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

back/services/schedule.ts

@@ -5,8 +5,8 @@ import { ChildProcessWithoutNullStreams, exec, spawn } from 'child_process';
 import {
   ToadScheduler,
   LongIntervalJob,
-  AsyncTask,
   SimpleIntervalSchedule,
+  Task,
 } from 'toad-scheduler';
 import dayjs from 'dayjs';
 
@@ -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,14 +56,15 @@ 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());
         });
 
         cp.stderr.on('data', async (data) => {
-          this.logger.error(
+          this.logger.info(
-            '执行任务 %s 失败，时间：%s, 错误信息：%j',
+            '[执行任务失败] %s，时间：%s, 错误信息：%j',
             command,
             new Date().toLocaleString(),
             data.toString(),
@@ -69,7 +74,7 @@ export default class ScheduleService {
 
         cp.on('error', async (err) => {
           this.logger.error(
-            '创建任务 %s 失败，时间：%s, 错误信息：%j',
+            '[创建任务失败] %s，时间：%s, 错误信息：%j',
             command,
             new Date().toLocaleString(),
             err,
@@ -79,7 +84,7 @@ export default class ScheduleService {
 
         cp.on('exit', async (code, signal) => {
           this.logger.info(
-            `任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`,
+            `[任务退出] ${command} 进程id: ${cp.pid}，退出码 ${code}`,
           );
         });
 
@@ -100,7 +105,6 @@ export default class ScheduleService {
           error,
         );
         await callbacks.onError?.(JSON.stringify(error));
-        resolve(null);
       }
     });
   }
@@ -134,7 +138,10 @@ export default class ScheduleService {
   async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
     this.logger.info('[取消定时任务]，任务名：%s', name);
-    this.scheduleStacks.has(_id) && this.scheduleStacks.get(_id)?.cancel();
+    if (this.scheduleStacks.has(_id)) {
+      this.scheduleStacks.get(_id)?.cancel();
+      this.scheduleStacks.delete(_id);
+    }
   }
 
   async createIntervalTask(
@@ -150,12 +157,10 @@ export default class ScheduleService {
       name,
       command,
     );
-    const task = new AsyncTask(
+    const task = new Task(
       name,
-      async () => {
+      () => {
-        return new Promise(async (resolve, reject) => {
+        this.runTask(command, callbacks);
-          await this.runTask(command, callbacks);
-        });
       },
       (err) => {
         this.logger.error(
@@ -176,7 +181,7 @@ export default class ScheduleService {
     this.intervalSchedule.addIntervalJob(job);
 
     if (runImmediately) {
-      await this.runTask(command, callbacks);
+      this.runTask(command, callbacks);
     }
   }
 

back/services/script.ts

@@ -6,7 +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 { TASK_COMMAND } from '../config/const';
+import { getPid, killTask } from '../config/util';
 
 @Service()
 export default class ScriptService {
@@ -41,23 +42,25 @@ export default class ScriptService {
 
   public async runScript(filePath: string) {
     const relativePath = path.relative(config.scriptPath, filePath);
-    const command = `task -l ${relativePath} now`;
+    const command = `${TASK_COMMAND} -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) {
+  public async stopScript(filePath: string, pid: number) {
-    const relativePath = path.relative(config.scriptPath, filePath);
+    let str = '';
-    const err = await this.cronService.killTask(`task -l ${relativePath} now`);
+    if (!pid) {
-
+      const relativePath = path.relative(config.scriptPath, filePath);
-    const str = err ? `\n${err}` : '';
+      pid = await getPid(`${TASK_COMMAND} -l ${relativePath} now`);
-    this.sockService.sendMessage({
+    }
-      type: 'manuallyRunScript',
+    try {
-      message: `${str}\n## 执行结束...  ${new Date()
+      await killTask(pid);
-        .toLocaleString('zh', { hour12: false })
+    } catch (error) {}
-        .replace(' 24:', ' 00:')}${LOG_END_SYMBOL}`,
-    });
 
     return { code: 200 };
   }

back/services/sshKey.ts

@@ -1,20 +1,42 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import fs from 'fs';
+import fs, { existsSync } from 'fs';
 import os from 'os';
 import path from 'path';
+import { Subscription } from '../data/subscription';
+import { formatUrl } from '../config/subscription';
+import config from '../config';
 
 @Service()
 export default class SshKeyService {
   private homedir = os.homedir();
-  private sshPath = path.resolve(this.homedir, '.ssh');
+  private sshPath = config.sshdPath;
-  private sshConfigFilePath = path.resolve(this.sshPath, 'config');
+  private sshConfigFilePath = path.resolve(this.homedir, '.ssh', 'config');
+  private sshConfigHeader = `Include ${path.join(this.sshPath, '*.config')}`;
 
-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor(@Inject('logger') private logger: winston.Logger) {
+    this.initSshConfigFile();
+  }
+
+  private initSshConfigFile() {
+    let config = '';
+    if (existsSync(this.sshConfigFilePath)) {
+      config = fs.readFileSync(this.sshConfigFilePath, { encoding: 'utf-8' });
+    } else {
+      fs.writeFileSync(this.sshConfigFilePath, '');
+    }
+    if (!config.includes(this.sshConfigHeader)) {
+      fs.writeFileSync(
+        this.sshConfigFilePath,
+        `${this.sshConfigHeader}\n\n${config}`,
+        { encoding: 'utf-8' },
+      );
+    }
+  }
 
   private generatePrivateKeyFile(alias: string, key: string): void {
     try {
-      fs.writeFileSync(`${this.sshPath}/${alias}`, key, {
+      fs.writeFileSync(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
         encoding: 'utf8',
         mode: '400',
       });
@@ -23,62 +45,70 @@ export default class SshKeyService {
     }
   }
 
-  private getConfigRegx(alias: string) {
-    return new RegExp(
-      `Host ${alias}\n.*[^StrictHostKeyChecking]*.*[\n]*.*StrictHostKeyChecking no`,
-      'g',
-    );
-  }
-
   private removePrivateKeyFile(alias: string): void {
     try {
-      fs.unlinkSync(`${this.sshPath}/${alias}`);
+      const filePath = path.join(this.sshPath, alias);
+      if (existsSync(filePath)) {
+        fs.unlinkSync(filePath);
+      }
     } catch (error) {
       this.logger.error('删除私钥文件失败', error);
     }
   }
 
-  private generateSingleSshConfig(alias: string, host: string): string {
+  private generateSingleSshConfig(alias: string, host: string, proxy?: string) {
-    return `\nHost ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no`;
+    if (host === 'github.com') {
-  }
+      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa\n    PubkeyAcceptedAlgorithms +ssh-rsa`;
-
-  private generateSshConfig(configs: string[]) {
-    try {
-      for (const config of configs) {
-        fs.appendFileSync(this.sshConfigFilePath, config, {
-          encoding: 'utf8',
-        });
-      }
-    } catch (error) {
-      this.logger.error('写入ssh配置文件失败', error);
     }
+    const proxyStr = proxy ? `    ProxyCommand nc -v -x ${proxy} %h %p\n` : '';
+    const config = `Host ${alias}\n    Hostname ${host}\n    IdentityFile ${path.join(
+      this.sshPath,
+      alias,
+    )}\n    StrictHostKeyChecking no\n${proxyStr}`;
+    fs.writeFileSync(`${path.join(this.sshPath, `${alias}.config`)}`, config, {
+      encoding: 'utf8',
+    });
   }
 
   private removeSshConfig(alias: string) {
     try {
-      const configRegx = this.getConfigRegx(alias);
+      const filePath = path.join(this.sshPath, `${alias}.config`);
-      const data = fs
+      if (existsSync(filePath)) {
-        .readFileSync(this.sshConfigFilePath, { encoding: 'utf8' })
+        fs.unlinkSync(filePath);
-        .replace(configRegx, '')
+      }
-        .replace(/\n[\n]+/g, '\n');
-      fs.writeFileSync(this.sshConfigFilePath, data, {
-        encoding: 'utf8',
-      });
     } catch (error) {
       this.logger.error(`删除ssh配置文件${alias}失败`, error);
     }
   }
 
-  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);
+    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);
+    this.removeSshConfig(alias);
-    this.removeSshConfig(config);
+  }
+
+  public setSshConfig(docs: Subscription[]) {
+    for (const doc of docs) {
+      if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
+        const { alias, proxy } = doc;
+        const { host } = formatUrl(doc);
+        this.removePrivateKeyFile(alias);
+        this.removeSshConfig(alias);
+        this.generatePrivateKeyFile(
+          alias,
+          (doc.pull_option as any).private_key,
+        );
+        this.generateSingleSshConfig(alias, host, proxy);
+      }
+    }
   }
 }

back/services/subscription.ts

@@ -13,16 +13,16 @@ import {
   spawn,
 } from 'child_process';
 import fs from 'fs';
-import cron_parser from 'cron-parser';
 import {
   getFileContentByName,
   concurrentRun,
   fileExist,
   createFile,
+  killTask,
+  handleLogPath,
 } from '../config/util';
 import { promises, existsSync } from 'fs';
-import { promisify } from 'util';
+import { FindOptions, Op } from 'sequelize';
-import { Op } from 'sequelize';
 import path from 'path';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import { SimpleIntervalSchedule } from 'toad-scheduler';
@@ -30,6 +30,7 @@ import SockService from './sock';
 import SshKeyService from './sshKey';
 import dayjs from 'dayjs';
 import { LOG_END_SYMBOL } from '../config/const';
+import { formatCommand, formatUrl } from '../config/subscription';
 
 @Service()
 export default class SubscriptionService {
@@ -68,62 +69,20 @@ export default class SubscriptionService {
           ['createdAt', 'DESC'],
         ],
       });
-      return result as any;
+      return result;
     } catch (error) {
       throw error;
     }
   }
 
-  private formatCommand(doc: Subscription, url?: string) {
-    let command = 'ql ';
-    let _url = url || this.formatUrl(doc).url;
-    const { type, whitelist, blacklist, dependences, branch, extensions } = doc;
-    if (type === 'file') {
-      command += `raw "${_url}"`;
-    } else {
-      command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
-        dependences || ''
-      }" "${branch || ''}" "${extensions || ''}"`;
-    }
-    return command;
-  }
-
-  private formatUrl(doc: Subscription) {
-    let url = doc.url;
-    let host = '';
-    if (doc.type === 'private-repo') {
-      if (doc.pull_type === 'ssh-key') {
-        host = doc.url!.replace(/.*\@([^\:]+)\:.*/, '$1');
-        url = doc.url!.replace(host, doc.alias);
-      } else {
-        host = doc.url!.replace(/.*\:\/\/([^\/]+)\/.*/, '$1');
-        const { username, password } = doc.pull_option as any;
-        url = doc.url!.replace(host, `${username}:${password}@${host}`);
-      }
-    }
-    return { url, host };
-  }
-
   public async handleTask(
     doc: Subscription,
     needCreate = true,
-    needAddKey = true,
     runImmediately = false,
   ) {
-    const { url, host } = this.formatUrl(doc);
+    const { url } = formatUrl(doc);
-    if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
-      if (needAddKey) {
-        this.sshKeyService.addSSHKey(
-          (doc.pull_option as any).private_key,
-          doc.alias,
-          host,
-        );
-      } else {
-        this.sshKeyService.removeSSHKey(doc.alias, host);
-      }
-    }
 
-    doc.command = this.formatCommand(doc, url as string);
+    doc.command = formatCommand(doc, url as string);
 
     if (doc.schedule_type === 'crontab') {
       this.scheduleService.cancelCronTask(doc as any);
@@ -146,6 +105,11 @@ export default class SubscriptionService {
     }
   }
 
+  public async setSshConfig() {
+    const docs = await SubscriptionModel.findAll();
+    this.sshKeyService.setSshConfig(docs);
+  }
+
   private async promiseExec(command: string): Promise<string> {
     return new Promise((resolve, reject) => {
       exec(
@@ -158,18 +122,6 @@ export default class SubscriptionService {
     });
   }
 
-  private async handleLogPath(
-    logPath: string,
-    data: string = '',
-  ): Promise<string> {
-    const absolutePath = path.resolve(config.logPath, logPath);
-    const logFileExist = await fileExist(absolutePath);
-    if (!logFileExist) {
-      await createFile(absolutePath, data);
-    }
-    return absolutePath;
-  }
-
   private taskCallbacks(doc: Subscription): TaskCallbacks {
     return {
       onBefore: async (startTime) => {
@@ -182,7 +134,7 @@ export default class SubscriptionService {
           },
           { where: { id: doc.id } },
         );
-        const absolutePath = await this.handleLogPath(
+        const absolutePath = await handleLogPath(
           logPath as string,
           `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`,
         );
@@ -212,7 +164,7 @@ export default class SubscriptionService {
       },
       onEnd: async (cp, endTime, diff) => {
         const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);
 
         // 执行 sub_after
         let afterStr = '';
@@ -249,12 +201,12 @@ export default class SubscriptionService {
       },
       onError: async (message: string) => {
         const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);
         fs.appendFileSync(absolutePath, `\n${message}`);
       },
       onLog: async (message: string) => {
         const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);
         fs.appendFileSync(absolutePath, `\n${message}`);
       },
     };
@@ -264,6 +216,7 @@ export default class SubscriptionService {
     const tab = new Subscription(payload);
     const doc = await this.insert(tab);
     await this.handleTask(doc);
+    await this.setSshConfig();
     return doc;
   }
 
@@ -272,8 +225,11 @@ export default class SubscriptionService {
   }
 
   public async update(payload: Subscription): Promise<Subscription> {
-    const newDoc = await this.updateDb(payload);
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new Subscription({ ...doc, ...payload });
+    const newDoc = await this.updateDb(tab);
     await this.handleTask(newDoc, !newDoc.is_disabled);
+    await this.setSshConfig();
     return newDoc;
   }
 
@@ -316,12 +272,15 @@ export default class SubscriptionService {
   public async remove(ids: number[]) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      await this.handleTask(doc, false, false);
+      await this.handleTask(doc, false);
     }
     await SubscriptionModel.destroy({ where: { id: ids } });
+    await this.setSshConfig();
   }
 
-  public async getDb(query: any): Promise<Subscription> {
+  public async getDb(
+    query: FindOptions<Subscription>['where'],
+  ): Promise<Subscription> {
     const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Subscription);
   }
@@ -342,19 +301,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 absolutePath = await handleLogPath(doc.log_path as string);
-      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')}${LOG_END_SYMBOL}`,
+        `\n## 执行结束...  ${dayjs().format(
+          'YYYY-MM-DD HH:mm:ss',
+        )}${LOG_END_SYMBOL}`,
       );
     }
 
@@ -364,48 +322,13 @@ 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) {
       return;
     }
 
-    const command = this.formatCommand(subscription);
+    const command = formatCommand(subscription);
 
     await this.scheduleService.runTask(
       command,
@@ -414,19 +337,21 @@ export default class SubscriptionService {
   }
 
   public async disabled(ids: number[]) {
+    await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
+    await this.setSshConfig();
     for (const doc of docs) {
       await this.handleTask(doc, false);
     }
-    await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
   }
 
   public async enabled(ids: number[]) {
+    await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
+    await this.setSshConfig();
     for (const doc of docs) {
       await this.handleTask(doc);
     }
-    await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
   }
 
   public async log(id: number) {
@@ -435,7 +360,7 @@ export default class SubscriptionService {
       return '';
     }
 
-    const absolutePath = await this.handleLogPath(doc.log_path as string);
+    const absolutePath = await handleLogPath(doc.log_path as string);
     return getFileContentByName(absolutePath);
   }
 

back/services/system.ts

@@ -2,14 +2,20 @@ 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';
-import ScheduleService from './schedule';
+import ScheduleService, { TaskCallbacks } from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import got from 'got';
+import {
+  getPid,
+  killTask,
+  parseContentVersion,
+  parseVersion,
+} from '../config/util';
+import { TASK_COMMAND } from '../config/const';
 
 @Service()
 export default class SystemService {
@@ -79,31 +85,33 @@ export default class SystemService {
 
   public async checkUpdate() {
     try {
-      const versionRegx = /.*export const version = \'(.*)\'\;/;
+      const currentVersionContent = await parseVersion(config.versionFile);
-      const logRegx = /.*export const changeLog = \`((.*\n.*)+)\`;/;
 
-      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
+      let lastVersionContent;
-      const currentVersion = currentVersionFile.match(versionRegx)![1];
-
-      let lastVersion = '';
-      let lastLog = '';
       try {
-        const result = await got.get(config.lastVersionFile, {
+        const result = await got.get(
-          timeout: 30000,
+          `${config.lastVersionFile}?t=${Date.now()}`,
-        });
+          {
-        const lastVersionFileContent = result.body;
+            timeout: 30000,
-        lastVersion = lastVersionFileContent.match(versionRegx)![1];
+          },
-        lastLog = lastVersionFileContent.match(logRegx)
+        );
-          ? lastVersionFileContent.match(logRegx)![1]
+        lastVersionContent = await parseContentVersion(result.body);
-          : '';
       } catch (error) {}
 
+      if (!lastVersionContent) {
+        lastVersionContent = currentVersionContent;
+      }
+
       return {
         code: 200,
         data: {
-          hasNewVersion: this.checkHasNewVersion(currentVersion, lastVersion),
+          hasNewVersion: this.checkHasNewVersion(
-          lastVersion,
+            currentVersionContent.version,
-          lastLog,
+            lastVersionContent.version,
+          ),
+          lastVersion: lastVersionContent.version,
+          lastLog: lastVersionContent.changeLog,
+          lastLogLink: lastVersionContent.changeLogLink,
         },
       };
     } catch (error: any) {
@@ -168,4 +176,30 @@ export default class SystemService {
       return { code: 400, message: '通知发送失败，请检查系统设置/通知配置' };
     }
   }
+
+  public async run(
+    { command, logPath }: { command: string; logPath: string },
+    callback: TaskCallbacks,
+  ) {
+    if (!command.startsWith(TASK_COMMAND)) {
+      command = `${TASK_COMMAND} ${command}`;
+    }
+    this.scheduleService.runTask(
+      `real_log_path=${logPath} real_time=true ${command}`,
+      callback,
+    );
+  }
+
+  public async stop({ command }: { command: string }) {
+    if (!command.startsWith(TASK_COMMAND)) {
+      command = `${TASK_COMMAND} ${command}`;
+    }
+    const pid = await getPid(command);
+    if (pid) {
+      await killTask(pid);
+      return { code: 200 };
+    } else {
+      return { code: 400, message: '任务未找到' };
+    }
+  }
 }

back/services/user.ts

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

back/token.ts

@@ -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' }, () => {
+    fs.writeFile(
-      resolve();
+      tokenFile,
-    });
+      `${JSON.stringify(data)}${os.EOL}`,
+      { encoding: 'utf8' },
+      () => {
+        resolve();
+      },
+    );
   });
 }
 

docker/Dockerfile

@@ -1,4 +1,13 @@
-FROM python:alpine
+FROM python:3.10-alpine as builder
+COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
+RUN set -x \
+  && apk update \
+  && apk add nodejs npm git \
+  && npm i -g pnpm \
+  && cd /tmp/build \
+  && pnpm install --prod
+
+FROM python:3.10-alpine
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -6,55 +15,63 @@ ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
 
 ENV PNPM_HOME=/root/.local/share/pnpm \
-    PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
-    LANG=zh_CN.UTF-8 \
+  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 \
-    SHELL=/bin/bash \
+  LANG=C.UTF-8 \
-    PS1="\u@\h:\w \$ " \
+  SHELL=/bin/bash \
-    QL_DIR=/ql \
+  PS1="\u@\h:\w \$ " \
-    QL_BRANCH=${QL_BRANCH}
+  QL_DIR=/ql \
+  QL_BRANCH=${QL_BRANCH}
+
+RUN set -x \
+  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
+  && apk update -f \
+  && apk upgrade \
+  && apk --no-cache add -f bash \
+  coreutils \
+  moreutils \
+  git \
+  curl \
+  wget \
+  tzdata \
+  perl \
+  openssl \
+  nginx \
+  nodejs \
+  jq \
+  openssh \
+  procps \
+  npm \
+  && rm -rf /var/cache/apk/* \
+  && apk update \
+  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+  && echo "Asia/Shanghai" > /etc/timezone \
+  && git config --global user.email "qinglong@@users.noreply.github.com" \
+  && git config --global user.name "qinglong" \
+  && git config --global http.postBuffer 524288000 \
+  && npm install -g pnpm \
+  && pnpm add -g pm2 tsx \
+  && rm -rf /root/.pnpm-store \
+  && rm -rf /root/.local/share/pnpm/store \
+  && rm -rf /root/.cache \
+  && rm -rf /root/.npm
+
+ARG SOURCE_COMMIT
+RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
+  && cd ${QL_DIR} \
+  && cp -f .env.example .env \
+  && chmod 777 ${QL_DIR}/shell/*.sh \
+  && chmod 777 ${QL_DIR}/docker/*.sh \
+  && git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
+  && mkdir -p ${QL_DIR}/static \
+  && cp -rf /static/* ${QL_DIR}/static \
+  && rm -rf /static
+
+COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 
 WORKDIR ${QL_DIR}
 
-RUN set -x \
+HEALTHCHECK --interval=5s --timeout=2s --retries=10 \
-    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
+  CMD curl -sf http://127.0.0.1:5400/api/health || exit 1
-    && apk update -f \
+
-    && apk upgrade \
-    && apk --no-cache add -f bash \
-                             coreutils \
-                             moreutils \
-                             git \
-                             curl \
-                             wget \
-                             tzdata \
-                             perl \
-                             openssl \
-                             nginx \
-                             nodejs \
-                             jq \
-                             openssh \
-                             npm \
-    && rm -rf /var/cache/apk/* \
-    && apk update \
-    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && echo "Asia/Shanghai" > /etc/timezone \
-    && git config --global user.email "qinglong@@users.noreply.github.com" \
-    && git config --global user.name "qinglong" \
-    && git config --global http.postBuffer 524288000 \
-    && npm install -g pnpm \
-    && pnpm add -g pm2 ts-node typescript tslib \
-    && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
-    && cd ${QL_DIR} \
-    && cp -f .env.example .env \
-    && chmod 777 ${QL_DIR}/shell/*.sh \
-    && chmod 777 ${QL_DIR}/docker/*.sh \
-    && pnpm install --prod \
-    && rm -rf /root/.pnpm-store \
-    && rm -rf /root/.local/share/pnpm/store \
-    && rm -rf /root/.cache \
-    && rm -rf /root/.npm \
-    && git clone -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
-    && mkdir -p ${QL_DIR}/static \
-    && cp -rf /static/* ${QL_DIR}/static \
-    && rm -rf /static
-    
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]

docker/docker-compose.yml

@@ -7,3 +7,8 @@ services:
     ports:
       - "0.0.0.0:5700:5700"
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-sf", "http://127.0.0.1:5400/api/health", "||", "exit", "1"]
+      interval: 2m
+      timeout: 10s
+      retries: 3

docker/docker-entrypoint.sh

@@ -9,15 +9,13 @@ export isFirstStartServer=true
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
-cp -fv $nginx_conf /etc/nginx/nginx.conf
+init_nginx
-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
+pm2 l &>/dev/null
-echo
+pm2 flush &>/dev/null
 
 echo -e "======================2. 安装依赖========================\n"
+patch_version
 update_depend
 echo
 
@@ -30,25 +28,25 @@ pm2 delete public &>/dev/null
 pm2 start $dir_static/build/public.js -n public --source-map-support --time
 echo -e "监控服务启动成功...\n"
 
-echo -e "======================5. 启动控制面板========================\n"
+echo -e "======================5. 启动主服务========================\n"
 pm2 delete panel &>/dev/null
 pm2 start $dir_static/build/app.js -n panel --source-map-support --time
-echo -e "控制面板启动成功...\n"
+echo -e "主服务启动成功...\n"
 
-echo -e "======================6. 启动定时任务========================\n"
+echo -e "======================6. 启动定时服务========================\n"
 pm2 delete schedule &>/dev/null
-pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time
+pm2 start $dir_static/build/schedule/index.js -n schedule --source-map-support --time
 echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
   echo -e "======================7. 启动bot========================\n"
-  nohup ql bot >$dir_log/bot.log 2>&1 &
+  nohup ql -l 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/extra.log 2>&1 &
+  nohup ql -l extra >$dir_log/extra.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi
 

docker/front.conf

@@ -13,6 +13,7 @@ map $http_upgrade $connection_upgrade {
 
 server {
   listen 5700;
+  IPV6_CONFIG
   root /ql/static/dist;
   ssl_session_timeout 5m;
 
@@ -20,7 +21,7 @@ server {
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_pass http://publicApi/api/public/;
+    proxy_pass http://publicApi/api/;
   }
 
   location QL_BASE_URL/api/ {

package.json

@@ -4,12 +4,14 @@
     "start": "concurrently -n w: npm:start:*",
     "start:front": "max dev",
     "start:back": "nodemon",
-    "start:public": "ts-node back/public.ts",
+    "start:public": "ts-node --transpile-only ./back/public.ts",
+    "start:rpc": "ts-node --transpile-only ./back/schedule/index.ts",
     "build:front": "max build",
     "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.js",
-    "schedule": "npm run build:back && node static/build/schedule.js",
+    "schedule": "npm run build:back && node static/build/schedule/index.js",
     "public": "npm run build:back && node static/build/public.js",
+    "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "postinstall": "max setup 2>/dev/null || true",
     "test": "umi-test",
@@ -42,7 +44,8 @@
         "monaco-editor",
         "rc-field-form",
         "@types/lodash.merge",
-        "rollup"
+        "rollup",
+        "styled-components"
       ],
       "allowedVersions": {
         "react": "18",
@@ -52,6 +55,7 @@
     }
   },
   "dependencies": {
+    "@grpc/grpc-js": "^1.8.13",
     "@otplib/preset-default": "^12.0.1",
     "@sentry/node": "^7.12.1",
     "@sentry/tracing": "^7.12.1",
@@ -69,18 +73,20 @@
     "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",
+    "protobufjs": "^7.2.3",
+    "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",
+    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.2",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
@@ -89,15 +95,17 @@
   },
   "devDependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.33.1",
+    "@ant-design/pro-layout": "6.38.22",
     "@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",
@@ -105,20 +113,22 @@
     "@types/nodemailer": "^6.4.4",
     "@types/qrcode.react": "^1.0.2",
     "@types/react": "^18.0.20",
+    "@types/react-copy-to-clipboard": "^5.0.4",
     "@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/max": "^4.0.21",
+    "@umijs/max": "^4.0.55",
     "@umijs/ssr-darkreader": "^4.9.45",
     "ansi-to-react": "^6.1.6",
-    "antd": "^4.23.0",
+    "antd": "^4.24.8",
     "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",
+    "monaco-editor": "0.33.0",
     "nodemon": "^2.0.15",
     "prettier": "^2.5.1",
     "qiniu": "^7.4.0",
@@ -127,6 +137,7 @@
     "rc-tween-one": "^3.0.6",
     "react": "18.2.0",
     "react-codemirror2": "^7.2.1",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-diff-viewer": "^3.1.1",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
@@ -134,10 +145,13 @@
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.6.0",
+    "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
-    "typescript": "^4.6.2",
+    "tsx": "^3.12.3",
+    "typescript": "4.8.4",
     "umi-request": "^1.4.0",
     "vh-check": "^2.0.5",
+    "virtualizedtableforantd4": "1.3.0",
     "webpack": "^5.70.0",
     "yorkie": "^2.0.0"
   }

sample/config.sample.sh

@@ -1,9 +1,3 @@
-## Version: v2.8.0
-## Date: 2021-06-20
-## Update Content: 可持续发展纲要\n1. session管理破坏性修改\n2. 配置管理可编辑config下文件\n3. 自定义脚本改为查看脚本\n4. 移除互助相关
-
-## 上面版本号中，如果第2位数字有变化，那么代表增加了新的参数，如果只有第3位数字有变化，仅代表更新了注释，没有增加新的参数，可更新可不更新
-
 ## 在运行 ql repo 命令时，是否自动删除失效的脚本与定时任务
 AutoDelCron="true"
 
@@ -16,7 +10,7 @@ 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%
@@ -24,11 +18,8 @@ CpuWarn=80
 MemoryWarn=80
 DiskWarn=90
 
-## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
+## 设置定时任务执行的超时时间，例如1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-CommandTimeoutTime="1h"
+CommandTimeoutTime=""
-
-## 设置批量执行任务时的并发数，默认同时执行5个任务
-MaxConcurrentNum="5"
 
 ## 在运行 task 命令时，随机延迟启动任务的最大延迟时间
 ## 默认给javascript任务加随机延迟，如 RandomDelay="300" ，表示任务将在 1-300 秒内随机延迟一个秒数，然后再运行，取消延迟赋值为空
@@ -67,7 +58,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"
@@ -160,4 +151,17 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""
 
+## 14. SMTP
+## 暂时只支持在 Python 中调用 notify.py 以发送 SMTP 邮件通知
+## smtp_server 填写 SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
+export SMTP_SERVER=""
+## smtp_ssl 填写 SMTP 发送邮件服务器是否使用 SSL，内容应为 true 或 false
+export SMTP_SSL="false"
+## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
+export SMTP_EMAIL=""
+## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
+export SMTP_PASSWORD=""
+## smtp_name 填写 SMTP 收发件人姓名，可随意填写
+export SMTP_NAME=""
+
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.js

@@ -38,6 +38,7 @@ let SCKEY = '';
 //此处填你申请的PushDeer KEY.
 //(环境变量名 DEER_KEY)
 let PUSHDEER_KEY = '';
+let PUSHDEER_URL = '';
 
 // =======================================Synology Chat通知设置区域===========================================
 //此处填你申请的CHAT_URL与CHAT_TOKEN
@@ -49,7 +50,7 @@ let CHAT_TOKEN = '';
 //此处填你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"
@@ -124,6 +125,18 @@ let AIBOTK_NAME = '';
 //FSKEY 飞书机器人的 FSKEY
 let FSKEY = '';
 
+// =======================================SMTP 邮件设置区域=======================================
+// SMTP_SERVER: 填写 SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
+// SMTP_SSL: 填写 SMTP 发送邮件服务器是否使用 SSL，内容应为 true 或 false
+// SMTP_EMAIL: 填写 SMTP 收发件邮箱，通知将会由自己发给自己
+// SMTP_PASSWORD: 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
+// SMTP_NAME: 填写 SMTP 收发件人姓名，可随意填写
+let SMTP_SERVER = '';
+let SMTP_SSL = 'false';
+let SMTP_EMAIL = '';
+let SMTP_PASSWORD = '';
+let SMTP_NAME = '';
+
 //==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
   GOTIFY_URL = process.env.GOTIFY_URL;
@@ -151,6 +164,7 @@ 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) {
@@ -248,6 +262,22 @@ if (process.env.AIBOTK_NAME) {
 if (process.env.FSKEY) {
   FSKEY = process.env.FSKEY;
 }
+
+if (process.env.SMTP_SERVER) {
+  SMTP_SERVER = process.env.SMTP_SERVER;
+}
+if (process.env.SMTP_SSL) {
+  SMTP_SSL = process.env.SMTP_SSL;
+}
+if (process.env.SMTP_EMAIL) {
+  SMTP_EMAIL = process.env.SMTP_EMAIL;
+}
+if (process.env.SMTP_PASSWORD) {
+  SMTP_PASSWORD = process.env.SMTP_PASSWORD;
+}
+if (process.env.SMTP_NAME) {
+  SMTP_NAME = process.env.SMTP_NAME;
+}
 //==========================云端环境变量的判断与接收=========================
 
 /**
@@ -266,6 +296,16 @@ async function sendNotify(
 ) {
   //提供6种通知
   desp += author; //增加作者信息，防止被贩卖等
+
+  // 根据标题跳过一些消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔
+  let skipTitle = process.env.SKIP_PUSH_TITLE
+  if(skipTitle) {
+    if(skipTitle.split('\n').includes(text)) {
+      console.info(text + "在SKIP_PUSH_TITLE环境变量内，跳过推送！");
+      return
+    }
+  }
+
   await Promise.all([
     serverNotify(text, desp), //微信server酱
     pushPlusNotify(text, desp), //pushplus(推送加)
@@ -285,6 +325,7 @@ async function sendNotify(
     PushDeerNotify(text, desp), //PushDeer
     aibotkNotify(text, desp), //智能微秘书
     fsBotNotify(text, desp), //飞书机器人
+    smtpNotify(text, desp), //SMTP 邮件
   ]);
 }
 
@@ -413,7 +454,7 @@ function PushDeerNotify(text, desp) {
       // 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',
@@ -492,7 +533,7 @@ function BarkNotify(text, desp, params = {}) {
       const options = {
         url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(
           desp,
-        )}?icon=${BARK_ICON}?sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(
+        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(
           params,
         )}`,
         headers: {
@@ -978,6 +1019,8 @@ function aibotkNotify(text, desp) {
           resolve(data);
         }
       });
+    } else {
+      resolve();
     }
   });
 }
@@ -987,7 +1030,7 @@ function fsBotNotify(text, desp) {
     if (FSKEY) {
       const options = {
         url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
-        json: { msg_type: 'text', content: { text: `${title}\n\n${content}` } },
+        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
         headers: {
           'Content-Type': 'application/json',
         },
@@ -1018,6 +1061,52 @@ function fsBotNotify(text, desp) {
   });
 }
 
+async function smtpNotify(text, desp) {
+  if (![SMTP_SERVER, SMTP_EMAIL, SMTP_PASSWORD].every(Boolean)) {
+    return;
+  }
+
+  try {
+    const nodemailer = require('nodemailer');
+    const transporter = nodemailer.createTransport(
+      `${SMTP_SSL === 'true' ? 'smtps:' : 'smtp:'}//${SMTP_SERVER}`,
+      {
+        auth: {
+          user: SMTP_EMAIL,
+          pass: SMTP_PASSWORD,
+        },
+      },
+    );
+
+    const addr = SMTP_NAME ? `"${SMTP_NAME}" <${SMTP_EMAIL}>` : SMTP_EMAIL;
+    const info = await transporter.sendMail({
+      from: addr,
+      to: addr,
+      subject: text,
+      text: desp,
+    });
+
+    if (!!info.messageId) {
+      console.log('SMTP发送通知消息成功🎉\n');
+      return true;
+    }
+    console.log('SMTP发送通知消息失败！！\n');
+  } catch (e) {
+    console.log('SMTP发送通知消息出现错误！！\n');
+    console.log(e);
+  }
+}
+
+function smtpNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (SMTP_SERVER && SMTP_SSL && SMTP_EMAIL && SMTP_PASSWORD && SMTP_NAME) {
+      // todo: Node.js并没有内置的 smtp 实现，需要调用外部库，因为不清楚这个文件的模块依赖情况，所以留给有缘人实现
+    } else {
+      resolve();
+    }
+  });
+}
+
 module.exports = {
   sendNotify,
   BARK_PUSH,

sample/notify.py

@@ -9,6 +9,10 @@ import re
 import threading
 import time
 import urllib.parse
+import smtplib
+from email.mime.text import MIMEText
+from email.header import Header
+from email.utils import formataddr
 
 import requests
 
@@ -61,10 +65,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+ 微信推送的群组编码
 
@@ -85,6 +90,12 @@ push_config = {
     'AIBOTK_KEY': '',                   # 智能微秘书 个人中心的apikey 文档地址：http://wechat.aibotk.com/docs/about
     'AIBOTK_TYPE': '',                  # 智能微秘书 发送目标 room 或 contact
     'AIBOTK_NAME': '',                  # 智能微秘书  发送群名 或者好友昵称和type要对应好
+
+    'SMTP_SERVER': '',                  # SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
+    'SMTP_SSL': 'false',                # SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false
+    'SMTP_EMAIL': '',                   # SMTP 收发件邮箱，通知将会由自己发给自己
+    'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
+    'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
 }
 notify_function = []
 # fmt: on
@@ -153,7 +164,8 @@ def dingding_bot(title: str, content: str) -> None:
 
     timestamp = str(round(time.time() * 1000))
     secret_enc = push_config.get("DD_BOT_SECRET").encode("utf-8")
-    string_to_sign = "{}\n{}".format(timestamp, push_config.get("DD_BOT_SECRET"))
+    string_to_sign = "{}\n{}".format(
+        timestamp, push_config.get("DD_BOT_SECRET"))
     string_to_sign_enc = string_to_sign.encode("utf-8")
     hmac_code = hmac.new(
         secret_enc, string_to_sign_enc, digestmod=hashlib.sha256
@@ -209,7 +221,7 @@ def go_cqhttp(title: str, content: str) -> None:
         print("go-cqhttp 推送失败！")
 
 
-def gotify(title:str,content:str)  -> None:
+def gotify(title: str, content: str) -> None:
     """
     使用 gotify 推送消息。
     """
@@ -219,8 +231,9 @@ def gotify(title:str,content:str)  -> None:
     print("gotify 服务启动")
 
     url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}'
-    data = {"title": title,"message": content,"priority": push_config.get("GOTIFY_PRIORITY")}
+    data = {"title": title, "message": content,
-    response = requests.post(url,data=data).json()
+            "priority": push_config.get("GOTIFY_PRIORITY")}
+    response = requests.post(url, data=data).json()
 
     if response.get("id"):
         print("gotify 推送成功！")
@@ -258,10 +271,10 @@ def serverJ(title: str, content: str) -> None:
     print("serverJ 服务启动")
 
     data = {"text": title, "desp": content.replace("\n", "\n\n")}
-    if push_config.get("PUSH_KEY").index("SCT") != -1:
+    if push_config.get("PUSH_KEY").find("SCT") != -1:
         url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
     else:
-        url = f'https://sc.ftqq.com/${push_config.get("PUSH_KEY")}.send'
+        url = f'https://sc.ftqq.com/{push_config.get("PUSH_KEY")}.send'
     response = requests.post(url, data=data).json()
 
     if response.get("errno") == 0 or response.get("code") == 0:
@@ -278,16 +291,20 @@ def pushdeer(title: str, content: str) -> None:
         print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
         return
     print("PushDeer 服务启动")
-    data = {"text": title, "desp": content, "type": "markdown", "pushkey": push_config.get("DEER_KEY")}
+    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 推送消息
@@ -299,14 +316,13 @@ def chat(title: str, content: str) -> None:
     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)    
+        print("Chat 推送失败！错误信息：", response)
+
 
-        
-        
 def pushplus_bot(title: str, content: str) -> None:
     """
     通过 push+ 推送消息。
@@ -334,7 +350,8 @@ def pushplus_bot(title: str, content: str) -> None:
 
         url_old = "http://pushplus.hxtrip.com/send"
         headers["Accept"] = "application/json"
-        response = requests.post(url=url_old, data=body, headers=headers).json()
+        response = requests.post(
+            url=url_old, data=body, headers=headers).json()
 
         if response["code"] == 200:
             print("PUSHPLUS(hxtrip) 推送成功！")
@@ -353,7 +370,8 @@ def qmsg_bot(title: str, content: str) -> None:
     print("qmsg 服务启动")
 
     url = f'https://qmsg.zendee.cn/{push_config.get("QMSG_TYPE")}/{push_config.get("QMSG_KEY")}'
-    payload = {"msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
+    payload = {
+        "msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
     response = requests.post(url=url, params=payload).json()
 
     if response["code"] == 0:
@@ -539,14 +557,14 @@ def aibotk(title: str, content: str) -> None:
         data = {
             "apiKey": push_config.get("AIBOTK_KEY"),
             "roomName": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+            "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}' }
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n{title}\n{content}'}
         }
     body = json.dumps(data).encode(encoding="utf-8")
     headers = {"Content-Type": "application/json"}
@@ -558,6 +576,35 @@ def aibotk(title: str, content: str) -> None:
         print(f'智能微秘书 推送失败！{response["error"]}')
 
 
+def smtp(title: str, content: str) -> None:
+    """
+    使用 SMTP 邮件 推送消息。
+    """
+    if not push_config.get("SMTP_SERVER") or not push_config.get("SMTP_SSL") or not push_config.get("SMTP_EMAIL") or not push_config.get("SMTP_PASSWORD") or not push_config.get("SMTP_NAME"):
+        print("SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送")
+        return
+    print("SMTP 邮件 服务启动")
+
+    message = MIMEText(content, 'plain', 'utf-8')
+    message['From'] = formataddr((Header(push_config.get(
+        "SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
+    message['To'] = formataddr((Header(push_config.get(
+        "SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
+    message['Subject'] = Header(title, 'utf-8')
+
+    try:
+        smtp_server = smtplib.SMTP_SSL(push_config.get("SMTP_SERVER")) if push_config.get(
+            "SMTP_SSL") == 'true' else smtplib.SMTP(push_config.get("SMTP_SERVER"))
+        smtp_server.login(push_config.get("SMTP_EMAIL"),
+                          push_config.get("SMTP_PASSWORD"))
+        smtp_server.sendmail(push_config.get("SMTP_EMAIL"),
+                             push_config.get("SMTP_EMAIL"), message.as_bytes())
+        smtp_server.close()
+        print("SMTP 邮件 推送成功！")
+    except Exception as e:
+        print(f'SMTP 邮件 推送失败！{e}')
+
+
 def one() -> str:
     """
     获取一条一言。
@@ -599,7 +646,9 @@ if push_config.get("QYWX_KEY"):
 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)    
+    notify_function.append(aibotk)
+if push_config.get("SMTP_SERVER") and push_config.get("SMTP_SSL") and push_config.get("SMTP_EMAIL") and push_config.get("SMTP_PASSWORD") and push_config.get("SMTP_NAME"):
+    notify_function.append(smtp)
 
 
 def send(title: str, content: str) -> None:
@@ -607,13 +656,21 @@ def send(title: str, content: str) -> None:
         print(f"{title} 推送内容为空！")
         return
 
+    # 根据标题跳过一些消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔
+    skipTitle = os.getenv("SKIP_PUSH_TITLE")
+    if skipTitle:
+        if (title in re.split("\n", skipTitle)):
+            print(f"{title} 在SKIP_PUSH_TITLE环境变量内，跳过推送！")
+            return
+
     hitokoto = push_config.get("HITOKOTO")
 
     text = one() if hitokoto else ""
     content += "\n\n" + text
 
     ts = [
-        threading.Thread(target=mode, args=(title, content), name=mode.__name__)
+        threading.Thread(target=mode, args=(
+            title, content), name=mode.__name__)
         for mode in notify_function
     ]
     [t.start() for t in ts]

sample/package.json

@@ -3,14 +3,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "crypto-js": "^4.0.0",
-    "download": "^8.0.0",
-    "http-server": "^0.12.3",
     "got": "^11.5.1",
-    "qrcode-terminal": "^0.12.0",
+    "nodemailer": "^6.8.0",
-    "request": "^2.88.2",
     "tough-cookie": "^4.0.0",
     "tunnel": "0.0.6",
     "ws": "^7.4.3"
   }
-}
+}

sample/tool.ts

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

shell/api.sh

@@ -1,7 +1,25 @@
 #!/usr/bin/env bash
 
+create_token() {
+  local token_command="tsx ${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")
+}
+
 get_token() {
-  token=$(cat $file_auth_token | jq -r .value)
+  if [[ -f $file_auth_token ]]; then
+    token=$(cat $file_auth_token | jq -r .value)
+    local expiration=$(cat $file_auth_token | jq -r .expiration)
+    local currentTimeStamp=$(date +%s)
+    if [[ $currentTimeStamp -ge $expiration ]]; then
+      create_token
+    fi
+  else
+    create_token
+  fi
 }
 
 add_cron_api() {
@@ -10,10 +28,16 @@ add_cron_api() {
     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 sub_id=$(echo "$1" | awk -F ":" '{print $4}')
   else
     local schedule=$1
     local command=$2
     local name=$3
+    local sub_id=$4
+  fi
+
+  if [[ ! $sub_id ]];then
+    sub_id="null"
   fi
 
   local api=$(
@@ -25,11 +49,11 @@ add_cron_api() {
       -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\"}" \
+      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
       --compressed
   )
-  code=$(echo $api | jq -r .code)
+  code=$(echo "$api" | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  message=$(echo "$api" | jq -r .message)
   if [[ $code == 200 ]]; then
     echo -e "$name -> 添加成功"
   else
@@ -64,8 +88,8 @@ update_cron_api() {
       --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
       --compressed
   )
-  code=$(echo $api | jq -r .code)
+  code=$(echo "$api" | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  message=$(echo "$api" | jq -r .message)
   if [[ $code == 200 ]]; then
     echo -e "$name -> 更新成功"
   else
@@ -96,8 +120,8 @@ update_cron_command_api() {
       --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
       --compressed
   )
-  code=$(echo $api | jq -r .code)
+  code=$(echo "$api" | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  message=$(echo "$api" | jq -r .message)
   if [[ $code == 200 ]]; then
     echo -e "$command -> 更新成功"
   else
@@ -121,8 +145,8 @@ del_cron_api() {
       --data-raw "[$ids]" \
       --compressed
   )
-  code=$(echo $api | jq -r .code)
+  code=$(echo "$api" | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  message=$(echo "$api" | jq -r .message)
   if [[ $code == 200 ]]; then
     echo -e "成功"
   else
@@ -151,10 +175,10 @@ update_cron() {
       --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)
+  code=$(echo "$api" | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  message=$(echo "$api" | jq -r .message)
   if [[ $code != 200 ]]; then
-    echo -e "\n## 更新任务状态失败(${message})\n" >>$dir_log/$log_path
+    echo -e "\n## 更新任务状态失败(${message})\n"
   fi
 }
 
@@ -175,8 +199,8 @@ notify_api() {
       --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
       --compressed
   )
-  code=$(echo $api | jq -r .code)
+  code=$(echo "$api" | jq -r .code)
-  message=$(echo $api | jq -r .message)
+  message=$(echo "$api" | jq -r .message)
   if [[ $code == 200 ]]; then
     echo -e "通知发送成功"
   else
@@ -184,4 +208,27 @@ notify_api() {
   fi
 }
 
+find_cron_api() {
+  local params=$1
+  local currentTimeStamp=$(date +%s)
+  local api=$(
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
+      -H "Accept: application/json" \
+      -H "Authorization: Bearer $token" \
+      -H "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" \
+      --compressed
+  )
+  data=$(echo "$api" | jq -r .data)
+  if [[ $data == 'null' ]]; then
+    echo -e ""
+  else
+    name=$(echo "$api" | jq -r .data.name)
+    echo -e "$name"
+  fi
+}
+
 get_token

shell/bot.sh

@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-
 if [[ -z ${BotRepoUrl} ]]; then
   url="https://github.com/SuMaiKaDe/bot.git"
   repo_path="${dir_repo}/dockerbot"
@@ -46,6 +42,6 @@ echo -e "\npython3依赖安装成功...\n"
 echo -e "4、启动bot程序...\n"
 make_dir $dir_log/bot
 cd $dir_data
-ps -ef | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
+ps -eo pid,command | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
 nohup python3 -m jbot >$dir_log/bot/nohup.log 2>&1 &
 echo -e "bot启动成功...\n"

shell/check.sh

@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-. $dir_shell/api.sh
-
 reset_env() {
   echo -e "---> 1. 开始检测配置文件\n"
   fix_config
@@ -29,9 +25,7 @@ copy_dep() {
   echo -e "---> 通知文件复制完成\n"
 
   echo -e "---> 2. 复制nginx配置文件\n"
-  cp -fv $nginx_conf /etc/nginx/nginx.conf
+  init_nginx
-  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
   echo -e "---> 配置文件复制完成\n"
 }
 
@@ -39,12 +33,12 @@ pm2_log() {
   echo -e "---> pm2日志"
   local panelOut="/root/.pm2/logs/panel-out.log"
   local panelError="/root/.pm2/logs/panel-error.log"
-  tail -n 100 "$panelOut"
+  tail -n 300 "$panelOut"
-  tail -n 100 "$panelError"
+  tail -n 300 "$panelError"
 }
 
 check_nginx() {
-  local nginxPid=$(ps -ef | grep nginx | grep -v grep)
+  local nginxPid=$(ps -eo pid,command | grep nginx | grep -v grep)
   echo -e "=====> 检测nginx服务\n$nginxPid"
   if [[ $nginxPid ]]; then
     echo -e "\n=====> nginx服务正常\n"
@@ -60,9 +54,6 @@ check_ql() {
   echo -e "\n=====> 检测面板\n\n$api\n"
   if [[ $api =~ "<div id=\"root\"></div>" ]]; then
     echo -e "=====> 面板服务启动正常\n"
-  else
-    echo -e "=====> 面板服务异常，重置基础环境\n"
-    reset_env
   fi
 }
 
@@ -70,9 +61,8 @@ check_pm2() {
   pm2_log
   local currentTimeStamp=$(date +%s)
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/api/user?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/api/system?t=$currentTimeStamp" \
       -H 'Accept: */*' \
-      -H "Authorization: Bearer $token" \
       -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36' \
       -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' \
@@ -81,19 +71,22 @@ check_pm2() {
   echo -e "\n=====> 检测后台\n\n$api\n"
   if [[ $api =~ "{\"code\"" ]]; then
     echo -e "=====> 后台服务启动正常\n"
-  else
-    echo -e "=====> 后台服务异常，重置基础环境并重启后台\n"
-    reset_env
   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 setup &>/dev/null
+  patch_version
-  source ~/.bashrc
+  pnpm add -g pm2 tsx
-  pnpm install -g &>/dev/null
+  reset_env
-  pnpm add -g pm2
+  start_public
   copy_dep
   check_ql
   check_nginx

shell/otask.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-. $dir_shell/api.sh
-
 random_delay() {
   local random_delay_max=$RandomDelay
   if [[ $random_delay_max ]] && [[ $random_delay_max -gt 0 ]]; then
@@ -29,7 +24,7 @@ random_delay() {
     done
 
     local delay_second=$(($(gen_random_num "$random_delay_max") + 1))
-    echo -e "\n命令未添加 \"now\"，随机延迟 $delay_second 秒后再执行任务，如需立即终止，请按 CTRL+C...\n"
+    echo -e "任务随机延迟 $delay_second 秒，配置文件参数 RandomDelay 置空可取消延迟 \n"
     sleep $delay_second
   fi
 }
@@ -75,55 +70,26 @@ run_nohup() {
 }
 
 check_server() {
-  cpu_use=$(top -b -n 1 | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
+  if [[ $cpu_warn ]] && [[ $mem_warn ]] && [[ $disk_warn ]]; then
+    local top_result=$(top -b -n 1)
+    cpu_use=$(echo "$top_result" | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
 
-  mem_free=$(free -m | grep "Mem" | awk '{print $3}' | head -n 1)
+    mem_free=$(free -m | grep "Mem" | awk '{print $3}' | head -n 1)
-  mem_total=$(free -m | grep "Mem" | awk '{print $2}' | 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)
+    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)
+    disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%" | head -n 1)
-
+    if [[ $cpu_use -gt $cpu_warn ]] && [[ $cpu_warn ]] || [[ $mem_free -lt $mem_warn ]] || [[ $disk_use -gt $disk_warn ]]; then
-  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)
-    local resource=$(top -b -n 1 | grep -v -E 'grep|Mem|idle|Load' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10)
+      notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource"
-    notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource"
+    fi
   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
+  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]]; then
     random_delay "$file_param"
   fi
 
@@ -149,7 +115,7 @@ run_concurrent() {
 
   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 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[@]}))
 
@@ -164,7 +130,7 @@ run_concurrent() {
 
   local envs=$(eval echo "\$${env_param}")
   local array=($(echo $envs | sed 's/&/ /g'))
-  single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
+  single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%3N")
 
   cd $dir_scripts
   local relative_path="${file_param%/*}"
@@ -197,7 +163,7 @@ run_designated() {
 
   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 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[@]}))
 
@@ -232,8 +198,7 @@ run_else() {
 
   shift
 
-  local params=$(echo "$@" | sed 's/ /\" \"/g')
+  $timeoutCmd $which_program $file_param "$@"
-  $timeoutCmd $which_program $file_param \"$params\"
 }
 
 ## 命令检测

shell/pub.sh

@@ -11,9 +11,9 @@ echo -e "提交master代码"
 git push
 
 echo -e "更新cdn文件"
-ts-node sample/tool.ts
+tsx 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"
 

shell/rmlog.sh

@@ -1,12 +1,8 @@
 #!/usr/bin/env bash
 
-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-
 days=$1
 
-## 删除运行js脚本的旧日志
+## 删除运行脚本的旧日志
 remove_js_log() {
   local log_full_path_list=$(find $dir_log/ -name "*.log")
   local diff_time
@@ -18,7 +14,17 @@ remove_js_log() {
       else
         diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
       fi
-      [[ $diff_time -gt $((${days} * 86400)) ]] && rm -vf $log
+      if [[ $diff_time -gt $((${days} * 86400)) ]]; then
+        local log_path=$(echo "$log" | sed "s,${dir_log}/,,g")
+        local result=$(find_cron_api "log_path=$log_path")
+        echo -e "查询文件 $log_path"
+        if [[ -z $result ]]; then
+          echo -e "删除中~"
+          rm -vf $log
+        else
+          echo -e "正在被 $result 使用，跳过~"
+        fi
+      fi
     fi
   done
 }

shell/share.sh

@@ -68,7 +68,7 @@ import_config() {
   [[ -f $file_env ]] && . $file_env
 
   ql_base_url=${QlBaseUrl:-""}
-  command_timeout_time=${CommandTimeoutTime:-"1h"}
+  command_timeout_time=${CommandTimeoutTime:-""}
   proxy_url=${ProxyUrl:-""}
   file_extensions=${RepoFileExtensions:-"js py"}
   current_branch=${QL_BRANCH}
@@ -79,12 +79,16 @@ import_config() {
     default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
   fi
 
-  cpu_warn=${CpuWarn:-80}
+  cpu_warn=${CpuWarn}
-  mem_warn=${MemoryWarn:-80}
+  mem_warn=${MemoryWarn}
-  disk_warn=${DiskWarn:-90}
+  disk_warn=${DiskWarn}
 }
 
 set_proxy() {
+  local proxy="$1"
+  if [[ $proxy ]]; then
+    proxy_url="$proxy"
+  fi
   if [[ $proxy_url ]]; then
     export http_proxy="${proxy_url}"
     export https_proxy="${proxy_url}"
@@ -263,9 +267,9 @@ npm_install_1() {
   local dir_work=$1
 
   cd $dir_work
-  echo -e "运行 npm install...\n"
+  echo -e "运行 pnpm install...\n"
   npm_install_sub
-  [[ $? -ne 0 ]] && echo -e "\nnpm install 运行不成功，请进入 $dir_work 目录后手动运行 npm install...\n"
+  [[ $? -ne 0 ]] && echo -e "\nnpm install 运行不成功，请进入 $dir_work 目录后手动运行 pnpm install...\n"
   cd $dir_current
 }
 
@@ -274,7 +278,7 @@ npm_install_2() {
   local dir_work=$1
 
   cd $dir_work
-  echo -e "检测到 $dir_work 的依赖包有变化，运行 npm install...\n"
+  echo -e "安装 $dir_work 依赖包...\n"
   npm_install_sub
   if [[ $? -ne 0 ]]; then
     echo -e "\n安装 $dir_work 的依赖包运行不成功，再次尝试一遍...\n"
@@ -303,32 +307,41 @@ update_depend() {
 }
 
 git_clone_scripts() {
-  local url=$1
+  local url="$1"
-  local dir=$2
+  local dir="$2"
-  local branch=$3
+  local branch="$3"
+  local proxy="$4"
   [[ $branch ]] && local part_cmd="-b $branch "
   echo -e "开始克隆仓库 $url 到 $dir\n"
 
-  set_proxy
+  set_proxy "$proxy"
-  git clone $part_cmd $url $dir
+  git clone --depth=1 $part_cmd $url $dir
   exit_status=$?
   unset_proxy
+
+  reset_branch "$branch"
 }
 
 git_pull_scripts() {
   local dir_current=$(pwd)
   local dir_work="$1"
   local branch="$2"
+  local proxy="$3"
   cd $dir_work
-  echo -e "开始更新仓库：$dir_work\n"
+  echo -e "开始更新仓库：$dir_work"
 
-  set_proxy
+  local pre_commit_id=$(git rev-parse --short HEAD)
-  git fetch --all
+  set_proxy "$proxy"
+  git fetch --depth=1 --all
+  git pull --depth=1 &>/dev/null
   exit_status=$?
-  git pull &>/dev/null
   unset_proxy
-  reset_branch "$branch"
 
+  reset_branch "$branch"
+  local cur_commit_id=$(git rev-parse --short HEAD)
+  if [[ $cur_commit_id != $pre_commit_id ]]; then
+    exit_status=0
+  fi
   cd $dir_current
 }
 
@@ -338,19 +351,21 @@ reset_romote_url() {
   local url=$2
   local branch="$3"
 
+  cd $dir_work
   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
-
+  else
-    local part_cmd=""
+    git init
-    reset_branch "$branch"
+    git remote add origin $url &>/dev/null
-    cd $dir_current
   fi
+  
+  cd $dir_current
 }
 
 reset_branch() {
   local branch="$1"
+  local part_cmd="HEAD"
   if [[ $branch ]]; then
     part_cmd="origin/${branch}"
     git checkout -B "$branch" &>/dev/null
@@ -367,18 +382,15 @@ random_range() {
 
 reload_pm2() {
   pm2 l &>/dev/null
+  pm2 flush &>/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"
+  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
+  pm2 start $dir_static/build/schedule/index.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
 }
 
 diff_time() {
@@ -410,9 +422,9 @@ format_log_time() {
   local time="$2"
 
   if [[ $is_macos -eq 1 ]]; then
-    echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S")
+    echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
   else
-    echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
   fi
 }
 
@@ -428,17 +440,22 @@ format_timestamp() {
 }
 
 patch_version() {
+  # 兼容pnpm@7
+  pnpm setup &>/dev/null
+  source ~/.bashrc
+  apk add procps
+
   if [[ $PipMirror ]]; then
     pip3 config set global.index-url $PipMirror
   fi
   if [[ $NpmMirror ]]; then
-    npm config set registry $NpmMirror
+    cd && pnpm config set registry $NpmMirror
+    pnpm install -g --force
   fi
 
-  # 兼容pnpm@7
+  git config --global pull.rebase false
-  pnpm setup &>/dev/null
+
-  source ~/.bashrc
+  cp -f $dir_root/.env.example $dir_root/.env
-  pnpm install -g &>/dev/null
 
   if [[ -f "$dir_root/db/cookie.db" ]]; then
     echo -e "检测到旧的db文件，拷贝为新db...\n"
@@ -447,14 +464,6 @@ patch_version() {
     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
@@ -480,6 +489,49 @@ patch_version() {
   fi
 }
 
+init_nginx() {
+  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
+  
+  ipv6=$(ip a | grep inet6)
+  ipv6Str=""
+  if [[ $ipv6 ]]; then
+    ipv6Str="listen [::]:5700 ipv6only=on;"
+  fi
+  sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf
+}
+
+handle_task_before() {
+  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
+
+  echo -e "## 开始执行... $begin_time\n"
+
+  [[ $is_macos -eq 0 ]] && check_server
+
+  if [[ -s $task_error_log_path ]]; then
+    cat $task_error_log_path
+    echo -e "加载 config.sh 出错，请手动检查"
+  fi
+
+  . $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))
+
+  [[ "$diff_time" == 0 ]] && diff_time=1
+
+  echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
+
+  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+}
+
 init_env
 detect_termux
 detect_macos

shell/task.sh

@@ -5,6 +5,12 @@ dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
+trap "single_hanle" 2 3 20 15 14
+single_hanle() {
+  eval handle_task_after "$@" "$cmd"
+  exit 1
+}
+
 ## 选择python3还是node
 define_program() {
   local file_param=$1
@@ -15,7 +21,11 @@ define_program() {
   elif [[ $file_param == *.sh ]]; then
     which_program="bash"
   elif [[ $file_param == *.ts ]]; then
-    which_program="ts-node-transpile-only"
+    if ! type tsx &>/dev/null; then
+      which_program="ts-node-transpile-only"
+    else
+      which_program="tsx"
+    fi
   else
     which_program=""
   fi
@@ -24,16 +34,24 @@ define_program() {
 handle_log_path() {
   local file_param=$1
 
-  if [[ -z $file_param ]];then
+  if [[ -z $file_param ]]; then
     file_param="task"
   fi
 
+  if [[ -z $ID ]]; then
+    ID=$(cat $list_crontab_user | grep -E "$cmd_task.* $file_param" | perl -pe "s|.*ID=(.*) $cmd_task.* $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
+  fi
   local suffix=""
   if [[ ! -z $ID ]]; then
-    suffix="_${ID}"
+    if [[ "$ID" -gt 0 ]] 2>/dev/null; then
+      suffix="_${ID}"
+    else
+      ID=""
+    fi
   fi
-  time=$(date "+$time_format")
+
-  log_time=$(format_log_time "$time_format" "$time")
+  time=$(date "+$mtime_format")
+  log_time=$(format_log_time "$mtime_format" "$time")
   log_dir_tmp="${file_param##*/}"
   if [[ $file_param =~ "/" ]]; then
     if [[ $file_param == /* ]]; then
@@ -47,33 +65,65 @@ handle_log_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"
+
+  if [[ $real_log_path ]]; then
+    log_path="$real_log_path"
+  fi
+  
   cmd=">> $dir_log/$log_path 2>&1"
-  [[ "$show_log" == "true" ]] && cmd=""
   make_dir "$dir_log/$log_dir"
+  if [[ "$show_log" == "true" ]]; then
+    cmd="2>&1 | tee -a $dir_log/$log_path"
+  fi
+
+  if [[ "$real_time" == "true" ]]; then
+    cmd=""
+  fi
 }
 
 format_params() {
   time_format="%Y-%m-%d %H:%M:%S"
-  timeoutCmd=""
+  if [[ $is_macos -eq 1 ]]; then
-  if type timeout &>/dev/null; then
+    mtime_format=$time_format
-    timeoutCmd="timeout -k 10s $command_timeout_time "
+  else
+    mtime_format="%Y-%m-%d %H:%M:%S.%3N"
   fi
+  timeoutCmd=""
+  if [[ $command_timeout_time ]]; then
+    if type timeout &>/dev/null; then
+      timeoutCmd="timeout --foreground -s 2 -k 10s $command_timeout_time "
+    fi
+  fi
+  # params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
 }
 
-show_log="false"
+init_begin_time() {
-while getopts ":l" opt; do
+  begin_time=$(format_time "$time_format" "$time")
+  begin_timestamp=$(format_timestamp "$time_format" "$time")
+}
+
+while getopts ":lm:" opt; do
   case $opt in
   l)
     show_log="true"
     ;;
+  m)
+    max_time="$OPTARG"
+    ;;
   esac
 done
-[[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
+[[ $show_log ]] && shift $(($OPTIND - 1))
+if [[ $max_time ]]; then
+  shift $(($OPTIND - 1))
+  command_timeout_time="$max_time"
+fi
 
-format_params
+format_params "$@"
 define_program "$@"
 handle_log_path "$@"
-eval . $dir_shell/otask.sh "$@" "$cmd"
+init_begin_time
-[[ -f "$dir_log/$log_path" ]] && cat "$dir_log/$log_path"
+
+eval . $dir_shell/otask.sh "$cmd"
+[[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
 
 exit 0

shell/update.sh

@@ -26,33 +26,6 @@ diff_cron() {
   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
-}
-
 ## 输出是否有新的或失效的定时任务，$1：新的或失效的任务清单文件路径，$2：新/失效
 output_list_add_drop() {
   local list=$1
@@ -73,7 +46,7 @@ del_cron() {
   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}')
+    local id=$(cat $list_crontab_user | grep -E "$cmd_task.* $cron" | perl -pe "s|.*ID=(.*) $cmd_task.* $cron\.*|\1|" | head -1 | awk -F " " '{print $1}')
     if [[ $ids ]]; then
       ids="$ids,\"$id\""
     else
@@ -124,7 +97,7 @@ add_cron() {
       [[ -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")
+      result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name:$SUB_ID")
       echo -e "$result"
       if [[ $detail ]]; then
         detail="${detail}${result}\n"
@@ -144,6 +117,9 @@ update_repo() {
   local dependence="$4"
   local branch="$5"
   local extensions="$6"
+  local proxy="$7"
+  local autoAddCron="$8"
+  local autoDelCron="$9"
   local tmp="${url%/*}"
   local authorTmp1="${tmp##*/}"
   local authorTmp2="${authorTmp1##*:}"
@@ -156,13 +132,14 @@ update_repo() {
   local formatUrl="$url"
   if [[ -d ${repo_path}/.git ]]; then
     reset_romote_url ${repo_path} "${formatUrl}" "${branch}"
-    git_pull_scripts ${repo_path} "${branch}"
+    git_pull_scripts ${repo_path} "${branch}" "${proxy}"
   else
-    git_clone_scripts "${formatUrl}" ${repo_path} "${branch}"
+    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"
+    diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
     echo -e "\n更新${repo_path}失败，请检查网络...\n"
   fi
@@ -170,41 +147,58 @@ update_repo() {
 
 ## 更新所有 raw 文件
 update_raw() {
-  echo -e "--------------------------------------------------------------\n"
   local url="$1"
+  local proxy="$2"
+  local autoAddCron="$3"
+  local autoDelCron="$4"
+
+  if [[ ! $autoAddCron ]]; then
+    autoAddCron=${AutoAddCron}
+  fi
+  if [[ ! $autoDelCron ]]; then
+    autoDelCron=${AutoDelCron}
+  fi
+
+  local proxyStr=""
+  if [[ $proxy ]]; then
+    if [[ $url == http:* ]]; then
+      proxyStr="-e \"http_proxy=${proxy}\""
+    elif [[ $url == https:* ]]; then
+      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
+    fi
+  fi
+
   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 $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
-  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}')
+    local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* $filename" | perl -pe "s|.*ID=(.*) $cmd_task.* $filename\.*|\1|" | head -1 | awk -F " " '{print $1}')
     cp -f $raw_file_name $dir_scripts/${filename}
-    cron_line=$(
+    if [[ -z $cron_id ]] && [[ ${autoAddCron} == true ]]; then
-      perl -ne "{
+      cron_line=$(
-                    print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
+        perl -ne "{
-                }" $raw_file_name |
+                      print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
-        perl -pe "{
+                  }" $raw_file_name |
-                    s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g;
+          perl -pe "{
-                    s|\*([\d\*])(.*)|\1\2|g;
+                      s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g;
-                    s|  | |g;
+                      s|\*([\d\*])(.*)|\1\2|g;
-                }" | sort -u | head -1
+                      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"
+      cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
-    [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
+      [[ -z $cron_name ]] && cron_name="$raw_file_name"
-    [[ -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=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
-    [[ -z $cron_line ]] && cron_line="$default_cron"
+      [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
-    if [[ -z $cron_id ]]; then
+      [[ -z $cron_line ]] && cron_line="$default_cron"
-      result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
+      result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name:$SUB_ID")
       echo -e "$result\n"
       notify_api "新增任务通知" "\n$result"
       # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
@@ -218,13 +212,10 @@ update_raw() {
 
 ## 调用用户自定义的extra.sh
 run_extra_shell() {
-  if [[ ${EnableExtraShell} == true ]]; then
+  if [[ -f $file_extra_shell ]]; then
-    if [[ -f $file_extra_shell ]]; then
+    . $file_extra_shell
-      echo -e "--------------------------------------------------------------\n"
+  else
-      . $file_extra_shell
+    echo -e "$file_extra_shell文件不存在，跳过执行...\n"
-    else
-      echo -e "$file_extra_shell文件不存在，跳过执行...\n"
-    fi
   fi
 }
 
@@ -244,28 +235,28 @@ usage() {
 
 ## 更新qinglong
 update_qinglong() {
-  patch_version &>/dev/null
+  local mirror="gitee"
-
+  local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200)
+  if [[ ! -z $githubStatus ]]; then
+    mirror="github"
+  fi
+  echo -e "使用 ${mirror} 源更新...\n"
   export isFirstStartServer=false
 
-  local all_branch=$(git branch -a)
+  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://github.com/whyour/qinglong.git" ${primary_branch}
+  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
 
-    [[ -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"
@@ -275,17 +266,16 @@ update_qinglong() {
 update_qinglong_static() {
   local no_restart="$1"
   local primary_branch="$2"
-  local url="https://github.com/whyour/qinglong-static.git"
+  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"
-    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
@@ -309,6 +299,15 @@ diff_scripts() {
   local blackword="$4"
   local dependence="$5"
   local extensions="$6"
+  local autoAddCron="$7"
+  local autoDelCron="$8"
+
+  if [[ ! $autoAddCron ]]; then
+    autoAddCron=${AutoAddCron}
+  fi
+  if [[ ! $autoDelCron ]]; then
+    autoDelCron=${AutoDelCron}
+  fi
 
   gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions"
 
@@ -318,13 +317,13 @@ diff_scripts() {
 
   if [[ -s $list_drop ]]; then
     output_list_add_drop $list_drop "失效"
-    if [[ ${AutoDelCron} == true ]]; then
+    if [[ ${autoDelCron} == true ]]; then
       del_cron $list_drop $uniq_path
     fi
   fi
   if [[ -s $list_add ]]; then
     output_list_add_drop $list_add "新"
-    if [[ ${AutoAddCron} == true ]]; then
+    if [[ ${autoAddCron} == true ]]; then
       add_cron $list_add $uniq_path
     fi
   fi
@@ -389,12 +388,12 @@ gen_list_repo() {
     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}')
+    # 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
+    # if [[ $cron_id ]]; then
-      result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
+    #   result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
-    fi
+    # 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"
+  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
 }
 
@@ -425,13 +424,16 @@ main() {
   done
   [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
 
-  local p1=$1
+  local p1="${1}"
-  local p2=$2
+  local p2="${2}"
-  local p3=$3
+  local p3="${3}"
-  local p4=$4
+  local p4="${4}"
-  local p5=$5
+  local p5="${5}"
-  local p6=$6
+  local p6="${6}"
-  local p7=$7
+  local p7="${7}"
+  local p8="${8}"
+  local p9="${9}"
+  local p10="${10}"
   local log_dir="${p1}"
   make_dir "$dir_log/$log_dir"
   local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
@@ -447,7 +449,10 @@ main() {
   [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
 
   local begin_time=$(format_time "$time_format" "$time")
-  eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+
+  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
@@ -470,7 +475,7 @@ main() {
   repo)
     get_uniq_path "$p2" "$p6"
     if [[ -n $p2 ]]; then
-      update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7"
+      update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7" "$p8" "$p9" "$p10"
     else
       eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd
@@ -479,7 +484,7 @@ main() {
   raw)
     get_uniq_path "$p2"
     if [[ -n $p2 ]]; then
-      update_raw "$p2"
+      update_raw "$p2" "$p3" "$p4"
     else
       eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd
@@ -497,7 +502,7 @@ main() {
   resetlet)
     auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
     echo "$auth_value" >$file_auth_user
-    echo -e "重置登录错误次数成功" $cmd
+    eval echo -e "重置登录错误次数成功" $cmd
     ;;
   resettfa)
     auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
@@ -514,10 +519,11 @@ main() {
   local end_time=$(format_time "$time_format" "$etime")
   local end_timestamp=$(format_timestamp "$time_format" "$etime")
   local diff_time=$(($end_timestamp - $begin_timestamp))
-  eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-
   [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-  eval echo -e "\\\n　　　　　　　　　　" $cmd
+
+  if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒　　　　　" $cmd
+  fi
 
   if [[ -f $file_path ]]; then
     cat $file_path

src/components/copy.tsx

@@ -0,0 +1,39 @@
+import React, { useRef, useState, useEffect } from 'react';
+import { Tooltip, Typography } from 'antd';
+import { CopyOutlined, CheckOutlined } from '@ant-design/icons';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+
+const { Link } = Typography;
+
+const Copy = ({ text }: { text: string }) => {
+  const [copied, setCopied] = useState(false);
+  const copyIdRef = useRef<number>();
+
+  const copyText = (e?: React.MouseEvent) => {
+    e?.preventDefault();
+    e?.stopPropagation();
+
+    setCopied(true);
+
+    cleanCopyId();
+    copyIdRef.current = window.setTimeout(() => {
+      setCopied(false);
+    }, 3000);
+  };
+
+  const cleanCopyId = () => {
+    window.clearTimeout(copyIdRef.current!);
+  };
+
+  return (
+    <Link onClick={copyText} style={{ marginLeft: 1 }}>
+      <CopyToClipboard text={text}>
+        <Tooltip key="copy" title={copied ? '复制成功' : '复制'}>
+          {copied ? <CheckOutlined /> : <CopyOutlined />}
+        </Tooltip>
+      </CopyToClipboard>
+    </Link>
+  );
+};
+
+export default Copy;

src/components/iconfont.tsx

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

src/components/vlist.tsx

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

src/hooks/useTableScrollHeight.ts

@@ -0,0 +1,19 @@
+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>(0);
+
+  useResizeObserver(target, (entry) => {
+    let _target = entry.target as any;
+    if (!_target.classList.contains('ant-table-wrapper')) {
+      _target = entry.target.querySelector('.ant-table-wrapper');
+    }
+    setHeight(getTableScroll({ extraHeight, target: _target as HTMLElement }));
+  });
+  return height;
+};

src/layouts/defaultProps.tsx

@@ -10,6 +10,7 @@ import {
   ContainerOutlined,
 } from '@ant-design/icons';
 import IconFont from '@/components/iconfont';
+import { BasicLayoutProps } from '@ant-design/pro-layout';
 
 export default {
   route: {
@@ -93,4 +94,4 @@ export default {
   contentWidth: 'Fixed',
   splitMenus: false,
   siderWidth: 180,
-} as any;
+} as BasicLayoutProps;

src/layouts/index.less

@@ -9,9 +9,25 @@
     url('../assets/fonts/SourceCodePro-Regular.ttf') format('truetype');
 }
 
+body {
+  // 禁止手机页面下拉刷新
+  overflow: hidden;
+
+  // 禁止手机页面弹簧效果
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+
+#root {
+  height: 100vh;
+  height: calc(100vh - var(--vh-offset, 0px));
+  -webkit-overflow-scrolling: touch;
+}
+
 .ant-modal-body {
-  max-height: calc(85vh - 110px);
+  max-height: calc(90vh - 110px);
-  max-height: calc(85vh - var(--vh-offset, 110px));
+  max-height: calc(90vh - var(--vh-offset, 110px));
   overflow-y: auto;
 }
 
@@ -179,8 +195,8 @@
 
 .Resizer {
   background: @component-background;
-  opacity: 0.2;
+  opacity: 0.8;
-  z-index: 1;
+  z-index: 100;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
@@ -253,10 +269,11 @@ textarea:-webkit-autofill:focus,
 select:-webkit-autofill,
 select:-webkit-autofill:hover,
 select:-webkit-autofill:focus {
-  border: none;
   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 {
@@ -310,22 +327,11 @@ select:-webkit-autofill:focus {
 .side-menu-user-drop-menu {
   position: relative;
   text-align: left;
-  outline: none;
+  padding: 2px 10px;
-  padding: 4px 0;
-  border: 1px solid fade(@component-background, 0.12);
-  border-radius: 4px;
-  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
   overflow: auto;
-  background-color: @component-background;
-}
-
-[data-dark='true'] .side-menu-user-drop-menu {
-  background-color: #373739;
 }
 
 .ant-pro-sider-logo {
-  padding: 16px 8px !important;
-
   h1 {
     margin-left: 5px !important;
   }
@@ -342,3 +348,41 @@ select:-webkit-autofill:focus {
     width: auto !important;
   }
 }
+
+pre {
+  word-break: break-all !important;
+  white-space: break-spaces !important;
+  padding: 0 !important;
+}
+
+.virtuallist {
+  .ant-table-tbody > tr > td > div {
+    white-space: unset !important;
+  }
+}
+
+.virtuallist .ant-table-tbody > tr > td > div {
+  box-sizing: border-box;
+  white-space: nowrap;
+  vertical-align: middle;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+}
+
+.virtuallist .ant-table-tbody > tr > td.ant-table-row-expand-icon-cell > div {
+  overflow: inherit;
+}
+
+.ant-table-bordered .virtuallist > table > .ant-table-tbody > tr > td {
+  border-right: 1px solid #f0f0f0;
+}
+
+.ant-table-column-title {
+  flex: unset;
+}
+
+.ant-table-column-sorters,
+.ant-table-filter-column {
+  justify-content: unset;
+}

src/layouts/index.tsx

@@ -13,9 +13,20 @@ 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,
+  MenuProps,
+} from 'antd';
 // @ts-ignore
 import SockJS from 'sockjs-client';
 import * as Sentry from '@sentry/react';
@@ -32,6 +43,17 @@ export interface SharedContext {
   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 () {
@@ -40,7 +62,7 @@ export default function () {
   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);
@@ -69,6 +91,7 @@ export default function () {
           if (!data.isInitialized) {
             history.push('/initialization');
           } else {
+            init(data.version);
             getUser();
           }
         }
@@ -123,7 +146,6 @@ export default function () {
 
   useEffect(() => {
     vhCheck();
-    init();
 
     const _theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
     if (typeof window === 'undefined') return;
@@ -201,9 +223,6 @@ export default function () {
   }
 
   if (['/login', '/initialization', '/error'].includes(location.pathname)) {
-    document.title = `${
-      (config.documentTitleMap as any)[location.pathname]
-    } - 控制面板`;
     if (systemInfo?.isInitialized && location.pathname === '/initialization') {
       history.push('/crontab');
     }
@@ -230,13 +249,17 @@ export default function () {
     !navigator.userAgent.includes('Chrome');
   const isQQBrowser = navigator.userAgent.includes('QQBrowser');
 
-  const menu = (
+  const menu: MenuProps = {
-    <Menu
+    items: [
-      className="side-menu-user-drop-menu"
+      {
-      items={[{ label: '退出登录', key: 'logout', icon: <LogoutOutlined /> }]}
+        label: '退出登录',
-      onClick={logout}
+        className: 'side-menu-user-drop-menu',
-    />
+        onClick: logout,
-  );
+        key: 'logout',
+        icon: <LogoutOutlined />,
+      },
+    ],
+  };
   return loading ? (
     <PageLoading />
   ) : (
@@ -244,29 +267,36 @@ export default function () {
       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" />}
+      // @ts-ignore
       title={
         <>
-          <span style={{ fontSize: 16 }}>控制面板</span>
+          <span style={{ fontSize: 16, marginRight: 5 }}>青龙</span>
           <a
-            href={changeLogLink}
+            href={systemInfo?.changeLogLink}
             target="_blank"
             rel="noopener noreferrer"
             onClick={(e) => {
               e.stopPropagation();
             }}
           >
-            <span
+            <Tooltip
-              style={{
+              title={systemInfo?.branch === 'develop' ? '开发版' : '正式版'}
-                fontSize: isFirefox ? 9 : 12,
-                color: '#666',
-                marginLeft: 2,
-                zoom: isSafari ? 0.66 : 0.8,
-                letterSpacing: isQQBrowser ? -2 : 0,
-              }}
             >
-              v{version}
+              <Badge size="small" dot={systemInfo?.branch === 'develop'}>
-            </span>
+                <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>
         </>
       }
@@ -281,16 +311,15 @@ export default function () {
         return <Link to={menuItemProps.path}>{defaultDom}</Link>;
       }}
       pageTitleRender={(props, pageName, info) => {
-        if (info && typeof info.pageName === 'string') {
+        const title =
-          return `${info.pageName} - 控制面板`;
+          (config.documentTitleMap as any)[location.pathname] || '未找到';
-        }
+        return `${title} - 青龙`;
-        return '控制面板';
       }}
       onCollapse={setCollapsed}
       collapsed={collapsed}
       rightContentRender={() =>
         ctx.isPhone && (
-          <Dropdown overlay={menu} placement="bottomRight" trigger={['click']}>
+          <Dropdown menu={menu} placement="bottomRight" trigger={['click']}>
             <span className="side-menu-user-wrapper">
               <Avatar
                 shape="square"
@@ -312,7 +341,7 @@ export default function () {
           }}
         >
           {!collapsed && !ctx.isPhone && (
-            <Dropdown overlay={menu} placement="topLeft" trigger={['hover']}>
+            <Dropdown menu={menu} placement="topLeft" trigger={['hover']}>
               <span className="side-menu-user-wrapper">
                 <Avatar
                   shape="square"
@@ -342,6 +371,7 @@ export default function () {
           reloadUser,
           reloadTheme,
           socketMessage,
+          systemInfo,
         }}
       />
     </ProLayout>

src/pages/404.tsx

@@ -0,0 +1,18 @@
+import React from 'react';
+import { Button, Result, Typography } from 'antd';
+
+const { Link } = Typography;
+
+const NotFound: React.FC = () => (
+  <Result
+    status="404"
+    title="404"
+    extra={
+      <Button type="primary">
+        <Link href="/">返回首页</Link>
+      </Button>
+    }
+  />
+);
+
+export default NotFound;

src/pages/crontab/detail.tsx

@@ -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;
 
@@ -147,22 +148,10 @@ const CronDetailModal = ({
   };
 
   const getScript = () => {
-    const cmd = cron.command.split(' ') as string[];
+    const result = getCommandScript(cron.command);
-    if (cmd[0] === 'task') {
+    if (Array.isArray(result)) {
       setValidTabs(validTabs);
-      if (cmd[1].startsWith('/ql/data/scripts')) {
+      const [s, p] = result;
-        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
-      }
-
-      let p: string, s: string;
-      let index = cmd[1].lastIndexOf('/');
-      if (index >= 0) {
-        s = cmd[1].slice(index + 1);
-        p = cmd[1].slice(0, index);
-      } else {
-        s = cmd[1];
-        p = '';
-      }
       setScriptInfo({ parent: p, filename: s });
       request
         .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
@@ -171,7 +160,7 @@ const CronDetailModal = ({
             setValue(data);
           }
         });
-    } else {
+    } else if (result) {
       setValidTabs([validTabs[0]]);
     }
   };

src/pages/crontab/index.less

@@ -4,13 +4,11 @@
 
 .crontab-detail {
   .card-wrapper {
-    height: 80vh;
-    height: calc(80vh - var(--vh-offset, 0px));
-
     .ant-card:last-child {
       .ant-card-body {
-        height: calc(80vh - 238px);
+        min-height: 300px;
-        height: calc(80vh - var(--vh-offset, 0px) - 238px);
+        height: calc(90vh - 367px);
+        height: calc(90vh - var(--vh-offset, 0px) - 367px);
         overflow-y: auto;
       }
     }
@@ -158,7 +156,7 @@
 .view-create-modal-sorts {
   display: flex;
 
-  .ant-space-item:nth-child(2) {
+  .ant-space-item:nth-child(1) {
     flex: 1;
   }
 }
@@ -176,3 +174,30 @@ tr.drop-over-upward td {
     padding-top: 10px;
   }
 }
+
+.view-filters-container.active {
+  .filter-item > div > .ant-form-item-control {
+    margin-left: 40px;
+    width: calc(100% - 40px);
+  }
+}
+
+.log-modal {
+  .log-container {
+    overflow-y: auto;
+    min-height: 300px;
+    max-height: calc(80vh - 110px);
+    max-height: calc(80vh - var(--vh-offset, 110px));
+
+    padding: 24px;
+    margin: -24px;
+  }
+}
+
+body[data-mode='desktop'] {
+  .crontab-wrapper {
+    tbody .ant-table-cell {
+      height: 69px !important;
+    }
+  }
+}

src/pages/crontab/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useMemo } from 'react';
 import {
   Button,
   message,
@@ -14,6 +14,7 @@ import {
   Popover,
   Tabs,
   TablePaginationConfig,
+  MenuProps,
 } from 'antd';
 import {
   ClockCircleOutlined,
@@ -43,14 +44,16 @@ 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, 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, parseCrontab } from '@/utils';
+import { ColumnProps } from 'antd/lib/table';
+import { useVT } from 'virtualizedtableforantd4';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -82,15 +85,28 @@ enum OperationPath {
   'unpin',
 }
 
+export interface ICrontab {
+  name: string;
+  command: string;
+  schedule: string;
+  id: number;
+  status: number;
+  isDisabled?: 1 | 0;
+  isPinned?: 1 | 0;
+  labels?: string[];
+  last_running_time?: number;
+  last_execution_time?: number;
+  nextRunTime: Date;
+}
+
 const Crontab = () => {
   const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
-  const columns: any = [
+  const columns: ColumnProps<ICrontab>[] = [
     {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
       width: 150,
-      align: 'center' as const,
       render: (text: string, record: any) => (
         <>
           <a
@@ -138,22 +154,20 @@ const Crontab = () => {
         </>
       ),
       sorter: {
-        compare: (a: any, b: any) => a?.name?.localeCompare(b?.name),
+        compare: (a, b) => a?.name?.localeCompare(b?.name),
       },
     },
     {
-      title: '命令',
+      title: '命令/脚本',
       dataIndex: 'command',
       key: 'command',
       width: 300,
-      align: 'center' as const,
+      render: (text, record) => {
-      render: (text: string, record: any) => {
         return (
           <Paragraph
             style={{
               wordBreak: 'break-all',
               marginBottom: 0,
-              textAlign: 'left',
             }}
             ellipsis={{ tooltip: text, rows: 2 }}
           >
@@ -176,23 +190,21 @@ const Crontab = () => {
       dataIndex: 'schedule',
       key: 'schedule',
       width: 110,
-      align: 'center' as const,
       sorter: {
-        compare: (a: any, b: any) => a.schedule.localeCompare(b.schedule),
+        compare: (a, b) => a.schedule.localeCompare(b.schedule),
       },
     },
     {
       title: '最后运行时间',
-      align: 'center' as const,
       dataIndex: 'last_execution_time',
       key: 'last_execution_time',
       width: 150,
       sorter: {
-        compare: (a: any, b: any) => {
+        compare: (a, b) => {
-          return a.last_execution_time - b.last_execution_time;
+          return (a.last_execution_time || 0) - (b.last_execution_time || 0);
         },
       },
-      render: (text: string, record: any) => {
+      render: (text, record) => {
         const language = navigator.language || navigator.languages[0];
         return (
           <span
@@ -213,7 +225,6 @@ const Crontab = () => {
     },
     {
       title: '最后运行时长',
-      align: 'center' as const,
       width: 120,
       dataIndex: 'last_running_time',
       key: 'last_running_time',
@@ -222,7 +233,7 @@ const Crontab = () => {
           return a.last_running_time - b.last_running_time;
         },
       },
-      render: (text: string, record: any) => {
+      render: (text, record) => {
         return record.last_running_time
           ? diffTime(record.last_running_time)
           : '-';
@@ -230,14 +241,13 @@ const Crontab = () => {
     },
     {
       title: '下次运行时间',
-      align: 'center' as const,
       width: 150,
       sorter: {
         compare: (a: any, b: any) => {
           return a.nextRunTime - b.nextRunTime;
         },
       },
-      render: (text: string, record: any) => {
+      render: (text, record) => {
         const language = navigator.language || navigator.languages[0];
         return record.nextRunTime
           .toLocaleString(language, {
@@ -246,13 +256,11 @@ const Crontab = () => {
           .replace(' 24:', ' 00:');
       },
     },
-
     {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
-      align: 'center' as const,
+      width: 88,
-      width: 85,
       filters: [
         {
           text: '运行中',
@@ -271,14 +279,7 @@ const Crontab = () => {
           value: 3,
         },
       ],
-      onFilter: (value: number, record: any) => {
+      render: (text, record) => (
-        if (record.isDisabled && record.status !== 0) {
-          return value === 2;
-        } else {
-          return record.status === value;
-        }
-      },
-      render: (text: string, record: any) => (
         <>
           {(!record.isDisabled || record.status !== CrontabStatus.idle) && (
             <>
@@ -313,9 +314,8 @@ const Crontab = () => {
     {
       title: '操作',
       key: 'action',
-      align: 'center' as const,
+      width: 130,
-      width: 100,
+      render: (text, record, index) => {
-      render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
           <Space size="middle">
@@ -376,7 +376,6 @@ const Crontab = () => {
     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('');
@@ -389,26 +388,15 @@ const Crontab = () => {
   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[];
+    const result = getCommandScript(record.command);
-    if (cmd[0] === 'task') {
+    if (Array.isArray(result)) {
-      if (cmd[1].startsWith('/ql/data/scripts')) {
+      const [s, p] = result;
-        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
-      }
-
-      let p: string, s: string;
-      let index = cmd[1].lastIndexOf('/');
-      if (index >= 0) {
-        s = cmd[1].slice(index + 1);
-        p = cmd[1].slice(0, index);
-      } else {
-        s = cmd[1];
-        p = '';
-      }
       history.push(`/script?p=${p}&s=${s}`);
-    } else if (cmd[1] === 'repo') {
+    } else if (result) {
-      location.href = cmd[2];
+      location.href = result;
     }
   };
 
@@ -420,9 +408,9 @@ const Crontab = () => {
     }crons?searchValue=${searchText}&page=${page}&size=${size}&filters=${JSON.stringify(
       filters,
     )}`;
-    if (sorter && sorter.field) {
+    if (sorter && sorter.column && sorter.order) {
       url += `&sorter=${JSON.stringify({
-        field: sorter.field,
+        field: sorter.column.key,
         type: sorter.order === 'ascend' ? 'ASC' : 'DESC',
       })}`;
     }
@@ -430,6 +418,7 @@ const Crontab = () => {
       url += `&queryString=${JSON.stringify({
         filters: viewConf.filters,
         sorts: viewConf.sorts,
+        filterRelation: viewConf.filterRelation || 'and',
       })}`;
     }
     request
@@ -441,10 +430,7 @@ const Crontab = () => {
             data.map((x) => {
               return {
                 ...x,
-                nextRunTime: cron_parser
+                nextRunTime: parseCrontab(x.schedule),
-                  .parseExpression(x.schedule)
-                  .next()
-                  .toDate(),
               };
             }),
           );
@@ -679,18 +665,15 @@ const Crontab = () => {
     index: number;
   }> = ({ record, index }) => (
     <Dropdown
-      arrow={{ pointAtCenter: true }}
       placement="bottomRight"
       trigger={['click']}
-      overlay={
+      menu={{
-        <Menu
+        items: getMenuItems(record),
-          items={getMenuItems(record)}
+        onClick: ({ key, domEvent }) => {
-          onClick={({ key, domEvent }) => {
+          domEvent.stopPropagation();
-            domEvent.stopPropagation();
+          action(key, record, index);
-            action(key, record, index);
+        },
-          }}
+      }}
-        />
-      }
     >
       <a onClick={(e) => e.stopPropagation()}>
         <EllipsisOutlined />
@@ -717,34 +700,15 @@ const Crontab = () => {
     }
   };
 
-  const handleCancel = (cron?: any) => {
+  const handleCancel = () => {
     setIsModalVisible(false);
-    if (cron) {
+    getCrons();
-      handleCrons(cron);
-    }
   };
 
   const onSearch = (value: string) => {
     setSearchText(value.trim());
   };
 
-  const handleCrons = (cron: any) => {
-    const index = value.findIndex((x) => x.id === cron.id);
-    const result = [...value];
-    cron.nextRunTime = cron_parser
-      .parseExpression(cron.schedule)
-      .next()
-      .toDate();
-    if (index === -1) {
-      result.unshift(cron);
-    } else {
-      result.splice(index, 1, {
-        ...cron,
-      });
-    }
-    setValue(result);
-  };
-
   const getCronDetail = (cron: any) => {
     request
       .get(`${config.apiPrefix}crons/${cron.id}`)
@@ -752,10 +716,7 @@ const Crontab = () => {
         if (code === 200) {
           const index = value.findIndex((x) => x.id === cron.id);
           const result = [...value];
-          data.nextRunTime = cron_parser
+          data.nextRunTime = parseCrontab(data.schedule);
-            .parseExpression(data.schedule)
-            .next()
-            .toDate();
           if (index !== -1) {
             result.splice(index, 1, {
               ...cron,
@@ -770,16 +731,10 @@ const Crontab = () => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
-
-    setTimeout(() => {
-      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll());
-      }
-    });
   };
 
   const rowSelection = {
-    selectedRowIds,
+    selectedRowKeys: selectedRowIds,
     onChange: onSelectChange,
   };
 
@@ -863,7 +818,7 @@ const Crontab = () => {
 
   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]);
@@ -878,97 +833,6 @@ const Crontab = () => {
     getCronViews();
   }, []);
 
-  useEffect(() => {
-    if (tableRef.current) {
-      setTableScrollHeight(getTableScroll());
-    }
-  }, [tableRef.current]);
-
-  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
-        ref={tableRef}
-        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}
-      />
-    </>
-  );
-
   const viewAction = (key: string) => {
     switch (key) {
       case 'new':
@@ -984,41 +848,39 @@ const Crontab = () => {
     }
   };
 
-  const menu = (
+  const menu: MenuProps = {
-    <Menu
+    onClick: ({ key, domEvent }) => {
-      onClick={({ key, domEvent }) => {
+      domEvent.stopPropagation();
-        domEvent.stopPropagation();
+      viewAction(key);
-        viewAction(key);
+    },
-      }}
+    items: [
-      items={[
+      ...[...enabledCronViews].slice(4).map((x) => ({
-        ...[...enabledCronViews].slice(2).map((x) => ({
+        label: (
-          label: (
+          <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
-            <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
+            <span>{x.name}</span>
-              <span>{x.name}</span>
+            {viewConf?.id === x.id && (
-              {viewConf?.id === x.id && (
+              <CheckOutlined style={{ color: '#1890ff' }} />
-                <CheckOutlined style={{ color: '#1890ff' }} />
+            )}
-              )}
+          </Space>
-            </Space>
+        ),
-          ),
+        key: x.id,
-          key: x.id,
+        icon: <UnorderedListOutlined />,
-          icon: <UnorderedListOutlined />,
+      })),
-        })),
+      {
-        {
+        type: 'divider' as 'group',
-          type: 'divider',
+      },
-        },
+      {
-        {
+        label: '新建视图',
-          label: '新建视图',
+        key: 'new',
-          key: 'new',
+        icon: <PlusOutlined />,
-          icon: <PlusOutlined />,
+      },
-        },
+      {
-        {
+        label: '视图管理',
-          label: '视图管理',
+        key: 'manage',
-          key: 'manage',
+        icon: <SettingOutlined />,
-          icon: <SettingOutlined />,
+      },
-        },
+    ],
-      ]}
+  };
-    />
-  );
 
   const getCronViews = () => {
     setLoading(true);
@@ -1037,10 +899,16 @@ const Crontab = () => {
 
   const tabClick = (key: string) => {
     const view = enabledCronViews.find((x) => x.id == key);
+    setSelectedRowIds([]);
     setPageConf({ ...pageConf, page: 1 });
     setViewConf(view ? view : null);
   };
 
+  const [vt] = useVT(
+    () => ({ scroll: { y: tableScrollHeight } }),
+    [tableScrollHeight],
+  );
+
   return (
     <PageContainer
       className="ql-container-wrapper crontab-wrapper ql-container-wrapper-has-tab"
@@ -1071,7 +939,7 @@ const Crontab = () => {
         className={`crontab-view ${moreMenuActive ? 'more-active' : ''}`}
         tabBarExtraContent={
           <Dropdown
-            overlay={menu}
+            menu={menu}
             trigger={['click']}
             overlayStyle={{ minWidth: 200 }}
           >
@@ -1086,27 +954,98 @@ const Crontab = () => {
         }
         onTabClick={tabClick}
         items={[
-          {
+          ...[...enabledCronViews].slice(0, 4).map((x) => ({
-            key: 'all',
-            label: '全部任务',
-            children: panelContent,
-          },
-          ...[...enabledCronViews].slice(0, 2).map((x) => ({
             key: x.id,
             label: x.name,
-            children: panelContent,
           })),
         ]}
-      >
+      />
-        <Tabs.TabPane tab="全部任务" key="all">
+      <div ref={tableRef}>
-          {panelContent}
+        {selectedRowIds.length > 0 && (
-        </Tabs.TabPane>
+          <div style={{ marginBottom: 16 }}>
-        {[...enabledCronViews].slice(0, 2).map((x) => (
+            <Button
-          <Tabs.TabPane tab={x.name} key={x.id}>
+              type="primary"
-            {panelContent}
+              style={{ marginBottom: 5 }}
-          </Tabs.TabPane>
+              onClick={delCrons}
-        ))}
+            >
-      </Tabs>
+              批量删除
+            </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}
+          // components={isPhone ? undefined : vt}
+        />
+      </div>
       <CronLogModal
         visible={isLogModalVisible}
         handleCancel={() => {

src/pages/crontab/logModal.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Modal, message, Input, Form, Statistic, Button } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
@@ -34,7 +34,7 @@ const CronLogModal = ({
   const [loading, setLoading] = useState<any>(true);
   const [executing, setExecuting] = useState<any>(true);
   const [isPhone, setIsPhone] = useState(false);
-  const [theme, setTheme] = useState<string>('');
+  const scrollInfoRef = useRef({ value: 0, down: true });
 
   const getCronLog = (isFirst?: boolean) => {
     if (isFirst) {
@@ -45,14 +45,20 @@ const CronLogModal = ({
       .then(({ code, data }) => {
         if (
           code === 200 &&
-          localStorage.getItem('logCron') === String(cron.id)
+          localStorage.getItem('logCron') === String(cron.id) &&
+          data !== value
         ) {
           const log = data as string;
           setValue(log || '暂无日志');
-          setExecuting(
+          const hasNext = Boolean(
-            log && !logEnded(log) && !log.includes('重启面板'),
+            log &&
+              !logEnded(log) &&
+              !log.includes('重启面板') &&
+              !log.includes('任务未运行'),
           );
-          if (log && !logEnded(log) && !log.includes('重启面板')) {
+          setExecuting(hasNext);
+          autoScroll();
+          if (hasNext) {
             setTimeout(() => {
               getCronLog();
             }, 2000);
@@ -89,11 +95,33 @@ const CronLogModal = ({
       });
   };
 
+  const autoScroll = () => {
+    if (!scrollInfoRef.current.down) {
+      return;
+    }
+
+    setTimeout(() => {
+      document
+        .querySelector('#log-flag')!
+        .scrollIntoView({ behavior: 'smooth' });
+    }, 1000);
+  };
+
   const cancel = () => {
     localStorage.removeItem('logCron');
     handleCancel();
   };
 
+  const handleScroll = (e) => {
+    const sTop = e.target.scrollTop;
+    if (scrollInfoRef.current.down) {
+      scrollInfoRef.current = {
+        value: sTop,
+        down: sTop > scrollInfoRef.current.value,
+      };
+    }
+  };
+
   const titleElement = () => {
     return (
       <>
@@ -138,23 +166,26 @@ const CronLogModal = ({
         </Button>,
       ]}
     >
-      {loading ? (
+      <div onScroll={handleScroll} className="log-container">
-        <PageLoading />
+        {loading ? (
-      ) : (
+          <PageLoading />
-        <pre
+        ) : (
-          style={
+          <pre
-            isPhone
+            style={
-              ? {
+              isPhone
-                  fontFamily: 'Source Code Pro',
+                ? {
-                  width: 375,
+                    fontFamily: 'Source Code Pro',
-                  zoom: 0.83,
+                    width: 375,
-                }
+                    zoom: 0.83,
-              : {}
+                  }
-          }
+                : {}
-        >
+            }
-          {value}
+          >
-        </pre>
+            {value}
-      )}
+          </pre>
+        )}
+        <div id="log-flag"></div>
+      </div>
     </Modal>
   );
 };

src/pages/crontab/modal.tsx

@@ -74,13 +74,13 @@ const CronModal = ({
         </Form.Item>
         <Form.Item
           name="command"
-          label="命令"
+          label="命令/脚本"
           rules={[{ required: true, whitespace: true }]}
         >
           <Input.TextArea
             rows={4}
             autoSize={true}
-            placeholder="请输入要执行的命令"
+            placeholder="支持输入脚本路径/任意系统可执行命令/task 脚本路径"
           />
         </Form.Item>
         <Form.Item

src/pages/crontab/viewCreateModal.tsx

@@ -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: 'In', type: 'select' },
-  { name: '不属于', value: 'Nin' },
+  { 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 = [
+const STATUS_MAP = {
-  { name: '运行中', value: 0 },
+  status: [
-  { name: '空闲中', value: 1 },
+    { name: '运行中', value: 0 },
-  { name: '已禁用', value: 2 },
+    { name: '空闲中', value: 1 },
-];
+    { name: '已禁用', value: 2 },
+  ],
+};
+
+enum ViewFilterRelation {
+  'and' = '且',
+  'or' = '或',
+}
 
 const ViewCreateModal = ({
   view,
@@ -53,10 +69,12 @@ const ViewCreateModal = ({
 }) => {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
-  const [operationMap, setOperationMap] = useState<any>();
+  const [filterRelation, setFilterRelation] = useState<'and' | 'or'>('and');
+  const filtersValue = Form.useWatch('filters', form);
 
   const handleOk = async (values: any) => {
     setLoading(true);
+    values.filterRelation = filterRelation;
     const method = view ? 'put' : 'post';
     try {
       const { code, data } = await request[method](
@@ -87,12 +105,7 @@ const ViewCreateModal = ({
   }, [view, visible]);
 
   const operationElement = (
-    <Select
+    <Select style={{ width: 80 }}>
-      style={{ width: 100 }}
-      onChange={() => {
-        setOperationMap({});
-      }}
-    >
       {OPERATIONS.map((x) => (
         <Select.Option key={x.name} value={x.value}>
           {x.name}
@@ -114,7 +127,7 @@ const ViewCreateModal = ({
   };
 
   const typeElement = (
-    <Select>
+    <Select style={{ width: 80 }}>
       {SORTTYPES.map((x) => (
         <Select.Option key={x.name} value={x.value}>
           {x.name}
@@ -123,15 +136,17 @@ const ViewCreateModal = ({
     </Select>
   );
 
-  const statusElement = (
+  const statusElement = (property: keyof typeof STATUS_MAP) => {
-    <Select mode="multiple" allowClear placeholder="请选择状态">
+    return (
-      {STATUS.map((x) => (
+      <Select mode="tags" allowClear placeholder="输入后回车增加自定义选项">
-        <Select.Option key={x.name} value={x.value}>
+        {STATUS_MAP[property]?.map((x) => (
-          {x.name}
+          <Select.Option key={x.name} value={x.value}>
-        </Select.Option>
+            {x.name}
-      ))}
+          </Select.Option>
-    </Select>
+        ))}
-  );
+      </Select>
+    );
+  };
 
   return (
     <Modal
@@ -164,94 +179,180 @@ const ViewCreateModal = ({
         </Form.Item>
         <Form.List name="filters">
           {(fields, { add, remove }) => (
-            <>
+            <div
-              {fields.map(({ key, name, ...restField }, index) => (
+              style={{ position: 'relative' }}
-                <Form.Item
+              className={`view-filters-container ${
-                  label={index === 0 ? '筛选条件' : ''}
+                fields.length > 1 ? 'active' : ''
-                  key={key}
+              }`}
-                  style={{ marginBottom: 0 }}
+            >
-                  required
+              {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">
+                  <Button
-                    <Form.Item
+                    type="primary"
-                      {...restField}
+                    size="small"
-                      name={[name, 'property']}
+                    style={{
-                      rules={[{ required: true }]}
+                      position: 'absolute',
+                      top: '50%',
+                      translate: '-50% -50%',
+                      padding: '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 }) => (
+                  <Form.Item
+                    label={name === 0 ? '筛选条件' : ''}
+                    key={key}
+                    style={{ marginBottom: 0 }}
+                    required
+                    className="filter-item"
+                  >
+                    <Space
+                      className="view-create-modal-filters"
+                      align="baseline"
                     >
-                      {propertyElement(PROPERTIES, { width: 120 })}
+                      <Form.Item
-                    </Form.Item>
+                        {...restField}
-                    <Form.Item
+                        name={[name, 'property']}
-                      {...restField}
+                        rules={[{ required: true }]}
-                      name={[name, 'operation']}
+                      >
-                      rules={[{ required: true }]}
+                        {propertyElement(PROPERTIES, { width: 90 })}
-                    >
+                      </Form.Item>
-                      {operationElement}
+                      <Form.Item
-                    </Form.Item>
+                        {...restField}
-                    <Form.Item
+                        name={[name, 'operation']}
-                      {...restField}
+                        rules={[{ required: true }]}
-                      name={[name, 'value']}
+                      >
-                      rules={[{ required: true, message: '请输入内容' }]}
+                        {operationElement}
-                    >
+                      </Form.Item>
-                      {['In', 'Nin'].includes(
+                      <Form.Item
-                        form.getFieldValue(['filters', index, 'operation']),
+                        {...restField}
-                      ) ? (
+                        name={[name, 'value']}
-                        statusElement
+                        rules={[{ required: true, message: '请输入内容' }]}
-                      ) : (
+                      >
-                        <Input placeholder="请输入内容" />
+                        {EOperation[filtersValue[name]['operation']] ===
+                        'select' ? (
+                          statusElement(filtersValue[name]['property'])
+                        ) : (
+                          <Input placeholder="请输入内容" />
+                        )}
+                      </Form.Item>
+                      {name !== 0 && (
+                        <MinusCircleOutlined onClick={() => remove(name)} />
                       )}
-                    </Form.Item>
+                    </Space>
-                    {index !== 0 && (
+                  </Form.Item>
-                      <MinusCircleOutlined onClick={() => remove(name)} />
+                ))}
-                    )}
+                <Form.Item>
-                  </Space>
+                  <a
+                    onClick={() =>
+                      add({ property: 'command', operation: 'Reg' })
+                    }
+                  >
+                    <PlusOutlined />
+                    新增筛选条件
+                  </a>
                 </Form.Item>
-              ))}
+              </div>
-              <Form.Item>
+            </div>
-                <a
-                  onClick={() => add({ property: 'command', operation: 'Reg' })}
-                >
-                  <PlusOutlined />
-                  新增筛选条件
-                </a>
-              </Form.Item>
-            </>
           )}
         </Form.List>
         <Form.List name="sorts">
           {(fields, { add, remove }) => (
-            <>
+            <div
-              {fields.map(({ key, name, ...restField }, index) => (
+              style={{ position: 'relative' }}
-                <Form.Item
+              className={`view-filters-container ${
-                  label={index === 0 ? '排序方式' : ''}
+                fields.length > 1 ? 'active' : ''
-                  key={key}
+              }`}
-                  style={{ marginBottom: 0 }}
+            >
+              {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-sorts" align="baseline">
+                  <Button
-                    <Form.Item
+                    type="primary"
-                      {...restField}
+                    size="small"
-                      name={[name, 'property']}
+                    style={{
-                      rules={[{ required: true }]}
+                      position: 'absolute',
-                    >
+                      top: '50%',
-                      {propertyElement(PROPERTIES, { width: 240 })}
+                      translate: '-50% -50%',
-                    </Form.Item>
+                      padding: '0 3px',
-                    <Form.Item
+                      cursor: 'pointer',
-                      {...restField}
+                    }}
-                      name={[name, 'type']}
+                  >
-                      rules={[{ required: true }]}
+                    <>
-                    >
+                      <span>{ViewFilterRelation[filterRelation]}</span>
-                      {typeElement}
+                    </>
-                    </Form.Item>
+                  </Button>
-                    <MinusCircleOutlined onClick={() => remove(name)} />
+                </div>
-                  </Space>
+              )}
+              <div>
+                {fields.map(({ key, name, ...restField }) => (
+                  <Form.Item
+                    label={name === 0 ? '排序方式' : ''}
+                    key={key}
+                    style={{ marginBottom: 0 }}
+                    className="filter-item"
+                  >
+                    <Space className="view-create-modal-sorts" align="baseline">
+                      <Form.Item
+                        {...restField}
+                        name={[name, 'property']}
+                        rules={[{ required: true }]}
+                      >
+                        {propertyElement(PROPERTIES)}
+                      </Form.Item>
+                      <Form.Item
+                        {...restField}
+                        name={[name, 'type']}
+                        rules={[{ required: true }]}
+                      >
+                        {typeElement}
+                      </Form.Item>
+                      <MinusCircleOutlined onClick={() => remove(name)} />
+                    </Space>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <a onClick={() => add({ property: 'command', type: 'ASC' })}>
+                    <PlusOutlined />
+                    新增排序方式
+                  </a>
                 </Form.Item>
-              ))}
+              </div>
-              <Form.Item>
+            </div>
-                <a onClick={() => add({ property: 'command', type: 'ASC' })}>
-                  <PlusOutlined />
-                  新增排序方式
-                </a>
-              </Form.Item>
-            </>
           )}
         </Form.List>
       </Form>

src/pages/crontab/viewManageModal.tsx

@@ -80,13 +80,17 @@ const ViewManageModal = ({
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      align: 'center' as const,
+    },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      render: (v) => (v === 1 ? '系统' : '个人'),
     },
     {
       title: '显示',
       key: 'isDisabled',
       dataIndex: 'isDisabled',
-      align: 'center' as const,
       width: 100,
       render: (text: string, record: any, index: number) => {
         return (
@@ -100,10 +104,9 @@ 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 +115,8 @@ const ViewManageModal = ({
               <DeleteOutlined />
             </a>
           </Space>
+        ) : (
+          '-'
         );
       },
     },
@@ -155,7 +160,6 @@ const ViewManageModal = ({
   };
 
   const onShowChange = (checked: boolean, record: any, index: number) => {
-    console.log(checked);
     request
       .put(`${config.apiPrefix}crons/views/${checked ? 'enable' : 'disable'}`, {
         data: [record.id],

src/pages/dependence/index.tsx

@@ -19,6 +19,8 @@ import {
   DeleteFilled,
   BugOutlined,
   FileTextOutlined,
+  CloseCircleOutlined,
+  ClockCircleOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -27,10 +29,10 @@ 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;
@@ -42,6 +44,7 @@ enum Status {
   '删除中',
   '已删除',
   '删除失败',
+  '队列中',
 }
 
 enum StatusColor {
@@ -50,13 +53,43 @@ enum StatusColor {
   'error',
 }
 
+const StatusMap: Record<number, { icon: React.ReactNode; color: string }> = {
+  0: {
+    icon: <SyncOutlined spin />,
+    color: 'processing',
+  },
+  1: {
+    icon: <CheckCircleOutlined />,
+    color: 'success',
+  },
+  2: {
+    icon: <CloseCircleOutlined />,
+    color: 'error',
+  },
+  3: {
+    icon: <SyncOutlined spin />,
+    color: 'processing',
+  },
+  4: {
+    icon: <CheckCircleOutlined />,
+    color: 'success',
+  },
+  5: {
+    icon: <CloseCircleOutlined />,
+    color: 'error',
+  },
+  6: {
+    icon: <ClockCircleOutlined />,
+    color: 'default',
+  },
+};
+
 const Dependence = () => {
   const { headerStyle, isPhone, socketMessage } =
     useOutletContext<SharedContext>();
   const columns: any = [
     {
       title: '序号',
-      align: 'center' as const,
       width: 50,
       render: (text: string, record: any, index: number) => {
         return <span style={{ cursor: 'text' }}>{index + 1} </span>;
@@ -66,18 +99,17 @@ const Dependence = () => {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      align: 'center' as const,
     },
     {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
-      align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         return (
           <Space size="middle" style={{ cursor: 'text' }}>
             <Tag
-              color={StatusColor[record.status % 3]}
+              color={StatusMap[record.status].color}
+              icon={StatusMap[record.status].icon}
               style={{ marginRight: 0 }}
             >
               {Status[record.status]}
@@ -90,13 +122,11 @@ const Dependence = () => {
       title: '备注',
       dataIndex: 'remark',
       key: 'remark',
-      align: 'center' as const,
     },
     {
       title: '创建时间',
       key: 'timestamp',
       dataIndex: 'timestamp',
-      align: 'center' as const,
       render: (text: string, record: any) => {
         const language = navigator.language || navigator.languages[0];
         const time = record.createdAt || record.timestamp;
@@ -119,7 +149,6 @@ const Dependence = () => {
     {
       title: '操作',
       key: 'action',
-      align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
@@ -164,11 +193,11 @@ const Dependence = () => {
   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);
@@ -283,16 +312,10 @@ const Dependence = () => {
 
   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,
   };
 
@@ -368,12 +391,6 @@ const Dependence = () => {
     getDependencies();
   }, [searchText, type]);
 
-  useEffect(() => {
-    if (tableRef.current) {
-      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-    }
-  }, [tableRef.current]);
-
   useEffect(() => {
     if (logDependence) {
       localStorage.setItem('logDependence', logDependence.id);
@@ -384,6 +401,23 @@ const Dependence = () => {
   useEffect(() => {
     if (!socketMessage) return;
     const { type, message, references } = socketMessage;
+    if (
+      type === 'installDependence' &&
+      message.includes('开始时间') &&
+      references.length > 0
+    ) {
+      const result = [...value];
+      for (let i = 0; i < references.length; i++) {
+        const index = value.findIndex((x) => x.id === references[i]);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...value[index],
+            status: message.includes('安装') ? Status.安装中 : Status.删除中,
+          });
+        }
+      }
+      setValue(result);
+    }
     if (
       type === 'installDependence' &&
       message.includes('结束时间') &&
@@ -422,54 +456,8 @@ const Dependence = () => {
     }
   }, [socketMessage]);
 
-  const panelContent = () => (
-    <>
-      {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
-          ref={tableRef}
-          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);
   };
 
@@ -502,20 +490,60 @@ const Dependence = () => {
           {
             key: 'nodejs',
             label: 'NodeJs',
-            children: panelContent(),
           },
           {
             key: 'python3',
             label: 'Python3',
-            children: panelContent(),
           },
           {
             key: 'linux',
             label: 'Linux',
-            children: panelContent(),
           },
         ]}
       />
+      <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}

src/pages/env/index.less

@@ -5,3 +5,9 @@ tr.drop-over-downward td {
 tr.drop-over-upward td {
   border-top: 2px dashed #1890ff;
 }
+
+.text-ellipsis {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}

src/pages/env/index.tsx

@@ -1,4 +1,10 @@
-import React, { useCallback, useRef, useState, useEffect } from 'react';
+import React, {
+  useCallback,
+  useRef,
+  useState,
+  useEffect,
+  useMemo,
+} from 'react';
 import {
   Button,
   message,
@@ -28,11 +34,14 @@ 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';
+import Copy from '../../components/copy';
+import { useVT } from 'virtualizedtableforantd4';
 
-const { Text, Paragraph } = Typography;
+const { Text } = Typography;
 const { Search } = Input;
 
 enum Status {
@@ -57,56 +66,11 @@ enum OperationPath {
 
 const type = 'DragableBodyRow';
 
-const DragableBodyRow = ({
-  index,
-  moveRow,
-  className,
-  style,
-  ...restProps
-}: any) => {
-  const ref = useRef();
-  const [{ isOver, dropClassName }, drop] = useDrop({
-    accept: type,
-    collect: (monitor) => {
-      const { index: dragIndex } = (monitor.getItem() as any) || {};
-      if (dragIndex === index) {
-        return {};
-      }
-      return {
-        isOver: monitor.isOver(),
-        dropClassName:
-          dragIndex < index ? ' drop-over-downward' : ' drop-over-upward',
-      };
-    },
-    drop: (item: any) => {
-      moveRow(item.index, index);
-    },
-  });
-  const [, drag] = useDrag({
-    type,
-    item: { index },
-    collect: (monitor) => ({
-      isDragging: monitor.isDragging(),
-    }),
-  });
-  drop(drag(ref));
-
-  return (
-    <tr
-      ref={ref}
-      className={`${className}${isOver ? dropClassName : ''}`}
-      style={{ cursor: 'move', ...style }}
-      {...restProps}
-    />
-  );
-};
-
 const Env = () => {
   const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
   const columns: any = [
     {
       title: '序号',
-      align: 'center' as const,
       width: 60,
       render: (text: string, record: any, index: number) => {
         return <span style={{ cursor: 'text' }}>{index + 1} </span>;
@@ -116,27 +80,21 @@ const Env = () => {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      align: 'center' as const,
       sorter: (a: any, b: any) => a.name.localeCompare(b.name),
     },
     {
       title: '值',
       dataIndex: 'value',
       key: 'value',
-      align: 'center' as const,
       width: '35%',
       render: (text: string, record: any) => {
         return (
-          <Paragraph
+          <div style={{ display: 'flex', alignItems: 'center' }}>
-            style={{
+            <Tooltip title={text} placement="topLeft">
-              wordBreak: 'break-all',
+              <div className="text-ellipsis">{text}</div>
-              marginBottom: 0,
+            </Tooltip>
-              textAlign: 'left',
+            <Copy text={text} />
-            }}
+          </div>
-            ellipsis={{ tooltip: text, rows: 2 }}
-          >
-            {text}
-          </Paragraph>
         );
       },
     },
@@ -144,13 +102,18 @@ const Env = () => {
       title: '备注',
       dataIndex: 'remarks',
       key: 'remarks',
-      align: 'center' as const,
+      render: (text: string, record: any) => {
+        return (
+          <Tooltip title={text} placement="topLeft">
+            <div className="text-ellipsis">{text}</div>
+          </Tooltip>
+        );
+      },
     },
     {
       title: '更新时间',
       dataIndex: 'timestamp',
       key: 'timestamp',
-      align: 'center' as const,
       width: 165,
       ellipsis: {
         showTitle: false,
@@ -185,7 +148,6 @@ const Env = () => {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
-      align: 'center' as const,
       width: 70,
       filters: [
         {
@@ -212,7 +174,6 @@ const Env = () => {
       title: '操作',
       key: 'action',
       width: 120,
-      align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
@@ -252,9 +213,9 @@ const Env = () => {
   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);
@@ -355,7 +316,7 @@ const Env = () => {
 
   const handleCancel = (env?: any[]) => {
     setIsModalVisible(false);
-    env && handleEnv(env);
+    getEnvs();
   };
 
   const handleEditNameCancel = (env?: any[]) => {
@@ -363,28 +324,64 @@ const Env = () => {
     getEnvs();
   };
 
-  const handleEnv = (env: any) => {
+  const [vt, setVT] = useVT(
-    const result = [...value];
+    () => ({ scroll: { y: tableScrollHeight } }),
-    const index = value.findIndex((x) => x.id === env.id);
+    [tableScrollHeight],
-    if (index === -1) {
+  );
-      env = Array.isArray(env) ? env : [env];
-      result.push(...env);
-    } else {
-      result.splice(index, 1, {
-        ...env,
-      });
-    }
-    setValue(result);
-  };
 
-  const components = {
+  const DragableBodyRow = React.forwardRef((props: any, ref) => {
-    body: {
+    const { index, moveRow, className, style, ...restProps } = props;
-      row: DragableBodyRow,
+    const [{ isOver, dropClassName }, drop] = useDrop({
-    },
+      accept: type,
-  };
+      collect: (monitor) => {
+        const { index: dragIndex } = (monitor.getItem() as any) || {};
+        if (dragIndex === index) {
+          return {};
+        }
+        return {
+          isOver: monitor.isOver(),
+          dropClassName:
+            dragIndex < index ? ' drop-over-downward' : ' drop-over-upward',
+        };
+      },
+      drop: (item: any) => {
+        moveRow(item.index, index);
+      },
+    });
+    const [, drag] = useDrag({
+      type,
+      item: { index },
+      collect: (monitor) => ({
+        isDragging: monitor.isDragging(),
+      }),
+    });
+
+    useEffect(() => {
+      drop(drag(ref));
+    }, [ref]);
+
+    return (
+      <tr
+        ref={ref}
+        className={`${className}${isOver ? dropClassName : ''}`}
+        style={{ cursor: 'move', ...style }}
+        {...restProps}
+      />
+    );
+  });
+
+  useEffect(
+    () =>
+      setVT({
+        body: {
+          row: DragableBodyRow,
+        },
+      }),
+    [],
+  );
 
   const moveRow = useCallback(
-    (dragIndex, hoverIndex) => {
+    (dragIndex: number, hoverIndex: number) => {
       if (dragIndex === hoverIndex) {
         return;
       }
@@ -407,16 +404,10 @@ const Env = () => {
 
   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,
   };
 
@@ -508,12 +499,6 @@ const Env = () => {
     getEnvs();
   }, [searchText]);
 
-  useEffect(() => {
-    if (tableRef.current) {
-      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-    }
-  }, [tableRef.current]);
-
   return (
     <PageContainer
       className="ql-container-wrapper env-wrapper"
@@ -543,69 +528,70 @@ const Env = () => {
         style: headerStyle,
       }}
     >
-      {selectedRowIds.length > 0 && (
+      <div ref={tableRef}>
-        <div style={{ marginBottom: 16 }}>
+        {selectedRowIds.length > 0 && (
-          <Button
+          <div style={{ marginBottom: 16 }}>
-            type="primary"
+            <Button
-            style={{ marginBottom: 5 }}
+              type="primary"
-            onClick={modifyName}
+              style={{ marginBottom: 5 }}
-          >
+              onClick={modifyName}
-            批量修改变量名称
+            >
-          </Button>
+              批量修改变量名称
-          <Button
+            </Button>
-            type="primary"
+            <Button
-            style={{ marginBottom: 5, marginLeft: 8 }}
+              type="primary"
-            onClick={delEnvs}
+              style={{ marginBottom: 5, marginLeft: 8 }}
-          >
+              onClick={delEnvs}
-            批量删除
+            >
-          </Button>
+              批量删除
-          <Button
+            </Button>
-            type="primary"
+            <Button
-            onClick={() => exportEnvs()}
+              type="primary"
-            style={{ marginLeft: 8, marginRight: 8 }}
+              onClick={() => exportEnvs()}
-          >
+              style={{ marginLeft: 8, marginRight: 8 }}
-            批量导出
+            >
-          </Button>
+              批量导出
-          <Button
+            </Button>
-            type="primary"
+            <Button
-            onClick={() => operateEnvs(0)}
+              type="primary"
-            style={{ marginLeft: 8, marginBottom: 5 }}
+              onClick={() => operateEnvs(0)}
-          >
+              style={{ marginLeft: 8, marginBottom: 5 }}
-            批量启用
+            >
-          </Button>
+              批量启用
-          <Button
+            </Button>
-            type="primary"
+            <Button
-            onClick={() => operateEnvs(1)}
+              type="primary"
-            style={{ marginLeft: 8, marginRight: 8 }}
+              onClick={() => operateEnvs(1)}
-          >
+              style={{ marginLeft: 8, marginRight: 8 }}
-            批量禁用
+            >
-          </Button>
+              批量禁用
-          <span style={{ marginLeft: 8 }}>
+            </Button>
-            已选择
+            <span style={{ marginLeft: 8 }}>
-            <a>{selectedRowIds?.length}</a>项
+              已选择
-          </span>
+              <a>{selectedRowIds?.length}</a>项
-        </div>
+            </span>
-      )}
+          </div>
-      <DndProvider backend={HTML5Backend}>
+        )}
-        <Table
+        <DndProvider backend={HTML5Backend}>
-          ref={tableRef}
+          <Table
-          columns={columns}
+            columns={columns}
-          rowSelection={rowSelection}
+            rowSelection={rowSelection}
-          pagination={false}
+            pagination={false}
-          dataSource={value}
+            dataSource={value}
-          rowKey="id"
+            rowKey="id"
-          size="middle"
+            size="middle"
-          scroll={{ x: 1000, y: tableScrollHeight }}
+            scroll={{ x: 1000, y: tableScrollHeight }}
-          components={components}
+            components={vt}
-          loading={loading}
+            loading={loading}
-          onRow={(record: any, index: number) => {
+            onRow={(record: any, index: number | undefined) => {
-            return {
+              return {
-              index,
+                index,
-              moveRow,
+                moveRow,
-            } as any;
+              } as any;
-          }}
+            }}
-        />
+          />
-      </DndProvider>
+        </DndProvider>
+      </div>
       <EnvModal
         visible={isModalVisible}
         handleCancel={handleCancel}

src/pages/error/index.less

@@ -9,4 +9,44 @@
     height: calc(100vh - 80px);
     overflow-y: auto;
   }
+
+  .code-box {
+    position: relative;
+    display: inline-block;
+    width: 80%;
+    margin: 16px;
+    background-color: #ffffff;
+    border: 1px solid rgba(5, 5, 5, 0.06);
+    border-radius: 6px;
+    -webkit-transition: all 0.2s;
+    transition: all 0.2s;
+    border-radius: 6px 6px 0 0;
+    color: rgba(0, 0, 0, 0.88);
+    border-bottom: 1px solid rgba(5, 5, 5, 0.06);
+
+    .browser-markup {
+      position: relative;
+      border-top: 2em solid rgba(230, 230, 230, 0.7);
+      border-radius: 3px 3px 0 0;
+
+      &::before {
+        position: absolute;
+        top: -1.25em;
+        left: 1em;
+        display: block;
+        width: 0.5em;
+        height: 0.5em;
+        background-color: #f44;
+        border-radius: 50%;
+        box-shadow: 0 0 0 2px #f44, 1.5em 0 0 2px #9b3, 3em 0 0 2px #fb5;
+        content: '';
+      }
+    }
+
+    .log {
+      height: calc(100vh - 150px);
+      overflow-y: auto;
+      padding: 12px;
+    }
+  }
 }

src/pages/error/index.tsx

@@ -1,28 +1,37 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 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, useOutletContext } from '@umijs/max';
-import Ansi from 'ansi-to-react';
 import './index.less';
 import { SharedContext } from '@/layouts';
+import { Alert, Typography } from 'antd';
 
 const Error = () => {
-  const { user, theme } = useOutletContext<SharedContext>();
+  const { user, theme, reloadUser } = useOutletContext<SharedContext>();
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState('暂无日志');
+  const retryTimes = useRef(1);
 
-  const getLog = () => {
+  const getLog = (needLoading: boolean = true) => {
-    setLoading(true);
+    needLoading && setLoading(true);
     request
-      .get(`${config.apiPrefix}public/panel/log`)
+      .get(`${config.apiPrefix}public/health`)
-      .then(({ code, data }) => {
+      .then(({ status, error }) => {
-        if (code === 200) {
+        if (status === 1) {
-          setData(data);
+          return reloadUser();
         }
+        if (retryTimes.current > 3) {
+          setData(error?.details);
+          return;
+        }
+        retryTimes.current += 1;
+        setTimeout(() => {
+          reloadUser();
+          getLog(false);
+        }, 3000);
       })
-      .finally(() => setLoading(false));
+      .finally(() => needLoading && setLoading(false));
   };
 
   useEffect(() => {
@@ -39,22 +48,18 @@ const Error = () => {
     <div className="error-wrapper">
       {loading ? (
         <PageLoading />
+      ) : retryTimes.current > 3 ? (
+        <div className="code-box">
+          <div className="browser-markup"></div>
+          <Alert
+            type="error"
+            message="服务启动超时，请检查如下日志或者进入容器执行 ql -l check 后刷新再试"
+            banner
+          />
+          <Typography.Paragraph className="log">{data}</Typography.Paragraph>
+        </div>
       ) : (
-        <Terminal
+        <PageLoading tip="启动中，请稍后..." />
-          name="服务错误"
-          colorMode={theme === 'vs-dark' ? ColorMode.Dark : ColorMode.Light}
-          lineData={[
-            { type: LineType.Input, value: 'pm2 logs panel' },
-            {
-              type: LineType.Output,
-              value: (
-                <pre>
-                  <Ansi>{data}</Ansi>
-                </pre>
-              ),
-            },
-          ]}
-        />
       )}
     </div>
   );

src/pages/initialization/index.tsx

@@ -78,9 +78,14 @@ const Initialization = () => {
     {
       title: '欢迎使用',
       content: (
-        <div className={styles.top} style={{ marginTop: 100 }}>
+        <div className={styles.top} style={{ marginTop: 30 }}>
           <div className={styles.header}>
-            <span className={styles.title}>欢迎使用青龙控制面板</span>
+            <span className={styles.title}>欢迎使用青龙</span>
+            <span className={styles.desc}>
+              支持python3、javaScript、shell、typescript 的定时任务管理面板（A
+              timed task management panel that supports typescript, javaScript,
+              python3, and shell.）
+            </span>
           </div>
           <div className={styles.action}>
             <Button
@@ -232,7 +237,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>

src/pages/log/index.tsx

@@ -21,7 +21,8 @@ import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
 import { DeleteOutlined } from '@ant-design/icons';
 import { depthFirstSearch } from '@/utils';
-import { debounce, uniq } from 'lodash';
+import debounce from 'lodash/debounce';
+import uniq from 'lodash/uniq';
 import useFilterTreeData from '@/hooks/useFilterTreeData';
 
 const { Text } = Typography;

src/pages/login/index.tsx

@@ -129,7 +129,7 @@ const Login = () => {
           <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}

src/pages/script/editModal.tsx

@@ -49,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();
@@ -94,21 +95,21 @@ const EditModal = ({
       .then(({ code, data }) => {
         if (code === 200) {
           setIsRunning(true);
+          setCurrentPid(data);
         }
       });
   };
 
   const stop = () => {
-    if (!cNode || !cNode.title) {
+    if (!cNode || !cNode.title || !currentPid) {
       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(({ code, data }) => {
@@ -253,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}
@@ -264,7 +272,7 @@ const EditModal = ({
           content:
             editorRef.current &&
             editorRef.current.getValue().replace(/\r\n/g, '\n'),
-          filename: cNode?.title,
+          ...cNode,
         }}
       />
       <SettingModal

src/pages/script/index.tsx

@@ -11,6 +11,7 @@ import {
   Dropdown,
   Menu,
   Empty,
+  MenuProps,
 } from 'antd';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -35,10 +36,12 @@ import EditScriptNameModal from './editNameModal';
 import debounce from 'lodash/debounce';
 import { history, useOutletContext, useLocation } from '@umijs/max';
 import { parse } from 'query-string';
-import { depthFirstSearch } from '@/utils';
+import { depthFirstSearch, findNode } from '@/utils';
 import { SharedContext } from '@/layouts';
 import useFilterTreeData from '@/hooks/useFilterTreeData';
-import { uniq } from 'lodash';
+import uniq from 'lodash/uniq';
+import IconFont from '@/components/iconfont';
+import RenameModal from './renameModal';
 
 const { Text } = Typography;
 
@@ -64,20 +67,23 @@ const Script = () => {
   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 = () => {
+  const getScripts = (needLoading: boolean = true) => {
-    setLoading(true);
+    needLoading && setLoading(true);
     request
       .get(`${config.apiPrefix}scripts`)
       .then(({ code, data }) => {
         if (code === 200) {
           setData(data);
-          initGetScript();
+          initState();
+          initGetScript(data);
         }
       })
-      .finally(() => setLoading(false));
+      .finally(() => needLoading && setLoading(false));
   };
 
   const getDetail = (node: any) => {
@@ -94,7 +100,7 @@ const Script = () => {
       });
   };
 
-  const initGetScript = () => {
+  const initGetScript = (_data: any) => {
     const { p, s } = parse(history.location.search);
     if (s) {
       const vkey = `${p}/${s}`;
@@ -105,8 +111,11 @@ const Script = () => {
           parent: p,
         },
       };
-      setExpandedKeys([p]);
+      const item = findNode(_data, (c) => c.key === obj.node.key);
-      onTreeSelect([vkey], obj);
+      if (item) {
+        setExpandedKeys([p as string]);
+        onTreeSelect([vkey], obj);
+      }
     }
   };
 
@@ -287,6 +296,15 @@ const Script = () => {
     });
   };
 
+  const renameFile = () => {
+    setIsRenameFileModalVisible(true);
+  };
+
+  const handleRenameFileCancel = () => {
+    setIsRenameFileModalVisible(false);
+    getScripts(false);
+  };
+
   const addFile = () => {
     setIsAddFileModalVisible(true);
   };
@@ -372,7 +390,7 @@ const Script = () => {
 
   const menuAction = (key: string | number) => {
     switch (key) {
-      case 'save':
+      case 'add':
         addFile();
         break;
       case 'edit':
@@ -381,45 +399,52 @@ const Script = () => {
       case 'delete':
         deleteFile();
         break;
+      case 'rename':
+        renameFile();
+        break;
       default:
         break;
     }
   };
 
-  const menu = isEditing ? (
+  const menu: MenuProps = isEditing
-    <Menu
+    ? {
-      items={[
+        items: [
-        { label: '保存', key: 'save', icon: <PlusOutlined /> },
+          { label: '保存', key: 'save', icon: <PlusOutlined /> },
-        { label: '退出编辑', key: 'exit', icon: <EditOutlined /> },
+          { label: '退出编辑', key: 'exit', icon: <EditOutlined /> },
-      ]}
+        ],
-      onClick={({ key, domEvent }) => {
+        onClick: ({ key, domEvent }) => {
-        domEvent.stopPropagation();
+          domEvent.stopPropagation();
-        action(key);
+          action(key);
-      }}
-    />
-  ) : (
-    <Menu
-      items={[
-        { label: '新建', key: 'add', icon: <PlusOutlined /> },
-        {
-          label: '编辑',
-          key: 'edit',
-          icon: <EditOutlined />,
-          disabled: !select,
         },
-        {
+      }
-          label: '删除',
+    : {
-          key: 'delete',
+        items: [
-          icon: <DeleteOutlined />,
+          { label: '新建', key: 'add', icon: <PlusOutlined /> },
-          disabled: !select,
+          {
+            label: '编辑',
+            key: 'edit',
+            icon: <EditOutlined />,
+            disabled: !select,
+          },
+          {
+            label: '重命名',
+            key: 'rename',
+            icon: <IconFont type="ql-icon-rename" />,
+            disabled: !select,
+          },
+          {
+            label: '删除',
+            key: 'delete',
+            icon: <DeleteOutlined />,
+            disabled: !select,
+          },
+        ],
+        onClick: ({ key, domEvent }) => {
+          domEvent.stopPropagation();
+          menuAction(key);
         },
-      ]}
+      };
-      onClick={({ key, domEvent }) => {
-        domEvent.stopPropagation();
-        menuAction(key);
-      }}
-    />
-  );
 
   return (
     <PageContainer
@@ -442,7 +467,7 @@ const Script = () => {
                 allowClear
                 onSelect={onSelect}
               />,
-              <Dropdown overlay={menu} trigger={['click']}>
+              <Dropdown menu={menu} trigger={['click']}>
                 <Button type="primary" icon={<EllipsisOutlined />} />
               </Dropdown>,
             ]
@@ -471,6 +496,14 @@ const Script = () => {
                   icon={<EditOutlined />}
                 />
               </Tooltip>,
+              <Tooltip title="重命名">
+                <Button
+                  disabled={!select}
+                  type="primary"
+                  onClick={renameFile}
+                  icon={<IconFont type="ql-icon-rename" />}
+                />
+              </Tooltip>,
               <Tooltip title="删除">
                 <Button
                   type="primary"
@@ -585,6 +618,11 @@ const Script = () => {
           treeData={data}
           handleCancel={addFileModalClose}
         />
+        <RenameModal
+          visible={isRenameFileModalVisible}
+          handleCancel={handleRenameFileCancel}
+          currentNode={currentNode}
+        />
       </div>
     </PageContainer>
   );

src/pages/script/renameModal.tsx

@@ -0,0 +1,78 @@
+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;
+}) => {
+  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;

src/pages/script/saveModal.tsx

@@ -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,
@@ -60,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"

src/pages/setting/about.tsx

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