更新版本 v2.13.1

发现有带&的消息都会漏掉&后面的内容，改为JSON发送

.github/ISSUE_TEMPLATE/bug_report.yml

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

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

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

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

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

.github/workflows/build_docker_image.yml

@@ -57,10 +57,12 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
 
-      - name: Setup timezone
+      - name: Set time zone
-        uses: zcong1993/setup-timezone@master
+        uses: szenius/set-timezone@v1.0
         with:
-          timezone: Asia/Shanghai
+          timezoneLinux: "Asia/Shanghai"
+          timezoneMacos: "Asia/Shanghai"
+          timezoneWindows: "China Standard Time"
 
       - name: Login to DockerHub
         uses: docker/login-action@v2

.npmrc

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

.umirc.ts

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

README-en.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
+    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
   </a>
 </p>
 
@@ -57,10 +57,11 @@ https://podman.io/getting-started/installation
 ```bash
 podman run -dit \
   --network bridge \
-  -v $PWD/ql/data:/ql/data \
+  -v $PWD/ql:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
+  --restart unless-stopped \
   docker.io/whyour/qinglong:latest
 ```
 
@@ -95,7 +96,7 @@ systemctl restart docker
 
 ```bash
 docker run -dit \
-  -v $PWD/ql/data:/ql/data \
+  -v $PWD/ql:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
@@ -123,10 +124,6 @@ docker-compose up -d
 docker-compose down
 ```
 
-3. access
-
-Open your browser and visit http://{ip}:5700
-
 ## Use
 
 1. built-in commands
@@ -182,7 +179,7 @@ task <file_path> desi <env_name> <account_number>
 - [crontab-ui](https://github.com/alseambusher/crontab-ui)
 - [Ant Design](https://ant.design)
 - [Ant Design Pro](https://pro.ant.design/)
-- [Umijs](https://umijs.org)
+- [Umijs3.0](https://umijs.org)
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)
 

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
+    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
   </a>
 </p>
 
@@ -57,10 +57,11 @@ https://podman.io/getting-started/installation
 ```bash
 podman run -dit \
   --network bridge \
-  -v $PWD/ql/data:/ql/data \
+  -v $PWD/ql:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
+  --restart unless-stopped \
   docker.io/whyour/qinglong:latest
 ```
 
@@ -96,7 +97,7 @@ systemctl restart docker
 
 ```bash
 docker run -dit \
-  -v $PWD/ql/data:/ql/data \
+  -v $PWD/ql:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
@@ -124,10 +125,6 @@ docker-compose up -d
 docker-compose down
 ```
 
-3. 访问
-
-打开你的浏览器，访问 http://{ip}:5700
-
 ## 使用
 
 1. 内置命令
@@ -166,11 +163,11 @@ task <file_path> desi <env_name> <account_number>
 
 * file_url: 脚本地址
 * repo_url: 仓库地址
-* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
+* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串
-* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
+* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串
-* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
+* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响
-* extensions: 拉取仓库的文件后缀，多个竖线分割
 * branch: 拉取仓库的分支
+* extensions: 拉取仓库的文件后缀
 * days: 需要保留的日志的天数
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称
@@ -182,7 +179,7 @@ task <file_path> desi <env_name> <account_number>
 - [crontab-ui](https://github.com/alseambusher/crontab-ui)
 - [Ant Design](https://ant.design)
 - [Ant Design Pro](https://pro.ant.design/)
-- [Umijs](https://umijs.org)
+- [Umijs3.0](https://umijs.org)
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)
 

back/api/config.ts

@@ -25,6 +25,7 @@ export default (app: Router) => {
             }),
         });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -50,6 +51,7 @@ export default (app: Router) => {
         }
         res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -74,6 +76,7 @@ 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,7 +2,6 @@ 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();
@@ -10,135 +9,11 @@ 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 as any);
+      const data = await cronService.crontabs(req.query.searchValue as string);
       return res.send({ code: 200, data });
     } catch (e) {
       logger.error('🔥 error: %o', e);
@@ -167,6 +42,7 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -184,6 +60,7 @@ 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);
       }
     },
@@ -201,6 +78,7 @@ 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);
       }
     },
@@ -224,6 +102,7 @@ export default (app: Router) => {
         );
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -244,6 +123,7 @@ 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);
       }
     },
@@ -261,6 +141,7 @@ 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);
       }
     },
@@ -278,6 +159,7 @@ 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);
       }
     },
@@ -297,6 +179,7 @@ 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);
       }
     },
@@ -307,9 +190,9 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         labels: Joi.array().optional().allow(null),
-        command: Joi.string().required(),
+        command: Joi.string().optional(),
-        schedule: Joi.string().required(),
+        schedule: Joi.string().optional(),
-        name: Joi.string().optional().allow(null),
+        name: Joi.string().optional(),
         id: Joi.number().required(),
       }),
     }),
@@ -327,6 +210,7 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -344,6 +228,7 @@ 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);
       }
     },
@@ -361,6 +246,7 @@ 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);
       }
     },
@@ -378,6 +264,7 @@ 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);
       }
     },
@@ -392,6 +279,7 @@ 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);
       }
     },
@@ -411,6 +299,7 @@ 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);
       }
     },
@@ -422,10 +311,10 @@ export default (app: Router) => {
       body: Joi.object({
         ids: Joi.array().items(Joi.number().required()),
         status: Joi.string().required(),
-        pid: Joi.string().optional().allow(null),
+        pid: Joi.string().optional(),
-        log_path: Joi.string().optional().allow(null),
+        log_path: Joi.string().optional(),
-        last_running_time: Joi.number().optional().allow(null),
+        last_running_time: Joi.number().optional(),
-        last_execution_time: Joi.number().optional().allow(null),
+        last_execution_time: Joi.number().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -439,6 +328,7 @@ export default (app: Router) => {
         });
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -458,6 +348,7 @@ 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,6 +38,7 @@ 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);
       }
     },
@@ -60,6 +61,7 @@ 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);
       }
     },
@@ -77,6 +79,7 @@ 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);
       }
     },
@@ -94,6 +97,7 @@ 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);
       }
     },
@@ -113,6 +117,7 @@ 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);
       }
     },
@@ -130,6 +135,7 @@ 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

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

back/api/log.ts

@@ -3,11 +3,9 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { emptyDir, getFileContentByName, readDirs } from '../config/util';
+import { getFileContentByName, readDirs } from '../config/util';
 import { join } from 'path';
-import { celebrate, Joi } from 'celebrate';
 const route = Router();
-const blacklist = ['.tmp'];
 
 export default (app: Router) => {
   app.use('/logs', route);
@@ -15,7 +13,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, blacklist);
+      const result = readDirs(config.logPath, config.logPath);
       res.send({
         code: 200,
         data: result,
@@ -31,9 +29,6 @@ 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,
@@ -42,38 +37,9 @@ export default (app: Router) => {
         const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
   );
-
-  route.delete(
-    '/',
-    celebrate({
-      body: Joi.object({
-        filename: Joi.string().required(),
-        path: Joi.string().allow(''),
-        type: Joi.string().optional()
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        let { filename, path, type } = req.body as {
-          filename: string;
-          path: string;
-          type: string;
-        };
-        const filePath = join(config.logPath, path, filename);
-        if (type === 'directory') {
-          emptyDir(filePath);          
-        } else {
-          fs.unlinkSync(filePath);
-        }
-        res.send({ code: 200 });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
 };

back/api/open.ts

@@ -16,6 +16,7 @@ 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);
       }
     },
@@ -25,7 +26,7 @@ export default (app: Router) => {
     '/apps',
     celebrate({
       body: Joi.object({
-        name: Joi.string().optional().allow('').disallow('system'),
+        name: Joi.string().optional().allow(''),
         scopes: Joi.array().items(Joi.string().required()),
       }),
     }),
@@ -36,6 +37,7 @@ 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);
       }
     },
@@ -57,6 +59,7 @@ 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);
       }
     },
@@ -74,6 +77,7 @@ 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);
       }
     },
@@ -93,6 +97,7 @@ 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);
       }
     },
@@ -113,6 +118,7 @@ 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,8 +3,6 @@ import {
   getFileContentByName,
   readDirs,
   getLastModifyFilePath,
-  readDir,
-  emptyDir,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
@@ -12,38 +10,17 @@ import { Logger } from 'winston';
 import config from '../config';
 import * as fs from 'fs';
 import { celebrate, Joi } from 'celebrate';
-import path, { join, parse } from 'path';
+import path, { join } 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 {
-      let result = [];
+      const result = readDirs(config.scriptPath, config.scriptPath);
-      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,
@@ -67,6 +44,7 @@ export default (app: Router) => {
         const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -74,19 +52,23 @@ export default (app: Router) => {
 
   route.post(
     '/',
-    upload.single('file'),
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().optional().allow(''),
+        content: Joi.string().allow(''),
+        originFilename: Joi.string().allow(''),
+      }),
+    }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, content, originFilename, directory } =
+        let { filename, path, content, originFilename } = req.body as {
-          req.body as {
           filename: string;
           path: string;
           content: string;
           originFilename: string;
-            directory: string;
         };
-
         if (!path) {
           path = config.scriptPath;
         }
@@ -102,26 +84,15 @@ export default (app: Router) => {
             message: '文件路径禁止访问',
           });
         }
-
-        if (req.file) {
-          fs.renameSync(req.file.path, join(path, req.file.filename));
-          return res.send({ code: 200 });
-        }
-
-        if (directory) {
-          fs.mkdirSync(join(path, directory), { recursive: true });
-          return res.send({ code: 200 });
-        }
-
         if (!originFilename) {
           originFilename = filename;
         }
-        const originFilePath = join(
+        const originFilePath = `${path}${originFilename.replace(/\//g, '')}`;
-          path,
+        const filePath = `${path}${filename.replace(/\//g, '')}`;
-          `${originFilename.replace(/\//g, '')}`,
-        );
-        const filePath = join(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, '')}`,
@@ -133,6 +104,7 @@ export default (app: Router) => {
         fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -144,7 +116,7 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().optional().allow(''),
-        content: Joi.string().required().allow(''),
+        content: Joi.string().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -159,6 +131,7 @@ export default (app: Router) => {
         fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -170,25 +143,20 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().allow(''),
-        type: Joi.string().optional()
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, type } = req.body as {
+        let { filename, path } = req.body as {
           filename: string;
           path: string;
-          type: string;
         };
         const filePath = join(config.scriptPath, path, filename);
-        if (type === 'directory') {
-          emptyDir(filePath);          
-        } else {
         fs.unlinkSync(filePath);
-        }
         res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -219,6 +187,7 @@ export default (app: Router) => {
           return next(err);
         });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -229,22 +198,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, content, path } = req.body;
+        let { filename, path } = req.body as {
-        const { name, ext } = parse(filename);
+          filename: string;
-        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
+          path: string;
-        fs.writeFileSync(filePath, content || '', { encoding: 'utf8' });
+        };
-
+        const filePath = join(path, filename);
         const scriptService = Container.get(ScriptService);
         const result = await scriptService.runScript(filePath);
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -255,21 +224,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, content, path } = req.body;
+        let { filename, path } = req.body as {
-        const { name, ext } = parse(filename);
+          filename: string;
-        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
+          path: string;
-
+        };
+        const filePath = join(path, filename);
         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,13 +29,7 @@ export default (app: Router) => {
       body: Joi.object({
         type: Joi.string().required(),
         schedule: Joi.string().optional().allow('').allow(null),
-        interval_schedule: Joi.object({
+        interval_schedule: Joi.object().optional().allow('').allow(null),
-          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),
@@ -65,6 +59,7 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -82,6 +77,7 @@ 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);
       }
     },
@@ -99,6 +95,7 @@ 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);
       }
     },
@@ -116,6 +113,7 @@ 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);
       }
     },
@@ -133,6 +131,7 @@ 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);
       }
     },
@@ -152,6 +151,7 @@ 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,6 +195,7 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -212,6 +213,7 @@ 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);
       }
     },
@@ -231,6 +233,7 @@ 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);
       }
     },
@@ -257,6 +260,7 @@ export default (app: Router) => {
         });
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -276,6 +280,7 @@ 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

@@ -7,8 +7,6 @@ import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
 import { EnvModel } from '../data/env';
-import { promiseExec } from '../config/util';
-
 const route = Router();
 
 export default (app: Router) => {
@@ -24,15 +22,6 @@ export default (app: Router) => {
 
       const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
       const version = currentVersionFile.match(versionRegx)![1];
-      const lastCommitTime = (
-        await promiseExec('git show -s --format=%ai')
-      ).replace('\n', '');
-      const lastCommitId = (
-        await promiseExec('git rev-parse --short HEAD')
-      ).replace('\n', '');
-      const branch = (
-        await promiseExec('git symbolic-ref --short HEAD')
-      ).replace('\n', '');
 
       let isInitialized = true;
       if (
@@ -48,9 +37,6 @@ export default (app: Router) => {
         data: {
           isInitialized,
           version,
-          lastCommitTime,
-          lastCommitId,
-          branch,
         },
       });
     } catch (e) {
@@ -68,6 +54,7 @@ export default (app: Router) => {
         const data = await systemService.getLogRemoveFrequency();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -89,6 +76,7 @@ export default (app: Router) => {
         );
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -103,6 +91,7 @@ export default (app: Router) => {
         const result = await systemService.checkUpdate();
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -117,6 +106,7 @@ export default (app: Router) => {
         const result = await systemService.updateSystem();
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -137,6 +127,7 @@ 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,6 +39,7 @@ 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);
       }
     },
@@ -53,6 +54,7 @@ export default (app: Router) => {
         await userService.logout(req.platform);
         res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -73,6 +75,7 @@ export default (app: Router) => {
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -106,6 +109,7 @@ export default (app: Router) => {
         const data = await userService.initTwoFactor();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -125,6 +129,7 @@ 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);
       }
     },
@@ -139,6 +144,7 @@ export default (app: Router) => {
         const data = await userService.deactiveTwoFactor();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -160,6 +166,7 @@ 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);
       }
     },
@@ -174,6 +181,7 @@ export default (app: Router) => {
         const data = await userService.getLoginLog();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -188,6 +196,7 @@ export default (app: Router) => {
         const data = await userService.getNotificationMode();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -202,6 +211,7 @@ export default (app: Router) => {
         const result = await userService.updateNotificationMode(req.body);
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -222,6 +232,7 @@ export default (app: Router) => {
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -236,6 +247,7 @@ export default (app: Router) => {
         const result = await userService.updateNotificationMode(req.body);
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -251,6 +263,7 @@ 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,23 +1,25 @@
 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
     .listen(config.port, () => {
-      Logger.debug(`✌️ 后端服务启动成功！`);
+      Logger.debug(`✌️ Back server launched on port ${config.port}`);
     })
     .on('error', (err) => {
       Logger.error(err);

back/config/const.ts

@@ -1 +0,0 @@
-export const LOG_END_SYMBOL = '\n　　　　　　　　　　';

back/config/index.ts

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

back/config/util.ts

@@ -2,8 +2,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 import got from 'got';
 import iconv from 'iconv-lite';
-import { exec } from 'child_process';
-import FormData from 'form-data';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -279,165 +277,31 @@ export async function concurrentRun(
   return replyList;
 }
 
-enum FileType {
+export function readDirs(dir: string, baseDir: string = '') {
-  '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
+  const result: any = files.map((file: string) => {
-    .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,
+        value: file,
         key,
         type: 'directory',
+        disabled: true,
         parent: relativePath,
-          children: readDirs(subPath, baseDir).sort(
+        children: readDirs(subPath, baseDir),
-            (a: any, b: any) =>
-              (FileType as any)[a.type] - (FileType as any)[b.type],
-          ),
       };
     }
     return {
       title: file,
+      value: file,
       type: 'file',
-        isLeaf: true,
-        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 emptyDir(path: string) {
-  const files = fs.readdirSync(path);
-  files.forEach((file) => {
-    const filePath = `${path}/${file}`;
-    const stats = fs.statSync(filePath);
-    if (stats.isDirectory()) {
-      emptyDir(filePath);
-    } else {
-      fs.unlinkSync(filePath);
-    }
-  });
-  fs.rmdirSync(path);
-}
-
-export function promiseExec(command: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    exec(
-      command,
-      { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
-      (err, stdout, stderr) => {
-        resolve(stdout || stderr || JSON.stringify(err));
-      },
-    );
-  });
-}
-
-export function parseHeaders(headers: string) {
-  if (!headers) return {};
-
-  const parsed: any = {};
-  let key;
-  let val;
-  let i;
-
-  headers &&
-    headers.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim().toLowerCase();
-      val = line.substring(i + 1).trim();
-
-      if (!key) {
-        return;
-      }
-
-      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
-    });
-
-  return parsed;
-}
-
-export function parseBody(
-  body: string,
-  contentType:
-    | 'application/json'
-    | 'multipart/form-data'
-    | 'application/x-www-form-urlencoded',
-) {
-  if (!body) return '';
-
-  const parsed: any = {};
-  let key;
-  let val;
-  let i;
-
-  body &&
-    body.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim().toLowerCase();
-      val = line.substring(i + 1).trim();
-
-      if (!key || parsed[key]) {
-        return;
-      }
-
-      try {
-        const jsonValue = JSON.parse(val);
-        parsed[key] = jsonValue;
-      } catch (error) {
-        parsed[key] = val;
-      }
-    });
-
-  switch (contentType) {
-    case 'multipart/form-data':
-      return Object.keys(parsed).reduce((p, c) => {
-        p.append(c, parsed[c]);
-        return p;
-      }, new FormData());
-    case 'application/x-www-form-urlencoded':
-      return Object.keys(parsed).reduce((p, c) => {
-        return p ? `${p}&${c}=${parsed[c]}` : `${c}=${parsed[c]}`;
-      });
-  }
-
-  return parsed;
-}

back/data/cronView.ts

@@ -1,47 +0,0 @@
-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/env.ts

@@ -26,10 +26,7 @@ export enum EnvStatus {
   'disabled',
 }
 
-export const maxPosition = 9000000000000000;
+export const initEnvPosition = 9999999999;
-export const initPosition = 4500000000000000;
-export const stepPosition = 10000000;
-export const minPosition = 100;
 
 interface EnvInstance extends Model<Env, Env>, Env {}
 export const EnvModel = sequelize.define<EnvInstance>('Env', {

back/data/index.ts

@@ -1,22 +1,15 @@
-import { Sequelize, Transaction } from 'sequelize';
+import { Sequelize } from 'sequelize';
 import config from '../config/index';
 
 export const sequelize = new Sequelize({
   dialect: 'sqlite',
   storage: `${config.dbPath}database.sqlite`,
   logging: false,
-  retry: {
-    max: 10,
-    match: ['SQLITE_BUSY: database is locked'],
-  },
   pool: {
-    max: 5,
+    max: 6,
-    min: 2,
+    min: 0,
     idle: 30000,
-    acquire: 30000,
-    evict: 10000,
   },
-  transactionType: Transaction.TYPES.IMMEDIATE,
 });
 
 export type ResponseType<T> = { code: number; data?: T; message?: string };

back/data/notify.ts

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

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

back/loaders/deps.ts

@@ -2,7 +2,6 @@ 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);
@@ -17,32 +16,7 @@ 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, { UnauthorizedError } from 'express-jwt';
+import jwt from 'express-jwt';
 import fs from 'fs';
 import { getPlatform, getToken } from '../config/util';
 import Container from 'typedi';
@@ -75,24 +75,29 @@ export default ({ app }: { app: Application }) => {
     if (
       !headerToken &&
       originPath &&
-      config.apiWhiteList.includes(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'
     ) {
       return next();
     }
 
     const data = fs.readFileSync(config.authConfigFile, 'utf8');
-    if (data && headerToken) {
+    if (data) {
       const { token = '', tokens = {} } = JSON.parse(data);
       if (headerToken === token || tokens[req.platform] === headerToken) {
         return next();
       }
     }
 
-    const errorCode = headerToken ? 'invalid_token' : 'credentials_required';
+    const err: any = new Error('UnauthorizedError');
-    const errorMessage = headerToken
+    err.status = 401;
-      ? 'jwt malformed'
-      : 'No authorization token was found';
-    const err = new UnauthorizedError(errorCode, { message: errorMessage });
     next(err);
   });
 
@@ -131,6 +136,7 @@ export default ({ app }: { app: Application }) => {
   });
 
   app.use(errors());
+  app.use(Sentry.Handlers.errorHandler());
 
   app.use(
     (
@@ -149,39 +155,6 @@ 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

@@ -4,7 +4,7 @@ import { Container } from 'typedi';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import CronService from '../services/cron';
 import EnvService from '../services/env';
-import groupBy from 'lodash/groupBy';
+import _ from 'lodash';
 import { DependenceModel } from '../data/dependence';
 import { Op } from 'sequelize';
 import config from '../config';
@@ -21,18 +21,15 @@ export default async () => {
   );
 
   // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  DependenceModel.findAll({
+  DependenceModel.findAll({ where: {}, raw: true }).then(async (docs) => {
-    where: {},
+    const groups = _.groupBy(docs, 'type');
-    order: [['type', 'DESC']],
+    for (const key in groups) {
-    raw: true,
+      if (Object.prototype.hasOwnProperty.call(groups, key)) {
-  }).then(async (docs) => {
-    const groups = groupBy(docs, 'type');
-    const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
-    for (const key of keys) {
         const group = groups[key];
         const depIds = group.map((x) => x.id);
         await dependenceService.reInstall(depIds as number[]);
       }
+    }
   });
 
   // 初始化时执行一次所有的ql repo 任务

back/loaders/initFile.ts

@@ -5,13 +5,12 @@ import dotenv from 'dotenv';
 import Logger from './logger';
 import { fileExist } from '../config/util';
 
-const rootPath = process.env.QL_DIR as string;;
+const rootPath = process.cwd();
 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');
@@ -28,7 +27,6 @@ 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);
@@ -58,10 +56,6 @@ export default async () => {
     fs.mkdirSync(sshPath);
   }
 
-  if (!bakDirExist) {
-    fs.mkdirSync(bakPath);
-  }
-
   dotenv.config({ path: confFile });
 
   Logger.info('✌️ Init file down');

back/loaders/initTask.ts

@@ -1,30 +1,14 @@
 import { Container } from 'typedi';
+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: NaN,
-    name: '生成token',
-    command: tokenCommand,
-  };
-  scheduleService.createIntervalTask(cron, {
-    days: 28,
-  });
-
   // 运行删除日志任务
   const data = await systemService.getLogRemoveFrequency();
   if (data && data.info && data.info.frequency) {
@@ -33,19 +17,15 @@ export default async () => {
       name: '删除日志',
       command: `ql rmlog ${data.info.frequency}`,
     };
-    scheduleService.createIntervalTask(cron, {
+    await scheduleService.createIntervalTask(cron, {
       days: data.info.frequency,
+      runImmediately: true,
     });
   }
 
   // 运行所有订阅
   const subs = await subscriptionService.list();
   for (const sub of subs) {
-    await subscriptionService.handleTask(
+    await subscriptionService.handleTask(sub, true, true, true);
-      sub,
-      !sub.is_disabled,
-      true,
-      !sub.is_disabled,
-    );
   }
 };

back/loaders/sentry.ts

@@ -2,23 +2,16 @@ import { Application } from 'express';
 import * as Sentry from '@sentry/node';
 import * as Tracing from '@sentry/tracing';
 import Logger from './logger';
-import config from '../config';
-import fs from 'fs';
 
 export default ({ expressApp }: { expressApp: Application }) => {
-  const versionRegx = /.*export const version = \'(.*)\'\;/;
-
-  const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
-  const currentVersion = currentVersionFile.match(versionRegx)![1];
-  
   Sentry.init({
     dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
     integrations: [
       new Sentry.Integrations.Http({ tracing: true }),
       new Tracing.Integrations.Express({ app: expressApp }),
     ],
-    tracesSampleRate: 0.1,
+
-    release: currentVersion,
+    tracesSampleRate: 1.0,
   });
 
   expressApp.use(Sentry.Handlers.requestHandler());

back/public.ts

@@ -22,7 +22,7 @@ app
     await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/db').default();
 
-    Logger.debug(`✌️ 公共服务启动成功！`);
+    Logger.debug(`✌️ Back server launched on port ${config.publicPort}`);
   })
   .on('error', (err) => {
     Logger.error(err);

back/schedule.ts

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

back/services/cron.ts

@@ -10,8 +10,6 @@ import { promises, existsSync } from 'fs';
 import { promisify } from 'util';
 import { Op } from 'sequelize';
 import path from 'path';
-import dayjs from 'dayjs';
-import { LOG_END_SYMBOL } from '../config/const';
 
 @Service()
 export default class CronService {
@@ -114,69 +112,9 @@ export default class CronService {
     }
   }
 
-  private formatViewQuery(query: any, viewQuery: any) {
+  public async crontabs(searchText?: string): Promise<Crontab[]> {
-    if (viewQuery.filters && viewQuery.filters.length > 0) {
+    let query = {};
-      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':
@@ -184,11 +122,13 @@ export default class CronService {
         case 'schedule':
         case 'label':
           const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-          q[column] = {
+          query = {
+            [column]: {
               [Op.or]: [
                 { [Op.like]: `%${textArray[1]}%` },
                 { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
               ],
+            },
           };
           break;
         default:
@@ -198,7 +138,8 @@ export default class CronService {
               { [Op.like]: `%${encodeURIComponent(searchText)}%` },
             ],
           };
-          q[Op.or] = [
+          query = {
+            [Op.or]: [
               {
                 name: reg,
               },
@@ -211,83 +152,17 @@ export default class CronService {
               {
                 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(condition);
+      const result = await CrontabModel.findAll({
-      const count = await CrontabModel.count({ where: query });
+        where: query,
-      return { data: result, total: count };
+        order: [['createdAt', 'DESC']],
+      });
+      return result as any;
     } catch (error) {
       throw error;
     }
@@ -322,21 +197,13 @@ 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## 执行结束... ${endTime.format(
+          `${str}\n## 执行结束...  ${new Date()
-            'YYYY-MM-DD HH:mm:ss',
+            .toLocaleString('zh', { hour12: false })
-          )}${diffTimeStr}${LOG_END_SYMBOL}`,
+            .replace(' 24:', ' 00:')} `,
         );
       }
     }
@@ -361,7 +228,6 @@ 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 {
@@ -403,17 +269,11 @@ export default class CronService {
       if (!cmdStr.includes('task ') && !cmdStr.includes('ql ')) {
         cmdStr = `task ${cmdStr}`;
       }
-      if (
+      if (cmdStr.endsWith('.js')) {
-        cmdStr.endsWith('.js') ||
-        cmdStr.endsWith('.py') ||
-        cmdStr.endsWith('.pyc') ||
-        cmdStr.endsWith('.sh') ||
-        cmdStr.endsWith('.ts')
-      ) {
         cmdStr = `${cmdStr} now`;
       }
 
-      const cp = spawn(`ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
+      const cp = spawn(cmdStr, { shell: '/bin/bash' });
 
       await CrontabModel.update(
         { status: CrontabStatus.running, pid: cp.pid },
@@ -421,7 +281,7 @@ export default class CronService {
       );
       cp.stderr.on('data', (data) => {
         if (logFileExist) {
-          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
+          fs.appendFileSync(`${absolutePath}`, `${data}`);
         }
       });
       cp.on('error', (err) => {
@@ -432,10 +292,16 @@ export default class CronService {
 
       cp.on('exit', async (code, signal) => {
         this.logger.info(
-          `任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`,
+          `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
         );
+        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 } },
@@ -565,7 +431,7 @@ export default class CronService {
   private async set_crontab(needReloadSchedule: boolean = false) {
     const tabs = await this.crontabs();
     var crontab_string = '';
-    tabs.data.forEach((tab) => {
+    tabs.forEach((tab) => {
       const _schedule = tab.schedule && tab.schedule.split(/ +/);
       if (tab.isDisabled === 1 || _schedule!.length !== 5) {
         crontab_string += '# ';

back/services/cronView.ts

@@ -1,92 +0,0 @@
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import { CrontabView, CrontabViewModel } from '../data/cronView';
-import { initPosition } from '../data/env';
-
-@Service()
-export default class CronViewService {
-  constructor(@Inject('logger') private logger: winston.Logger) {}
-
-  public async create(payload: CrontabView): Promise<CrontabView> {
-    let position = initPosition;
-    const views = await this.list();
-    if (views && views.length > 0 && views[views.length - 1].position) {
-      position = views[views.length - 1].position as number;
-    }
-    position = position / 2;
-    const tab = new CrontabView({ ...payload, position });
-    const doc = await this.insert(tab);
-    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

@@ -9,11 +9,11 @@ import {
   unInstallDependenceCommandTypes,
   DependenceModel,
 } from '../data/dependence';
+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 {
@@ -124,11 +124,8 @@ export default class DependenceService {
     return docs;
   }
 
-  private async find(query: any, sort: any = []): Promise<Dependence[]> {
+  private async find(query: any, sort?: any): Promise<Dependence[]> {
-    const docs = await DependenceModel.findAll({
+    const docs = await DependenceModel.findAll({ where: { ...query } });
-      where: { ...query },
-      order: [...sort, ['createdAt', 'DESC']],
-    });
     return docs;
   }
 
@@ -164,17 +161,20 @@ export default class DependenceService {
       )[dependencies[0].type as any];
       const actionText = isInstall ? '安装' : '删除';
       const depIds = dependencies.map((x) => x.id) as number[];
-      const startTime = dayjs();
+      const startTime = Date.now();
-
-      const message = `开始${actionText}依赖 ${depNames}，开始时间 ${startTime.format(
-        'YYYY-MM-DD HH:mm:ss',
-      )}\n\n`;
       this.sockService.sendMessage({
         type: socketMessageType,
-        message,
+        message: `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
+          startTime,
+        ).toLocaleString()}\n\n`,
         references: depIds,
       });
-      await this.updateLog(depIds, message);
+      await this.updateLog(
+        depIds,
+        `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
+          startTime,
+        ).toLocaleString()}\n\n`,
+      );
 
       const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
 
@@ -207,19 +207,23 @@ export default class DependenceService {
       });
 
       cp.on('close', async (code) => {
-        const endTime = dayjs();
+        const endTime = Date.now();
         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,
+          message: `\n依赖${actionText}${resultText}，结束时间 ${new Date(
+            endTime,
+          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
           references: depIds,
         });
-        await this.updateLog(depIds, message);
+        await this.updateLog(
+          depIds,
+          `\n依赖${actionText}${resultText}，结束时间 ${new Date(
+            endTime,
+          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
+        );
 
         let status = null;
         if (isSucceed) {

back/services/env.ts

@@ -1,17 +1,10 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
+import { getFileContentByName } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
-import {
+import { Env, EnvModel, EnvStatus, initEnvPosition } from '../data/env';
-  Env,
+import _ from 'lodash';
-  EnvModel,
-  EnvStatus,
-  initPosition,
-  maxPosition,
-  minPosition,
-  stepPosition,
-} from '../data/env';
-import groupBy from 'lodash/groupBy';
 import { Op } from 'sequelize';
 
 @Service()
@@ -20,22 +13,17 @@ export default class EnvService {
 
   public async create(payloads: Env[]): Promise<Env[]> {
     const envs = await this.envs();
-    let position = initPosition;
+    let position = initEnvPosition;
-    if (
+    if (envs && envs.length > 0 && envs[envs.length - 1].position) {
-      envs &&
+      position = envs[envs.length - 1].position as number;
-      envs.length > 0 &&
-      typeof envs[envs.length - 1].position === 'number'
-    ) {
-      position = envs[envs.length - 1].position!;
     }
     const tabs = payloads.map((x) => {
-      position = position - stepPosition;
+      position = position / 2;
       const tab = new Env({ ...x, position });
       return tab;
     });
     const docs = await this.insert(tabs);
     await this.set_envs();
-    await this.checkPosition(tabs[tabs.length - 1].position!);
     return docs;
   }
 
@@ -79,40 +67,25 @@ export default class EnvService {
     const envs = await this.envs();
     if (toIndex === 0 || toIndex === envs.length - 1) {
       targetPosition = isUpward
-        ? envs[0].position! + stepPosition
+        ? envs[0].position * 2
-        : envs[toIndex].position! - stepPosition;
+        : envs[toIndex].position / 2;
     } else {
       targetPosition = isUpward
-        ? (envs[toIndex].position! + envs[toIndex - 1].position!) / 2
+        ? (envs[toIndex].position + envs[toIndex - 1].position) / 2
-        : (envs[toIndex].position! + envs[toIndex + 1].position!) / 2;
+        : (envs[toIndex].position + envs[toIndex + 1].position) / 2;
     }
-
     const newDoc = await this.update({
       id,
-      position: this.getPrecisionPosition(targetPosition),
+      position: targetPosition,
     });
-
-    await this.checkPosition(targetPosition);
     return newDoc;
   }
 
-  private async checkPosition(position: number) {
+  public async envs(
-    const precisionPosition = parseFloat(position.toPrecision(16));
+    searchText: string = '',
-    if (precisionPosition < minPosition || precisionPosition > maxPosition) {
+    sort: any = { position: -1 },
-      const envs = await this.envs();
+    query: any = {},
-      let position = initPosition;
+  ): Promise<Env[]> {
-      for (const env of envs) {
-        position = position - stepPosition;
-        await this.updateDb({ ...env, position });
-      }
-    }
-  }
-
-  private getPrecisionPosition(position: number): number {
-    return parseFloat(position.toPrecision(16));
-  }
-
-  public async envs(searchText: string = '', query: any = {}): Promise<Env[]> {
     let condition = { ...query };
     if (searchText) {
       const encodeText = encodeURIComponent(searchText);
@@ -139,11 +112,7 @@ export default class EnvService {
       };
     }
     try {
-      const result = await this.find(condition, [
+      const result = await this.find(condition, [['position', 'DESC']]);
-        ['status', 'ASC'],
-        ['position', 'DESC'],
-        ['createdAt', 'ASC'],
-      ]);
       return result as any;
     } catch (error) {
       throw error;
@@ -182,22 +151,24 @@ export default class EnvService {
   }
 
   public async set_envs() {
-    const envs = await this.envs('', {
+    const envs = await this.envs(
-      name: { [Op.not]: null },
+      '',
-      status: EnvStatus.normal,
+      { position: -1 },
-    });
+      { name: { [Op.not]: null } },
-    const groups = groupBy(envs, 'name');
+    );
+    const groups = _.groupBy(envs, 'name');
     let env_string = '';
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
         const group = groups[key];
 
         // 忽略不符合bash要求的环境变量名称
-        if (/^[a-zA-Z_][0-9a-zA-Z_]*$/.test(key)) {
+        if (/^[a-zA-Z_][0-9a-zA-Z_]+$/.test(key)) {
-          let value = group
+          let value = _(group)
-            .map((x) => x.value)
+            .filter((x) => x.status !== EnvStatus.disabled)
+            .map('value')
             .join('&')
-            .replace(/(\\)[^n]/g, '\\\\')
+            .replace(/(\\)[^\n]/g, '\\\\')
             .replace(/(\\$)/, '\\\\')
             .replace(/"/g, '\\"')
             .trim();

back/services/notify.ts

@@ -6,7 +6,6 @@ import got from 'got';
 import nodemailer from 'nodemailer';
 import crypto from 'crypto';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
-import { parseBody, parseHeaders } from '../config/util';
 
 @Service()
 export default class NotificationService {
@@ -18,27 +17,20 @@ export default class NotificationService {
     ['goCqHttpBot', this.goCqHttpBot],
     ['serverChan', this.serverChan],
     ['pushDeer', this.pushDeer],
-    ['chat', this.chat],
     ['bark', this.bark],
     ['telegramBot', this.telegramBot],
     ['dingtalkBot', this.dingtalkBot],
     ['weWorkBot', this.weWorkBot],
     ['weWorkApp', this.weWorkApp],
-    ['aibotk', this.aibotk],
     ['iGot', this.iGot],
     ['pushPlus', this.pushPlus],
     ['email', this.email],
-    ['webhook', this.webhook],
-    ['lark', this.lark],
   ]);
 
+  private timeout = 10000;
   private title = '';
   private content = '';
   private params!: Omit<NotificationInfo, 'type'>;
-  private gotOption = {
-    timeout: 30000,
-    retry: 1,
-  };
 
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
@@ -81,7 +73,8 @@ export default class NotificationService {
     const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
     const res: any = await got
       .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         body: `title=${encodeURIComponent(
           this.title,
         )}&message=${encodeURIComponent(
@@ -99,7 +92,8 @@ export default class NotificationService {
     const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
     const res: any = await got
       .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         json: { message: `${this.title}\n${this.content}` },
         headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
       })
@@ -114,7 +108,8 @@ export default class NotificationService {
       : `https://sc.ftqq.com/${serverChanKey}.send`;
     const res: any = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         body: `title=${this.title}&desp=${this.content}`,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       })
@@ -127,7 +122,8 @@ export default class NotificationService {
     const url = `https://api2.pushdeer.com/message/push`;
     const res: any = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
           this.title,
         )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
@@ -139,19 +135,6 @@ export default class NotificationService {
     );
   }
 
-  private async chat() {
-    const { chatUrl, chatToken } = this.params;
-    const url = `${chatUrl}${chatToken}`;
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        body: `payload={"text":"${this.title}\n${this.content}"}`,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
-      .json();
-    return res.success;
-  }
-
   private async bark() {
     let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
     if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
@@ -164,7 +147,8 @@ export default class NotificationService {
     )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
     const res: any = await got
       .get(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       })
       .json();
@@ -202,7 +186,8 @@ export default class NotificationService {
     }
     const res: any = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
         agent,
@@ -224,7 +209,8 @@ export default class NotificationService {
     const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
     const res: any = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         json: {
           msgtype: 'text',
           text: {
@@ -241,7 +227,8 @@ export default class NotificationService {
     const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
     const res: any = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         json: {
           msgtype: 'text',
           text: {
@@ -258,9 +245,10 @@ 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 tokenRes: any = await got
+    const { access_token } = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         json: {
           corpid,
           corpsecret,
@@ -308,9 +296,10 @@ export default class NotificationService {
 
     const res: any = await got
       .post(
-        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
+        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
         {
-          ...this.gotOption,
+          timeout: this.timeout,
+          retry: 0,
           json: {
             touser,
             agentid,
@@ -324,53 +313,13 @@ export default class NotificationService {
     return res.errcode === 0;
   }
 
-  private async aibotk() {
-    const { aibotkKey, aibotkType, aibotkName } = this.params;
-    let url = '';
-    let json = {};
-    switch (aibotkType) {
-      case 'room':
-        url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
-        json = {
-          apiKey: `${aibotkKey}`,
-          roomName: `${aibotkName}`,
-          message: {
-            type: 1,
-            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
-          },
-        };
-        break;
-      case 'contact':
-        url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
-        json = {
-          apiKey: `${aibotkKey}`,
-          name: `${aibotkName}`,
-          message: {
-            type: 1,
-            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
-          },
-        };
-        break;
-    }
-
-    const res: any = await got
-      .post(url, {
-        ...this.gotOption,
-        json: {
-          ...json,
-        },
-      })
-      .json();
-
-    return res.code === 0;
-  }
-
   private async iGot() {
     const { iGotPushKey } = this.params;
     const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
     const res: any = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         body: `title=${this.title}&content=${this.content}`,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       })
@@ -384,7 +333,8 @@ export default class NotificationService {
     const url = `https://www.pushplus.plus/send`;
     const res: any = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         json: {
           token: `${pushPlusToken}`,
           title: `${this.title}`,
@@ -397,21 +347,6 @@ export default class NotificationService {
     return res.code === 200;
   }
 
-  private async lark() {
-    const { larkKey } = this.params;
-    const res: any = await got
-      .post(`https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`, {
-        ...this.gotOption,
-        json: {
-          msg_type: 'text',
-          content: { text: `${this.title}\n\n${this.content}` },
-        },
-        headers: { 'Content-Type': 'application/json' },
-      })
-      .json();
-    return res.StatusCode === 0;
-  }
-
   private async email() {
     const { emailPass, emailService, emailUser } = this.params;
     const transporter = nodemailer.createTransport({
@@ -433,62 +368,4 @@ export default class NotificationService {
 
     return !!info.messageId;
   }
-
-  private async webhook() {
-    const {
-      webhookUrl,
-      webhookBody,
-      webhookHeaders,
-      webhookMethod,
-      webhookContentType,
-    } = this.params;
-
-    const { formatBody, formatUrl } = this.formatNotifyContent(
-      webhookUrl,
-      webhookBody,
-    );
-    if (!formatUrl && !formatBody) {
-      return false;
-    }
-    const headers = parseHeaders(webhookHeaders);
-    const body = parseBody(formatBody, webhookContentType);
-    const bodyParam = this.formatBody(webhookContentType, body);
-    const options = {
-      method: webhookMethod,
-      headers,
-      ...this.gotOption,
-      allowGetBody: true,
-      ...bodyParam,
-    };
-    const res = await got(formatUrl, options);
-    return String(res.statusCode).startsWith('20');
-  }
-
-  private formatBody(contentType: string, body: any): object {
-    if (!body) return {};
-    switch (contentType) {
-      case 'application/json':
-        return { json: body };
-      case 'multipart/form-data':
-        return { form: body };
-      case 'application/x-www-form-urlencoded':
-        return { body };
-    }
-    return {};
-  }
-
-  private formatNotifyContent(url: string, body: string) {
-    if (!url.includes('$title') && !body.includes('$title')) {
-      return {};
-    }
-
-    return {
-      formatUrl: url
-        .replaceAll('$title', encodeURIComponent(this.title))
-        .replaceAll('$content', encodeURIComponent(this.content)),
-      formatBody: body
-        .replaceAll('$title', this.title)
-        .replaceAll('$content', this.content),
-    };
-  }
 }

back/services/open.ts

@@ -90,9 +90,7 @@ export default class OpenService {
     }
     try {
       const result = await this.find(condition);
-      return result
+      return result.map((x) => ({ ...x, tokens: [] }));
-        .filter((x) => x.name !== 'system')
-        .map((x) => ({ ...x, tokens: [] }));
     } catch (error) {
       throw error;
     }
@@ -144,27 +142,4 @@ 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,7 +18,6 @@ interface ScheduleTaskType {
 }
 
 export interface TaskCallbacks {
-  onBefore?: (startTime: dayjs.Dayjs) => Promise<void>;
   onStart?: (
     cp: ChildProcessWithoutNullStreams,
     startTime: dayjs.Dayjs,
@@ -46,8 +45,6 @@ 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:
@@ -79,12 +76,13 @@ export default class ScheduleService {
 
         cp.on('exit', async (code, signal) => {
           this.logger.info(
-            `任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`,
+            `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
           );
         });
 
         cp.on('close', async (code) => {
           const endTime = dayjs();
+          this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
           await callbacks.onEnd?.(
             cp,
             endTime,
@@ -168,7 +166,7 @@ export default class ScheduleService {
     );
 
     const job = new LongIntervalJob(
-      { runImmediately: false, ...schedule },
+      { ...schedule, runImmediately: false },
       task,
       _id,
     );

back/services/script.ts

@@ -1,12 +1,8 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import fs from 'fs';
+import { spawn } from 'child_process';
-import path from 'path';
 import SockService from './sock';
 import CronService from './cron';
-import ScheduleService, { TaskCallbacks } from './schedule';
-import config from '../config';
-import { LOG_END_SYMBOL } from '../config/const';
 
 @Service()
 export default class ScriptService {
@@ -14,49 +10,50 @@ export default class ScriptService {
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
     private cronService: CronService,
-    private scheduleService: ScheduleService,
   ) {}
 
-  private taskCallbacks(filePath: string): TaskCallbacks {
+  public async runScript(path: string) {
-    return {
+    const cp = spawn(`task -l ${path} now`, { shell: '/bin/bash' });
-      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,
-        });
-      },
-    };
-  }
 
-  public async runScript(filePath: string) {
+    cp.stdout.on('data', (data) => {
-    const relativePath = path.relative(config.scriptPath, filePath);
+      this.sockService.sendMessage({
-    const command = `task -l ${relativePath} now`;
+        type: 'manuallyRunScript',
-    this.scheduleService.runTask(command, this.taskCallbacks(filePath));
+        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: `执行结束`,
+      });
+    });
 
     return { code: 200 };
   }
 
-  public async stopScript(filePath: string) {
+  public async stopScript(path: string) {
-    const relativePath = path.relative(config.scriptPath, filePath);
+    const err = await this.cronService.killTask(`task -l ${path} now`);
-    const err = await this.cronService.killTask(`task -l ${relativePath} now`);
-
     const str = err ? `\n${err}` : '';
     this.sockService.sendMessage({
       type: 'manuallyRunScript',
       message: `${str}\n## 执行结束...  ${new Date()
         .toLocaleString('zh', { hour12: false })
-        .replace(' 24:', ' 00:')}${LOG_END_SYMBOL}`,
+        .replace(' 24:', ' 00:')} `,
     });
 
     return { code: 200 };

back/services/sshKey.ts

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

back/services/subscription.ts

@@ -28,8 +28,6 @@ import ScheduleService, { TaskCallbacks } from './schedule';
 import { SimpleIntervalSchedule } from 'toad-scheduler';
 import SockService from './sock';
 import SshKeyService from './sshKey';
-import dayjs from 'dayjs';
-import { LOG_END_SYMBOL } from '../config/const';
 
 @Service()
 export default class SubscriptionService {
@@ -43,6 +41,23 @@ 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}%` },
@@ -55,18 +70,23 @@ export default class SubscriptionService {
                 name: reg,
               },
               {
-            url: reg,
+                command: reg,
+              },
+              {
+                schedule: reg,
+              },
+              {
+                labels: reg,
               },
             ],
           };
+          break;
+      }
     }
     try {
       const result = await SubscriptionModel.findAll({
         where: query,
-        order: [
+        order: [['createdAt', 'DESC']],
-          ['is_disabled', 'ASC'],
-          ['createdAt', 'DESC'],
-        ],
       });
       return result as any;
     } catch (error) {
@@ -172,13 +192,14 @@ export default class SubscriptionService {
 
   private taskCallbacks(doc: Subscription): TaskCallbacks {
     return {
-      onBefore: async (startTime) => {
+      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
         const logTime = startTime.format('YYYY-MM-DD-HH-mm-ss');
         const logPath = `${doc.alias}/${logTime}.log`;
         await SubscriptionModel.update(
           {
             status: SubscriptionStatus.running,
             log_path: logPath,
+            pid: cp.pid,
           },
           { where: { id: doc.id } },
         );
@@ -199,17 +220,9 @@ export default class SubscriptionService {
             (error.stderr && error.stderr.toString()) || JSON.stringify(error);
         }
         if (beforeStr) {
-          fs.appendFileSync(absolutePath, `${beforeStr}\n`);
+          fs.appendFileSync(absolutePath, `${beforeStr}\n\n`);
         }
       },
-      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
-        await SubscriptionModel.update(
-          {
-            pid: cp.pid,
-          },
-          { where: { id: doc.id } },
-        );
-      },
       onEnd: async (cp, endTime, diff) => {
         const sub = await this.getDb({ id: doc.id });
         const absolutePath = await this.handleLogPath(sub.log_path as string);
@@ -218,7 +231,7 @@ export default class SubscriptionService {
         let afterStr = '';
         try {
           if (sub.sub_after) {
-            fs.appendFileSync(absolutePath, `\n\n## 执行after命令...\n\n`);
+            fs.appendFileSync(absolutePath, `\n\n## 执行after命令...\n`);
             afterStr = await this.promiseExec(sub.sub_after);
           }
         } catch (error: any) {
@@ -233,7 +246,7 @@ export default class SubscriptionService {
           absolutePath,
           `\n## 执行结束... ${endTime.format(
             'YYYY-MM-DD HH:mm:ss',
-          )}  耗时 ${diff} 秒${LOG_END_SYMBOL}`,
+          )}  耗时 ${diff} 秒`,
         );
 
         await SubscriptionModel.update(
@@ -273,7 +286,7 @@ export default class SubscriptionService {
 
   public async update(payload: Subscription): Promise<Subscription> {
     const newDoc = await this.updateDb(payload);
-    await this.handleTask(newDoc, !newDoc.is_disabled);
+    await this.handleTask(newDoc);
     return newDoc;
   }
 
@@ -347,14 +360,16 @@ export default class SubscriptionService {
           this.logger.silly(error);
         }
       }
+      await 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## 执行结束...  ${dayjs().format('YYYY-MM-DD HH:mm:ss')}${LOG_END_SYMBOL}`,
+        `${str}\n## 执行结束...  ${new Date()
+          .toLocaleString('zh', { hour12: false })
+          .replace(' 24:', ' 00:')} `,
       );
     }
 

back/services/system.ts

@@ -2,6 +2,7 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
 import * as fs from 'fs';
+import _ from 'lodash';
 import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
@@ -9,7 +10,6 @@ import ScheduleService from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import got from 'got';
-import { promiseExec } from '../config/util';
 
 @Service()
 export default class SystemService {
@@ -70,8 +70,9 @@ export default class SystemService {
     };
     await this.scheduleService.cancelIntervalTask(cron);
     if (frequency > 0) {
-      this.scheduleService.createIntervalTask(cron, {
+      await this.scheduleService.createIntervalTask(cron, {
         days: frequency,
+        runImmediately: true,
       });
     }
     return { code: 200, data: { ...cron } };
@@ -88,9 +89,11 @@ export default class SystemService {
       let lastVersion = '';
       let lastLog = '';
       try {
-        const lastVersionFileContent = await promiseExec(
+        const result = await got.get(config.lastVersionFile, {
-          `curl ${config.lastVersionFile}?t=${Date.now()}`,
+          timeout: 6000,
-        );
+          retry: 0,
+        });
+        const lastVersionFileContent = result.body;
         lastVersion = lastVersionFileContent.match(versionRegx)![1];
         lastLog = lastVersionFileContent.match(logRegx)
           ? lastVersionFileContent.match(logRegx)![1]
@@ -135,6 +138,10 @@ export default class SystemService {
   public async updateSystem() {
     const cp = spawn('ql -l update', { shell: '/bin/bash' });
 
+    this.sockService.sendMessage({
+      type: 'updateSystemVersion',
+      message: `开始更新系统`,
+    });
     cp.stdout.on('data', (data) => {
       this.sockService.sendMessage({
         type: 'updateSystemVersion',

back/services/user.ts

@@ -3,6 +3,7 @@ import winston from 'winston';
 import { createRandomString, getNetIp, getPlatform } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
+import _ from 'lodash';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
@@ -12,7 +13,7 @@ import { Request } from 'express';
 import ScheduleService from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
-import dayjs from 'dayjs';
+import got from 'got';
 
 @Service()
 export default class UserService {
@@ -64,37 +65,32 @@ export default class UserService {
         return this.initAuthInfo();
       }
 
-      const retriesTime = Math.pow(3, retries) * 1000;
+      if (retries > 2 && Date.now() - lastlogon < Math.pow(3, retries) * 1000) {
-      if (retries > 2 && timestamp - lastlogon < retriesTime) {
-        const waitTime = Math.ceil(
-          (retriesTime - (timestamp - lastlogon)) / 1000,
-        );
         return {
           code: 410,
-          message: `失败次数过多，请${waitTime}秒后重试`,
+          message: `失败次数过多，请${Math.round(
-          data: waitTime,
+            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
-        };
+          )}秒后重试`,
-      }
+          data: Math.round(
-
+            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
-      if (
+          ),
-        username === cUsername &&
-        password === cPassword &&
-        twoFactorActivated &&
-        needTwoFactor
-      ) {
-        this.updateAuthInfo(content, {
-          isTwoFactorChecking: true,
-        });
-        return {
-          code: 420,
-          message: '',
         };
       }
 
       const { ip, address } = await getNetIp(req);
       if (username === cUsername && password === cPassword) {
+        if (twoFactorActivated && needTwoFactor) {
+          this.updateAuthInfo(content, {
+            isTwoFactorChecking: true,
+          });
+          return {
+            code: 420,
+            message: '请输入两步验证token',
+          };
+        }
+
         const data = createRandomString(50, 100);
-        const expiration = twoFactorActivated ? 60 : 20;
+        const expiration = twoFactorActivated ? 30 : 3;
         let token = jwt.sign({ data }, config.secret as any, {
           expiresIn: 60 * 60 * 24 * expiration,
           algorithm: 'HS384',
@@ -115,7 +111,7 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
             req.platform
           }端 登录成功，ip地址 ${ip}`,
         );
@@ -144,7 +140,7 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
             req.platform
           }端 登录失败，ip地址 ${ip}`,
         );
@@ -159,17 +155,8 @@ export default class UserService {
             status: LoginStatus.fail,
           },
         });
-        if (retries > 2) {
-          const waitTime = Math.round(Math.pow(3, retries + 1));
-          return {
-            code: 410,
-            message: `失败次数过多，请${waitTime}秒后重试`,
-            data: waitTime,
-          };
-        } else {
         return { code: 400, message: config.authError };
       }
-      }
     } else {
       return this.initAuthInfo();
     }

back/token.ts

@@ -1,34 +0,0 @@
-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,12 +1,11 @@
-FROM python:alpine
+FROM node:alpine
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
-ARG QL_BRANCH=develop
+ARG QL_BRANCH=master
 
-ENV PNPM_HOME=/root/.local/share/pnpm \
+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 \
-    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 \$ " \
@@ -29,18 +28,18 @@ RUN set -x \
                              perl \
                              openssl \
                              nginx \
-                             nodejs \
+                             python3 \
                              jq \
                              openssh \
-                             npm \
+                             py3-pip \
     && rm -rf /var/cache/apk/* \
-    && apk update \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && echo "Asia/Shanghai" > /etc/timezone \
     && git config --global user.email "qinglong@@users.noreply.github.com" \
     && git config --global user.name "qinglong" \
-    && git config --global http.postBuffer 524288000 \
     && npm install -g pnpm \
+    && pnpm 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

@@ -4,17 +4,12 @@ dir_shell=/ql/shell
 . $dir_shell/share.sh
 link_shell
 
-export isFirstStartServer=true
-
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
 cp -fv $nginx_conf /etc/nginx/nginx.conf
 cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
-sed -i "s,QL_BASE_URL,${qlBaseUrl},g" /etc/nginx/conf.d/front.conf
 pm2 l &>/dev/null
-
-patch_version &>/dev/null
 echo
 
 echo -e "======================2. 安装依赖========================\n"
@@ -42,13 +37,13 @@ echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
   echo -e "======================7. 启动bot========================\n"
-  nohup ql bot >$dir_log/bot.log 2>&1 &
+  nohup ql bot >>$dir_log/start.log 2>&1 &
   echo -e "bot后台启动中...\n"
 fi
 
 if [[ $EnableExtraShell == true ]]; then
   echo -e "======================8. 执行自定义脚本========================\n"
-  nohup ql extra >$dir_log/extra.log 2>&1 &
+  nohup ql extra >>$dir_log/start.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi
 

docker/front.conf

@@ -1,8 +1,8 @@
-upstream baseApi {
+upstream api {
   server 0.0.0.0:5600;
 }
 
-upstream publicApi {
+upstream public {
   server 0.0.0.0:5400;
 }
 
@@ -16,28 +16,28 @@ server {
   root /ql/static/dist;
   ssl_session_timeout 5m;
 
-  location QL_BASE_URL/api/public/ {
+  location /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://publicApi/api/public/;
+    proxy_pass http://public;
   }
 
-  location QL_BASE_URL/api/ {
+  location /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://baseApi/api/;
+    proxy_pass http://api;
 
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
   }
 
-  location QL_BASE_URL/open/ {
+  location /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://baseApi/open/;
+    proxy_pass http://api;
   }
 
   gzip on;
@@ -49,9 +49,9 @@ server {
   gzip_buffers 16 8k;
   gzip_http_version 1.0;  
 
-  location QL_BASE_URL/ {
+  location / {
     index  index.html index.htm;
-    try_files $uri $uri/ QL_BASE_URL/index.html;
+    try_files $uri $uri/ /index.html;
   }
 
   location ~ .*\.(html)$ {

package.json

@@ -2,16 +2,16 @@
   "private": true,
   "scripts": {
     "start": "concurrently -n w: npm:start:*",
-    "start:front": "max dev",
+    "start:front": "umi dev",
     "start:back": "nodemon",
     "start:public": "ts-node back/public.ts",
-    "build:front": "max build",
+    "build:front": "umi build",
     "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.js",
     "schedule": "npm run build:back && node static/build/schedule.js",
     "public": "npm run build:back && node static/build/public.js",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "postinstall": "max setup 2>/dev/null || true",
+    "postinstall": "umi generate tmp 2>/dev/null || true",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage"
   },
@@ -28,33 +28,20 @@
   },
   "pnpm": {
     "peerDependencyRules": {
-      "ignoreMissing": [
-        "react",
-        "react-dom",
-        "antd",
-        "dva",
-        "postcss",
-        "webpack",
-        "eslint",
-        "stylelint",
-        "redux",
-        "@babel/core",
-        "monaco-editor",
-        "rc-field-form",
-        "@types/lodash.merge",
-        "rollup"
-      ],
       "allowedVersions": {
-        "react": "18",
+        "react": "17",
-        "react-dom": "18",
+        "react-dom": "17"
-        "dva-core": "2"
+      },
-      }
+      "ignoreMissing": [
+        "monaco-editor",
+        "react-router"
+      ]
     }
   },
   "dependencies": {
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^7.12.1",
+    "@sentry/node": "^6.18.1",
-    "@sentry/tracing": "^7.12.1",
+    "@sentry/tracing": "^6.18.1",
     "body-parser": "^1.19.2",
     "celebrate": "^15.0.1",
     "chokidar": "^3.5.3",
@@ -65,7 +52,6 @@
     "express": "^4.17.3",
     "express-jwt": "^6.1.1",
     "express-urlrewrite": "^1.4.0",
-    "form-data": "^4.0.0",
     "got": "^11.8.2",
     "hpagent": "^0.1.2",
     "iconv-lite": "^0.6.3",
@@ -77,10 +63,10 @@
     "nodemailer": "^6.7.2",
     "p-queue": "7.2.0",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.25.3",
+    "sequelize": "^6.17.0",
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
-    "sqlite3": "npm:@louislam/sqlite3@^15.0.6",
+    "sqlite3": "npm:@louislam/sqlite3@^15.0.3",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
@@ -90,31 +76,32 @@
   "devDependencies": {
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.33.1",
-    "@monaco-editor/react": "4.2.1",
+    "@monaco-editor/react": "^4.3.1",
-    "@react-hook/resize-observer": "^1.2.6",
+    "@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",
     "@types/express-jwt": "^6.0.4",
     "@types/jsonwebtoken": "^8.5.8",
-    "@types/lodash": "^4.14.185",
+    "@types/lodash": "^4.14.179",
     "@types/multer": "^1.4.7",
     "@types/nedb": "^1.8.12",
     "@types/node": "^17.0.21",
     "@types/node-schedule": "^1.3.2",
     "@types/nodemailer": "^6.4.4",
     "@types/qrcode.react": "^1.0.2",
-    "@types/react": "^18.0.20",
+    "@types/react": "^17.0.39",
-    "@types/react-dom": "^18.0.6",
+    "@types/react-dom": "^17.0.13",
     "@types/serve-handler": "^6.1.1",
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
     "@types/uuid": "^8.3.4",
-    "@umijs/max": "^4.0.21",
+    "@umijs/plugin-antd": "^0.15.0",
+    "@umijs/plugin-esbuild": "^1.4.1",
     "@umijs/ssr-darkreader": "^4.9.45",
+    "@umijs/test": "^3.5.21",
     "ansi-to-react": "^6.1.6",
-    "antd": "^4.23.0",
+    "antd": "^4.20.5",
     "antd-img-crop": "^4.2.3",
     "codemirror": "^5.65.2",
     "compression-webpack-plugin": "9.2.0",
@@ -124,19 +111,18 @@
     "prettier": "^2.5.1",
     "qiniu": "^7.4.0",
     "qrcode.react": "^1.0.1",
-    "query-string": "^7.1.1",
     "rc-tween-one": "^3.0.6",
-    "react": "18.2.0",
+    "react": "17.x",
     "react-codemirror2": "^7.2.1",
     "react-diff-viewer": "^3.1.1",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
-    "react-dom": "18.2.0",
+    "react-dom": "17.x",
     "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",
     "vh-check": "^2.0.5",
     "webpack": "^5.70.0",

sample/config.sample.sh

@@ -19,11 +19,6 @@ RepoFileExtensions="js py"
 ## 代理地址，支持http/https/socks，例如 http://127.0.0.1:7890
 ProxyUrl=""
 
-## 资源告警阙值，默认CPU 80%、内存80%、磁盘90%
-CpuWarn=80
-MemoryWarn=80
-DiskWarn=90
-
 ## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 CommandTimeoutTime="1h"
 
@@ -34,14 +29,6 @@ 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"
 
@@ -51,11 +38,8 @@ AutoStartBot=""
 ## 是否使用第三方bot，默认不使用，使用时填入仓库地址，存到ql/repo目录下，文件夹命名为diybot
 BotRepoUrl=""
 
-## 安装python依赖时指定pip源
+## 安装bot依赖时指定pip源，默认使用清华源，如不需要源，设置此参数为空
-PipMirror="https://pypi.doubanio.com/simple/"
+PipMirror="https://pypi.tuna.tsinghua.edu.cn/simple"
-
-## 安装node依赖时指定npm源
-NpmMirror="https://registry.npmmirror.com"
 
 ## 通知环境变量
 ## 1. Server酱
@@ -67,7 +51,7 @@ export PUSH_KEY=""
 ## 下方填写app提供的设备码，例如：https://api.day.app/123 那么此处的设备码就是123
 export BARK_PUSH=""
 ## 下方填写推送图标设置，自定义推送图标(需iOS15或以上)
-export BARK_ICON="https://qn.whyour.cn/logo.png"
+export BARK_ICON="http://qn.whyour.cn/logo.png"
 ## 下方填写推送声音设置，例如choo，具体值请在bark-推送铃声-查看所有铃声
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
@@ -145,19 +129,4 @@ export GOTIFY_PRIORITY=0
 ## deer_key 填写PushDeer的key
 export DEER_KEY=""
 
-## 12. Chat
-## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
-## chat_token 填写后面的token
-export CHAT_URL=""
-export CHAT_TOKEN=""
-
-## 13. aibotk
-## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
-## aibotk_key (必填)填写智能微秘书个人中心的apikey
-export AIBOTK_KEY=""
-## aibotk_type (必填)填写发送的目标 room 或 contact, 填其他的不生效
-export AIBOTK_TYPE=""
-## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
-export AIBOTK_NAME=""
-
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.js

@@ -39,17 +39,11 @@ 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 = '';
 //BARK app推送图标,自定义推送图标(需iOS15或以上)
-let BARK_ICON = 'https://qn.whyour.cn/logo.png';
+let BARK_ICON = 'http://qn.whyour.cn/logo.png';
 //BARK app推送铃声,铃声列表去APP查看复制填写
 let BARK_SOUND = '';
 //BARK app推送消息的分组, 默认为"QingLong"
@@ -103,27 +97,6 @@ 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 = '';
-
-// =======================================智能微秘书设置区域=======================================
-//官方文档：http://wechat.aibotk.com/docs/about
-//AIBOTK_KEY： 填写智能微秘书个人中心的apikey
-//AIBOTK_TYPE：填写发送的目标 room 或 contact, 填其他的不生效
-//AIBOTK_NAME: 填写群名或用户昵称，和上面的type类型要对应
-let AIBOTK_KEY = '';
-let AIBOTK_TYPE = '';
-let AIBOTK_NAME = '';
-
-// =======================================飞书机器人设置区域=======================================
-//官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
-//FSKEY 飞书机器人的 FSKEY
-let FSKEY = '';
-
 //==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
   GOTIFY_URL = process.env.GOTIFY_URL;
@@ -153,14 +126,6 @@ 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;
 }
@@ -234,20 +199,6 @@ if (process.env.PUSH_PLUS_TOKEN) {
 if (process.env.PUSH_PLUS_USER) {
   PUSH_PLUS_USER = process.env.PUSH_PLUS_USER;
 }
-
-if (process.env.AIBOTK_KEY) {
-  AIBOTK_KEY = process.env.AIBOTK_KEY;
-}
-if (process.env.AIBOTK_TYPE) {
-  AIBOTK_TYPE = process.env.AIBOTK_TYPE;
-}
-if (process.env.AIBOTK_NAME) {
-  AIBOTK_NAME = process.env.AIBOTK_NAME;
-}
-
-if (process.env.FSKEY) {
-  FSKEY = process.env.FSKEY;
-}
 //==========================云端环境变量的判断与接收=========================
 
 /**
@@ -281,10 +232,6 @@ async function sendNotify(
     iGotNotify(text, desp, params), //iGot
     gobotNotify(text, desp), //go-cqhttp
     gotifyNotify(text, desp), //gotify
-    ChatNotify(text, desp), //synolog chat
-    PushDeerNotify(text, desp), //PushDeer
-    aibotkNotify(text, desp), //智能微秘书
-    fsBotNotify(text, desp), //飞书机器人
   ]);
 }
 
@@ -325,7 +272,7 @@ function gotifyNotify(text, desp) {
   });
 }
 
-function gobotNotify(text, desp) {
+function gobotNotify(text, desp, time = 2100) {
   return new Promise((resolve) => {
     if (GOBOT_URL) {
       const options = {
@@ -336,6 +283,7 @@ function gobotNotify(text, desp) {
         },
         timeout,
       };
+      setTimeout(() => {
         $.post(options, (err, resp, data) => {
           try {
             if (err) {
@@ -348,7 +296,9 @@ function gobotNotify(text, desp) {
               } else if (data.retcode === 100) {
                 console.log(`go-cqhttp发送通知消息异常: ${data.errmsg}\n`);
               } else {
-              console.log(`go-cqhttp发送通知消息异常\n${JSON.stringify(data)}`);
+                console.log(
+                  `go-cqhttp发送通知消息异常\n${JSON.stringify(data)}`,
+                );
               }
             }
           } catch (e) {
@@ -357,13 +307,14 @@ function gobotNotify(text, desp) {
             resolve(data);
           }
         });
+      }, time);
     } else {
       resolve();
     }
   });
 }
 
-function serverNotify(text, desp) {
+function serverNotify(text, desp, time = 2100) {
   return new Promise((resolve) => {
     if (SCKEY) {
       //微信server酱推送通知一个\n不会换行，需要两个\n才能换行，故做此替换
@@ -378,6 +329,7 @@ function serverNotify(text, desp) {
         },
         timeout,
       };
+      setTimeout(() => {
         $.post(options, (err, resp, data) => {
           try {
             if (err) {
@@ -392,7 +344,9 @@ function serverNotify(text, desp) {
                 // 一分钟内发送相同的内容会触发
                 console.log(`server酱发送通知消息异常: ${data.errmsg}\n`);
               } else {
-              console.log(`server酱发送通知消息异常\n${JSON.stringify(data)}`);
+                console.log(
+                  `server酱发送通知消息异常\n${JSON.stringify(data)}`,
+                );
               }
             }
           } catch (e) {
@@ -401,13 +355,14 @@ function serverNotify(text, desp) {
             resolve(data);
           }
         });
+      }, time);
     } else {
       resolve();
     }
   });
 }
 
-function PushDeerNotify(text, desp) {
+function PushDeerNotify(text, desp, time = 2100) {
   return new Promise((resolve) => {
     if (PUSHDEER_KEY) {
       // PushDeer 建议对消息内容进行 urlencode
@@ -420,6 +375,7 @@ function PushDeerNotify(text, desp) {
         },
         timeout,
       };
+      setTimeout(() => {
         $.post(options, (err, resp, data) => {
           try {
             if (err) {
@@ -434,7 +390,9 @@ function PushDeerNotify(text, desp) {
               ) {
                 console.log('PushDeer发送通知消息成功🎉\n');
               } else {
-              console.log(`PushDeer发送通知消息异常\n${JSON.stringify(data)}`);
+                console.log(
+                  `PushDeer发送通知消息异常\n${JSON.stringify(data)}`,
+                );
               }
             }
           } catch (e) {
@@ -443,39 +401,80 @@ function PushDeerNotify(text, desp) {
             resolve(data);
           }
         });
+      }, time);
     } else {
       resolve();
     }
   });
 }
 
-function ChatNotify(text, desp) {
+function CoolPush(text, desp) {
   return new Promise((resolve) => {
-    if (CHAT_URL && CHAT_TOKEN) {
+    if (QQ_SKEY) {
-      // 对消息内容进行 urlencode
+      let options = {
-      desp = encodeURI(desp);
+        url: `https://push.xuthus.cc/${QQ_MODE}/${QQ_SKEY}`,
-      const options = {
-        url: `${CHAT_URL}${CHAT_TOKEN}`,
-        body: `payload={"text":"${text}\n${desp}"}`,
         headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Type': 'application/json',
         },
       };
+
+      // 已知敏感词
+      text = text.replace(/京豆/g, '豆豆');
+      desp = desp.replace(/京豆/g, '');
+      desp = desp.replace(/🐶/g, '');
+      desp = desp.replace(/红包/g, 'H包');
+
+      switch (QQ_MODE) {
+        case 'email':
+          options.json = {
+            t: text,
+            c: desp,
+          };
+          break;
+        default:
+          options.body = `${text}\n\n${desp}`;
+      }
+
+      let pushMode = function (t) {
+        switch (t) {
+          case 'send':
+            return '个人';
+          case 'group':
+            return 'QQ群';
+          case 'wx':
+            return '微信';
+          case 'ww':
+            return '企业微信';
+          case 'email':
+            return '邮件';
+          default:
+            return '未知方式';
+        }
+      };
+
       $.post(options, (err, resp, data) => {
         try {
           if (err) {
-            console.log('发送通知调用API失败！！\n');
+            console.log(`发送${pushMode(QQ_MODE)}通知调用API失败！！\n`);
             console.log(err);
           } else {
             data = JSON.parse(data);
-            if (data.success) {
+            if (data.code === 200) {
-              console.log('Chat发送通知消息成功🎉\n');
+              console.log(`酷推发送${pushMode(QQ_MODE)}通知消息成功🎉\n`);
+            } else if (data.code === 400) {
+              console.log(
+                `QQ酷推(Cool Push)发送${pushMode(QQ_MODE)}推送失败：${
+                  data.msg
+                }\n`,
+              );
+            } else if (data.code === 503) {
+              console.log(`QQ酷推出错，${data.message}：${data.data}\n`);
             } else {
-              console.log(`Chat发送通知消息异常\n${JSON.stringify(data)}`);
+              console.log(`酷推推送异常: ${JSON.stringify(data)}`);
             }
           }
         } catch (e) {
-          $.logErr(e);
+          $.logErr(e, resp);
         } finally {
           resolve(data);
         }
@@ -724,9 +723,9 @@ function qywxamNotify(text, desp) {
         timeout,
       };
       $.post(options_accesstoken, (err, resp, data) => {
-        let html = desp.replace(/\n/g, '<br/>');
+        html = desp.replace(/\n/g, '<br/>');
-        let json = JSON.parse(data);
+        var json = JSON.parse(data);
-        let accesstoken = json.access_token;
+        accesstoken = json.access_token;
         let options;
 
         switch (QYWX_AM_AY[4]) {
@@ -922,102 +921,6 @@ function pushPlusNotify(text, desp) {
   });
 }
 
-function aibotkNotify(text, desp) {
-  return new Promise((resolve) => {
-    if (AIBOTK_KEY && AIBOTK_TYPE && AIBOTK_NAME) {
-      let json = {};
-      let url = '';
-      switch (AIBOTK_TYPE) {
-        case 'room':
-          url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
-          json = {
-            apiKey: `${AIBOTK_KEY}`,
-            roomName: `${AIBOTK_NAME}`,
-            message: {
-              type: 1,
-              content: `【青龙快讯】\n\n${text}\n${desp}`,
-            },
-          };
-          break;
-        case 'contact':
-          url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
-          json = {
-            apiKey: `${AIBOTK_KEY}`,
-            name: `${AIBOTK_NAME}`,
-            message: {
-              type: 1,
-              content: `【青龙快讯】\n\n${text}\n${desp}`,
-            },
-          };
-          break;
-      }
-      const options = {
-        url: url,
-        json,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        timeout,
-      };
-      $.post(options, (err, resp, data) => {
-        try {
-          if (err) {
-            console.log('智能微秘书发送通知消息失败！！\n');
-            console.log(err);
-          } else {
-            data = JSON.parse(data);
-            if (data.code === 0) {
-              console.log('智能微秘书发送通知消息成功🎉。\n');
-            } else {
-              console.log(`${data.error}\n`);
-            }
-          }
-        } catch (e) {
-          $.logErr(e, resp);
-        } finally {
-          resolve(data);
-        }
-      });
-    }
-  });
-}
-
-function fsBotNotify(text, desp) {
-  return new Promise((resolve) => {
-    if (FSKEY) {
-      const options = {
-        url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
-        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        timeout,
-      };
-      $.post(options, (err, resp, data) => {
-        try {
-          if (err) {
-            console.log('发送通知调用API失败！！\n');
-            console.log(err);
-          } else {
-            data = JSON.parse(data);
-            if (data.StatusCode === 0) {
-              console.log('飞书发送通知消息成功🎉\n');
-            } else {
-              console.log(`${data.msg}\n`);
-            }
-          }
-        } catch (e) {
-          $.logErr(e, resp);
-        } finally {
-          resolve(data);
-        }
-      });
-    } else {
-      resolve();
-    }
-  });
-}
-
 module.exports = {
   sendNotify,
   BARK_PUSH,

sample/notify.py

@@ -62,9 +62,6 @@ push_config = {
 
     'DEER_KEY': '',                     # PushDeer 的 PUSHDEER_KEY
     
-    'CHAT_URL': '',                     # synology chat url
-    'CHAT_TOKEN': '',                   # synology chat token
-  
     'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
     'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
 
@@ -81,10 +78,6 @@ push_config = {
     'TG_PROXY_AUTH': '',                # tg 代理认证参数
     'TG_PROXY_HOST': '',                # tg 机器人的 TG_PROXY_HOST
     'TG_PROXY_PORT': '',                # tg 机器人的 TG_PROXY_PORT
-
-    'AIBOTK_KEY': '',                   # 智能微秘书 个人中心的apikey 文档地址：http://wechat.aibotk.com/docs/about
-    'AIBOTK_TYPE': '',                  # 智能微秘书 发送目标 room 或 contact
-    'AIBOTK_NAME': '',                  # 智能微秘书  发送群名 或者好友昵称和type要对应好
 }
 notify_function = []
 # fmt: on
@@ -288,25 +281,6 @@ def pushdeer(title: str, content: str) -> None:
         print("PushDeer 推送失败！错误信息：", response)
     
 
-def chat(title: str, content: str) -> None:
-    """
-    通过Chat 推送消息
-    """
-    if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
-        print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
-        return
-    print("chat 服务启动")
-    data = 'payload=' + json.dumps({'text': title + '\n' + content})
-    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
-    response = requests.post(url, data=data)
-    
-    if response.status_code == 200:
-        print("Chat 推送成功！")
-    else:
-        print("Chat 推送失败！错误信息：", response)    
-
-        
-        
 def pushplus_bot(title: str, content: str) -> None:
     """
     通过 push+ 推送消息。
@@ -525,39 +499,6 @@ def telegram_bot(title: str, content: str) -> None:
         print("tg 推送失败！")
 
 
-def aibotk(title: str, content: str) -> None:
-    """
-    使用 智能微秘书 推送消息。
-    """
-    if not push_config.get("AIBOTK_KEY") or not push_config.get("AIBOTK_TYPE") or not push_config.get("AIBOTK_NAME"):
-        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
-        return
-    print("智能微秘书 服务启动")
-
-    if push_config.get("AIBOTK_TYPE") == 'room':
-        url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
-        data = {
-            "apiKey": push_config.get("AIBOTK_KEY"),
-            "roomName": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
-        }
-    else:
-        url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
-        data = {
-            "apiKey": push_config.get("AIBOTK_KEY"),
-            "name": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
-        }
-    body = json.dumps(data).encode(encoding="utf-8")
-    headers = {"Content-Type": "application/json"}
-    response = requests.post(url=url, data=body, headers=headers).json()
-    print(response)
-    if response["code"] == 0:
-        print("智能微秘书 推送成功！")
-    else:
-        print(f'智能微秘书 推送失败！{response["error"]}')
-
-
 def one() -> str:
     """
     获取一条一言。
@@ -586,8 +527,6 @@ 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"):
@@ -598,8 +537,6 @@ if push_config.get("QYWX_KEY"):
     notify_function.append(wecom_bot)
 if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
     notify_function.append(telegram_bot)
-if push_config.get("AIBOTK_KEY") and push_config.get("AIBOTK_TYPE") and push_config.get("AIBOTK_NAME"):
-    notify_function.append(aibotk)    
 
 
 def send(title: str, content: str) -> None:

shell/api.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 get_token() {
-  token=$(cat $file_auth_token | jq -r .value)
+    token=$(cat $file_auth_user | jq -r .token)
 }
 
 add_cron_api() {
@@ -17,7 +17,7 @@ add_cron_api() {
     fi
 
     local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/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/open/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/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/open/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/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/open/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
             -X 'DELETE' \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \
@@ -130,6 +130,24 @@ 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"
@@ -139,7 +157,7 @@ update_cron() {
     local runningTime="${6:-0}"
     local currentTimeStamp=$(date +%s)
     local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons/status?t=$currentTimeStamp" \
             -X 'PUT' \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \
@@ -154,7 +172,7 @@ update_cron() {
     code=$(echo $api | jq -r .code)
     message=$(echo $api | jq -r .message)
     if [[ $code != 200 ]]; then
-    echo -e "\n## 更新任务状态失败(${message})\n" >>$dir_log/$log_path
+        echo -e "\n## 更新任务状态失败(${message})\n" >> $log_path
     fi
 }
 
@@ -163,7 +181,7 @@ notify_api() {
     local content=$2
     local currentTimeStamp=$(date +%s)
     local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/system/notify?t=$currentTimeStamp" \
             -X 'PUT' \
             -H "Accept: application/json" \
             -H "Authorization: Bearer $token" \

shell/bot.sh

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

shell/check.sh

@@ -31,7 +31,6 @@ 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"
 }
 
@@ -89,10 +88,6 @@ 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/otask.sh

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

shell/share.sh

@@ -14,6 +14,7 @@ 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
 
@@ -24,7 +25,6 @@ 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,10 +52,12 @@ list_own_drop=$dir_list_tmp/own_drop.list
 link_name=(
     task
     ql
+    notify
 )
 original_name=(
     task.sh
     update.sh
+    notify.sh
 )
 
 init_env() {
@@ -67,7 +69,6 @@ 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"}
@@ -78,10 +79,6 @@ import_config() {
     else
         default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
     fi
-
-  cpu_warn=${CpuWarn:-80}
-  mem_warn=${MemoryWarn:-80}
-  disk_warn=${DiskWarn:-90}
 }
 
 set_proxy() {
@@ -104,7 +101,7 @@ make_dir() {
 }
 
 detect_termux() {
-  if [[ $PATH == *com.termux* ]]; then
+    if [[ ${ANDROID_RUNTIME_ROOT}${ANDROID_ROOT} ]] || [[ $PATH == *com.termux* ]]; then
         is_termux=1
     else
         is_termux=0
@@ -249,13 +246,15 @@ fix_config() {
 }
 
 npm_install_sub() {
+    set_proxy
     if [ $is_termux -eq 1 ]; then
-    npm install --production --no-bin-links
+        npm install --production --no-bin-links --registry=https://registry.npm.taobao.org || npm install --production --no-bin-links
     elif ! type pnpm &>/dev/null; then
-    npm install --production
+        npm install --production --registry=https://registry.npm.taobao.org || npm install --production
     else
-    pnpm install --loglevel error --production
+        pnpm install --loglevel error --production --registry=https://registry.npm.taobao.org || pnpm install --production --loglevel error
     fi
+    unset_proxy
 }
 
 npm_install_1() {
@@ -353,8 +352,8 @@ reset_branch() {
     local branch="$1"
     if [[ $branch ]]; then
         part_cmd="origin/${branch}"
-    git checkout -B "$branch" &>/dev/null
+        git checkout -B "$branch"
-    git branch --set-upstream-to=$part_cmd $branch &>/dev/null
+        git branch --set-upstream-to=$part_cmd $branch
     fi
     git reset --hard $part_cmd &>/dev/null
 }
@@ -381,109 +380,10 @@ 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
-}
-
-patch_version() {
-  if [[ $PipMirror ]]; then
-    pip3 config set global.index-url $PipMirror
-  fi
-  if [[ $NpmMirror ]]; then
-    npm config set registry $NpmMirror
-  fi
-
-  # 兼容pnpm@7
-  pnpm setup &>/dev/null
-  source ~/.bashrc
-  pnpm install -g &>/dev/null
-
-  if [[ -f "$dir_root/db/cookie.db" ]]; then
-    echo -e "检测到旧的db文件，拷贝为新db...\n"
-    mv $dir_root/db/cookie.db $dir_root/db/env.db
-    rm -rf $dir_root/db/cookie.db
-    echo
-  fi
-
-  if ! type ts-node &>/dev/null; then
-    pnpm add -g ts-node typescript tslib
-  fi
-
-  git config --global pull.rebase false
-
-  cp -f $dir_root/.env.example $dir_root/.env
-
-  if [[ -d "$dir_root/db" ]]; then
-    echo -e "检测到旧的db目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
-    echo
-  fi
-
-  if [[ -d "$dir_root/scripts" ]]; then
-    echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-    cp -rf $dir_root/scripts $dir_root/data
-    echo
-  fi
-
-  if [[ -d "$dir_root/log" ]]; then
-    echo -e "检测到旧的log目录，拷贝到data目录...\n"
-    cp -rf $dir_root/log $dir_root/data
-    echo
-  fi
-
-  if [[ -d "$dir_root/config" ]]; then
-    echo -e "检测到旧的config目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
-    echo
-  fi
-}
-
 init_env
 detect_termux
 detect_macos
 define_cmd
 fix_config
 
-import_config $1 2>$task_error_log_path
+import_config $1 >$task_error_log_path 2>&1

shell/task.sh

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

shell/update.sh

@@ -12,16 +12,14 @@ diff_cron() {
     local list_task="$2"
     local list_add="$3"
     local list_drop="$4"
-  if [[ -s $list_task ]] && [[ -s $list_scripts ]]; then
+    if [[ -s $list_task ]]; then
         grep -vwf $list_task $list_scripts >$list_add
-    grep -vwf $list_scripts $list_task >$list_drop
+    elif [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
-  fi
-
-  if [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
         cp -f $list_scripts $list_add
     fi
-
+    if [[ -s $list_scripts ]]; then
-  if [[ ! -s $list_scripts ]] && [[ -s $list_task ]]; then
+        grep -vwf $list_scripts $list_task >$list_drop
+    else
         cp -f $list_task $list_drop
     fi
 }
@@ -230,7 +228,7 @@ run_extra_shell() {
 
 ## 脚本用法
 usage() {
-  echo -e "ql命令使用方法："
+    echo -e "本脚本用法："
     echo -e "1. $cmd_update update                                                                  # 更新并重启青龙"
     echo -e "2. $cmd_update extra                                                                   # 运行自定义脚本"
     echo -e "3. $cmd_update raw <fileurl>                                                           # 更新单个脚本文件"
@@ -244,10 +242,9 @@ usage() {
 
 ## 更新qinglong
 update_qinglong() {
-  patch_version &>/dev/null
+    patch_version
-
-  export isFirstStartServer=false
 
+    local no_restart="$1"
     local all_branch=$(git branch -a)
     local primary_branch="master"
     if [[ "${all_branch}" =~ "${current_branch}" ]]; then
@@ -265,16 +262,10 @@ update_qinglong() {
 
         [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
         [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root
-
-    update_qinglong_static "$1" "$primary_branch"
     else
-    echo -e "\n更新青龙源文件失败，请检查网络...\n"
+        echo -e "\n更新青龙源文件失败，请检查原因...\n"
     fi
-}
 
-update_qinglong_static() {
-  local no_restart="$1"
-  local primary_branch="$2"
     local url="https://github.com/whyour/qinglong-static.git"
     if [[ -d ${ql_static_repo}/.git ]]; then
         reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
@@ -296,8 +287,56 @@ update_qinglong_static() {
             reload_pm2
         fi
     else
-    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+        echo -e "\n更新青龙静态资源失败，请检查原因...\n"
     fi
+
+}
+
+patch_version() {
+    if [[ -f "$dir_root/db/cookie.db" ]]; then
+        echo -e "检测到旧的db文件，拷贝为新db...\n"
+        mv $dir_root/db/cookie.db $dir_root/db/env.db
+        rm -rf $dir_root/db/cookie.db
+        echo
+    fi
+
+    if ! type ts-node &>/dev/null; then
+        pnpm i -g ts-node typescript tslib
+    fi
+
+    # 兼容pnpm@7 
+    npm i -g pnpm
+    pnpm setup
+    source ~/.bashrc
+
+    git config --global pull.rebase false
+
+    cp -f $dir_root/.env.example $dir_root/.env
+
+    if [[ -d "$dir_root/db" ]]; then
+        echo -e "检测到旧的db目录，拷贝到data目录...\n"
+        cp -rf $dir_root/config $dir_root/data
+        echo
+    fi
+
+    if [[ -d "$dir_root/scripts" ]]; then
+        echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
+        cp -rf $dir_root/scripts $dir_root/data
+        echo
+    fi
+
+    if [[ -d "$dir_root/log" ]]; then
+        echo -e "检测到旧的log目录，拷贝到data目录...\n"
+        cp -rf $dir_root/log $dir_root/data
+        echo
+    fi
+
+    if [[ -d "$dir_root/config" ]]; then
+        echo -e "检测到旧的config目录，拷贝到data目录...\n"
+        cp -rf $dir_root/config $dir_root/data
+        echo
+    fi
+
 }
 
 ## 对比脚本
@@ -348,9 +387,6 @@ 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
@@ -416,7 +452,8 @@ get_uniq_path() {
 main() {
     ## for ql update
     show_log="false"
-  while getopts ":l" opt; do
+    while getopts ":l" opt
+    do
         case $opt in
             l)
                 show_log="true"
@@ -432,95 +469,80 @@ main() {
     local p5=$5
     local p6=$6
     local p7=$7
-  local log_dir="${p1}"
-  make_dir "$dir_log/$log_dir"
     local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-  local log_path="${log_dir}/${log_time}.log"
+    local log_path="$dir_log/update/${log_time}_$p1.log"
-  local file_path="$dir_log/$log_path"
+    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-
-  cmd=">> $file_path 2>&1"
-  [[ "$show_log" == "true" ]] && cmd=""
-
-  local time_format="%Y-%m-%d %H:%M:%S"
-  local time=$(date "+$time_format")
-  local begin_timestamp=$(format_timestamp "$time_format" "$time")
-  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
-
-  local begin_time=$(format_time "$time_format" "$time")
-  eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-
-  if [[ -s $task_error_log_path ]]; then
-    eval cat $task_error_log_path $cmd
-    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
-    eval echo $cmd
-  fi
-
-  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
-    eval echo -e "请移除 -l 参数" $cmd
-    exit 1
-  fi
 
     case $p1 in
     update)
+        cmd=">> $log_path 2>&1"
+        [[ "$show_log" == "true" ]] && cmd=""
+        eval echo -e "## 开始执行... $begin_time\n" $cmd
+        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
         eval update_qinglong "$2" $cmd
         ;;
     extra)
-    eval run_extra_shell $cmd
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
+        run_extra_shell >>$log_path
         ;;
     repo)
+        get_user_info
         get_uniq_path "$p2" "$p6"
         if [[ -n $p2 ]]; then
             update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7"
         else
-      eval echo -e "命令输入错误...\\\n" $cmd
+            echo -e "命令输入错误...\n"
-      eval usage $cmd
+            usage
         fi
         ;;
     raw)
+        get_user_info
         get_uniq_path "$p2"
         if [[ -n $p2 ]]; then
             update_raw "$p2"
         else
-      eval echo -e "命令输入错误...\\\n" $cmd
+            echo -e "命令输入错误...\n"
-      eval usage $cmd
+            usage
         fi
         ;;
     rmlog)
-    eval . $dir_shell/rmlog.sh "$p2" $cmd
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
+        . $dir_shell/rmlog.sh "$p2" >>$log_path
         ;;
     bot)
-    eval . $dir_shell/bot.sh $cmd
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
+        . $dir_shell/bot.sh >>$log_path
         ;;
     check)
-    eval . $dir_shell/check.sh $cmd
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
+        . $dir_shell/check.sh >>$log_path
         ;;
     resetlet)
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
         auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
+        echo -e "重置登录错误次数成功 \n $auth_value" >>$log_path
         echo "$auth_value" >$file_auth_user
-    echo -e "重置登录错误次数成功" $cmd
         ;;
     resettfa)
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
         auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
+        echo -e "禁用两步验证成功 \n $auth_value" >>$log_path
         echo "$auth_value" >$file_auth_user
-    eval echo -e "禁用两步验证成功" $cmd
         ;;
     *)
-    eval echo -e "命令输入错误...\\\n" $cmd
+        echo -e "命令输入错误...\n"
-    eval usage $cmd
+        usage
         ;;
     esac
-
+    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-  local etime=$(date "+$time_format")
+    local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-  local end_time=$(format_time "$time_format" "$etime")
+    if [[ $p1 != "repo" ]] && [[ $p1 != "raw" ]]; then
-  local end_timestamp=$(format_timestamp "$time_format" "$etime")
+        echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >>$log_path
-  local diff_time=$(($end_timestamp - $begin_timestamp))
+        cat $log_path
-  eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-
-  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-  eval echo -e "\\\n　　　　　　　　　　" $cmd
-
-  if [[ -f $file_path ]]; then
-    cat $file_path
     fi
 }
 

src/components/tag.tsx

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

src/hooks/useFilterTreeData.ts

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

src/hooks/useTableScrollHeight.ts

@@ -1,16 +0,0 @@
-import { MutableRefObject, useLayoutEffect, useState } from 'react';
-import useResizeObserver from '@react-hook/resize-observer'
-import { getTableScroll } from '@/utils';
-
-export default <T extends HTMLElement>(target: MutableRefObject<T>, extraHeight?: number) => {
-  const [height, setHeight] = useState<number>()
-
-  useResizeObserver(target, (entry) => {
-    let _targe = entry.target as any
-    if (!_targe.classList.contains('ant-table-wrapper')) {
-      _targe = entry.target.querySelector('.ant-table-wrapper')
-    }
-    setHeight(getTableScroll({ extraHeight, target: _targe as HTMLElement }))
-  })
-  return height
-}

src/layouts/defaultProps.tsx

@@ -68,18 +68,18 @@ export default {
         icon: <IconFont type="ql-icon-dependence" />,
         component: '@/pages/dependence/index',
       },
-      {
-        path: '/log',
-        name: '日志管理',
-        icon: <IconFont type="ql-icon-log" />,
-        component: '@/pages/log/index',
-      },
       {
         path: '/diff',
         name: '对比工具',
         icon: <IconFont type="ql-icon-diff" />,
         component: '@/pages/diff/index',
       },
+      {
+        path: '/log',
+        name: '任务日志',
+        icon: <IconFont type="ql-icon-log" />,
+        component: '@/pages/log/index',
+      },
       {
         path: '/setting',
         name: '系统设置',

src/layouts/index.less

@@ -56,13 +56,7 @@
     overflow: auto;
     height: 100%;
     background-color: @component-background;
-    padding: 12px;
+    padding: 16px;
-  }
-}
-
-.ql-container-wrapper-has-tab {
-  .ant-pro-grid-content.wide .ant-pro-page-container-children-content {
-    padding-top: 0;
   }
 }
 
@@ -142,7 +136,7 @@
     flex: 1;
 
     .ant-pro-grid-content-children {
-      height: 100%;
+      height: calc(100% - 36px);
 
       > div,
       .log-container,
@@ -161,7 +155,7 @@
     &.env-wrapper,
     &.config-wrapper {
       .CodeMirror {
-        width: calc(100vw - 24px);
+        width: calc(100vw - 80px);
       }
     }
   }
@@ -179,8 +173,8 @@
 
 .Resizer {
   background: @component-background;
-  opacity: 0.8;
+  opacity: 0.2;
-  z-index: 100;
+  z-index: 1;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
@@ -243,6 +237,7 @@
   font-size: 13px;
 }
 
+[data-dark='true'] {
   /* Change autocomplete styles in WebKit */
   input:-webkit-autofill,
   input:-webkit-autofill:hover,
@@ -253,10 +248,11 @@ textarea:-webkit-autofill:focus,
   select:-webkit-autofill,
   select:-webkit-autofill:hover,
   select:-webkit-autofill:focus {
-  border: none;
+    border: 1px solid @border-color-base;
     box-shadow: none;
     transition: background-color 5000s ease-in-out 0s;
     -webkit-text-fill-color: @text-color;
+    caret-color: #e8e6f3 !important;
   }
 
   ::placeholder {
@@ -266,25 +262,18 @@ select:-webkit-autofill:focus {
   .ant-select-selection-placeholder {
     opacity: 0.5 !important;
   }
-
-.ant-pro-basicLayout-content {
-  margin: 12px;
-
-  .ant-pro-page-container {
-    margin: -12px;
-  }
-
-  .ant-pro-page-container-warp .ant-page-header {
-    border-bottom: 1px solid #eee;
 }
 
 .ant-pro-page-container-children-content {
-    margin: 0;
+  margin: 18px 18px 18px;
-  }
 }
 
-.ant-pro-global-header {
+.ant-pro-basicLayout-content {
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.03);
+  margin: 18px;
+
+  .ant-pro-page-container {
+    margin: -18px -18px -18px;
+  }
 }
 
 .ant-menu-item.ant-pro-sider-collapsed-button {
@@ -342,8 +331,3 @@ select:-webkit-autofill:focus {
     width: auto !important;
   }
 }
-
-pre {
-  word-break: break-all !important;
-  white-space: break-spaces !important;
-}

src/layouts/index.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState, useRef } from 'react';
 import ProLayout, { PageLoading } from '@ant-design/pro-layout';
 import * as DarkReader from '@umijs/ssr-darkreader';
 import defaultProps from './defaultProps';
-import { Link, history, Outlet, useLocation } from '@umijs/max';
+import { Link, history } from 'umi';
 import {
   LogoutOutlined,
   MenuFoldOutlined,
@@ -15,56 +15,21 @@ import './index.less';
 import vhCheck from 'vh-check';
 import { version, changeLogLink, changeLog } from '../version';
 import { useCtx, useTheme } from '@/utils/hooks';
-import {
+import { message, Badge, Modal, Avatar, Dropdown, Menu, Image } from 'antd';
-  message,
-  Badge,
-  Modal,
-  Avatar,
-  Dropdown,
-  Menu,
-  Image,
-  Popover,
-  Descriptions,
-  Tooltip,
-} from 'antd';
 // @ts-ignore
 import SockJS from 'sockjs-client';
 import * as Sentry from '@sentry/react';
 import { init } from '../utils/init';
-import 'codemirror/mode/javascript/javascript';
-import 'codemirror/mode/python/python';
-import 'codemirror/mode/shell/shell';
 
-export interface SharedContext {
+export default function (props: any) {
-  headerStyle: React.CSSProperties;
-  isPhone: boolean;
-  theme: 'vs' | 'vs-dark';
-  user: any;
-  reloadUser: (needLoading?: boolean) => void;
-  reloadTheme: () => void;
-  socketMessage: any;
-  systemInfo: TSystemInfo;
-}
-
-interface TSystemInfo {
-  branch: 'develop' | 'master';
-  isInitialized: boolean;
-  lastCommitId: string;
-  lastCommitTime: string;
-  version: string;
-}
-
-export default function () {
-  const location = useLocation();
   const ctx = useCtx();
   const { theme, reloadTheme } = useTheme();
   const [user, setUser] = useState<any>({});
   const [loading, setLoading] = useState<boolean>(true);
-  const [systemInfo, setSystemInfo] = useState<TSystemInfo>();
+  const [systemInfo, setSystemInfo] = useState<{ isInitialized: boolean }>();
   const ws = useRef<any>(null);
   const [socketMessage, setSocketMessage] = useState<any>();
   const [collapsed, setCollapsed] = useState(false);
-  const [initLoading, setInitLoading] = useState<boolean>(true);
   const {
     enable: enableDarkMode,
     disable: disableDarkMode,
@@ -88,15 +53,17 @@ export default function () {
           setSystemInfo(data);
           if (!data.isInitialized) {
             history.push('/initialization');
+            setLoading(false);
           } else {
             getUser();
           }
+        } else {
+          message.error(data);
         }
       })
       .catch((error) => {
         console.log(error);
-      })
+      });
-      .finally(() => setInitLoading(false));
   };
 
   const getUser = (needLoading = true) => {
@@ -106,9 +73,11 @@ export default function () {
       .then(({ code, data }) => {
         if (code === 200 && data.username) {
           setUser(data);
-          if (location.pathname === '/') {
+          if (props.location.pathname === '/') {
             history.push('/crontab');
           }
+        } else {
+          message.error(data);
         }
         needLoading && setLoading(false);
       })
@@ -125,7 +94,7 @@ export default function () {
     if (systemInfo && systemInfo.isInitialized && !user) {
       getUser();
     }
-  }, [location.pathname]);
+  }, [props.location.pathname]);
 
   useEffect(() => {
     if (!systemInfo) {
@@ -167,11 +136,9 @@ export default function () {
   }, []);
 
   useEffect(() => {
-    if (!user || !user.username) return;
+    if (!user) return;
     ws.current = new SockJS(
-      `${window.location.origin}/api/ws?token=${localStorage.getItem(
+      `${location.origin}/api/ws?token=${localStorage.getItem(config.authKey)}`,
-        config.authKey,
-      )}`,
     );
 
     ws.current.onmessage = (e: any) => {
@@ -179,9 +146,9 @@ export default function () {
         const data = JSON.parse(e.data);
         if (data.type === 'ping') {
           if (data && data.message === 'hanhh') {
-            console.log('WS connection succeeded !!!');
+            console.log('websocket连接成功', e);
           } else {
-            console.log('WS connection Failed !!!', e);
+            console.log('websocket连接失败', e);
           }
         }
         setSocketMessage(data);
@@ -216,31 +183,30 @@ export default function () {
     };
   }, []);
 
-  if (initLoading) {
+  if (
-    return <PageLoading />;
+    ['/login', '/initialization', '/error'].includes(props.location.pathname)
-  }
+  ) {
-
-  if (['/login', '/initialization', '/error'].includes(location.pathname)) {
     document.title = `${
-      (config.documentTitleMap as any)[location.pathname]
+      (config.documentTitleMap as any)[props.location.pathname]
     } - 控制面板`;
-    if (systemInfo?.isInitialized && location.pathname === '/initialization') {
+    if (
+      systemInfo?.isInitialized &&
+      props.location.pathname === '/initialization'
+    ) {
       history.push('/crontab');
     }
 
-    if (systemInfo || location.pathname === '/error') {
+    if (systemInfo || props.location.pathname === '/error') {
-      return (
+      return React.Children.map(props.children, (child) => {
-        <Outlet
+        return React.cloneElement(child, {
-          context={{
           ...ctx,
           theme,
           user,
           reloadUser,
           reloadTheme,
           ws: ws.current,
-          }}
+        });
-        />
+      });
-      );
     }
   }
 
@@ -261,10 +227,10 @@ export default function () {
     <PageLoading />
   ) : (
     <ProLayout
-      selectedKeys={[location.pathname]}
+      selectedKeys={[props.location.pathname]}
       loading={loading}
       ErrorBoundary={Sentry.ErrorBoundary}
-      logo={<Image preview={false} src="https://qn.whyour.cn/logo.png" />}
+      logo={<Image preview={false} src="http://qn.whyour.cn/logo.png" />}
       title={
         <>
           <span style={{ fontSize: 16 }}>控制面板</span>
@@ -276,10 +242,6 @@ export default function () {
               e.stopPropagation();
             }}
           >
-            <Tooltip
-              title={systemInfo?.branch === 'develop' ? '开发版' : '正式版'}
-            >
-              <Badge size="small" dot={systemInfo?.branch === 'develop'}>
             <span
               style={{
                 fontSize: isFirefox ? 9 : 12,
@@ -291,8 +253,6 @@ export default function () {
             >
               v{version}
             </span>
-              </Badge>
-            </Tooltip>
           </a>
         </>
       }
@@ -322,7 +282,7 @@ export default function () {
                 shape="square"
                 size="small"
                 icon={<UserOutlined />}
-                src={user.avatar ? `/api/static/${user.avatar}` : ''}
+                src={`/api/static/${user.avatar}`}
               />
               <span style={{ marginLeft: 5 }}>{user.username}</span>
             </span>
@@ -344,7 +304,7 @@ export default function () {
                   shape="square"
                   size="small"
                   icon={<UserOutlined />}
-                  src={user.avatar ? `/api/static/${user.avatar}` : ''}
+                  src={`/api/static/${user.avatar}`}
                 />
                 <span style={{ marginLeft: 5 }}>{user.username}</span>
               </span>
@@ -360,17 +320,16 @@ export default function () {
       )}
       {...defaultProps}
     >
-      <Outlet
+      {React.Children.map(props.children, (child) => {
-        context={{
+        return React.cloneElement(child, {
           ...ctx,
           theme,
           user,
           reloadUser,
           reloadTheme,
           socketMessage,
-          systemInfo,
+        });
-        }}
+      })}
-      />
     </ProLayout>
   );
 }

src/pages/config/index.tsx

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

src/pages/crontab/detail.tsx

@@ -20,7 +20,6 @@ import {
   FileOutlined,
   PlayCircleOutlined,
   PauseCircleOutlined,
-  FullscreenOutlined,
 } from '@ant-design/icons';
 import { CrontabStatus } from './index';
 import { diffTime } from '@/utils/date';
@@ -103,10 +102,11 @@ const CronDetailModal = ({
           fontSize: 12,
           lineNumbersMinChars: 3,
           fontFamily: 'Source Code Pro',
+          folding: false,
           glyphMargin: false,
           wordWrap: 'on',
         }}
-        onMount={(editor, monaco) => {
+        onMount={(editor) => {
           editorRef.current = editor;
         }}
       />
@@ -122,11 +122,9 @@ const CronDetailModal = ({
       .get(
         `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
       )
-      .then(({ code, data }) => {
+      .then((data) => {
-        if (code === 200) {
+        setLog(data.data);
-          setLog(data);
         setIsLogModalVisible(true);
-        }
       });
   };
 
@@ -138,9 +136,9 @@ const CronDetailModal = ({
     setLoading(true);
     request
       .get(`${config.apiPrefix}crons/${cron.id}/logs`)
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
+        if (data.code === 200) {
-          setLogs(data);
+          setLogs(data.data);
         }
       })
       .finally(() => setLoading(false));
@@ -154,22 +152,16 @@ const CronDetailModal = ({
         cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
       }
 
-      let p: string, s: string;
+      let [p, s] = cmd[1].split('/');
-      let index = cmd[1].lastIndexOf('/');
+      if (!s) {
-      if (index >= 0) {
+        s = p;
-        s = cmd[1].slice(index + 1);
-        p = cmd[1].slice(0, index);
-      } else {
-        s = cmd[1];
         p = '';
       }
       setScriptInfo({ parent: p, filename: s });
       request
         .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
-        .then(({ code, data }) => {
+        .then((data) => {
-          if (code === 200) {
+          setValue(data.data);
-            setValue(data);
-          }
         });
     } else {
       setValidTabs([validTabs[0]]);
@@ -201,10 +193,12 @@ const CronDetailModal = ({
                 content,
               },
             })
-            .then(({ code, data }) => {
+            .then((_data: any) => {
-              if (code === 200) {
+              if (_data.code === 200) {
                 setValue(content);
                 message.success(`保存成功`);
+              } else {
+                message.error(_data);
               }
               resolve(null);
             })
@@ -232,12 +226,14 @@ const CronDetailModal = ({
       onOk() {
         request
           .put(`${config.apiPrefix}crons/run`, { data: [currentCron.id] })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               setCurrentCron({ ...currentCron, status: CrontabStatus.running });
               setTimeout(() => {
                 getLogs();
               }, 1000);
+            } else {
+              message.error(data);
             }
           });
       },
@@ -262,9 +258,11 @@ const CronDetailModal = ({
       onOk() {
         request
           .put(`${config.apiPrefix}crons/stop`, { data: [currentCron.id] })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               setCurrentCron({ ...currentCron, status: CrontabStatus.idle });
+            } else {
+              message.error(data);
             }
           });
       },
@@ -297,12 +295,14 @@ const CronDetailModal = ({
               data: [currentCron.id],
             },
           )
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               setCurrentCron({
                 ...currentCron,
                 isDisabled: currentCron.isDisabled === 1 ? 0 : 1,
               });
+            } else {
+              message.error(data);
             }
           });
       },
@@ -335,12 +335,14 @@ const CronDetailModal = ({
               data: [currentCron.id],
             },
           )
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               setCurrentCron({
                 ...currentCron,
                 isPinned: currentCron.isPinned === 1 ? 0 : 1,
               });
+            } else {
+              message.error(data);
             }
           });
       },
@@ -350,11 +352,6 @@ const CronDetailModal = ({
     });
   };
 
-  const fullscreen = () => {
-    const editorElement = editorRef.current._domElement as HTMLElement;
-    editorElement.parentElement?.requestFullscreen();
-  };
-
   useEffect(() => {
     if (cron && cron.id) {
       setCurrentCron(cron);
@@ -375,7 +372,7 @@ const CronDetailModal = ({
             {currentCron.labels?.length > 0 &&
               currentCron.labels[0] !== '' &&
               currentCron.labels?.map((label: string, i: number) => (
-                <Tag key={label} color="blue" style={{ marginRight: 5 }}>
+                <Tag color="blue" style={{ marginRight: 5 }}>
                   {label}
                 </Tag>
               ))}
@@ -438,7 +435,7 @@ const CronDetailModal = ({
         </div>
       }
       centered
-      open={visible}
+      visible={visible}
       forceRender
       footer={false}
       onCancel={() => handleCancel()}
@@ -532,7 +529,6 @@ const CronDetailModal = ({
           }}
           tabBarExtraContent={
             activeTabKey === 'script' && (
-              <>
               <Button
                 type="primary"
                 style={{ marginRight: 8 }}
@@ -540,12 +536,6 @@ const CronDetailModal = ({
               >
                 保存
               </Button>
-                <Button
-                  type="primary"
-                  icon={<FullscreenOutlined />}
-                  onClick={fullscreen}
-                />
-              </>
             )
           }
         >

src/pages/crontab/index.less

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { PureComponent, Fragment, useState, useEffect } from 'react';
 import {
   Button,
   message,
@@ -12,8 +12,6 @@ import {
   Typography,
   Input,
   Popover,
-  Tabs,
-  TablePaginationConfig,
 } from 'antd';
 import {
   ClockCircleOutlined,
@@ -29,11 +27,6 @@ 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';
@@ -43,13 +36,9 @@ import CronLogModal from './logModal';
 import CronDetailModal from './detail';
 import cron_parser from 'cron-parser';
 import { diffTime } from '@/utils/date';
-import { history, useOutletContext } from '@umijs/max';
+import { getTableScroll } from '@/utils/index';
+import { history } from 'umi';
 import './index.less';
-import ViewCreateModal from './viewCreateModal';
-import ViewManageModal from './viewManageModal';
-import { FilterValue, SorterResult } from 'antd/lib/table/interface';
-import { SharedContext } from '@/layouts';
-import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -81,8 +70,7 @@ enum OperationPath {
   'unpin',
 }
 
-const Crontab = () => {
+const Crontab = ({ headerStyle, isPhone, theme }: any) => {
-  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
   const columns: any = [
     {
       title: '名称',
@@ -94,11 +82,10 @@ const Crontab = () => {
         <>
           <a
             onClick={() => {
-              setDetailCron(record);
+              goToScriptManager(record);
-              setIsDetailModalVisible(true);
             }}
           >
-            {record.labels?.length > 0 && record.labels[0] !== '' && false ? (
+            {record.labels?.length > 0 && record.labels[0] !== '' ? (
               <Popover
                 placement="right"
                 trigger={isPhone ? 'click' : 'hover'}
@@ -107,12 +94,10 @@ const Crontab = () => {
                     {record.labels?.map((label: string) => (
                       <Tag
                         color="blue"
-                        key={label}
                         style={{ cursor: 'point' }}
                         onClick={(e) => {
                           e.stopPropagation();
                           setSearchValue(`label:${label}`);
-                          setSearchText(`label:${label}`);
                         }}
                       >
                         <a>{label}</a>
@@ -137,14 +122,15 @@ const Crontab = () => {
         </>
       ),
       sorter: {
-        compare: (a: any, b: any) => a?.name?.localeCompare(b?.name),
+        compare: (a: any, b: any) => a.name.localeCompare(b.name),
+        multiple: 2,
       },
     },
     {
       title: '命令',
       dataIndex: 'command',
       key: 'command',
-      width: 300,
+      width: 250,
       align: 'center' as const,
       render: (text: string, record: any) => {
         return (
@@ -155,19 +141,14 @@ const Crontab = () => {
               textAlign: 'left',
             }}
             ellipsis={{ tooltip: text, rows: 2 }}
-          >
-            <a
-              onClick={() => {
-                goToScriptManager(record);
-              }}
           >
             {text}
-            </a>
           </Paragraph>
         );
       },
       sorter: {
         compare: (a: any, b: any) => a.command.localeCompare(b.command),
+        multiple: 3,
       },
     },
     {
@@ -178,13 +159,12 @@ const Crontab = () => {
       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) => {
@@ -214,8 +194,6 @@ const Crontab = () => {
       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;
@@ -368,26 +346,12 @@ const Crontab = () => {
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
   const [logCron, setLogCron] = useState<any>();
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
-  const [pageConf, setPageConf] = useState<{
+  const [currentPage, setCurrentPage] = useState(1);
-    page: number;
+  const [pageSize, setPageSize] = useState(20);
-    size: number;
+  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
-    sorter: any;
-    filters: any;
-  }>({} as any);
-  const [viewConf, setViewConf] = useState<any>();
   const [isDetailModalVisible, setIsDetailModalVisible] = useState(false);
   const [detailCron, setDetailCron] = useState<any>();
   const [searchValue, setSearchValue] = useState('');
-  const [total, setTotal] = useState<number>();
-  const [isCreateViewModalVisible, setIsCreateViewModalVisible] =
-    useState(false);
-  const [isViewManageModalVisible, setIsViewManageModalVisible] =
-    useState(false);
-  const [cronViews, setCronViews] = useState<any[]>([]);
-  const [enabledCronViews, setEnabledCronViews] = useState<any[]>([]);
-  const [moreMenuActive, setMoreMenuActive] = useState(false);
-  const tableRef = useRef<any>();
-  const tableScrollHeight = useTableScrollHeight(tableRef)
 
   const goToScriptManager = (record: any) => {
     const cmd = record.command.split(' ') as string[];
@@ -396,13 +360,9 @@ const Crontab = () => {
         cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
       }
 
-      let p: string, s: string;
+      let [p, s] = cmd[1].split('/');
-      let index = cmd[1].lastIndexOf('/');
+      if (!s) {
-      if (index >= 0) {
+        s = p;
-        s = cmd[1].slice(index + 1);
-        p = cmd[1].slice(0, index);
-      } else {
-        s = cmd[1];
         p = '';
       }
       history.push(`/script?p=${p}&s=${s}`);
@@ -413,30 +373,27 @@ const Crontab = () => {
 
   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(url)
+      .get(`${config.apiPrefix}crons?searchValue=${searchText}`)
-      .then(({ code, data: _data }) => {
+      .then((data: any) => {
-        if (code === 200) {
-          const { data, total } = _data;
         setValue(
-            data.map((x) => {
+          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
@@ -446,8 +403,7 @@ const Crontab = () => {
               };
             }),
         );
-          setTotal(total);
+        setCurrentPage(1);
-        }
       })
       .finally(() => setLoading(false));
   };
@@ -477,8 +433,8 @@ const Crontab = () => {
       onOk() {
         request
           .delete(`${config.apiPrefix}crons`, { data: [record.id] })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               message.success('删除成功');
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
@@ -486,6 +442,8 @@ const Crontab = () => {
                 result.splice(i, 1);
                 setValue(result);
               }
+            } else {
+              message.error(data);
             }
           });
       },
@@ -510,8 +468,8 @@ const Crontab = () => {
       onOk() {
         request
           .put(`${config.apiPrefix}crons/run`, { data: [record.id] })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
               if (i !== -1) {
@@ -521,6 +479,8 @@ const Crontab = () => {
                 });
                 setValue(result);
               }
+            } else {
+              message.error(data);
             }
           });
       },
@@ -545,8 +505,8 @@ const Crontab = () => {
       onOk() {
         request
           .put(`${config.apiPrefix}crons/stop`, { data: [record.id] })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
               if (i !== -1) {
@@ -557,6 +517,8 @@ const Crontab = () => {
                 });
                 setValue(result);
               }
+            } else {
+              message.error(data);
             }
           });
       },
@@ -582,14 +544,15 @@ const Crontab = () => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}crons/${record.isDisabled === 1 ? 'enable' : 'disable'
+            `${config.apiPrefix}crons/${
+              record.isDisabled === 1 ? 'enable' : 'disable'
             }`,
             {
               data: [record.id],
             },
           )
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               const newStatus = record.isDisabled === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
@@ -600,6 +563,8 @@ const Crontab = () => {
                 });
                 setValue(result);
               }
+            } else {
+              message.error(data);
             }
           });
       },
@@ -625,14 +590,15 @@ const Crontab = () => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}crons/${record.isPinned === 1 ? 'unpin' : 'pin'
+            `${config.apiPrefix}crons/${
+              record.isPinned === 1 ? 'unpin' : 'pin'
             }`,
             {
               data: [record.id],
             },
           )
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               const newStatus = record.isPinned === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
@@ -643,6 +609,8 @@ const Crontab = () => {
                 });
                 setValue(result);
               }
+            } else {
+              message.error(data);
             }
           });
       },
@@ -744,33 +712,42 @@ const Crontab = () => {
   const getCronDetail = (cron: any) => {
     request
       .get(`${config.apiPrefix}crons/${cron.id}`)
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
         const index = value.findIndex((x) => x.id === cron.id);
         const result = [...value];
-          data.nextRunTime = cron_parser
+        data.data.nextRunTime = cron_parser
-            .parseExpression(data.schedule)
+          .parseExpression(data.data.schedule)
           .next()
           .toDate();
         if (index !== -1) {
           result.splice(index, 1, {
             ...cron,
-              ...data,
+            ...data.data,
           });
           setValue(result);
         }
-        }
       })
       .finally(() => setLoading(false));
   };
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
+
+    setTimeout(() => {
+      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
+        setTableScrollHeight(getTableScroll());
+      }
+    });
   };
 
   const rowSelection = {
-    selectedRowKeys: selectedRowIds,
+    selectedRowIds,
     onChange: onSelectChange,
+    selections: [
+      Table.SELECTION_ALL,
+      Table.SELECTION_INVERT,
+      Table.SELECTION_NONE,
+    ],
   };
 
   const delCrons = () => {
@@ -780,11 +757,13 @@ const Crontab = () => {
       onOk() {
         request
           .delete(`${config.apiPrefix}crons`, { data: selectedRowIds })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               message.success('批量删除成功');
               setSelectedRowIds([]);
               getCrons();
+            } else {
+              message.error(data);
             }
           });
       },
@@ -803,9 +782,11 @@ const Crontab = () => {
           .put(`${config.apiPrefix}crons/${OperationPath[operationStatus]}`, {
             data: selectedRowIds,
           })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               getCrons();
+            } else {
+              message.error(data);
             }
           });
       },
@@ -815,19 +796,10 @@ const Crontab = () => {
     });
   };
 
-  const onPageChange = (
+  const onPageChange = (page: number, pageSize: number | undefined) => {
-    pagination: TablePaginationConfig,
+    setCurrentPage(page);
-    filters: Record<string, FilterValue | null>,
+    setPageSize(pageSize as number);
-    sorter: SorterResult<any> | SorterResult<any>[],
+    localStorage.setItem('pageSize', pageSize + '');
-  ) => {
-    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) => {
@@ -842,108 +814,19 @@ const Crontab = () => {
   }, [logCron]);
 
   useEffect(() => {
-    setPageConf({ ...pageConf, page: 1 });
+    getCrons();
   }, [searchText]);
 
   useEffect(() => {
-    if (pageConf.page && pageConf.size) {
+    setPageSize(parseInt(localStorage.getItem('pageSize') || '20'));
-      getCrons();
+    setTimeout(() => {
-    }
+      setTableScrollHeight(getTableScroll());
-  }, [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: {},
     });
-    getCronViews();
   }, []);
 
-  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(({ code, data }) => {
-        if (code === 200) {
-          setCronViews(data);
-          setEnabledCronViews(data.filter((x) => !x.isDisabled));
-        }
-      })
-      .finally(() => {
-        setLoading(false);
-      });
-  };
-
-  const tabClick = (key: string) => {
-    const view = enabledCronViews.find((x) => x.id == key);
-    setSelectedRowIds([]);
-    setPageConf({ ...pageConf, page: 1 });
-    setViewConf(view ? view : null);
-  };
-
   return (
     <PageContainer
-      className="ql-container-wrapper crontab-wrapper ql-container-wrapper-has-tab"
+      className="ql-container-wrapper crontab-wrapper"
       title="定时任务"
       extra={[
         <Search
@@ -964,39 +847,6 @@ const Crontab = () => {
         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}
-        items={[
-          {
-            key: 'all',
-            label: '全部任务',
-          },
-          ...[...enabledCronViews].slice(0, 2).map((x) => ({
-            key: x.id,
-            label: x.name,
-          })),
-        ]}
-      />
-      <div ref={tableRef}>
       {selectedRowIds.length > 0 && (
         <div style={{ marginBottom: 16 }}>
           <Button type="primary" style={{ marginBottom: 5 }} onClick={delCrons}>
@@ -1056,16 +906,23 @@ const Crontab = () => {
       <Table
         columns={columns}
         pagination={{
-            current: pageConf.page,
+          current: currentPage,
-            pageSize: pageConf.size,
+          onChange: onPageChange,
+          pageSize: pageSize,
           showSizeChanger: true,
           simple: isPhone,
-            total,
+          defaultPageSize: 20,
           showTotal: (total: number, range: number[]) =>
             `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
-            pageSizeOptions: [10, 20, 50, 100, 200, 500, total || 10000].sort(
+          pageSizeOptions: [20, 100, 500, 1000] as any,
-              (a, b) => a - b,
+        }}
-            ),
+        onRow={(record) => {
+          return {
+            onClick: (event) => {
+              setDetailCron(record);
+              setIsDetailModalVisible(true);
+            },
+          };
         }}
         dataSource={value}
         rowKey="id"
@@ -1074,9 +931,7 @@ const Crontab = () => {
         loading={loading}
         rowSelection={rowSelection}
         rowClassName={getRowClassName}
-          onChange={onPageChange}
       />
-      </div>
       <CronLogModal
         visible={isLogModalVisible}
         handleCancel={() => {
@@ -1109,29 +964,6 @@ const Crontab = () => {
         theme={theme}
         isPhone={isPhone}
       />
-      <ViewCreateModal
-        visible={isCreateViewModalVisible}
-        handleCancel={(data) => {
-          setIsCreateViewModalVisible(false);
-          getCronViews();
-          if (data && data.id === viewConf.id) {
-            setViewConf({ ...viewConf, ...data });
-          }
-        }}
-      />
-      <ViewManageModal
-        cronViews={cronViews}
-        visible={isViewManageModalVisible}
-        handleCancel={() => {
-          setIsViewManageModalVisible(false);
-        }}
-        cronViewChange={(data) => {
-          getCronViews();
-          if (data && data.id === viewConf.id) {
-            setViewConf({ ...viewConf, ...data });
-          }
-        }}
-      />
     </PageContainer>
   );
 };

src/pages/crontab/logModal.tsx

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

src/pages/crontab/modal.tsx

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

src/pages/crontab/viewCreateModal.tsx

@@ -1,262 +0,0 @@
-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) {
-        handleCancel(data);
-      }
-      setLoading(false);
-    } 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 ? '编辑视图' : '新建视图'}
-      open={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

@@ -1,266 +0,0 @@
-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(({ code, data }) => {
-            if (code === 200) {
-              message.success('删除成功');
-              cronViewChange();
-            }
-          });
-      },
-      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(({ code, data }) => {
-        if (code === 200) {
-          const _list = [...list];
-          _list.splice(index, 1, { ...list[index], isDisabled: !checked });
-          setList(_list);
-          cronViewChange();
-        }
-      });
-  };
-
-  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(({ code, data }) => {
-          if (code === 200) {
-            const newData = [...list];
-            newData.splice(dragIndex, 1);
-            newData.splice(hoverIndex, 0, { ...dragRow, ...data });
-            setList(newData);
-            cronViewChange();
-          }
-        });
-    },
-    [list],
-  );
-
-  useEffect(() => {
-    setList(cronViews);
-  }, [cronViews]);
-
-  return (
-    <Modal
-      title="视图管理"
-      open={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

@@ -27,11 +27,8 @@ import DependenceModal from './modal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
+import { getTableScroll } from '@/utils/index';
 import DependenceLogModal from './logModal';
-import { useOutletContext } from '@umijs/max';
-import { SharedContext } from '@/layouts';
-import useTableScrollHeight from '@/hooks/useTableScrollHeight';
-
 
 const { Text } = Typography;
 const { Search } = Input;
@@ -51,9 +48,7 @@ enum StatusColor {
   'error',
 }
 
-const Dependence = () => {
+const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
-  const { headerStyle, isPhone, socketMessage } =
-    useOutletContext<SharedContext>();
   const columns: any = [
     {
       title: '序号',
@@ -165,11 +160,10 @@ const Dependence = () => {
   const [editedDependence, setEditedDependence] = useState();
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
   const [searchText, setSearchText] = useState('');
+  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
   const [logDependence, setLogDependence] = useState<any>();
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
   const [type, setType] = useState('nodejs');
-  const tableRef = useRef<any>();
-  const tableScrollHeight = useTableScrollHeight(tableRef, 59)
 
   const getDependencies = () => {
     setLoading(true);
@@ -177,10 +171,8 @@ const Dependence = () => {
       .get(
         `${config.apiPrefix}dependencies?searchValue=${searchText}&type=${type}`,
       )
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
+        setValue(data.data);
-          setValue(data);
-        }
       })
       .finally(() => setLoading(false));
   };
@@ -216,8 +208,9 @@ const Dependence = () => {
           .delete(`${config.apiPrefix}dependencies${force ? '/force' : ''}`, {
             data: [record.id],
           })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200 && force) {
+            if (data.code === 200) {
+              if (force) {
                 const i = value.findIndex((x) => x.id === data.data[0].id);
                 if (i !== -1) {
                   const result = [...value];
@@ -225,6 +218,9 @@ const Dependence = () => {
                   setValue(result);
                 }
               }
+            } else {
+              message.error(data);
+            }
           });
       },
       onCancel() {
@@ -250,9 +246,11 @@ const Dependence = () => {
           .put(`${config.apiPrefix}dependencies/reinstall`, {
             data: [record.id],
           })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
-              handleDependence(data[0]);
+              handleDependence(data.data[0]);
+            } else {
+              message.error(data);
             }
           });
       },
@@ -284,10 +282,16 @@ const Dependence = () => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
+
+    setTimeout(() => {
+      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
+        setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
+      }
+    });
   };
 
   const rowSelection = {
-    selectedRowKeys: selectedRowIds,
+    selectedRowIds,
     onChange: onSelectChange,
   };
 
@@ -301,32 +305,12 @@ const Dependence = () => {
           .delete(`${config.apiPrefix}dependencies${forceUrl}`, {
             data: selectedRowIds,
           })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
-              setSelectedRowIds([]);
-              getDependencies();
-            }
-          });
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  };
-
-  const handlereInstallDependencies = () => {
-    Modal.confirm({
-      title: '确认重新安装',
-      content: <>确认重新安装选中的依赖吗</>,
-      onOk() {
-        request
-          .put(`${config.apiPrefix}dependencies/reinstall`, {
-            data: selectedRowIds,
-          })
-          .then(({ code, data }) => {
-            if (code === 200) {
               setSelectedRowIds([]);
               getDependencies();
+            } else {
+              message.error(data);
             }
           });
       },
@@ -339,18 +323,16 @@ const Dependence = () => {
   const getDependenceDetail = (dependence: any) => {
     request
       .get(`${config.apiPrefix}dependencies/${dependence.id}`)
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
         const index = value.findIndex((x) => x.id === dependence.id);
         const result = [...value];
         if (index !== -1) {
           result.splice(index, 1, {
             ...dependence,
-              ...data,
+            ...data.data,
           });
           setValue(result);
         }
-        }
       })
       .finally(() => setLoading(false));
   };
@@ -363,6 +345,12 @@ const Dependence = () => {
     getDependencies();
   }, [searchText, type]);
 
+  useEffect(() => {
+    setTimeout(() => {
+      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
+    });
+  }, []);
+
   useEffect(() => {
     if (logDependence) {
       localStorage.setItem('logDependence', logDependence.id);
@@ -411,61 +399,10 @@ const Dependence = () => {
     }
   }, [socketMessage]);
 
-  const onTabChange = (activeKey: string) => {
+  const panelContent = () => (
-    setSelectedRowIds([]);
+    <>
-    setType(activeKey);
-  };
-
-  return (
-    <PageContainer
-      className="ql-container-wrapper dependence-wrapper ql-container-wrapper-has-tab"
-      title="依赖管理"
-      extra={[
-        <Search
-          placeholder="请输入名称"
-          style={{ width: 'auto' }}
-          enterButton
-          loading={loading}
-          onSearch={onSearch}
-        />,
-        <Button key="2" type="primary" onClick={() => addDependence()}>
-          新建依赖
-        </Button>,
-      ]}
-      header={{
-        style: headerStyle,
-      }}
-    >
-      <Tabs
-        defaultActiveKey="nodejs"
-        size="small"
-        tabPosition="top"
-        onChange={onTabChange}
-        items={[
-          {
-            key: 'nodejs',
-            label: 'NodeJs',
-          },
-          {
-            key: 'python3',
-            label: 'Python3',
-          },
-          {
-            key: 'linux',
-            label: 'Linux',
-          },
-        ]}
-      />
-      <div ref={tableRef}>
       {selectedRowIds.length > 0 && (
         <div style={{ marginBottom: 16 }}>
-            <Button
-              type="primary"
-              style={{ marginBottom: 5, marginLeft: 8 }}
-              onClick={() => handlereInstallDependencies()}
-            >
-              批量安装
-            </Button>
           <Button
             type="primary"
             style={{ marginBottom: 5, marginLeft: 8 }}
@@ -498,7 +435,49 @@ const Dependence = () => {
           loading={loading}
         />
       </DndProvider>
-      </div>
+    </>
+  );
+
+  const onTabChange = (activeKey: string) => {
+    setType(activeKey);
+  };
+
+  return (
+    <PageContainer
+      className="ql-container-wrapper dependence-wrapper"
+      title="依赖管理"
+      extra={[
+        <Search
+          placeholder="请输入名称"
+          style={{ width: 'auto' }}
+          enterButton
+          loading={loading}
+          onSearch={onSearch}
+        />,
+        <Button key="2" type="primary" onClick={() => addDependence()}>
+          新建依赖
+        </Button>,
+      ]}
+      header={{
+        style: headerStyle,
+      }}
+    >
+      <Tabs
+        defaultActiveKey="nodejs"
+        size="small"
+        tabPosition="top"
+        onChange={onTabChange}
+      >
+        <Tabs.TabPane tab="NodeJs" key="nodejs">
+          {panelContent()}
+        </Tabs.TabPane>
+        <Tabs.TabPane tab="Python3" key="python3">
+          {panelContent()}
+        </Tabs.TabPane>
+        <Tabs.TabPane tab="Linux" key="linux">
+          {panelContent()}
+        </Tabs.TabPane>
+      </Tabs>
       <DependenceModal
         visible={isModalVisible}
         handleCancel={handleCancel}

src/pages/dependence/logModal.tsx

@@ -48,12 +48,9 @@ const DependenceLogModal = ({
     setLoading(true);
     request
       .get(`${config.apiPrefix}dependencies/${dependence.id}`)
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (
+        if (localStorage.getItem('logDependence') === String(dependence.id)) {
-          code === 200 &&
+          const log = (data.data.log || []).join('') as string;
-          localStorage.getItem('logDependence') === String(dependence.id)
-        ) {
-          const log = (data.log || []).join('') as string;
           setValue(log);
           setExecuting(!log.includes('结束时间'));
           setIsRemoveFailed(log.includes('删除失败'));
@@ -70,10 +67,8 @@ const DependenceLogModal = ({
       .delete(`${config.apiPrefix}dependencies/force`, {
         data: [dependence.id],
       })
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
         cancel(true);
-        }
       })
       .finally(() => {
         setRemoveLoading(false);
@@ -117,7 +112,7 @@ const DependenceLogModal = ({
   return (
     <Modal
       title={titleElement()}
-      open={visible}
+      visible={visible}
       centered
       className="log-modal"
       bodyStyle={{

src/pages/dependence/modal.tsx

@@ -52,11 +52,11 @@ const DependenceModal = ({
           data: payload,
         },
       );
-
+      if (code !== 200) {
-      if (code === 200) {
+        message.error(data);
-        handleCancel(data);
       }
       setLoading(false);
+      handleCancel(data);
     } catch (error) {
       setLoading(false);
     }
@@ -69,7 +69,7 @@ const DependenceModal = ({
   return (
     <Modal
       title={dependence ? '编辑依赖' : '新建依赖'}
-      open={visible}
+      visible={visible}
       forceRender
       centered
       maskClosable={false}
@@ -99,9 +99,7 @@ const DependenceModal = ({
         >
           <Select>
             {config.dependenceTypes.map((x, i) => (
-              <Option key={i} value={i}>
+              <Option value={i}>{x}</Option>
-                {x}
-              </Option>
             ))}
           </Select>
         </Form.Item>

src/pages/diff/index.less

@@ -17,8 +17,4 @@
   .ant-form-item {
     margin-bottom: 8px;
   }
-
-  + section {
-    height: calc(100% - 40px) !important;
-  }
 }

src/pages/diff/index.tsx

@@ -6,13 +6,10 @@ import { request } from '@/utils/http';
 import './index.less';
 import { DiffEditor } from '@monaco-editor/react';
 import ReactDiffViewer from 'react-diff-viewer';
-import { useOutletContext } from '@umijs/max';
-import { SharedContext } from '@/layouts';
 
 const { Option } = Select;
 
-const Diff = () => {
+const Diff = ({ headerStyle, isPhone, theme }: any) => {
-  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
   const [origin, setOrigin] = useState('config.sample.sh');
   const [current, setCurrent] = useState('config.sh');
   const [originValue, setOriginValue] = useState('');
@@ -22,22 +19,14 @@ const Diff = () => {
   const editorRef = useRef<any>(null);
 
   const getConfig = () => {
-    request
+    request.get(`${config.apiPrefix}configs/${current}`).then((data) => {
-      .get(`${config.apiPrefix}configs/${current}`)
+      setCurrentValue(data.data);
-      .then(({ code, data }) => {
-        if (code === 200) {
-          setCurrentValue(data);
-        }
     });
   };
 
   const getSample = () => {
-    request
+    request.get(`${config.apiPrefix}configs/${origin}`).then((data) => {
-      .get(`${config.apiPrefix}configs/${origin}`)
+      setOriginValue(data.data);
-      .then(({ code, data }) => {
-        if (code === 200) {
-          setOriginValue(data);
-        }
     });
   };
 
@@ -50,10 +39,8 @@ const Diff = () => {
       .post(`${config.apiPrefix}configs/save`, {
         data: { content, name: current },
       })
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
+        message.success(data.message);
-          message.success('保存成功');
-        }
       });
   };
 
@@ -61,10 +48,8 @@ const Diff = () => {
     setLoading(true);
     request
       .get(`${config.apiPrefix}configs/files`)
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
+        setFiles(data.data);
-          setFiles(data);
-        }
       })
       .finally(() => setLoading(false));
   };
@@ -110,9 +95,7 @@ const Diff = () => {
           <Form.Item label="源文件">
             <Select value={origin} onChange={originFileChange}>
               {files.map((x) => (
-                <Option key={x.value} value={x.value}>
+                <Option value={x.value}>{x.title}</Option>
-                  {x.title}
-                </Option>
               ))}
             </Select>
           </Form.Item>
@@ -121,9 +104,7 @@ const Diff = () => {
           <Form.Item label="当前文件">
             <Select value={current} onChange={currentFileChange}>
               {files.map((x) => (
-                <Option key={x.value} value={x.value}>
+                <Option value={x.value}>{x.title}</Option>
-                  {x.title}
-                </Option>
               ))}
             </Select>
           </Form.Item>

src/pages/env/editNameModal.tsx

@@ -17,22 +17,19 @@ const EditNameModal = ({
 
   const handleOk = async (values: any) => {
     setLoading(true);
-    try {
     const { code, data } = await request.put(`${config.apiPrefix}envs/name`, {
       data: {
         ids,
         name: values.name,
       },
     });
-
     if (code === 200) {
       message.success('更新环境变量名称成功');
+    } else {
+      message.error(data);
+    }
+    setLoading(false);
     handleCancel();
-      }
-      setLoading(false);
-    } catch (error) {
-      setLoading(false);
-    }
   };
 
   useEffect(() => {
@@ -42,7 +39,7 @@ const EditNameModal = ({
   return (
     <Modal
       title="修改环境变量名称"
-      open={visible}
+      visible={visible}
       forceRender
       centered
       maskClosable={false}

src/pages/env/index.tsx

@@ -9,8 +9,6 @@ import {
   Typography,
   Tooltip,
   Input,
-  UploadProps,
-  Upload,
 } from 'antd';
 import {
   EditOutlined,
@@ -18,7 +16,6 @@ import {
   SyncOutlined,
   CheckCircleOutlined,
   StopOutlined,
-  UploadOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -28,10 +25,7 @@ import EditNameModal from './editNameModal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
-import { exportJson } from '@/utils/index';
+import { getTableScroll } from '@/utils/index';
-import { useOutletContext } from '@umijs/max';
-import { SharedContext } from '@/layouts';
-import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -102,8 +96,7 @@ const DragableBodyRow = ({
   );
 };
 
-const Env = () => {
+const Env = ({ headerStyle, isPhone, theme }: any) => {
-  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
   const columns: any = [
     {
       title: '序号',
@@ -135,7 +128,6 @@ const Env = () => {
               textAlign: 'left',
             }}
             ellipsis={{ tooltip: text, rows: 2 }}
-            copyable
           >
             {text}
           </Paragraph>
@@ -254,18 +246,14 @@ const Env = () => {
   const [editedEnv, setEditedEnv] = useState();
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
   const [searchText, setSearchText] = useState('');
-  const [importLoading, setImportLoading] = useState(false);
+  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
-  const tableRef = useRef<any>();
-  const tableScrollHeight = useTableScrollHeight(tableRef, 59)
 
   const getEnvs = () => {
     setLoading(true);
     request
       .get(`${config.apiPrefix}envs?searchValue=${searchText}`)
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
+        setValue(data.data);
-          setValue(data);
-        }
       })
       .finally(() => setLoading(false));
   };
@@ -286,14 +274,15 @@ const Env = () => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}envs/${record.status === Status.已禁用 ? 'enable' : 'disable'
+            `${config.apiPrefix}envs/${
+              record.status === Status.已禁用 ? 'enable' : 'disable'
             }`,
             {
               data: [record.id],
             },
           )
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               message.success(
                 `${record.status === Status.已禁用 ? '启用' : '禁用'}成功`,
               );
@@ -305,6 +294,8 @@ const Env = () => {
                 status: newStatus,
               });
               setValue(result);
+            } else {
+              message.error(data);
             }
           });
       },
@@ -339,12 +330,14 @@ const Env = () => {
       onOk() {
         request
           .delete(`${config.apiPrefix}envs`, { data: [record.id] })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               message.success('删除成功');
               const result = [...value];
               result.splice(index, 1);
               setValue(result);
+            } else {
+              message.error(data);
             }
           });
       },
@@ -394,12 +387,14 @@ const Env = () => {
         .put(`${config.apiPrefix}envs/${dragRow.id}/move`, {
           data: { fromIndex: dragIndex, toIndex: hoverIndex },
         })
-        .then(({ code, data }) => {
+        .then((data: any) => {
-          if (code === 200) {
+          if (data.code === 200) {
             const newData = [...value];
             newData.splice(dragIndex, 1);
             newData.splice(hoverIndex, 0, { ...dragRow, ...data.data });
             setValue([...newData]);
+          } else {
+            message.error(data);
           }
         });
     },
@@ -408,10 +403,16 @@ const Env = () => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
+
+    setTimeout(() => {
+      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
+        setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
+      }
+    });
   };
 
   const rowSelection = {
-    selectedRowKeys: selectedRowIds,
+    selectedRowIds,
     onChange: onSelectChange,
   };
 
@@ -422,11 +423,13 @@ const Env = () => {
       onOk() {
         request
           .delete(`${config.apiPrefix}envs`, { data: selectedRowIds })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               message.success('批量删除成功');
               setSelectedRowIds([]);
               getEnvs();
+            } else {
+              message.error(data);
             }
           });
       },
@@ -445,9 +448,11 @@ const Env = () => {
           .put(`${config.apiPrefix}envs/${OperationPath[operationStatus]}`, {
             data: selectedRowIds,
           })
-          .then(({ code, data }) => {
+          .then((data: any) => {
-            if (code === 200) {
+            if (data.code === 200) {
               getEnvs();
+            } else {
+              message.error(data);
             }
           });
       },
@@ -457,13 +462,6 @@ const Env = () => {
     });
   };
 
-  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);
   };
@@ -472,37 +470,16 @@ const Env = () => {
     setSearchText(value.trim());
   };
 
-  const uploadProps: UploadProps = {
-    accept: 'application/json',
-    beforeUpload: async (file) => {
-      const formData = new FormData();
-      formData.append('env', file);
-      setImportLoading(true);
-      try {
-        const { code, data } = await request.post(
-          `${config.apiPrefix}envs/upload`,
-          {
-            data: formData,
-          },
-        );
-
-        if (code === 200) {
-          message.success(`成功上传${data.length}个环境变量`);
-          getEnvs();
-        }
-        setImportLoading(false);
-      } catch (error: any) {
-        setImportLoading(false);
-      }
-      return false;
-    },
-    fileList: [],
-  };
-
   useEffect(() => {
     getEnvs();
   }, [searchText]);
 
+  useEffect(() => {
+    setTimeout(() => {
+      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
+    });
+  }, []);
+
   return (
     <PageContainer
       className="ql-container-wrapper env-wrapper"
@@ -515,15 +492,6 @@ const Env = () => {
           loading={loading}
           onSearch={onSearch}
         />,
-        <Upload {...uploadProps}>
-          <Button
-            type="primary"
-            icon={<UploadOutlined />}
-            loading={importLoading}
-          >
-            导入
-          </Button>
-        </Upload>,
         <Button key="2" type="primary" onClick={() => addEnv()}>
           新建变量
         </Button>,
@@ -548,13 +516,6 @@ const Env = () => {
           >
             批量删除
           </Button>
-          <Button
-            type="primary"
-            onClick={() => exportEnvs()}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量导出
-          </Button>
           <Button
             type="primary"
             onClick={() => operateEnvs(0)}
@@ -577,7 +538,6 @@ const Env = () => {
       )}
       <DndProvider backend={HTML5Backend}>
         <Table
-          ref={tableRef}
           columns={columns}
           rowSelection={rowSelection}
           pagination={false}
@@ -587,7 +547,7 @@ const Env = () => {
           scroll={{ x: 1000, y: tableScrollHeight }}
           components={components}
           loading={loading}
-          onRow={(record: any, index: number | undefined) => {
+          onRow={(record: any, index: number) => {
             return {
               index,
               moveRow,

src/pages/env/modal.tsx

@@ -40,12 +40,13 @@ const EnvModal = ({
       const { code, data } = await request[method](`${config.apiPrefix}envs`, {
         data: payload,
       });
-
       if (code === 200) {
         message.success(env ? '更新变量成功' : '新建变量成功');
-        handleCancel(data);
+      } else {
+        message.error(data);
       }
       setLoading(false);
+      handleCancel(data);
     } catch (error: any) {
       setLoading(false);
     }
@@ -58,7 +59,7 @@ const EnvModal = ({
   return (
     <Modal
       title={env ? '编辑变量' : '新建变量'}
-      open={visible}
+      visible={visible}
       forceRender
       centered
       maskClosable={false}

src/pages/error/index.tsx

@@ -3,13 +3,11 @@ import config from '@/utils/config';
 import { request } from '@/utils/http';
 import Terminal, { ColorMode, LineType } from '../../components/terminal';
 import { PageLoading } from '@ant-design/pro-layout';
-import { history, useOutletContext } from '@umijs/max';
+import { history } from 'umi';
 import Ansi from 'ansi-to-react';
 import './index.less';
-import { SharedContext } from '@/layouts';
 
-const Error = () => {
+const Error = ({ user, theme }: any) => {
-  const { user, theme } = useOutletContext<SharedContext>();
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState('暂无日志');
 
@@ -17,10 +15,8 @@ const Error = () => {
     setLoading(true);
     request
       .get(`${config.apiPrefix}public/panel/log`)
-      .then(({ code, data }) => {
+      .then((data: any) => {
-        if (code === 200) {
+        setData(data.data);
-          setData(data);
-        }
       })
       .finally(() => setLoading(false));
   };

src/pages/initialization/index.tsx

@@ -10,7 +10,7 @@ import {
   Select,
 } from 'antd';
 import config from '@/utils/config';
-import { history } from '@umijs/max';
+import { history } from 'umi';
 import styles from './index.less';
 import { request } from '@/utils/http';
 
@@ -41,9 +41,11 @@ const Initialization = () => {
           password: values.password,
         },
       })
-      .then(({ code, data }) => {
+      .then((data) => {
-        if (code === 200) {
+        if (data.code === 200) {
           next();
+        } else {
+          message.error(data.message);
         }
       })
       .finally(() => setLoading(false));
@@ -57,9 +59,11 @@ const Initialization = () => {
           ...values,
         },
       })
-      .then(({ code, data }) => {
+      .then((_data: any) => {
-        if (code === 200) {
+        if (_data && _data.code === 200) {
           next();
+        } else {
+          message.error(_data.message);
         }
       })
       .finally(() => setLoading(false));
@@ -112,15 +116,12 @@ const Initialization = () => {
               {config.notificationModes
                 .filter((x) => x.value !== 'closed')
                 .map((x) => (
-                  <Option key={x.value} value={x.value}>
+                  <Option value={x.value}>{x.label}</Option>
-                    {x.label}
-                  </Option>
                 ))}
             </Select>
           </Form.Item>
           {fields.map((x) => (
             <Form.Item
-              key={x.label}
               label={x.label}
               name={x.label}
               extra={x.tip}
@@ -232,7 +233,7 @@ const Initialization = () => {
           <img
             alt="logo"
             className={styles.logo}
-            src="https://qn.whyour.cn/logo.png"
+            src="http://qn.whyour.cn/logo.png"
           />
           <span className={styles.title}>初始化配置</span>
         </div>

src/pages/log/index.module.less

@@ -6,7 +6,8 @@
     overflow: hidden;
     position: relative;
     background-color: @component-background;
-    height: 100%;
+    height: calc(100vh - 128px);
+    height: calc(100vh - var(--vh-offset, 0px) - 128px);
     display: flex;
     flex-direction: column;
   }

src/pages/log/index.tsx

@@ -1,15 +1,5 @@
 import { useState, useEffect, useCallback, Key, useRef } from 'react';
-import {
+import { TreeSelect, Tree, Input, Empty } from 'antd';
-  TreeSelect,
-  Tree,
-  Input,
-  Empty,
-  Button,
-  message,
-  Modal,
-  Tooltip,
-  Typography,
-} from 'antd';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
 import Editor from '@monaco-editor/react';
@@ -17,64 +7,72 @@ import { request } from '@/utils/http';
 import styles from './index.module.less';
 import { Controlled as CodeMirror } from 'react-codemirror2';
 import SplitPane from 'react-split-pane';
-import { useOutletContext } from '@umijs/max';
-import { SharedContext } from '@/layouts';
-import { DeleteOutlined } from '@ant-design/icons';
-import { depthFirstSearch } from '@/utils';
-import debounce from 'lodash/groupBy';
-import uniq from 'lodash/uniq';
-import useFilterTreeData from '@/hooks/useFilterTreeData';
 
-const { Text } = Typography;
+function getFilterData(keyword: string, data: any) {
+  const expandedKeys: string[] = [];
+  if (keyword) {
+    const tree: any = [];
+    data.forEach((item: any) => {
+      if (item.title.toLocaleLowerCase().includes(keyword)) {
+        tree.push(item);
+      } else {
+        const children: any[] = [];
+        (item.children || []).forEach((subItem: any) => {
+          if (subItem.title.toLocaleLowerCase().includes(keyword)) {
+            children.push(subItem);
+          }
+        });
+        if (children.length > 0) {
+          tree.push({
+            ...item,
+            children,
+          });
+          expandedKeys.push(item.key);
+        }
+      }
+    });
+    return { tree, expandedKeys };
+  }
+  return { tree: data, expandedKeys };
+}
 
-const Log = () => {
+const Log = ({ headerStyle, isPhone, theme }: any) => {
-  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
+  const [title, setTitle] = useState('请选择日志文件');
   const [value, setValue] = useState('请选择日志文件');
-  const [select, setSelect] = useState<string>('');
+  const [select, setSelect] = useState<any>();
   const [data, setData] = useState<any[]>([]);
+  const [filterData, setFilterData] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);
   const [height, setHeight] = useState<number>();
   const treeDom = useRef<any>();
   const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
-  const [currentNode, setCurrentNode] = useState<any>();
-  const [searchValue, setSearchValue] = useState('');
 
   const getLogs = () => {
     setLoading(true);
     request
       .get(`${config.apiPrefix}logs`)
-      .then(({ code, data }) => {
+      .then((data) => {
-        if (code === 200) {
+        setData(data.data);
-          setData(data);
+        setFilterData(data.data);
-        }
       })
       .finally(() => setLoading(false));
   };
 
   const getLog = (node: any) => {
     request
-      .get(`${config.apiPrefix}logs/${node.title}?path=${node.parent || ''}`)
+      .get(`${config.apiPrefix}logs/${node.value}?path=${node.parent || ''}`)
-      .then(({ code, data }) => {
+      .then((data) => {
-        if (code === 200) {
+        setValue(data.data);
-          setValue(data);
-        }
       });
   };
 
   const onSelect = (value: any, node: any) => {
-    setCurrentNode(node);
-    setSelect(value);
-
     if (node.key === select || !value) {
       return;
     }
-
-    if (node.type === 'directory') {
-      setValue('请选择日志文件');
-      return;
-    }
-
     setValue('加载中...');
+    setSelect(value);
+    setTitle(node.key);
     getLog(node);
   };
 
@@ -85,130 +83,40 @@ const Log = () => {
   const onSearch = useCallback(
     (e) => {
       const keyword = e.target.value;
-      debounceSearch(keyword);
+      const { tree, expandedKeys } = getFilterData(
-    },
+        keyword.toLocaleLowerCase(),
-    [data],
-  );
-
-  const debounceSearch = useCallback(
-    debounce((keyword) => {
-      setSearchValue(keyword);
-    }, 300),
-    [data],
-  );
-
-  const { treeData: filterData, keys: searchExpandedKeys } = useFilterTreeData(
         data,
-    searchValue,
-    { treeNodeFilterProp: 'title' },
       );
-
+      setFilterData(tree);
-  useEffect(() => {
+      setExpandedKeys(expandedKeys);
-    setExpandedKeys(uniq([...expandedKeys, ...searchExpandedKeys]));
-  }, [searchExpandedKeys]);
-
-  const deleteFile = () => {
-    Modal.confirm({
-      title: `确认删除`,
-      content: (
-        <>
-          确认删除
-          <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {select}
-          </Text>
-          文件{currentNode.type === 'directory' ? '夹下所以日志' : ''}
-          ，删除后不可恢复
-        </>
-      ),
-      onOk() {
-        request
-          .delete(`${config.apiPrefix}logs`, {
-            data: {
-              filename: currentNode.title,
-              path: currentNode.parent || '',
-              type: currentNode.type,
     },
-          })
+    [data, setFilterData],
-          .then(({ code }) => {
-            if (code === 200) {
-              message.success(`删除成功`);
-              let newData = [...data];
-              if (currentNode.parent) {
-                newData = depthFirstSearch(
-                  newData,
-                  (c) => c.key === currentNode.key,
   );
-              } else {
-                const index = newData.findIndex(
-                  (x) => x.key === currentNode.key,
-                );
-                if (index !== -1) {
-                  newData.splice(index, 1);
-                }
-              }
-              setData(newData);
-              initState();
-            }
-          });
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  };
-
-  const initState = () => {
-    setSelect('');
-    setCurrentNode(null);
-    setValue('请选择脚本文件');
-  };
-
-  const onExpand = (expKeys: any) => {
-    setExpandedKeys(expKeys);
-  };
 
   useEffect(() => {
     getLogs();
-  }, []);
+    if (treeDom && treeDom.current) {
-
-  useEffect(() => {
-    if (treeDom.current) {
       setHeight(treeDom.current.clientHeight);
     }
-  }, [treeDom.current, data]);
+  }, []);
 
   return (
     <PageContainer
       className="ql-container-wrapper log-wrapper"
-      title={select}
+      title={title}
       loading={loading}
       extra={
-        isPhone
+        isPhone && [
-          ? [
           <TreeSelect
-                treeExpandAction="click"
             className="log-select"
             value={select}
             dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
             treeData={data}
             placeholder="请选择日志"
-                fieldNames={{ value: 'key' }}
-                treeNodeFilterProp="title"
             showSearch
-                allowClear
             onSelect={onSelect}
           />,
         ]
-          : [
-              <Tooltip title="删除">
-                <Button
-                  type="primary"
-                  disabled={!select}
-                  onClick={deleteFile}
-                  icon={<DeleteOutlined />}
-                />
-              </Tooltip>,
-            ]
       }
       header={{
         style: headerStyle,
@@ -216,7 +124,6 @@ const Log = () => {
     >
       <div className={`${styles['log-container']} log-container`}>
         {!isPhone && (
-          /*// @ts-ignore*/
           <SplitPane split="vertical" size={200} maxSize={-100}>
             <div className={styles['left-tree-container']}>
               {data.length > 0 ? (
@@ -229,7 +136,6 @@ const Log = () => {
                   ></Input.Search>
                   <div className={styles['left-tree-scroller']} ref={treeDom}>
                     <Tree
-                      expandAction="click"
                       className={styles['left-tree']}
                       treeData={filterData}
                       showIcon={true}
@@ -237,8 +143,6 @@ const Log = () => {
                       selectedKeys={[select]}
                       showLine={{ showLeafIcon: true }}
                       onSelect={onTreeSelect}
-                      expandedKeys={expandedKeys}
-                      onExpand={onExpand}
                     ></Tree>
                   </div>
                 </>

src/pages/login/index.tsx

@@ -9,18 +9,16 @@ import {
   Statistic,
 } from 'antd';
 import config from '@/utils/config';
-import { history, useOutletContext } from '@umijs/max';
+import { history, Link } from 'umi';
 import styles from './index.less';
 import { request } from '@/utils/http';
 import { useTheme } from '@/utils/hooks';
 import { MobileOutlined } from '@ant-design/icons';
-import { SharedContext } from '@/layouts';
 
 const FormItem = Form.Item;
 const { Countdown } = Statistic;
 
-const Login = () => {
+const Login = ({ reloadUser }: any) => {
-  const { reloadUser } = useOutletContext<SharedContext>();
   const [loading, setLoading] = useState(false);
   const [waitTime, setWaitTime] = useState<any>();
   const { theme } = useTheme();
@@ -40,7 +38,15 @@ const Login = () => {
         },
       })
       .then((data) => {
-        checkResponse(data, values);
+        if (data.code === 420) {
+          setLoginInfo({
+            username: values.username,
+            password: values.password,
+          });
+          setTwoFactor(true);
+        } else {
+          checkResponse(data);
+        }
         setLoading(false);
       })
       .catch(function (error) {
@@ -56,7 +62,11 @@ const Login = () => {
         data: { ...loginInfo, code: values.code },
       })
       .then((data: any) => {
+        if (data.code === 430) {
+          message.error(data.message);
+        } else {
           checkResponse(data);
+        }
         setVerifying(false);
       })
       .catch((error: any) => {
@@ -65,11 +75,8 @@ const Login = () => {
       });
   };
 
-  const checkResponse = (
+  const checkResponse = (data: any) => {
-    { code, data, message: _message }: any,
+    if (data.code === 200) {
-    values?: any,
-  ) => {
-    if (code === 200) {
       const {
         token,
         lastip,
@@ -77,7 +84,7 @@ const Login = () => {
         lastlogon,
         retries = 0,
         platform,
-      } = data;
+      } = data.data;
       localStorage.setItem(config.authKey, token);
       notification.success({
         message: '登录成功！',
@@ -96,14 +103,13 @@ const Login = () => {
       });
       reloadUser(true);
       history.push('/crontab');
-    } else if (code === 410) {
+    } else if (data.code === 100) {
-      setWaitTime(data);
+      message.warn(data.message);
-    } else if (code === 420) {
+    } else if (data.code === 410) {
-      setLoginInfo({
+      message.error(data.message);
-        username: values.username,
+      setWaitTime(data.data);
-        password: values.password,
+    } else {
-      });
+      message.error(data.message);
-      setTwoFactor(true);
     }
   };
 
@@ -129,7 +135,7 @@ const Login = () => {
           <img
             alt="logo"
             className={styles.logo}
-            src="https://qn.whyour.cn/logo.png"
+            src="http://qn.whyour.cn/logo.png"
           />
           <span className={styles.title}>
             {twoFactor ? '两步验证' : config.siteName}
@@ -148,7 +154,6 @@ const Login = () => {
                   message: '验证码为6位数字',
                 },
               ]}
-              validateTrigger="onBlur"
             >
               <Input
                 placeholder="6位数字"

src/pages/script/editModal.tsx

@@ -7,7 +7,6 @@ import Editor from '@monaco-editor/react';
 import SaveModal from './saveModal';
 import SettingModal from './setting';
 import { useTheme } from '@/utils/hooks';
-import { logEnded } from '@/utils';
 
 const { Option } = Select;
 const LangMap: any = {
@@ -58,11 +57,6 @@ const EditModal = ({
     if (node.key === selectedKey || !value) {
       return;
     }
-
-    if (node.type === 'directory') {
-      return;
-    }
-
     const newMode = LangMap[value.slice(-3)] || '';
     setCNode(node);
     setLanguage(newMode);
@@ -72,49 +66,39 @@ const EditModal = ({
 
   const getDetail = (node: any) => {
     request
-      .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`)
+      .get(`${config.apiPrefix}scripts/${node.value}?path=${node.parent || ''}`)
-      .then(({ code, data }) => {
+      .then((data) => {
-        if (code === 200) {
+        setValue(data.data);
-          setValue(data);
-        }
       });
   };
 
   const run = () => {
     setLog('');
-    const content = editorRef.current.getValue().replace(/\r\n/g, '\n');
     request
       .put(`${config.apiPrefix}scripts/run`, {
         data: {
-          filename: cNode.title,
+          filename: cNode.value,
           path: cNode.parent || '',
-          content,
         },
       })
-      .then(({ code, data }) => {
+      .then((data) => {
-        if (code === 200) {
         setIsRunning(true);
-        }
       });
   };
 
   const stop = () => {
-    if (!cNode || !cNode.title) {
+    if (!cNode || !cNode.value) {
       return;
     }
-    const content = editorRef.current.getValue().replace(/\r\n/g, '\n');
     request
       .put(`${config.apiPrefix}scripts/stop`, {
         data: {
-          filename: cNode.title,
+          filename: cNode.value,
           path: cNode.parent || '',
-          content,
         },
       })
-      .then(({ code, data }) => {
+      .then((data) => {
-        if (code === 200) {
         setIsRunning(false);
-        }
       });
   };
 
@@ -129,7 +113,8 @@ const EditModal = ({
       return;
     }
 
-    if (logEnded(_message)) {
+    if (_message === '执行结束') {
+      _message = '';
       setTimeout(() => {
         setIsRunning(false);
       }, 300);
@@ -142,13 +127,10 @@ const EditModal = ({
   }, [socketMessage]);
 
   useEffect(() => {
-    setLog('');
     if (currentNode) {
       setCNode(currentNode);
       setValue(content as string);
       setSelectedKey(currentNode.key);
-      const newMode = LangMap[currentNode.title.slice(-3)] || '';
-      setLanguage(newMode);
     }
   }, [content, currentNode]);
 
@@ -159,13 +141,11 @@ const EditModal = ({
       title={
         <>
           <TreeSelect
-            treeExpandAction="click"
             style={{ marginRight: 8, width: 150 }}
             value={selectedKey}
             dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
             treeData={treeData}
             placeholder="请选择脚本文件"
-            fieldNames={{ value: 'key', label: 'title' }}
             showSearch
             onSelect={onSelect}
           />
@@ -230,9 +210,8 @@ const EditModal = ({
       width={'100%'}
       headerStyle={{ padding: '11px 24px' }}
       onClose={cancel}
-      open={visible}
+      visible={visible}
     >
-      {/* @ts-ignore */}
       <SplitPane
         split="vertical"
         minSize={200}
@@ -253,14 +232,7 @@ const EditModal = ({
             editorRef.current = editor;
           }}
         />
-        <pre
+        <pre style={{ height: '100%', whiteSpace: 'break-spaces' }}>{log}</pre>
-          style={{
-            height: '100%',
-            padding: '0 15px',
-          }}
-        >
-          {log}
-        </pre>
       </SplitPane>
       <SaveModal
         visible={saveModalVisible}
@@ -271,7 +243,7 @@ const EditModal = ({
           content:
             editorRef.current &&
             editorRef.current.getValue().replace(/\r\n/g, '\n'),
-          filename: cNode?.title,
+          filename: cNode?.value,
         }}
       />
       <SettingModal

src/pages/script/editNameModal.tsx

@@ -1,17 +1,7 @@
 import React, { useEffect, useState } from 'react';
-import {
+import { Modal, message, Input, Form, Select } from 'antd';
-  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;
 
@@ -31,75 +21,40 @@ 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' | 'directory'>('blank');
 
   const handleOk = async (values: any) => {
     setLoading(true);
-    const { path = '', filename: inputFilename, directory = '' } = values;
+    values.path = values.path || '';
-    const formData = new FormData();
-    formData.append('file', file as any);
-    formData.append('filename', inputFilename);
-    formData.append('path', path);
-    formData.append('content', '');
-    formData.append('directory', directory);
     request
       .post(`${config.apiPrefix}scripts`, {
-        data: formData,
+        data: { filename: values.filename, path: values.path, content: '' },
       })
       .then(({ code, data }) => {
         if (code === 200) {
-          message.success(directory ? '新建文件夹成功' : '新建文件成功');
+          message.success('保存文件成功');
-          const key = path ? `${path}/` : '';
-          const filename = file ? file.name : inputFilename;
           handleCancel({
-            filename,
+            filename: values.filename,
-            path,
+            path: values.path,
-            key: `${key}${filename}`,
+            key: `${values.path}-${values.filename}`,
           });
+        } else {
+          message.error(data);
         }
         setLoading(false);
       })
       .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="新建文件"
-      open={visible}
+      visible={visible}
       forceRender
       centered
       maskClosable={false}
@@ -117,63 +72,24 @@ const EditScriptNameModal = ({
       confirmLoading={loading}
     >
       <Form form={form} layout="vertical" name="edit_name_modal">
-        <Form.Item
-          name="type"
-          label="类型"
-          rules={[{ required: true }]}
-          initialValue={'blank'}
-        >
-          <Radio.Group onChange={typeChange}>
-            <Radio value="blank">空文件</Radio>
-            <Radio value="upload">本地文件</Radio>
-            <Radio value="directory">文件夹</Radio>
-          </Radio.Group>
-        </Form.Item>
-        {type === 'blank' && (
         <Form.Item
           name="filename"
           label="文件名"
-            rules={[
+          rules={[{ required: true, message: '请输入文件名' }]}
-              { required: true, message: '请输入文件名' },
-              {
-                validator: (_, value) =>
-                  value.includes('/')
-                    ? Promise.reject(new Error('文件名不能包含斜杠'))
-                    : Promise.resolve(),
-              },
-            ]}
         >
           <Input placeholder="请输入文件名" />
         </Form.Item>
-        )}
-        {type === 'directory' && (
         <Form.Item
-            name="directory"
+          label="父目录"
-            label="文件夹名"
+          name="path"
-            rules={[{ required: true, message: '请输入文件夹名' }]}
+          initialValue={dirs && dirs.length > 0 ? dirs[0].key : ''}
         >
-            <Input placeholder="请输入文件夹名" />
+          <Select placeholder="请选择父目录">
+            {dirs.map((x) => (
+              <Option value={x.key}>{x.key || '根'}</Option>
+            ))}
+          </Select>
         </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.module.less

@@ -6,7 +6,8 @@
     overflow: hidden;
     position: relative;
     background-color: @component-background;
-    height: 100%;
+    height: calc(100vh - 128px);
+    height: calc(100vh - var(--vh-offset, 0px) - 128px);
     display: flex;
     flex-direction: column;
   }

src/pages/script/index.tsx

@@ -33,15 +33,38 @@ import {
 } from '@ant-design/icons';
 import EditScriptNameModal from './editNameModal';
 import debounce from 'lodash/debounce';
-import { history, useOutletContext, useLocation } from '@umijs/max';
+import { history } from 'umi';
-import { parse } from 'query-string';
-import { depthFirstSearch } from '@/utils';
-import { SharedContext } from '@/layouts';
-import useFilterTreeData from '@/hooks/useFilterTreeData';
-import uniq from 'lodash/uniq';
 
 const { Text } = Typography;
 
+function getFilterData(keyword: string, data: any) {
+  const expandedKeys: string[] = [];
+  if (keyword) {
+    const tree: any = [];
+    data.forEach((item: any) => {
+      if (item.title.toLocaleLowerCase().includes(keyword)) {
+        tree.push(item);
+      } else {
+        const children: any[] = [];
+        (item.children || []).forEach((subItem: any) => {
+          if (subItem.title.toLocaleLowerCase().includes(keyword)) {
+            children.push(subItem);
+          }
+        });
+        if (children.length > 0) {
+          tree.push({
+            ...item,
+            children,
+          });
+          expandedKeys.push(item.key);
+        }
+      }
+    });
+    return { tree, expandedKeys };
+  }
+  return { tree: data, expandedKeys };
+}
+
 const LangMap: any = {
   '.py': 'python',
   '.js': 'javascript',
@@ -49,12 +72,12 @@ const LangMap: any = {
   '.ts': 'typescript',
 };
 
-const Script = () => {
+const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
-  const { headerStyle, isPhone, theme, socketMessage } =
+  const [title, setTitle] = useState('请选择脚本文件');
-    useOutletContext<SharedContext>();
   const [value, setValue] = useState('请选择脚本文件');
-  const [select, setSelect] = useState<string>('');
+  const [select, setSelect] = useState<any>();
   const [data, setData] = useState<any[]>([]);
+  const [filterData, setFilterData] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);
   const [mode, setMode] = useState('');
   const [height, setHeight] = useState<number>();
@@ -71,36 +94,30 @@ const Script = () => {
     setLoading(true);
     request
       .get(`${config.apiPrefix}scripts`)
-      .then(({ code, data }) => {
+      .then((data) => {
-        if (code === 200) {
+        setData(data.data);
-          setData(data);
+        setFilterData(data.data);
         initGetScript();
-        }
       })
       .finally(() => setLoading(false));
   };
 
   const getDetail = (node: any) => {
     request
-      .get(
+      .get(`${config.apiPrefix}scripts/${node.value}?path=${node.parent || ''}`)
-        `${config.apiPrefix}scripts/${encodeURIComponent(node.title)}?path=${
+      .then((data) => {
-          node.parent || ''
+        setValue(data.data);
-        }`,
-      )
-      .then(({ code, data }) => {
-        if (code === 200) {
-          setValue(data);
-        }
       });
   };
 
   const initGetScript = () => {
-    const { p, s } = parse(history.location.search);
+    const { p, s } = history.location.query as any;
     if (s) {
       const vkey = `${p}/${s}`;
       const obj = {
         node: {
           title: s,
+          value: s,
           key: p ? vkey : s,
           parent: p,
         },
@@ -111,24 +128,22 @@ const Script = () => {
   };
 
   const onSelect = (value: any, node: any) => {
-    setSelect(node.key);
-    setCurrentNode(node);
-
     if (node.key === select || !value) {
       return;
     }
-
+    setValue('加载中...');
-    if (node.type === 'directory') {
-      setValue('请选择脚本文件');
-      return;
-    }
-
     const newMode = value ? LangMap[value.slice(-3)] : '';
     setMode(isPhone && newMode === 'typescript' ? 'javascript' : newMode);
-    setValue('加载中...');
+    setSelect(node.key);
+    setTitle(node.key);
+    setCurrentNode(node);
     getDetail(node);
   };
 
+  const onExpand = (expKeys: any) => {
+    setExpandedKeys(expKeys);
+  };
+
   const onTreeSelect = useCallback(
     (keys: Key[], e: any) => {
       const content = editorRef.current
@@ -159,29 +174,21 @@ const Script = () => {
       const keyword = e.target.value;
       debounceSearch(keyword);
     },
-    [data],
+    [data, setFilterData],
   );
 
   const debounceSearch = useCallback(
     debounce((keyword) => {
       setSearchValue(keyword);
-    }, 300),
+      const { tree, expandedKeys } = getFilterData(
-    [data],
+        keyword.toLocaleLowerCase(),
-  );
-
-  const { treeData: filterData, keys: searchExpandedKeys } = useFilterTreeData(
         data,
-    searchValue,
-    { treeNodeFilterProp: 'title' },
       );
-
+      setExpandedKeys(expandedKeys);
-  useEffect(() => {
+      setFilterData(tree);
-    setExpandedKeys(uniq([...expandedKeys, ...searchExpandedKeys]));
+    }, 300),
-  }, [searchExpandedKeys]);
+    [data, setFilterData],
-
+  );
-  const onExpand = (expKeys: any) => {
-    setExpandedKeys(expKeys);
-  };
 
   const editFile = () => {
     setTimeout(() => {
@@ -202,7 +209,7 @@ const Script = () => {
         <>
           确认保存文件
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {currentNode.title}
+            {currentNode.value}
           </Text>{' '}
           ，保存后不可恢复
         </>
@@ -215,16 +222,18 @@ const Script = () => {
           request
             .put(`${config.apiPrefix}scripts`, {
               data: {
-                filename: currentNode.title,
+                filename: currentNode.value,
                 path: currentNode.parent || '',
                 content,
               },
             })
-            .then(({ code, data }) => {
+            .then((_data: any) => {
-              if (code === 200) {
+              if (_data.code === 200) {
                 message.success(`保存成功`);
                 setValue(content);
                 setIsEditing(false);
+              } else {
+                message.error(_data);
               }
               resolve(null);
             })
@@ -242,11 +251,10 @@ const Script = () => {
       title: `确认删除`,
       content: (
         <>
-          确认删除
+          确认删除文件
           <Text style={{ wordBreak: 'break-all' }} type="warning">
             {select}
-          </Text>
+          </Text>{' '}
-          文件{currentNode.type === 'directory' ? '夹及其子文件' : ''}
           ，删除后不可恢复
         </>
       ),
@@ -254,20 +262,26 @@ const Script = () => {
         request
           .delete(`${config.apiPrefix}scripts`, {
             data: {
-              filename: currentNode.title,
+              filename: currentNode.value,
               path: currentNode.parent || '',
-              type: currentNode.type,
             },
           })
-          .then(({ code }) => {
+          .then((_data: any) => {
-            if (code === 200) {
+            if (_data.code === 200) {
               message.success(`删除成功`);
               let newData = [...data];
               if (currentNode.parent) {
-                newData = depthFirstSearch(
+                const parentNodeIndex = newData.findIndex(
-                  newData,
+                  (x) => x.key === currentNode.parent,
-                  (c) => c.key === currentNode.key,
                 );
+                const parentNode = newData[parentNodeIndex];
+                const index = parentNode.children.findIndex(
+                  (y) => y.key === currentNode.key,
+                );
+                if (index !== -1 && parentNodeIndex !== -1) {
+                  parentNode.children.splice(index, 1);
+                  newData.splice(parentNodeIndex, 1, { ...parentNode });
+                }
               } else {
                 const index = newData.findIndex(
                   (x) => x.key === currentNode.key,
@@ -277,7 +291,8 @@ const Script = () => {
                 }
               }
               setData(newData);
-              initState();
+            } else {
+              message.error(_data);
             }
           });
       },
@@ -299,22 +314,24 @@ const Script = () => {
     },
   ) => {
     if (filename) {
-      let newData = [...data];
+      const newData = [...data];
-      const _file = { title: filename, key, parent: path };
+      const _file = { title: filename, key, value: filename, parent: path };
       if (path) {
-        newData = depthFirstSearch(newData, (c) => c.key === path, _file);
+        const parentNodeIndex = newData.findIndex((x) => x.key === path);
-        const keys = path.split('/');
+        if (parentNodeIndex !== -1) {
-        const sKeys: string[] = [];
+          const parentNode = newData[parentNodeIndex];
-        keys.reduce((p, c) => {
+          if (parentNode.children && parentNode.children.length > 0) {
-          sKeys.push(p);
+            parentNode.children.unshift(_file);
-          return `${p}/${c}`;
+          } else {
-        });
+            parentNode.children = [_file];
-        setExpandedKeys([...expandedKeys, ...sKeys, path]);
+          }
+          newData.splice(parentNodeIndex, 1, { ...parentNode });
+        }
       } else {
         newData.unshift(_file);
       }
       setData(newData);
-      onSelect(_file.title, _file);
+      onSelect(_file.value, _file);
       setIsEditing(true);
     }
     setIsAddFileModalVisible(false);
@@ -324,38 +341,37 @@ const Script = () => {
     request
       .post(`${config.apiPrefix}scripts/download`, {
         data: {
-          filename: currentNode.title,
+          filename: currentNode.value,
         },
       })
-      .then(({ code, data }) => {
+      .then((_data: any) => {
-        if (code === 200) {
+        const blob = new Blob([_data], { type: 'application/json' });
-          const blob = new Blob([data], { type: 'application/json' });
         const url = URL.createObjectURL(blob);
         const a = document.createElement('a');
         a.href = url;
-          a.download = currentNode.title;
+        a.download = currentNode.value;
         document.documentElement.appendChild(a);
         a.click();
         document.documentElement.removeChild(a);
-        }
       });
   };
 
-  const initState = () => {
+  useEffect(() => {
+    const word = searchValue || '';
+    const { tree } = getFilterData(word.toLocaleLowerCase(), data);
+    setFilterData(tree);
     setSelect('');
     setCurrentNode(null);
+    setTitle('请选择脚本文件');
     setValue('请选择脚本文件');
-  };
+  }, [data]);
 
   useEffect(() => {
     getScripts();
-  }, []);
+    if (treeDom && treeDom.current) {
-
-  useEffect(() => {
-    if (treeDom.current) {
       setHeight(treeDom.current.clientHeight);
     }
-  }, [treeDom.current, data]);
+  }, []);
 
   const action = (key: string | number) => {
     switch (key) {
@@ -424,22 +440,18 @@ const Script = () => {
   return (
     <PageContainer
       className="ql-container-wrapper log-wrapper"
-      title={select}
+      title={title}
       loading={loading}
       extra={
         isPhone
           ? [
               <TreeSelect
-                treeExpandAction="click"
                 className="log-select"
                 value={select}
                 dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
                 treeData={data}
                 placeholder="请选择脚本"
-                fieldNames={{ value: 'key' }}
-                treeNodeFilterProp="title"
                 showSearch
-                allowClear
                 onSelect={onSelect}
               />,
               <Dropdown overlay={menu} trigger={['click']}>
@@ -495,7 +507,6 @@ const Script = () => {
     >
       <div className={`${styles['log-container']} log-container`}>
         {!isPhone && (
-          /*// @ts-ignore*/
           <SplitPane split="vertical" size={200} maxSize={-100}>
             <div className={styles['left-tree-container']}>
               {data.length > 0 ? (
@@ -508,7 +519,6 @@ const Script = () => {
                   ></Input.Search>
                   <div className={styles['left-tree-scroller']} ref={treeDom}>
                     <Tree
-                      expandAction="click"
                       className={styles['left-tree']}
                       treeData={filterData}
                       showIcon={true}
@@ -545,6 +555,7 @@ const Script = () => {
                 readOnly: !isEditing,
                 fontSize: 12,
                 lineNumbersMinChars: 3,
+                folding: false,
                 glyphMargin: false,
               }}
               onMount={(editor) => {

src/pages/script/saveModal.tsx

@@ -26,6 +26,8 @@ const SaveModal = ({
         if (code === 200) {
           message.success('保存文件成功');
           handleCancel(data);
+        } else {
+          message.error(data);
         }
         setLoading(false);
       });
@@ -39,7 +41,7 @@ const SaveModal = ({
   return (
     <Modal
       title="保存文件"
-      open={visible}
+      visible={visible}
       forceRender
       centered
       maskClosable={false}

src/pages/script/setting.tsx

@@ -26,6 +26,8 @@ const SettingModal = ({
         if (code === 200) {
           message.success('保存文件成功');
           handleCancel(data);
+        } else {
+          message.error(data);
         }
         setLoading(false);
       });
@@ -39,7 +41,7 @@ const SettingModal = ({
   return (
     <Modal
       title="运行设置"
-      open={visible}
+      visible={visible}
       forceRender
       centered
       onCancel={() => handleCancel()}