更新版本 v2.15.13

* 修复了视图无排序时无法再次修改的问题

* 修复在视图管理中编辑、新建视图点击确定后不能关闭页面的问题

* 修复#1611 避免查询条件被覆盖

* 修复视图筛选不能正确处理`不包含`

.env.example

@@ -10,3 +10,4 @@ SECRET='whyour'
 QINIU_AK=''
 QINIU_SK=''
 QINIU_SCOPE=''
+TEMP=''

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,42 @@
+name: "\U0001F41E Bug report"
+description: Create a report to help us improve
+body:
+  - type: input
+    id: version
+    attributes:
+      label: Qinglong version
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: |
+        What do we need to do after opening your repro in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner. Note that you can use [Markdown](https://guides.github.com/features/mastering-markdown/) to format lists and code.
+      placeholder: Steps to reproduce
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: What is expected?
+    validations:
+      required: true
+  - type: textarea
+    id: actually-happening
+    attributes:
+      label: What is actually happening?
+    validations:
+      required: true
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System Info
+      description: Output of `npx envinfo --system --binaries --browsers`
+      render: shell
+      placeholder: System, Binaries, Browsers
+  - type: textarea
+    id: additional-comments
+    attributes:
+      label: Any additional comments?
+      description: e.g. some background/context of how you ran into this bug.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Telegram Chat
+    url: https://t.me/jiao_long
+    about: Ask questions and discuss with other Qinglong users in real time.
+  - name: Questions & Discussions
+    url: https://github.com/whyour/qinglong/discussions/new?category=q-a
+    about: Use GitHub discussions for message-board style questions and discussions.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,40 @@
+name: "\U0001F680 New feature proposal"
+description: Suggest an idea for this project
+labels: [":sparkles: feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your interest in the project and taking the time to fill out this feature report!
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Clear and concise description of the problem
+      description: "Explain your use case, context, and rationale behind this feature request. More importantly, what is the **end user experience** you are trying to build that led to the need for this feature?"
+    validations:
+      required: true
+  - type: textarea
+    id: suggested-solution
+    attributes:
+      label: Suggested solution
+      description: "In module [xy] we could provide following implementation..."
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: Alternative
+      description: Clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Any other context or screenshots about the feature request here.
+  - type: checkboxes
+    id: checkboxes
+    attributes:
+      label: Validations
+      description: Before submitting the issue, please make sure you do the following
+      options:
+        - label: Check that there isn't already an issue that request the same feature to avoid creating a duplicate.
+          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,31 @@
+## PR Type
+What kind of change does this PR introduce?
+
+<!-- Please check the one that applies to this PR using "x". -->
+
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update (formatting, local variables)
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Other... Please describe:
+
+
+## What is the current behavior?
+<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
+
+Issue Number: N/A
+
+
+## What is the new behavior?
+
+
+## Does this PR introduce a breaking change?
+
+- [ ] Yes
+- [ ] No
+
+
+<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
+
+
+## Other information

.github/config.yml

@@ -0,0 +1,7 @@
+# Comment to be posted to on PRs from first time contributors in your repository
+newPRWelcomeComment: |
+  💖 Thanks for opening this pull request! 💖
+  Please be patient and we will get back to you as soon as we can.
+# Comment to be posted to on pull requests merged by a first time user
+firstPRMergeComment: >
+  Congrats on merging your first pull request! 🎉🎉🎉

.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,14 +97,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v2
-
-      - name: Set time zone
-        uses: szenius/set-timezone@v1.0
         with:
-          timezoneLinux: "Asia/Shanghai"
+          version: latest
-          timezoneMacos: "Asia/Shanghai"
+      - uses: actions/setup-node@v3
-          timezoneWindows: "China Standard Time"
+        with:
+          cache: 'pnpm'
+
+      - name: Setup timezone
+        uses: zcong1993/setup-timezone@master
+        with:
+          timezone: Asia/Shanghai
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
@@ -108,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

@@ -1,24 +1,21 @@
-import { defineConfig } from 'umi';
+import { defineConfig } from '@umijs/max';
 const CompressionPlugin = require('compression-webpack-plugin');
 
 export default defineConfig({
   hash: true,
-  layout: false,
+  antd: {},
   outputPath: 'static/dist',
-  nodeModulesTransform: {
+  fastRefresh: true,
-    type: 'none',
+  favicons: ['./images/favicon.svg'],
+  mfsu: {
+    strategy: 'eager',
   },
-  fastRefresh: {},
+  publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
-  esbuild: {},
-  webpack5: {},
-  dynamicImport: {
-    loading: '@/components/pageLoading',
-  },
-  favicon: '/images/g5.ico',
   proxy: {
     '/api/public': {
       target: 'http://127.0.0.1:5400/',
       changeOrigin: true,
+      pathRewrite: { '^/api/public': '/api/' },
     },
     '/api': {
       target: 'http://127.0.0.1:5600/',
@@ -26,7 +23,7 @@ export default defineConfig({
       ws: true,
     },
   },
-  chainWebpack: (config) => {
+  chainWebpack: ((config: any) => {
     config.plugin('compression-webpack-plugin').use(
       new CompressionPlugin({
         algorithm: 'gzip',
@@ -35,13 +32,13 @@ export default defineConfig({
         minRatio: 0.6,
       }),
     );
-  },
+  }) as any,
   externals: {
     react: 'window.React',
     'react-dom': 'window.ReactDOM',
   },
-  scripts: [
+  headScripts: [
-    'https://gw.alipayobjects.com/os/lib/react/16.13.1/umd/react.production.min.js',
+    'https://gw.alipayobjects.com/os/lib/react/18.2.0/umd/react.production.min.js',
-    'https://gw.alipayobjects.com/os/lib/react-dom/16.13.1/umd/react-dom.production.min.js',
+    'https://gw.alipayobjects.com/os/lib/react-dom/18.2.0/umd/react-dom.production.min.js',
   ],
 });

README-en.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
+    <img width="150" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
   </a>
 </p>
 
@@ -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
@@ -57,11 +57,10 @@ https://podman.io/getting-started/installation
 ```bash
 podman run -dit \
   --network bridge \
-  -v $PWD/ql:/ql/data \
+  -v $PWD/ql/data:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
-  --restart unless-stopped \
   docker.io/whyour/qinglong:latest
 ```
 
@@ -96,7 +95,7 @@ systemctl restart docker
 
 ```bash
 docker run -dit \
-  -v $PWD/ql:/ql/data \
+  -v $PWD/ql/data:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
@@ -124,6 +123,10 @@ docker-compose up -d
 docker-compose down
 ```
 
+3. access
+
+Open your browser and visit http://{ip}:5700
+
 ## Use
 
 1. built-in commands
@@ -158,6 +161,10 @@ task <file_path> now
 task <file_path> conc <env_name> <account_number>(Optional) 
 # Specify the account to execute and run immediately regardless of whether a random delay is set 
 task <file_path> desi <env_name> <account_number>       
+# Set task timeout   
+task -m <max_time> <file_path>
+# Print task log in real time, no need to carry this parameter when creating timed tasks
+task -l <file_path>  
 ```
 
 2. parameter description
@@ -172,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
 
@@ -179,7 +187,7 @@ task <file_path> desi <env_name> <account_number>
 - [crontab-ui](https://github.com/alseambusher/crontab-ui)
 - [Ant Design](https://ant.design)
 - [Ant Design Pro](https://pro.ant.design/)
-- [Umijs3.0](https://umijs.org)
+- [Umijs](https://umijs.org)
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)
 

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
+    <img width="150" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
   </a>
 </p>
 
@@ -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 部署
@@ -57,11 +57,10 @@ https://podman.io/getting-started/installation
 ```bash
 podman run -dit \
   --network bridge \
-  -v $PWD/ql:/ql/data \
+  -v $PWD/ql/data:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
-  --restart unless-stopped \
   docker.io/whyour/qinglong:latest
 ```
 
@@ -74,7 +73,6 @@ sudo curl -sSL get.docker.com | sh
 ```
 
 2. 配置国内镜像源
-Configure domestic mirror sources
 
 ```bash
 mkdir -p /etc/docker
@@ -97,7 +95,7 @@ systemctl restart docker
 
 ```bash
 docker run -dit \
-  -v $PWD/ql:/ql/data \
+  -v $PWD/ql/data:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
@@ -125,6 +123,10 @@ docker-compose up -d
 docker-compose down
 ```
 
+3. 访问
+
+打开你的浏览器，访问 http://{ip}:5700
+
 ## 使用
 
 1. 内置命令
@@ -157,6 +159,10 @@ task <file_path> now
 task <file_path> conc <env_name> <account_number>(可选的) 
 # 指定账号执行，无论是否设置了随机延迟，均立即运行 
 task <file_path> desi <env_name> <account_number>      
+# 设置任务超时时间   
+task -m <max_time> <file_path>
+# 实时打印任务日志，创建定时任务时，不用携带此参数
+task -l <file_path>
 ```
 
 2. 参数说明
@@ -172,6 +178,7 @@ task <file_path> desi <env_name> <account_number>
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称
 * account_number: 任务执行时指定某个环境变量需要执行的账号序号
+* max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 
 ## 链接
 
@@ -179,7 +186,7 @@ task <file_path> desi <env_name> <account_number>
 - [crontab-ui](https://github.com/alseambusher/crontab-ui)
 - [Ant Design](https://ant.design)
 - [Ant Design Pro](https://pro.ant.design/)
-- [Umijs3.0](https://umijs.org)
+- [Umijs](https://umijs.org)
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)
 

back/api/cron.ts

@@ -2,6 +2,7 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import CronService from '../services/cron';
+import CronViewService from '../services/cronView';
 import { celebrate, Joi } from 'celebrate';
 import cron_parser from 'cron-parser';
 const route = Router();
@@ -9,11 +10,141 @@ const route = Router();
 export default (app: Router) => {
   app.use('/crons', route);
 
+  route.get(
+    '/views',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const cronViewService = Container.get(CronViewService);
+        const data = await cronViewService.list();
+        return res.send({ code: 200, data });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.post(
+    '/views',
+    celebrate({
+      body: Joi.object({
+        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) => {
+      try {
+        const cronViewService = Container.get(CronViewService);
+        const data = await cronViewService.create(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/views',
+    celebrate({
+      body: Joi.object({
+        name: Joi.string().required(),
+        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);
+        if (req.body.type === 1) {
+          return res.send({ code: 400, message: '参数错误' });
+        } else {
+          const data = await cronViewService.update(req.body);
+          return res.send({ code: 200, data });
+        }
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.delete(
+    '/views',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const cronViewService = Container.get(CronViewService);
+        const data = await cronViewService.remove(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/views/move',
+    celebrate({
+      body: Joi.object({
+        fromIndex: Joi.number().required(),
+        toIndex: Joi.number().required(),
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      try {
+        const cronViewService = Container.get(CronViewService);
+        const data = await cronViewService.move(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/views/disable',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronViewService = Container.get(CronViewService);
+        const data = await cronViewService.disabled(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/views/enable',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronViewService = Container.get(CronViewService);
+        const data = await cronViewService.enabled(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
       const cronService = Container.get(CronService);
-      const data = await cronService.crontabs(req.query.searchValue as string);
+      const data = await cronService.crontabs(req.query as any);
       return res.send({ code: 200, data });
     } catch (e) {
       logger.error('🔥 error: %o', e);
@@ -21,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({
@@ -29,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) => {
@@ -185,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

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

back/api/log.ts

@@ -3,8 +3,9 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { getFileContentByName, readDirs } from '../config/util';
+import { emptyDir, getFileContentByName, readDirs } from '../config/util';
 import { join } from 'path';
+import { celebrate, Joi } from 'celebrate';
 const route = Router();
 const blacklist = ['.tmp'];
 
@@ -45,4 +46,34 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.delete(
+    '/',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().allow(''),
+        type: Joi.string().optional()
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        let { filename, path, type } = req.body as {
+          filename: string;
+          path: string;
+          type: string;
+        };
+        const filePath = join(config.logPath, path, filename);
+        if (type === 'directory') {
+          emptyDir(filePath);          
+        } else {
+          fs.unlinkSync(filePath);
+        }
+        res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
 };

back/api/script.ts

@@ -4,6 +4,7 @@ import {
   readDirs,
   getLastModifyFilePath,
   readDir,
+  emptyDir,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
@@ -77,12 +78,14 @@ export default (app: Router) => {
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, content, originFilename } = req.body as {
+        let { filename, path, content, originFilename, directory } =
-          filename: string;
+          req.body as {
-          path: string;
+            filename: string;
-          content: string;
+            path: string;
-          originFilename: string;
+            content: string;
-        };
+            originFilename: string;
+            directory: string;
+          };
 
         if (!path) {
           path = config.scriptPath;
@@ -105,11 +108,19 @@ export default (app: Router) => {
           return res.send({ code: 200 });
         }
 
+        if (directory) {
+          fs.mkdirSync(join(path, directory), { recursive: true });
+          return res.send({ code: 200 });
+        }
+
         if (!originFilename) {
           originFilename = filename;
         }
-        const originFilePath = `${path}${originFilename.replace(/\//g, '')}`;
+        const originFilePath = join(
-        const filePath = `${path}${filename.replace(/\//g, '')}`;
+          path,
+          `${originFilename.replace(/\//g, '')}`,
+        );
+        const filePath = join(path, `${filename.replace(/\//g, '')}`);
         if (fs.existsSync(originFilePath)) {
           fs.copyFileSync(
             originFilePath,
@@ -159,17 +170,23 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().allow(''),
+        type: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path } = req.body as {
+        let { filename, path, type } = req.body as {
           filename: string;
           path: string;
+          type: string;
         };
         const filePath = join(config.scriptPath, path, filename);
-        fs.unlinkSync(filePath);
+        if (type === 'directory') {
+          emptyDir(filePath);
+        } else {
+          fs.unlinkSync(filePath);
+        }
         res.send({ code: 200 });
       } catch (e) {
         return next(e);
@@ -238,23 +255,50 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
-        content: Joi.string().optional().allow(''),
         path: Joi.string().optional().allow(''),
+        pid: Joi.number().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, content, path } = req.body;
+        let { filename, path, pid } = req.body;
         const { name, ext } = parse(filename);
         const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
 
         const scriptService = Container.get(ScriptService);
-        const result = await scriptService.stopScript(filePath);
+        const result = await scriptService.stopScript(filePath, pid);
         res.send(result);
       } catch (e) {
         return next(e);
       }
     },
   );
+
+  route.put(
+    '/rename',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().allow(''),
+        newFilename: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        let { filename, path, type, newFilename } = req.body as {
+          filename: string;
+          path: string;
+          type: string;
+          newFilename: string;
+        };
+        const filePath = join(config.scriptPath, path, filename);
+        const newPath = join(config.scriptPath, path, newFilename);
+        fs.renameSync(filePath, newPath);
+        res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };

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

@@ -17,7 +17,7 @@ async function startServer() {
 
   const server = app
     .listen(config.port, () => {
-      Logger.debug(`✌️ Back server launched on port ${config.port}`);
+      Logger.debug(`✌️ 后端服务启动成功！`);
     })
     .on('error', (err) => {
       Logger.error(err);

back/config/const.ts

@@ -0,0 +1,7 @@
+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

@@ -11,10 +11,10 @@ if (!process.env.QL_DIR) {
   if (qlHomePath.endsWith('/static/')) {
     qlHomePath = path.join(qlHomePath, '../');
   }
-  process.env.QL_DIR = qlHomePath;
+  process.env.QL_DIR = qlHomePath.replace(/\/$/g, '');
 }
 
-const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;
+const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
@@ -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

@@ -3,6 +3,12 @@ import * as path from 'path';
 import got from 'got';
 import iconv from 'iconv-lite';
 import { exec } from 'child_process';
+import FormData from 'form-data';
+import psTreeFun from 'pstree.remy';
+import { promisify } from 'util';
+import { load } from 'js-yaml';
+import config from './index';
+import { TASK_COMMAND } from './const';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -241,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,
@@ -283,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 = '',
@@ -301,24 +333,21 @@ export function readDirs(
           title: file,
           key,
           type: 'directory',
-          disabled: true,
           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 {
         title: file,
         type: 'file',
+        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(
@@ -344,6 +373,20 @@ export function readDir(
   return result;
 }
 
+export function emptyDir(path: string) {
+  const files = fs.readdirSync(path);
+  files.forEach((file) => {
+    const filePath = `${path}/${file}`;
+    const stats = fs.statSync(filePath);
+    if (stats.isDirectory()) {
+      emptyDir(filePath);
+    } else {
+      fs.unlinkSync(filePath);
+    }
+  });
+  fs.rmdirSync(path);
+}
+
 export function promiseExec(command: string): Promise<string> {
   return new Promise((resolve, reject) => {
     exec(
@@ -355,3 +398,156 @@ export function promiseExec(command: string): Promise<string> {
     );
   });
 }
+
+export function parseHeaders(headers: string) {
+  if (!headers) return {};
+
+  const parsed: any = {};
+  let key;
+  let val;
+  let i;
+
+  headers &&
+    headers.split('\n').forEach(function parser(line) {
+      i = line.indexOf(':');
+      key = line.substring(0, i).trim().toLowerCase();
+      val = line.substring(i + 1).trim();
+
+      if (!key) {
+        return;
+      }
+
+      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+    });
+
+  return parsed;
+}
+
+export function parseBody(
+  body: string,
+  contentType:
+    | 'application/json'
+    | 'multipart/form-data'
+    | 'application/x-www-form-urlencoded',
+) {
+  if (!body) return '';
+
+  const parsed: any = {};
+  let key;
+  let val;
+  let i;
+
+  body &&
+    body.split('\n').forEach(function parser(line) {
+      i = line.indexOf(':');
+      key = line.substring(0, i).trim().toLowerCase();
+      val = line.substring(i + 1).trim();
+
+      if (!key || parsed[key]) {
+        return;
+      }
+
+      try {
+        const jsonValue = JSON.parse(val);
+        parsed[key] = jsonValue;
+      } catch (error) {
+        parsed[key] = val;
+      }
+    });
+
+  switch (contentType) {
+    case 'multipart/form-data':
+      return Object.keys(parsed).reduce((p, c) => {
+        p.append(c, parsed[c]);
+        return p;
+      }, new FormData());
+    case 'application/x-www-form-urlencoded':
+      return Object.keys(parsed).reduce((p, c) => {
+        return p ? `${p}&${c}=${parsed[c]}` : `${c}=${parsed[c]}`;
+      });
+  }
+
+  return parsed;
+}
+
+export function psTree(pid: number): Promise<number[]> {
+  return new Promise((resolve, reject) => {
+    psTreeFun(pid, (err: any, pids: number[]) => {
+      if (err) {
+        reject(err);
+      }
+      resolve(pids.filter((x) => !isNaN(x)));
+    });
+  });
+}
+
+export async function killTask(pid: number) {
+  const pids = await psTree(pid);
+  // 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

@@ -0,0 +1,62 @@
+import { sequelize } from '.';
+import { DataTypes, Model } from 'sequelize';
+
+export enum CronViewType {
+  '系统' = 1,
+  '个人',
+}
+
+interface SortType {
+  type: 'ASC' | 'DESC';
+  value: string;
+}
+
+interface FilterType {
+  property: string;
+  operation: string;
+  value: string;
+}
+
+export class CrontabView {
+  name?: string;
+  id?: number;
+  position?: number;
+  isDisabled?: 1 | 0;
+  filters?: FilterType[];
+  sorts?: SortType[];
+  filterRelation?: 'and' | 'or';
+  type?: CronViewType;
+
+  constructor(options: CrontabView) {
+    this.name = options.name;
+    this.id = options.id;
+    this.position = options.position;
+    this.isDisabled = options.isDisabled || 0;
+    this.filters = options.filters;
+    this.sorts = options.sorts;
+    this.filterRelation = options.filterRelation;
+    this.type = options.type || CronViewType.个人;
+  }
+}
+
+interface CronViewInstance
+  extends Model<CrontabView, CrontabView>,
+    CrontabView {}
+export const CrontabViewModel = sequelize.define<CronViewInstance>(
+  'CrontabView',
+  {
+    name: {
+      unique: 'name',
+      type: DataTypes.STRING,
+    },
+    position: DataTypes.NUMBER,
+    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

@@ -1,16 +1,22 @@
+import { IncomingHttpHeaders } from 'http';
+
 export enum NotificationMode {
   'gotify' = 'gotify',
   'goCqHttpBot' = 'goCqHttpBot',
   'serverChan' = 'serverChan',
   'pushDeer' = 'pushDeer',
   'bark' = 'bark',
+  'chat' = 'chat',
   'telegramBot' = 'telegramBot',
   'dingtalkBot' = 'dingtalkBot',
   'weWorkBot' = 'weWorkBot',
   'weWorkApp' = 'weWorkApp',
+  'aibotk' = 'aibotk',
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
   'email' = 'email',
+  'feishu' = 'feishu',
+  'webhook' = 'webhook',
 }
 
 abstract class NotificationBaseInfo {
@@ -35,11 +41,17 @@ export class ServerChanNotification extends NotificationBaseInfo {
 
 export class PushDeerNotification extends NotificationBaseInfo {
   public pushDeerKey = '';
+  public pushDeerUrl = '';
+}
+
+export class ChatNotification extends NotificationBaseInfo {
+  public chatUrl = '';
+  public chatToken = '';
 }
 
 export class BarkNotification extends NotificationBaseInfo {
   public barkPush = '';
-  public barkIcon = 'http://qn.whyour.cn/logo.png';
+  public barkIcon = 'https://qn.whyour.cn/logo.png';
   public barkSound = '';
   public barkGroup = 'qinglong';
 }
@@ -66,6 +78,12 @@ export class WeWorkAppNotification extends NotificationBaseInfo {
   public weWorkAppKey = '';
 }
 
+export class AibotkNotification extends NotificationBaseInfo {
+  public aibotkKey: string = '';
+  public aibotkType: 'room' | 'contact' = 'room';
+  public aibotkName: string = '';
+}
+
 export class IGotNotification extends NotificationBaseInfo {
   public iGotPushKey = '';
 }
@@ -81,16 +99,35 @@ export class EmailNotification extends NotificationBaseInfo {
   public emailPass: string = '';
 }
 
+export class WebhookNotification extends NotificationBaseInfo {
+  public webhookHeaders: string = '';
+  public webhookBody: string = '';
+  public webhookUrl: string = '';
+  public webhookMethod: 'GET' | 'POST' | 'PUT' = 'GET';
+  public webhookContentType:
+    | 'application/json'
+    | 'multipart/form-data'
+    | 'application/x-www-form-urlencoded' = 'application/json';
+}
+
+export class LarkNotification extends NotificationBaseInfo {
+  public larkKey = '';
+}
+
 export interface NotificationInfo
   extends GoCqHttpBotNotification,
     GotifyNotification,
     ServerChanNotification,
     PushDeerNotification,
+    ChatNotification,
     BarkNotification,
     TelegramBotNotification,
     DingtalkBotNotification,
     WeWorkBotNotification,
     WeWorkAppNotification,
+    AibotkNotification,
     IGotNotification,
     PushPlusNotification,
-    EmailNotification {}
+    EmailNotification,
+    WebhookNotification,
+    LarkNotification {}

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

@@ -6,10 +6,11 @@ import { CrontabModel } from '../data/cron';
 import { DependenceModel } from '../data/dependence';
 import { AppModel } from '../data/open';
 import { AuthModel } from '../data/auth';
-import { sequelize } from '../data';
 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 {
@@ -19,13 +20,35 @@ export default async () => {
     await AuthModel.sync();
     await EnvModel.sync();
     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/express.ts

@@ -3,7 +3,7 @@ import bodyParser from 'body-parser';
 import cors from 'cors';
 import routes from '../api';
 import config from '../config';
-import jwt from 'express-jwt';
+import jwt, { UnauthorizedError } from 'express-jwt';
 import fs from 'fs';
 import { getPlatform, getToken } from '../config/util';
 import Container from 'typedi';
@@ -75,22 +75,24 @@ export default ({ app }: { app: Application }) => {
     if (
       !headerToken &&
       originPath &&
-      config.apiWhiteList.includes(originPath) &&
+      config.apiWhiteList.includes(originPath)
-      originPath !== '/api/crons/status'
     ) {
       return next();
     }
 
     const data = fs.readFileSync(config.authConfigFile, 'utf8');
-    if (data) {
+    if (data && headerToken) {
       const { token = '', tokens = {} } = JSON.parse(data);
       if (headerToken === token || tokens[req.platform] === headerToken) {
         return next();
       }
     }
 
-    const err: any = new Error('UnauthorizedError');
+    const errorCode = headerToken ? 'invalid_token' : 'credentials_required';
-    err.status = 401;
+    const errorMessage = headerToken
+      ? 'jwt malformed'
+      : 'No authorization token was found';
+    const err = new UnauthorizedError(errorCode, { message: errorMessage });
     next(err);
   });
 
@@ -168,7 +170,17 @@ export default ({ app }: { app: Application }) => {
     },
   );
 
-  app.use(Sentry.Handlers.errorHandler());
+  app.use(
+    Sentry.Handlers.errorHandler({
+      shouldHandleError(error) {
+        // 排除 SequelizeUniqueConstraintError / NotFound
+        return (
+          !['SequelizeUniqueConstraintError'].includes(error.name) ||
+          !['Not Found'].includes(error.message)
+        );
+      },
+    }),
+  );
 
   app.use(
     (

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,43 +11,39 @@ 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`;
+  const tokenFile = `${config.rootPath}static/build/token.js`;
   if (await fileExist(tokenFile)) {
     tokenCommand = `node ${tokenFile}`;
   }
   const cron = {
-    id: 'token',
+    id: NaN,
     name: '生成token',
     command: tokenCommand,
   };
-  scheduleService.createIntervalTask(cron as any, {
+  await scheduleService.cancelIntervalTask(cron);
+  scheduleService.createIntervalTask(cron, {
     days: 28,
-    runImmediately: true,
   });
 
   // 运行删除日志任务
   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,
-      runImmediately: true,
     });
   }
 
   // 运行所有订阅
+  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

@@ -2,16 +2,21 @@ import { Application } from 'express';
 import * as Sentry from '@sentry/node';
 import * as Tracing from '@sentry/tracing';
 import Logger from './logger';
+import config from '../config';
+import fs from 'fs';
+import { parseVersion } from '../config/util';
+
+export default async ({ expressApp }: { expressApp: Application }) => {
+  const { version } = await parseVersion(config.versionFile);
 
-export default ({ expressApp }: { expressApp: Application }) => {
   Sentry.init({
     dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
     integrations: [
       new Sentry.Integrations.Http({ tracing: true }),
       new Tracing.Integrations.Express({ app: expressApp }),
     ],
-
+    tracesSampleRate: 0.1,
-    tracesSampleRate: 1.0,
+    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
@@ -22,7 +25,7 @@ app
     await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/db').default();
 
-    Logger.debug(`✌️ Back server launched on port ${config.publicPort}`);
+    Logger.debug(`✌️ 公共服务启动成功！`);
   })
   .on('error', (err) => {
     Logger.error(err);

back/schedule.ts

@@ -1,55 +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
-          ) {
-            schedule.scheduleJob(task.schedule, function () {
-              let command = task.command as string;
-              if (!command.includes('task ') && !command.includes('ql ')) {
-                command = `task ${command}`;
-              }
-              exec(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.info(`
-      ################################################
-      🛡️  Schedule listening on port: ${config.cronPort} 🛡️
-      ################################################
-    `);
-  })
-  .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,16 +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 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;
@@ -28,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;
   }
 
@@ -37,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;
   }
 
@@ -78,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[]) {
@@ -113,9 +141,84 @@ export default class CronService {
     }
   }
 
-  public async crontabs(searchText?: string): Promise<Crontab[]> {
+  private formatViewQuery(query: any, viewQuery: any) {
-    let query = {};
+    if (viewQuery.filters && viewQuery.filters.length > 0) {
+      const primaryOperate = viewQuery.filterRelation === 'or' ? Op.or : Op.and;
+      if (!query[primaryOperate]) {
+        query[primaryOperate] = [];
+      }
+      for (const col of viewQuery.filters) {
+        const { property, value, operation } = col;
+        let q: any = {};
+        let operate2 = null;
+        let operate = null;
+        switch (operation) {
+          case 'Reg':
+            operate = Op.like;
+            operate2 = Op.or;
+            break;
+          case 'NotReg':
+            operate = Op.notLike;
+            operate2 = Op.and;
+            break;
+          case 'In':
+            q[Op.or] = [
+              {
+                [property]: value,
+              },
+              property === 'status' && value.includes(2)
+                ? { isDisabled: 1 }
+                : {},
+            ];
+            break;
+          case 'Nin':
+            q[Op.and] = [
+              {
+                [property]: {
+                  [Op.notIn]: value,
+                },
+              },
+              property === 'status' && value.includes(2)
+                ? { isDisabled: { [Op.ne]: 1 } }
+                : {},
+            ];
+            break;
+          default:
+            break;
+        }
+        if (operate && operate2) {
+          q[property] = {
+            [Op.or]: [
+              {
+                [operate2]: [
+                  { [operate]: `%${value}%` },
+                  { [operate]: `%${encodeURIComponent(value)}%` },
+                ],
+              },
+              {
+                [operate2]: [
+                  where(colFn(property), operate, `%${value}%`),
+                  where(
+                    colFn(property),
+                    operate,
+                    `%${encodeURIComponent(value)}%`,
+                  ),
+                ],
+              },
+            ],
+          };
+        }
+        query[primaryOperate].push(q);
+      }
+    }
+  }
+
+  private formatSearchText(query: any, searchText: string | undefined) {
     if (searchText) {
+      if (!query[Op.and]) {
+        query[Op.and] = [];
+      }
+      let q: any = {};
       const textArray = searchText.split(':');
       switch (textArray[0]) {
         case 'name':
@@ -123,13 +226,11 @@ export default class CronService {
         case 'schedule':
         case 'label':
           const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-          query = {
+          q[column] = {
-            [column]: {
+            [Op.or]: [
-              [Op.or]: [
+              { [Op.like]: `%${textArray[1]}%` },
-                { [Op.like]: `%${textArray[1]}%` },
+              { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
-                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
+            ],
-              ],
-            },
           };
           break;
         default:
@@ -139,37 +240,122 @@ export default class CronService {
               { [Op.like]: `%${encodeURIComponent(searchText)}%` },
             ],
           };
-          query = {
+          q[Op.or] = [
-            [Op.or]: [
+            {
-              {
+              name: reg,
-                name: reg,
+            },
-              },
+            {
-              {
+              command: reg,
-                command: reg,
+            },
-              },
+            {
-              {
+              schedule: reg,
-                schedule: reg,
+            },
-              },
+            {
-              {
+              labels: reg,
-                labels: reg,
+            },
-              },
+          ];
-            ],
-          };
           break;
       }
+      query[Op.and].push(q);
     }
+  }
+
+  private formatFilterQuery(query: any, filterQuery: any) {
+    if (filterQuery) {
+      if (!query[Op.and]) {
+        query[Op.and] = [];
+      }
+      const filterKeys: any = Object.keys(filterQuery);
+      for (const key of filterKeys) {
+        let q: any = {};
+        if (!filterQuery[key]) continue;
+        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);
+      }
+    }
+  }
+
+  private formatViewSort(order: string[][], viewQuery: any) {
+    if (viewQuery.sorts && viewQuery.sorts.length > 0) {
+      for (const { property, type } of viewQuery.sorts) {
+        order.unshift([property, type]);
+      }
+    }
+  }
+
+  public async find({
+    log_path,
+  }: {
+    log_path: string;
+  }): Promise<Crontab | null> {
     try {
-      const result = await CrontabModel.findAll({
+      const result = await CrontabModel.findOne({ where: { log_path } });
-        where: query,
+      return result;
-        order: [['createdAt', 'DESC']],
-      });
-      return result as any;
     } catch (error) {
       throw error;
     }
   }
 
-  public async getDb(query: any): Promise<Crontab> {
+  public async crontabs(params?: {
+    searchValue: string;
+    page: string;
+    size: string;
+    sorter: string;
+    filters: string;
+    queryString: string;
+  }): Promise<{ data: Crontab[]; total: number }> {
+    const searchText = params?.searchValue;
+    const page = Number(params?.page || '0');
+    const size = Number(params?.size || '0');
+    const viewQuery = JSON.parse(params?.queryString || '{}');
+    const filterQuery = JSON.parse(params?.filters || '{}');
+    const sorterQuery = JSON.parse(params?.sorter || '{}');
+
+    let query: any = {};
+    let order = [
+      ['isPinned', 'DESC'],
+      ['isDisabled', 'ASC'],
+      ['status', 'ASC'],
+      ['createdAt', 'DESC'],
+    ];
+
+    this.formatViewQuery(query, viewQuery);
+    this.formatSearchText(query, searchText);
+    this.formatFilterQuery(query, filterQuery);
+    this.formatViewSort(order, viewQuery);
+
+    if (sorterQuery) {
+      const { field, type } = sorterQuery;
+      if (field && type) {
+        order.unshift([field, type]);
+      }
+    }
+    let condition: any = {
+      where: query,
+      order: order,
+    };
+    if (page && size) {
+      condition.offset = (page - 1) * size;
+      condition.limit = size;
+    }
+    try {
+      const result = await CrontabModel.findAll(condition);
+      const count = await CrontabModel.count({ where: query });
+      return { data: result, total: count };
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  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);
   }
@@ -190,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}`,
-        );
-      }
     }
 
     await CrontabModel.update(
@@ -223,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 });
@@ -276,14 +406,20 @@ 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')) {
+      if (
+        cmdStr.endsWith('.js') ||
+        cmdStr.endsWith('.py') ||
+        cmdStr.endsWith('.pyc') ||
+        cmdStr.endsWith('.sh') ||
+        cmdStr.endsWith('.ts')
+      ) {
         cmdStr = `${cmdStr} now`;
       }
 
-      const cp = spawn(cmdStr, { shell: '/bin/bash' });
+      const cp = spawn(`ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
 
       await CrontabModel.update(
         { status: CrontabStatus.running, pid: cp.pid },
@@ -291,7 +427,7 @@ export default class CronService {
       );
       cp.stderr.on('data', (data) => {
         if (logFileExist) {
-          fs.appendFileSync(`${absolutePath}`, `${data}`);
+          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
         }
       });
       cp.on('error', (err) => {
@@ -302,16 +438,10 @@ export default class CronService {
 
       cp.on('exit', async (code, signal) => {
         this.logger.info(
-          `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
+          `任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`,
         );
-        await CrontabModel.update(
-          { status: CrontabStatus.idle, pid: undefined },
-          { where: { id } },
-        );
-        resolve();
       });
       cp.on('close', async (code) => {
-        this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
         await CrontabModel.update(
           { status: CrontabStatus.idle, pid: undefined },
           { where: { id } },
@@ -323,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) {
@@ -341,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 {
@@ -411,37 +508,21 @@ 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.forEach((tab) => {
+    tabs.data.forEach((tab) => {
       const _schedule = tab.schedule && tab.schedule.split(/ +/);
       if (tab.isDisabled === 1 || _schedule!.length !== 5) {
         crontab_string += '# ';
@@ -461,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: {} });
   }
 
@@ -501,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

@@ -0,0 +1,120 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import { CrontabView, CrontabViewModel } from '../data/cronView';
+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 = initPosition;
+    const views = await this.list();
+    if (views && views.length > 0 && views[views.length - 1].position) {
+      position = views[views.length - 1].position as number;
+    }
+    position = position / 2;
+    const tab = new CrontabView({ ...payload, position });
+    const doc = await this.insert(tab);
+
+    await this.checkPosition(tab.position!);
+    return doc;
+  }
+
+  public async insert(payload: CrontabView): Promise<CrontabView> {
+    return await CrontabViewModel.create(payload, { returning: true });
+  }
+
+  public async update(payload: CrontabView): Promise<CrontabView> {
+    const doc = await this.getDb({ id: payload.id })
+    const tab = new CrontabView({ ...doc, ...payload });
+    const newDoc = await this.updateDb(tab);
+    return newDoc;
+  }
+
+  public async updateDb(payload: CrontabView): Promise<CrontabView> {
+    await CrontabViewModel.update(payload, { where: { id: payload.id } });
+    return await this.getDb({ id: payload.id });
+  }
+
+  public async remove(ids: number[]) {
+    await CrontabViewModel.destroy({ where: { id: ids } });
+  }
+
+  public async list(): Promise<CrontabView[]> {
+    try {
+      const result = await CrontabViewModel.findAll({
+        where: {},
+        order: [['position', 'DESC']],
+      });
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  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);
+  }
+
+  public async disabled(ids: number[]) {
+    await CrontabViewModel.update({ isDisabled: 1 }, { where: { id: ids } });
+  }
+
+  public async enabled(ids: number[]) {
+    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,
+    toIndex,
+  }: {
+    fromIndex: number;
+    toIndex: number;
+    id: number;
+  }): Promise<CrontabView> {
+    let targetPosition: number;
+    const isUpward = fromIndex > toIndex;
+    const views = await this.list();
+    if (toIndex === 0 || toIndex === views.length - 1) {
+      targetPosition = isUpward
+        ? views[0].position! * 2
+        : views[toIndex].position! / 2;
+    } else {
+      targetPosition = isUpward
+        ? (views[toIndex].position! + views[toIndex - 1].position!) / 2
+        : (views[toIndex].position! + views[toIndex + 1].position!) / 2;
+    }
+    const newDoc = await this.update({
+      id,
+      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 } },
     );
 
@@ -125,12 +131,17 @@ export default class DependenceService {
     return docs;
   }
 
-  private async find(query: any, sort?: any): Promise<Dependence[]> {
+  private async find(query: any, sort: any = []): Promise<Dependence[]> {
-    const docs = await DependenceModel.findAll({ where: { ...query } });
+    const docs = await DependenceModel.findAll({
+      where: { ...query },
+      order: [...sort, ['createdAt', 'DESC']],
+    });
     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
-        : (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);
@@ -112,7 +145,10 @@ export default class EnvService {
       };
     }
     try {
-      const result = await this.find(condition, [['position', 'DESC']]);
+      const result = await this.find(condition, [
+        ['position', 'DESC'],
+        ['createdAt', 'ASC'],
+      ]);
       return result as any;
     } catch (error) {
       throw error;
@@ -127,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);
   }
@@ -151,22 +187,20 @@ 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 } },
+    });
-    );
+    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)) {
         const group = groups[key];
 
         // 忽略不符合bash要求的环境变量名称
-        if (/^[a-zA-Z_][0-9a-zA-Z_]+$/.test(key)) {
+        if (/^[a-zA-Z_][0-9a-zA-Z_]*$/.test(key)) {
-          let value = _(group)
+          let value = group
-            .filter((x) => x.status !== EnvStatus.disabled)
+            .map((x) => x.value)
-            .map('value')
             .join('&')
             .replace(/(\\)[^n]/g, '\\\\')
             .replace(/(\\$)/, '\\\\')

back/services/notify.ts

@@ -6,6 +6,7 @@ import got from 'got';
 import nodemailer from 'nodemailer';
 import crypto from 'crypto';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
+import { parseBody, parseHeaders } from '../config/util';
 
 @Service()
 export default class NotificationService {
@@ -17,20 +18,27 @@ export default class NotificationService {
     ['goCqHttpBot', this.goCqHttpBot],
     ['serverChan', this.serverChan],
     ['pushDeer', this.pushDeer],
+    ['chat', this.chat],
     ['bark', this.bark],
     ['telegramBot', this.telegramBot],
     ['dingtalkBot', this.dingtalkBot],
     ['weWorkBot', this.weWorkBot],
     ['weWorkApp', this.weWorkApp],
+    ['aibotk', this.aibotk],
     ['iGot', this.iGot],
     ['pushPlus', this.pushPlus],
     ['email', this.email],
+    ['webhook', this.webhook],
+    ['lark', this.lark],
   ]);
 
-  private timeout = 10000;
   private title = '';
   private content = '';
   private params!: Omit<NotificationInfo, 'type'>;
+  private gotOption = {
+    timeout: 10000,
+    retry: 1,
+  };
 
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
@@ -70,35 +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
-        timeout: this.timeout,
+        .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        retry: 0,
+          ...this.gotOption,
-        body: `title=${encodeURIComponent(
+          body: `title=${encodeURIComponent(
-          this.title,
+            this.title,
-        )}&message=${encodeURIComponent(
+          )}&message=${encodeURIComponent(
-          this.content,
+            this.content,
-        )}&priority=${gotifyPriority}`,
+          )}&priority=${gotifyPriority}`,
-        headers: {
+          headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
+            'Content-Type': 'application/x-www-form-urlencoded',
-        },
+          },
-      })
+        })
-      .json();
+        .json();
-    return typeof res.id === 'number';
+      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
-        timeout: this.timeout,
+        .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        retry: 0,
+          ...this.gotOption,
-        json: { message: `${this.title}\n${this.content}` },
+          json: { message: `${this.title}\n${this.content}` },
-        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+          headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
-      })
+        })
-      .json();
+        .json();
-    return res.retcode === 0;
+      return res.retcode === 0;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async serverChan() {
@@ -106,53 +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
-        timeout: this.timeout,
+        .post(url, {
-        retry: 0,
+          ...this.gotOption,
-        body: `title=${this.title}&desp=${this.content}`,
+          body: `title=${this.title}&desp=${this.content}`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
+        })
-      .json();
+        .json();
-    return res.errno === 0 || res.data.errno === 0;
+      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
-        timeout: this.timeout,
+        .post(url, {
-        retry: 0,
+          ...this.gotOption,
-        body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
+          body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
-          this.title,
+            this.title,
-        )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
+          )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
+        })
-      .json();
+        .json();
-    return (
+      return (
-      res.content.result.length !== undefined && res.content.result.length > 0
+        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}`;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          body: `payload={"text":"${this.title}\n${this.content}"}`,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();
+      return res.success;
+    } 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 {
-        timeout: this.timeout,
+      const res: any = await got
-        retry: 0,
+        .get(url, {
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          ...this.gotOption,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
-    return res.code === 200;
+        .json();
+      return res.code === 200;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async telegramBot() {
@@ -184,16 +225,19 @@ export default class NotificationService {
         https: httpsAgent,
       };
     }
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        timeout: this.timeout,
+        .post(url, {
-        retry: 0,
+          ...this.gotOption,
-        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
+          body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        agent,
+          agent,
-      })
+        })
-      .json();
+        .json();
-    return !!res.ok;
+      return !!res.ok;
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async dingtalkBot() {
@@ -207,37 +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
-        timeout: this.timeout,
+        .post(url, {
-        retry: 0,
+          ...this.gotOption,
-        json: {
+          json: {
-          msgtype: 'text',
+            msgtype: 'text',
-          text: {
+            text: {
-            content: ` ${this.title}\n\n${this.content}`,
+              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
-        timeout: this.timeout,
+        .post(url, {
-        retry: 0,
+          ...this.gotOption,
-        json: {
+          json: {
-          msgtype: 'text',
+            msgtype: 'text',
-          text: {
+            text: {
-            content: ` ${this.title}\n\n${this.content}`,
+              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() {
@@ -245,10 +295,9 @@ export default class NotificationService {
     const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] =
       weWorkAppKey.split(',');
     const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
-    const { access_token } = await got
+    const tokenRes: any = await got
       .post(url, {
-        timeout: this.timeout,
+        ...this.gotOption,
-        retry: 0,
         json: {
           corpid,
           corpsecret,
@@ -294,78 +343,223 @@ 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=${access_token}`,
+        .post(
-        {
+          `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
-          timeout: this.timeout,
+          {
-          retry: 0,
+            ...this.gotOption,
-          json: {
+            json: {
-            touser,
+              touser,
-            agentid,
+              agentid,
-            safe: '0',
+              safe: '0',
-            ...options,
+              ...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() {
+    const { aibotkKey, aibotkType, aibotkName } = this.params;
+    let url = '';
+    let json = {};
+    switch (aibotkType) {
+      case 'room':
+        url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
+        json = {
+          apiKey: `${aibotkKey}`,
+          roomName: `${aibotkName}`,
+          message: {
+            type: 1,
+            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+          },
+        };
+        break;
+      case 'contact':
+        url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
+        json = {
+          apiKey: `${aibotkKey}`,
+          name: `${aibotkName}`,
+          message: {
+            type: 1,
+            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+          },
+        };
+        break;
+    }
+
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          json: {
+            ...json,
+          },
+        })
+        .json();
+
+      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
-        timeout: this.timeout,
+        .post(url, {
-        retry: 0,
+          ...this.gotOption,
-        body: `title=${this.title}&content=${this.content}`,
+          body: `title=${this.title}&content=${this.content}`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          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
-        timeout: this.timeout,
+        .post(url, {
-        retry: 0,
+          ...this.gotOption,
-        json: {
+          json: {
-          token: `${pushPlusToken}`,
+            token: `${pushPlusToken}`,
-          title: `${this.title}`,
+            title: `${this.title}`,
-          content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
+            content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
-          topic: `${pushPlusUser || ''}`,
+            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() {
+    let { larkKey } = this.params;
+
+    if (!larkKey.startsWith('http')) {
+      larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
+    }
+
+    try {
+      const res: any = await got
+        .post(larkKey, {
+          ...this.gotOption,
+          json: {
+            msg_type: 'text',
+            content: { text: `${this.title}\n\n${this.content}` },
+          },
+          headers: { 'Content-Type': 'application/json' },
+        })
+        .json();
+      return res.StatusCode === 0;
+    } 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() {
+    const {
+      webhookUrl,
+      webhookBody,
+      webhookHeaders,
+      webhookMethod,
+      webhookContentType,
+    } = this.params;
+
+    const { formatBody, formatUrl } = this.formatNotifyContent(
+      webhookUrl,
+      webhookBody,
+    );
+    if (!formatUrl && !formatBody) {
+      return false;
+    }
+    const headers = parseHeaders(webhookHeaders);
+    const body = parseBody(formatBody, webhookContentType);
+    const bodyParam = this.formatBody(webhookContentType, body);
+    const options = {
+      method: webhookMethod,
+      headers,
+      ...this.gotOption,
+      allowGetBody: true,
+      ...bodyParam,
+    };
+    try {
+      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 {
+    if (!body) return {};
+    switch (contentType) {
+      case 'application/json':
+        return { json: body };
+      case 'multipart/form-data':
+        return { form: body };
+      case 'application/x-www-form-urlencoded':
+        return { body };
+    }
+    return {};
+  }
+
+  private formatNotifyContent(url: string, body: string) {
+    if (!url.includes('$title') && !body.includes('$title')) {
+      return {};
+    }
+
+    return {
+      formatUrl: url
+        ?.replaceAll('$title', encodeURIComponent(this.title))
+        ?.replaceAll('$content', encodeURIComponent(this.content)),
+      formatBody: body
+        ?.replaceAll('$title', this.title)
+        ?.replaceAll('$content', this.content),
+    };
   }
 }

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,13 +84,12 @@ export default class ScheduleService {
 
         cp.on('exit', async (code, signal) => {
           this.logger.info(
-            `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
+            `[任务退出] ${command} 进程id: ${cp.pid}，退出码 ${code}`,
           );
         });
 
         cp.on('close', async (code) => {
           const endTime = dayjs();
-          this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
           await callbacks.onEnd?.(
             cp,
             endTime,
@@ -101,7 +105,6 @@ export default class ScheduleService {
           error,
         );
         await callbacks.onError?.(JSON.stringify(error));
-        resolve(null);
       }
     });
   }
@@ -135,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(
@@ -151,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(
@@ -177,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,6 +6,8 @@ import SockService from './sock';
 import CronService from './cron';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import config from '../config';
+import { TASK_COMMAND } from '../config/const';
+import { getPid, killTask } from '../config/util';
 
 @Service()
 export default class ScriptService {
@@ -40,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:')} `,
-    });
 
     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,22 +13,24 @@ 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';
 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 {
@@ -62,64 +64,25 @@ export default class SubscriptionService {
     try {
       const result = await SubscriptionModel.findAll({
         where: query,
-        order: [['createdAt', 'DESC']],
+        order: [
+          ['is_disabled', 'ASC'],
+          ['createdAt', 'DESC'],
+        ],
       });
-      return result as any;
+      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);
@@ -142,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(
@@ -154,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) => {
@@ -178,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`,
         );
@@ -208,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 = '';
@@ -229,7 +185,7 @@ export default class SubscriptionService {
           absolutePath,
           `\n## 执行结束... ${endTime.format(
             'YYYY-MM-DD HH:mm:ss',
-          )}  耗时 ${diff} 秒`,
+          )}  耗时 ${diff} 秒${LOG_END_SYMBOL}`,
         );
 
         await SubscriptionModel.update(
@@ -245,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}`);
       },
     };
@@ -260,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;
   }
 
@@ -268,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;
   }
 
@@ -312,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);
   }
@@ -338,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')} `,
+        `\n## 执行结束...  ${dayjs().format(
+          'YYYY-MM-DD HH:mm:ss',
+        )}${LOG_END_SYMBOL}`,
       );
     }
 
@@ -360,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,
@@ -410,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) {
@@ -431,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 {
@@ -70,9 +76,8 @@ export default class SystemService {
     };
     await this.scheduleService.cancelIntervalTask(cron);
     if (frequency > 0) {
-      await this.scheduleService.createIntervalTask(cron, {
+      this.scheduleService.createIntervalTask(cron, {
         days: frequency,
-        runImmediately: true,
       });
     }
     return { code: 200, data: { ...cron } };
@@ -80,32 +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: 6000,
+          `${config.lastVersionFile}?t=${Date.now()}`,
-          retry: 0,
+          {
-        });
+            timeout: 30000,
-        const lastVersionFileContent = result.body;
+          },
-        lastVersion = lastVersionFileContent.match(versionRegx)![1];
+        );
-        lastLog = lastVersionFileContent.match(logRegx)
+        lastVersionContent = await parseContentVersion(result.body);
-          ? lastVersionFileContent.match(logRegx)![1]
-          : '';
       } 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) {
@@ -138,10 +144,6 @@ export default class SystemService {
   public async updateSystem() {
     const cp = spawn('ql -l update', { shell: '/bin/bash' });
 
-    this.sockService.sendMessage({
-      type: 'updateSystemVersion',
-      message: `开始更新系统`,
-    });
     cp.stdout.on('data', (data) => {
       this.sockService.sendMessage({
         type: 'updateSystemVersion',
@@ -174,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';
@@ -65,32 +64,37 @@ export default class UserService {
         return this.initAuthInfo();
       }
 
-      if (retries > 2 && Date.now() - lastlogon < Math.pow(3, retries) * 1000) {
+      const retriesTime = Math.pow(3, retries) * 1000;
+      if (retries > 2 && timestamp - lastlogon < retriesTime) {
+        const waitTime = Math.ceil(
+          (retriesTime - (timestamp - lastlogon)) / 1000,
+        );
         return {
           code: 410,
-          message: `失败次数过多，请${Math.round(
+          message: `失败次数过多，请${waitTime}秒后重试`,
-            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
+          data: waitTime,
-          )}秒后重试`,
+        };
-          data: Math.round(
+      }
-            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
+
-          ),
+      if (
+        username === cUsername &&
+        password === cPassword &&
+        twoFactorActivated &&
+        needTwoFactor
+      ) {
+        this.updateAuthInfo(content, {
+          isTwoFactorChecking: true,
+        });
+        return {
+          code: 420,
+          message: '',
         };
       }
 
       const { ip, address } = await getNetIp(req);
       if (username === cUsername && password === cPassword) {
-        if (twoFactorActivated && needTwoFactor) {
-          this.updateAuthInfo(content, {
-            isTwoFactorChecking: true,
-          });
-          return {
-            code: 420,
-            message: '请输入两步验证token',
-          };
-        }
-
         const data = createRandomString(50, 100);
-        const expiration = twoFactorActivated ? 30 : 3;
+        const expiration = twoFactorActivated ? 60 : 20;
         let token = jwt.sign({ data }, config.secret as any, {
           expiresIn: 60 * 60 * 24 * expiration,
           algorithm: 'HS384',
@@ -155,7 +159,16 @@ export default class UserService {
             status: LoginStatus.fail,
           },
         });
-        return { code: 400, message: config.authError };
+        if (retries > 2) {
+          const waitTime = Math.round(Math.pow(3, retries + 1));
+          return {
+            code: 410,
+            message: `失败次数过多，请${waitTime}秒后重试`,
+            data: waitTime,
+          };
+        } else {
+          return { code: 400, message: config.authError };
+        }
       }
     } else {
       return this.initAuthInfo();

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,60 +1,77 @@
-FROM node: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}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
-ARG QL_BRANCH=master
+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 \
-                             python3 \
-                             jq \
-                             openssh \
-                             py3-pip \
-    && 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

@@ -4,15 +4,18 @@ dir_shell=/ql/shell
 . $dir_shell/share.sh
 link_shell
 
+export isFirstStartServer=true
+
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
-cp -fv $nginx_conf /etc/nginx/nginx.conf
+init_nginx
-cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
+
 pm2 l &>/dev/null
-echo
+pm2 flush &>/dev/null
 
 echo -e "======================2. 安装依赖========================\n"
+patch_version
 update_depend
 echo
 
@@ -25,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/start.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/start.log 2>&1 &
+  nohup ql -l extra >$dir_log/extra.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi
 

docker/front.conf

@@ -1,8 +1,8 @@
-upstream api {
+upstream baseApi {
   server 0.0.0.0:5600;
 }
 
-upstream public {
+upstream publicApi {
   server 0.0.0.0:5400;
 }
 
@@ -13,45 +13,46 @@ map $http_upgrade $connection_upgrade {
 
 server {
   listen 5700;
+  IPV6_CONFIG
   root /ql/static/dist;
   ssl_session_timeout 5m;
 
-  location /api/public {
+  location QL_BASE_URL/api/public/ {
     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://public;
+    proxy_pass http://publicApi/api/;
   }
 
-  location /api {
+  location QL_BASE_URL/api/ {
     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://api;
+    proxy_pass http://baseApi/api/;
 
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
   }
 
-  location /open {
+  location QL_BASE_URL/open/ {
     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://api;
+    proxy_pass http://baseApi/open/;
   }
 
   gzip on;
   gzip_static on;
   gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript;
-  gzip_proxied  any;
+  gzip_proxied any;
   gzip_vary on;
   gzip_comp_level 6;
   gzip_buffers 16 8k;
   gzip_http_version 1.0;
 
-  location / {
+  location QL_BASE_URL/ {
-    index  index.html index.htm;
+    index index.html index.htm;
-    try_files $uri $uri/ /index.html;
+    try_files $uri $uri/ QL_BASE_URL/index.html;
   }
 
   location ~ .*\.(html)$ {

docker/nginx.conf

@@ -5,41 +5,41 @@ error_log /var/log/nginx/error.log warn;
 include /etc/nginx/modules/*.conf;
 
 events {
-	worker_connections 1024;
+  worker_connections 1024;
 }
 
 http {
-	include /etc/nginx/mime.types;
+  include /etc/nginx/mime.types;
-	default_type application/octet-stream;
+  default_type application/octet-stream;
 
-	server_tokens off;
+  server_tokens off;
 
-	client_max_body_size 20m;
+  client_max_body_size 20m;
-	client_body_buffer_size 20m;
+  client_body_buffer_size 20m;
 
-	keepalive_timeout 65;
+  keepalive_timeout 65;
 
-	sendfile on;
+  sendfile on;
 
-	tcp_nodelay on;
+  tcp_nodelay on;
 
-	ssl_prefer_server_ciphers on;
+  ssl_prefer_server_ciphers on;
 
-	ssl_session_cache shared:SSL:2m;
+  ssl_session_cache shared:SSL:2m;
 
-	gzip on;
+  gzip on;
   gzip_static on;
   gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript;
-  gzip_proxied  any;
+  gzip_proxied any;
   gzip_vary on;
   gzip_comp_level 6;
   gzip_buffers 16 8k;
   gzip_http_version 1.0;
 
-	log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+  log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-			'$status $body_bytes_sent "$http_referer" '
+  '$status $body_bytes_sent "$http_referer" '
-			'"$http_user_agent" "$http_x_forwarded_for"';
+  '"$http_user_agent" "$http_x_forwarded_for"';
 
-	access_log /var/log/nginx/access.log main;
+  access_log /var/log/nginx/access.log main;
-	include /etc/nginx/conf.d/*.conf;
+  include /etc/nginx/conf.d/*.conf;
 }

package.json

@@ -2,16 +2,18 @@
   "private": true,
   "scripts": {
     "start": "concurrently -n w: npm:start:*",
-    "start:front": "umi dev",
+    "start:front": "max dev",
     "start:back": "nodemon",
-    "start:public": "ts-node back/public.ts",
+    "start:public": "ts-node --transpile-only ./back/public.ts",
-    "build:front": "umi build",
+    "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": "umi generate tmp 2>/dev/null || true",
+    "postinstall": "max setup 2>/dev/null || true",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage"
   },
@@ -28,16 +30,35 @@
   },
   "pnpm": {
     "peerDependencyRules": {
+      "ignoreMissing": [
+        "react",
+        "react-dom",
+        "antd",
+        "dva",
+        "postcss",
+        "webpack",
+        "eslint",
+        "stylelint",
+        "redux",
+        "@babel/core",
+        "monaco-editor",
+        "rc-field-form",
+        "@types/lodash.merge",
+        "rollup",
+        "styled-components"
+      ],
       "allowedVersions": {
-        "react": "17",
+        "react": "18",
-        "react-dom": "17"
+        "react-dom": "18",
+        "dva-core": "2"
       }
     }
   },
   "dependencies": {
+    "@grpc/grpc-js": "^1.8.13",
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^7.0.0",
+    "@sentry/node": "^7.12.1",
-    "@sentry/tracing": "^7.0.0",
+    "@sentry/tracing": "^7.12.1",
     "body-parser": "^1.19.2",
     "celebrate": "^15.0.1",
     "chokidar": "^3.5.3",
@@ -48,21 +69,24 @@
     "express": "^4.17.3",
     "express-jwt": "^6.1.1",
     "express-urlrewrite": "^1.4.0",
+    "form-data": "^4.0.0",
     "got": "^11.8.2",
     "hpagent": "^0.1.2",
     "iconv-lite": "^0.6.3",
+    "js-yaml": "^4.1.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "multer": "^1.4.4",
     "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
-    "p-queue": "7.2.0",
+    "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",
@@ -71,56 +95,63 @@
   },
   "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.3.1",
+    "@monaco-editor/react": "4.2.1",
-    "@sentry/react": "^7.0.0",
+    "@react-hook/resize-observer": "^1.2.6",
+    "@sentry/react": "^7.12.1",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "@types/express-jwt": "^6.0.4",
+    "@types/js-yaml": "^4.0.5",
     "@types/jsonwebtoken": "^8.5.8",
-    "@types/lodash": "^4.14.179",
+    "@types/lodash": "^4.14.185",
     "@types/multer": "^1.4.7",
     "@types/nedb": "^1.8.12",
     "@types/node": "^17.0.21",
     "@types/node-schedule": "^1.3.2",
     "@types/nodemailer": "^6.4.4",
     "@types/qrcode.react": "^1.0.2",
-    "@types/react": "^17.0.39",
+    "@types/react": "^18.0.20",
-    "@types/react-dom": "^17.0.13",
+    "@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/plugin-antd": "^0.15.0",
+    "@umijs/max": "^4.0.55",
-    "@umijs/plugin-esbuild": "^1.4.1",
     "@umijs/ssr-darkreader": "^4.9.45",
-    "@umijs/test": "^3.5.21",
     "ansi-to-react": "^6.1.6",
-    "antd": "^4.20.5",
+    "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",
     "qrcode.react": "^1.0.1",
+    "query-string": "^7.1.1",
     "rc-tween-one": "^3.0.6",
-    "react": "17.x",
+    "react": "18.2.0",
     "react-codemirror2": "^7.2.1",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-diff-viewer": "^3.1.1",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
-    "react-dom": "17.x",
+    "react-dom": "18.2.0",
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.6.0",
-    "typescript": "^4.6.2",
+    "ts-proto": "^1.146.0",
-    "umi": "^3.5.21",
+    "tslib": "^2.4.0",
+    "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,19 +10,29 @@ DefaultCronRule=""
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
 RepoFileExtensions="js py"
 
-## 代理地址，支持http/https/socks，例如 http://127.0.0.1:7890
+## 代理地址，支持HTTP/SOCK5，例如 http://127.0.0.1:7890
 ProxyUrl=""
 
-## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
+## 资源告警阙值，默认CPU 80%、内存80%、磁盘90%
-CommandTimeoutTime="1h"
+CpuWarn=80
+MemoryWarn=80
+DiskWarn=90
 
-## 设置批量执行任务时的并发数，默认同时执行5个任务
+## 设置定时任务执行的超时时间，例如1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-MaxConcurrentNum="5"
+CommandTimeoutTime=""
 
 ## 在运行 task 命令时，随机延迟启动任务的最大延迟时间
 ## 默认给javascript任务加随机延迟，如 RandomDelay="300" ，表示任务将在 1-300 秒内随机延迟一个秒数，然后再运行，取消延迟赋值为空
 RandomDelay="300"
 
+## 需要随机延迟运行任务的文件后缀，直接写后缀名即可，多个后缀用空格分开，例如: js py ts
+## 默认仅给javascript任务加随机延迟，其它任务按定时规则准点运行。全部任务随机延迟赋值为空
+RandomDelayFileExtensions="js"
+
+## 每小时的第几分钟准点运行任务，当在这些时间运行任务时将忽略 RandomDelay 配置，不会被随机延迟
+## 默认是第0分钟和第30分钟，例如21:00或21:30分的任务将会准点运行。不需要准点运行赋值为空
+RandomDelayIgnoredMinutes="0 30"
+
 ## 如果你自己会写shell脚本，并且希望在每次运行 ql update 命令时，额外运行你的 shell 脚本，请赋值为 "true"，默认为true
 EnableExtraShell="true"
 
@@ -38,9 +42,12 @@ AutoStartBot=""
 ## 是否使用第三方bot，默认不使用，使用时填入仓库地址，存到ql/repo目录下，文件夹命名为diybot
 BotRepoUrl=""
 
-## 安装bot依赖时指定pip源，默认使用清华源，如不需要源，设置此参数为空
+## 安装python依赖时指定pip源
 PipMirror="https://pypi.doubanio.com/simple/"
 
+## 安装node依赖时指定npm源
+NpmMirror="https://registry.npmmirror.com"
+
 ## 通知环境变量
 ## 1. Server酱
 ## https://sct.ftqq.com
@@ -51,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"
@@ -129,4 +136,32 @@ export GOTIFY_PRIORITY=0
 ## deer_key 填写PushDeer的key
 export DEER_KEY=""
 
+## 12. Chat
+## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
+## chat_token 填写后面的token
+export CHAT_URL=""
+export CHAT_TOKEN=""
+
+## 13. aibotk
+## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
+## aibotk_key (必填)填写智能微秘书个人中心的apikey
+export AIBOTK_KEY=""
+## aibotk_type (必填)填写发送的目标 room 或 contact, 填其他的不生效
+export AIBOTK_TYPE=""
+## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
+export AIBOTK_NAME=""
+
+## 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,12 +38,19 @@ let SCKEY = '';
 //此处填你申请的PushDeer KEY.
 //(环境变量名 DEER_KEY)
 let PUSHDEER_KEY = '';
+let PUSHDEER_URL = '';
+
+// =======================================Synology Chat通知设置区域===========================================
+//此处填你申请的CHAT_URL与CHAT_TOKEN
+//(环境变量名 CHAT_URL CHAT_TOKEN)
+let CHAT_URL = '';
+let CHAT_TOKEN = '';
 
 // =======================================Bark App通知设置区域===========================================
 //此处填你BarkAPP的信息(IP/设备码，例如：https://api.day.app/XXXXXXXX)
 let BARK_PUSH = '';
 //BARK app推送图标,自定义推送图标(需iOS15或以上)
-let BARK_ICON = 'http://qn.whyour.cn/logo.png';
+let BARK_ICON = 'https://qn.whyour.cn/logo.png';
 //BARK app推送铃声,铃声列表去APP查看复制填写
 let BARK_SOUND = '';
 //BARK app推送消息的分组, 默认为"QingLong"
@@ -104,6 +111,32 @@ let PUSH_PLUS_USER = '';
 let QQ_SKEY = '';
 let QQ_MODE = '';
 
+// =======================================智能微秘书设置区域=======================================
+//官方文档：http://wechat.aibotk.com/docs/about
+//AIBOTK_KEY： 填写智能微秘书个人中心的apikey
+//AIBOTK_TYPE：填写发送的目标 room 或 contact, 填其他的不生效
+//AIBOTK_NAME: 填写群名或用户昵称，和上面的type类型要对应
+let AIBOTK_KEY = '';
+let AIBOTK_TYPE = '';
+let AIBOTK_NAME = '';
+
+// =======================================飞书机器人设置区域=======================================
+//官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
+//FSKEY 飞书机器人的 FSKEY
+let FSKEY = '';
+
+// =======================================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;
@@ -131,6 +164,15 @@ if (process.env.PUSH_KEY) {
 
 if (process.env.DEER_KEY) {
   PUSHDEER_KEY = process.env.DEER_KEY;
+  PUSHDEER_URL = process.env.DEER_URL;
+}
+
+if (process.env.CHAT_URL) {
+  CHAT_URL = process.env.CHAT_URL;
+}
+
+if (process.env.CHAT_TOKEN) {
+  CHAT_TOKEN = process.env.CHAT_TOKEN;
 }
 
 if (process.env.QQ_SKEY) {
@@ -206,6 +248,36 @@ if (process.env.PUSH_PLUS_TOKEN) {
 if (process.env.PUSH_PLUS_USER) {
   PUSH_PLUS_USER = process.env.PUSH_PLUS_USER;
 }
+
+if (process.env.AIBOTK_KEY) {
+  AIBOTK_KEY = process.env.AIBOTK_KEY;
+}
+if (process.env.AIBOTK_TYPE) {
+  AIBOTK_TYPE = process.env.AIBOTK_TYPE;
+}
+if (process.env.AIBOTK_NAME) {
+  AIBOTK_NAME = process.env.AIBOTK_NAME;
+}
+
+if (process.env.FSKEY) {
+  FSKEY = process.env.FSKEY;
+}
+
+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;
+}
 //==========================云端环境变量的判断与接收=========================
 
 /**
@@ -224,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(推送加)
@@ -239,6 +321,11 @@ async function sendNotify(
     iGotNotify(text, desp, params), //iGot
     gobotNotify(text, desp), //go-cqhttp
     gotifyNotify(text, desp), //gotify
+    ChatNotify(text, desp), //synolog chat
+    PushDeerNotify(text, desp), //PushDeer
+    aibotkNotify(text, desp), //智能微秘书
+    fsBotNotify(text, desp), //飞书机器人
+    smtpNotify(text, desp), //SMTP 邮件
   ]);
 }
 
@@ -279,7 +366,7 @@ function gotifyNotify(text, desp) {
   });
 }
 
-function gobotNotify(text, desp, time = 2100) {
+function gobotNotify(text, desp) {
   return new Promise((resolve) => {
     if (GOBOT_URL) {
       const options = {
@@ -290,38 +377,34 @@ function gobotNotify(text, desp, time = 2100) {
         },
         timeout,
       };
-      setTimeout(() => {
+      $.post(options, (err, resp, data) => {
-        $.post(options, (err, resp, data) => {
+        try {
-          try {
+          if (err) {
-            if (err) {
+            console.log('发送go-cqhttp通知调用API失败！！\n');
-              console.log('发送go-cqhttp通知调用API失败！！\n');
+            console.log(err);
-              console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.retcode === 0) {
+              console.log('go-cqhttp发送通知消息成功🎉\n');
+            } else if (data.retcode === 100) {
+              console.log(`go-cqhttp发送通知消息异常: ${data.errmsg}\n`);
             } else {
-              data = JSON.parse(data);
+              console.log(`go-cqhttp发送通知消息异常\n${JSON.stringify(data)}`);
-              if (data.retcode === 0) {
-                console.log('go-cqhttp发送通知消息成功🎉\n');
-              } else if (data.retcode === 100) {
-                console.log(`go-cqhttp发送通知消息异常: ${data.errmsg}\n`);
-              } else {
-                console.log(
-                  `go-cqhttp发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
             }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
           }
-        });
+        } catch (e) {
-      }, time);
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
     } else {
       resolve();
     }
   });
 }
 
-function serverNotify(text, desp, time = 2100) {
+function serverNotify(text, desp) {
   return new Promise((resolve) => {
     if (SCKEY) {
       //微信server酱推送通知一个\n不会换行，需要两个\n才能换行，故做此替换
@@ -336,152 +419,104 @@ function serverNotify(text, desp, time = 2100) {
         },
         timeout,
       };
-      setTimeout(() => {
+      $.post(options, (err, resp, data) => {
-        $.post(options, (err, resp, data) => {
+        try {
-          try {
+          if (err) {
-            if (err) {
+            console.log('发送通知调用API失败！！\n');
-              console.log('发送通知调用API失败！！\n');
+            console.log(err);
-              console.log(err);
+          } else {
+            data = JSON.parse(data);
+            //server酱和Server酱·Turbo版的返回json格式不太一样
+            if (data.errno === 0 || data.data.errno === 0) {
+              console.log('server酱发送通知消息成功🎉\n');
+            } else if (data.errno === 1024) {
+              // 一分钟内发送相同的内容会触发
+              console.log(`server酱发送通知消息异常: ${data.errmsg}\n`);
             } else {
-              data = JSON.parse(data);
+              console.log(`server酱发送通知消息异常\n${JSON.stringify(data)}`);
-              //server酱和Server酱·Turbo版的返回json格式不太一样
-              if (data.errno === 0 || data.data.errno === 0) {
-                console.log('server酱发送通知消息成功🎉\n');
-              } else if (data.errno === 1024) {
-                // 一分钟内发送相同的内容会触发
-                console.log(`server酱发送通知消息异常: ${data.errmsg}\n`);
-              } else {
-                console.log(
-                  `server酱发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
             }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
           }
-        });
+        } catch (e) {
-      }, time);
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
     } else {
       resolve();
     }
   });
 }
 
-function PushDeerNotify(text, desp, time = 2100) {
+function PushDeerNotify(text, desp) {
   return new Promise((resolve) => {
     if (PUSHDEER_KEY) {
       // PushDeer 建议对消息内容进行 urlencode
       desp = encodeURI(desp);
       const options = {
-        url: `https://api2.pushdeer.com/message/push`,
+        url: PUSHDEER_URL || `https://api2.pushdeer.com/message/push`,
         body: `pushkey=${PUSHDEER_KEY}&text=${text}&desp=${desp}&type=markdown`,
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
         },
         timeout,
       };
-      setTimeout(() => {
+      $.post(options, (err, resp, data) => {
-        $.post(options, (err, resp, data) => {
+        try {
-          try {
+          if (err) {
-            if (err) {
+            console.log('发送通知调用API失败！！\n');
-              console.log('发送通知调用API失败！！\n');
+            console.log(err);
-              console.log(err);
+          } else {
+            data = JSON.parse(data);
+            // 通过返回的result的长度来判断是否成功
+            if (
+              data.content.result.length !== undefined &&
+              data.content.result.length > 0
+            ) {
+              console.log('PushDeer发送通知消息成功🎉\n');
             } else {
-              data = JSON.parse(data);
+              console.log(`PushDeer发送通知消息异常\n${JSON.stringify(data)}`);
-              // 通过返回的result的长度来判断是否成功
-              if (
-                data.content.result.length !== undefined &&
-                data.content.result.length > 0
-              ) {
-                console.log('PushDeer发送通知消息成功🎉\n');
-              } else {
-                console.log(
-                  `PushDeer发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
             }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
           }
-        });
+        } catch (e) {
-      }, time);
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
     } else {
       resolve();
     }
   });
 }
 
-function CoolPush(text, desp) {
+function ChatNotify(text, desp) {
   return new Promise((resolve) => {
-    if (QQ_SKEY) {
+    if (CHAT_URL && CHAT_TOKEN) {
-      let options = {
+      // 对消息内容进行 urlencode
-        url: `https://push.xuthus.cc/${QQ_MODE}/${QQ_SKEY}`,
+      desp = encodeURI(desp);
+      const options = {
+        url: `${CHAT_URL}${CHAT_TOKEN}`,
+        body: `payload={"text":"${text}\n${desp}"}`,
         headers: {
-          'Content-Type': 'application/json',
+          'Content-Type': 'application/x-www-form-urlencoded',
         },
       };
-
-      // 已知敏感词
-      text = text.replace(/京豆/g, '豆豆');
-      desp = desp.replace(/京豆/g, '');
-      desp = desp.replace(/🐶/g, '');
-      desp = desp.replace(/红包/g, 'H包');
-
-      switch (QQ_MODE) {
-        case 'email':
-          options.json = {
-            t: text,
-            c: desp,
-          };
-          break;
-        default:
-          options.body = `${text}\n\n${desp}`;
-      }
-
-      let pushMode = function (t) {
-        switch (t) {
-          case 'send':
-            return '个人';
-          case 'group':
-            return 'QQ群';
-          case 'wx':
-            return '微信';
-          case 'ww':
-            return '企业微信';
-          case 'email':
-            return '邮件';
-          default:
-            return '未知方式';
-        }
-      };
-
       $.post(options, (err, resp, data) => {
         try {
           if (err) {
-            console.log(`发送${pushMode(QQ_MODE)}通知调用API失败！！\n`);
+            console.log('发送通知调用API失败！！\n');
             console.log(err);
           } else {
             data = JSON.parse(data);
-            if (data.code === 200) {
+            if (data.success) {
-              console.log(`酷推发送${pushMode(QQ_MODE)}通知消息成功🎉\n`);
+              console.log('Chat发送通知消息成功🎉\n');
-            } else if (data.code === 400) {
-              console.log(
-                `QQ酷推(Cool Push)发送${pushMode(QQ_MODE)}推送失败：${
-                  data.msg
-                }\n`,
-              );
-            } else if (data.code === 503) {
-              console.log(`QQ酷推出错，${data.message}：${data.data}\n`);
             } else {
-              console.log(`酷推推送异常: ${JSON.stringify(data)}`);
+              console.log(`Chat发送通知消息异常\n${JSON.stringify(data)}`);
             }
           }
         } catch (e) {
-          $.logErr(e, resp);
+          $.logErr(e);
         } finally {
           resolve(data);
         }
@@ -498,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: {
@@ -594,7 +629,7 @@ function ddBotNotify(text, desp) {
       json: {
         msgtype: 'text',
         text: {
-          content: ` ${text}\n\n${desp}`,
+          content: `${text}\n\n${desp}`,
         },
       },
       headers: {
@@ -661,7 +696,7 @@ function qywxBotNotify(text, desp) {
       json: {
         msgtype: 'text',
         text: {
-          content: ` ${text}\n\n${desp}`,
+          content: `${text}\n\n${desp}`,
         },
       },
       headers: {
@@ -928,6 +963,150 @@ function pushPlusNotify(text, desp) {
   });
 }
 
+function aibotkNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (AIBOTK_KEY && AIBOTK_TYPE && AIBOTK_NAME) {
+      let json = {};
+      let url = '';
+      switch (AIBOTK_TYPE) {
+        case 'room':
+          url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
+          json = {
+            apiKey: `${AIBOTK_KEY}`,
+            roomName: `${AIBOTK_NAME}`,
+            message: {
+              type: 1,
+              content: `【青龙快讯】\n\n${text}\n${desp}`,
+            },
+          };
+          break;
+        case 'contact':
+          url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
+          json = {
+            apiKey: `${AIBOTK_KEY}`,
+            name: `${AIBOTK_NAME}`,
+            message: {
+              type: 1,
+              content: `【青龙快讯】\n\n${text}\n${desp}`,
+            },
+          };
+          break;
+      }
+      const options = {
+        url: url,
+        json,
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        timeout,
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('智能微秘书发送通知消息失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.code === 0) {
+              console.log('智能微秘书发送通知消息成功🎉。\n');
+            } else {
+              console.log(`${data.error}\n`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
+function fsBotNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (FSKEY) {
+      const options = {
+        url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
+        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        timeout,
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.StatusCode === 0) {
+              console.log('飞书发送通知消息成功🎉\n');
+            } else {
+              console.log(`${data.msg}\n`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
+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,6 +65,10 @@ push_config = {
     'PUSH_KEY': '',                     # server 酱的 PUSH_KEY，兼容旧版与 Turbo 版
 
     'DEER_KEY': '',                     # PushDeer 的 PUSHDEER_KEY
+    'DEER_URL': '',                     # PushDeer 的 PUSHDEER_URL
+
+    'CHAT_URL': '',                     # synology chat url
+    'CHAT_TOKEN': '',                   # synology chat token
 
     'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
     'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
@@ -78,6 +86,16 @@ push_config = {
     'TG_PROXY_AUTH': '',                # tg 代理认证参数
     'TG_PROXY_HOST': '',                # tg 机器人的 TG_PROXY_HOST
     'TG_PROXY_PORT': '',                # tg 机器人的 TG_PROXY_PORT
+
+    'AIBOTK_KEY': '',                   # 智能微秘书 个人中心的apikey 文档地址：http://wechat.aibotk.com/docs/about
+    'AIBOTK_TYPE': '',                  # 智能微秘书 发送目标 room 或 contact
+    'AIBOTK_NAME': '',                  # 智能微秘书  发送群名 或者好友昵称和type要对应好
+
+    '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
@@ -146,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
@@ -202,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 推送消息。
     """
@@ -212,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 推送成功！")
@@ -251,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:
@@ -271,8 +291,12 @@ 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:
@@ -281,6 +305,24 @@ def pushdeer(title: str, content: str) -> None:
         print("PushDeer 推送失败！错误信息：", response)
 
 
+def chat(title: str, content: str) -> None:
+    """
+    通过Chat 推送消息
+    """
+    if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
+        print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
+        return
+    print("chat 服务启动")
+    data = 'payload=' + json.dumps({'text': title + '\n' + content})
+    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
+    response = requests.post(url, data=data)
+
+    if response.status_code == 200:
+        print("Chat 推送成功！")
+    else:
+        print("Chat 推送失败！错误信息：", response)
+
+
 def pushplus_bot(title: str, content: str) -> None:
     """
     通过 push+ 推送消息。
@@ -308,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) 推送成功！")
@@ -327,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:
@@ -499,6 +543,68 @@ def telegram_bot(title: str, content: str) -> None:
         print("tg 推送失败！")
 
 
+def aibotk(title: str, content: str) -> None:
+    """
+    使用 智能微秘书 推送消息。
+    """
+    if not push_config.get("AIBOTK_KEY") or not push_config.get("AIBOTK_TYPE") or not push_config.get("AIBOTK_NAME"):
+        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
+        return
+    print("智能微秘书 服务启动")
+
+    if push_config.get("AIBOTK_TYPE") == 'room':
+        url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
+        data = {
+            "apiKey": push_config.get("AIBOTK_KEY"),
+            "roomName": push_config.get("AIBOTK_NAME"),
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n{title}\n{content}'}
+        }
+    else:
+        url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
+        data = {
+            "apiKey": push_config.get("AIBOTK_KEY"),
+            "name": push_config.get("AIBOTK_NAME"),
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n{title}\n{content}'}
+        }
+    body = json.dumps(data).encode(encoding="utf-8")
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, data=body, headers=headers).json()
+    print(response)
+    if response["code"] == 0:
+        print("智能微秘书 推送成功！")
+    else:
+        print(f'智能微秘书 推送失败！{response["error"]}')
+
+
+def 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:
     """
     获取一条一言。
@@ -527,6 +633,8 @@ if push_config.get("PUSH_KEY"):
     notify_function.append(serverJ)
 if push_config.get("DEER_KEY"):
     notify_function.append(pushdeer)
+if push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"):
+    notify_function.append(chat)
 if push_config.get("PUSH_PLUS_TOKEN"):
     notify_function.append(pushplus_bot)
 if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"):
@@ -537,6 +645,10 @@ if push_config.get("QYWX_KEY"):
     notify_function.append(wecom_bot)
 if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
     notify_function.append(telegram_bot)
+if push_config.get("AIBOTK_KEY") and push_config.get("AIBOTK_TYPE") and push_config.get("AIBOTK_NAME"):
+    notify_function.append(aibotk)
+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:
@@ -544,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,12 +3,8 @@
   "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,187 +1,234 @@
 #!/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() {
+  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() {
-    local currentTimeStamp=$(date +%s)
+  local currentTimeStamp=$(date +%s)
-    if [[ $# -eq 1 ]]; then
+  if [[ $# -eq 1 ]]; then
-        local schedule=$(echo "$1" | awk -F ":" '{print $1}')
+    local schedule=$(echo "$1" | awk -F ":" '{print $1}')
-        local command=$(echo "$1" | awk -F ":" '{print $2}')
+    local command=$(echo "$1" | awk -F ":" '{print $2}')
-        local name=$(echo "$1" | awk -F ":" '{print $3}')
+    local name=$(echo "$1" | awk -F ":" '{print $3}')
-    else
+    local sub_id=$(echo "$1" | awk -F ":" '{print $4}')
-        local schedule=$1
+  else
-        local command=$2
+    local schedule=$1
-        local name=$3
+    local command=$2
-    fi
+    local name=$3
+    local sub_id=$4
+  fi
 
-    local api=$(
+  if [[ ! $sub_id ]];then
-        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    sub_id="null"
-            -H "Accept: application/json" \
+  fi
-            -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" \
+  local api=$(
-            -H "Content-Type: application/json;charset=UTF-8" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
-            -H "Origin: http://0.0.0.0:5700" \
+      -H "Accept: application/json" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Authorization: Bearer $token" \
-            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      -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" \
-            --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\"}" \
+      -H "Content-Type: application/json;charset=UTF-8" \
-            --compressed
+      -H "Origin: http://0.0.0.0:5700" \
-    )
+      -H "Referer: http://0.0.0.0:5700/crontab" \
-    code=$(echo $api | jq -r .code)
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-    message=$(echo $api | jq -r .message)
+      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
-    if [[ $code == 200 ]]; then
+      --compressed
-        echo -e "$name -> 添加成功"
+  )
-    else
+  code=$(echo "$api" | jq -r .code)
-        echo -e "$name -> 添加失败(${message})"
+  message=$(echo "$api" | jq -r .message)
-    fi
+  if [[ $code == 200 ]]; then
+    echo -e "$name -> 添加成功"
+  else
+    echo -e "$name -> 添加失败(${message})"
+  fi
 }
 
 update_cron_api() {
-    local currentTimeStamp=$(date +%s)
+  local currentTimeStamp=$(date +%s)
-    if [[ $# -eq 1 ]]; then
+  if [[ $# -eq 1 ]]; then
-        local schedule=$(echo "$1" | awk -F ":" '{print $1}')
+    local schedule=$(echo "$1" | awk -F ":" '{print $1}')
-        local command=$(echo "$1" | awk -F ":" '{print $2}')
+    local command=$(echo "$1" | awk -F ":" '{print $2}')
-        local name=$(echo "$1" | awk -F ":" '{print $3}')
+    local name=$(echo "$1" | awk -F ":" '{print $3}')
-        local id=$(echo "$1" | awk -F ":" '{print $4}')
+    local id=$(echo "$1" | awk -F ":" '{print $4}')
-    else
+  else
-        local schedule=$1
+    local schedule=$1
-        local command=$2
+    local command=$2
-        local name=$3
+    local name=$3
-        local id=$4
+    local id=$4
-    fi
+  fi
 
-    local api=$(
+  local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
-            -X 'PUT' \
+      -X 'PUT' \
-            -H "Accept: application/json" \
+      -H "Accept: application/json" \
-            -H "Authorization: Bearer $token" \
+      -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 "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 "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
+      -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
+      -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" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
+      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
-            --compressed
+      --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
+  if [[ $code == 200 ]]; then
-        echo -e "$name -> 更新成功"
+    echo -e "$name -> 更新成功"
-    else
+  else
-        echo -e "$name -> 更新失败(${message})"
+    echo -e "$name -> 更新失败(${message})"
-    fi
+  fi
 }
 
 update_cron_command_api() {
-    local currentTimeStamp=$(date +%s)
+  local currentTimeStamp=$(date +%s)
-    if [[ $# -eq 1 ]]; then
+  if [[ $# -eq 1 ]]; then
-        local command=$(echo "$1" | awk -F ":" '{print $1}')
+    local command=$(echo "$1" | awk -F ":" '{print $1}')
-        local id=$(echo "$1" | awk -F ":" '{print $2}')
+    local id=$(echo "$1" | awk -F ":" '{print $2}')
-    else
+  else
-        local command=$1
+    local command=$1
-        local id=$2
+    local id=$2
-    fi
+  fi
 
-    local api=$(
+  local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
-            -X 'PUT' \
+      -X 'PUT' \
-            -H "Accept: application/json" \
+      -H "Accept: application/json" \
-            -H "Authorization: Bearer $token" \
+      -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 "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 "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
+      -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
+      -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" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
+      --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
-            --compressed
+      --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
+  if [[ $code == 200 ]]; then
-        echo -e "$command -> 更新成功"
+    echo -e "$command -> 更新成功"
-    else
+  else
-        echo -e "$command -> 更新失败(${message})"
+    echo -e "$command -> 更新失败(${message})"
-    fi
+  fi
 }
 
 del_cron_api() {
-    local ids=$1
+  local ids=$1
-    local currentTimeStamp=$(date +%s)
+  local currentTimeStamp=$(date +%s)
-    local api=$(
+  local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
-            -X 'DELETE' \
+      -X 'DELETE' \
-            -H "Accept: application/json" \
+      -H "Accept: application/json" \
-            -H "Authorization: Bearer $token" \
+      -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 "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 "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
+      -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
+      -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" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "[$ids]" \
+      --data-raw "[$ids]" \
-            --compressed
+      --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
+  if [[ $code == 200 ]]; then
-        echo -e "成功"
+    echo -e "成功"
-    else
+  else
-        echo -e "失败(${message})"
+    echo -e "失败(${message})"
-    fi
+  fi
 }
 
 update_cron() {
-    local ids="$1"
+  local ids="$1"
-    local status="$2"
+  local status="$2"
-    local pid="${3:-''}"
+  local pid="${3:-''}"
-    local logPath="$4"
+  local logPath="$4"
-    local lastExecutingTime="${5:-0}"
+  local lastExecutingTime="${5:-0}"
-    local runningTime="${6:-0}"
+  local runningTime="${6:-0}"
-    local currentTimeStamp=$(date +%s)
+  local currentTimeStamp=$(date +%s)
-    local api=$(
+  local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
-            -X 'PUT' \
+      -X 'PUT' \
-            -H "Accept: application/json" \
+      -H "Accept: application/json" \
-            -H "Authorization: Bearer $token" \
+      -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 "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 "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
+      -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
+      -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" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
+      --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
-            --compressed
+      --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
+  if [[ $code != 200 ]]; then
-        echo -e "\n## 更新任务状态失败(${message})\n" >> $dir_log/$log_path
+    echo -e "\n## 更新任务状态失败(${message})\n"
-    fi
+  fi
 }
 
 notify_api() {
-    local title=$1
+  local title=$1
-    local content=$2
+  local content=$2
-    local currentTimeStamp=$(date +%s)
+  local currentTimeStamp=$(date +%s)
-    local api=$(
+  local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
-            -X 'PUT' \
+      -X 'PUT' \
-            -H "Accept: application/json" \
+      -H "Accept: application/json" \
-            -H "Authorization: Bearer $token" \
+      -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 "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 "Content-Type: application/json;charset=UTF-8" \
-            -H "Origin: http://0.0.0.0:5700" \
+      -H "Origin: http://0.0.0.0:5700" \
-            -H "Referer: http://0.0.0.0:5700/crontab" \
+      -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" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
+      --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
-            --compressed
+      --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
+  if [[ $code == 200 ]]; then
-        echo -e "通知发送成功"
+    echo -e "通知发送成功"
-    else
+  else
-        echo -e "通知失败(${message})"
+    echo -e "通知失败(${message})"
-    fi
+  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"
@@ -35,11 +31,10 @@ fi
 cp -f "$repo_path/jbot/requirements.txt" "$dir_data"
 
 cd $dir_data
-cat requirements.txt | while read LREAD
+cat requirements.txt | while read LREAD; do
-do
+  if [[ ! $(pip3 show "${LREAD%%=*}" 2>/dev/null) ]]; then
-if [[ ! $(pip3 show "${LREAD%%=*}" 2>/dev/null) ]]; then
+    pip3 --default-timeout=100 install ${LREAD}
-  pip3 --default-timeout=100 install ${LREAD}
+  fi
-fi
 done
 
 echo -e "\npython3依赖安装成功...\n"
@@ -47,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,8 +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
   echo -e "---> 配置文件复制完成\n"
 }
 
@@ -38,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"
@@ -59,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
 }
 
@@ -69,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' \
@@ -80,16 +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 add -g pm2
+  patch_version
+  pnpm add -g pm2 tsx
+  reset_env
+  start_public
   copy_dep
   check_ql
   check_nginx

shell/otask.sh

@@ -0,0 +1,238 @@
+#!/usr/bin/env bash
+
+random_delay() {
+  local random_delay_max=$RandomDelay
+  if [[ $random_delay_max ]] && [[ $random_delay_max -gt 0 ]]; then
+    local file_param=$1
+    local file_extensions=${RandomDelayFileExtensions-"js"}
+    local ignored_minutes=${RandomDelayIgnoredMinutes-"0 30"}
+
+    if [[ -n $file_extensions ]]; then
+      if ! echo "$file_param" | grep -qE "\.${file_extensions// /$|\\.}$"; then
+        # echo -e "\n当前文件需要准点运行, 放弃随机延迟\n"
+        return
+      fi
+    fi
+
+    local current_min
+    current_min=$(date "+%-M")
+    for minute in $ignored_minutes; do
+      if [[ $current_min -eq $minute ]]; then
+        # echo -e "\n当前时间需要准点运行, 放弃随机延迟\n"
+        return
+      fi
+    done
+
+    local delay_second=$(($(gen_random_num "$random_delay_max") + 1))
+    echo -e "任务随机延迟 $delay_second 秒，配置文件参数 RandomDelay 置空可取消延迟 \n"
+    sleep $delay_second
+  fi
+}
+
+## scripts目录下所有可运行脚本数组
+gen_array_scripts() {
+  local dir_current=$(pwd)
+  local i="-1"
+  cd $dir_scripts
+  for file in $(ls); do
+    if [[ -f $file ]] && [[ $file == *.js && $file != sendNotify.js ]]; then
+      let i++
+      array_scripts[i]=$(echo "$file" | perl -pe "s|$dir_scripts/||g")
+      array_scripts_name[i]=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1)
+      [[ -z ${array_scripts_name[i]} ]] && array_scripts_name[i]="<未识别出活动名称>"
+    fi
+  done
+  cd $dir_current
+}
+
+## 使用说明
+usage() {
+  gen_array_scripts
+  echo -e "task命令运行本程序自动添加进crontab的脚本，需要输入脚本的绝对路径或去掉 “$dir_scripts/” 目录后的相对路径（定时任务中请写作相对路径），用法为："
+  echo -e "1.$cmd_task <file_name>                                             # 依次执行，如果设置了随机延迟，将随机延迟一定秒数"
+  echo -e "2.$cmd_task <file_name> now                                         # 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日志，同时记录在日志文件中"
+  echo -e "3.$cmd_task <file_name> conc <环境变量名称> <账号编号，空格分隔>(可选的)  # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日志，直接记录在日志文件中，且可指定账号执行"
+  echo -e "4.$cmd_task <file_name> desi <环境变量名称> <账号编号，空格分隔>         # 指定账号执行，无论是否设置了随机延迟，均立即运行"
+  if [[ ${#array_scripts[*]} -gt 0 ]]; then
+    echo -e "\n当前有以下脚本可以运行:"
+    for ((i = 0; i < ${#array_scripts[*]}; i++)); do
+      echo -e "$(($i + 1)). ${array_scripts_name[i]}：${array_scripts[i]}"
+    done
+  else
+    echo -e "\n暂无脚本可以执行"
+  fi
+}
+
+## run nohup，$1：文件名，不含路径，带后缀
+run_nohup() {
+  local file_name=$1
+  nohup node $file_name &>$log_path &
+}
+
+check_server() {
+  if [[ $cpu_warn ]] && [[ $mem_warn ]] && [[ $disk_warn ]]; then
+    local top_result=$(top -b -n 1)
+    cpu_use=$(echo "$top_result" | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
+
+    mem_free=$(free -m | grep "Mem" | awk '{print $3}' | head -n 1)
+    mem_total=$(free -m | grep "Mem" | awk '{print $2}' | head -n 1)
+    mem_use=$(printf "%d%%" $((mem_free * 100 / mem_total)) | cut -f 1 -d "%" | head -n 1)
+
+    disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%" | head -n 1)
+    if [[ $cpu_use -gt $cpu_warn ]] && [[ $cpu_warn ]] || [[ $mem_free -lt $mem_warn ]] || [[ $disk_use -gt $disk_warn ]]; then
+      local resource=$(echo "$top_result" | grep -v -E 'grep|Mem|idle|Load|tr' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10 | tr '\n' '|' | sed s/\|/\\\\n/g)
+      notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource"
+    fi
+  fi
+}
+
+## 正常运行单个脚本，$1：传入参数
+run_normal() {
+  local file_param=$1
+  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]]; then
+    random_delay "$file_param"
+  fi
+
+  cd $dir_scripts
+  local relative_path="${file_param%/*}"
+  if [[ ${file_param} != /* ]] && [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+    cd ${relative_path}
+    file_param=${file_param/$relative_path\//}
+  fi
+
+  $timeoutCmd $which_program $file_param
+}
+
+## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
+run_concurrent() {
+  local file_param="$1"
+  local env_param="$2"
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
+  if [[ ! $env_param ]]; then
+    echo -e "\n 缺少并发运行的环境变量参数"
+    exit 1
+  fi
+
+  local envs=$(eval echo "\$${env_param}")
+  local array=($(echo $envs | sed 's/&/ /g'))
+  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local runArr=($(eval echo $tempArr))
+  runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
+
+  local n=0
+  for i in ${runArr[@]}; do
+    array_run[n]=${array[$i - 1]}
+    let n++
+  done
+
+  local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
+  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+
+  local envs=$(eval echo "\$${env_param}")
+  local array=($(echo $envs | sed 's/&/ /g'))
+  single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%3N")
+
+  cd $dir_scripts
+  local relative_path="${file_param%/*}"
+  if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+    cd ${relative_path}
+    file_param=${file_param/$relative_path\//}
+  fi
+  for i in "${!array[@]}"; do
+    export ${env_param}=${array[i]}
+    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
+    eval $timeoutCmd $which_program $file_param &>$single_log_path &
+  done
+
+  wait
+  for i in "${!array[@]}"; do
+    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
+    cat $single_log_path
+    [[ -f $single_log_path ]] && rm -f $single_log_path
+  done
+}
+
+run_designated() {
+  local file_param="$1"
+  local env_param="$2"
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
+  if [[ ! $env_param ]] || [[ ! $num_param ]]; then
+    echo -e "\n 缺少单独运行的参数 task xxx.js desi Test 1 3"
+    exit 1
+  fi
+
+  local envs=$(eval echo "\$${env_param}")
+  local array=($(echo $envs | sed 's/&/ /g'))
+  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local runArr=($(eval echo $tempArr))
+  runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
+
+  local n=0
+  for i in ${runArr[@]}; do
+    array_run[n]=${array[$i - 1]}
+    let n++
+  done
+
+  local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
+  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+
+  cd $dir_scripts
+  local relative_path="${file_param%/*}"
+  if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+    cd ${relative_path}
+    file_param=${file_param/$relative_path\//}
+  fi
+  $timeoutCmd $which_program $file_param
+}
+
+## 运行其他命令
+run_else() {
+  local file_param="$1"
+
+  cd $dir_scripts
+  local relative_path="${file_param%/*}"
+  if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+    cd ${relative_path}
+    file_param=${file_param/$relative_path\//}
+  fi
+
+  shift
+
+  $timeoutCmd $which_program $file_param "$@"
+}
+
+## 命令检测
+main() {
+  if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
+    case $# in
+    1)
+      run_normal "$1"
+      ;;
+    *)
+      case $2 in
+      now)
+        run_normal "$1" "$2"
+        ;;
+      conc)
+        run_concurrent "$1" "$3" "$*"
+        ;;
+      desi)
+        run_designated "$1" "$3" "$*"
+        ;;
+      *)
+        run_else "$@"
+        ;;
+      esac
+      ;;
+    esac
+  elif [[ $# -eq 0 ]]; then
+    echo
+    usage
+  else
+    run_else "$@"
+  fi
+}
+
+handle_task_before "$@"
+main "$@"
+handle_task_after "$@"

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,42 +1,48 @@
 #!/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 log_full_path_list=$(find $dir_log/ -name "*.log")
-    local diff_time
+  local diff_time
-    for log in $log_full_path_list; do
+  for log in $log_full_path_list; do
-        local log_date=$(echo $log | awk -F "/" '{print $NF}' | cut -c1-10) #文件名比文件属性获得的日期要可靠
+    local log_date=$(echo $log | awk -F "/" '{print $NF}' | cut -c1-10) #文件名比文件属性获得的日期要可靠
-        if [[ $(date +%s -d $log_date 2>/dev/null) ]]; then
+    if [[ $(date +%s -d $log_date 2>/dev/null) ]]; then
-            if [[ $is_macos -eq 1 ]]; then
+      if [[ $is_macos -eq 1 ]]; then
-                diff_time=$(($(date +%s) - $(date -j -f "%Y-%m-%d" "$log_date" +%s)))
+        diff_time=$(($(date +%s) - $(date -j -f "%Y-%m-%d" "$log_date" +%s)))
-            else
+      else
-                diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
+        diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
-            fi
+      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
-    done
+      fi
+    fi
+  done
 }
 
 ## 删除空文件夹
 remove_empty_dir() {
-    cd $dir_log
+  cd $dir_log
-    for dir in $(ls); do
+  for dir in $(ls); do
-        if [[ -d $dir ]] && [[ -z $(ls $dir) ]]; then
+    if [[ -d $dir ]] && [[ -z $(ls $dir) ]]; then
-            rm -rf $dir
+      rm -rf $dir
-        fi
+    fi
-    done
+  done
 }
 
 ## 运行
 if [[ ${days} ]]; then
-    echo -e "查找旧日志文件中...\n"
+  echo -e "查找旧日志文件中...\n"
-    remove_js_log
+  remove_js_log
-    remove_empty_dir
+  remove_empty_dir
-    echo -e "删除旧日志执行完毕\n"
+  echo -e "删除旧日志执行完毕\n"
 fi

shell/share.sh

@@ -50,378 +50,486 @@ list_own_drop=$dir_list_tmp/own_drop.list
 
 ## 软连接及其原始文件对应关系
 link_name=(
-    task
+  task
-    ql
+  ql
 )
 original_name=(
-    task.sh
+  task.sh
-    update.sh
+  update.sh
 )
 
 init_env() {
-    export NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules
+  export NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules
-    export PYTHONUNBUFFERED=1
+  export PYTHONUNBUFFERED=1
 }
 
 import_config() {
-    [[ -f $file_config_user ]] && . $file_config_user
+  [[ -f $file_config_user ]] && . $file_config_user
-    [[ -f $file_env ]] && . $file_env
+  [[ -f $file_env ]] && . $file_env
 
-    command_timeout_time=${CommandTimeoutTime:-"1h"}
+  ql_base_url=${QlBaseUrl:-""}
-    proxy_url=${ProxyUrl:-""}
+  command_timeout_time=${CommandTimeoutTime:-""}
-    file_extensions=${RepoFileExtensions:-"js py"}
+  proxy_url=${ProxyUrl:-""}
-    current_branch=${QL_BRANCH}
+  file_extensions=${RepoFileExtensions:-"js py"}
+  current_branch=${QL_BRANCH}
 
-    if [[ -n "${DefaultCronRule}" ]]; then
+  if [[ -n "${DefaultCronRule}" ]]; then
-        default_cron="${DefaultCronRule}"
+    default_cron="${DefaultCronRule}"
-    else
+  else
-        default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
+    default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
-    fi
+  fi
+
+  cpu_warn=${CpuWarn}
+  mem_warn=${MemoryWarn}
+  disk_warn=${DiskWarn}
 }
 
 set_proxy() {
-    if [[ $proxy_url ]]; then
+  local proxy="$1"
-        export http_proxy="${proxy_url}"
+  if [[ $proxy ]]; then
-        export https_proxy="${proxy_url}"
+    proxy_url="$proxy"
-    fi
+  fi
+  if [[ $proxy_url ]]; then
+    export http_proxy="${proxy_url}"
+    export https_proxy="${proxy_url}"
+  fi
 }
 
 unset_proxy() {
-    unset http_proxy
+  unset http_proxy
-    unset https_proxy
+  unset https_proxy
 }
 
 make_dir() {
-    local dir=$1
+  local dir=$1
-    if [[ ! -d $dir ]]; then
+  if [[ ! -d $dir ]]; then
-        mkdir -p $dir
+    mkdir -p $dir
-    fi
+  fi
 }
 
 detect_termux() {
-    if [[ $PATH == *com.termux* ]]; then
+  if [[ $PATH == *com.termux* ]]; then
-        is_termux=1
+    is_termux=1
-    else
+  else
-        is_termux=0
+    is_termux=0
-    fi
+  fi
 }
 
 detect_macos() {
-    [[ $(uname -s) == Darwin ]] && is_macos=1 || is_macos=0
+  [[ $(uname -s) == Darwin ]] && is_macos=1 || is_macos=0
 }
 
 gen_random_num() {
-    local divi=$1
+  local divi=$1
-    echo $((${RANDOM} % $divi))
+  echo $((${RANDOM} % $divi))
 }
 
 link_shell_sub() {
-    local link_path="$1"
+  local link_path="$1"
-    local original_path="$2"
+  local original_path="$2"
-    if [[ ! -L $link_path ]] || [[ $(readlink -f $link_path) != $original_path ]]; then
+  if [[ ! -L $link_path ]] || [[ $(readlink -f $link_path) != $original_path ]]; then
-        rm -f $link_path 2>/dev/null
+    rm -f $link_path 2>/dev/null
-        ln -sf $original_path $link_path
+    ln -sf $original_path $link_path
-    fi
+  fi
 }
 
 link_shell() {
-    if [[ $is_termux -eq 1 ]]; then
+  if [[ $is_termux -eq 1 ]]; then
-        local path="/data/data/com.termux/files/usr/bin/"
+    local path="/data/data/com.termux/files/usr/bin/"
-    elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
+  elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
-        local path="/usr/local/bin/"
+    local path="/usr/local/bin/"
-    else
+  else
-        local path=""
+    local path=""
-        echo -e "脚本功能受限，请自行添加命令的软连接...\n"
+    echo -e "脚本功能受限，请自行添加命令的软连接...\n"
-    fi
+  fi
-    if [[ $path ]]; then
+  if [[ $path ]]; then
-        for ((i = 0; i < ${#link_name[*]}; i++)); do
+    for ((i = 0; i < ${#link_name[*]}; i++)); do
-            link_shell_sub "$path${link_name[i]}" "$dir_shell/${original_name[i]}"
+      link_shell_sub "$path${link_name[i]}" "$dir_shell/${original_name[i]}"
-        done
+    done
-    fi
+  fi
 }
 
 define_cmd() {
-    local cmd_prefix cmd_suffix
+  local cmd_prefix cmd_suffix
-    if type task &>/dev/null; then
+  if type task &>/dev/null; then
-        cmd_suffix=""
+    cmd_suffix=""
-        if [[ -f "$dir_shell/task.sh" ]]; then
+    if [[ -f "$dir_shell/task.sh" ]]; then
-            cmd_prefix=""
+      cmd_prefix=""
-        else
-            cmd_prefix="bash "
-        fi
     else
-        cmd_suffix=".sh"
+      cmd_prefix="bash "
-        if [[ -f "$dir_shell/task.sh" ]]; then
-            cmd_prefix="$dir_shell/"
-        else
-            cmd_prefix="bash $dir_shell/"
-        fi
     fi
-    for ((i = 0; i < ${#link_name[*]}; i++)); do
+  else
-        export cmd_${link_name[i]}="${cmd_prefix}${link_name[i]}${cmd_suffix}"
+    cmd_suffix=".sh"
-    done
+    if [[ -f "$dir_shell/task.sh" ]]; then
+      cmd_prefix="$dir_shell/"
+    else
+      cmd_prefix="bash $dir_shell/"
+    fi
+  fi
+  for ((i = 0; i < ${#link_name[*]}; i++)); do
+    export cmd_${link_name[i]}="${cmd_prefix}${link_name[i]}${cmd_suffix}"
+  done
 }
 
 fix_config() {
-    make_dir $dir_static
+  make_dir $dir_static
-    make_dir $dir_data
+  make_dir $dir_data
-    make_dir $dir_config
+  make_dir $dir_config
-    make_dir $dir_log
+  make_dir $dir_log
-    make_dir $dir_db
+  make_dir $dir_db
-    make_dir $dir_scripts
+  make_dir $dir_scripts
-    make_dir $dir_list_tmp
+  make_dir $dir_list_tmp
-    make_dir $dir_repo
+  make_dir $dir_repo
-    make_dir $dir_raw
+  make_dir $dir_raw
-    make_dir $dir_update_log
+  make_dir $dir_update_log
-    make_dir $dir_dep
+  make_dir $dir_dep
 
-    if [[ ! -s $file_config_user ]]; then
+  if [[ ! -s $file_config_user ]]; then
-        echo -e "复制一份 $file_config_sample 为 $file_config_user，随后请按注释编辑你的配置文件：$file_config_user\n"
+    echo -e "复制一份 $file_config_sample 为 $file_config_user，随后请按注释编辑你的配置文件：$file_config_user\n"
-        cp -fv $file_config_sample $file_config_user
+    cp -fv $file_config_sample $file_config_user
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -f $file_env ]]; then
+  if [[ ! -f $file_env ]]; then
-        echo -e "检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...\n"
+    echo -e "检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...\n"
-        touch $file_env
+    touch $file_env
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -f $file_task_before ]]; then
+  if [[ ! -f $file_task_before ]]; then
-        echo -e "复制一份 $file_task_sample 为 $file_task_before\n"
+    echo -e "复制一份 $file_task_sample 为 $file_task_before\n"
-        cp -fv $file_task_sample $file_task_before
+    cp -fv $file_task_sample $file_task_before
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -f $file_task_after ]]; then
+  if [[ ! -f $file_task_after ]]; then
-        echo -e "复制一份 $file_task_sample 为 $file_task_after\n"
+    echo -e "复制一份 $file_task_sample 为 $file_task_after\n"
-        cp -fv $file_task_sample $file_task_after
+    cp -fv $file_task_sample $file_task_after
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -f $file_extra_shell ]]; then
+  if [[ ! -f $file_extra_shell ]]; then
-        echo -e "复制一份 $file_extra_sample 为 $file_extra_shell\n"
+    echo -e "复制一份 $file_extra_sample 为 $file_extra_shell\n"
-        cp -fv $file_extra_sample $file_extra_shell
+    cp -fv $file_extra_sample $file_extra_shell
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -s $file_auth_user ]]; then
+  if [[ ! -s $file_auth_user ]]; then
-        echo -e "复制一份 $file_auth_sample 为 $file_auth_user\n"
+    echo -e "复制一份 $file_auth_sample 为 $file_auth_user\n"
-        cp -fv $file_auth_sample $file_auth_user
+    cp -fv $file_auth_sample $file_auth_user
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -s $file_notify_py ]]; then
+  if [[ ! -s $file_notify_py ]]; then
-        echo -e "复制一份 $file_notify_py_sample 为 $file_notify_py\n"
+    echo -e "复制一份 $file_notify_py_sample 为 $file_notify_py\n"
-        cp -fv $file_notify_py_sample $file_notify_py
+    cp -fv $file_notify_py_sample $file_notify_py
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -s $file_notify_js ]]; then
+  if [[ ! -s $file_notify_js ]]; then
-        echo -e "复制一份 $file_notify_js_sample 为 $file_notify_js\n"
+    echo -e "复制一份 $file_notify_js_sample 为 $file_notify_js\n"
-        cp -fv $file_notify_js_sample $file_notify_js
+    cp -fv $file_notify_js_sample $file_notify_js
-        echo
+    echo
-    fi
+  fi
 
-    if [[ -s /etc/nginx/conf.d/default.conf ]]; then
+  if [[ -s /etc/nginx/conf.d/default.conf ]]; then
-        echo -e "检测到默认nginx配置文件，清空...\n"
+    echo -e "检测到默认nginx配置文件，清空...\n"
-        cat /dev/null >/etc/nginx/conf.d/default.conf
+    cat /dev/null >/etc/nginx/conf.d/default.conf
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -s $dep_notify_js ]]; then
+  if [[ ! -s $dep_notify_js ]]; then
-        echo -e "复制一份 $file_notify_js_sample 为 $dep_notify_js\n"
+    echo -e "复制一份 $file_notify_js_sample 为 $dep_notify_js\n"
-        cp -fv $file_notify_js_sample $dep_notify_js
+    cp -fv $file_notify_js_sample $dep_notify_js
-        echo
+    echo
-    fi
+  fi
 
-    if [[ ! -s $dep_notify_py ]]; then
+  if [[ ! -s $dep_notify_py ]]; then
-        echo -e "复制一份 $file_notify_py_sample 为 $dep_notify_py\n"
+    echo -e "复制一份 $file_notify_py_sample 为 $dep_notify_py\n"
-        cp -fv $file_notify_py_sample $dep_notify_py
+    cp -fv $file_notify_py_sample $dep_notify_py
-        echo
+    echo
-    fi
+  fi
 
 }
 
 npm_install_sub() {
-    set_proxy
+  if [ $is_termux -eq 1 ]; then
-    if [ $is_termux -eq 1 ]; then
+    npm install --production --no-bin-links
-        npm install --production --no-bin-links --registry=https://registry.npmmirror.com || npm install --production --no-bin-links
+  elif ! type pnpm &>/dev/null; then
-    elif ! type pnpm &>/dev/null; then
+    npm install --production
-        npm install --production --registry=https://registry.npmmirror.com || npm install --production
+  else
-    else
+    pnpm install --loglevel error --production
-        pnpm install --loglevel error --production --registry=https://registry.npmmirror.com || pnpm install --production --loglevel error
+  fi
-    fi
-    unset_proxy
 }
 
 npm_install_1() {
-    local dir_current=$(pwd)
+  local dir_current=$(pwd)
-    local dir_work=$1
+  local dir_work=$1
 
-    cd $dir_work
+  cd $dir_work
-    echo -e "运行 npm install...\n"
+  echo -e "运行 pnpm install...\n"
-    npm_install_sub
+  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
+  cd $dir_current
 }
 
 npm_install_2() {
-    local dir_current=$(pwd)
+  local dir_current=$(pwd)
-    local dir_work=$1
+  local dir_work=$1
 
-    cd $dir_work
+  cd $dir_work
-    echo -e "检测到 $dir_work 的依赖包有变化，运行 npm install...\n"
+  echo -e "安装 $dir_work 依赖包...\n"
-    npm_install_sub
+  npm_install_sub
-    if [[ $? -ne 0 ]]; then
+  if [[ $? -ne 0 ]]; then
-        echo -e "\n安装 $dir_work 的依赖包运行不成功，再次尝试一遍...\n"
+    echo -e "\n安装 $dir_work 的依赖包运行不成功，再次尝试一遍...\n"
-        npm_install_1 $dir_work
+    npm_install_1 $dir_work
-    fi
+  fi
-    cd $dir_current
+  cd $dir_current
 }
 
 diff_and_copy() {
-    local copy_source=$1
+  local copy_source=$1
-    local copy_to=$2
+  local copy_to=$2
-    if [[ ! -s $copy_to ]] || [[ $(diff $copy_source $copy_to) ]]; then
+  if [[ ! -s $copy_to ]] || [[ $(diff $copy_source $copy_to) ]]; then
-        cp -f $copy_source $copy_to
+    cp -f $copy_source $copy_to
-    fi
+  fi
 }
 
 update_depend() {
-    local dir_current=$(pwd)
+  local dir_current=$(pwd)
 
-    if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+  if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
-        cp -f $dir_sample/package.json $dir_scripts/package.json
+    cp -f $dir_sample/package.json $dir_scripts/package.json
-        npm_install_2 $dir_scripts
+    npm_install_2 $dir_scripts
-    fi
+  fi
 
-    cd $dir_current
+  cd $dir_current
 }
 
 git_clone_scripts() {
-    local url=$1
+  local url="$1"
-    local dir=$2
+  local dir="$2"
-    local branch=$3
+  local branch="$3"
-    [[ $branch ]] && local part_cmd="-b $branch "
+  local proxy="$4"
-    echo -e "开始克隆仓库 $url 到 $dir\n"
+  [[ $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=$?
+  exit_status=$?
-    unset_proxy
+  unset_proxy
+
+  reset_branch "$branch"
 }
 
 git_pull_scripts() {
-    local dir_current=$(pwd)
+  local dir_current=$(pwd)
-    local dir_work="$1"
+  local dir_work="$1"
-    local branch="$2"
+  local branch="$2"
-    cd $dir_work
+  local proxy="$3"
-    echo -e "开始更新仓库：$dir_work\n"
+  cd $dir_work
+  echo -e "开始更新仓库：$dir_work"
 
-    set_proxy
+  local pre_commit_id=$(git rev-parse --short HEAD)
-    git fetch --all
+  set_proxy "$proxy"
-    exit_status=$?
+  git fetch --depth=1 --all
-    git pull &>/dev/null
+  git pull --depth=1 &>/dev/null
-    unset_proxy
+  exit_status=$?
-    reset_branch "$branch"
+  unset_proxy
 
-    cd $dir_current
+  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
 }
 
 reset_romote_url() {
-    local dir_current=$(pwd)
+  local dir_current=$(pwd)
-    local dir_work=$1
+  local dir_work=$1
-    local url=$2
+  local url=$2
-    local branch="$3"
+  local branch="$3"
 
-    if [[ -d "$dir_work/.git" ]]; then
+  cd $dir_work
-        cd $dir_work
+  if [[ -d "$dir_work/.git" ]]; then
-        [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
+    [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
-        git remote set-url origin $url &>/dev/null
+    git remote set-url origin $url &>/dev/null
+  else
+    git init
+    git remote add origin $url &>/dev/null
+  fi
   
-        local part_cmd=""
+  cd $dir_current
-        reset_branch "$branch"
-        cd $dir_current
-    fi
 }
 
 reset_branch() {
-    local branch="$1"
+  local branch="$1"
-    if [[ $branch ]]; then
+  local part_cmd="HEAD"
-        part_cmd="origin/${branch}"
+  if [[ $branch ]]; then
-        git checkout -B "$branch"
+    part_cmd="origin/${branch}"
-        git branch --set-upstream-to=$part_cmd $branch
+    git checkout -B "$branch" &>/dev/null
-    fi
+    git branch --set-upstream-to=$part_cmd $branch &>/dev/null
-    git reset --hard $part_cmd &>/dev/null
+  fi
+  git reset --hard $part_cmd &>/dev/null
 }
 
 random_range() {
-    local beg=$1
+  local beg=$1
-    local end=$2
+  local end=$2
-    echo $((RANDOM % ($end - $beg) + $beg))
+  echo $((RANDOM % ($end - $beg) + $beg))
 }
 
 reload_pm2() {
-    pm2 l &>/dev/null
+  pm2 l &>/dev/null
+  pm2 flush &>/dev/null
 
-    echo -e "启动面板服务\n"
+  echo -e "启动面板服务\n"
-    pm2 delete panel --source-map-support --time &>/dev/null
+  pm2 delete panel --source-map-support --time &>/dev/null
-    pm2 start $dir_static/build/app.js -n 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 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() {
-    local format="$1"
+  local format="$1"
-    local begin_time="$2"
+  local begin_time="$2"
-    local end_time="$3"
+  local end_time="$3"
 
-    if [[ $is_macos -eq 1 ]]; then
+  if [[ $is_macos -eq 1 ]]; then
-        diff_time=$(($(date -j -f "$format" "$end_time" +%s) - $(date -j -f "$format" "$begin_time" +%s)))
+    diff_time=$(($(date -j -f "$format" "$end_time" +%s) - $(date -j -f "$format" "$begin_time" +%s)))
-    else
+  else
-        diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
+    diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    fi
+  fi
-    echo "$diff_time"
+  echo "$diff_time"
 }
 
 format_time() {
-    local format="$1"
+  local format="$1"
-    local time="$2"
+  local time="$2"
 
-    if [[ $is_macos -eq 1 ]]; then
+  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")
-    else
+  else
-        echo $(date -d "$time" "+%Y-%m-%d %H:%M:%S")
+    echo $(date -d "$time" "+%Y-%m-%d %H:%M:%S")
-    fi
+  fi
 }
 
 format_log_time() {
-    local format="$1"
+  local format="$1"
-    local time="$2"
+  local time="$2"
 
-    if [[ $is_macos -eq 1 ]]; then
+  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
+  else
-        echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
-    fi
+  fi
 }
 
 format_timestamp() {
-    local format="$1"
+  local format="$1"
-    local time="$2"
+  local time="$2"
 
-    if [[ $is_macos -eq 1 ]]; then
+  if [[ $is_macos -eq 1 ]]; then
-        echo $(date -j -f "$format" "$time" "+%s")
+    echo $(date -j -f "$format" "$time" "+%s")
-    else
+  else
-        echo $(date -d "$time" "+%s")
+    echo $(date -d "$time" "+%s")
-    fi
+  fi
+}
+
+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
+    cd && pnpm config set registry $NpmMirror
+    pnpm install -g --force
+  fi
+
+  git config --global pull.rebase false
+
+  cp -f $dir_root/.env.example $dir_root/.env
+
+  if [[ -f "$dir_root/db/cookie.db" ]]; then
+    echo -e "检测到旧的db文件，拷贝为新db...\n"
+    mv $dir_root/db/cookie.db $dir_root/db/env.db
+    rm -rf $dir_root/db/cookie.db
+    echo
+  fi
+
+  if [[ -d "$dir_root/db" ]]; then
+    echo -e "检测到旧的db目录，拷贝到data目录...\n"
+    cp -rf $dir_root/config $dir_root/data
+    echo
+  fi
+
+  if [[ -d "$dir_root/scripts" ]]; then
+    echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
+    cp -rf $dir_root/scripts $dir_root/data
+    echo
+  fi
+
+  if [[ -d "$dir_root/log" ]]; then
+    echo -e "检测到旧的log目录，拷贝到data目录...\n"
+    cp -rf $dir_root/log $dir_root/data
+    echo
+  fi
+
+  if [[ -d "$dir_root/config" ]]; then
+    echo -e "检测到旧的config目录，拷贝到data目录...\n"
+    cp -rf $dir_root/config $dir_root/data
+    echo
+  fi
+}
+
+init_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
@@ -430,4 +538,4 @@ detect_macos
 define_cmd
 fix_config
 
-import_config $1 >$task_error_log_path 2>&1
+import_config $1 2>$task_error_log_path

shell/task.sh

@@ -5,388 +5,125 @@ 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
+  local file_param=$1
-    if [[ $file_param == *.js ]]; then
+  if [[ $file_param == *.js ]]; then
-        which_program="node"
+    which_program="node"
-    elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
+  elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
-        which_program="python3"
+    which_program="python3"
-    elif [[ $file_param == *.sh ]]; then
+  elif [[ $file_param == *.sh ]]; then
-        which_program="bash"
+    which_program="bash"
-    elif [[ $file_param == *.ts ]]; then
+  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=""
+      which_program="tsx"
     fi
+  else
+    which_program=""
+  fi
 }
 
-random_delay() {
+handle_log_path() {
-    local random_delay_max=$RandomDelay
+  local file_param=$1
-    if [[ $random_delay_max ]] && [[ $random_delay_max -gt 0 ]]; then
-        local current_min=$(date "+%-M")
-        if [[ $current_min -ne 0 ]] && [[ $current_min -ne 30 ]]; then
-            delay_second=$(($(gen_random_num $random_delay_max) + 1))
-            echo -e "\n命令未添加 \"now\"，随机延迟 $delay_second 秒后再执行任务，如需立即终止，请按 CTRL+C...\n"
-            sleep $delay_second
-        fi
-    fi
-}
 
-## scripts目录下所有可运行脚本数组
+  if [[ -z $file_param ]]; then
-gen_array_scripts() {
+    file_param="task"
-    local dir_current=$(pwd)
+  fi
-    local i="-1"
-    cd $dir_scripts
-    for file in $(ls); do
-        if [[ -f $file ]] && [[ $file == *.js && $file != sendNotify.js ]]; then
-            let i++
-            array_scripts[i]=$(echo "$file" | perl -pe "s|$dir_scripts/||g")
-            array_scripts_name[i]=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1)
-            [[ -z ${array_scripts_name[i]} ]] && array_scripts_name[i]="<未识别出活动名称>"
-        fi
-    done
-    cd $dir_current
-}
 
-## 使用说明
+  if [[ -z $ID ]]; then
-usage() {
+    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}')
-    define_cmd
+  fi
-    gen_array_scripts
+  local suffix=""
-    echo -e "task命令运行本程序自动添加进crontab的脚本，需要输入脚本的绝对路径或去掉 “$dir_scripts/” 目录后的相对路径（定时任务中请写作相对路径），用法为："
+  if [[ ! -z $ID ]]; then
-    echo -e "1.$cmd_task <file_name>                                             # 依次执行，如果设置了随机延迟，将随机延迟一定秒数"
+    if [[ "$ID" -gt 0 ]] 2>/dev/null; then
-    echo -e "2.$cmd_task <file_name> now                                         # 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日志，同时记录在日志文件中"
+      suffix="_${ID}"
-    echo -e "3.$cmd_task <file_name> conc <环境变量名称> <账号编号，空格分隔>(可选的)  # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日志，直接记录在日志文件中，且可指定账号执行"
-    echo -e "4.$cmd_task <file_name> desi <环境变量名称> <账号编号，空格分隔>         # 指定账号执行，无论是否设置了随机延迟，均立即运行"
-    if [[ ${#array_scripts[*]} -gt 0 ]]; then
-        echo -e "\n当前有以下脚本可以运行:"
-        for ((i = 0; i < ${#array_scripts[*]}; i++)); do
-            echo -e "$(($i + 1)). ${array_scripts_name[i]}：${array_scripts[i]}"
-        done
     else
-        echo -e "\n暂无脚本可以执行"
+      ID=""
     fi
+  fi
+
+  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
+      log_dir_tmp_path="${file_param:1}"
+    else
+      log_dir_tmp_path="${file_param}"
+    fi
+  fi
+  log_dir_tmp_path="${log_dir_tmp_path%/*}"
+  log_dir_tmp_path="${log_dir_tmp_path##*/}"
+  [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
+  log_dir="${log_dir_tmp%.*}${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"
+  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
 }
 
-## run nohup，$1：文件名，不含路径，带后缀
+format_params() {
-run_nohup() {
+  time_format="%Y-%m-%d %H:%M:%S"
-    local file_name=$1
+  if [[ $is_macos -eq 1 ]]; then
-    nohup node $file_name &>$log_path &
+    mtime_format=$time_format
-}
+  else
-
+    mtime_format="%Y-%m-%d %H:%M:%S.%3N"
-## 正常运行单个脚本，$1：传入参数
+  fi
-run_normal() {
+  timeoutCmd=""
-    local file_param=$1
+  if [[ $command_timeout_time ]]; then
-    define_program "$file_param"
-    if [[ $file_param == *.js ]]; then
-        if [[ $# -eq 1 ]]; then
-            random_delay
-        fi
-    fi
-
-    local time=$(date "+$time_format")
-    log_time=$(format_log_time "$time_format" "$time")
-    log_dir_tmp="${file_param##*/}"
-    if [[ $file_param =~ "/" ]]; then
-        if [[ $file_param == /* ]]; then
-            log_dir_tmp_path="${file_param:1}"
-        else
-            log_dir_tmp_path="${file_param}"
-        fi
-    fi
-    log_dir_tmp_path="${log_dir_tmp_path%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="${log_dir_tmp%.*}"
-    log_path="$log_dir/$log_time.log"
-    cmd=">> $dir_log/$log_path 2>&1"
-    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$dir_log/$log_dir"
-
-    local begin_time=$(format_time "$time_format" "$time")
-    local begin_timestamp=$(format_timestamp "$time_format" "$time")
-    
-    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $file_param" | perl -pe "s|.*ID=(.*) $cmd_task $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
-    eval . $file_task_before "$@" $cmd
-
-    cd $dir_scripts
-    local relative_path="${file_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
-        cd ${relative_path}
-        file_param=${file_param/$relative_path\//}
-    fi
-    
-    eval $timeoutCmd $which_program $file_param $cmd
-
-    eval . $file_task_after "$@" $cmd
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(expr $end_timestamp - $begin_timestamp)
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-}
-
-## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
-run_concurrent() {
-    local file_param="$1"
-    local env_param="$2"
-    local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
-    if [[ ! $env_param ]]; then
-        echo -e "\n 缺少并发运行的环境变量参数"
-        exit 1
-    fi
-
-    local envs=$(eval echo "\$${env_param}")
-    local array=($(echo $envs | sed 's/&/ /g'))
-    local tempArr=$(echo $num_param | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
-    local runArr=($(eval echo $tempArr))
-    runArr=($(awk -v RS=' ' '!a[$1]++' <<< ${runArr[@]}))
-
-    local n=0
-    for i in ${runArr[@]}; do
-        array_run[n]=${array[$i - 1]}
-        let n++
-    done
-
-    local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
-
-    define_program "$file_param"
-    local time=$(date "+$time_format")
-    log_time=$(format_log_time "$time_format" "$time")
-    log_dir_tmp="${file_param##*/}"
-    if [[ $file_param =~ "/" ]]; then
-        if [[ $file_param == /* ]]; then
-            log_dir_tmp_path="${file_param:1}"
-        else
-            log_dir_tmp_path="${file_param}"
-        fi
-    fi
-    log_dir_tmp_path="${log_dir_tmp_path%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="${log_dir_tmp%.*}"
-    log_path="$log_dir/$log_time.log"
-    cmd=">> $dir_log/$log_path 2>&1"
-    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$dir_log/$log_dir"
-
-    local begin_time=$(format_time "$time_format" "$time")
-    local begin_timestamp=$(format_timestamp "$time_format" "$time")
-
-    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $file_param" | perl -pe "s|.*ID=(.*) $cmd_task $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
-    eval . $file_task_before "$@" $cmd
-
-    local envs=$(eval echo "\$${env_param}")
-    local array=($(echo $envs | sed 's/&/ /g'))
-    single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
-
-    cd $dir_scripts
-    local relative_path="${file_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
-        cd ${relative_path}
-        file_param=${file_param/$relative_path\//}
-    fi
-    for i in "${!array[@]}"; do
-        export ${env_param}=${array[i]}
-        single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-        eval $timeoutCmd $which_program $file_param &>$single_log_path &
-    done
-
-    wait
-    for i in "${!array[@]}"; do
-        single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-        eval cat $single_log_path $cmd
-        [[ -f $single_log_path ]] && rm -f $single_log_path
-    done
-
-    eval . $file_task_after "$@" $cmd
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(( $end_timestamp - $begin_timestamp ))
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-}
-
-run_designated() {
-    local file_param="$1"
-    local env_param="$2"
-    local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
-    if [[ ! $env_param ]] || [[ ! $num_param ]]; then
-        echo -e "\n 缺少单独运行的参数 task xxx.js desi Test 1 3"
-        exit 1
-    fi
-
-    define_program "$file_param"
-    local time=$(date "+$time_format")
-    log_time=$(format_log_time "$time_format" "$time")
-    log_dir_tmp="${file_param##*/}"
-    if [[ $file_param =~ "/" ]]; then
-        if [[ $file_param == /* ]]; then
-            log_dir_tmp_path="${file_param:1}"
-        else
-            log_dir_tmp_path="${file_param}"
-        fi
-    fi
-    log_dir_tmp_path="${log_dir_tmp_path%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="${log_dir_tmp%.*}"
-    log_path="$log_dir/$log_time.log"
-    cmd=">> $dir_log/$log_path 2>&1"
-    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$dir_log/$log_dir"
-
-    local begin_time=$(format_time "$time_format" "$time")
-    local begin_timestamp=$(format_timestamp "$time_format" "$time")
-
-    local envs=$(eval echo "\$${env_param}")
-    local array=($(echo $envs | sed 's/&/ /g'))
-    local tempArr=$(echo $num_param | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
-    local runArr=($(eval echo $tempArr))
-    runArr=($(awk -v RS=' ' '!a[$1]++' <<< ${runArr[@]}))
-
-    local n=0
-    for i in ${runArr[@]}; do
-        array_run[n]=${array[$i - 1]}
-        let n++
-    done
-
-    local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
-
-    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $file_param" | perl -pe "s|.*ID=(.*) $cmd_task $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
-    eval . $file_task_before "$@" $cmd
-
-    cd $dir_scripts
-    local relative_path="${file_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
-        cd ${relative_path}
-        file_param=${file_param/$relative_path\//}
-    fi
-    eval $timeoutCmd $which_program $file_param $cmd
-
-    eval . $file_task_after "$@" $cmd
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(( $end_timestamp - $begin_timestamp ))
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-}
-
-## 运行其他命令
-run_else() {
-    local file_param="$1"
-    define_program "$file_param"
-    local time=$(date "+$time_format")
-    log_time=$(format_log_time "$time_format" "$time")
-    log_dir_tmp="${file_param##*/}"
-    if [[ $file_param =~ "/" ]]; then
-        if [[ $file_param == /* ]]; then
-            log_dir_tmp_path="${file_param:1}"
-        else
-            log_dir_tmp_path="${file_param}"
-        fi
-    fi
-    log_dir_tmp_path="${log_dir_tmp_path%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="${log_dir_tmp%.*}"
-    log_path="$log_dir/$log_time.log"
-    cmd=">> $dir_log/$log_path 2>&1"
-    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$dir_log/$log_dir"
-
-    local begin_time=$(format_time "$time_format" "$time")
-    local begin_timestamp=$(format_timestamp "$time_format" "$time")
-
-    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $@" | perl -pe "s|.*ID=(.*) $cmd_task $@\.*|\1|" | head -1 | awk -F " " '{print $1}')
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
-    eval . $file_task_before "$@" $cmd
-
-    cd $dir_scripts
-    local relative_path="${file_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
-        cd ${relative_path}
-        file_param=${file_param/$relative_path\//}
-    fi
-
-    shift
-    eval $timeoutCmd $which_program "$file_param" "$@" $cmd
-
-    eval . $file_task_after "$file_param" "$@" $cmd
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(( $end_timestamp - $begin_timestamp ))
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-}
-
-## 命令检测
-main() {
-    show_log="false"
-    while getopts ":l" opt
-    do
-        case $opt in
-            l)
-                show_log="true"
-                ;;
-        esac
-    done
-    [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
-
-    timeoutCmd=""
     if type timeout &>/dev/null; then
-        timeoutCmd="timeout -k 10s $command_timeout_time "
+      timeoutCmd="timeout --foreground -s 2 -k 10s $command_timeout_time "
-    fi
-
-    time_format="%Y-%m-%d %H:%M:%S"
-    if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
-        case $# in
-        1)
-            run_normal "$1"
-            ;;
-        *)
-            case $2 in
-            now)
-                run_normal "$1" "$2"
-                ;;
-            conc)
-                run_concurrent "$1" "$3" "$*"
-                ;;
-            desi)
-                run_designated "$1" "$3" "$*"
-                ;;
-            *)
-                run_else "$@"
-                ;;
-            esac
-            ;;
-        esac
-        [[ -f "$dir_log/$log_path" ]] && cat "$dir_log/$log_path"
-    elif [[ $# -eq 0 ]]; then
-        echo
-        usage
-    else
-        run_else "$@"
     fi
+  fi
+  # params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
 }
 
-main "$@"
+init_begin_time() {
+  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 ]] && shift $(($OPTIND - 1))
+if [[ $max_time ]]; then
+  shift $(($OPTIND - 1))
+  command_timeout_time="$max_time"
+fi
+
+format_params "$@"
+define_program "$@"
+handle_log_path "$@"
+init_begin_time
+
+eval . $dir_shell/otask.sh "$cmd"
+[[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
 
 exit 0

shell/update.sh

@@ -8,544 +8,526 @@ send_mark=$dir_shell/send_mark
 
 ## 检测cron的差异，$1：脚本清单文件路径，$2：cron任务清单文件路径，$3：增加任务清单文件路径，$4：删除任务清单文件路径
 diff_cron() {
-    local list_scripts="$1"
+  local list_scripts="$1"
-    local list_task="$2"
+  local list_task="$2"
-    local list_add="$3"
+  local list_add="$3"
-    local list_drop="$4"
+  local list_drop="$4"
-    if [[ -s $list_task ]] && [[ -s $list_scripts ]]; then
+  if [[ -s $list_task ]] && [[ -s $list_scripts ]]; then
-        grep -vwf $list_task $list_scripts >$list_add
+    grep -vwf $list_task $list_scripts >$list_add
-        grep -vwf $list_scripts $list_task >$list_drop
+    grep -vwf $list_scripts $list_task >$list_drop
-    fi
+  fi
 
-    if [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
+  if [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
-        cp -f $list_scripts $list_add
+    cp -f $list_scripts $list_add
-    fi
+  fi
 
-    if [[ ! -s $list_scripts ]] && [[ -s $list_task ]]; then
+  if [[ ! -s $list_scripts ]] && [[ -s $list_task ]]; then
-        cp -f $list_task $list_drop
+    cp -f $list_task $list_drop
-    fi
+  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
+  local list=$1
-    local type=$2
+  local type=$2
-    if [[ -s $list ]]; then
+  if [[ -s $list ]]; then
-        echo -e "检测到有$type的定时任务：\n"
+    echo -e "检测到有$type的定时任务：\n"
-        cat $list
+    cat $list
-        echo
+    echo
-    fi
+  fi
 }
 
 ## 自动删除失效的脚本与定时任务，需要：1.AutoDelCron 设置为 true；2.正常更新js脚本，没有报错；3.存在失效任务
 ## $1：失效任务清单文件路径
 del_cron() {
-    local list_drop=$1
+  local list_drop=$1
-    local path=$2
+  local path=$2
-    local detail=""
+  local detail=""
-    local ids=""
+  local ids=""
-    echo -e "开始尝试自动删除失效的定时任务...\n"
+  echo -e "开始尝试自动删除失效的定时任务...\n"
-    for cron in $(cat $list_drop); do
+  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
-            ids="\"$id\""
-        fi
-        cron_file="$dir_scripts/${cron}"
-        if [[ -f $cron_file ]]; then
-            cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
-            rm -f $cron_file
-        fi
-        [[ -z $cron_name ]] && cron_name="$cron"
-        if [[ $detail ]]; then
-            detail="${detail}\n${cron_name}"
-        else
-            detail="${cron_name}"
-        fi
-    done
     if [[ $ids ]]; then
-        result=$(del_cron_api "$ids")
+      ids="$ids,\"$id\""
-        notify_api "$path 删除任务${result}" "$detail"
+    else
+      ids="\"$id\""
     fi
+    cron_file="$dir_scripts/${cron}"
+    if [[ -f $cron_file ]]; then
+      cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      rm -f $cron_file
+    fi
+    [[ -z $cron_name ]] && cron_name="$cron"
+    if [[ $detail ]]; then
+      detail="${detail}\n${cron_name}"
+    else
+      detail="${cron_name}"
+    fi
+  done
+  if [[ $ids ]]; then
+    result=$(del_cron_api "$ids")
+    notify_api "$path 删除任务${result}" "$detail"
+  fi
 }
 
 ## 自动增加定时任务，需要：1.AutoAddCron 设置为 true；2.正常更新js脚本，没有报错；3.存在新任务；4.crontab.list存在并且不为空
 ## $1：新任务清单文件路径
 add_cron() {
-    local list_add=$1
+  local list_add=$1
-    local path=$2
+  local path=$2
-    echo -e "开始尝试自动添加定时任务...\n"
+  echo -e "开始尝试自动添加定时任务...\n"
-    local detail=""
+  local detail=""
-    cd $dir_scripts
+  cd $dir_scripts
-    for file in $(cat $list_add); do
+  for file in $(cat $list_add); do
-        local file_name=${file/${path}\//}
+    local file_name=${file/${path}\//}
-        file_name=${file_name/${path}\_/}
+    file_name=${file_name/${path}\_/}
-        if [[ -f $file ]]; then
+    if [[ -f $file ]]; then
-            cron_line=$(
+      cron_line=$(
-                perl -ne "{
+        perl -ne "{
                         print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$file_name/
                     }" $file |
-                    perl -pe "{
+          perl -pe "{
                         s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$file_name.*|\1|g;
                         s|\*([\d\*])(.*)|\1\2|g;
                         s|  | |g;
                     }" | sort -u | head -1
-            )
+      )
-            cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
-            [[ -z $cron_name ]] && cron_name="$file_name"
+      [[ -z $cron_name ]] && cron_name="$file_name"
-            [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
+      [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{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=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
-            [[ -z $cron_line ]] && cron_line="$default_cron"
+      [[ -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"
+      echo -e "$result"
-            if [[ $detail ]]; then
+      if [[ $detail ]]; then
-                detail="${detail}${result}\n"
+        detail="${detail}${result}\n"
-            else
+      else
-                detail="${result}\n"
+        detail="${result}\n"
-            fi
+      fi
-        fi
+    fi
-    done
+  done
-    notify_api "$path 新增任务" "$detail"
+  notify_api "$path 新增任务" "$detail"
 }
 
 ## 更新仓库
 update_repo() {
-    local url="$1"
+  local url="$1"
-    local path="$2"
+  local path="$2"
-    local blackword="$3"
+  local blackword="$3"
-    local dependence="$4"
+  local dependence="$4"
-    local branch="$5"
+  local branch="$5"
-    local extensions="$6"
+  local extensions="$6"
-    local tmp="${url%/*}"
+  local proxy="$7"
-    local authorTmp1="${tmp##*/}"
+  local autoAddCron="$8"
-    local authorTmp2="${authorTmp1##*:}"
+  local autoDelCron="$9"
-    local author="${authorTmp2##*.}"
+  local tmp="${url%/*}"
+  local authorTmp1="${tmp##*/}"
+  local authorTmp2="${authorTmp1##*:}"
+  local author="${authorTmp2##*.}"
 
-    local repo_path="${dir_repo}/${uniq_path}"
+  local repo_path="${dir_repo}/${uniq_path}"
 
-    make_dir "${dir_scripts}/${uniq_path}"
+  make_dir "${dir_scripts}/${uniq_path}"
 
-    local formatUrl="$url"
+  local formatUrl="$url"
-    if [[ -d ${repo_path}/.git ]]; then
+  if [[ -d ${repo_path}/.git ]]; then
-        reset_romote_url ${repo_path} "${formatUrl}" "${branch}"
+    reset_romote_url ${repo_path} "${formatUrl}" "${branch}"
-        git_pull_scripts ${repo_path} "${branch}"
+    git_pull_scripts ${repo_path} "${branch}" "${proxy}"
-    else
+  else
-        git_clone_scripts "${formatUrl}" ${repo_path} "${branch}"
+    rm -rf ${repo_path} &>/dev/null
-    fi
+    git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
-    if [[ $exit_status -eq 0 ]]; then
+  fi
-        echo -e "\n更新${repo_path}成功...\n"
+  if [[ $exit_status -eq 0 ]]; then
-        diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions"
+    echo -e "\n更新${repo_path}成功...\n"
-    else
+    diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
-        echo -e "\n更新${repo_path}失败，请检查网络...\n"
+  else
-    fi
+    echo -e "\n更新${repo_path}失败，请检查网络...\n"
+  fi
 }
 
 ## 更新所有 raw 文件
 update_raw() {
-    echo -e "--------------------------------------------------------------\n"
+  local url="$1"
-    local url="$1"
+  local proxy="$2"
-    local raw_url="$url"
+  local autoAddCron="$3"
-    local suffix="${raw_url##*.}"
+  local autoDelCron="$4"
-    local raw_file_name="${uniq_path}.${suffix}"
-    echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"
 
-    set_proxy
+  if [[ ! $autoAddCron ]]; then
-    wget -q --no-check-certificate -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+    autoAddCron=${AutoAddCron}
-    unset_proxy
+  fi
+  if [[ ! $autoDelCron ]]; then
+    autoDelCron=${AutoDelCron}
+  fi
 
-    if [[ $? -eq 0 ]]; then
+  local proxyStr=""
-        mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
+  if [[ $proxy ]]; then
-        echo -e "下载 ${raw_file_name} 成功...\n"
+    if [[ $url == http:* ]]; then
-        cd $dir_raw
+      proxyStr="-e \"http_proxy=${proxy}\""
-        local filename="raw_${raw_file_name}"
+    elif [[ $url == https:* ]]; then
-        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}')
+      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
-        cp -f $raw_file_name $dir_scripts/${filename}
-        cron_line=$(
-            perl -ne "{
-                    print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
-                }" $raw_file_name |
-                perl -pe "{
-                    s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g;
-                    s|\*([\d\*])(.*)|\1\2|g;
-                    s|  | |g;
-                }" | sort -u | head -1
-        )
-        cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
-        [[ -z $cron_name ]] && cron_name="$raw_file_name"
-        [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
-        [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
-        [[ -z $cron_line ]] && cron_line="$default_cron"
-        if [[ -z $cron_id ]]; then
-            result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
-            echo -e "$result\n"
-            notify_api "新增任务通知" "\n$result"
-            # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
-        fi
-    else
-        echo -e "下载 ${raw_file_name} 失败，保留之前正常下载的版本...\n"
-        [[ -f "$dir_raw/${raw_file_name}.new" ]] && rm -f "$dir_raw/${raw_file_name}.new"
     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"
+
+  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+
+  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 | awk -F " " '{print $1}')
+    cp -f $raw_file_name $dir_scripts/${filename}
+    if [[ -z $cron_id ]] && [[ ${autoAddCron} == true ]]; then
+      cron_line=$(
+        perl -ne "{
+                      print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
+                  }" $raw_file_name |
+          perl -pe "{
+                      s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g;
+                      s|\*([\d\*])(.*)|\1\2|g;
+                      s|  | |g;
+                  }" | sort -u | head -1
+      )
+      cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      [[ -z $cron_name ]] && cron_name="$raw_file_name"
+      [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
+      [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
+      [[ -z $cron_line ]] && cron_line="$default_cron"
+      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"
+    fi
+  else
+    echo -e "下载 ${raw_file_name} 失败，保留之前正常下载的版本...\n"
+    [[ -f "$dir_raw/${raw_file_name}.new" ]] && rm -f "$dir_raw/${raw_file_name}.new"
+  fi
 
 }
 
 ## 调用用户自定义的extra.sh
 run_extra_shell() {
-    if [[ ${EnableExtraShell} == true ]]; then
+  if [[ -f $file_extra_shell ]]; then
-        if [[ -f $file_extra_shell ]]; then
+    . $file_extra_shell
-            echo -e "--------------------------------------------------------------\n"
+  else
-            . $file_extra_shell
+    echo -e "$file_extra_shell文件不存在，跳过执行...\n"
-        else
+  fi
-            echo -e "$file_extra_shell文件不存在，跳过执行...\n"
-        fi
-    fi
 }
 
 ## 脚本用法
 usage() {
-    echo -e "本脚本用法："
+  echo -e "ql命令使用方法："
-    echo -e "1. $cmd_update update                                                                  # 更新并重启青龙"
+  echo -e "1. $cmd_update update                                                                  # 更新并重启青龙"
-    echo -e "2. $cmd_update extra                                                                   # 运行自定义脚本"
+  echo -e "2. $cmd_update extra                                                                   # 运行自定义脚本"
-    echo -e "3. $cmd_update raw <fileurl>                                                           # 更新单个脚本文件"
+  echo -e "3. $cmd_update raw <fileurl>                                                            # 更新单个脚本文件"
-    echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch> <extensions>    # 更新单个仓库的脚本"
+  echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch> <extensions>    # 更新单个仓库的脚本"
-    echo -e "5. $cmd_update rmlog <days>                                                            # 删除旧日志"
+  echo -e "5. $cmd_update rmlog <days>                                                            # 删除旧日志"
-    echo -e "6. $cmd_update bot                                                                     # 启动tg-bot"
+  echo -e "6. $cmd_update bot                                                                     # 启动tg-bot"
-    echo -e "7. $cmd_update check                                                                   # 检测青龙环境并修复"
+  echo -e "7. $cmd_update check                                                                   # 检测青龙环境并修复"
-    echo -e "8. $cmd_update resetlet                                                                # 重置登录错误次数"
+  echo -e "8. $cmd_update resetlet                                                                # 重置登录错误次数"
-    echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
+  echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
 }
 
 ## 更新qinglong
 update_qinglong() {
-    patch_version
+  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 no_restart="$1"
+  local all_branch=$(cd ${dir_root} && git branch -a)
-    local all_branch=$(git branch -a)
+  local primary_branch="master"
-    local primary_branch="master"
+  if [[ "${all_branch}" =~ "${current_branch}" ]]; then
-    if [[ "${all_branch}" =~ "${current_branch}" ]]; then
+    primary_branch="${current_branch}"
-        primary_branch="${current_branch}"
+  fi
-    fi
+  [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
-    [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
+  reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
-    reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" ${primary_branch}
+  git_pull_scripts $dir_root ${primary_branch}
-    git_pull_scripts $dir_root ${primary_branch}
 
-    if [[ $exit_status -eq 0 ]]; then
+  if [[ $exit_status -eq 0 ]]; then
-        echo -e "\n更新青龙源文件成功...\n"
+    echo -e "\n更新青龙源文件成功...\n"
-        cp -f $file_config_sample $dir_config/config.sample.sh
+    cp -f $file_config_sample $dir_config/config.sample.sh
-        detect_config_version
+    update_depend
-        update_depend
-
-        [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
-        [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root
-    else
-        echo -e "\n更新青龙源文件失败，请检查原因...\n"
-    fi
-
-    local url="https://github.com/whyour/qinglong-static.git"
-    if [[ -d ${ql_static_repo}/.git ]]; then
-        reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
-        git_pull_scripts ${ql_static_repo} ${primary_branch}
-    else
-        git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
-    fi
-    if [[ $exit_status -eq 0 ]]; then
-        echo -e "\n更新青龙静态资源成功...\n"
-        local static_version=$(cat $dir_root/src/version.ts | perl -pe "s|.*\'(.*)\';\.*|\1|" | head -1)
-        echo -e "\n当前版本 $static_version...\n"
-        
-        rm -rf $dir_static/*
-        cp -rf $ql_static_repo/* $dir_static
-        if [[ $no_restart != "no-restart" ]]; then
-            nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
-            echo -e "重启面板中..."
-            sleep 3
-            reload_pm2
-        fi
-    else
-        echo -e "\n更新青龙静态资源失败，请检查原因...\n"
-    fi
 
+    update_qinglong_static "$1" "$primary_branch"
+  else
+    echo -e "\n更新青龙源文件失败，请检查网络...\n"
+  fi
 }
 
-patch_version() {
+update_qinglong_static() {
-    if [[ -f "$dir_root/db/cookie.db" ]]; then
+  local no_restart="$1"
-        echo -e "检测到旧的db文件，拷贝为新db...\n"
+  local primary_branch="$2"
-        mv $dir_root/db/cookie.db $dir_root/db/env.db
+  local url="https://${mirror}.com/whyour/qinglong-static.git"
-        rm -rf $dir_root/db/cookie.db
+  if [[ -d ${ql_static_repo}/.git ]]; then
-        echo
+    reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
+    git_pull_scripts ${ql_static_repo} ${primary_branch}
+  else
+    rm -rf ${ql_static_repo} &>/dev/null
+    git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
+  fi
+  if [[ $exit_status -eq 0 ]]; then
+    echo -e "\n更新青龙静态资源成功...\n"
+
+    rm -rf $dir_static/*
+    cp -rf $ql_static_repo/* $dir_static
+    if [[ $no_restart != "no-restart" ]]; then
+      nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
+      echo -e "重启面板中..."
+      sleep 3
+      reload_pm2
     fi
-
+  else
-    if ! type ts-node &>/dev/null; then
+    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
-        pnpm i -g ts-node typescript tslib
+  fi
-    fi
-
-    # 兼容pnpm@7 
-    pnpm setup
-    source ~/.bashrc
-
-    git config --global pull.rebase false
-
-    cp -f $dir_root/.env.example $dir_root/.env
-
-    if [[ -d "$dir_root/db" ]]; then
-        echo -e "检测到旧的db目录，拷贝到data目录...\n"
-        cp -rf $dir_root/config $dir_root/data
-        echo
-    fi
-
-    if [[ -d "$dir_root/scripts" ]]; then
-        echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-        cp -rf $dir_root/scripts $dir_root/data
-        echo
-    fi
-
-    if [[ -d "$dir_root/log" ]]; then
-        echo -e "检测到旧的log目录，拷贝到data目录...\n"
-        cp -rf $dir_root/log $dir_root/data
-        echo
-    fi
-
-    if [[ -d "$dir_root/config" ]]; then
-        echo -e "检测到旧的config目录，拷贝到data目录...\n"
-        cp -rf $dir_root/config $dir_root/data
-        echo
-    fi
-
 }
 
 ## 对比脚本
 diff_scripts() {
-    local dir_current=$(pwd)
+  local dir_current=$(pwd)
-    local repo_path="$1"
+  local repo_path="$1"
-    local author="$2"
+  local author="$2"
-    local path="$3"
+  local path="$3"
-    local blackword="$4"
+  local blackword="$4"
-    local dependence="$5"
+  local dependence="$5"
-    local extensions="$6"
+  local extensions="$6"
+  local autoAddCron="$7"
+  local autoDelCron="$8"
 
-    gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions"
+  if [[ ! $autoAddCron ]]; then
+    autoAddCron=${AutoAddCron}
+  fi
+  if [[ ! $autoDelCron ]]; then
+    autoDelCron=${AutoDelCron}
+  fi
 
-    local list_add="$dir_list_tmp/${uniq_path}_add.list"
+  gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions"
-    local list_drop="$dir_list_tmp/${uniq_path}_drop.list"
-    diff_cron "$dir_list_tmp/${uniq_path}_scripts.list" "$dir_list_tmp/${uniq_path}_user.list" $list_add $list_drop
 
-    if [[ -s $list_drop ]]; then
+  local list_add="$dir_list_tmp/${uniq_path}_add.list"
-        output_list_add_drop $list_drop "失效"
+  local list_drop="$dir_list_tmp/${uniq_path}_drop.list"
-        if [[ ${AutoDelCron} == true ]]; then
+  diff_cron "$dir_list_tmp/${uniq_path}_scripts.list" "$dir_list_tmp/${uniq_path}_user.list" $list_add $list_drop
-            del_cron $list_drop $uniq_path
+
-        fi
+  if [[ -s $list_drop ]]; then
+    output_list_add_drop $list_drop "失效"
+    if [[ ${autoDelCron} == true ]]; then
+      del_cron $list_drop $uniq_path
     fi
-    if [[ -s $list_add ]]; then
+  fi
-        output_list_add_drop $list_add "新"
+  if [[ -s $list_add ]]; then
-        if [[ ${AutoAddCron} == true ]]; then
+    output_list_add_drop $list_add "新"
-            add_cron $list_add $uniq_path
+    if [[ ${autoAddCron} == true ]]; then
-        fi
+      add_cron $list_add $uniq_path
     fi
-    cd $dir_current
+  fi
+  cd $dir_current
 }
 
 ## 生成脚本的路径清单文件
 gen_list_repo() {
-    local dir_current=$(pwd)
+  local dir_current=$(pwd)
-    local repo_path="$1"
+  local repo_path="$1"
-    local author="$2"
+  local author="$2"
-    local path="$3"
+  local path="$3"
-    local blackword="$4"
+  local blackword="$4"
-    local dependence="$5"
+  local dependence="$5"
 
-    rm -f $dir_list_tmp/${uniq_path}*.list &>/dev/null
+  rm -f $dir_list_tmp/${uniq_path}*.list &>/dev/null
 
+  cd ${repo_path}
+
+  local cmd="find ."
+  local index=0
+  if [[ $6 ]]; then
+    file_extensions="$6"
+    if [[ $file_extensions =~ "|" ]]; then
+      file_extensions=$(echo $file_extensions | sed 's/|/ /g')
+    fi
+  fi
+  for extension in $file_extensions; do
+    if [[ $index -eq 0 ]]; then
+      cmd="${cmd} -name \"*.${extension}\""
+    else
+      cmd="${cmd} -o -name \"*.${extension}\""
+    fi
+    let index+=1
+  done
+  files=$(eval $cmd | sed 's/^..//')
+  if [[ $path ]]; then
+    files=$(echo "$files" | egrep $path)
+  fi
+  if [[ $blackword ]]; then
+    files=$(echo "$files" | egrep -v $blackword)
+  fi
+
+  cp -f $file_notify_js "${dir_scripts}/${uniq_path}"
+  cp -f $file_notify_py "${dir_scripts}/${uniq_path}"
+
+  if [[ $dependence ]]; then
     cd ${repo_path}
-
+    results=$(eval $cmd | sed 's/^..//' | egrep $dependence)
-    local cmd="find ."
+    for _file in ${results}; do
-    local index=0
+      file_path=$(dirname $_file)
-    if [[ $6 ]]; then
+      make_dir "${dir_scripts}/${uniq_path}/${file_path}"
-        file_extensions="$6"
+      cp -f $_file "${dir_scripts}/${uniq_path}/${file_path}"
-        if [[ $file_extensions =~ "|" ]]; then
-            file_extensions=$(echo $file_extensions | sed 's/|/ /g')
-        fi
-    fi
-    for extension in $file_extensions; do
-        if [[ $index -eq 0 ]]; then
-            cmd="${cmd} -name \"*.${extension}\""
-        else
-            cmd="${cmd} -o -name \"*.${extension}\""
-        fi
-        let index+=1
     done
-    files=$(eval $cmd | sed 's/^..//')
+  fi
-    if [[ $path ]]; then
-        files=$(echo "$files" | egrep $path)
-    fi
-    if [[ $blackword ]]; then
-        files=$(echo "$files" | egrep -v $blackword)
-    fi
 
-    cp -f $file_notify_js "${dir_scripts}/${uniq_path}"
+  if [[ -d $dir_dep ]]; then
-    cp -f $file_notify_py "${dir_scripts}/${uniq_path}"
+    cp -rf $dir_dep/* "${dir_scripts}/${uniq_path}" &>/dev/null
+  fi
 
-    if [[ $dependence ]]; then
+  for file in ${files}; do
-        cd ${repo_path}
+    filename=$(basename $file)
-        results=$(eval $cmd | sed 's/^..//' | egrep $dependence)
+    cp -f $file "$dir_scripts/${uniq_path}/${filename}"
-        for _file in ${results}; do
+    echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
-            file_path=$(dirname $_file)
+    # 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}')
-            make_dir "${dir_scripts}/${uniq_path}/${file_path}"
+    # if [[ $cron_id ]]; then
-            cp -f $_file "${dir_scripts}/${uniq_path}/${file_path}"
+    #   result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
-        done
+    # 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"
-    if [[ -d $dir_dep ]]; then
+  cd $dir_current
-        cp -rf $dir_dep/* "${dir_scripts}/${uniq_path}" &>/dev/null
-    fi
-
-    for file in ${files}; do
-        filename=$(basename $file)
-        cp -f $file "$dir_scripts/${uniq_path}/${filename}"
-        echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
-        cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
-        if [[ $cron_id ]]; then
-            result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
-        fi
-    done
-    grep -E "${cmd_task} ${uniq_path}" ${list_crontab_user} | perl -pe "s|.*ID=(.*) ${cmd_task} (${uniq_path}.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${uniq_path}_user.list"
-    cd $dir_current
 }
 
 get_uniq_path() {
-    local url="$1"
+  local url="$1"
-    local branch="$2"
+  local branch="$2"
-    local urlTmp="${url%*/}"
+  local urlTmp="${url%*/}"
-    local repoTmp="${urlTmp##*/}"
+  local repoTmp="${urlTmp##*/}"
-    local repo="${repoTmp%.*}"
+  local repo="${repoTmp%.*}"
-    local tmp="${url%/*}"
+  local tmp="${url%/*}"
-    local authorTmp1="${tmp##*/}"
+  local authorTmp1="${tmp##*/}"
-    local authorTmp2="${authorTmp1##*:}"
+  local authorTmp2="${authorTmp1##*:}"
-    local author="${authorTmp2##*.}"
+  local author="${authorTmp2##*.}"
 
-    uniq_path="${author}_${repo}"
+  uniq_path="${author}_${repo}"
-    [[ $branch ]] && uniq_path="${uniq_path}_${branch}"
+  [[ $branch ]] && uniq_path="${uniq_path}_${branch}"
 }
 
 main() {
-    ## for ql update
+  ## for ql update
-    show_log="false"
+  show_log="false"
-    while getopts ":l" opt
+  while getopts ":l" opt; do
-    do
+    case $opt in
-        case $opt in
+    l)
-            l)
+      show_log="true"
-                show_log="true"
+      ;;
-                ;;
-        esac
-    done
-    [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
-
-    local p1=$1
-    local p2=$2
-    local p3=$3
-    local p4=$4
-    local p5=$5
-    local p6=$6
-    local p7=$7
-    local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    local log_path="$dir_log/update/${log_time}_$p1.log"
-    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-
-    case $p1 in
-    update)
-        cmd=">> $log_path 2>&1"
-        [[ "$show_log" == "true" ]] && cmd=""
-        eval echo -e "## 开始执行... $begin_time\n" $cmd
-        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-        eval update_qinglong "$2" $cmd
-        ;;
-    extra)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
-        run_extra_shell >>$log_path
-        ;;
-    repo)
-        get_uniq_path "$p2" "$p6"
-        if [[ -n $p2 ]]; then
-            update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7"
-        else
-            echo -e "命令输入错误...\n"
-            usage
-        fi
-        ;;
-    raw)
-        get_uniq_path "$p2"
-        if [[ -n $p2 ]]; then
-            update_raw "$p2"
-        else
-            echo -e "命令输入错误...\n"
-            usage
-        fi
-        ;;
-    rmlog)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
-        . $dir_shell/rmlog.sh "$p2" >>$log_path
-        ;;
-    bot)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
-        . $dir_shell/bot.sh >>$log_path
-        ;;
-    check)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
-        . $dir_shell/check.sh >>$log_path
-        ;;
-    resetlet)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
-        echo -e "重置登录错误次数成功 \n $auth_value" >>$log_path
-        echo "$auth_value" >$file_auth_user
-        ;;
-    resettfa)
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
-        echo -e "禁用两步验证成功 \n $auth_value" >>$log_path
-        echo "$auth_value" >$file_auth_user
-        ;;
-    *)
-        echo -e "命令输入错误...\n"
-        usage
-        ;;
     esac
-    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
+  done
-    local diff_time=$(diff_time "%Y-%m-%d %H:%M:%S" "$begin_time" "$end_time")
+  [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
-    if [[ $p1 != "repo" ]] && [[ $p1 != "raw" ]]; then
+
-        echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >>$log_path
+  local p1="${1}"
-        cat $log_path
+  local p2="${2}"
+  local p3="${3}"
+  local p4="${4}"
+  local p5="${5}"
+  local p6="${6}"
+  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")
+  local log_path="${log_dir}/${log_time}.log"
+  local file_path="$dir_log/$log_path"
+
+  cmd=">> $file_path 2>&1"
+  [[ "$show_log" == "true" ]] && cmd=""
+
+  local time_format="%Y-%m-%d %H:%M:%S"
+  local time=$(date "+$time_format")
+  local begin_timestamp=$(format_timestamp "$time_format" "$time")
+  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
+
+  local begin_time=$(format_time "$time_format" "$time")
+
+  if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
+    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+  fi
+
+  if [[ -s $task_error_log_path ]]; then
+    eval cat $task_error_log_path $cmd
+    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
+    eval echo $cmd
+  fi
+
+  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
+    eval echo -e "请移除 -l 参数" $cmd
+    exit 1
+  fi
+
+  case $p1 in
+  update)
+    eval update_qinglong "$2" $cmd
+    ;;
+  extra)
+    eval run_extra_shell $cmd
+    ;;
+  repo)
+    get_uniq_path "$p2" "$p6"
+    if [[ -n $p2 ]]; then
+      update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7" "$p8" "$p9" "$p10"
+    else
+      eval echo -e "命令输入错误...\\\n" $cmd
+      eval usage $cmd
     fi
+    ;;
+  raw)
+    get_uniq_path "$p2"
+    if [[ -n $p2 ]]; then
+      update_raw "$p2" "$p3" "$p4"
+    else
+      eval echo -e "命令输入错误...\\\n" $cmd
+      eval usage $cmd
+    fi
+    ;;
+  rmlog)
+    eval . $dir_shell/rmlog.sh "$p2" $cmd
+    ;;
+  bot)
+    eval . $dir_shell/bot.sh $cmd
+    ;;
+  check)
+    eval . $dir_shell/check.sh $cmd
+    ;;
+  resetlet)
+    auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
+    echo "$auth_value" >$file_auth_user
+    eval echo -e "重置登录错误次数成功" $cmd
+    ;;
+  resettfa)
+    auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
+    echo "$auth_value" >$file_auth_user
+    eval echo -e "禁用两步验证成功" $cmd
+    ;;
+  *)
+    eval echo -e "命令输入错误...\\\n" $cmd
+    eval usage $cmd
+    ;;
+  esac
+
+  local etime=$(date "+$time_format")
+  local end_time=$(format_time "$time_format" "$etime")
+  local end_timestamp=$(format_timestamp "$time_format" "$etime")
+  local diff_time=$(($end_timestamp - $begin_timestamp))
+  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+
+  if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒　　　　　" $cmd
+  fi
+
+  if [[ -f $file_path ]]; then
+    cat $file_path
+  fi
 }
 
 main "$@"

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/tag.tsx

@@ -50,6 +50,7 @@ const EditableTagGroup = ({
         {tag}
       </Tag>
     );
+
     return (
       <span key={tag} style={{ display: 'inline-block', marginBottom: 8 }}>
         {tagElem}

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

@@ -0,0 +1,48 @@
+import { useMemo, useState } from 'react';
+
+export default (
+  treeData: any[],
+  searchValue: string,
+  {
+    treeNodeFilterProp,
+  }: {
+    treeNodeFilterProp: string;
+  },
+) => {
+  return useMemo(() => {
+    const keys: string[] = [];
+
+    if (!searchValue) {
+      return { treeData, keys };
+    }
+
+    const upperStr = searchValue.toUpperCase();
+    function filterOptionFunc(_: string, dataNode: any[]) {
+      const value = dataNode[treeNodeFilterProp as any];
+
+      return String(value).toUpperCase().includes(upperStr);
+    }
+
+    function dig(list: any[], keepAll: boolean = false): any[] {
+      return list
+        .map((dataNode) => {
+          const children = dataNode.children;
+
+          const match = keepAll || filterOptionFunc!(searchValue, dataNode);
+          const childList = dig(children || [], match);
+
+          if (match || childList.length) {
+            childList.length && keys.push(dataNode.key);
+            return {
+              ...dataNode,
+              children: childList,
+            };
+          }
+          return null;
+        })
+        .filter((node) => node);
+    }
+
+    return { treeData: dig(treeData), keys };
+  }, [treeData, searchValue, treeNodeFilterProp]);
+};

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: {
@@ -68,18 +69,18 @@ export default {
         icon: <IconFont type="ql-icon-dependence" />,
         component: '@/pages/dependence/index',
       },
+      {
+        path: '/log',
+        name: '日志管理',
+        icon: <IconFont type="ql-icon-log" />,
+        component: '@/pages/log/index',
+      },
       {
         path: '/diff',
         name: '对比工具',
         icon: <IconFont type="ql-icon-diff" />,
         component: '@/pages/diff/index',
       },
-      {
-        path: '/log',
-        name: '任务日志',
-        icon: <IconFont type="ql-icon-log" />,
-        component: '@/pages/log/index',
-      },
       {
         path: '/setting',
         name: '系统设置',
@@ -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;
 }
 
@@ -56,7 +72,13 @@
     overflow: auto;
     height: 100%;
     background-color: @component-background;
-    padding: 16px;
+    padding: 12px;
+  }
+}
+
+.ql-container-wrapper-has-tab {
+  .ant-pro-grid-content.wide .ant-pro-page-container-children-content {
+    padding-top: 0;
   }
 }
 
@@ -136,7 +158,7 @@
     flex: 1;
 
     .ant-pro-grid-content-children {
-      height: calc(100% - 36px);
+      height: 100%;
 
       > div,
       .log-container,
@@ -155,7 +177,7 @@
     &.env-wrapper,
     &.config-wrapper {
       .CodeMirror {
-        width: calc(100vw - 80px);
+        width: calc(100vw - 24px);
       }
     }
   }
@@ -173,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;
@@ -237,43 +259,49 @@
   font-size: 13px;
 }
 
-[data-dark='true'] {
+/* Change autocomplete styles in WebKit */
-  /* Change autocomplete styles in WebKit */
+input:-webkit-autofill,
-  input:-webkit-autofill,
+input:-webkit-autofill:hover,
-  input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
-  input:-webkit-autofill:focus,
+textarea:-webkit-autofill,
-  textarea:-webkit-autofill,
+textarea:-webkit-autofill:hover,
-  textarea:-webkit-autofill:hover,
+textarea:-webkit-autofill:focus,
-  textarea:-webkit-autofill:focus,
+select:-webkit-autofill,
-  select:-webkit-autofill,
+select:-webkit-autofill:hover,
-  select:-webkit-autofill:hover,
+select:-webkit-autofill:focus {
-  select:-webkit-autofill:focus {
+  box-shadow: none;
-    border: 1px solid @border-color-base;
+  transition: background-color 5000s ease-in-out 0s;
-    box-shadow: none;
+  -webkit-text-fill-color: @text-color;
-    transition: background-color 5000s ease-in-out 0s;
+  caret-color: @text-color;
-    -webkit-text-fill-color: @text-color;
+  color: @text-color;
-    caret-color: #e8e6f3 !important;
-  }
-
-  ::placeholder {
-    opacity: 0.5 !important;
-  }
-
-  .ant-select-selection-placeholder {
-    opacity: 0.5 !important;
-  }
 }
 
-.ant-pro-page-container-children-content {
+::placeholder {
-  margin: 18px 18px 18px;
+  opacity: 0.5 !important;
+}
+
+.ant-select-selection-placeholder {
+  opacity: 0.5 !important;
 }
 
 .ant-pro-basicLayout-content {
-  margin: 18px;
+  margin: 12px;
 
   .ant-pro-page-container {
-    margin: -18px -18px -18px;
+    margin: -12px;
   }
+
+  .ant-pro-page-container-warp .ant-page-header {
+    border-bottom: 1px solid #eee;
+  }
+
+  .ant-pro-page-container-children-content {
+    margin: 0;
+  }
+}
+
+.ant-pro-global-header {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.03);
 }
 
 .ant-menu-item.ant-pro-sider-collapsed-button {
@@ -299,22 +327,11 @@
 .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;
   }
@@ -331,3 +348,41 @@
     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

@@ -2,7 +2,7 @@ import React, { useEffect, useState, useRef } from 'react';
 import ProLayout, { PageLoading } from '@ant-design/pro-layout';
 import * as DarkReader from '@umijs/ssr-darkreader';
 import defaultProps from './defaultProps';
-import { Link, history } from 'umi';
+import { Link, history, Outlet, useLocation } from '@umijs/max';
 import {
   LogoutOutlined,
   MenuFoldOutlined,
@@ -13,23 +13,60 @@ 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';
 import { init } from '../utils/init';
+import 'codemirror/mode/javascript/javascript';
+import 'codemirror/mode/python/python';
+import 'codemirror/mode/shell/shell';
 
-export default function (props: any) {
+export interface SharedContext {
+  headerStyle: React.CSSProperties;
+  isPhone: boolean;
+  theme: 'vs' | 'vs-dark';
+  user: any;
+  reloadUser: (needLoading?: boolean) => void;
+  reloadTheme: () => void;
+  socketMessage: any;
+  systemInfo: TSystemInfo;
+}
+
+interface TSystemInfo {
+  branch: 'develop' | 'master';
+  isInitialized: boolean;
+  lastCommitId: string;
+  lastCommitTime: number;
+  version: string;
+  changeLog: string;
+  changeLogLink: string;
+}
+
+export default function () {
+  const location = useLocation();
   const ctx = useCtx();
   const { theme, reloadTheme } = useTheme();
   const [user, setUser] = useState<any>({});
   const [loading, setLoading] = useState<boolean>(true);
-  const [systemInfo, setSystemInfo] = useState<{ isInitialized: boolean }>();
+  const [systemInfo, setSystemInfo] = useState<TSystemInfo>();
   const ws = useRef<any>(null);
   const [socketMessage, setSocketMessage] = useState<any>();
   const [collapsed, setCollapsed] = useState(false);
+  const [initLoading, setInitLoading] = useState<boolean>(true);
   const {
     enable: enableDarkMode,
     disable: disableDarkMode,
@@ -53,17 +90,16 @@ export default function (props: any) {
           setSystemInfo(data);
           if (!data.isInitialized) {
             history.push('/initialization');
-            setLoading(false);
           } else {
+            init(data.version);
             getUser();
           }
-        } else {
-          message.error(data);
         }
       })
       .catch((error) => {
         console.log(error);
-      });
+      })
+      .finally(() => setInitLoading(false));
   };
 
   const getUser = (needLoading = true) => {
@@ -73,11 +109,9 @@ export default function (props: any) {
       .then(({ code, data }) => {
         if (code === 200 && data.username) {
           setUser(data);
-          if (props.location.pathname === '/') {
+          if (location.pathname === '/') {
             history.push('/crontab');
           }
-        } else {
-          message.error(data);
         }
         needLoading && setLoading(false);
       })
@@ -94,7 +128,7 @@ export default function (props: any) {
     if (systemInfo && systemInfo.isInitialized && !user) {
       getUser();
     }
-  }, [props.location.pathname]);
+  }, [location.pathname]);
 
   useEffect(() => {
     if (!systemInfo) {
@@ -112,7 +146,6 @@ export default function (props: any) {
 
   useEffect(() => {
     vhCheck();
-    init();
 
     const _theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
     if (typeof window === 'undefined') return;
@@ -136,9 +169,11 @@ export default function (props: any) {
   }, []);
 
   useEffect(() => {
-    if (!user) return;
+    if (!user || !user.username) return;
     ws.current = new SockJS(
-      `${location.origin}/api/ws?token=${localStorage.getItem(config.authKey)}`,
+      `${window.location.origin}/api/ws?token=${localStorage.getItem(
+        config.authKey,
+      )}`,
     );
 
     ws.current.onmessage = (e: any) => {
@@ -146,9 +181,9 @@ export default function (props: any) {
         const data = JSON.parse(e.data);
         if (data.type === 'ping') {
           if (data && data.message === 'hanhh') {
-            console.log('websocket连接成功', e);
+            console.log('WS connection succeeded !!!');
           } else {
-            console.log('websocket连接失败', e);
+            console.log('WS connection Failed !!!', e);
           }
         }
         setSocketMessage(data);
@@ -183,30 +218,28 @@ export default function (props: any) {
     };
   }, []);
 
-  if (
+  if (initLoading) {
-    ['/login', '/initialization', '/error'].includes(props.location.pathname)
+    return <PageLoading />;
-  ) {
+  }
-    document.title = `${
+
-      (config.documentTitleMap as any)[props.location.pathname]
+  if (['/login', '/initialization', '/error'].includes(location.pathname)) {
-    } - 控制面板`;
+    if (systemInfo?.isInitialized && location.pathname === '/initialization') {
-    if (
-      systemInfo?.isInitialized &&
-      props.location.pathname === '/initialization'
-    ) {
       history.push('/crontab');
     }
 
-    if (systemInfo || props.location.pathname === '/error') {
+    if (systemInfo || location.pathname === '/error') {
-      return React.Children.map(props.children, (child) => {
+      return (
-        return React.cloneElement(child, {
+        <Outlet
-          ...ctx,
+          context={{
-          theme,
+            ...ctx,
-          user,
+            theme,
-          reloadUser,
+            user,
-          reloadTheme,
+            reloadUser,
-          ws: ws.current,
+            reloadTheme,
-        });
+            ws: ws.current,
-      });
+          }}
+        />
+      );
     }
   }
 
@@ -216,43 +249,54 @@ export default function (props: any) {
     !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 />
   ) : (
     <ProLayout
-      selectedKeys={[props.location.pathname]}
+      selectedKeys={[location.pathname]}
       loading={loading}
       ErrorBoundary={Sentry.ErrorBoundary}
-      logo={<Image preview={false} src="http://qn.whyour.cn/logo.png" />}
+      logo={<Image preview={false} src="https://qn.whyour.cn/logo.png" />}
+      // @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>
         </>
       }
@@ -267,22 +311,21 @@ export default function (props: any) {
         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"
                 size="small"
                 icon={<UserOutlined />}
-                src={`/api/static/${user.avatar}`}
+                src={user.avatar ? `/api/static/${user.avatar}` : ''}
               />
               <span style={{ marginLeft: 5 }}>{user.username}</span>
             </span>
@@ -298,13 +341,13 @@ export default function (props: any) {
           }}
         >
           {!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"
                   size="small"
                   icon={<UserOutlined />}
-                  src={`/api/static/${user.avatar}`}
+                  src={user.avatar ? `/api/static/${user.avatar}` : ''}
                 />
                 <span style={{ marginLeft: 5 }}>{user.username}</span>
               </span>
@@ -320,16 +363,17 @@ export default function (props: any) {
       )}
       {...defaultProps}
     >
-      {React.Children.map(props.children, (child) => {
+      <Outlet
-        return React.cloneElement(child, {
+        context={{
           ...ctx,
           theme,
           user,
           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/config/index.tsx

@@ -11,8 +11,11 @@ import { PageContainer } from '@ant-design/pro-layout';
 import { request } from '@/utils/http';
 import Editor from '@monaco-editor/react';
 import { Controlled as CodeMirror } from 'react-codemirror2';
+import { useOutletContext } from '@umijs/max';
+import { SharedContext } from '@/layouts';
 
-const Config = ({ headerStyle, isPhone, theme }: any) => {
+const Config = () => {
+  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
   const [value, setValue] = useState('');
   const [loading, setLoading] = useState(true);
   const [title, setTitle] = useState('config.sh');
@@ -22,8 +25,10 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
   const [confirmLoading, setConfirmLoading] = useState(false);
 
   const getConfig = (name: string) => {
-    request.get(`${config.apiPrefix}configs/${name}`).then((data: any) => {
+    request.get(`${config.apiPrefix}configs/${name}`).then(({ code, data }) => {
-      setValue(data.data);
+      if (code === 200) {
+        setValue(data);
+      }
     });
   };
 
@@ -31,8 +36,10 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
     setLoading(true);
     request
       .get(`${config.apiPrefix}configs/files`)
-      .then((data: any) => {
+      .then(({ code, data }) => {
-        setData(data.data);
+        if (code === 200) {
+          setData(data);
+        }
       })
       .finally(() => setLoading(false));
   };
@@ -47,8 +54,10 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
       .post(`${config.apiPrefix}configs/save`, {
         data: { content, name: select },
       })
-      .then((data: any) => {
+      .then(({ code, data }) => {
-        message.success(data.message);
+        if (code === 200) {
+          message.success('保存成功');
+        }
         setConfirmLoading(false);
       });
   };
@@ -71,6 +80,7 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
       loading={loading}
       extra={[
         <TreeSelect
+          treeExpandAction="click"
           className="config-select"
           value={select}
           dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}

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;
 
@@ -103,12 +104,10 @@ const CronDetailModal = ({
           fontSize: 12,
           lineNumbersMinChars: 3,
           fontFamily: 'Source Code Pro',
-          folding: false,
           glyphMargin: false,
           wordWrap: 'on',
         }}
         onMount={(editor, monaco) => {
-          console.log(monaco);
           editorRef.current = editor;
         }}
       />
@@ -124,9 +123,11 @@ const CronDetailModal = ({
       .get(
         `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
       )
-      .then((data) => {
+      .then(({ code, data }) => {
-        setLog(data.data);
+        if (code === 200) {
-        setIsLogModalVisible(true);
+          setLog(data);
+          setIsLogModalVisible(true);
+        }
       });
   };
 
@@ -138,34 +139,28 @@ const CronDetailModal = ({
     setLoading(true);
     request
       .get(`${config.apiPrefix}crons/${cron.id}/logs`)
-      .then((data: any) => {
+      .then(({ code, data }) => {
-        if (data.code === 200) {
+        if (code === 200) {
-          setLogs(data.data);
+          setLogs(data);
         }
       })
       .finally(() => setLoading(false));
   };
 
   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, s] = cmd[1].split('/');
-      if (!s) {
-        s = p;
-        p = '';
-      }
       setScriptInfo({ parent: p, filename: s });
       request
         .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
-        .then((data) => {
+        .then(({ code, data }) => {
-          setValue(data.data);
+          if (code === 200) {
+            setValue(data);
+          }
         });
-    } else {
+    } else if (result) {
       setValidTabs([validTabs[0]]);
     }
   };
@@ -195,12 +190,10 @@ const CronDetailModal = ({
                 content,
               },
             })
-            .then((_data: any) => {
+            .then(({ code, data }) => {
-              if (_data.code === 200) {
+              if (code === 200) {
                 setValue(content);
                 message.success(`保存成功`);
-              } else {
-                message.error(_data);
               }
               resolve(null);
             })
@@ -228,14 +221,12 @@ const CronDetailModal = ({
       onOk() {
         request
           .put(`${config.apiPrefix}crons/run`, { data: [currentCron.id] })
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               setCurrentCron({ ...currentCron, status: CrontabStatus.running });
               setTimeout(() => {
                 getLogs();
               }, 1000);
-            } else {
-              message.error(data);
             }
           });
       },
@@ -260,11 +251,9 @@ const CronDetailModal = ({
       onOk() {
         request
           .put(`${config.apiPrefix}crons/stop`, { data: [currentCron.id] })
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               setCurrentCron({ ...currentCron, status: CrontabStatus.idle });
-            } else {
-              message.error(data);
             }
           });
       },
@@ -297,14 +286,12 @@ const CronDetailModal = ({
               data: [currentCron.id],
             },
           )
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               setCurrentCron({
                 ...currentCron,
                 isDisabled: currentCron.isDisabled === 1 ? 0 : 1,
               });
-            } else {
-              message.error(data);
             }
           });
       },
@@ -337,14 +324,12 @@ const CronDetailModal = ({
               data: [currentCron.id],
             },
           )
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               setCurrentCron({
                 ...currentCron,
                 isPinned: currentCron.isPinned === 1 ? 0 : 1,
               });
-            } else {
-              message.error(data);
             }
           });
       },
@@ -379,7 +364,7 @@ const CronDetailModal = ({
             {currentCron.labels?.length > 0 &&
               currentCron.labels[0] !== '' &&
               currentCron.labels?.map((label: string, i: number) => (
-                <Tag color="blue" style={{ marginRight: 5 }}>
+                <Tag key={label} color="blue" style={{ marginRight: 5 }}>
                   {label}
                 </Tag>
               ))}
@@ -442,7 +427,7 @@ const CronDetailModal = ({
         </div>
       }
       centered
-      visible={visible}
+      open={visible}
       forceRender
       footer={false}
       onCancel={() => handleCancel()}

src/pages/crontab/index.less

@@ -2,21 +2,13 @@
   margin-bottom: 0 !important;
 }
 
-.cron {
-  &:hover {
-    cursor: pointer;
-  }
-}
-
 .crontab-detail {
   .card-wrapper {
-    height: 80vh;
-    height: calc(80vh - var(--vh-offset, 0px));
-
     .ant-card:last-child {
       .ant-card-body {
-        height: calc(80vh - 238px);
+        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;
       }
     }
@@ -101,3 +93,111 @@
     background: #fafafa;
   }
 }
+
+.crontab-view {
+  .ant-tabs-nav-wrap {
+    flex: unset !important;
+  }
+
+  .ant-tabs-nav-operations {
+    position: absolute;
+    visibility: hidden;
+    pointer-events: none;
+  }
+
+  .view-more {
+    margin-left: 32px;
+    padding: 8px 0;
+    cursor: pointer;
+
+    .ant-tabs-ink-bar {
+      width: 0;
+    }
+
+    &:hover,
+    &:focus-visible {
+      color: #1890ff;
+
+      .ant-tabs-ink-bar {
+        width: 50px;
+      }
+    }
+
+    &.active {
+      color: #1890ff;
+
+      .ant-tabs-ink-bar {
+        width: 50px;
+      }
+    }
+  }
+
+  &.more-active {
+    .ant-tabs-nav-list {
+      .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
+        color: unset;
+      }
+
+      .ant-tabs-ink-bar {
+        width: 0 !important;
+      }
+    }
+  }
+}
+
+.view-create-modal-filters {
+  display: flex;
+
+  .ant-space-item:nth-child(3) {
+    flex: 1;
+  }
+}
+
+.view-create-modal-sorts {
+  display: flex;
+
+  .ant-space-item:nth-child(1) {
+    flex: 1;
+  }
+}
+
+tr.drop-over-downward td {
+  border-bottom: 2px dashed #1890ff;
+}
+
+tr.drop-over-upward td {
+  border-top: 2px dashed #1890ff;
+}
+
+.view-manage-modal {
+  .ant-modal-body {
+    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, { PureComponent, Fragment, useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef, useMemo } from 'react';
 import {
   Button,
   message,
@@ -12,6 +12,9 @@ import {
   Typography,
   Input,
   Popover,
+  Tabs,
+  TablePaginationConfig,
+  MenuProps,
 } from 'antd';
 import {
   ClockCircleOutlined,
@@ -27,6 +30,11 @@ import {
   PauseCircleOutlined,
   FieldTimeOutlined,
   PushpinOutlined,
+  DownOutlined,
+  SettingOutlined,
+  PlusOutlined,
+  UnorderedListOutlined,
+  CheckOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -36,9 +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 { history } from 'umi';
 import './index.less';
+import ViewCreateModal from './viewCreateModal';
+import ViewManageModal from './viewManageModal';
+import { FilterValue, SorterResult } from 'antd/lib/table/interface';
+import { SharedContext } from '@/layouts';
+import useTableScrollHeight from '@/hooks/useTableScrollHeight';
+import { getCommandScript, parseCrontab } from '@/utils';
+import { ColumnProps } from 'antd/lib/table';
+import { useVT } from 'virtualizedtableforantd4';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -70,22 +85,37 @@ enum OperationPath {
   'unpin',
 }
 
-const Crontab = ({ headerStyle, isPhone, theme }: any) => {
+export interface ICrontab {
-  const columns: any = [
+  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: ColumnProps<ICrontab>[] = [
     {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
       width: 150,
-      align: 'center' as const,
       render: (text: string, record: any) => (
         <>
           <a
             onClick={() => {
-              goToScriptManager(record);
+              setDetailCron(record);
+              setIsDetailModalVisible(true);
             }}
           >
-            {record.labels?.length > 0 && record.labels[0] !== '' ? (
+            {record.labels?.length > 0 && record.labels[0] !== '' && false ? (
               <Popover
                 placement="right"
                 trigger={isPhone ? 'click' : 'hover'}
@@ -94,10 +124,12 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                     {record.labels?.map((label: string) => (
                       <Tag
                         color="blue"
+                        key={label}
                         style={{ cursor: 'point' }}
                         onClick={(e) => {
                           e.stopPropagation();
                           setSearchValue(`label:${label}`);
+                          setSearchText(`label:${label}`);
                         }}
                       >
                         <a>{label}</a>
@@ -122,33 +154,35 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         </>
       ),
       sorter: {
-        compare: (a: any, b: any) => a.name.localeCompare(b.name),
+        compare: (a, b) => a?.name?.localeCompare(b?.name),
-        multiple: 2,
       },
     },
     {
-      title: '命令',
+      title: '命令/脚本',
       dataIndex: 'command',
       key: 'command',
-      width: 250,
+      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 }}
           >
-            {text}
+            <a
+              onClick={() => {
+                goToScriptManager(record);
+              }}
+            >
+              {text}
+            </a>
           </Paragraph>
         );
       },
       sorter: {
         compare: (a: any, b: any) => a.command.localeCompare(b.command),
-        multiple: 3,
       },
     },
     {
@@ -156,22 +190,21 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       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),
-        multiple: 1,
       },
     },
     {
       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
@@ -192,14 +225,15 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
     },
     {
       title: '最后运行时长',
-      align: 'center' as const,
       width: 120,
+      dataIndex: 'last_running_time',
+      key: 'last_running_time',
       sorter: {
         compare: (a: any, b: any) => {
           return a.last_running_time - b.last_running_time;
         },
       },
-      render: (text: string, record: any) => {
+      render: (text, record) => {
         return record.last_running_time
           ? diffTime(record.last_running_time)
           : '-';
@@ -207,14 +241,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
     },
     {
       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, {
@@ -223,13 +256,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
           .replace(' 24:', ' 00:');
       },
     },
-
     {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
-      align: 'center' as const,
+      width: 88,
-      width: 85,
       filters: [
         {
           text: '运行中',
@@ -248,14 +279,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
           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) && (
             <>
@@ -290,9 +314,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
     {
       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">
@@ -346,64 +369,73 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
   const [logCron, setLogCron] = useState<any>();
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
-  const [currentPage, setCurrentPage] = useState(1);
+  const [pageConf, setPageConf] = useState<{
-  const [pageSize, setPageSize] = useState(20);
+    page: number;
-  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
+    size: number;
+    sorter: any;
+    filters: any;
+  }>({} as any);
+  const [viewConf, setViewConf] = useState<any>();
   const [isDetailModalVisible, setIsDetailModalVisible] = useState(false);
   const [detailCron, setDetailCron] = useState<any>();
   const [searchValue, setSearchValue] = useState('');
+  const [total, setTotal] = useState<number>();
+  const [isCreateViewModalVisible, setIsCreateViewModalVisible] =
+    useState(false);
+  const [isViewManageModalVisible, setIsViewManageModalVisible] =
+    useState(false);
+  const [cronViews, setCronViews] = useState<any[]>([]);
+  const [enabledCronViews, setEnabledCronViews] = useState<any[]>([]);
+  const [moreMenuActive, setMoreMenuActive] = useState(false);
+  const tableRef = useRef<any>();
+  const tableScrollHeight = useTableScrollHeight(tableRef);
 
   const goToScriptManager = (record: any) => {
-    const cmd = record.command.split(' ') as string[];
+    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, s] = cmd[1].split('/');
-      if (!s) {
-        s = p;
-        p = '';
-      }
       history.push(`/script?p=${p}&s=${s}`);
-    } else if (cmd[1] === 'repo') {
+    } else if (result) {
-      location.href = cmd[2];
+      location.href = result;
     }
   };
 
   const getCrons = () => {
     setLoading(true);
+    const { page, size, sorter, filters } = pageConf;
+    let url = `${
+      config.apiPrefix
+    }crons?searchValue=${searchText}&page=${page}&size=${size}&filters=${JSON.stringify(
+      filters,
+    )}`;
+    if (sorter && sorter.column && sorter.order) {
+      url += `&sorter=${JSON.stringify({
+        field: sorter.column.key,
+        type: sorter.order === 'ascend' ? 'ASC' : 'DESC',
+      })}`;
+    }
+    if (viewConf) {
+      url += `&queryString=${JSON.stringify({
+        filters: viewConf.filters,
+        sorts: viewConf.sorts,
+        filterRelation: viewConf.filterRelation || 'and',
+      })}`;
+    }
     request
-      .get(`${config.apiPrefix}crons?searchValue=${searchText}`)
+      .get(url)
-      .then((data: any) => {
+      .then(({ code, data: _data }) => {
-        setValue(
+        if (code === 200) {
-          data.data
+          const { data, total } = _data;
-            .sort((a: any, b: any) => {
+          setValue(
-              const sortA =
+            data.map((x) => {
-                a.isPinned && a.status !== 0
-                  ? 5
-                  : a.isDisabled && a.status !== 0
-                  ? 4
-                  : a.status;
-              const sortB =
-                b.isPinned && b.status !== 0
-                  ? 5
-                  : b.isDisabled && b.status !== 0
-                  ? 4
-                  : b.status;
-              return CrontabSort[sortA] - CrontabSort[sortB];
-            })
-            .map((x) => {
               return {
                 ...x,
-                nextRunTime: cron_parser
+                nextRunTime: parseCrontab(x.schedule),
-                  .parseExpression(x.schedule)
-                  .next()
-                  .toDate(),
               };
             }),
-        );
+          );
-        setCurrentPage(1);
+          setTotal(total);
+        }
       })
       .finally(() => setLoading(false));
   };
@@ -433,8 +465,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       onOk() {
         request
           .delete(`${config.apiPrefix}crons`, { data: [record.id] })
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               message.success('删除成功');
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
@@ -442,8 +474,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                 result.splice(i, 1);
                 setValue(result);
               }
-            } else {
-              message.error(data);
             }
           });
       },
@@ -468,8 +498,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       onOk() {
         request
           .put(`${config.apiPrefix}crons/run`, { data: [record.id] })
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
               if (i !== -1) {
@@ -479,8 +509,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                 });
                 setValue(result);
               }
-            } else {
-              message.error(data);
             }
           });
       },
@@ -505,8 +533,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       onOk() {
         request
           .put(`${config.apiPrefix}crons/stop`, { data: [record.id] })
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
               if (i !== -1) {
@@ -517,8 +545,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                 });
                 setValue(result);
               }
-            } else {
-              message.error(data);
             }
           });
       },
@@ -551,8 +577,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
               data: [record.id],
             },
           )
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               const newStatus = record.isDisabled === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
@@ -563,8 +589,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                 });
                 setValue(result);
               }
-            } else {
-              message.error(data);
             }
           });
       },
@@ -597,8 +621,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
               data: [record.id],
             },
           )
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               const newStatus = record.isPinned === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
@@ -609,8 +633,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                 });
                 setValue(result);
               }
-            } else {
-              message.error(data);
             }
           });
       },
@@ -643,18 +665,15 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
     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 />
@@ -681,50 +700,30 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
     }
   };
 
-  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}`)
-      .then((data: any) => {
+      .then(({ code, data }) => {
-        const index = value.findIndex((x) => x.id === cron.id);
+        if (code === 200) {
-        const result = [...value];
+          const index = value.findIndex((x) => x.id === cron.id);
-        data.data.nextRunTime = cron_parser
+          const result = [...value];
-          .parseExpression(data.data.schedule)
+          data.nextRunTime = parseCrontab(data.schedule);
-          .next()
+          if (index !== -1) {
-          .toDate();
+            result.splice(index, 1, {
-        if (index !== -1) {
+              ...cron,
-          result.splice(index, 1, {
+              ...data,
-            ...cron,
+            });
-            ...data.data,
+            setValue(result);
-          });
+          }
-          setValue(result);
         }
       })
       .finally(() => setLoading(false));
@@ -732,22 +731,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
-
-    setTimeout(() => {
-      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll());
-      }
-    });
   };
 
   const rowSelection = {
-    selectedRowIds,
+    selectedRowKeys: selectedRowIds,
     onChange: onSelectChange,
-    selections: [
-      Table.SELECTION_ALL,
-      Table.SELECTION_INVERT,
-      Table.SELECTION_NONE,
-    ],
   };
 
   const delCrons = () => {
@@ -757,13 +745,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       onOk() {
         request
           .delete(`${config.apiPrefix}crons`, { data: selectedRowIds })
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               message.success('批量删除成功');
               setSelectedRowIds([]);
               getCrons();
-            } else {
-              message.error(data);
             }
           });
       },
@@ -782,11 +768,9 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
           .put(`${config.apiPrefix}crons/${OperationPath[operationStatus]}`, {
             data: selectedRowIds,
           })
-          .then((data: any) => {
+          .then(({ code, data }) => {
-            if (data.code === 200) {
+            if (code === 200) {
               getCrons();
-            } else {
-              message.error(data);
             }
           });
       },
@@ -796,10 +780,19 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
     });
   };
 
-  const onPageChange = (page: number, pageSize: number | undefined) => {
+  const onPageChange = (
-    setCurrentPage(page);
+    pagination: TablePaginationConfig,
-    setPageSize(pageSize as number);
+    filters: Record<string, FilterValue | null>,
-    localStorage.setItem('pageSize', pageSize + '');
+    sorter: SorterResult<any> | SorterResult<any>[],
+  ) => {
+    const { current, pageSize } = pagination;
+    setPageConf({
+      page: current as number,
+      size: pageSize as number,
+      sorter,
+      filters,
+    });
+    localStorage.setItem('pageSize', String(pageSize));
   };
 
   const getRowClassName = (record: any, index: number) => {
@@ -814,19 +807,111 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
   }, [logCron]);
 
   useEffect(() => {
-    getCrons();
+    setPageConf({ ...pageConf, page: 1 });
   }, [searchText]);
 
   useEffect(() => {
-    setPageSize(parseInt(localStorage.getItem('pageSize') || '20'));
+    if (pageConf.page && pageConf.size) {
-    setTimeout(() => {
+      getCrons();
-      setTableScrollHeight(getTableScroll());
+    }
+  }, [pageConf, viewConf]);
+
+  useEffect(() => {
+    if (viewConf && enabledCronViews && enabledCronViews.length > 0) {
+      const view = enabledCronViews.slice(4).find((x) => x.id === viewConf.id);
+      setMoreMenuActive(!!view);
+    }
+  }, [viewConf, enabledCronViews]);
+
+  useEffect(() => {
+    setPageConf({
+      page: 1,
+      size: parseInt(localStorage.getItem('pageSize') || '20'),
+      sorter: {},
+      filters: {},
     });
+    getCronViews();
   }, []);
 
+  const viewAction = (key: string) => {
+    switch (key) {
+      case 'new':
+        setIsCreateViewModalVisible(true);
+        break;
+      case 'manage':
+        setIsViewManageModalVisible(true);
+        break;
+
+      default:
+        tabClick(key);
+        break;
+    }
+  };
+
+  const menu: MenuProps = {
+    onClick: ({ key, domEvent }) => {
+      domEvent.stopPropagation();
+      viewAction(key);
+    },
+    items: [
+      ...[...enabledCronViews].slice(4).map((x) => ({
+        label: (
+          <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
+            <span>{x.name}</span>
+            {viewConf?.id === x.id && (
+              <CheckOutlined style={{ color: '#1890ff' }} />
+            )}
+          </Space>
+        ),
+        key: x.id,
+        icon: <UnorderedListOutlined />,
+      })),
+      {
+        type: 'divider' as 'group',
+      },
+      {
+        label: '新建视图',
+        key: 'new',
+        icon: <PlusOutlined />,
+      },
+      {
+        label: '视图管理',
+        key: 'manage',
+        icon: <SettingOutlined />,
+      },
+    ],
+  };
+
+  const getCronViews = () => {
+    setLoading(true);
+    request
+      .get(`${config.apiPrefix}crons/views`)
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setCronViews(data);
+          setEnabledCronViews(data.filter((x) => !x.isDisabled));
+        }
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  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"
+      className="ql-container-wrapper crontab-wrapper ql-container-wrapper-has-tab"
       title="定时任务"
       extra={[
         <Search
@@ -847,91 +932,120 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         style: headerStyle,
       }}
     >
-      {selectedRowIds.length > 0 && (
+      <Tabs
-        <div style={{ marginBottom: 16 }}>
+        defaultActiveKey="all"
-          <Button type="primary" style={{ marginBottom: 5 }} onClick={delCrons}>
+        size="small"
-            批量删除
+        tabPosition="top"
-          </Button>
+        className={`crontab-view ${moreMenuActive ? 'more-active' : ''}`}
-          <Button
+        tabBarExtraContent={
-            type="primary"
+          <Dropdown
-            onClick={() => operateCrons(0)}
+            menu={menu}
-            style={{ marginLeft: 8, marginBottom: 5 }}
+            trigger={['click']}
+            overlayStyle={{ minWidth: 200 }}
           >
-            批量启用
+            <div className={`view-more ${moreMenuActive ? 'active' : ''}`}>
-          </Button>
+              <Space>
-          <Button
+                更多
-            type="primary"
+                <DownOutlined />
-            onClick={() => operateCrons(1)}
+              </Space>
-            style={{ marginLeft: 8, marginRight: 8 }}
+              <div className="ant-tabs-ink-bar ant-tabs-ink-bar-animated"></div>
-          >
+            </div>
-            批量禁用
+          </Dropdown>
-          </Button>
+        }
-          <Button
+        onTabClick={tabClick}
-            type="primary"
+        items={[
-            style={{ marginRight: 8 }}
+          ...[...enabledCronViews].slice(0, 4).map((x) => ({
-            onClick={() => operateCrons(2)}
+            key: x.id,
-          >
+            label: x.name,
-            批量运行
+          })),
-          </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: currentPage,
-          onChange: onPageChange,
-          pageSize: pageSize,
-          showSizeChanger: true,
-          simple: isPhone,
-          defaultPageSize: 20,
-          showTotal: (total: number, range: number[]) =>
-            `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
-          pageSizeOptions: [20, 100, 500, 1000] as any,
-        }}
-        onRow={(record) => {
-          return {
-            onClick: (event) => {
-              setDetailCron(record);
-              setIsDetailModalVisible(true);
-            },
-          };
-        }}
-        dataSource={value}
-        rowKey="id"
-        size="middle"
-        scroll={{ x: 1000, y: tableScrollHeight }}
-        loading={loading}
-        rowSelection={rowSelection}
-        rowClassName={getRowClassName}
       />
+      <div ref={tableRef}>
+        {selectedRowIds.length > 0 && (
+          <div style={{ marginBottom: 16 }}>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5 }}
+              onClick={delCrons}
+            >
+              批量删除
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(0)}
+              style={{ marginLeft: 8, marginBottom: 5 }}
+            >
+              批量启用
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(1)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量禁用
+            </Button>
+            <Button
+              type="primary"
+              style={{ marginRight: 8 }}
+              onClick={() => operateCrons(2)}
+            >
+              批量运行
+            </Button>
+            <Button type="primary" onClick={() => operateCrons(3)}>
+              批量停止
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(4)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量置顶
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(5)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量取消置顶
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => setIsLabelModalVisible(true)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量修改标签
+            </Button>
+            <span style={{ marginLeft: 8 }}>
+              已选择
+              <a>{selectedRowIds?.length}</a>项
+            </span>
+          </div>
+        )}
+        <Table
+          columns={columns}
+          pagination={{
+            current: pageConf.page,
+            pageSize: pageConf.size,
+            showSizeChanger: true,
+            simple: isPhone,
+            total,
+            showTotal: (total: number, range: number[]) =>
+              `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
+            pageSizeOptions: [10, 20, 50, 100, 200, 500, total || 10000].sort(
+              (a, b) => a - b,
+            ),
+          }}
+          dataSource={value}
+          rowKey="id"
+          size="middle"
+          scroll={{ x: 1000, y: tableScrollHeight }}
+          loading={loading}
+          rowSelection={rowSelection}
+          rowClassName={getRowClassName}
+          onChange={onPageChange}
+          // components={isPhone ? undefined : vt}
+        />
+      </div>
       <CronLogModal
         visible={isLogModalVisible}
         handleCancel={() => {
@@ -964,6 +1078,29 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         theme={theme}
         isPhone={isPhone}
       />
+      <ViewCreateModal
+        visible={isCreateViewModalVisible}
+        handleCancel={(data) => {
+          setIsCreateViewModalVisible(false);
+          getCronViews();
+          if (data && data.id === viewConf.id) {
+            setViewConf({ ...viewConf, ...data });
+          }
+        }}
+      />
+      <ViewManageModal
+        cronViews={cronViews}
+        visible={isViewManageModalVisible}
+        handleCancel={() => {
+          setIsViewManageModalVisible(false);
+        }}
+        cronViewChange={(data) => {
+          getCronViews();
+          if (data && data.id === viewConf.id) {
+            setViewConf({ ...viewConf, ...data });
+          }
+        }}
+      />
     </PageContainer>
   );
 };

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';
@@ -7,6 +7,7 @@ import {
   CheckCircleOutlined,
 } from '@ant-design/icons';
 import { PageLoading } from '@ant-design/pro-layout';
+import { logEnded } from '@/utils';
 
 enum CrontabStatus {
   'running',
@@ -33,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) {
@@ -41,14 +42,23 @@ const CronLogModal = ({
     }
     request
       .get(logUrl ? logUrl : `${config.apiPrefix}crons/${cron.id}/log`)
-      .then((data: any) => {
+      .then(({ code, data }) => {
-        if (localStorage.getItem('logCron') === String(cron.id)) {
+        if (
-          const log = data.data as string;
+          code === 200 &&
+          localStorage.getItem('logCron') === String(cron.id) &&
+          data !== value
+        ) {
+          const log = data as string;
           setValue(log || '暂无日志');
-          setExecuting(
+          const hasNext = Boolean(
-            log && !log.includes('执行结束') && !log.includes('重启面板'),
+            log &&
+              !logEnded(log) &&
+              !log.includes('重启面板') &&
+              !log.includes('任务未运行'),
           );
-          if (log && !log.includes('执行结束') && !log.includes('重启面板')) {
+          setExecuting(hasNext);
+          autoScroll();
+          if (hasNext) {
             setTimeout(() => {
               getCronLog();
             }, 2000);
@@ -85,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 (
       <>
@@ -119,7 +151,7 @@ const CronLogModal = ({
   return (
     <Modal
       title={titleElement()}
-      visible={visible}
+      open={visible}
       centered
       className="log-modal"
       bodyStyle={{
@@ -134,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

@@ -28,13 +28,12 @@ const CronModal = ({
       const { code, data } = await request[method](`${config.apiPrefix}crons`, {
         data: payload,
       });
+
       if (code === 200) {
         message.success(cron ? '更新Cron成功' : '新建Cron成功');
-      } else {
+        handleCancel(data);
-        message.error(data);
       }
       setLoading(false);
-      handleCancel(data);
     } catch (error: any) {
       setLoading(false);
     }
@@ -47,7 +46,7 @@ const CronModal = ({
   return (
     <Modal
       title={cron ? '编辑任务' : '新建任务'}
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}
@@ -75,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
@@ -128,21 +127,24 @@ const CronLabelModal = ({
       .then(async (values) => {
         setLoading(true);
         const payload = { ids, labels: values.labels };
-        const { code, data } = await request[action](
+        try {
-          `${config.apiPrefix}crons/labels`,
+          const { code, data } = await request[action](
-          {
+            `${config.apiPrefix}crons/labels`,
-            data: payload,
+            {
-          },
+              data: payload,
-        );
+            },
-        if (code === 200) {
-          message.success(
-            action === 'post' ? '添加Labels成功' : '删除Labels成功',
           );
-        } else {
+
-          message.error(data);
+          if (code === 200) {
+            message.success(
+              action === 'post' ? '添加Labels成功' : '删除Labels成功',
+            );
+            handleCancel(true);
+          }
+          setLoading(false);
+        } catch (error) {
+          setLoading(false);
         }
-        setLoading(false);
-        handleCancel(true);
       })
       .catch((info) => {
         console.log('Validate Failed:', info);
@@ -166,7 +168,7 @@ const CronLabelModal = ({
   return (
     <Modal
       title="批量修改标签"
-      visible={visible}
+      open={visible}
       footer={buttons}
       centered
       maskClosable={false}