更新版本 v2.14.3

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

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

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

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

.env.example

@@ -7,6 +7,6 @@ LOG_LEVEL='debug'
 
 SECRET='whyour'
 
-QINIU_AK = ''
-QINIU_SK = ''
-QINIU_SCOPE = ''
+QINIU_AK=''
+QINIU_SK=''
+QINIU_SCOPE=''

.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! 🎉🎉🎉

.npmrc

@@ -1 +1,2 @@
-sentrycli_cdnurl=https://cdn.npm.taobao.org/dist/sentry-cli
+sentrycli_cdnurl=https://npmmirror.com/mirrors/sentry-cli/
+strict-peer-dependencies=false

.umirc.ts

@@ -9,16 +9,12 @@ export default defineConfig({
     type: 'none',
   },
   fastRefresh: {},
-  // antd: {
-  //   dark: true,
-  // },
-  mfsu: {},
   esbuild: {},
   webpack5: {},
   dynamicImport: {
     loading: '@/components/pageLoading',
   },
-  favicon: '/images/g5.ico',
+  favicon: '/images/favicon.svg',
   proxy: {
     '/api/public': {
       target: 'http://127.0.0.1:5400/',

README-en.md

@@ -57,7 +57,7 @@ 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 \
@@ -96,7 +96,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 +124,10 @@ docker-compose up -d
 docker-compose down
 ```
 
+3. access
+
+Open your browser and visit http://{ip}:5700
+
 ## Use
 
 1. built-in commands

README.md

@@ -57,7 +57,7 @@ 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 \
@@ -97,7 +97,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 +125,10 @@ docker-compose up -d
 docker-compose down
 ```
 
+3. 访问
+
+打开你的浏览器，访问 http://{ip}:5700
+
 ## 使用
 
 1. 内置命令
@@ -163,11 +167,11 @@ task <file_path> desi <env_name> <account_number>
 
 * file_url: 脚本地址
 * repo_url: 仓库地址
-* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串
-* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串
-* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响
+* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
+* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
+* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
+* extensions: 拉取仓库的文件后缀，多个竖线分割
 * branch: 拉取仓库的分支
-* extensions: 拉取仓库的文件后缀
 * days: 需要保留的日志的天数
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称

back/api/config.ts

@@ -25,7 +25,6 @@ export default (app: Router) => {
             }),
         });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -51,7 +50,6 @@ export default (app: Router) => {
         }
         res.send({ code: 200, data: content });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -76,7 +74,6 @@ export default (app: Router) => {
         fs.writeFileSync(path, content);
         res.send({ code: 200, message: '保存成功' });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

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,135 @@ 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(),
+      }),
+    }),
+    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(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const cronViewService = Container.get(CronViewService);
+        const data = await cronViewService.update(req.body);
+        return res.send({ code: 200, data });
+      } 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);
@@ -42,7 +167,6 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -60,7 +184,6 @@ export default (app: Router) => {
         const data = await cronService.run(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -78,7 +201,6 @@ export default (app: Router) => {
         const data = await cronService.stop(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -102,7 +224,6 @@ export default (app: Router) => {
         );
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -123,7 +244,6 @@ export default (app: Router) => {
         const data = await cronService.addLabels(req.body.ids, req.body.labels);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -141,7 +261,6 @@ export default (app: Router) => {
         const data = await cronService.disabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -159,7 +278,6 @@ export default (app: Router) => {
         const data = await cronService.enabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -179,7 +297,6 @@ export default (app: Router) => {
         const data = await cronService.log(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -190,9 +307,9 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         labels: Joi.array().optional().allow(null),
-        command: Joi.string().optional(),
-        schedule: Joi.string().optional(),
-        name: Joi.string().optional(),
+        command: Joi.string().required(),
+        schedule: Joi.string().required(),
+        name: Joi.string().optional().allow(null),
         id: Joi.number().required(),
       }),
     }),
@@ -210,7 +327,6 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -228,7 +344,6 @@ export default (app: Router) => {
         const data = await cronService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -246,7 +361,6 @@ export default (app: Router) => {
         const data = await cronService.pin(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -264,7 +378,6 @@ export default (app: Router) => {
         const data = await cronService.unPin(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -279,7 +392,6 @@ export default (app: Router) => {
         const data = await cronService.import_crontab();
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -299,7 +411,6 @@ export default (app: Router) => {
         const data = await cronService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -311,10 +422,10 @@ export default (app: Router) => {
       body: Joi.object({
         ids: Joi.array().items(Joi.number().required()),
         status: Joi.string().required(),
-        pid: Joi.string().optional(),
-        log_path: Joi.string().optional(),
-        last_running_time: Joi.number().optional(),
-        last_execution_time: Joi.number().optional(),
+        pid: Joi.string().optional().allow(null),
+        log_path: Joi.string().optional().allow(null),
+        last_running_time: Joi.number().optional().allow(null),
+        last_execution_time: Joi.number().optional().allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -328,7 +439,6 @@ export default (app: Router) => {
         });
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -348,7 +458,6 @@ export default (app: Router) => {
         const data = await cronService.logs(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/dependence.ts

@@ -38,7 +38,6 @@ export default (app: Router) => {
         const data = await dependenceService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -61,7 +60,6 @@ export default (app: Router) => {
         const data = await dependenceService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -79,7 +77,6 @@ export default (app: Router) => {
         const data = await dependenceService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -97,7 +94,6 @@ export default (app: Router) => {
         const data = await dependenceService.remove(req.body, true);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -117,7 +113,6 @@ export default (app: Router) => {
         const data = await dependenceService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -135,7 +130,6 @@ export default (app: Router) => {
         const data = await dependenceService.reInstall(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/env.ts

@@ -38,7 +38,6 @@ export default (app: Router) => {
         const data = await envService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -61,7 +60,6 @@ export default (app: Router) => {
         const data = await envService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -79,7 +77,6 @@ export default (app: Router) => {
         const data = await envService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -103,7 +100,6 @@ export default (app: Router) => {
         const data = await envService.move(req.params.id, req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -121,7 +117,6 @@ export default (app: Router) => {
         const data = await envService.disabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -139,7 +134,6 @@ export default (app: Router) => {
         const data = await envService.enabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -160,7 +154,6 @@ export default (app: Router) => {
         const data = await envService.updateNames(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -177,10 +170,9 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
-        const data = await envService.getDb(req.params.id);
+        const data = await envService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/log.ts

@@ -6,6 +6,7 @@ import config from '../config';
 import { getFileContentByName, readDirs } from '../config/util';
 import { join } from 'path';
 const route = Router();
+const blacklist = ['.tmp'];
 
 export default (app: Router) => {
   app.use('/logs', route);
@@ -13,7 +14,7 @@ export default (app: Router) => {
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
-      const result = readDirs(config.logPath, config.logPath);
+      const result = readDirs(config.logPath, config.logPath, blacklist);
       res.send({
         code: 200,
         data: result,
@@ -29,15 +30,17 @@ export default (app: Router) => {
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
+        if (blacklist.includes(req.path)) {
+          return res.send({ code: 403, message: '暂无权限' });
+        }
         const filePath = join(
           config.logPath,
-          req.query.path as string,
+          (req.query.path || '') as string,
           req.params.file,
         );
         const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/open.ts

@@ -16,7 +16,6 @@ export default (app: Router) => {
         const data = await openService.list();
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -26,7 +25,7 @@ export default (app: Router) => {
     '/apps',
     celebrate({
       body: Joi.object({
-        name: Joi.string().optional().allow(''),
+        name: Joi.string().optional().allow('').disallow('system'),
         scopes: Joi.array().items(Joi.string().required()),
       }),
     }),
@@ -37,7 +36,6 @@ export default (app: Router) => {
         const data = await openService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -59,7 +57,6 @@ export default (app: Router) => {
         const data = await openService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -77,7 +74,6 @@ export default (app: Router) => {
         const data = await openService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -97,7 +93,6 @@ export default (app: Router) => {
         const data = await openService.resetSecret(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -118,7 +113,6 @@ export default (app: Router) => {
         const result = await openService.authToken(req.query as any);
         return res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/script.ts

@@ -3,6 +3,7 @@ import {
   getFileContentByName,
   readDirs,
   getLastModifyFilePath,
+  readDir,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
@@ -10,17 +11,38 @@ import { Logger } from 'winston';
 import config from '../config';
 import * as fs from 'fs';
 import { celebrate, Joi } from 'celebrate';
-import path, { join } from 'path';
+import path, { join, parse } from 'path';
 import ScriptService from '../services/script';
+import multer from 'multer';
 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('/scripts', route);
 
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
-      const result = readDirs(config.scriptPath, config.scriptPath);
+      let result = [];
+      const blacklist = ['node_modules', '.git'];
+      if (req.query.path) {
+        const targetPath = path.join(
+          config.scriptPath,
+          req.query.path as string,
+        );
+        result = readDir(targetPath, config.scriptPath, blacklist);
+      } else {
+        result = readDirs(config.scriptPath, config.scriptPath, blacklist);
+      }
       res.send({
         code: 200,
         data: result,
@@ -44,7 +66,6 @@ export default (app: Router) => {
         const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -52,14 +73,7 @@ export default (app: Router) => {
 
   route.post(
     '/',
-    celebrate({
-      body: Joi.object({
-        filename: Joi.string().required(),
-        path: Joi.string().optional().allow(''),
-        content: Joi.string().allow(''),
-        originFilename: Joi.string().allow(''),
-      }),
-    }),
+    upload.single('file'),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
@@ -69,6 +83,7 @@ export default (app: Router) => {
           content: string;
           originFilename: string;
         };
+
         if (!path) {
           path = config.scriptPath;
         }
@@ -84,15 +99,18 @@ export default (app: Router) => {
             message: '文件路径禁止访问',
           });
         }
+
+        if (req.file) {
+          fs.renameSync(req.file.path, join(path, req.file.filename));
+          return res.send({ code: 200 });
+        }
+
         if (!originFilename) {
           originFilename = filename;
         }
         const originFilePath = `${path}${originFilename.replace(/\//g, '')}`;
         const filePath = `${path}${filename.replace(/\//g, '')}`;
         if (fs.existsSync(originFilePath)) {
-          if (!fs.existsSync(config.bakPath)) {
-            fs.mkdirSync(config.bakPath);
-          }
           fs.copyFileSync(
             originFilePath,
             `${config.bakPath}${originFilename.replace(/\//g, '')}`,
@@ -104,7 +122,6 @@ export default (app: Router) => {
         fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -116,7 +133,7 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().optional().allow(''),
-        content: Joi.string().required(),
+        content: Joi.string().required().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -131,7 +148,6 @@ export default (app: Router) => {
         fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -156,7 +172,6 @@ export default (app: Router) => {
         fs.unlinkSync(filePath);
         res.send({ code: 200 });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -187,7 +202,6 @@ export default (app: Router) => {
           return next(err);
         });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -198,22 +212,22 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
+        content: Joi.string().optional().allow(''),
         path: Joi.string().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path } = req.body as {
-          filename: string;
-          path: string;
-        };
-        const filePath = join(path, filename);
+        let { filename, content, path } = req.body;
+        const { name, ext } = parse(filename);
+        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
+        fs.writeFileSync(filePath, content || '', { encoding: 'utf8' });
+
         const scriptService = Container.get(ScriptService);
         const result = await scriptService.runScript(filePath);
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -224,22 +238,21 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
+        content: Joi.string().optional().allow(''),
         path: Joi.string().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path } = req.body as {
-          filename: string;
-          path: string;
-        };
-        const filePath = join(path, filename);
+        let { filename, content, path } = 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);
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/subscription.ts

@@ -29,7 +29,13 @@ export default (app: Router) => {
       body: Joi.object({
         type: Joi.string().required(),
         schedule: Joi.string().optional().allow('').allow(null),
-        interval_schedule: Joi.object().optional().allow('').allow(null),
+        interval_schedule: Joi.object({
+          type: Joi.string().required(),
+          value: Joi.number().min(1).required(),
+        })
+          .optional()
+          .allow('')
+          .allow(null),
         name: Joi.string().optional().allow('').allow(null),
         url: Joi.string().required(),
         whitelist: Joi.string().optional().allow('').allow(null),
@@ -59,7 +65,6 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -77,7 +82,6 @@ export default (app: Router) => {
         const data = await subscriptionService.run(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -95,7 +99,6 @@ export default (app: Router) => {
         const data = await subscriptionService.stop(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -113,7 +116,6 @@ export default (app: Router) => {
         const data = await subscriptionService.disabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -131,7 +133,6 @@ export default (app: Router) => {
         const data = await subscriptionService.enabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -151,7 +152,6 @@ export default (app: Router) => {
         const data = await subscriptionService.log(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -195,7 +195,6 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -213,7 +212,6 @@ export default (app: Router) => {
         const data = await subscriptionService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -233,7 +231,6 @@ export default (app: Router) => {
         const data = await subscriptionService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -260,7 +257,6 @@ export default (app: Router) => {
         });
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -280,7 +276,6 @@ export default (app: Router) => {
         const data = await subscriptionService.logs(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/system.ts

@@ -54,7 +54,6 @@ export default (app: Router) => {
         const data = await systemService.getLogRemoveFrequency();
         res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -76,7 +75,6 @@ export default (app: Router) => {
         );
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -91,7 +89,6 @@ export default (app: Router) => {
         const result = await systemService.checkUpdate();
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -106,7 +103,6 @@ export default (app: Router) => {
         const result = await systemService.updateSystem();
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -127,7 +123,6 @@ export default (app: Router) => {
         const result = await systemService.notify(req.body);
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/user.ts

@@ -39,7 +39,6 @@ export default (app: Router) => {
         const data = await userService.login({ ...req.body }, req);
         return res.send(data);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -54,7 +53,6 @@ export default (app: Router) => {
         await userService.logout(req.platform);
         res.send({ code: 200 });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -75,7 +73,6 @@ export default (app: Router) => {
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -109,7 +106,6 @@ export default (app: Router) => {
         const data = await userService.initTwoFactor();
         res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -129,7 +125,6 @@ export default (app: Router) => {
         const data = await userService.activeTwoFactor(req.body.code);
         res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -144,7 +139,6 @@ export default (app: Router) => {
         const data = await userService.deactiveTwoFactor();
         res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -166,7 +160,6 @@ export default (app: Router) => {
         const data = await userService.twoFactorLogin(req.body, req);
         res.send(data);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -181,7 +174,6 @@ export default (app: Router) => {
         const data = await userService.getLoginLog();
         res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -196,7 +188,6 @@ export default (app: Router) => {
         const data = await userService.getNotificationMode();
         res.send({ code: 200, data });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -211,7 +202,6 @@ export default (app: Router) => {
         const result = await userService.updateNotificationMode(req.body);
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -232,7 +222,6 @@ export default (app: Router) => {
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -247,7 +236,6 @@ export default (app: Router) => {
         const result = await userService.updateNotificationMode(req.body);
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -263,7 +251,6 @@ export default (app: Router) => {
         const result = await userService.updateAvatar(req.file!.filename);
         res.send(result);
       } catch (e) {
-        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/app.ts

@@ -1,20 +1,18 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
-
 import config from './config';
-
 import express from 'express';
-
 import Logger from './loaders/logger';
+import path from 'path';
 
 async function startServer() {
   const app = express();
 
+  await require('./loaders/db').default();
+
   await require('./loaders/initFile').default();
 
   await require('./loaders/sentry').default({ expressApp: app });
 
-  await require('./loaders/db').default();
-
   await require('./loaders/app').default({ expressApp: app });
 
   const server = app

back/config/index.ts

@@ -4,10 +4,21 @@ import { createRandomString } from './util';
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
+if (!process.env.QL_DIR) {
+  // 声明QL_DIR环境变量
+  let qlHomePath = path.join(__dirname, '../../');
+  // 生产环境
+  if (qlHomePath.endsWith('/static/')) {
+    qlHomePath = path.join(qlHomePath, '../');
+  }
+  process.env.QL_DIR = qlHomePath;
+}
+
 const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;
 
-const envFound = dotenv.config();
-const rootPath = process.cwd();
+const rootPath = process.env.QL_DIR as string;
+const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
+
 const dataPath = path.join(rootPath, 'data/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');
@@ -69,6 +80,7 @@ export default {
     'cookie.sh',
     'crontab.list',
     'env.sh',
+    'token.json',
   ],
   writePathList: [configPath, scriptPath],
   bakPath,

back/config/util.ts

@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import got from 'got';
 import iconv from 'iconv-lite';
+import { exec } from 'child_process';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -277,31 +278,80 @@ export async function concurrentRun(
   return replyList;
 }
 
-export function readDirs(dir: string, baseDir: string = '') {
+enum FileType {
+  'directory',
+  'file',
+}
+
+export function readDirs(
+  dir: string,
+  baseDir: string = '',
+  blacklist: string[] = [],
+) {
   const relativePath = path.relative(baseDir, dir);
   const files = fs.readdirSync(dir);
-  const result: any = files.map((file: string) => {
-    const subPath = path.join(dir, file);
-    const stats = fs.statSync(subPath);
-    const key = path.join(relativePath, file);
-    if (stats.isDirectory()) {
+  const result: any = files
+    .filter((x) => !blacklist.includes(x))
+    .map((file: string) => {
+      const subPath = path.join(dir, file);
+      const stats = fs.statSync(subPath);
+      const key = path.join(relativePath, file);
+      if (stats.isDirectory()) {
+        return {
+          title: file,
+          key,
+          type: 'directory',
+          disabled: true,
+          parent: relativePath,
+          children: readDirs(subPath, baseDir).sort(
+            (a: any, b: any) =>
+              (FileType as any)[a.type] - (FileType as any)[b.type],
+          ),
+        };
+      }
       return {
         title: file,
-        value: file,
+        type: 'file',
         key,
-        type: 'directory',
-        disabled: true,
         parent: relativePath,
-        children: readDirs(subPath, baseDir),
       };
-    }
-    return {
-      title: file,
-      value: file,
-      type: 'file',
-      key,
-      parent: relativePath,
-    };
-  });
+    });
+  return result.sort(
+    (a: any, b: any) => (FileType as any)[a.type] - (FileType as any)[b.type],
+  );
+}
+
+export function readDir(
+  dir: string,
+  baseDir: string = '',
+  blacklist: string[] = [],
+) {
+  const relativePath = path.relative(baseDir, dir);
+  const files = fs.readdirSync(dir);
+  const result: any = files
+    .filter((x) => !blacklist.includes(x))
+    .map((file: string) => {
+      const subPath = path.join(dir, file);
+      const stats = fs.statSync(subPath);
+      const key = path.join(relativePath, file);
+      return {
+        title: file,
+        type: stats.isDirectory() ? 'directory' : 'file',
+        key,
+        parent: relativePath,
+      };
+    });
   return result;
 }
+
+export function promiseExec(command: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    exec(
+      command,
+      { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
+      (err, stdout, stderr) => {
+        resolve(stdout || stderr || JSON.stringify(err));
+      },
+    );
+  });
+}

back/data/cronView.ts

@@ -0,0 +1,47 @@
+import { sequelize } from '.';
+import { DataTypes, Model } from 'sequelize';
+
+interface SortType {
+  type: 'ASC' | 'DESC';
+  value: string;
+}
+
+interface FilterType {
+  type: 'or' | 'and';
+  value: string;
+}
+
+export class CrontabView {
+  name?: string;
+  id?: number;
+  position?: number;
+  isDisabled?: 1 | 0;
+  filters?: FilterType[];
+  sorts?: SortType[];
+
+  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;
+  }
+}
+
+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,
+  },
+);

back/data/notify.ts

@@ -4,6 +4,7 @@ export enum NotificationMode {
   'serverChan' = 'serverChan',
   'pushDeer' = 'pushDeer',
   'bark' = 'bark',
+  'chat' = 'chat',
   'telegramBot' = 'telegramBot',
   'dingtalkBot' = 'dingtalkBot',
   'weWorkBot' = 'weWorkBot',
@@ -37,6 +38,11 @@ export class PushDeerNotification extends NotificationBaseInfo {
   public pushDeerKey = '';
 }
 
+export class ChatNotification extends NotificationBaseInfo {
+  public chatUrl = '';
+  public chatToken = '';
+}
+
 export class BarkNotification extends NotificationBaseInfo {
   public barkPush = '';
   public barkIcon = 'http://qn.whyour.cn/logo.png';
@@ -86,6 +92,7 @@ export interface NotificationInfo
     GotifyNotification,
     ServerChanNotification,
     PushDeerNotification,
+    ChatNotification,
     BarkNotification,
     TelegramBotNotification,
     DingtalkBotNotification,

back/loaders/db.ts

@@ -6,9 +6,9 @@ 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';
 
 export default async () => {
@@ -18,9 +18,8 @@ export default async () => {
     await AppModel.sync();
     await AuthModel.sync();
     await EnvModel.sync();
-    await SubscriptionModel.sync({ alter: true });
-
-    await sequelize.sync();
+    await SubscriptionModel.sync();
+    await CrontabViewModel.sync();
 
     // try {
     //   const queryInterface = sequelize.getQueryInterface();

back/loaders/deps.ts

@@ -2,6 +2,7 @@ import path from 'path';
 import fs from 'fs';
 import chokidar from 'chokidar';
 import config from '../config/index';
+import { promiseExec } from '../config/util';
 
 function linkToNodeModule(src: string, dst?: string) {
   const target = path.join(config.rootPath, 'node_modules', dst || src);
@@ -16,7 +17,32 @@ function linkToNodeModule(src: string, dst?: string) {
   });
 }
 
+async function linkCommand() {
+  const commandPath = await promiseExec('which node');
+  const commandDir = path.dirname(commandPath);
+  const linkShell = [
+    {
+      src: 'update.sh',
+      dest: 'ql',
+    },
+    {
+      src: 'task.sh',
+      dest: 'task',
+    },
+  ];
+
+  for (const link of linkShell) {
+    const source = path.join(config.rootPath, 'shell', link.src);
+    const target = path.join(commandDir, link.dest);
+    if (fs.existsSync(target)) {
+      fs.unlinkSync(target);
+    }
+    fs.symlink(source, target, (err) => {});
+  }
+}
+
 export default async (src: string = 'deps') => {
+  await linkCommand();
   linkToNodeModule(src);
 
   const source = path.join(config.rootPath, src);

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,29 +75,24 @@ export default ({ app }: { app: Application }) => {
     if (
       !headerToken &&
       originPath &&
-      config.apiWhiteList.includes(originPath) &&
-      originPath !== '/api/crons/status'
-    ) {
-      return next();
-    }
-    const remoteAddress = req.socket.remoteAddress;
-    if (
-      remoteAddress === '::ffff:127.0.0.1' &&
-      originPath === '/api/crons/status'
+      config.apiWhiteList.includes(originPath)
     ) {
       return next();
     }
 
     const data = fs.readFileSync(config.authConfigFile, 'utf8');
-    if (data) {
+    if (data && headerToken) {
       const { token = '', tokens = {} } = JSON.parse(data);
       if (headerToken === token || tokens[req.platform] === headerToken) {
         return next();
       }
     }
 
-    const err: any = new Error('UnauthorizedError');
-    err.status = 401;
+    const errorCode = headerToken ? 'invalid_token' : 'credentials_required';
+    const errorMessage = headerToken
+      ? 'jwt malformed'
+      : 'No authorization token was found';
+    const err = new UnauthorizedError(errorCode, { message: errorMessage });
     next(err);
   });
 
@@ -136,7 +131,6 @@ export default ({ app }: { app: Application }) => {
   });
 
   app.use(errors());
-  app.use(Sentry.Handlers.errorHandler());
 
   app.use(
     (
@@ -155,6 +149,39 @@ export default ({ app }: { app: Application }) => {
     },
   );
 
+  app.use(
+    (
+      err: Error & { errors: any[] },
+      req: Request,
+      res: Response,
+      next: NextFunction,
+    ) => {
+      if (err.name.includes('Sequelize')) {
+        return res
+          .status(500)
+          .send({
+            code: 400,
+            message: `${err.name} ${err.message}`,
+            validation: err.errors,
+          })
+          .end();
+      }
+      return next(err);
+    },
+  );
+
+  app.use(
+    Sentry.Handlers.errorHandler({
+      shouldHandleError(error) {
+        // 排除 SequelizeUniqueConstraintError / NotFound
+        return (
+          !['SequelizeUniqueConstraintError'].includes(error.name) ||
+          !['Not Found'].includes(error.message)
+        );
+      },
+    }),
+  );
+
   app.use(
     (
       err: Error & { status: number },

back/loaders/initData.ts

@@ -21,18 +21,17 @@ export default async () => {
   );
 
   // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  DependenceModel.findAll({ where: {}, raw: true }).then(async (docs) => {
+  DependenceModel.findAll({
+    where: {},
+    order: [['type', 'DESC']],
+    raw: true,
+  }).then(async (docs) => {
     const groups = _.groupBy(docs, 'type');
-    for (const key in groups) {
-      if (Object.prototype.hasOwnProperty.call(groups, key)) {
-        const group = groups[key];
-        const depIds = group.map((x) => x.id);
-        for (const dep of depIds) {
-          if (dep) {
-            await dependenceService.reInstall([dep]);
-          }
-        }
-      }
+    const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
+    for (const key of keys) {
+      const group = groups[key];
+      const depIds = group.map((x) => x.id);
+      await dependenceService.reInstall(depIds as number[]);
     }
   });
 

back/loaders/initFile.ts

@@ -5,12 +5,13 @@ import dotenv from 'dotenv';
 import Logger from './logger';
 import { fileExist } from '../config/util';
 
-const rootPath = process.cwd();
+const rootPath = process.env.QL_DIR as string;;
 const dataPath = path.join(rootPath, 'data/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');
 const uploadPath = path.join(dataPath, 'upload/');
+const bakPath = path.join(dataPath, 'bak/');
 const samplePath = path.join(rootPath, 'sample/');
 const confFile = path.join(configPath, 'config.sh');
 const authConfigFile = path.join(configPath, 'auth.json');
@@ -27,6 +28,7 @@ export default async () => {
   const configDirExist = await fileExist(configPath);
   const uploadDirExist = await fileExist(uploadPath);
   const sshDirExist = await fileExist(sshPath);
+  const bakDirExist = await fileExist(bakPath);
 
   if (!configDirExist) {
     fs.mkdirSync(configPath);
@@ -56,6 +58,10 @@ export default async () => {
     fs.mkdirSync(sshPath);
   }
 
+  if (!bakDirExist) {
+    fs.mkdirSync(bakPath);
+  }
+
   dotenv.config({ path: confFile });
 
   Logger.info('✌️ Init file down');

back/loaders/initTask.ts

@@ -3,12 +3,30 @@ import _ from 'lodash';
 import SystemService from '../services/system';
 import ScheduleService from '../services/schedule';
 import SubscriptionService from '../services/subscription';
+import config from '../config';
+import { fileExist } from '../config/util';
 
 export default async () => {
   const systemService = Container.get(SystemService);
   const scheduleService = Container.get(ScheduleService);
   const subscriptionService = Container.get(SubscriptionService);
 
+  // 生成内置token
+  let tokenCommand = `ts-node-transpile-only ${config.rootPath}/back/token.ts`;
+  const tokenFile = `${config.rootPath}/static/build/token.js`;
+  if (await fileExist(tokenFile)) {
+    tokenCommand = `node ${tokenFile}`;
+  }
+  const cron = {
+    id: 'token',
+    name: '生成token',
+    command: tokenCommand,
+  };
+  scheduleService.createIntervalTask(cron as any, {
+    days: 28,
+    runImmediately: true,
+  });
+
   // 运行删除日志任务
   const data = await systemService.getLogRemoveFrequency();
   if (data && data.info && data.info.frequency) {
@@ -17,7 +35,7 @@ export default async () => {
       name: '删除日志',
       command: `ql rmlog ${data.info.frequency}`,
     };
-    await scheduleService.createIntervalTask(cron, {
+    scheduleService.createIntervalTask(cron, {
       days: data.info.frequency,
       runImmediately: true,
     });
@@ -26,6 +44,11 @@ export default async () => {
   // 运行所有订阅
   const subs = await subscriptionService.list();
   for (const sub of subs) {
-    await subscriptionService.handleTask(sub);
+    await subscriptionService.handleTask(
+      sub,
+      !sub.is_disabled,
+      true,
+      !sub.is_disabled,
+    );
   }
 };

back/services/cron.ts

@@ -10,6 +10,7 @@ import { promises, existsSync } from 'fs';
 import { promisify } from 'util';
 import { Op } from 'sequelize';
 import path from 'path';
+import dayjs from 'dayjs';
 
 @Service()
 export default class CronService {
@@ -112,9 +113,69 @@ export default class CronService {
     }
   }
 
-  public async crontabs(searchText?: string): Promise<Crontab[]> {
-    let query = {};
+  private formatViewQuery(query: any, viewQuery: any) {
+    if (viewQuery.filters && viewQuery.filters.length > 0) {
+      if (!query[Op.and]) {
+        query[Op.and] = [];
+      }
+      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] = {
+            [operate2]: [
+              { [operate]: `%${value}%` },
+              { [operate]: `%${encodeURIComponent(value)}%` },
+            ],
+          };
+        }
+        query[Op.and].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':
@@ -122,13 +183,11 @@ export default class CronService {
         case 'schedule':
         case 'label':
           const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-          query = {
-            [column]: {
-              [Op.or]: [
-                { [Op.like]: `%${textArray[1]}%` },
-                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
-              ],
-            },
+          q[column] = {
+            [Op.or]: [
+              { [Op.like]: `%${textArray[1]}%` },
+              { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
+            ],
           };
           break;
         default:
@@ -138,31 +197,96 @@ export default class CronService {
               { [Op.like]: `%${encodeURIComponent(searchText)}%` },
             ],
           };
-          query = {
-            [Op.or]: [
-              {
-                name: reg,
-              },
-              {
-                command: reg,
-              },
-              {
-                schedule: reg,
-              },
-              {
-                labels: reg,
-              },
-            ],
-          };
+          q[Op.or] = [
+            {
+              name: reg,
+            },
+            {
+              command: reg,
+            },
+            {
+              schedule: reg,
+            },
+            {
+              labels: reg,
+            },
+          ];
           break;
       }
+      query[Op.and].push(q);
+    }
+  }
+
+  private formatFilterQuery(query: any, filterQuery: any) {
+    if (filterQuery) {
+      if (!query[Op.and]) {
+        query[Op.and] = [];
+      }
+      const filterKeys: any = Object.keys(filterQuery);
+      for (const key of filterKeys) {
+        let q: any = {};
+        if (filterKeys[key]) {
+          q[key] = filterKeys[key];
+        }
+        query[Op.and].push(q);
+      }
+    }
+  }
+
+  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 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({
-        where: query,
-        order: [['createdAt', 'DESC']],
-      });
-      return result as any;
+      const result = await CrontabModel.findAll(condition);
+      const count = await CrontabModel.count({ where: query });
+      return { data: result, total: count };
     } catch (error) {
       throw error;
     }
@@ -197,13 +321,21 @@ export default class CronService {
       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## 执行结束...  ${new Date()
-            .toLocaleString('zh', { hour12: false })
-            .replace(' 24:', ' 00:')} `,
+          `${str}\n## 执行结束... ${endTime.format(
+            'YYYY-MM-DD HH:mm:ss',
+          )}${diffTimeStr}`,
         );
       }
     }
@@ -228,6 +360,7 @@ export default class CronService {
       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 {
@@ -269,7 +402,13 @@ export default class CronService {
       if (!cmdStr.includes('task ') && !cmdStr.includes('ql ')) {
         cmdStr = `task ${cmdStr}`;
       }
-      if (cmdStr.endsWith('.js')) {
+      if (
+        cmdStr.endsWith('.js') ||
+        cmdStr.endsWith('.py') ||
+        cmdStr.endsWith('.pyc') ||
+        cmdStr.endsWith('.sh') ||
+        cmdStr.endsWith('.ts')
+      ) {
         cmdStr = `${cmdStr} now`;
       }
 
@@ -292,16 +431,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 } },
@@ -431,7 +564,7 @@ export default class CronService {
   private async set_crontab(needReloadSchedule: boolean = false) {
     const tabs = 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 += '# ';

back/services/cronView.ts

@@ -0,0 +1,92 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import { CrontabView, CrontabViewModel } from '../data/cronView';
+import { initEnvPosition } from '../data/env';
+
+@Service()
+export default class CronViewService {
+  constructor(@Inject('logger') private logger: winston.Logger) {}
+
+  public async create(payload: CrontabView): Promise<CrontabView> {
+    let position = initEnvPosition;
+    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);
+    return doc;
+  }
+
+  public async insert(payload: CrontabView): Promise<CrontabView> {
+    return await CrontabViewModel.create(payload, { returning: true });
+  }
+
+  public async update(payload: CrontabView): Promise<CrontabView> {
+    const newDoc = await this.updateDb(payload);
+    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: any): 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 } });
+  }
+
+  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: targetPosition,
+    });
+    return newDoc;
+  }
+}

back/services/dependence.ts

@@ -13,6 +13,8 @@ import _ from 'lodash';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import { Op } from 'sequelize';
+import { concurrentRun } from '../config/util';
+import dayjs from 'dayjs';
 
 @Service()
 export default class DependenceService {
@@ -27,7 +29,7 @@ export default class DependenceService {
       return tab;
     });
     const docs = await this.insert(tabs);
-    this.installOrUninstallDependencies(docs);
+    this.installDependenceOneByOne(docs);
     return docs;
   }
 
@@ -47,7 +49,7 @@ export default class DependenceService {
       status: DependenceStatus.installing,
     });
     const newDoc = await this.updateDb(tab);
-    this.installOrUninstallDependencies([newDoc]);
+    this.installDependenceOneByOne([newDoc]);
     return newDoc;
   }
 
@@ -62,7 +64,7 @@ export default class DependenceService {
       { where: { id: ids } },
     );
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installOrUninstallDependencies(docs, false, force);
+    this.installDependenceOneByOne(docs, false, force);
     return docs;
   }
 
@@ -98,6 +100,20 @@ export default class DependenceService {
     }
   }
 
+  private installDependenceOneByOne(
+    docs: Dependence[],
+    isInstall: boolean = true,
+    force: boolean = false,
+  ) {
+    concurrentRun(
+      docs.map(
+        (dep) => async () =>
+          await this.installOrUninstallDependencies([dep], isInstall, force),
+      ),
+      1,
+    );
+  }
+
   public async reInstall(ids: number[]): Promise<Dependence[]> {
     await DependenceModel.update(
       { status: DependenceStatus.installing, log: [] },
@@ -105,7 +121,7 @@ export default class DependenceService {
     );
 
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installOrUninstallDependencies(docs);
+    this.installDependenceOneByOne(docs);
     return docs;
   }
 
@@ -146,20 +162,17 @@ export default class DependenceService {
       )[dependencies[0].type as any];
       const actionText = isInstall ? '安装' : '删除';
       const depIds = dependencies.map((x) => x.id) as number[];
-      const startTime = Date.now();
+      const startTime = dayjs();
+
+      const message = `开始${actionText}依赖 ${depNames}，开始时间 ${startTime.format(
+        'YYYY-MM-DD HH:mm:ss',
+      )}\n\n`;
       this.sockService.sendMessage({
         type: socketMessageType,
-        message: `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
-          startTime,
-        ).toLocaleString()}\n\n`,
+        message,
         references: depIds,
       });
-      await this.updateLog(
-        depIds,
-        `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
-          startTime,
-        ).toLocaleString()}\n\n`,
-      );
+      await this.updateLog(depIds, message);
 
       const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
 
@@ -192,23 +205,19 @@ export default class DependenceService {
       });
 
       cp.on('close', async (code) => {
-        const endTime = Date.now();
+        const endTime = dayjs();
         const isSucceed = code === 0;
         const resultText = isSucceed ? '成功' : '失败';
 
+        const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format(
+          'YYYY-MM-DD HH:mm:ss',
+        )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
         this.sockService.sendMessage({
           type: socketMessageType,
-          message: `\n依赖${actionText}${resultText}，结束时间 ${new Date(
-            endTime,
-          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
+          message,
           references: depIds,
         });
-        await this.updateLog(
-          depIds,
-          `\n依赖${actionText}${resultText}，结束时间 ${new Date(
-            endTime,
-          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
-        );
+        await this.updateLog(depIds, message);
 
         let status = null;
         if (isSucceed) {

back/services/env.ts

@@ -168,7 +168,7 @@ export default class EnvService {
             .filter((x) => x.status !== EnvStatus.disabled)
             .map('value')
             .join('&')
-            .replace(/(\\)[^\n]/g, '\\\\')
+            .replace(/(\\)[^n]/g, '\\\\')
             .replace(/(\\$)/, '\\\\')
             .replace(/"/g, '\\"')
             .trim();

back/services/notify.ts

@@ -17,6 +17,7 @@ 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],
@@ -135,6 +136,20 @@ export default class NotificationService {
     );
   }
 
+  private async chat() {
+    const { chatUrl, chatToken } = this.params;
+    const url = `${chatUrl}${chatToken}`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `payload={"text":"${this.title}\n${this.content}"}`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+    return res.success;
+  }
+
   private async bark() {
     let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
     if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
@@ -245,7 +260,7 @@ 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,
         retry: 0,
@@ -296,7 +311,7 @@ export default class NotificationService {
 
     const res: any = await got
       .post(
-        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
+        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
         {
           timeout: this.timeout,
           retry: 0,

back/services/open.ts

@@ -90,7 +90,9 @@ export default class OpenService {
     }
     try {
       const result = await this.find(condition);
-      return result.map((x) => ({ ...x, tokens: [] }));
+      return result
+        .filter((x) => x.name !== 'system')
+        .map((x) => ({ ...x, tokens: [] }));
     } catch (error) {
       throw error;
     }
@@ -142,4 +144,27 @@ export default class OpenService {
       return { code: 400, message: 'client_id或client_seret有误' };
     }
   }
+
+  public async generateSystemToken(): Promise<{
+    value: string;
+    expiration: number;
+  }> {
+    let systemApp = (await AppModel.findOne({
+      where: { name: 'system' },
+    })) as App;
+    if (!systemApp) {
+      systemApp = await this.create({
+        name: 'system',
+        scopes: ['crons', 'system'],
+      } as App);
+    }
+    const { data } = await this.authToken({
+      client_id: systemApp.client_id,
+      client_secret: systemApp.client_secret,
+    });
+    return {
+      ...data,
+      value: data.token,
+    };
+  }
 }

back/services/schedule.ts

@@ -18,6 +18,7 @@ interface ScheduleTaskType {
 }
 
 export interface TaskCallbacks {
+  onBefore?: (startTime: dayjs.Dayjs) => Promise<void>;
   onStart?: (
     cp: ChildProcessWithoutNullStreams,
     startTime: dayjs.Dayjs,
@@ -45,6 +46,8 @@ export default class ScheduleService {
     return new Promise(async (resolve, reject) => {
       try {
         const startTime = dayjs();
+        await callbacks.onBefore?.(startTime);
+
         const cp = spawn(command, { shell: '/bin/bash' });
 
         // TODO:
@@ -76,13 +79,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,
@@ -106,6 +108,7 @@ export default class ScheduleService {
   async createCronTask(
     { id = 0, command, name, schedule = '' }: ScheduleTaskType,
     callbacks?: TaskCallbacks,
+    runImmediately = false,
   ) {
     const _id = this.formatId(id);
     this.logger.info(
@@ -122,6 +125,10 @@ export default class ScheduleService {
         await this.runTask(command, callbacks);
       }),
     );
+
+    if (runImmediately) {
+      await this.runTask(command, callbacks);
+    }
   }
 
   async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
@@ -160,9 +167,17 @@ export default class ScheduleService {
       },
     );
 
-    const job = new LongIntervalJob({ ...schedule, runImmediately }, task, _id);
+    const job = new LongIntervalJob(
+      { runImmediately: false, ...schedule },
+      task,
+      _id,
+    );
 
     this.intervalSchedule.addIntervalJob(job);
+
+    if (runImmediately) {
+      await this.runTask(command, callbacks);
+    }
   }
 
   async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {

back/services/script.ts

@@ -1,8 +1,11 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import { spawn } from 'child_process';
+import fs from 'fs';
+import path from 'path';
 import SockService from './sock';
 import CronService from './cron';
+import ScheduleService, { TaskCallbacks } from './schedule';
+import config from '../config';
 
 @Service()
 export default class ScriptService {
@@ -10,44 +13,43 @@ export default class ScriptService {
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
     private cronService: CronService,
+    private scheduleService: ScheduleService,
   ) {}
 
-  public async runScript(path: string) {
-    const cp = spawn(`task -l ${path} now`, { shell: '/bin/bash' });
+  private taskCallbacks(filePath: string): TaskCallbacks {
+    return {
+      onEnd: async (cp, endTime, diff) => {
+        try {
+          fs.unlinkSync(filePath);
+        } catch (error) {}
+      },
+      onError: async (message: string) => {
+        this.sockService.sendMessage({
+          type: 'manuallyRunScript',
+          message,
+        });
+      },
+      onLog: async (message: string) => {
+        this.sockService.sendMessage({
+          type: 'manuallyRunScript',
+          message,
+        });
+      },
+    };
+  }
 
-    cp.stdout.on('data', (data) => {
-      this.sockService.sendMessage({
-        type: 'manuallyRunScript',
-        message: data.toString(),
-      });
-    });
-
-    cp.stderr.on('data', (data) => {
-      this.sockService.sendMessage({
-        type: 'manuallyRunScript',
-        message: data.toString(),
-      });
-    });
-
-    cp.on('error', (err) => {
-      this.sockService.sendMessage({
-        type: 'manuallyRunScript',
-        message: JSON.stringify(err),
-      });
-    });
-
-    cp.on('close', (err) => {
-      this.sockService.sendMessage({
-        type: 'manuallyRunScript',
-        message: `执行结束`,
-      });
-    });
+  public async runScript(filePath: string) {
+    const relativePath = path.relative(config.scriptPath, filePath);
+    const command = `task -l ${relativePath} now`;
+    this.scheduleService.runTask(command, this.taskCallbacks(filePath));
 
     return { code: 200 };
   }
 
-  public async stopScript(path: string) {
-    const err = await this.cronService.killTask(`task -l ${path} now`);
+  public async stopScript(filePath: string) {
+    const relativePath = path.relative(config.scriptPath, filePath);
+    const err = await this.cronService.killTask(`task -l ${relativePath} now`);
+
     const str = err ? `\n${err}` : '';
     this.sockService.sendMessage({
       type: 'manuallyRunScript',

back/services/sshKey.ts

@@ -23,6 +23,13 @@ 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}`);
@@ -47,24 +54,25 @@ export default class SshKeyService {
     }
   }
 
-  private removeSshConfig(config: string) {
+  private removeSshConfig(alias: string) {
     try {
+      const configRegx = this.getConfigRegx(alias);
       const data = fs
         .readFileSync(this.sshConfigFilePath, { encoding: 'utf8' })
-        .replace(config, '')
-        .replace(/\n\n+/, '\n\n');
+        .replace(configRegx, '')
+        .replace(/\n[\n]+/g, '\n');
       fs.writeFileSync(this.sshConfigFilePath, data, {
         encoding: 'utf8',
       });
     } catch (error) {
-      this.logger.error(`删除ssh配置文件${config}失败`, error);
+      this.logger.error(`删除ssh配置文件${alias}失败`, error);
     }
   }
 
   public addSSHKey(key: string, alias: string, host: string): void {
     this.generatePrivateKeyFile(alias, key);
     const config = this.generateSingleSshConfig(alias, host);
-    this.removeSshConfig(config);
+    this.removeSshConfig(alias);
     this.generateSshConfig([config]);
   }
 

back/services/subscription.ts

@@ -28,6 +28,7 @@ import ScheduleService, { TaskCallbacks } from './schedule';
 import { SimpleIntervalSchedule } from 'toad-scheduler';
 import SockService from './sock';
 import SshKeyService from './sshKey';
+import dayjs from 'dayjs';
 
 @Service()
 export default class SubscriptionService {
@@ -41,47 +42,22 @@ export default class SubscriptionService {
   public async list(searchText?: string): Promise<Subscription[]> {
     let query = {};
     if (searchText) {
-      const textArray = searchText.split(':');
-      switch (textArray[0]) {
-        case 'name':
-        case 'command':
-        case 'schedule':
-        case 'label':
-          const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-          query = {
-            [column]: {
-              [Op.or]: [
-                { [Op.like]: `%${textArray[1]}%` },
-                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
-              ],
-            },
-          };
-          break;
-        default:
-          const reg = {
-            [Op.or]: [
-              { [Op.like]: `%${searchText}%` },
-              { [Op.like]: `%${encodeURIComponent(searchText)}%` },
-            ],
-          };
-          query = {
-            [Op.or]: [
-              {
-                name: reg,
-              },
-              {
-                command: reg,
-              },
-              {
-                schedule: reg,
-              },
-              {
-                labels: reg,
-              },
-            ],
-          };
-          break;
-      }
+      const reg = {
+        [Op.or]: [
+          { [Op.like]: `%${searchText}%` },
+          { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+        ],
+      };
+      query = {
+        [Op.or]: [
+          {
+            name: reg,
+          },
+          {
+            url: reg,
+          },
+        ],
+      };
     }
     try {
       const result = await SubscriptionModel.findAll({
@@ -124,7 +100,12 @@ export default class SubscriptionService {
     return { url, host };
   }
 
-  public handleTask(doc: Subscription, needCreate = true, needAddKey = true) {
+  public async handleTask(
+    doc: Subscription,
+    needCreate = true,
+    needAddKey = true,
+    runImmediately = false,
+  ) {
     const { url, host } = this.formatUrl(doc);
     if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
       if (needAddKey) {
@@ -143,23 +124,36 @@ export default class SubscriptionService {
     if (doc.schedule_type === 'crontab') {
       this.scheduleService.cancelCronTask(doc as any);
       needCreate &&
-        this.scheduleService.createCronTask(
+        (await this.scheduleService.createCronTask(
           doc as any,
           this.taskCallbacks(doc),
-        );
+          runImmediately,
+        ));
     } else {
       this.scheduleService.cancelIntervalTask(doc as any);
       const { type, value } = doc.interval_schedule as any;
       needCreate &&
-        this.scheduleService.createIntervalTask(
+        (await this.scheduleService.createIntervalTask(
           doc as any,
           { [type]: value } as SimpleIntervalSchedule,
-          true,
+          runImmediately,
           this.taskCallbacks(doc),
-        );
+        ));
     }
   }
 
+  private async promiseExec(command: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+      exec(
+        command,
+        { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
+        (err, stdout, stderr) => {
+          resolve(stdout || stderr || JSON.stringify(err));
+        },
+      );
+    });
+  }
+
   private async handleLogPath(
     logPath: string,
     data: string = '',
@@ -174,32 +168,39 @@ export default class SubscriptionService {
 
   private taskCallbacks(doc: Subscription): TaskCallbacks {
     return {
-      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
-        // 执行sub_before
-        let beforeStr = '';
-        try {
-          if (doc.sub_before) {
-            beforeStr = execSync(doc.sub_before).toString();
-          }
-        } catch (error) {
-          beforeStr = JSON.stringify(error);
-        }
-        if (beforeStr) {
-          beforeStr += '\n';
-        }
-
+      onBefore: async (startTime) => {
         const logTime = startTime.format('YYYY-MM-DD-HH-mm-ss');
         const logPath = `${doc.alias}/${logTime}.log`;
-        await this.handleLogPath(
-          logPath as string,
-          `${beforeStr}## 开始执行... ${startTime.format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}\n`,
-        );
         await SubscriptionModel.update(
           {
             status: SubscriptionStatus.running,
             log_path: logPath,
+          },
+          { where: { id: doc.id } },
+        );
+        const absolutePath = await this.handleLogPath(
+          logPath as string,
+          `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`,
+        );
+
+        // 执行sub_before
+        let beforeStr = '';
+        try {
+          if (doc.sub_before) {
+            fs.appendFileSync(absolutePath, `\n## 执行before命令...\n\n`);
+            beforeStr = await this.promiseExec(doc.sub_before);
+          }
+        } catch (error: any) {
+          beforeStr =
+            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
+        }
+        if (beforeStr) {
+          fs.appendFileSync(absolutePath, `${beforeStr}\n`);
+        }
+      },
+      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
+        await SubscriptionModel.update(
+          {
             pid: cp.pid,
           },
           { where: { id: doc.id } },
@@ -207,11 +208,23 @@ export default class SubscriptionService {
       },
       onEnd: async (cp, endTime, diff) => {
         const sub = await this.getDb({ id: doc.id });
-        await SubscriptionModel.update(
-          { status: SubscriptionStatus.idle, pid: undefined },
-          { where: { id: sub.id } },
-        );
         const absolutePath = await this.handleLogPath(sub.log_path as string);
+
+        // 执行 sub_after
+        let afterStr = '';
+        try {
+          if (sub.sub_after) {
+            fs.appendFileSync(absolutePath, `\n\n## 执行after命令...\n\n`);
+            afterStr = await this.promiseExec(sub.sub_after);
+          }
+        } catch (error: any) {
+          afterStr =
+            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
+        }
+        if (afterStr) {
+          fs.appendFileSync(absolutePath, `${afterStr}\n`);
+        }
+
         fs.appendFileSync(
           absolutePath,
           `\n## 执行结束... ${endTime.format(
@@ -219,20 +232,10 @@ export default class SubscriptionService {
           )}  耗时 ${diff} 秒`,
         );
 
-        // 执行 sub_after
-        let afterStr = '';
-        try {
-          if (sub.sub_after) {
-            afterStr = execSync(sub.sub_after).toString();
-          }
-        } catch (error) {
-          afterStr = JSON.stringify(error);
-        }
-        if (afterStr) {
-          afterStr = `\n\n${afterStr}`;
-          const absolutePath = await this.handleLogPath(sub.log_path as string);
-          fs.appendFileSync(absolutePath, afterStr);
-        }
+        await SubscriptionModel.update(
+          { status: SubscriptionStatus.idle, pid: undefined },
+          { where: { id: sub.id } },
+        );
 
         this.sockService.sendMessage({
           type: 'runSubscriptionEnd',
@@ -256,7 +259,7 @@ export default class SubscriptionService {
   public async create(payload: Subscription): Promise<Subscription> {
     const tab = new Subscription(payload);
     const doc = await this.insert(tab);
-    this.handleTask(doc);
+    await this.handleTask(doc);
     return doc;
   }
 
@@ -266,7 +269,7 @@ export default class SubscriptionService {
 
   public async update(payload: Subscription): Promise<Subscription> {
     const newDoc = await this.updateDb(payload);
-    this.handleTask(newDoc);
+    await this.handleTask(newDoc, !newDoc.is_disabled);
     return newDoc;
   }
 
@@ -309,7 +312,7 @@ export default class SubscriptionService {
   public async remove(ids: number[]) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      this.handleTask(doc, false, false);
+      await this.handleTask(doc, false, false);
     }
     await SubscriptionModel.destroy({ where: { id: ids } });
   }
@@ -340,16 +343,14 @@ export default class SubscriptionService {
           this.logger.silly(error);
         }
       }
-      this.handleTask(doc, false);
       const command = this.formatCommand(doc);
       const err = await this.killTask(command);
       const absolutePath = await this.handleLogPath(doc.log_path as string);
       const str = err ? `\n${err}` : '';
+
       fs.appendFileSync(
         `${absolutePath}`,
-        `${str}\n## 执行结束...  ${new Date()
-          .toLocaleString('zh', { hour12: false })
-          .replace(' 24:', ' 00:')} `,
+        `${str}\n## 执行结束...  ${dayjs().format('YYYY-MM-DD HH:mm:ss')} `,
       );
     }
 
@@ -411,7 +412,7 @@ export default class SubscriptionService {
   public async disabled(ids: number[]) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      this.handleTask(doc, false);
+      await this.handleTask(doc, false);
     }
     await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
   }
@@ -419,14 +420,14 @@ export default class SubscriptionService {
   public async enabled(ids: number[]) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      this.handleTask(doc);
+      await this.handleTask(doc);
     }
     await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
   }
 
   public async log(id: number) {
     const doc = await this.getDb({ id });
-    if (!doc) {
+    if (!doc || !doc.log_path) {
       return '';
     }
 

back/services/user.ts

@@ -13,7 +13,7 @@ import { Request } from 'express';
 import ScheduleService from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
-import got from 'got';
+import dayjs from 'dayjs';
 
 @Service()
 export default class UserService {
@@ -111,7 +111,7 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
+          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
             req.platform
           }端 登录成功，ip地址 ${ip}`,
         );
@@ -140,7 +140,7 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
+          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
             req.platform
           }端 登录失败，ip地址 ${ip}`,
         );

back/token.ts

@@ -0,0 +1,34 @@
+import 'reflect-metadata';
+import OpenService from './services/open';
+import { Container } from 'typedi';
+import LoggerInstance from './loaders/logger';
+import fs from 'fs';
+import config from './config';
+import path from 'path';
+
+const tokenFile = path.join(config.configPath, 'token.json');
+
+async function getToken() {
+  try {
+    Container.set('logger', LoggerInstance);
+    const openService = Container.get(OpenService);
+    const appToken = await openService.generateSystemToken();
+    console.log(appToken.value);
+    await writeFile({
+      value: appToken.value,
+      expiration: appToken.expiration,
+    });
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+async function writeFile(data: any) {
+  return new Promise<void>((resolve, reject) => {
+    fs.writeFile(tokenFile, JSON.stringify(data), { encoding: 'utf8' }, () => {
+      resolve();
+    });
+  });
+}
+
+getToken();

docker/Dockerfile

@@ -1,11 +1,12 @@
-FROM node:alpine
+FROM python: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 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 \
+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 \
     LANG=zh_CN.UTF-8 \
     SHELL=/bin/bash \
     PS1="\u@\h:\w \$ " \
@@ -28,18 +29,18 @@ RUN set -x \
                              perl \
                              openssl \
                              nginx \
-                             python3 \
+                             nodejs \
                              jq \
                              openssh \
-                             py3-pip \
+                             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 setup \
-    && source ~/.bashrc \
     && pnpm add -g pm2 ts-node typescript tslib \
     && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
     && cd ${QL_DIR} \

docker/docker-entrypoint.sh

@@ -9,7 +9,15 @@ make_dir /etc/nginx/conf.d
 make_dir /run/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
 pm2 l &>/dev/null
+
+if [[ $PipMirror ]]; then
+  pip3 config set global.index-url $PipMirror
+fi
+if [[ $NpmMirror ]]; then
+  npm config set registry $NpmMirror
+fi
 echo
 
 echo -e "======================2. 安装依赖========================\n"

docker/front.conf

@@ -1,12 +1,12 @@
-upstream api {
+upstream baseApi {
   server 0.0.0.0:5600;
 }
 
-upstream public {
+upstream publicApi {
   server 0.0.0.0:5400;
 }
 
-map $http_upgrade $connection_upgrade { 
+map $http_upgrade $connection_upgrade {
   default keep-alive;
   'websocket' upgrade;
 }
@@ -16,42 +16,42 @@ server {
   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/public/;
   }
 
-  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_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;  
+  gzip_http_version 1.0;
 
-  location / {
-    index  index.html index.htm;
-    try_files $uri $uri/ /index.html;
+  location QL_BASE_URL/ {
+    index index.html index.htm;
+    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;
-	default_type application/octet-stream;
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
 
-	server_tokens off;
+  server_tokens off;
 
-	client_max_body_size 20m;
-	client_body_buffer_size 20m;
+  client_max_body_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_static 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" '
-			'$status $body_bytes_sent "$http_referer" '
-			'"$http_user_agent" "$http_x_forwarded_for"';
+  log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+  '$status $body_bytes_sent "$http_referer" '
+  '"$http_user_agent" "$http_x_forwarded_for"';
 
-	access_log /var/log/nginx/access.log main;
-	include /etc/nginx/conf.d/*.conf;
+  access_log /var/log/nginx/access.log main;
+  include /etc/nginx/conf.d/*.conf;
 }

package.json

@@ -31,17 +31,13 @@
       "allowedVersions": {
         "react": "17",
         "react-dom": "17"
-      },
-      "ignoreMissing": [
-        "monaco-editor",
-        "react-router"
-      ]
+      }
     }
   },
   "dependencies": {
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^6.18.1",
-    "@sentry/tracing": "^6.18.1",
+    "@sentry/node": "^7.12.1",
+    "@sentry/tracing": "^7.12.1",
     "body-parser": "^1.19.2",
     "celebrate": "^15.0.1",
     "chokidar": "^3.5.3",
@@ -63,10 +59,10 @@
     "nodemailer": "^6.7.2",
     "p-queue": "7.2.0",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.17.0",
+    "sequelize": "^6.20.1",
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
-    "sqlite3": "npm:@louislam/sqlite3@^15.0.3",
+    "sqlite3": "npm:@louislam/sqlite3@^15.0.6",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
@@ -77,7 +73,7 @@
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.33.1",
     "@monaco-editor/react": "^4.3.1",
-    "@sentry/react": "^6.18.1",
+    "@sentry/react": "^7.12.1",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
@@ -121,6 +117,7 @@
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.6.0",
+    "tslib": "^2.4.0",
     "typescript": "^4.6.2",
     "umi": "^3.5.21",
     "umi-request": "^1.4.0",

sample/config.sample.sh

@@ -29,6 +29,14 @@ MaxConcurrentNum="5"
 ## 默认给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,8 +46,11 @@ AutoStartBot=""
 ## 是否使用第三方bot，默认不使用，使用时填入仓库地址，存到ql/repo目录下，文件夹命名为diybot
 BotRepoUrl=""
 
-## 安装bot依赖时指定pip源，默认使用清华源，如不需要源，设置此参数为空
-PipMirror="https://pypi.tuna.tsinghua.edu.cn/simple"
+## 安装python依赖时指定pip源，默认使用清华源
+PipMirror="https://pypi.doubanio.com/simple/"
+
+## 安装node依赖时指定pip源，默认使用清华源
+NpmMirror="https://registry.npmmirror.com"
 
 ## 通知环境变量
 ## 1. Server酱
@@ -129,4 +140,10 @@ 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=""
+
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.js

@@ -39,6 +39,12 @@ let SCKEY = '';
 //(环境变量名 DEER_KEY)
 let PUSHDEER_KEY = '';
 
+// =======================================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 = '';
@@ -97,6 +103,13 @@ let IGOT_PUSH_KEY = '';
 let PUSH_PLUS_TOKEN = '';
 let PUSH_PLUS_USER = '';
 
+// =======================================Cool Push设置区域=======================================
+//官方文档：https://cp.xuthus.cc/docs
+//QQ_SKEY: Cool Push登录授权后推送消息的调用代码Skey
+//QQ_MODE: 推送模式详情请登录获取QQ_SKEY后见https://cp.xuthus.cc/feat
+let QQ_SKEY = '';
+let QQ_MODE = '';
+
 //==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
   GOTIFY_URL = process.env.GOTIFY_URL;
@@ -126,6 +139,14 @@ if (process.env.DEER_KEY) {
   PUSHDEER_KEY = process.env.DEER_KEY;
 }
 
+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) {
   QQ_SKEY = process.env.QQ_SKEY;
 }
@@ -232,6 +253,8 @@ 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
   ]);
 }
 
@@ -362,7 +385,7 @@ function serverNotify(text, desp, time = 2100) {
   });
 }
 
-function PushDeerNotify(text, desp, time = 2100) {
+function PushDeerNotify(text, desp) {
   return new Promise((resolve) => {
     if (PUSHDEER_KEY) {
       // PushDeer 建议对消息内容进行 urlencode
@@ -375,8 +398,9 @@ function PushDeerNotify(text, desp, time = 2100) {
         },
         timeout,
       };
-      setTimeout(() => {
-        $.post(options, (err, resp, data) => {
+      $.post(
+        options,
+        (err, resp, data) => {
           try {
             if (err) {
               console.log('发送通知调用API失败！！\n');
@@ -400,8 +424,46 @@ function PushDeerNotify(text, desp, time = 2100) {
           } finally {
             resolve(data);
           }
-        });
-      }, time);
+        },
+        time,
+      );
+    } else {
+      resolve();
+    }
+  });
+}
+
+function ChatNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (CHAT_URL && CHAT_TOKEN) {
+      // 对消息内容进行 urlencode
+      desp = encodeURI(desp);
+      const options = {
+        url: `${CHAT_URL}${CHAT_TOKEN}`,
+        body: `payload={"text":"${text}\n${desp}"}`,
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+        },
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.success) {
+              console.log('Chat发送通知消息成功🎉\n');
+            } else {
+              console.log(`Chat发送通知消息异常\n${JSON.stringify(data)}`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e);
+        } finally {
+          resolve(data);
+        }
+      });
     } else {
       resolve();
     }
@@ -723,9 +785,9 @@ function qywxamNotify(text, desp) {
         timeout,
       };
       $.post(options_accesstoken, (err, resp, data) => {
-        html = desp.replace(/\n/g, '<br/>');
-        var json = JSON.parse(data);
-        accesstoken = json.access_token;
+        let html = desp.replace(/\n/g, '<br/>');
+        let json = JSON.parse(data);
+        let accesstoken = json.access_token;
         let options;
 
         switch (QYWX_AM_AY[4]) {

sample/notify.py

@@ -61,7 +61,10 @@ push_config = {
     'PUSH_KEY': '',                     # server 酱的 PUSH_KEY，兼容旧版与 Turbo 版
 
     'DEER_KEY': '',                     # PushDeer 的 PUSHDEER_KEY
-    
+  
+    'CHAT_URL': '',                     # synology chat url
+    'CHAT_TOKEN': '',                   # synology chat token
+  
     'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
     'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
 
@@ -279,8 +282,27 @@ def pushdeer(title: str, content: str) -> None:
         print("PushDeer 推送成功！")
     else:
         print("PushDeer 推送失败！错误信息：", response)
-    
 
+        
+def chat(title: str, content: str) -> None:
+    """
+    通过Chat 推送消息
+    """
+    if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
+        print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
+        return
+    print("chat 服务启动")
+    data = 'payload=' + json.dumps({'text': title + '\n' + content})
+    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
+    response = requests.post(url, data=data)
+    
+    if response.status_code == 200:
+        print("Chat 推送成功！")
+    else:
+        print("Chat 推送失败！错误信息：", response)    
+
+        
+        
 def pushplus_bot(title: str, content: str) -> None:
     """
     通过 push+ 推送消息。
@@ -527,6 +549,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"):

sample/tool.ts

@@ -17,7 +17,7 @@ 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(
   '',
-  '',
+  {},
   'text/plain; charset=utf-8',
 );
 // 文件上传

shell/api.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 get_token() {
-    token=$(cat $file_auth_user | jq -r .token)
+    token=$(cat $file_auth_token | jq -r .value)
 }
 
 add_cron_api() {
@@ -17,7 +17,7 @@ add_cron_api() {
     fi
 
     local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \
             -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
@@ -52,7 +52,7 @@ update_cron_api() {
     fi
 
     local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
             -X 'PUT' \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \
@@ -84,7 +84,7 @@ update_cron_command_api() {
     fi
 
     local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
             -X 'PUT' \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \
@@ -109,7 +109,7 @@ del_cron_api() {
     local ids=$1
     local currentTimeStamp=$(date +%s)
     local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
             -X 'DELETE' \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \
@@ -130,24 +130,6 @@ del_cron_api() {
     fi
 }
 
-get_user_info() {
-    local currentTimeStamp=$(date +%s)
-    local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/api/user?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' \
-            --compressed
-    )
-    code=$(echo $api | jq -r .code)
-    if [[ $code != 200 ]]; then
-        echo -e "请先登录！"
-        exit 0
-    fi
-}
-
 update_cron() {
     local ids="$1"
     local status="$2"
@@ -157,7 +139,7 @@ update_cron() {
     local runningTime="${6:-0}"
     local currentTimeStamp=$(date +%s)
     local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons/status?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
             -X 'PUT' \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \
@@ -172,7 +154,7 @@ update_cron() {
     code=$(echo $api | jq -r .code)
     message=$(echo $api | jq -r .message)
     if [[ $code != 200 ]]; then
-        echo -e "\n## 更新任务状态失败(${message})\n" >> $log_path
+        echo -e "\n## 更新任务状态失败(${message})\n" >> $dir_log/$log_path
     fi
 }
 
@@ -181,7 +163,7 @@ notify_api() {
     local content=$2
     local currentTimeStamp=$(date +%s)
     local api=$(
-        curl -s --noproxy "*" "http://0.0.0.0:5600/api/system/notify?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
             -X 'PUT' \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \

shell/check.sh

@@ -31,6 +31,7 @@ copy_dep() {
   echo -e "---> 2. 复制nginx配置文件\n"
   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
   echo -e "---> 配置文件复制完成\n"
 }
 
@@ -88,6 +89,10 @@ check_pm2() {
 
 main() {
   echo -e "=====> 开始检测"
+  npm i -g pnpm
+  pnpm setup &>/dev/null
+  source ~/.bashrc
+  pnpm install -g &>/dev/null
   pnpm add -g pm2
   copy_dep
   check_ql

shell/share.sh

@@ -14,7 +14,6 @@ dir_log=$dir_data/log
 dir_db=$dir_data/db
 dir_dep=$dir_data/deps
 dir_list_tmp=$dir_log/.tmp
-dir_code=$dir_log/code
 dir_update_log=$dir_log/update
 ql_static_repo=$dir_repo/static
 
@@ -25,6 +24,7 @@ file_sharecode=$dir_config/sharecode.sh
 file_config_user=$dir_config/config.sh
 file_auth_sample=$dir_sample/auth.sample.json
 file_auth_user=$dir_config/auth.json
+file_auth_token=$dir_config/token.json
 file_extra_shell=$dir_config/extra.sh
 file_task_before=$dir_config/task_before.sh
 file_task_after=$dir_config/task_after.sh
@@ -52,12 +52,10 @@ list_own_drop=$dir_list_tmp/own_drop.list
 link_name=(
     task
     ql
-    notify
 )
 original_name=(
     task.sh
     update.sh
-    notify.sh
 )
 
 init_env() {
@@ -69,6 +67,7 @@ import_config() {
     [[ -f $file_config_user ]] && . $file_config_user
     [[ -f $file_env ]] && . $file_env
 
+    ql_base_url=${QlBaseUrl:-""}
     command_timeout_time=${CommandTimeoutTime:-"1h"}
     proxy_url=${ProxyUrl:-""}
     file_extensions=${RepoFileExtensions:-"js py"}
@@ -101,7 +100,7 @@ make_dir() {
 }
 
 detect_termux() {
-    if [[ ${ANDROID_RUNTIME_ROOT}${ANDROID_ROOT} ]] || [[ $PATH == *com.termux* ]]; then
+    if [[ $PATH == *com.termux* ]]; then
         is_termux=1
     else
         is_termux=0
@@ -246,15 +245,13 @@ fix_config() {
 }
 
 npm_install_sub() {
-    set_proxy
     if [ $is_termux -eq 1 ]; then
-        npm install --production --no-bin-links --registry=https://registry.npm.taobao.org || npm install --production --no-bin-links
+        npm install --production --no-bin-links
     elif ! type pnpm &>/dev/null; then
-        npm install --production --registry=https://registry.npm.taobao.org || npm install --production
+        npm install --production
     else
-        pnpm install --loglevel error --production --registry=https://registry.npm.taobao.org || pnpm install --production --loglevel error
+        pnpm install --loglevel error --production
     fi
-    unset_proxy
 }
 
 npm_install_1() {
@@ -380,6 +377,52 @@ reload_pm2() {
     pm2 start $dir_static/build/public.js -n public --source-map-support --time &>/dev/null
 }
 
+diff_time() {
+    local format="$1"
+    local begin_time="$2"
+    local end_time="$3"
+
+    if [[ $is_macos -eq 1 ]]; then
+        diff_time=$(($(date -j -f "$format" "$end_time" +%s) - $(date -j -f "$format" "$begin_time" +%s)))
+    else
+        diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
+    fi
+    echo "$diff_time"
+}
+
+format_time() {
+    local format="$1"
+    local time="$2"
+
+    if [[ $is_macos -eq 1 ]]; then
+        echo $(date -j -f "$format" "$time" "+%Y-%m-%d %H:%M:%S")
+    else
+        echo $(date -d "$time" "+%Y-%m-%d %H:%M:%S")
+    fi
+}
+
+format_log_time() {
+    local format="$1"
+    local time="$2"
+
+    if [[ $is_macos -eq 1 ]]; then
+        echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S")
+    else
+        echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    fi
+}
+
+format_timestamp() {
+    local format="$1"
+    local time="$2"
+
+    if [[ $is_macos -eq 1 ]]; then
+        echo $(date -j -f "$format" "$time" "+%s")
+    else
+        echo $(date -d "$time" "+%s")
+    fi
+}
+
 init_env
 detect_termux
 detect_macos

shell/task.sh

@@ -24,12 +24,29 @@ define_program() {
 random_delay() {
     local random_delay_max=$RandomDelay
     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
+        local file_param=$1
+        local file_extensions=${RandomDelayFileExtensions-"js"}
+        local ignored_minutes=${RandomDelayIgnoredMinutes-"0 30"}
+
+        if [[ -n $file_extensions ]]; then
+            if ! echo "$file_param" | grep -qE "\.${file_extensions// /$|\\.}$"; then
+                # echo -e "\n当前文件需要准点运行, 放弃随机延迟\n"
+                return
+            fi
         fi
+
+        local current_min
+        current_min=$(date "+%-M")
+        for minute in $ignored_minutes; do
+            if [[ $current_min -eq $minute ]]; then
+                # echo -e "\n当前时间需要准点运行, 放弃随机延迟\n"
+                return
+            fi
+        done
+
+        local delay_second=$(($(gen_random_num "$random_delay_max") + 1))
+        echo -e "\n命令未添加 \"now\"，随机延迟 $delay_second 秒后再执行任务，如需立即终止，请按 CTRL+C...\n"
+        sleep $delay_second
     fi
 }
 
@@ -78,14 +95,12 @@ run_nohup() {
 run_normal() {
     local file_param=$1
     define_program "$file_param"
-    if [[ $file_param == *.js ]]; then
-        if [[ $# -eq 1 ]]; then
-            random_delay
-        fi
+    if [[ $# -eq 1 ]]; then
+        random_delay "$file_param"
     fi
 
-    local time=$(date)
-    log_time=$(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    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
@@ -99,12 +114,13 @@ run_normal() {
     [[ $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"
+    cmd=">> $dir_log/$log_path 2>&1"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$dir_log/$log_dir"
 
-    local begin_time=$(date -d "$time" "+%Y-%m-%d %H:%M:%S")
-    local begin_timestamp=$(date -d "$time" "+%s")
+    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
 
@@ -118,12 +134,13 @@ run_normal() {
         cd ${relative_path}
         file_param=${file_param/$relative_path\//}
     fi
-    eval timeout -k 10s $command_timeout_time $which_program $file_param $cmd
+    
+    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 ))
+    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
 }
@@ -154,8 +171,8 @@ run_concurrent() {
     [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
 
     define_program "$file_param"
-    local time=$(date)
-    log_time=$(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    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
@@ -169,12 +186,12 @@ run_concurrent() {
     [[ $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"
+    cmd=">> $dir_log/$log_path 2>&1"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$dir_log/$log_dir"
 
-    local begin_time=$(date -d "$time" "+%Y-%m-%d %H:%M:%S")
-    local begin_timestamp=$(date -d "$time" "+%s")
+    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
@@ -196,7 +213,7 @@ run_concurrent() {
     for i in "${!array[@]}"; do
         export ${env_param}=${array[i]}
         single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-        timeout -k 10s $command_timeout_time $which_program $file_param &>$single_log_path &
+        eval $timeoutCmd $which_program $file_param &>$single_log_path &
     done
 
     wait
@@ -224,8 +241,8 @@ run_designated() {
     fi
 
     define_program "$file_param"
-    local time=$(date)
-    log_time=$(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    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
@@ -239,12 +256,12 @@ run_designated() {
     [[ $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"
+    cmd=">> $dir_log/$log_path 2>&1"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$dir_log/$log_dir"
 
-    local begin_time=$(date -d "$time" "+%Y-%m-%d %H:%M:%S")
-    local begin_timestamp=$(date -d "$time" "+%s")
+    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'))
@@ -274,7 +291,7 @@ run_designated() {
         cd ${relative_path}
         file_param=${file_param/$relative_path\//}
     fi
-    eval timeout -k 10s $command_timeout_time $which_program $file_param $cmd
+    eval $timeoutCmd $which_program $file_param $cmd
 
     eval . $file_task_after "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
@@ -288,8 +305,8 @@ run_designated() {
 run_else() {
     local file_param="$1"
     define_program "$file_param"
-    local time=$(date)
-    log_time=$(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    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
@@ -303,12 +320,12 @@ run_else() {
     [[ $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"
+    cmd=">> $dir_log/$log_path 2>&1"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$dir_log/$log_dir"
 
-    local begin_time=$(date -d "$time" "+%Y-%m-%d %H:%M:%S")
-    local begin_timestamp=$(date -d "$time" "+%s")
+    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
@@ -325,7 +342,7 @@ run_else() {
     fi
 
     shift
-    eval timeout -k 10s $command_timeout_time $which_program "$file_param" "$@" $cmd
+    eval $timeoutCmd $which_program "$file_param" "$@" $cmd
 
     eval . $file_task_after "$file_param" "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
@@ -348,7 +365,13 @@ main() {
     done
     [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
 
-    if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
+    timeoutCmd=""
+    if type timeout &>/dev/null; then
+        timeoutCmd="timeout -k 10s $command_timeout_time "
+    fi
+
+    time_format="%Y-%m-%d %H:%M:%S"
+    if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
         case $# in
         1)
             run_normal "$1"

shell/update.sh

@@ -12,14 +12,16 @@ diff_cron() {
     local list_task="$2"
     local list_add="$3"
     local list_drop="$4"
-    if [[ -s $list_task ]]; then
+    if [[ -s $list_task ]] && [[ -s $list_scripts ]]; then
         grep -vwf $list_task $list_scripts >$list_add
-    elif [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
+        grep -vwf $list_scripts $list_task >$list_drop
+    fi
+
+    if [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
         cp -f $list_scripts $list_add
     fi
-    if [[ -s $list_scripts ]]; then
-        grep -vwf $list_scripts $list_task >$list_drop
-    else
+
+    if [[ ! -s $list_scripts ]] && [[ -s $list_task ]]; then
         cp -f $list_task $list_drop
     fi
 }
@@ -293,6 +295,11 @@ update_qinglong() {
 }
 
 patch_version() {
+    # 兼容pnpm@7 
+    pnpm setup &>/dev/null
+    source ~/.bashrc
+    pnpm install -g &>/dev/null
+
     if [[ -f "$dir_root/db/cookie.db" ]]; then
         echo -e "检测到旧的db文件，拷贝为新db...\n"
         mv $dir_root/db/cookie.db $dir_root/db/env.db
@@ -301,13 +308,9 @@ patch_version() {
     fi
 
     if ! type ts-node &>/dev/null; then
-        pnpm i -g ts-node typescript tslib
+        pnpm add -g ts-node typescript tslib
     fi
 
-    # 兼容pnpm@7 
-    pnpm setup
-    source ~/.bashrc
-
     git config --global pull.rebase false
 
     cp -f $dir_root/.env.example $dir_root/.env
@@ -336,6 +339,13 @@ patch_version() {
         echo
     fi
 
+    if [[ $PipMirror ]]; then
+      pip3 config set global.index-url $PipMirror
+    fi
+    if [[ $NpmMirror ]]; then
+      npm config set registry $NpmMirror
+    fi
+
 }
 
 ## 对比脚本
@@ -386,6 +396,9 @@ gen_list_repo() {
     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
@@ -486,7 +499,6 @@ main() {
         run_extra_shell >>$log_path
         ;;
     repo)
-        get_user_info
         get_uniq_path "$p2" "$p6"
         if [[ -n $p2 ]]; then
             update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7"
@@ -496,7 +508,6 @@ main() {
         fi
         ;;
     raw)
-        get_user_info
         get_uniq_path "$p2"
         if [[ -n $p2 ]]; then
             update_raw "$p2"
@@ -538,7 +549,7 @@ main() {
         ;;
     esac
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
+    local diff_time=$(diff_time "%Y-%m-%d %H:%M:%S" "$begin_time" "$end_time")
     if [[ $p1 != "repo" ]] && [[ $p1 != "raw" ]]; then
         echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >>$log_path
         cat $log_path

src/layouts/index.less

@@ -56,7 +56,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 +142,7 @@
     flex: 1;
 
     .ant-pro-grid-content-children {
-      height: calc(100% - 36px);
+      height: 100%;
 
       > div,
       .log-container,
@@ -264,16 +270,24 @@
   }
 }
 
-.ant-pro-page-container-children-content {
-  margin: 18px 18px 18px;
-}
-
 .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 {
@@ -312,6 +326,10 @@
   background-color: #373739;
 }
 
+.ant-layout-sider {
+  border-right: 1px solid rgba(0, 0, 0, 0.06) !important;
+}
+
 .ant-pro-sider-logo {
   padding: 16px 8px !important;
 

src/layouts/index.tsx

@@ -186,9 +186,8 @@ export default function (props: any) {
   if (
     ['/login', '/initialization', '/error'].includes(props.location.pathname)
   ) {
-    document.title = `${
-      (config.documentTitleMap as any)[props.location.pathname]
-    } - 控制面板`;
+    document.title = `${(config.documentTitleMap as any)[props.location.pathname]
+      } - 控制面板`;
     if (
       systemInfo?.isInitialized &&
       props.location.pathname === '/initialization'
@@ -282,7 +281,7 @@ export default function (props: any) {
                 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>
@@ -304,7 +303,7 @@ export default function (props: any) {
                   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>

src/pages/crontab/detail.tsx

@@ -20,6 +20,7 @@ import {
   FileOutlined,
   PlayCircleOutlined,
   PauseCircleOutlined,
+  FullscreenOutlined,
 } from '@ant-design/icons';
 import { CrontabStatus } from './index';
 import { diffTime } from '@/utils/date';
@@ -106,7 +107,7 @@ const CronDetailModal = ({
           glyphMargin: false,
           wordWrap: 'on',
         }}
-        onMount={(editor) => {
+        onMount={(editor, monaco) => {
           editorRef.current = editor;
         }}
       />
@@ -115,9 +116,13 @@ const CronDetailModal = ({
 
   const onClickItem = (item: LogItem) => {
     localStorage.setItem('logCron', currentCron.id);
-    setLogUrl(`${config.apiPrefix}logs/${item.directory}/${item.filename}`);
+    setLogUrl(
+      `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+    );
     request
-      .get(`${config.apiPrefix}logs/${item.directory}/${item.filename}`)
+      .get(
+        `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+      )
       .then((data) => {
         setLog(data.data);
         setIsLogModalVisible(true);
@@ -148,9 +153,13 @@ const CronDetailModal = ({
         cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
       }
 
-      let [p, s] = cmd[1].split('/');
-      if (!s) {
-        s = p;
+      let p: string, s: string;
+      let index = cmd[1].lastIndexOf('/');
+      if (index >= 0) {
+        s = cmd[1].slice(index + 1);
+        p = cmd[1].slice(0, index);
+      } else {
+        s = cmd[1];
         p = '';
       }
       setScriptInfo({ parent: p, filename: s });
@@ -348,6 +357,11 @@ const CronDetailModal = ({
     });
   };
 
+  const fullscreen = () => {
+    const editorElement = editorRef.current._domElement as HTMLElement;
+    editorElement.parentElement?.requestFullscreen();
+  };
+
   useEffect(() => {
     if (cron && cron.id) {
       setCurrentCron(cron);
@@ -525,13 +539,20 @@ const CronDetailModal = ({
           }}
           tabBarExtraContent={
             activeTabKey === 'script' && (
-              <Button
-                type="primary"
-                style={{ marginRight: 8 }}
-                onClick={saveFile}
-              >
-                保存
-              </Button>
+              <>
+                <Button
+                  type="primary"
+                  style={{ marginRight: 8 }}
+                  onClick={saveFile}
+                >
+                  保存
+                </Button>
+                <Button
+                  type="primary"
+                  icon={<FullscreenOutlined />}
+                  onClick={fullscreen}
+                />
+              </>
             )
           }
         >

src/pages/crontab/index.less

@@ -2,12 +2,6 @@
   margin-bottom: 0 !important;
 }
 
-.cron {
-  &:hover {
-    cursor: pointer;
-  }
-}
-
 .crontab-detail {
   .card-wrapper {
     height: 80vh;
@@ -101,3 +95,84 @@
     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(2) {
+    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;
+  }
+}

src/pages/crontab/index.tsx

@@ -12,6 +12,8 @@ import {
   Typography,
   Input,
   Popover,
+  Tabs,
+  TablePaginationConfig,
 } from 'antd';
 import {
   ClockCircleOutlined,
@@ -27,6 +29,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';
@@ -39,6 +46,10 @@ import { diffTime } from '@/utils/date';
 import { getTableScroll } from '@/utils/index';
 import { history } from 'umi';
 import './index.less';
+import ViewCreateModal from './viewCreateModal';
+import ViewManageModal from './viewManageModal';
+import pagination from 'antd/lib/pagination';
+import { FilterValue, SorterResult } from 'antd/lib/table/interface';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -82,10 +93,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         <>
           <a
             onClick={() => {
-              goToScriptManager(record);
+              setDetailCron(record);
+              setIsDetailModalVisible(true);
             }}
           >
-            {record.labels?.length > 0 && record.labels[0] !== '' ? (
+            {record.labels?.length > 0 && record.labels[0] !== '' && false ? (
               <Popover
                 placement="right"
                 trigger={isPhone ? 'click' : 'hover'}
@@ -98,6 +110,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
                         onClick={(e) => {
                           e.stopPropagation();
                           setSearchValue(`label:${label}`);
+                          setSearchText(`label:${label}`);
                         }}
                       >
                         <a>{label}</a>
@@ -122,15 +135,14 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         </>
       ),
       sorter: {
-        compare: (a: any, b: any) => a.name.localeCompare(b.name),
-        multiple: 2,
+        compare: (a: any, b: any) => a?.name?.localeCompare(b?.name),
       },
     },
     {
       title: '命令',
       dataIndex: 'command',
       key: 'command',
-      width: 250,
+      width: 300,
       align: 'center' as const,
       render: (text: string, record: any) => {
         return (
@@ -142,13 +154,18 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
             }}
             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,
       },
     },
     {
@@ -159,12 +176,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       align: 'center' as const,
       sorter: {
         compare: (a: any, b: any) => 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) => {
@@ -181,10 +199,10 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
           >
             {record.last_execution_time
               ? new Date(record.last_execution_time * 1000)
-                  .toLocaleString(language, {
-                    hour12: false,
-                  })
-                  .replace(' 24:', ' 00:')
+                .toLocaleString(language, {
+                  hour12: false,
+                })
+                .replace(' 24:', ' 00:')
               : '-'}
           </span>
         );
@@ -194,6 +212,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       title: '最后运行时长',
       align: 'center' as const,
       width: 120,
+      dataIndex: 'last_running_time',
+      key: 'last_running_time',
       sorter: {
         compare: (a: any, b: any) => {
           return a.last_running_time - b.last_running_time;
@@ -346,12 +366,25 @@ 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 [pageSize, setPageSize] = useState(20);
+  const [pageConf, setPageConf] = useState<{
+    page: number;
+    size: number;
+    sorter: any;
+    filters: any;
+  }>({} as any);
+  const [viewConf, setViewConf] = useState<any>();
   const [tableScrollHeight, setTableScrollHeight] = useState<number>();
   const [isDetailModalVisible, setIsDetailModalVisible] = useState(false);
   const [detailCron, setDetailCron] = useState<any>();
   const [searchValue, setSearchValue] = useState('');
+  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 goToScriptManager = (record: any) => {
     const cmd = record.command.split(' ') as string[];
@@ -360,9 +393,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
       }
 
-      let [p, s] = cmd[1].split('/');
-      if (!s) {
-        s = p;
+      let p: string, s: string;
+      let index = cmd[1].lastIndexOf('/');
+      if (index >= 0) {
+        s = cmd[1].slice(index + 1);
+        p = cmd[1].slice(0, index);
+      } else {
+        s = cmd[1];
         p = '';
       }
       history.push(`/script?p=${p}&s=${s}`);
@@ -373,37 +410,33 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
 
   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.field) {
+      url += `&sorter=${JSON.stringify({ field: sorter.field, type: sorter.order === 'ascend' ? 'ASC' : 'DESC' })}`;
+    }
+    if (viewConf) {
+      url += `&queryString=${JSON.stringify({
+        filters: viewConf.filters,
+        sorts: viewConf.sorts,
+      })}`;
+    }
     request
-      .get(`${config.apiPrefix}crons?searchValue=${searchText}`)
-      .then((data: any) => {
+      .get(url)
+      .then((_data: any) => {
+        const { data, total } = _data.data;
         setValue(
-          data.data
-            .sort((a: any, b: any) => {
-              const sortA =
-                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
-                  .parseExpression(x.schedule)
-                  .next()
-                  .toDate(),
-              };
-            }),
+          data.map((x) => {
+            return {
+              ...x,
+              nextRunTime: cron_parser
+                .parseExpression(x.schedule)
+                .next()
+                .toDate(),
+            };
+          }),
         );
-        setCurrentPage(1);
+        setTotal(total);
       })
       .finally(() => setLoading(false));
   };
@@ -438,8 +471,10 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
               message.success('删除成功');
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1);
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1);
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -470,11 +505,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
             if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                status: CrontabStatus.running,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  status: CrontabStatus.running,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -505,12 +542,14 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
             if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                pid: null,
-                status: CrontabStatus.idle,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  pid: null,
+                  status: CrontabStatus.idle,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -538,8 +577,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}crons/${
-              record.isDisabled === 1 ? 'enable' : 'disable'
+            `${config.apiPrefix}crons/${record.isDisabled === 1 ? 'enable' : 'disable'
             }`,
             {
               data: [record.id],
@@ -550,11 +588,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
               const newStatus = record.isDisabled === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                isDisabled: newStatus,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  isDisabled: newStatus,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -582,8 +622,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}crons/${
-              record.isPinned === 1 ? 'unpin' : 'pin'
+            `${config.apiPrefix}crons/${record.isPinned === 1 ? 'unpin' : 'pin'
             }`,
             {
               data: [record.id],
@@ -594,11 +633,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
               const newStatus = record.isPinned === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                isPinned: newStatus,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  isPinned: newStatus,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -709,11 +750,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
           .parseExpression(data.data.schedule)
           .next()
           .toDate();
-        result.splice(index, 1, {
-          ...cron,
-          ...data.data,
-        });
-        setValue(result);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...cron,
+            ...data.data,
+          });
+          setValue(result);
+        }
       })
       .finally(() => setLoading(false));
   };
@@ -731,11 +774,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
   const rowSelection = {
     selectedRowIds,
     onChange: onSelectChange,
-    selections: [
-      Table.SELECTION_ALL,
-      Table.SELECTION_INVERT,
-      Table.SELECTION_NONE,
-    ],
   };
 
   const delCrons = () => {
@@ -784,10 +822,14 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
     });
   };
 
-  const onPageChange = (page: number, pageSize: number | undefined) => {
-    setCurrentPage(page);
-    setPageSize(pageSize as number);
-    localStorage.setItem('pageSize', pageSize + '');
+  const onPageChange = (
+    pagination: TablePaginationConfig,
+    filters: Record<string, FilterValue | null>,
+    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) => {
@@ -802,39 +844,37 @@ 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) {
+      getCrons();
+    }
+  }, [pageConf, viewConf]);
+
+  useEffect(() => {
+    if (viewConf && enabledCronViews && enabledCronViews.length > 0) {
+      const view = enabledCronViews.slice(2).find((x) => x.id === viewConf.id);
+      setMoreMenuActive(!!view);
+    }
+  }, [viewConf, enabledCronViews]);
+
+  useEffect(() => {
+    setPageConf({
+      page: 1,
+      size: parseInt(localStorage.getItem('pageSize') || '20'),
+      sorter: {},
+      filters: {}
+    });
     setTimeout(() => {
       setTableScrollHeight(getTableScroll());
     });
+    getCronViews();
   }, []);
 
-  return (
-    <PageContainer
-      className="ql-container-wrapper crontab-wrapper"
-      title="定时任务"
-      extra={[
-        <Search
-          placeholder="请输入名称或者关键词"
-          style={{ width: 'auto' }}
-          enterButton
-          allowClear
-          loading={loading}
-          value={searchValue}
-          onChange={(e) => setSearchValue(e.target.value)}
-          onSearch={onSearch}
-        />,
-        <Button key="2" type="primary" onClick={() => addCron()}>
-          新建任务
-        </Button>,
-      ]}
-      header={{
-        style: headerStyle,
-      }}
-    >
+  const panelContent = (
+    <>
       {selectedRowIds.length > 0 && (
         <div style={{ marginBottom: 16 }}>
           <Button type="primary" style={{ marginBottom: 5 }} onClick={delCrons}>
@@ -894,23 +934,16 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       <Table
         columns={columns}
         pagination={{
-          current: currentPage,
-          onChange: onPageChange,
-          pageSize: pageSize,
+          current: pageConf.page,
+          pageSize: pageConf.size,
           showSizeChanger: true,
           simple: isPhone,
-          defaultPageSize: 20,
+          total,
           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);
-            },
-          };
+          pageSizeOptions: [10, 20, 50, 100, 200, 500, total || 10000].sort(
+            (a, b) => a - b,
+          ),
         }}
         dataSource={value}
         rowKey="id"
@@ -919,7 +952,135 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         loading={loading}
         rowSelection={rowSelection}
         rowClassName={getRowClassName}
+        onChange={onPageChange}
       />
+    </>
+  );
+
+  const viewAction = (key: string) => {
+    switch (key) {
+      case 'new':
+        setIsCreateViewModalVisible(true);
+        break;
+      case 'manage':
+        setIsViewManageModalVisible(true);
+        break;
+
+      default:
+        tabClick(key);
+        break;
+    }
+  };
+
+  const menu = (
+    <Menu
+      onClick={({ key, domEvent }) => {
+        domEvent.stopPropagation();
+        viewAction(key);
+      }}
+      items={[
+        ...[...enabledCronViews].slice(2).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',
+        },
+        {
+          label: '新建视图',
+          key: 'new',
+          icon: <PlusOutlined />,
+        },
+        {
+          label: '视图管理',
+          key: 'manage',
+          icon: <SettingOutlined />,
+        },
+      ]}
+    />
+  );
+
+  const getCronViews = () => {
+    setLoading(true);
+    request
+      .get(`${config.apiPrefix}crons/views`)
+      .then((data: any) => {
+        setCronViews(data.data);
+        setEnabledCronViews(data.data.filter((x) => !x.isDisabled));
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  const tabClick = (key: string) => {
+    const view = enabledCronViews.find((x) => x.id == key);
+    setPageConf({ ...pageConf, page: 1 });
+    setViewConf(view ? view : null);
+  };
+
+  return (
+    <PageContainer
+      className="ql-container-wrapper crontab-wrapper ql-container-wrapper-has-tab"
+      title="定时任务"
+      extra={[
+        <Search
+          placeholder="请输入名称或者关键词"
+          style={{ width: 'auto' }}
+          enterButton
+          allowClear
+          loading={loading}
+          value={searchValue}
+          onChange={(e) => setSearchValue(e.target.value)}
+          onSearch={onSearch}
+        />,
+        <Button key="2" type="primary" onClick={() => addCron()}>
+          新建任务
+        </Button>,
+      ]}
+      header={{
+        style: headerStyle,
+      }}
+    >
+      <Tabs
+        defaultActiveKey="all"
+        size="small"
+        tabPosition="top"
+        className={`crontab-view ${moreMenuActive ? 'more-active' : ''}`}
+        tabBarExtraContent={
+          <Dropdown
+            overlay={menu}
+            trigger={['click']}
+            overlayStyle={{ minWidth: 200 }}
+          >
+            <div className={`view-more ${moreMenuActive ? 'active' : ''}`}>
+              <Space>
+                更多
+                <DownOutlined />
+              </Space>
+              <div className="ant-tabs-ink-bar ant-tabs-ink-bar-animated"></div>
+            </div>
+          </Dropdown>
+        }
+        onTabClick={tabClick}
+      >
+        <Tabs.TabPane tab="全部任务" key="all">
+          {panelContent}
+        </Tabs.TabPane>
+        {[...enabledCronViews].slice(0, 2).map((x) => (
+          <Tabs.TabPane tab={x.name} key={x.id}>
+            {panelContent}
+          </Tabs.TabPane>
+        ))}
+      </Tabs>
       <CronLogModal
         visible={isLogModalVisible}
         handleCancel={() => {
@@ -952,6 +1113,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/viewCreateModal.tsx

@@ -0,0 +1,262 @@
+import React, { useEffect, useState } from 'react';
+import {
+  Modal,
+  message,
+  Input,
+  Form,
+  Statistic,
+  Button,
+  Space,
+  Select,
+} from 'antd';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
+
+const PROPERTIES = [
+  { name: '命令', value: 'command' },
+  { name: '名称', value: 'name' },
+  { name: '定时规则', value: 'schedule' },
+  { name: '状态', value: 'status' },
+];
+
+const OPERATIONS = [
+  { name: '包含', value: 'Reg' },
+  { name: '不包含', value: 'NotReg' },
+  { name: '属于', value: 'In' },
+  { name: '不属于', value: 'Nin' },
+  // { name: '等于', value: 'Eq' },
+  // { name: '不等于', value: 'Ne' },
+  // { name: '为空', value: 'IsNull' },
+  // { name: '不为空', value: 'NotNull' },
+];
+
+const SORTTYPES = [
+  { name: '顺序', value: 'ASC' },
+  { name: '倒序', value: 'DESC' },
+];
+
+const STATUS = [
+  { name: '运行中', value: 0 },
+  { name: '空闲中', value: 1 },
+  { name: '已禁用', value: 2 },
+];
+
+const ViewCreateModal = ({
+  view,
+  handleCancel,
+  visible,
+}: {
+  view?: any;
+  visible: boolean;
+  handleCancel: (param?: any) => void;
+}) => {
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+  const [operationMap, setOperationMap] = useState<any>();
+
+  const handleOk = async (values: any) => {
+    setLoading(true);
+    const method = view ? 'put' : 'post';
+    try {
+      const { code, data } = await request[method](
+        `${config.apiPrefix}crons/views`,
+        {
+          data: view ? { ...values, id: view.id } : values,
+        },
+      );
+      if (code !== 200) {
+        message.error(data);
+      }
+      setLoading(false);
+      handleCancel(data);
+    } catch (error: any) {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    if (!view) {
+      form.resetFields();
+    }
+    form.setFieldsValue(
+      view || {
+        filters: [{ property: 'command', operation: 'Reg' }],
+      },
+    );
+  }, [view, visible]);
+
+  const operationElement = (
+    <Select
+      style={{ width: 100 }}
+      onChange={() => {
+        setOperationMap({});
+      }}
+    >
+      {OPERATIONS.map((x) => (
+        <Select.Option key={x.name} value={x.value}>
+          {x.name}
+        </Select.Option>
+      ))}
+    </Select>
+  );
+
+  const propertyElement = (props: any, style: React.CSSProperties = {}) => {
+    return (
+      <Select style={style}>
+        {props.map((x) => (
+          <Select.Option key={x.name} value={x.value}>
+            {x.name}
+          </Select.Option>
+        ))}
+      </Select>
+    );
+  };
+
+  const typeElement = (
+    <Select>
+      {SORTTYPES.map((x) => (
+        <Select.Option key={x.name} value={x.value}>
+          {x.name}
+        </Select.Option>
+      ))}
+    </Select>
+  );
+
+  const statusElement = (
+    <Select mode="multiple" allowClear placeholder="请选择状态">
+      {STATUS.map((x) => (
+        <Select.Option key={x.name} value={x.value}>
+          {x.name}
+        </Select.Option>
+      ))}
+    </Select>
+  );
+
+  return (
+    <Modal
+      title={view ? '编辑视图' : '新建视图'}
+      visible={visible}
+      forceRender
+      width={580}
+      centered
+      maskClosable={false}
+      onOk={() => {
+        form
+          .validateFields()
+          .then((values) => {
+            handleOk(values);
+          })
+          .catch((info) => {
+            console.log('Validate Failed:', info);
+          });
+      }}
+      onCancel={() => handleCancel()}
+      confirmLoading={loading}
+    >
+      <Form form={form} layout="vertical" name="env_modal">
+        <Form.Item
+          name="name"
+          label="视图名称"
+          rules={[{ required: true, message: '请输入视图名称' }]}
+        >
+          <Input placeholder="请输入视图名称" />
+        </Form.Item>
+        <Form.List name="filters">
+          {(fields, { add, remove }) => (
+            <>
+              {fields.map(({ key, name, ...restField }, index) => (
+                <Form.Item
+                  label={index === 0 ? '筛选条件' : ''}
+                  key={key}
+                  style={{ marginBottom: 0 }}
+                  required
+                >
+                  <Space className="view-create-modal-filters" align="baseline">
+                    <Form.Item
+                      {...restField}
+                      name={[name, 'property']}
+                      rules={[{ required: true }]}
+                    >
+                      {propertyElement(PROPERTIES, { width: 120 })}
+                    </Form.Item>
+                    <Form.Item
+                      {...restField}
+                      name={[name, 'operation']}
+                      rules={[{ required: true }]}
+                    >
+                      {operationElement}
+                    </Form.Item>
+                    <Form.Item
+                      {...restField}
+                      name={[name, 'value']}
+                      rules={[{ required: true, message: '请输入内容' }]}
+                    >
+                      {['In', 'Nin'].includes(
+                        form.getFieldValue(['filters', index, 'operation']),
+                      ) ? (
+                        statusElement
+                      ) : (
+                        <Input placeholder="请输入内容" />
+                      )}
+                    </Form.Item>
+                    {index !== 0 && (
+                      <MinusCircleOutlined onClick={() => remove(name)} />
+                    )}
+                  </Space>
+                </Form.Item>
+              ))}
+              <Form.Item>
+                <a
+                  onClick={() => add({ property: 'command', operation: 'Reg' })}
+                >
+                  <PlusOutlined />
+                  新增筛选条件
+                </a>
+              </Form.Item>
+            </>
+          )}
+        </Form.List>
+        <Form.List name="sorts">
+          {(fields, { add, remove }) => (
+            <>
+              {fields.map(({ key, name, ...restField }, index) => (
+                <Form.Item
+                  label={index === 0 ? '排序方式' : ''}
+                  key={key}
+                  style={{ marginBottom: 0 }}
+                >
+                  <Space className="view-create-modal-sorts" align="baseline">
+                    <Form.Item
+                      {...restField}
+                      name={[name, 'property']}
+                      rules={[{ required: true }]}
+                    >
+                      {propertyElement(PROPERTIES, { width: 240 })}
+                    </Form.Item>
+                    <Form.Item
+                      {...restField}
+                      name={[name, 'type']}
+                      rules={[{ required: true }]}
+                    >
+                      {typeElement}
+                    </Form.Item>
+                    <MinusCircleOutlined onClick={() => remove(name)} />
+                  </Space>
+                </Form.Item>
+              ))}
+              <Form.Item>
+                <a onClick={() => add({ property: 'command', type: 'ASC' })}>
+                  <PlusOutlined />
+                  新增排序方式
+                </a>
+              </Form.Item>
+            </>
+          )}
+        </Form.List>
+      </Form>
+    </Modal>
+  );
+};
+
+export default ViewCreateModal;

src/pages/crontab/viewManageModal.tsx

@@ -0,0 +1,272 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import {
+  Modal,
+  message,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  Button,
+  Switch,
+} from 'antd';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
+import { DndProvider, useDrag, useDrop } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
+import ViewCreateModal from './viewCreateModal';
+
+const { Text } = Typography;
+
+const type = 'DragableBodyRow';
+
+const DragableBodyRow = ({
+  index,
+  moveRow,
+  className,
+  style,
+  ...restProps
+}: any) => {
+  const ref = useRef();
+  const [{ isOver, dropClassName }, drop] = useDrop({
+    accept: type,
+    collect: (monitor) => {
+      const { index: dragIndex } = (monitor.getItem() as any) || {};
+      if (dragIndex === index) {
+        return {};
+      }
+      return {
+        isOver: monitor.isOver(),
+        dropClassName:
+          dragIndex < index ? ' drop-over-downward' : ' drop-over-upward',
+      };
+    },
+    drop: (item: any) => {
+      moveRow(item.index, index);
+    },
+  });
+  const [, drag] = useDrag({
+    type,
+    item: { index },
+    collect: (monitor) => ({
+      isDragging: monitor.isDragging(),
+    }),
+  });
+  drop(drag(ref));
+
+  return (
+    <tr
+      ref={ref}
+      className={`${className}${isOver ? dropClassName : ''}`}
+      style={{ cursor: 'move', ...style }}
+      {...restProps}
+    />
+  );
+};
+
+const ViewManageModal = ({
+  cronViews,
+  handleCancel,
+  visible,
+  cronViewChange,
+}: {
+  cronViews: any[];
+  visible: boolean;
+  handleCancel: () => void;
+  cronViewChange: (data?: any) => void;
+}) => {
+  const columns: any = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center' as const,
+    },
+    {
+      title: '显示',
+      key: 'isDisabled',
+      dataIndex: 'isDisabled',
+      align: 'center' as const,
+      width: 100,
+      render: (text: string, record: any, index: number) => {
+        return (
+          <Switch
+            checked={!record.isDisabled}
+            onChange={(checked) => onShowChange(checked, record, index)}
+          />
+        );
+      },
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 140,
+      align: 'center' as const,
+      render: (text: string, record: any, index: number) => {
+        return (
+          <Space size="middle">
+            <a onClick={() => editView(record, index)}>
+              <EditOutlined />
+            </a>
+            <a onClick={() => deleteView(record, index)}>
+              <DeleteOutlined />
+            </a>
+          </Space>
+        );
+      },
+    },
+  ];
+  const [list, setList] = useState<any[]>([]);
+  const [isCreateViewModalVisible, setIsCreateViewModalVisible] =
+    useState<boolean>(false);
+  const [editedView, setEditedView] = useState<any>(null);
+
+  const editView = (record: any, index: number) => {
+    setEditedView(record);
+    setIsCreateViewModalVisible(true);
+  };
+
+  const deleteView = (record: any, index: number) => {
+    Modal.confirm({
+      title: '确认删除',
+      content: (
+        <>
+          确认删除视图{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .delete(`${config.apiPrefix}crons/views`, { data: [record.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              message.success('删除成功');
+              cronViewChange();
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const onShowChange = (checked: boolean, record: any, index: number) => {
+    console.log(checked);
+    request
+      .put(`${config.apiPrefix}crons/views/${checked ? 'enable' : 'disable'}`, {
+        data: [record.id],
+      })
+      .then((data: any) => {
+        if (data.code === 200) {
+          const _list = [...list];
+          _list.splice(index, 1, { ...list[index], isDisabled: !checked });
+          setList(_list);
+          cronViewChange();
+        } else {
+          message.error(data);
+        }
+      });
+  };
+
+  const components = {
+    body: {
+      row: DragableBodyRow,
+    },
+  };
+
+  const moveRow = useCallback(
+    (dragIndex, hoverIndex) => {
+      if (dragIndex === hoverIndex) {
+        return;
+      }
+      const dragRow = list[dragIndex];
+      request
+        .put(`${config.apiPrefix}crons/views/move`, {
+          data: { fromIndex: dragIndex, toIndex: hoverIndex, id: dragRow.id },
+        })
+        .then((data: any) => {
+          if (data.code === 200) {
+            const newData = [...list];
+            newData.splice(dragIndex, 1);
+            newData.splice(hoverIndex, 0, { ...dragRow, ...data.data });
+            setList(newData);
+            cronViewChange();
+          } else {
+            message.error(data);
+          }
+        });
+    },
+    [list],
+  );
+
+  useEffect(() => {
+    setList(cronViews);
+  }, [cronViews]);
+
+  return (
+    <Modal
+      title="视图管理"
+      visible={visible}
+      centered
+      width={620}
+      onCancel={() => handleCancel()}
+      className="view-manage-modal"
+      forceRender
+      footer={false}
+      maskClosable={false}
+    >
+      <Space
+        style={{
+          display: 'flex',
+          justifyContent: 'flex-end',
+          marginBottom: 10,
+        }}
+      >
+        <Button
+          key="2"
+          type="primary"
+          onClick={() => {
+            setEditedView(null);
+            setIsCreateViewModalVisible(true);
+          }}
+        >
+          新建视图
+        </Button>
+      </Space>
+      <DndProvider backend={HTML5Backend}>
+        <Table
+          bordered
+          columns={columns}
+          pagination={false}
+          dataSource={list}
+          rowKey="id"
+          size="middle"
+          style={{ marginBottom: 20 }}
+          components={components}
+          onRow={(record: any, index: number) => {
+            return {
+              index,
+              moveRow,
+            } as any;
+          }}
+        />
+      </DndProvider>
+      <ViewCreateModal
+        view={editedView}
+        visible={isCreateViewModalVisible}
+        handleCancel={(data) => {
+          setIsCreateViewModalVisible(false);
+          cronViewChange(data);
+        }}
+      />
+    </Modal>
+  );
+};
+
+export default ViewManageModal;

src/pages/dependence/index.tsx

@@ -271,9 +271,11 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       result.push(...dependence);
     } else {
       const index = value.findIndex((x) => x.id === dependence.id);
-      result.splice(index, 1, {
-        ...dependence,
-      });
+      if (index !== -1) {
+        result.splice(index, 1, {
+          ...dependence,
+        });
+      }
     }
     setValue(result);
   };
@@ -324,11 +326,13 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       .then((data: any) => {
         const index = value.findIndex((x) => x.id === dependence.id);
         const result = [...value];
-        result.splice(index, 1, {
-          ...dependence,
-          ...data.data,
-        });
-        setValue(result);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...dependence,
+            ...data.data,
+          });
+          setValue(result);
+        }
       })
       .finally(() => setLoading(false));
   };
@@ -371,10 +375,12 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       const result = [...value];
       for (let i = 0; i < references.length; i++) {
         const index = value.findIndex((x) => x.id === references[i]);
-        result.splice(index, 1, {
-          ...result[index],
-          status,
-        });
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...value[index],
+            status,
+          });
+        }
       }
       setValue(result);
 
@@ -383,7 +389,9 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
           const _result = [...value];
           for (let i = 0; i < references.length; i++) {
             const index = value.findIndex((x) => x.id === references[i]);
-            _result.splice(index, 1);
+            if (index !== -1) {
+              _result.splice(index, 1);
+            }
           }
           setValue(_result);
         }, 5000);
@@ -436,7 +444,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
 
   return (
     <PageContainer
-      className="ql-container-wrapper dependence-wrapper"
+      className="ql-container-wrapper dependence-wrapper ql-container-wrapper-has-tab"
       title="依赖管理"
       extra={[
         <Search
@@ -483,8 +491,10 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
           if (needRemove) {
             const index = value.findIndex((x) => x.id === logDependence.id);
             const result = [...value];
-            result.splice(index, 1);
-            setValue(result);
+            if (index !== -1) {
+              result.splice(index, 1);
+              setValue(result);
+            }
           } else if ([...value].map((x) => x.id).includes(logDependence.id)) {
             getDependenceDetail(logDependence);
           }

src/pages/dependence/logModal.tsx

@@ -90,17 +90,19 @@ const DependenceLogModal = ({
   }, [dependence]);
 
   useEffect(() => {
-    if (!socketMessage) return;
+    if (!socketMessage || !dependence) return;
     const { type, message, references } = socketMessage;
     if (
       type === 'installDependence' &&
-      message.includes('结束时间') &&
-      references.length > 0
+      references.length > 0 &&
+      references.includes(dependence.id)
     ) {
-      setExecuting(false);
-      setIsRemoveFailed(message.includes('删除失败'));
+      if (message.includes('结束时间')) {
+        setExecuting(false);
+        setIsRemoveFailed(message.includes('删除失败'));
+      }
+      setValue(`${value}${message}`);
     }
-    setValue(`${value}${message}`);
   }, [socketMessage]);
 
   useEffect(() => {

src/pages/env/index.tsx

@@ -25,7 +25,7 @@ import EditNameModal from './editNameModal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
-import { getTableScroll } from '@/utils/index';
+import { exportJson, getTableScroll } from '@/utils/index';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -462,6 +462,13 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
     });
   };
 
+  const exportEnvs = () => {
+    const envs = value
+      .filter((x) => selectedRowIds.includes(x.id))
+      .map((x) => ({ value: x.value, name: x.name, remarks: x.remarks }));
+    exportJson('env.json', JSON.stringify(envs));
+  };
+
   const modifyName = () => {
     setIsEditNameModalVisible(true);
   };
@@ -516,6 +523,13 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
           >
             批量删除
           </Button>
+          <Button
+            type="primary"
+            onClick={() => exportEnvs()}
+            style={{ marginLeft: 8, marginRight: 8 }}
+          >
+            批量导出
+          </Button>
           <Button
             type="primary"
             onClick={() => operateEnvs(0)}

src/pages/log/index.tsx

@@ -60,7 +60,7 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
 
   const getLog = (node: any) => {
     request
-      .get(`${config.apiPrefix}logs/${node.value}?path=${node.parent || ''}`)
+      .get(`${config.apiPrefix}logs/${node.title}?path=${node.parent || ''}`)
       .then((data) => {
         setValue(data.data);
       });
@@ -113,6 +113,7 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
             dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
             treeData={data}
             placeholder="请选择日志"
+            fieldNames={{ value: 'key', label: 'title' }}
             showSearch
             onSelect={onSelect}
           />,

src/pages/login/index.tsx

@@ -154,6 +154,7 @@ const Login = ({ reloadUser }: any) => {
                   message: '验证码为6位数字',
                 },
               ]}
+              validateTrigger="onBlur"
             >
               <Input
                 placeholder="6位数字"

src/pages/script/editModal.tsx

@@ -66,7 +66,7 @@ const EditModal = ({
 
   const getDetail = (node: any) => {
     request
-      .get(`${config.apiPrefix}scripts/${node.value}?path=${node.parent || ''}`)
+      .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`)
       .then((data) => {
         setValue(data.data);
       });
@@ -74,11 +74,13 @@ const EditModal = ({
 
   const run = () => {
     setLog('');
+    const content = editorRef.current.getValue().replace(/\r\n/g, '\n');
     request
       .put(`${config.apiPrefix}scripts/run`, {
         data: {
-          filename: cNode.value,
+          filename: cNode.title,
           path: cNode.parent || '',
+          content,
         },
       })
       .then((data) => {
@@ -87,14 +89,16 @@ const EditModal = ({
   };
 
   const stop = () => {
-    if (!cNode || !cNode.value) {
+    if (!cNode || !cNode.title) {
       return;
     }
+    const content = editorRef.current.getValue().replace(/\r\n/g, '\n');
     request
       .put(`${config.apiPrefix}scripts/stop`, {
         data: {
-          filename: cNode.value,
+          filename: cNode.title,
           path: cNode.parent || '',
+          content,
         },
       })
       .then((data) => {
@@ -113,8 +117,7 @@ const EditModal = ({
       return;
     }
 
-    if (_message === '执行结束') {
-      _message = '';
+    if (_message.includes('执行结束')) {
       setTimeout(() => {
         setIsRunning(false);
       }, 300);
@@ -146,6 +149,7 @@ const EditModal = ({
             dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
             treeData={treeData}
             placeholder="请选择脚本文件"
+            fieldNames={{ value: 'key', label: 'title' }}
             showSearch
             onSelect={onSelect}
           />
@@ -243,7 +247,7 @@ const EditModal = ({
           content:
             editorRef.current &&
             editorRef.current.getValue().replace(/\r\n/g, '\n'),
-          filename: cNode?.value,
+          filename: cNode?.title,
         }}
       />
       <SettingModal

src/pages/script/editNameModal.tsx

@@ -1,7 +1,17 @@
 import React, { useEffect, useState } from 'react';
-import { Modal, message, Input, Form, Select } from 'antd';
+import {
+  Modal,
+  message,
+  Input,
+  Form,
+  Select,
+  Upload,
+  Radio,
+  TreeSelect,
+} from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
+import { UploadOutlined } from '@ant-design/icons';
 
 const { Option } = Select;
 
@@ -21,21 +31,30 @@ const EditScriptNameModal = ({
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
   const [dirs, setDirs] = useState<any[]>([]);
+  const [file, setFile] = useState<File>();
+  const [type, setType] = useState<'blank' | 'upload'>('blank');
 
   const handleOk = async (values: any) => {
     setLoading(true);
     values.path = values.path || '';
+    const formData = new FormData();
+    formData.append('file', file as any);
+    formData.append('filename', values.filename);
+    formData.append('path', values.path);
+    formData.append('content', '');
     request
       .post(`${config.apiPrefix}scripts`, {
-        data: { filename: values.filename, path: values.path, content: '' },
+        data: formData,
       })
       .then(({ code, data }) => {
         if (code === 200) {
-          message.success('保存文件成功');
+          message.success('新建文件成功');
+          const key = values.path ? `${values.path}/` : '';
+          const filename = file ? file.name : values.filename;
           handleCancel({
-            filename: values.filename,
+            filename,
             path: values.path,
-            key: `${values.path}-${values.filename}`,
+            key: `${key}${filename}`,
           });
         } else {
           message.error(data);
@@ -45,15 +64,42 @@ const EditScriptNameModal = ({
       .finally(() => setLoading(false));
   };
 
+  const beforeUpload = (file: File) => {
+    setFile(file);
+    return false;
+  };
+
+  const typeChange = (e) => {
+    setType(e.target.value);
+  };
+
+  const getDirs = (data) => {
+    for (const item of data) {
+      if (item.children && item.children.length > 0) {
+        item.children = item.children
+          .filter((x) => x.type === 'directory')
+          .map((x) => ({ ...x, disabled: false }));
+        getDirs(item.children);
+      }
+    }
+    return data;
+  };
+
+  useEffect(() => {
+    const originDirs = treeData
+      .filter((x) => x.type === 'directory')
+      .map((x) => ({ ...x, disabled: false }));
+    const dirs = getDirs(originDirs);
+    setDirs(dirs);
+  }, [treeData]);
+
   useEffect(() => {
     form.resetFields();
-    const originDirs = treeData.filter((x) => x.disabled);
-    setDirs([{ key: '' }, ...originDirs]);
   }, [visible]);
 
   return (
     <Modal
-      title="新建文件"
+      title="新建脚本"
       visible={visible}
       forceRender
       centered
@@ -73,23 +119,44 @@ const EditScriptNameModal = ({
     >
       <Form form={form} layout="vertical" name="edit_name_modal">
         <Form.Item
-          name="filename"
-          label="文件名"
-          rules={[{ required: true, message: '请输入文件名' }]}
+          name="type"
+          label="类型"
+          rules={[{ required: true }]}
+          initialValue={'blank'}
         >
-          <Input placeholder="请输入文件名" />
+          <Radio.Group onChange={typeChange}>
+            <Radio value="blank">空文件</Radio>
+            <Radio value="upload">本地上传</Radio>
+          </Radio.Group>
         </Form.Item>
-        <Form.Item
-          label="父目录"
-          name="path"
-          initialValue={dirs && dirs.length > 0 ? dirs[0].key : ''}
-        >
-          <Select placeholder="请选择父目录">
-            {dirs.map((x) => (
-              <Option value={x.key}>{x.key || '根'}</Option>
-            ))}
-          </Select>
+        {type === 'blank' && (
+          <Form.Item
+            name="filename"
+            label="文件名"
+            rules={[{ required: true, message: '请输入文件名' }]}
+          >
+            <Input placeholder="请输入文件名" />
+          </Form.Item>
+        )}
+        <Form.Item label="父目录" name="path">
+          <TreeSelect
+            allowClear
+            treeData={dirs}
+            fieldNames={{ value: 'key', label: 'title' }}
+            placeholder="请选择父目录"
+            treeDefaultExpandAll
+          />
         </Form.Item>
+        {type === 'upload' && (
+          <Form.Item label="文件" name="file">
+            <Upload.Dragger beforeUpload={beforeUpload} maxCount={1}>
+              <p className="ant-upload-drag-icon">
+                <UploadOutlined />
+              </p>
+              <p className="ant-upload-text">点击或者拖拽文件到此区域上传</p>
+            </Upload.Dragger>
+          </Form.Item>
+        )}
       </Form>
     </Modal>
   );

src/pages/script/index.tsx

@@ -104,7 +104,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
 
   const getDetail = (node: any) => {
     request
-      .get(`${config.apiPrefix}scripts/${node.value}?path=${node.parent || ''}`)
+      .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`)
       .then((data) => {
         setValue(data.data);
       });
@@ -117,7 +117,6 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
       const obj = {
         node: {
           title: s,
-          value: s,
           key: p ? vkey : s,
           parent: p,
         },
@@ -209,7 +208,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
         <>
           确认保存文件
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {currentNode.value}
+            {currentNode.title}
           </Text>{' '}
           ，保存后不可恢复
         </>
@@ -222,7 +221,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
           request
             .put(`${config.apiPrefix}scripts`, {
               data: {
-                filename: currentNode.value,
+                filename: currentNode.title,
                 path: currentNode.parent || '',
                 content,
               },
@@ -262,7 +261,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
         request
           .delete(`${config.apiPrefix}scripts`, {
             data: {
-              filename: currentNode.value,
+              filename: currentNode.title,
               path: currentNode.parent || '',
             },
           })
@@ -278,13 +277,17 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                 const index = parentNode.children.findIndex(
                   (y) => y.key === currentNode.key,
                 );
-                parentNode.children.splice(index, 1);
-                newData.splice(parentNodeIndex, 1, { ...parentNode });
+                if (index !== -1 && parentNodeIndex !== -1) {
+                  parentNode.children.splice(index, 1);
+                  newData.splice(parentNodeIndex, 1, { ...parentNode });
+                }
               } else {
                 const index = newData.findIndex(
                   (x) => x.key === currentNode.key,
                 );
-                newData.splice(index, 1);
+                if (index !== -1) {
+                  newData.splice(index, 1);
+                }
               }
               setData(newData);
             } else {
@@ -311,21 +314,24 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
   ) => {
     if (filename) {
       const newData = [...data];
-      const _file = { title: filename, key, value: filename, parent: path };
+      const _file = { title: filename, key, parent: path };
       if (path) {
+        // TODO: 更新左侧树数据
         const parentNodeIndex = newData.findIndex((x) => x.key === path);
-        const parentNode = newData[parentNodeIndex];
-        if (parentNode.children && parentNode.children.length > 0) {
-          parentNode.children.unshift(_file);
-        } else {
-          parentNode.children = [_file];
+        if (parentNodeIndex !== -1) {
+          const parentNode = newData[parentNodeIndex];
+          if (parentNode.children && parentNode.children.length > 0) {
+            parentNode.children.unshift(_file);
+          } else {
+            parentNode.children = [_file];
+          }
+          newData.splice(parentNodeIndex, 1, { ...parentNode });
         }
-        newData.splice(parentNodeIndex, 1, { ...parentNode });
       } else {
         newData.unshift(_file);
       }
       setData(newData);
-      onSelect(_file.value, _file);
+      onSelect(_file.title, _file);
       setIsEditing(true);
     }
     setIsAddFileModalVisible(false);
@@ -335,7 +341,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
     request
       .post(`${config.apiPrefix}scripts/download`, {
         data: {
-          filename: currentNode.value,
+          filename: currentNode.title,
         },
       })
       .then((_data: any) => {
@@ -343,7 +349,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
         const url = URL.createObjectURL(blob);
         const a = document.createElement('a');
         a.href = url;
-        a.download = currentNode.value;
+        a.download = currentNode.title;
         document.documentElement.appendChild(a);
         a.click();
         document.documentElement.removeChild(a);
@@ -445,6 +451,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                 dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
                 treeData={data}
                 placeholder="请选择脚本"
+                fieldNames={{ value: 'key', label: 'title' }}
                 showSearch
                 onSelect={onSelect}
               />,

src/pages/setting/index.tsx

@@ -313,7 +313,7 @@ const Setting = ({
 
   return (
     <PageContainer
-      className="ql-container-wrapper"
+      className="ql-container-wrapper ql-container-wrapper-has-tab"
       title="系统设置"
       header={{
         style: headerStyle,

src/pages/subscription/index.tsx

@@ -263,11 +263,13 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
             if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                status: SubscriptionStatus.running,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  status: SubscriptionStatus.running,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -298,12 +300,14 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
             if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                pid: null,
-                status: SubscriptionStatus.idle,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  pid: null,
+                  status: SubscriptionStatus.idle,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -356,8 +360,10 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
               message.success('删除成功');
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1);
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1);
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -397,11 +403,13 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
               const newStatus = record.is_disabled === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                is_disabled: newStatus,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  is_disabled: newStatus,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -509,10 +517,12 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
       const result = [...value];
       for (let i = 0; i < references.length; i++) {
         const index = value.findIndex((x) => x.id === references[i]);
-        result.splice(index, 1, {
-          ...result[index],
-          status: SubscriptionStatus.idle,
-        });
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...value[index],
+            status: SubscriptionStatus.idle,
+          });
+        }
       }
       setValue(result);
     }

src/pages/subscription/modal.tsx

@@ -107,12 +107,18 @@ const SubscriptionModal = ({
     const [intervalNumber, setIntervalNumber] = useState<number>();
     const intervalTypeChange = (type: string) => {
       setIntervalType(type);
-      onChange?.({ type, value: intervalNumber });
+      if (intervalNumber && intervalNumber > 0) {
+        onChange?.({ type, value: intervalNumber });
+      }
     };
 
     const numberChange = (value: number) => {
       setIntervalNumber(value);
-      onChange?.({ type: intervalType, value });
+      if (!value) {
+        onChange?.(null);
+      } else {
+        onChange?.({ type: intervalType, value });
+      }
     };
 
     useEffect(() => {
@@ -195,21 +201,27 @@ const SubscriptionModal = ({
         dependences,
         branch,
         extensions,
-      ] = text.split(' ').map((x) => x.trim());
+      ] = text
+        .split(' ')
+        .map((x) => x.trim().replace(/\"/g, '').replace(/\'/, ''));
+      const _type =
+        type === 'raw'
+          ? 'file'
+          : url.startsWith('http')
+          ? 'public-repo'
+          : 'private-repo';
+
       form.setFieldsValue({
-        type:
-          type === 'raw'
-            ? 'file'
-            : url.startsWith('http')
-            ? 'public-repo'
-            : 'private-repo',
+        type: _type,
         url,
         whitelist,
         blacklist,
         dependences,
         branch,
         extensions,
+        alias: formatAlias(url, branch),
       });
+      setType(_type);
     }
   }, []);
 

src/utils/config.ts

@@ -90,6 +90,7 @@ export default {
     { value: 'weWorkApp', label: '企业微信应用' },
     { value: 'iGot', label: 'IGot' },
     { value: 'pushPlus', label: 'PushPlus' },
+    { value: 'chat', label: '群辉chat' },
     { value: 'email', label: '邮箱' },
     { value: 'closed', label: '已关闭' },
   ],
@@ -103,6 +104,14 @@ export default {
       { label: 'gotifyToken', tip: 'gotify的消息应用token码', required: true },
       { label: 'gotifyPriority', tip: '推送消息的优先级' },
     ],
+    chat: [
+      {
+        label: 'chatUrl',
+        tip: 'chat的url地址',
+        required: true,
+      },
+      { label: 'chatToken', tip: 'chat的token码', required: true },
+    ],
     goCqHttpBot: [
       {
         label: 'goCqHttpBotUrl',

src/utils/index.ts

@@ -181,8 +181,8 @@ export function getTableScroll({
   id,
 }: { extraHeight?: number; id?: string } = {}) {
   if (typeof extraHeight == 'undefined') {
-    //  47 + 40 + 10 + 24
-    extraHeight = 121;
+    //  47 + 40 + 12
+    extraHeight = 99;
   }
   let tHeader = null;
   if (id) {
@@ -205,3 +205,39 @@ export function getTableScroll({
   let height = document.body.clientHeight - mainTop - extraHeight;
   return height;
 }
+
+// 自动触发点击事件
+function automaticClick(elment: HTMLElement) {
+  const ev = document.createEvent('MouseEvents');
+  ev.initMouseEvent(
+    'click',
+    true,
+    false,
+    window,
+    0,
+    0,
+    0,
+    0,
+    0,
+    false,
+    false,
+    false,
+    false,
+    0,
+    null,
+  );
+  elment.dispatchEvent(ev);
+}
+
+// 导出文件
+export function exportJson(name: string, data: string) {
+  const urlObject = window.URL || window.webkitURL || window;
+  const export_blob = new Blob([data]);
+  const createA = document.createElementNS(
+    'http://www.w3.org/1999/xhtml',
+    'a',
+  ) as any;
+  createA.href = urlObject.createObjectURL(export_blob);
+  createA.download = name;
+  automaticClick(createA);
+}

src/utils/init.ts

@@ -7,9 +7,15 @@ export function init() {
   // sentry监控 init
   Sentry.init({
     dsn: 'https://3406424fb1dc4813a62d39e844a9d0ac@o1098464.ingest.sentry.io/6122818',
-    integrations: [new Integrations.BrowserTracing()],
+    integrations: [
+      new Integrations.BrowserTracing({
+        shouldCreateSpanForRequest(url) {
+          return !url.includes('/api/ws') && !url.includes('/api/static');
+        },
+      }),
+    ],
     release: version,
-    tracesSampleRate: 1.0,
+    tracesSampleRate: 0.1,
     beforeBreadcrumb(breadcrumb, hint?) {
       if (breadcrumb.data && breadcrumb.data.url) {
         const url = breadcrumb.data.url.replace(/token=.*/, '');

src/version.ts

@@ -1,12 +1,6 @@
-export const version = '2.13.0';
-export const changeLogLink = 'https://t.me/jiao_long/303';
-export const changeLog = `2.13.0 版本说明
-1. 新增订阅管理模块，支持公开仓库/私有仓库等
-2. 支持修改头像
-3. 修复特殊字符环境变量异常
-4. 修改定时任务添加标签
-5. 修复添加任务默认会展示一个空标签
-6. 修复用户名显示
-7. 修复依赖安装
-8. 其他bug修复
+export const version = '2.14.3';
+export const changeLogLink = 'https://t.me/jiao_long/330';
+export const changeLog = `2.14.8 版本说明
+1. 修复安装依赖可能出现的  ERR_PNPM_REGISTRIES_MISMATCH
+2. 今人不见古时月，今月曾经照古人  -> 中秋快乐
 `;