更新版本 v2.13.1

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

.env.example

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

.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

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

README-en.md

@@ -57,7 +57,7 @@ https://podman.io/getting-started/installation
 ```bash
 podman run -dit \
   --network bridge \
-  -v $PWD/ql/data:/ql/data \
+  -v $PWD/ql:/ql/data \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
@@ -96,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 \
@@ -124,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

README.md

@@ -57,7 +57,7 @@ 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 \
@@ -97,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 \
@@ -125,10 +125,6 @@ docker-compose up -d
 docker-compose down
 ```
 
-3. 访问
-
-打开你的浏览器，访问 http://{ip}:5700
-
 ## 使用
 
 1. 内置命令
@@ -167,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: 任务执行时需要并发或者指定时的环境变量名称

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(),
-        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(),
-        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

@@ -38,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);
       }
     },
@@ -60,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);
       }
     },
@@ -77,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);
       }
     },
@@ -100,6 +103,7 @@ export default (app: Router) => {
         const data = await envService.move(req.params.id, req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -117,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);
       }
     },
@@ -134,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);
       }
     },
@@ -154,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);
       }
     },
@@ -170,9 +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) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/log.ts

@@ -6,7 +6,6 @@ import config from '../config';
 import { getFileContentByName, readDirs } from '../config/util';
 import { join } from 'path';
 const route = Router();
-const blacklist = ['.tmp'];
 
 export default (app: Router) => {
   app.use('/logs', route);
@@ -14,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,
@@ -30,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,
@@ -41,6 +37,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);
       }
     },

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,7 +3,6 @@ import {
   getFileContentByName,
   readDirs,
   getLastModifyFilePath,
-  readDir,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
@@ -11,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,
@@ -66,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);
       }
     },
@@ -73,7 +52,14 @@ 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 {
@@ -83,7 +69,6 @@ export default (app: Router) => {
           content: string;
           originFilename: string;
         };
-
         if (!path) {
           path = config.scriptPath;
         }
@@ -99,18 +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 (!originFilename) {
           originFilename = filename;
         }
         const originFilePath = `${path}${originFilename.replace(/\//g, '')}`;
         const filePath = `${path}${filename.replace(/\//g, '')}`;
         if (fs.existsSync(originFilePath)) {
+          if (!fs.existsSync(config.bakPath)) {
+            fs.mkdirSync(config.bakPath);
+          }
           fs.copyFileSync(
             originFilePath,
             `${config.bakPath}${originFilename.replace(/\//g, '')}`,
@@ -122,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);
       }
     },
@@ -133,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) => {
@@ -148,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);
       }
     },
@@ -172,6 +156,7 @@ export default (app: Router) => {
         fs.unlinkSync(filePath);
         res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -202,6 +187,7 @@ export default (app: Router) => {
           return next(err);
         });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -212,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);
       }
     },
@@ -238,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

@@ -54,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);
       }
     },
@@ -75,6 +76,7 @@ export default (app: Router) => {
         );
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -89,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);
       }
     },
@@ -103,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);
       }
     },
@@ -123,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,18 +1,20 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
+
 import config from './config';
+
 import express from 'express';
+
 import Logger from './loaders/logger';
-import path from 'path';
 
 async function startServer() {
   const app = express();
 
-  await require('./loaders/db').default();
-
   await require('./loaders/initFile').default();
 
   await require('./loaders/sentry').default({ expressApp: app });
 
+  await require('./loaders/db').default();
+
   await require('./loaders/app').default({ expressApp: app });
 
   const server = app

back/config/index.ts

@@ -4,21 +4,10 @@ import { createRandomString } from './util';
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-if (!process.env.QL_DIR) {
-  // 声明QL_DIR环境变量
-  let qlHomePath = path.join(__dirname, '../../');
-  // 生产环境
-  if (qlHomePath.endsWith('/static/')) {
-    qlHomePath = path.join(qlHomePath, '../');
-  }
-  process.env.QL_DIR = qlHomePath;
-}
-
 const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;
 
-const rootPath = process.env.QL_DIR as string;
+const envFound = dotenv.config();
-const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
+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,7 +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';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -278,80 +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))
+    const subPath = path.join(dir, file);
-    .map((file: string) => {
+    const stats = fs.statSync(subPath);
-      const subPath = path.join(dir, file);
+    const key = path.join(relativePath, file);
-      const stats = fs.statSync(subPath);
+    if (stats.isDirectory()) {
-      const key = path.join(relativePath, file);
-      if (stats.isDirectory()) {
-        return {
-          title: file,
-          key,
-          type: 'directory',
-          disabled: true,
-          parent: relativePath,
-          children: readDirs(subPath, baseDir).sort(
-            (a: any, b: any) =>
-              (FileType as any)[a.type] - (FileType as any)[b.type],
-          ),
-        };
-      }
       return {
         title: file,
-        type: 'file',
+        value: file,
         key,
+        type: 'directory',
+        disabled: true,
         parent: relativePath,
+        children: readDirs(subPath, baseDir),
       };
-    });
+    }
-  return result.sort(
+    return {
-    (a: any, b: any) => (FileType as any)[a.type] - (FileType as any)[b.type],
+      title: file,
-  );
+      value: file,
-}
+      type: 'file',
-
+      key,
-export function readDir(
+      parent: relativePath,
-  dir: string,
+    };
-  baseDir: string = '',
+  });
-  blacklist: string[] = [],
-) {
-  const relativePath = path.relative(baseDir, dir);
-  const files = fs.readdirSync(dir);
-  const result: any = files
-    .filter((x) => !blacklist.includes(x))
-    .map((file: string) => {
-      const subPath = path.join(dir, file);
-      const stats = fs.statSync(subPath);
-      const key = path.join(relativePath, file);
-      return {
-        title: file,
-        type: stats.isDirectory() ? 'directory' : 'file',
-        key,
-        parent: relativePath,
-      };
-    });
   return result;
 }
-
-export function promiseExec(command: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    exec(
-      command,
-      { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
-      (err, stdout, stderr) => {
-        resolve(stdout || stderr || JSON.stringify(err));
-      },
-    );
-  });
-}

back/data/cronView.ts

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

@@ -80,6 +80,13 @@ export default ({ app }: { app: Application }) => {
     ) {
       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) {
@@ -129,6 +136,7 @@ export default ({ app }: { app: Application }) => {
   });
 
   app.use(errors());
+  app.use(Sentry.Handlers.errorHandler());
 
   app.use(
     (
@@ -147,29 +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());
-
   app.use(
     (
       err: Error & { status: number },

back/loaders/initData.ts

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

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

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

@@ -10,7 +10,6 @@ import { promises, existsSync } from 'fs';
 import { promisify } from 'util';
 import { Op } from 'sequelize';
 import path from 'path';
-import dayjs from 'dayjs';
 
 @Service()
 export default class CronService {
@@ -113,56 +112,8 @@ 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 = {};
-      for (const col of viewQuery.filters) {
-        const { property, value, operation } = col;
-        let operate = null;
-        switch (operation) {
-          case 'Reg':
-            operate = Op.like;
-            break;
-          case 'NotReg':
-            operate = Op.notLike;
-            break;
-          case 'In':
-            query[Op.or] = [
-              {
-                [property]: value,
-              },
-              property === 'status' && value.includes(2)
-                ? { isDisabled: 1 }
-                : {},
-            ];
-            break;
-          case 'Nin':
-            query[Op.and] = [
-              {
-                [property]: {
-                  [Op.notIn]: value,
-                },
-              },
-              property === 'status' && value.includes(2)
-                ? { isDisabled: { [Op.ne]: 1 } }
-                : {},
-            ];
-            break;
-          default:
-            break;
-        }
-        if (operate) {
-          query[property] = {
-            [Op.or]: [
-              { [operate]: `%${value}%` },
-              { [operate]: `%${encodeURIComponent(value)}%` },
-            ],
-          };
-        }
-      }
-    }
-  }
-
-  private formatSearchText(query: any, searchText: string | undefined) {
     if (searchText) {
       const textArray = searchText.split(':');
       switch (textArray[0]) {
@@ -206,58 +157,12 @@ export default class CronService {
           break;
       }
     }
-  }
-
-  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;
-    sortField: string;
-    sortType: string;
-    queryString: string;
-  }): Promise<{ data: Crontab[]; total: number }> {
-    const searchText = params?.searchValue;
-    const page = Number(params?.page || '0');
-    const size = Number(params?.size || '0');
-    const sortField = params?.sortField || '';
-    const sortType = params?.sortType || '';
-    const viewQuery = JSON.parse(params?.queryString || '{}');
-
-    let query: any = {};
-    let order = [
-      ['isPinned', 'DESC'],
-      ['isDisabled', 'ASC'],
-      ['status', 'ASC'],
-      ['createdAt', 'DESC'],
-    ];
-
-    this.formatViewQuery(query, viewQuery);
-    this.formatSearchText(query, searchText);
-    this.formatViewSort(order, viewQuery);
-
-    if (sortType && sortField) {
-      order.unshift([sortField, sortType]);
-    }
-    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;
     }
@@ -292,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}`,
+            .replace(' 24:', ' 00:')} `,
         );
       }
     }
@@ -331,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 {
@@ -373,13 +269,7 @@ 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`;
       }
 
@@ -402,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 } },
@@ -535,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 { initEnvPosition } from '../data/env';
-
-@Service()
-export default class CronViewService {
-  constructor(@Inject('logger') private logger: winston.Logger) {}
-
-  public async create(payload: CrontabView): Promise<CrontabView> {
-    let position = initEnvPosition;
-    const views = await this.list();
-    if (views && views.length > 0 && views[views.length - 1].position) {
-      position = views[views.length - 1].position as number;
-    }
-    position = position / 2;
-    const tab = new CrontabView({ ...payload, position });
-    const doc = await this.insert(tab);
-    return doc;
-  }
-
-  public async insert(payload: CrontabView): Promise<CrontabView> {
-    return await CrontabViewModel.create(payload, { returning: true });
-  }
-
-  public async update(payload: CrontabView): Promise<CrontabView> {
-    const newDoc = await this.updateDb(payload);
-    return newDoc;
-  }
-
-  public async updateDb(payload: CrontabView): Promise<CrontabView> {
-    await CrontabViewModel.update(payload, { where: { id: payload.id } });
-    return await this.getDb({ id: payload.id });
-  }
-
-  public async remove(ids: number[]) {
-    await CrontabViewModel.destroy({ where: { id: ids } });
-  }
-
-  public async list(): Promise<CrontabView[]> {
-    try {
-      const result = await CrontabViewModel.findAll({
-        where: {},
-        order: [['position', 'DESC']],
-      });
-      return result;
-    } catch (error) {
-      throw error;
-    }
-  }
-
-  public async getDb(query: any): Promise<CrontabView> {
-    const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as CrontabView);
-  }
-
-  public async disabled(ids: number[]) {
-    await CrontabViewModel.update({ isDisabled: 1 }, { where: { id: ids } });
-  }
-
-  public async enabled(ids: number[]) {
-    await CrontabViewModel.update({ isDisabled: 0 }, { where: { id: ids } });
-  }
-
-  public async move({
-    id,
-    fromIndex,
-    toIndex,
-  }: {
-    fromIndex: number;
-    toIndex: number;
-    id: number;
-  }): Promise<CrontabView> {
-    let targetPosition: number;
-    const isUpward = fromIndex > toIndex;
-    const views = await this.list();
-    if (toIndex === 0 || toIndex === views.length - 1) {
-      targetPosition = isUpward
-        ? views[0].position * 2
-        : views[toIndex].position / 2;
-    } else {
-      targetPosition = isUpward
-        ? (views[toIndex].position + views[toIndex - 1].position) / 2
-        : (views[toIndex].position + views[toIndex + 1].position) / 2;
-    }
-    const newDoc = await this.update({
-      id,
-      position: targetPosition,
-    });
-    return newDoc;
-  }
-}

back/services/dependence.ts

@@ -14,7 +14,6 @@ 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 {
@@ -162,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' });
 
@@ -205,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

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

back/services/notify.ts

@@ -245,7 +245,7 @@ export default class NotificationService {
     const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] =
       weWorkAppKey.split(',');
     const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
-    const tokenRes: any = await got
+    const { access_token } = await got
       .post(url, {
         timeout: this.timeout,
         retry: 0,
@@ -296,7 +296,7 @@ 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}`,
         {
           timeout: this.timeout,
           retry: 0,

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,11 +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';
 
 @Service()
 export default class ScriptService {
@@ -13,43 +10,44 @@ 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',

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,7 +28,6 @@ import ScheduleService, { TaskCallbacks } from './schedule';
 import { SimpleIntervalSchedule } from 'toad-scheduler';
 import SockService from './sock';
 import SshKeyService from './sshKey';
-import dayjs from 'dayjs';
 
 @Service()
 export default class SubscriptionService {
@@ -42,22 +41,47 @@ export default class SubscriptionService {
   public async list(searchText?: string): Promise<Subscription[]> {
     let query = {};
     if (searchText) {
-      const reg = {
+      const textArray = searchText.split(':');
-        [Op.or]: [
+      switch (textArray[0]) {
-          { [Op.like]: `%${searchText}%` },
+        case 'name':
-          { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+        case 'command':
-        ],
+        case 'schedule':
-      };
+        case 'label':
-      query = {
+          const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-        [Op.or]: [
+          query = {
-          {
+            [column]: {
-            name: reg,
+              [Op.or]: [
-          },
+                { [Op.like]: `%${textArray[1]}%` },
-          {
+                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
-            url: reg,
+              ],
-          },
+            },
-        ],
+          };
-      };
+          break;
+        default:
+          const reg = {
+            [Op.or]: [
+              { [Op.like]: `%${searchText}%` },
+              { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+            ],
+          };
+          query = {
+            [Op.or]: [
+              {
+                name: reg,
+              },
+              {
+                command: reg,
+              },
+              {
+                schedule: reg,
+              },
+              {
+                labels: reg,
+              },
+            ],
+          };
+          break;
+      }
     }
     try {
       const result = await SubscriptionModel.findAll({
@@ -168,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 } },
         );
@@ -195,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);
@@ -214,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) {
@@ -269,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;
   }
 
@@ -343,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')} `,
+        `${str}\n## 执行结束...  ${new Date()
+          .toLocaleString('zh', { hour12: false })
+          .replace(' 24:', ' 00:')} `,
       );
     }
 

back/services/user.ts

@@ -13,7 +13,7 @@ import { Request } from 'express';
 import ScheduleService from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
-import dayjs from 'dayjs';
+import got from 'got';
 
 @Service()
 export default class UserService {
@@ -111,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}`,
         );
@@ -140,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}`,
         );

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

@@ -9,7 +9,6 @@ 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
 echo
 

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,42 +16,42 @@ 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;
   gzip_static on;    
   gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript;
-  gzip_proxied any;
+  gzip_proxied  any;
   gzip_vary on;
   gzip_comp_level 6;
   gzip_buffers 16 8k;
   gzip_http_version 1.0;  
 
-  location QL_BASE_URL/ {
+  location / {
-    index index.html index.htm;
+    index  index.html index.htm;
-    try_files $uri $uri/ QL_BASE_URL/index.html;
+    try_files $uri $uri/ /index.html;
   }
 
   location ~ .*\.(html)$ {

docker/nginx.conf

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

package.json

@@ -31,13 +31,17 @@
       "allowedVersions": {
         "react": "17",
         "react-dom": "17"
-      }
+      },
+      "ignoreMissing": [
+        "monaco-editor",
+        "react-router"
+      ]
     }
   },
   "dependencies": {
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^7.0.0",
+    "@sentry/node": "^6.18.1",
-    "@sentry/tracing": "^7.0.0",
+    "@sentry/tracing": "^6.18.1",
     "body-parser": "^1.19.2",
     "celebrate": "^15.0.1",
     "chokidar": "^3.5.3",
@@ -59,10 +63,10 @@
     "nodemailer": "^6.7.2",
     "p-queue": "7.2.0",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.20.1",
+    "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",
@@ -73,7 +77,7 @@
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.33.1",
     "@monaco-editor/react": "^4.3.1",
-    "@sentry/react": "^7.0.0",
+    "@sentry/react": "^6.18.1",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
@@ -117,7 +121,6 @@
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.6.0",
-    "tslib": "^2.4.0",
     "typescript": "^4.6.2",
     "umi": "^3.5.21",
     "umi-request": "^1.4.0",

sample/config.sample.sh

@@ -29,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"
 
@@ -47,7 +39,7 @@ AutoStartBot=""
 BotRepoUrl=""
 
 ## 安装bot依赖时指定pip源，默认使用清华源，如不需要源，设置此参数为空
-PipMirror="https://pypi.doubanio.com/simple/"
+PipMirror="https://pypi.tuna.tsinghua.edu.cn/simple"
 
 ## 通知环境变量
 ## 1. Server酱

sample/notify.js

@@ -97,13 +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 = '';
-
 //==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
   GOTIFY_URL = process.env.GOTIFY_URL;
@@ -730,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]) {

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/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,7 +88,6 @@ check_pm2() {
 
 main() {
   echo -e "=====> 开始检测"
-  npm i -g pnpm
   pnpm add -g pm2
   copy_dep
   check_ql

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"}
@@ -100,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
@@ -247,11 +248,11 @@ fix_config() {
 npm_install_sub() {
     set_proxy
     if [ $is_termux -eq 1 ]; then
-        npm install --production --no-bin-links --registry=https://registry.npmmirror.com || npm install --production --no-bin-links
+        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 --registry=https://registry.npmmirror.com || npm install --production
+        npm install --production --registry=https://registry.npm.taobao.org || npm install --production
     else
-        pnpm install --loglevel error --production --registry=https://registry.npmmirror.com || pnpm install --production --loglevel error
+        pnpm install --loglevel error --production --registry=https://registry.npm.taobao.org || pnpm install --production --loglevel error
     fi
     unset_proxy
 }
@@ -379,52 +380,6 @@ reload_pm2() {
     pm2 start $dir_static/build/public.js -n public --source-map-support --time &>/dev/null
 }
 
-diff_time() {
-    local format="$1"
-    local begin_time="$2"
-    local end_time="$3"
-
-    if [[ $is_macos -eq 1 ]]; then
-        diff_time=$(($(date -j -f "$format" "$end_time" +%s) - $(date -j -f "$format" "$begin_time" +%s)))
-    else
-        diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    fi
-    echo "$diff_time"
-}
-
-format_time() {
-    local format="$1"
-    local time="$2"
-
-    if [[ $is_macos -eq 1 ]]; then
-        echo $(date -j -f "$format" "$time" "+%Y-%m-%d %H:%M:%S")
-    else
-        echo $(date -d "$time" "+%Y-%m-%d %H:%M:%S")
-    fi
-}
-
-format_log_time() {
-    local format="$1"
-    local time="$2"
-
-    if [[ $is_macos -eq 1 ]]; then
-        echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S")
-    else
-        echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
-    fi
-}
-
-format_timestamp() {
-    local format="$1"
-    local time="$2"
-
-    if [[ $is_macos -eq 1 ]]; then
-        echo $(date -j -f "$format" "$time" "+%s")
-    else
-        echo $(date -d "$time" "+%s")
-    fi
-}
-
 init_env
 detect_termux
 detect_macos

shell/task.sh

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

shell/update.sh

@@ -12,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
 }
@@ -307,6 +305,7 @@ patch_version() {
     fi
 
     # 兼容pnpm@7 
+    npm i -g pnpm
     pnpm setup
     source ~/.bashrc
 
@@ -388,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
@@ -491,6 +487,7 @@ main() {
         run_extra_shell >>$log_path
         ;;
     repo)
+        get_user_info
         get_uniq_path "$p2" "$p6"
         if [[ -n $p2 ]]; then
             update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7"
@@ -500,6 +497,7 @@ main() {
         fi
         ;;
     raw)
+        get_user_info
         get_uniq_path "$p2"
         if [[ -n $p2 ]]; then
             update_raw "$p2"
@@ -541,7 +539,7 @@ main() {
         ;;
     esac
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local diff_time=$(diff_time "%Y-%m-%d %H:%M:%S" "$begin_time" "$end_time")
+    local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
     if [[ $p1 != "repo" ]] && [[ $p1 != "raw" ]]; then
         echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >>$log_path
         cat $log_path

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

src/layouts/index.tsx

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

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';
@@ -107,7 +106,7 @@ const CronDetailModal = ({
           glyphMargin: false,
           wordWrap: 'on',
         }}
-        onMount={(editor, monaco) => {
+        onMount={(editor) => {
           editorRef.current = editor;
         }}
       />
@@ -353,11 +352,6 @@ const CronDetailModal = ({
     });
   };
 
-  const fullscreen = () => {
-    const editorElement = editorRef.current._domElement as HTMLElement;
-    editorElement.parentElement?.requestFullscreen();
-  };
-
   useEffect(() => {
     if (cron && cron.id) {
       setCurrentCron(cron);
@@ -535,20 +529,13 @@ const CronDetailModal = ({
           }}
           tabBarExtraContent={
             activeTabKey === 'script' && (
-              <>
+              <Button
-                <Button
+                type="primary"
-                  type="primary"
+                style={{ marginRight: 8 }}
-                  style={{ marginRight: 8 }}
+                onClick={saveFile}
-                  onClick={saveFile}
+              >
-                >
+                保存
-                  保存
+              </Button>
-                </Button>
-                <Button
-                  type="primary"
-                  icon={<FullscreenOutlined />}
-                  onClick={fullscreen}
-                />
-              </>
             )
           }
         >

src/pages/crontab/index.less

@@ -101,76 +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;
-  }
-}
-
-tr.drop-over-downward td {
-  border-bottom: 2px dashed #1890ff;
-}
-
-tr.drop-over-upward td {
-  border-top: 2px dashed #1890ff;
-}
-
-.view-manage-modal {
-  .ant-modal-body {
-    padding-top: 10px;
-  }
-}

src/pages/crontab/index.tsx

@@ -12,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';
@@ -46,10 +39,6 @@ import { diffTime } from '@/utils/date';
 import { getTableScroll } from '@/utils/index';
 import { history } from 'umi';
 import './index.less';
-import ViewCreateModal from './viewCreateModal';
-import ViewManageModal from './viewManageModal';
-import pagination from 'antd/lib/pagination';
-import { FilterValue, SorterResult } from 'antd/lib/table/interface';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -133,7 +122,8 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         </>
       ),
       sorter: {
-        compare: (a: any, b: any) => a?.name?.localeCompare(b?.name),
+        compare: (a: any, b: any) => a.name.localeCompare(b.name),
+        multiple: 2,
       },
     },
     {
@@ -158,6 +148,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       },
       sorter: {
         compare: (a: any, b: any) => a.command.localeCompare(b.command),
+        multiple: 3,
       },
     },
     {
@@ -168,6 +159,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       align: 'center' as const,
       sorter: {
         compare: (a: any, b: any) => a.schedule.localeCompare(b.schedule),
+        multiple: 1,
       },
     },
     {
@@ -354,24 +346,12 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
   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;
-    sorter: any;
-  }>({} as any);
-  const [viewConf, setViewConf] = useState<any>();
   const [tableScrollHeight, setTableScrollHeight] = useState<number>();
   const [isDetailModalVisible, setIsDetailModalVisible] = useState(false);
   const [detailCron, setDetailCron] = useState<any>();
   const [searchValue, setSearchValue] = useState('');
-  const [total, setTotal] = useState<number>();
-  const [isCreateViewModalVisible, setIsCreateViewModalVisible] =
-    useState(false);
-  const [isViewManageModalVisible, setIsViewManageModalVisible] =
-    useState(false);
-  const [cronViews, setCronViews] = useState<any[]>([]);
-  const [enabledCronViews, setEnabledCronViews] = useState<any[]>([]);
-  const [moreMenuActive, setMoreMenuActive] = useState(false);
 
   const goToScriptManager = (record: any) => {
     const cmd = record.command.split(' ') as string[];
@@ -393,35 +373,37 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
 
   const getCrons = () => {
     setLoading(true);
-    const { page, size, sorter } = pageConf;
-    let url = `${config.apiPrefix}crons?searchValue=${searchText}&page=${page}&size=${size}`;
-    if (sorter && sorter.field) {
-      url += `&sortField=${sorter.field}&sortType=${
-        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((_data: any) => {
+      .then((data: any) => {
-        const { data, total } = _data.data;
         setValue(
-          data.map((x) => {
+          data.data
-            return {
+            .sort((a: any, b: any) => {
-              ...x,
+              const sortA =
-              nextRunTime: cron_parser
+                a.isPinned && a.status !== 0
-                .parseExpression(x.schedule)
+                  ? 5
-                .next()
+                  : a.isDisabled && a.status !== 0
-                .toDate(),
+                  ? 4
-            };
+                  : a.status;
-          }),
+              const sortB =
+                b.isPinned && b.status !== 0
+                  ? 5
+                  : b.isDisabled && b.status !== 0
+                  ? 4
+                  : b.status;
+              return CrontabSort[sortA] - CrontabSort[sortB];
+            })
+            .map((x) => {
+              return {
+                ...x,
+                nextRunTime: cron_parser
+                  .parseExpression(x.schedule)
+                  .next()
+                  .toDate(),
+              };
+            }),
         );
-        setTotal(total);
+        setCurrentPage(1);
       })
       .finally(() => setLoading(false));
   };
@@ -761,6 +743,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
   const rowSelection = {
     selectedRowIds,
     onChange: onSelectChange,
+    selections: [
+      Table.SELECTION_ALL,
+      Table.SELECTION_INVERT,
+      Table.SELECTION_NONE,
+    ],
   };
 
   const delCrons = () => {
@@ -809,14 +796,10 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
     });
   };
 
-  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 });
-    localStorage.setItem('pageSize', String(pageSize));
   };
 
   const getRowClassName = (record: any, index: number) => {
@@ -831,36 +814,39 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
   }, [logCron]);
 
   useEffect(() => {
-    setPageConf({ ...pageConf, page: 1 });
+    getCrons();
   }, [searchText]);
 
   useEffect(() => {
-    if (pageConf.page && pageConf.size) {
+    setPageSize(parseInt(localStorage.getItem('pageSize') || '20'));
-      getCrons();
-    }
-  }, [pageConf, viewConf]);
-
-  useEffect(() => {
-    if (viewConf && enabledCronViews && enabledCronViews.length > 0) {
-      const view = enabledCronViews.slice(2).find((x) => x.id === viewConf.id);
-      setMoreMenuActive(!!view);
-    }
-  }, [viewConf, enabledCronViews]);
-
-  useEffect(() => {
-    setPageConf({
-      page: 1,
-      size: parseInt(localStorage.getItem('pageSize') || '20'),
-      sorter: {},
-    });
     setTimeout(() => {
       setTableScrollHeight(getTableScroll());
     });
-    getCronViews();
   }, []);
 
-  const panelContent = (
+  return (
-    <>
+    <PageContainer
+      className="ql-container-wrapper crontab-wrapper"
+      title="定时任务"
+      extra={[
+        <Search
+          placeholder="请输入名称或者关键词"
+          style={{ width: 'auto' }}
+          enterButton
+          allowClear
+          loading={loading}
+          value={searchValue}
+          onChange={(e) => setSearchValue(e.target.value)}
+          onSearch={onSearch}
+        />,
+        <Button key="2" type="primary" onClick={() => addCron()}>
+          新建任务
+        </Button>,
+      ]}
+      header={{
+        style: headerStyle,
+      }}
+    >
       {selectedRowIds.length > 0 && (
         <div style={{ marginBottom: 16 }}>
           <Button type="primary" style={{ marginBottom: 5 }} onClick={delCrons}>
@@ -920,16 +906,15 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
       <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 {
@@ -946,134 +931,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         loading={loading}
         rowSelection={rowSelection}
         rowClassName={getRowClassName}
-        onChange={onPageChange}
       />
-    </>
-  );
-
-  const viewAction = (key: string) => {
-    switch (key) {
-      case 'new':
-        setIsCreateViewModalVisible(true);
-        break;
-      case 'manage':
-        setIsViewManageModalVisible(true);
-        break;
-
-      default:
-        tabClick(key);
-        break;
-    }
-  };
-
-  const menu = (
-    <Menu
-      onClick={({ key, domEvent }) => {
-        domEvent.stopPropagation();
-        viewAction(key);
-      }}
-      items={[
-        ...[...enabledCronViews].slice(2).map((x) => ({
-          label: (
-            <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
-              <span>{x.name}</span>
-              {viewConf?.id === x.id && (
-                <CheckOutlined style={{ color: '#1890ff' }} />
-              )}
-            </Space>
-          ),
-          key: x.id,
-          icon: <UnorderedListOutlined />,
-        })),
-        {
-          type: 'divider',
-        },
-        {
-          label: '新建视图',
-          key: 'new',
-          icon: <PlusOutlined />,
-        },
-        {
-          label: '视图管理',
-          key: 'manage',
-          icon: <SettingOutlined />,
-        },
-      ]}
-    />
-  );
-
-  const getCronViews = () => {
-    setLoading(true);
-    request
-      .get(`${config.apiPrefix}crons/views`)
-      .then((data: any) => {
-        setCronViews(data.data);
-        setEnabledCronViews(data.data.filter((x) => !x.isDisabled));
-      })
-      .finally(() => {
-        setLoading(false);
-      });
-  };
-
-  const tabClick = (key: string) => {
-    const view = enabledCronViews.find((x) => x.id == key);
-    setViewConf(view ? view : null);
-  };
-
-  return (
-    <PageContainer
-      className="ql-container-wrapper crontab-wrapper ql-container-wrapper-has-tab"
-      title="定时任务"
-      extra={[
-        <Search
-          placeholder="请输入名称或者关键词"
-          style={{ width: 'auto' }}
-          enterButton
-          allowClear
-          loading={loading}
-          value={searchValue}
-          onChange={(e) => setSearchValue(e.target.value)}
-          onSearch={onSearch}
-        />,
-        <Button key="2" type="primary" onClick={() => addCron()}>
-          新建任务
-        </Button>,
-      ]}
-      header={{
-        style: headerStyle,
-      }}
-    >
-      <Tabs
-        defaultActiveKey="all"
-        size="small"
-        tabPosition="top"
-        className={`crontab-view ${moreMenuActive ? 'more-active' : ''}`}
-        tabBarExtraContent={
-          <Dropdown
-            overlay={menu}
-            trigger={['click']}
-            overlayStyle={{ minWidth: 200 }}
-          >
-            <div className={`view-more ${moreMenuActive ? 'active' : ''}`}>
-              <Space>
-                更多
-                <DownOutlined />
-              </Space>
-              <div className="ant-tabs-ink-bar ant-tabs-ink-bar-animated"></div>
-            </div>
-          </Dropdown>
-        }
-        onTabClick={tabClick}
-      >
-        <Tabs.TabPane tab="全部任务" key="all">
-          {panelContent}
-        </Tabs.TabPane>
-        {[...enabledCronViews].slice(0, 2).map((x) => (
-          <Tabs.TabPane tab={x.name} key={x.id}>
-            {panelContent}
-          </Tabs.TabPane>
-        ))}
-      </Tabs>
       <CronLogModal
         visible={isLogModalVisible}
         handleCancel={() => {
@@ -1106,29 +964,6 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
         theme={theme}
         isPhone={isPhone}
       />
-      <ViewCreateModal
-        visible={isCreateViewModalVisible}
-        handleCancel={(data) => {
-          setIsCreateViewModalVisible(false);
-          getCronViews();
-          if (data && data.id === viewConf.id) {
-            setViewConf({ ...viewConf, ...data });
-          }
-        }}
-      />
-      <ViewManageModal
-        cronViews={cronViews}
-        visible={isViewManageModalVisible}
-        handleCancel={() => {
-          setIsViewManageModalVisible(false);
-        }}
-        cronViewChange={(data) => {
-          getCronViews();
-          if (data && data.id === viewConf.id) {
-            setViewConf({ ...viewConf, ...data });
-          }
-        }}
-      />
     </PageContainer>
   );
 };

src/pages/crontab/viewCreateModal.tsx

@@ -1,263 +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) {
-        message.error(data);
-      }
-      setLoading(false);
-      handleCancel(data);
-    } catch (error: any) {
-      setLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    if (!view) {
-      form.resetFields();
-    }
-    form.setFieldsValue(
-      view || {
-        filters: [{ property: 'command', operation: 'Reg' }],
-      },
-    );
-  }, [view, visible]);
-
-  const operationElement = (
-    <Select
-      style={{ width: 100 }}
-      onChange={() => {
-        setOperationMap({});
-      }}
-    >
-      {OPERATIONS.map((x) => (
-        <Select.Option key={x.name} value={x.value}>
-          {x.name}
-        </Select.Option>
-      ))}
-    </Select>
-  );
-
-  const propertyElement = (props: any) => {
-    return (
-      <Select style={{ width: 120 }}>
-        {props.map((x) => (
-          <Select.Option key={x.name} value={x.value}>
-            {x.name}
-          </Select.Option>
-        ))}
-      </Select>
-    );
-  };
-
-  const typeElement = (
-    <Select style={{ width: 120 }}>
-      {SORTTYPES.map((x) => (
-        <Select.Option key={x.name} value={x.value}>
-          {x.name}
-        </Select.Option>
-      ))}
-    </Select>
-  );
-
-  const statusElement = (
-    <Select mode="multiple" allowClear placeholder="请选择状态">
-      {STATUS.map((x) => (
-        <Select.Option key={x.name} value={x.value}>
-          {x.name}
-        </Select.Option>
-      ))}
-    </Select>
-  );
-
-  return (
-    <Modal
-      title={view ? '编辑视图' : '新建视图'}
-      visible={visible}
-      forceRender
-      width={580}
-      centered
-      maskClosable={false}
-      onOk={() => {
-        form
-          .validateFields()
-          .then((values) => {
-            handleOk(values);
-          })
-          .catch((info) => {
-            console.log('Validate Failed:', info);
-          });
-      }}
-      onCancel={() => handleCancel()}
-      confirmLoading={loading}
-    >
-      <Form form={form} layout="vertical" name="env_modal">
-        <Form.Item
-          name="name"
-          label="视图名称"
-          rules={[{ required: true, message: '请输入视图名称' }]}
-        >
-          <Input placeholder="请输入视图名称" />
-        </Form.Item>
-        <Form.List name="filters">
-          {(fields, { add, remove }) => (
-            <>
-              {fields.map(({ key, name, ...restField }, index) => (
-                <Form.Item
-                  label={index === 0 ? '筛选条件' : ''}
-                  key={key}
-                  style={{ marginBottom: 0 }}
-                >
-                  <Space className="view-create-modal-filters" align="baseline">
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'property']}
-                      rules={[{ required: true }]}
-                    >
-                      {propertyElement(PROPERTIES)}
-                    </Form.Item>
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'operation']}
-                      rules={[{ required: true }]}
-                    >
-                      {operationElement}
-                    </Form.Item>
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'value']}
-                      rules={[{ required: true, message: '请输入内容' }]}
-                    >
-                      {['In', 'Nin'].includes(
-                        form.getFieldValue(['filters', index, 'operation']),
-                      ) ? (
-                        statusElement
-                      ) : (
-                        <Input placeholder="请输入内容" />
-                      )}
-                    </Form.Item>
-                    {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-filters" align="baseline">
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'property']}
-                      rules={[{ required: true }]}
-                    >
-                      {propertyElement(PROPERTIES)}
-                    </Form.Item>
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'type']}
-                      rules={[{ required: true }]}
-                    >
-                      {typeElement}
-                    </Form.Item>
-                    {index !== 0 && (
-                      <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,269 +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((data: any) => {
-            if (data.code === 200) {
-              message.success('删除成功');
-              cronViewChange();
-            } else {
-              message.error(data);
-            }
-          });
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  };
-
-  const onShowChange = (checked: boolean, record: any, index: number) => {
-    console.log(checked);
-    request
-      .put(`${config.apiPrefix}crons/views/${checked ? 'enable' : 'disable'}`, {
-        data: [record.id],
-      })
-      .then((data: any) => {
-        if (data.code === 200) {
-          const _list = [...list];
-          _list.splice(index, 1, { ...list[index], isDisabled: !checked });
-          setList(_list);
-          cronViewChange();
-        } else {
-          message.error(data);
-        }
-      });
-  };
-
-  const components = {
-    body: {
-      row: DragableBodyRow,
-    },
-  };
-
-  const moveRow = useCallback(
-    (dragIndex, hoverIndex) => {
-      if (dragIndex === hoverIndex) {
-        return;
-      }
-      const dragRow = list[dragIndex];
-      request
-        .put(`${config.apiPrefix}crons/views/move`, {
-          data: { fromIndex: dragIndex, toIndex: hoverIndex, id: dragRow.id },
-        })
-        .then((data: any) => {
-          if (data.code === 200) {
-            const newData = [...list];
-            newData.splice(dragIndex, 1);
-            newData.splice(hoverIndex, 0, { ...dragRow, ...data.data });
-            setList(newData);
-            cronViewChange();
-          } else {
-            message.error(data);
-          }
-        });
-    },
-    [list],
-  );
-
-  useEffect(() => {
-    setList(cronViews);
-  }, [cronViews]);
-
-  return (
-    <Modal
-      title="视图管理"
-      visible={visible}
-      centered
-      width={620}
-      onCancel={() => handleCancel()}
-      className="view-manage-modal"
-      forceRender
-      footer={false}
-      maskClosable={false}
-    >
-      <Space
-        style={{
-          display: 'flex',
-          justifyContent: 'flex-end',
-          marginBottom: 10,
-        }}
-      >
-        <Button
-          key="2"
-          type="primary"
-          onClick={() => 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) => {
-          cronViewChange(data);
-          setIsCreateViewModalVisible(false);
-        }}
-      />
-    </Modal>
-  );
-};
-
-export default ViewManageModal;

src/pages/dependence/index.tsx

@@ -444,7 +444,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
 
   return (
     <PageContainer
-      className="ql-container-wrapper dependence-wrapper ql-container-wrapper-has-tab"
+      className="ql-container-wrapper dependence-wrapper"
       title="依赖管理"
       extra={[
         <Search

src/pages/env/index.tsx

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

src/pages/log/index.tsx

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

src/pages/login/index.tsx

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

src/pages/script/editModal.tsx

@@ -66,7 +66,7 @@ const EditModal = ({
 
   const getDetail = (node: any) => {
     request
-      .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`)
+      .get(`${config.apiPrefix}scripts/${node.value}?path=${node.parent || ''}`)
       .then((data) => {
         setValue(data.data);
       });
@@ -74,13 +74,11 @@ const EditModal = ({
 
   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((data) => {
@@ -89,16 +87,14 @@ const EditModal = ({
   };
 
   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((data) => {
@@ -117,7 +113,8 @@ const EditModal = ({
       return;
     }
 
-    if (_message.includes('执行结束')) {
+    if (_message === '执行结束') {
+      _message = '';
       setTimeout(() => {
         setIsRunning(false);
       }, 300);
@@ -149,7 +146,6 @@ const EditModal = ({
             dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
             treeData={treeData}
             placeholder="请选择脚本文件"
-            fieldNames={{ value: 'key', label: 'title' }}
             showSearch
             onSelect={onSelect}
           />
@@ -247,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,30 +21,21 @@ const EditScriptNameModal = ({
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
   const [dirs, setDirs] = useState<any[]>([]);
-  const [file, setFile] = useState<File>();
-  const [type, setType] = useState<'blank' | 'upload'>('blank');
 
   const handleOk = async (values: any) => {
     setLoading(true);
     values.path = values.path || '';
-    const formData = new FormData();
-    formData.append('file', file as any);
-    formData.append('filename', values.filename);
-    formData.append('path', values.path);
-    formData.append('content', '');
     request
       .post(`${config.apiPrefix}scripts`, {
-        data: formData,
+        data: { filename: values.filename, path: values.path, content: '' },
       })
       .then(({ code, data }) => {
         if (code === 200) {
-          message.success('新建文件成功');
+          message.success('保存文件成功');
-          const key = values.path ? `${values.path}/` : '';
-          const filename = file ? file.name : values.filename;
           handleCancel({
-            filename,
+            filename: values.filename,
             path: values.path,
-            key: `${key}${filename}`,
+            key: `${values.path}-${values.filename}`,
           });
         } else {
           message.error(data);
@@ -64,42 +45,15 @@ const EditScriptNameModal = ({
       .finally(() => setLoading(false));
   };
 
-  const beforeUpload = (file: File) => {
-    setFile(file);
-    return false;
-  };
-
-  const typeChange = (e) => {
-    setType(e.target.value);
-  };
-
-  const getDirs = (data) => {
-    for (const item of data) {
-      if (item.children && item.children.length > 0) {
-        item.children = item.children
-          .filter((x) => x.type === 'directory')
-          .map((x) => ({ ...x, disabled: false }));
-        getDirs(item.children);
-      }
-    }
-    return data;
-  };
-
-  useEffect(() => {
-    const originDirs = treeData
-      .filter((x) => x.type === 'directory')
-      .map((x) => ({ ...x, disabled: false }));
-    const dirs = getDirs(originDirs);
-    setDirs(dirs);
-  }, [treeData]);
-
   useEffect(() => {
     form.resetFields();
+    const originDirs = treeData.filter((x) => x.disabled);
+    setDirs([{ key: '' }, ...originDirs]);
   }, [visible]);
 
   return (
     <Modal
-      title="新建脚本"
+      title="新建文件"
       visible={visible}
       forceRender
       centered
@@ -119,44 +73,23 @@ const EditScriptNameModal = ({
     >
       <Form form={form} layout="vertical" name="edit_name_modal">
         <Form.Item
-          name="type"
+          name="filename"
-          label="类型"
+          label="文件名"
-          rules={[{ required: true }]}
+          rules={[{ required: true, message: '请输入文件名' }]}
-          initialValue={'blank'}
         >
-          <Radio.Group onChange={typeChange}>
+          <Input placeholder="请输入文件名" />
-            <Radio value="blank">空文件</Radio>
-            <Radio value="upload">本地上传</Radio>
-          </Radio.Group>
         </Form.Item>
-        {type === 'blank' && (
+        <Form.Item
-          <Form.Item
+          label="父目录"
-            name="filename"
+          name="path"
-            label="文件名"
+          initialValue={dirs && dirs.length > 0 ? dirs[0].key : ''}
-            rules={[{ required: true, message: '请输入文件名' }]}
+        >
-          >
+          <Select placeholder="请选择父目录">
-            <Input placeholder="请输入文件名" />
+            {dirs.map((x) => (
-          </Form.Item>
+              <Option value={x.key}>{x.key || '根'}</Option>
-        )}
+            ))}
-        <Form.Item label="父目录" name="path">
+          </Select>
-          <TreeSelect
-            allowClear
-            treeData={dirs}
-            fieldNames={{ value: 'key', label: 'title' }}
-            placeholder="请选择父目录"
-            treeDefaultExpandAll
-          />
         </Form.Item>
-        {type === 'upload' && (
-          <Form.Item label="文件" name="file">
-            <Upload.Dragger beforeUpload={beforeUpload} maxCount={1}>
-              <p className="ant-upload-drag-icon">
-                <UploadOutlined />
-              </p>
-              <p className="ant-upload-text">点击或者拖拽文件到此区域上传</p>
-            </Upload.Dragger>
-          </Form.Item>
-        )}
       </Form>
     </Modal>
   );

src/pages/script/index.tsx

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

src/pages/setting/index.tsx

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

src/pages/subscription/modal.tsx

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

src/utils/index.ts

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

src/utils/init.ts

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

src/version.ts

@@ -1,8 +1,8 @@
-export const version = '2.14.0';
+export const version = '2.13.1';
-export const changeLogLink = 'https://t.me/jiao_long/325';
+export const changeLogLink = 'https://t.me/jiao_long/303';
-export const changeLog = `2.14.0 版本说明
+export const changeLog = `2.13.1 版本说明
-1. 定时任务自定义视图功能来啦，支持自定义筛选条件、排序规则等
+1. 修复新建订阅repo命令快捷导入
-2. 配置文件可设置需要延迟的脚本后缀，默认只有js脚本随机延迟执行，感谢 https://github.com/cddjr
+2. 修复执行订阅任务含有before/after命令时，造成面板无法访问
-3. 修复定时任务搜索及搜索分页
+3. 修复任务详情日志列表访问
-4. 其他bug修复
+4. 修复安装依赖造成CPU满负荷，服务器崩溃
 `;