更新版本 v2.15.4

.github/workflows/build_docker_image.yml

@@ -17,16 +17,47 @@ on:
   workflow_dispatch:
 
 jobs:
+  to_gitlab:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: pixta-dev/repository-mirroring-action@v1
+        with:
+          target_repo_url:
+            git@gitlab.com:whyour/qinglong.git
+          ssh_private_key:
+            ${{ secrets.GITLAB_SSH_PK }}
+  
+  to_gitee:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: pixta-dev/repository-mirroring-action@v1
+        with:
+          target_repo_url:
+            git@gitee.com:whyour/qinglong.git
+          ssh_private_key:
+            ${{ secrets.GITLAB_SSH_PK }}
+
   build-static:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: latest
+
       - uses: actions/setup-node@v3
+        with:
+          cache: 'pnpm'
 
       - name: build front and back
         run: |
-          npm i -g pnpm
-          pnpm install
+          pnpm install --frozen-lockfile
           pnpm build:front
           pnpm build:back
 
@@ -34,6 +65,9 @@ jobs:
         env:
           GITHUB_REPO: github.com/${{ github.repository_owner }}/qinglong-static
           GITHUB_BRANCH: ${{ github.ref_name }}
+          REPO_GITEE: git@gitee.com:whyour/qinglong-static.git
+          REPO_GITLAB: git@gitlab.com:whyour/qinglong-static.git
+          PRIVATE_KEY: ${{ secrets.GITLAB_SSH_PK }}
         run: |
           mkdir -p tmp
           cd ./tmp
@@ -44,6 +78,16 @@ jobs:
           git commit --allow-empty -m "copy static at $(date +'%Y-%m-%d %H:%M:%S')"
           git push --force --quiet "https://${{ secrets.API_TOKEN }}@${GITHUB_REPO}.git" ${GITHUB_BRANCH}:${GITHUB_BRANCH}
 
+          mkdir -p ~/.ssh
+          echo "${PRIVATE_KEY}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+
+          export GIT_SSH_COMMAND="ssh -v -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -l git"
+          git remote add gitee "${REPO_GITEE}"
+          git remote add gitlab "${REPO_GITLAB}"
+          git push --force --quiet gitee ${GITHUB_BRANCH}:${GITHUB_BRANCH}
+          git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}
+
   build:
     needs: build-static
 
@@ -55,7 +99,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: latest
       - uses: actions/setup-node@v3
+        with:
+          cache: 'pnpm'
 
       - name: Setup timezone
         uses: zcong1993/setup-timezone@master
@@ -112,3 +161,6 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+      
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

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

README-en.md

@@ -22,7 +22,7 @@ Timed task management panel with python3, javaScript, shell, typescript support
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 </div>
 
-[![](https://user-images.githubusercontent.com/22700758/161788855-c4e51cb8-d4e9-44fe-bb17-ee1a56c8549b.png)](https://whyour.cn)
+[![](https://user-images.githubusercontent.com/22700758/203243067-1a8a570d-b1b4-4837-9f12-d78d83e31f35.jpg)](https://whyour.cn)
 
 [简体中文](./README.md) | English
 
@@ -41,7 +41,7 @@ Timed task management panel with python3, javaScript, shell, typescript support
 ### Local Deployment
 
 ```bash
-# To be completed
+# To be refined, see the development steps first (not supported on windows yet)
 ```
 
 ### Podman Deployment
@@ -161,6 +161,10 @@ task <file_path> now
 task <file_path> conc <env_name> <account_number>(Optional) 
 # Specify the account to execute and run immediately regardless of whether a random delay is set 
 task <file_path> desi <env_name> <account_number>       
+# Set task timeout   
+task -m <max_time> <file_path>
+# Print task log in real time, no need to carry this parameter when creating timed tasks
+task -l <file_path>  
 ```
 
 2. parameter description
@@ -175,6 +179,7 @@ task <file_path> desi <env_name> <account_number>
 * file_path: File path for task execution
 * env_name: The name of the environment variable that needs to be concurrent or specified at the time of task execution
 * account_number: Specify the account number of an environment variable to be executed when the task is executed
+* max_time: Timeout, suffix "s" for seconds (default), "m" for minutes, "h" for hours, "d" for days
 
 ## Links
 

README.md

@@ -22,7 +22,7 @@
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 </div>
 
-[![](https://user-images.githubusercontent.com/22700758/161788855-c4e51cb8-d4e9-44fe-bb17-ee1a56c8549b.png)](https://whyour.cn)
+[![](https://user-images.githubusercontent.com/22700758/203243067-1a8a570d-b1b4-4837-9f12-d78d83e31f35.jpg)](https://whyour.cn)
 
 简体中文 | [English](./README-en.md)
 
@@ -41,7 +41,7 @@
 ### 本机部署
 
 ```bash
-# 待完善
+# 待完善，可先参考开发步骤 (windows暂时不支持)
 ```
 
 ### podman 部署
@@ -160,6 +160,10 @@ task <file_path> now
 task <file_path> conc <env_name> <account_number>(可选的) 
 # 指定账号执行，无论是否设置了随机延迟，均立即运行 
 task <file_path> desi <env_name> <account_number>      
+# 设置任务超时时间   
+task -m <max_time> <file_path>
+# 实时打印任务日志，创建定时任务时，不用携带此参数
+task -l <file_path>
 ```
 
 2. 参数说明
@@ -175,6 +179,7 @@ task <file_path> desi <env_name> <account_number>
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称
 * account_number: 任务执行时指定某个环境变量需要执行的账号序号
+* max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 
 ## 链接
 

back/api/cron.ts

@@ -30,6 +30,7 @@ export default (app: Router) => {
         name: Joi.string().required(),
         sorts: Joi.array().optional().allow(null),
         filters: Joi.array().optional(),
+        filterRelation: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -51,13 +52,18 @@ export default (app: Router) => {
         id: Joi.number().required(),
         sorts: Joi.array().optional().allow(null),
         filters: Joi.array().optional(),
+        filterRelation: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {
         const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.update(req.body);
-        return res.send({ code: 200, data });
+        if (req.body.type === 1) {
+          return res.send({ code: 400, message: '参数错误' });
+        } else {
+          const data = await cronViewService.update(req.body);
+          return res.send({ code: 200, data });
+        }
       } catch (e) {
         return next(e);
       }

back/api/env.ts

@@ -109,7 +109,6 @@ export default (app: Router) => {
       }),
     }),
     async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
         const data = await envService.move(req.params.id, req.body);

back/api/script.ts

@@ -170,7 +170,7 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().allow(''),
-        type: Joi.string().optional()
+        type: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -255,23 +255,50 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
-        content: Joi.string().optional().allow(''),
         path: Joi.string().optional().allow(''),
+        pid: Joi.number().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, content, path } = req.body;
+        let { filename, path, pid } = req.body;
         const { name, ext } = parse(filename);
         const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
 
         const scriptService = Container.get(ScriptService);
-        const result = await scriptService.stopScript(filePath);
+        const result = await scriptService.stopScript(filePath, pid);
         res.send(result);
       } catch (e) {
         return next(e);
       }
     },
   );
+
+  route.put(
+    '/rename',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().allow(''),
+        newFilename: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        let { filename, path, type, newFilename } = req.body as {
+          filename: string;
+          path: string;
+          type: string;
+          newFilename: string;
+        };
+        const filePath = join(config.scriptPath, path, filename);
+        const newPath = join(config.scriptPath, path, newFilename);
+        fs.renameSync(filePath, newPath);
+        res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };

back/api/subscription.ts

@@ -49,6 +49,7 @@ export default (app: Router) => {
         sub_after: Joi.string().optional().allow('').allow(null),
         schedule_type: Joi.string().required(),
         alias: Joi.string().required(),
+        proxy: Joi.string().optional().allow('').allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -177,6 +178,7 @@ export default (app: Router) => {
         sub_before: Joi.string().optional().allow('').allow(null),
         sub_after: Joi.string().optional().allow('').allow(null),
         alias: Joi.string().required(),
+        proxy: Joi.string().optional().allow('').allow(null),
         id: Joi.number().required(),
       }),
     }),

back/api/system.ts

@@ -7,6 +7,9 @@ import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
 import { EnvModel } from '../data/env';
+import { parseVersion, promiseExec } from '../config/util';
+import dayjs from 'dayjs';
+
 const route = Router();
 
 export default (app: Router) => {
@@ -18,10 +21,22 @@ export default (app: Router) => {
       const userService = Container.get(UserService);
       const authInfo = await userService.getUserInfo();
       const envCount = await EnvModel.count();
-      const versionRegx = /.*export const version = \'(.*)\'\;/;
-
-      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
-      const version = currentVersionFile.match(versionRegx)![1];
+      const { version, changeLog, changeLogLink } = await parseVersion(
+        config.versionFile,
+      );
+      const lastCommitTime = (
+        await promiseExec(
+          `cd ${config.rootPath} && git show -s --format=%ai | head -1`,
+        )
+      ).replace('\n', '');
+      const lastCommitId = (
+        await promiseExec(`cd ${config.rootPath} && git rev-parse --short HEAD`)
+      ).replace('\n', '');
+      const branch = (
+        await promiseExec(
+          `cd ${config.rootPath} && git symbolic-ref --short HEAD`,
+        )
+      ).replace('\n', '');
 
       let isInitialized = true;
       if (
@@ -37,6 +52,11 @@ export default (app: Router) => {
         data: {
           isInitialized,
           version,
+          lastCommitTime: dayjs(lastCommitTime).unix(),
+          lastCommitId,
+          branch,
+          changeLog,
+          changeLogLink,
         },
       });
     } catch (e) {

back/config/index.ts

@@ -14,7 +14,7 @@ if (!process.env.QL_DIR) {
   process.env.QL_DIR = qlHomePath.replace(/\/$/g, '');
 }
 
-const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;
+const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
@@ -40,7 +40,7 @@ const sqliteFile = path.join(samplePath, 'database.sqlite');
 const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
-const versionFile = path.join(rootPath, 'src/version.ts');
+const versionFile = path.join(rootPath, 'version.yaml');
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");

back/config/util.ts

@@ -4,6 +4,9 @@ import got from 'got';
 import iconv from 'iconv-lite';
 import { exec } from 'child_process';
 import FormData from 'form-data';
+import psTreeFun from 'pstree.remy';
+import { promisify } from 'util';
+import { load } from 'js-yaml';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -284,6 +287,20 @@ enum FileType {
   'file',
 }
 
+interface IFile {
+  title: string;
+  key: string;
+  type: 'directory' | 'file';
+  parent: string;
+  mtime: number;
+  children?: IFile[];
+}
+
+export function dirSort(a: IFile, b: IFile) {
+  if (a.type !== b.type) return FileType[a.type] < FileType[b.type] ? -1 : 1;
+  else if (a.mtime !== b.mtime) return a.mtime > b.mtime ? -1 : 1;
+}
+
 export function readDirs(
   dir: string,
   baseDir: string = '',
@@ -303,10 +320,8 @@ export function readDirs(
           key,
           type: 'directory',
           parent: relativePath,
-          children: readDirs(subPath, baseDir).sort(
-            (a: any, b: any) =>
-              (FileType as any)[a.type] - (FileType as any)[b.type],
-          ),
+          mtime: stats.mtime.getTime(),
+          children: readDirs(subPath, baseDir).sort(dirSort),
         };
       }
       return {
@@ -315,11 +330,10 @@ export function readDirs(
         isLeaf: true,
         key,
         parent: relativePath,
+        mtime: stats.mtime.getTime(),
       };
     });
-  return result.sort(
-    (a: any, b: any) => (FileType as any)[a.type] - (FileType as any)[b.type],
-  );
+  return result.sort(dirSort);
 }
 
 export function readDir(
@@ -419,7 +433,12 @@ export function parseBody(
         return;
       }
 
-      parsed[key] = val;
+      try {
+        const jsonValue = JSON.parse(val);
+        parsed[key] = jsonValue;
+      } catch (error) {
+        parsed[key] = val;
+      }
     });
 
   switch (contentType) {
@@ -436,3 +455,45 @@ export function parseBody(
 
   return parsed;
 }
+
+export function psTree(pid: number): Promise<number[]> {
+  return new Promise((resolve, reject) => {
+    psTreeFun(pid, (err: any, pids: number[]) => {
+      if (err) {
+        reject(err);
+      }
+      resolve(pids.filter((x) => !isNaN(x)));
+    });
+  });
+}
+
+export async function killTask(pid: number) {
+  const pids = await psTree(pid);
+  // SIGALRM 14 时钟信号
+  if (pids.length) {
+    process.kill(pids[0], 14);
+  } else {
+    process.kill(pid, 14);
+  }
+}
+
+export async function getPid(name: string) {
+  let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
+  const execAsync = promisify(exec);
+  let pid = (await execAsync(taskCommand)).stdout;
+  return Number(pid);
+}
+
+interface IVersion {
+  version: string;
+  changeLogLink: string;
+  changeLog: string;
+}
+
+export async function parseVersion(path: string): Promise<IVersion> {
+  return load(await promisify(fs.readFile)(path, 'utf8')) as IVersion;
+}
+
+export async function parseContentVersion(content: string): Promise<IVersion> {
+  return load(content) as IVersion;
+}

back/data/cronView.ts

@@ -1,13 +1,19 @@
 import { sequelize } from '.';
 import { DataTypes, Model } from 'sequelize';
 
+export enum CronViewType {
+  '系统' = 1,
+  '个人',
+}
+
 interface SortType {
   type: 'ASC' | 'DESC';
   value: string;
 }
 
 interface FilterType {
-  type: 'or' | 'and';
+  property: string;
+  operation: string;
   value: string;
 }
 
@@ -18,6 +24,8 @@ export class CrontabView {
   isDisabled?: 1 | 0;
   filters?: FilterType[];
   sorts?: SortType[];
+  filterRelation?: 'and' | 'or';
+  type?: CronViewType;
 
   constructor(options: CrontabView) {
     this.name = options.name;
@@ -26,6 +34,8 @@ export class CrontabView {
     this.isDisabled = options.isDisabled || 0;
     this.filters = options.filters;
     this.sorts = options.sorts;
+    this.filterRelation = options.filterRelation;
+    this.type = options.type || CronViewType.个人;
   }
 }
 
@@ -43,5 +53,10 @@ export const CrontabViewModel = sequelize.define<CronViewInstance>(
     isDisabled: DataTypes.NUMBER,
     filters: DataTypes.JSON,
     sorts: DataTypes.JSON,
+    filterRelation: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
+    type: DataTypes.NUMBER,
   },
 );

back/data/env.ts

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

back/data/index.ts

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

back/data/notify.ts

@@ -11,9 +11,11 @@ export enum NotificationMode {
   'dingtalkBot' = 'dingtalkBot',
   'weWorkBot' = 'weWorkBot',
   'weWorkApp' = 'weWorkApp',
+  'aibotk' = 'aibotk',
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
   'email' = 'email',
+  'feishu' = 'feishu',
   'webhook' = 'webhook',
 }
 
@@ -39,6 +41,7 @@ export class ServerChanNotification extends NotificationBaseInfo {
 
 export class PushDeerNotification extends NotificationBaseInfo {
   public pushDeerKey = '';
+  public pushDeerUrl = '';
 }
 
 export class ChatNotification extends NotificationBaseInfo {
@@ -48,7 +51,7 @@ export class ChatNotification extends NotificationBaseInfo {
 
 export class BarkNotification extends NotificationBaseInfo {
   public barkPush = '';
-  public barkIcon = 'http://qn.whyour.cn/logo.png';
+  public barkIcon = 'https://qn.whyour.cn/logo.png';
   public barkSound = '';
   public barkGroup = 'qinglong';
 }
@@ -75,6 +78,12 @@ export class WeWorkAppNotification extends NotificationBaseInfo {
   public weWorkAppKey = '';
 }
 
+export class AibotkNotification extends NotificationBaseInfo {
+  public aibotkKey: string = '';
+  public aibotkType: 'room' | 'contact' = 'room';
+  public aibotkName: string = '';
+}
+
 export class IGotNotification extends NotificationBaseInfo {
   public iGotPushKey = '';
 }
@@ -95,7 +104,14 @@ export class WebhookNotification extends NotificationBaseInfo {
   public webhookBody: string = '';
   public webhookUrl: string = '';
   public webhookMethod: 'GET' | 'POST' | 'PUT' = 'GET';
-  public webhookContentType: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded' = 'application/json';
+  public webhookContentType:
+    | 'application/json'
+    | 'multipart/form-data'
+    | 'application/x-www-form-urlencoded' = 'application/json';
+}
+
+export class LarkNotification extends NotificationBaseInfo {
+  public larkKey = '';
 }
 
 export interface NotificationInfo
@@ -109,7 +125,9 @@ export interface NotificationInfo
     DingtalkBotNotification,
     WeWorkBotNotification,
     WeWorkAppNotification,
+    AibotkNotification,
     IGotNotification,
     PushPlusNotification,
     EmailNotification,
-    WebhookNotification {}
+    WebhookNotification,
+    LarkNotification {}

back/data/subscription.ts

@@ -28,6 +28,7 @@ export class Subscription {
   extensions?: string;
   sub_before?: string;
   sub_after?: string;
+  proxy?: string;
 
   constructor(options: Subscription) {
     this.id = options.id;
@@ -54,6 +55,7 @@ export class Subscription {
     this.extensions = options.extensions;
     this.sub_before = options.sub_before;
     this.sub_after = options.sub_after;
+    this.proxy = options.proxy;
   }
 }
 
@@ -102,5 +104,6 @@ export const SubscriptionModel = sequelize.define<SubscriptionInstance>(
     log_path: DataTypes.STRING,
     schedule_type: DataTypes.STRING,
     alias: { type: DataTypes.STRING, unique: 'alias' },
+    proxy: { type: DataTypes.STRING, allowNull: true },
   },
 );

back/loaders/db.ts

@@ -10,6 +10,7 @@ import { fileExist } from '../config/util';
 import { SubscriptionModel } from '../data/subscription';
 import { CrontabViewModel } from '../data/cronView';
 import config from '../config';
+import { sequelize } from '../data';
 
 export default async () => {
   try {
@@ -21,12 +22,20 @@ export default async () => {
     await SubscriptionModel.sync();
     await CrontabViewModel.sync();
 
-    // try {
-    //   const queryInterface = sequelize.getQueryInterface();
-    //   await queryInterface.addIndex('Crontabs', ['command'], { unique: true });
-    //   await queryInterface.addIndex('Envs', ['name', 'value'], { unique: true });
-    //   await queryInterface.addIndex('Apps', ['name'], { unique: true });
-    // } catch (error) { }
+    // 初始化新增字段
+    try {
+      await sequelize.query(
+        'alter table CrontabViews add column filterRelation VARCHAR(255)',
+      );
+    } catch (error) {}
+    try {
+      await sequelize.query(
+        'alter table Subscriptions add column proxy VARCHAR(255)',
+      );
+    } catch (error) {}
+    try {
+      await sequelize.query('alter table CrontabViews add column type NUMBER');
+    } catch (error) {}
 
     // 2.10-2.11 升级
     const cronDbFile = path.join(config.rootPath, 'db/crontab.db');

back/loaders/initData.ts

@@ -4,16 +4,32 @@ import { Container } from 'typedi';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import CronService from '../services/cron';
 import EnvService from '../services/env';
-import _ from 'lodash';
+import groupBy from 'lodash/groupBy';
 import { DependenceModel } from '../data/dependence';
 import { Op } from 'sequelize';
 import config from '../config';
+import { CrontabViewModel, CronViewType } from '../data/cronView';
+import { initPosition } from '../data/env';
 
 export default async () => {
   const cronService = Container.get(CronService);
   const envService = Container.get(EnvService);
   const dependenceService = Container.get(DependenceService);
 
+  // 初始化新增默认全部任务视图
+  CrontabViewModel.findAll({
+    where: { type: CronViewType.系统, name: '全部任务' },
+    raw: true,
+  }).then((docs) => {
+    if (docs.length === 0) {
+      CrontabViewModel.create({
+        name: '全部任务',
+        type: CronViewType.系统,
+        position: initPosition / 2,
+      });
+    }
+  });
+
   // 初始化更新所有任务状态为空闲
   await CrontabModel.update(
     { status: CrontabStatus.idle },
@@ -26,7 +42,7 @@ export default async () => {
     order: [['type', 'DESC']],
     raw: true,
   }).then(async (docs) => {
-    const groups = _.groupBy(docs, 'type');
+    const groups = groupBy(docs, 'type');
     const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
     for (const key of keys) {
       const group = groups[key];

back/loaders/initTask.ts

@@ -1,5 +1,4 @@
 import { Container } from 'typedi';
-import _ from 'lodash';
 import SystemService from '../services/system';
 import ScheduleService from '../services/schedule';
 import SubscriptionService from '../services/subscription';

back/loaders/sentry.ts

@@ -4,12 +4,10 @@ import * as Tracing from '@sentry/tracing';
 import Logger from './logger';
 import config from '../config';
 import fs from 'fs';
+import { parseVersion } from '../config/util';
 
-export default ({ expressApp }: { expressApp: Application }) => {
-  const versionRegx = /.*export const version = \'(.*)\'\;/;
-
-  const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
-  const currentVersion = currentVersionFile.match(versionRegx)![1];
+export default async ({ expressApp }: { expressApp: Application }) => {
+  const { version } = await parseVersion(config.versionFile);
 
   Sentry.init({
     dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
@@ -18,7 +16,7 @@ export default ({ expressApp }: { expressApp: Application }) => {
       new Tracing.Integrations.Express({ app: expressApp }),
     ],
     tracesSampleRate: 0.1,
-    release: currentVersion,
+    release: version,
   });
 
   expressApp.use(Sentry.Handlers.requestHandler());

back/services/cron.ts

@@ -5,13 +5,15 @@ import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import { exec, execSync, spawn } from 'child_process';
 import fs from 'fs';
 import cron_parser from 'cron-parser';
-import { getFileContentByName, concurrentRun, fileExist } from '../config/util';
+import {
+  getFileContentByName,
+  concurrentRun,
+  fileExist,
+  killTask,
+} from '../config/util';
 import { promises, existsSync } from 'fs';
-import { promisify } from 'util';
-import { Op } from 'sequelize';
+import { Op, where, col as colFn } from 'sequelize';
 import path from 'path';
-import dayjs from 'dayjs';
-import { LOG_END_SYMBOL } from '../config/const';
 
 @Service()
 export default class CronService {
@@ -116,8 +118,9 @@ export default class CronService {
 
   private formatViewQuery(query: any, viewQuery: any) {
     if (viewQuery.filters && viewQuery.filters.length > 0) {
-      if (!query[Op.and]) {
-        query[Op.and] = [];
+      const primaryOperate = viewQuery.filterRelation === 'or' ? Op.or : Op.and;
+      if (!query[primaryOperate]) {
+        query[primaryOperate] = [];
       }
       for (const col of viewQuery.filters) {
         const { property, value, operation } = col;
@@ -160,13 +163,27 @@ export default class CronService {
         }
         if (operate && operate2) {
           q[property] = {
-            [operate2]: [
-              { [operate]: `%${value}%` },
-              { [operate]: `%${encodeURIComponent(value)}%` },
+            [Op.or]: [
+              {
+                [operate2]: [
+                  { [operate]: `%${value}%` },
+                  { [operate]: `%${encodeURIComponent(value)}%` },
+                ],
+              },
+              {
+                [operate2]: [
+                  where(colFn(property), operate, `%${value}%`),
+                  where(
+                    colFn(property),
+                    operate,
+                    `%${encodeURIComponent(value)}%`,
+                  ),
+                ],
+              },
             ],
           };
         }
-        query[Op.and].push(q);
+        query[primaryOperate].push(q);
       }
     }
   }
@@ -314,31 +331,11 @@ export default class CronService {
     for (const doc of docs) {
       if (doc.pid) {
         try {
-          process.kill(-doc.pid);
+          await killTask(doc.pid);
         } catch (error) {
           this.logger.silly(error);
         }
       }
-      const err = await this.killTask(doc.command);
-      const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
-      const logFileExist = doc.log_path && (await fileExist(absolutePath));
-
-      const endTime = dayjs();
-      const diffTimeStr = doc.last_execution_time
-        ? `，耗时 ${endTime.diff(
-            dayjs(doc.last_execution_time * 1000),
-            'second',
-          )}`
-        : '';
-      if (logFileExist) {
-        const str = err ? `\n${err}` : '';
-        fs.appendFileSync(
-          `${absolutePath}`,
-          `${str}\n## 执行结束... ${endTime.format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}${diffTimeStr}${LOG_END_SYMBOL}`,
-        );
-      }
     }
 
     await CrontabModel.update(
@@ -347,42 +344,6 @@ export default class CronService {
     );
   }
 
-  public async killTask(name: string) {
-    let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
-    const execAsync = promisify(exec);
-    try {
-      let pid = (await execAsync(taskCommand)).stdout;
-      if (pid) {
-        pid = (await execAsync(`pstree -p ${pid}`)).stdout;
-      } else {
-        return;
-      }
-      let pids = pid.match(/\(\d+/g);
-      const killLogs = [];
-      if (pids && pids.length > 0) {
-        // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
-        pids = pids.slice(0, 3);
-        for (const id of pids) {
-          const c = `kill -9 ${id.slice(1)}`;
-          try {
-            const { stdout, stderr } = await execAsync(c);
-            if (stderr) {
-              killLogs.push(stderr);
-            }
-            if (stdout) {
-              killLogs.push(stdout);
-            }
-          } catch (error: any) {
-            killLogs.push(error.message);
-          }
-        }
-      }
-      return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
-    } catch (e) {
-      return JSON.stringify(e);
-    }
-  }
-
   private async runSingle(cronId: number): Promise<number> {
     return new Promise(async (resolve: any) => {
       const cron = await this.getDb({ id: cronId });

back/services/cronView.ts

@@ -1,14 +1,19 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import { CrontabView, CrontabViewModel } from '../data/cronView';
-import { initEnvPosition } from '../data/env';
+import {
+  initPosition,
+  maxPosition,
+  minPosition,
+  stepPosition,
+} from '../data/env';
 
 @Service()
 export default class CronViewService {
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
   public async create(payload: CrontabView): Promise<CrontabView> {
-    let position = initEnvPosition;
+    let position = initPosition;
     const views = await this.list();
     if (views && views.length > 0 && views[views.length - 1].position) {
       position = views[views.length - 1].position as number;
@@ -16,6 +21,8 @@ export default class CronViewService {
     position = position / 2;
     const tab = new CrontabView({ ...payload, position });
     const doc = await this.insert(tab);
+
+    await this.checkPosition(tab.position!);
     return doc;
   }
 
@@ -62,6 +69,22 @@ export default class CronViewService {
     await CrontabViewModel.update({ isDisabled: 0 }, { where: { id: ids } });
   }
 
+  private async checkPosition(position: number) {
+    const precisionPosition = parseFloat(position.toPrecision(16));
+    if (precisionPosition < minPosition || precisionPosition > maxPosition) {
+      const envs = await this.list();
+      let position = initPosition;
+      for (const env of envs) {
+        position = position - stepPosition;
+        await this.updateDb({ id: env.id, position });
+      }
+    }
+  }
+
+  private getPrecisionPosition(position: number): number {
+    return parseFloat(position.toPrecision(16));
+  }
+
   public async move({
     id,
     fromIndex,
@@ -85,8 +108,10 @@ export default class CronViewService {
     }
     const newDoc = await this.update({
       id,
-      position: targetPosition,
+      position: this.getPrecisionPosition(targetPosition),
     });
+
+    await this.checkPosition(targetPosition);
     return newDoc;
   }
 }

back/services/dependence.ts

@@ -9,7 +9,6 @@ import {
   unInstallDependenceCommandTypes,
   DependenceModel,
 } from '../data/dependence';
-import _ from 'lodash';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import { Op } from 'sequelize';

back/services/env.ts

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

back/services/notify.ts

@@ -24,18 +24,23 @@ export default class NotificationService {
     ['dingtalkBot', this.dingtalkBot],
     ['weWorkBot', this.weWorkBot],
     ['weWorkApp', this.weWorkApp],
+    ['aibotk', this.aibotk],
     ['iGot', this.iGot],
     ['pushPlus', this.pushPlus],
     ['email', this.email],
     ['webhook', this.webhook],
+    ['lark', this.lark],
   ]);
 
-  private timeout = 10000;
   private title = '';
   private content = '';
   private params!: Omit<NotificationInfo, 'type'>;
+  private gotOption = {
+    timeout: 30000,
+    retry: 1,
+  };
 
-  constructor(@Inject('logger') private logger: winston.Logger) { }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   public async notify(
     title: string,
@@ -76,8 +81,7 @@ export default class NotificationService {
     const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
     const res: any = await got
       .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         body: `title=${encodeURIComponent(
           this.title,
         )}&message=${encodeURIComponent(
@@ -95,8 +99,7 @@ export default class NotificationService {
     const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
     const res: any = await got
       .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         json: { message: `${this.title}\n${this.content}` },
         headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
       })
@@ -111,8 +114,7 @@ export default class NotificationService {
       : `https://sc.ftqq.com/${serverChanKey}.send`;
     const res: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         body: `title=${this.title}&desp=${this.content}`,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       })
@@ -121,12 +123,11 @@ export default class NotificationService {
   }
 
   private async pushDeer() {
-    const { pushDeerKey } = this.params;
-    const url = `https://api2.pushdeer.com/message/push`;
+    const { pushDeerKey, pushDeerUrl } = this.params;
+    const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
     const res: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
           this.title,
         )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
@@ -143,8 +144,7 @@ export default class NotificationService {
     const url = `${chatUrl}${chatToken}`;
     const res: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         body: `payload={"text":"${this.title}\n${this.content}"}`,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       })
@@ -164,8 +164,7 @@ export default class NotificationService {
     )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
     const res: any = await got
       .get(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       })
       .json();
@@ -182,8 +181,9 @@ export default class NotificationService {
       telegramBotUserId,
     } = this.params;
     const authStr = telegramBotProxyAuth ? `${telegramBotProxyAuth}@` : '';
-    const url = `https://${telegramBotApiHost ? telegramBotApiHost : 'api.telegram.org'
-      }/bot${telegramBotToken}/sendMessage`;
+    const url = `https://${
+      telegramBotApiHost ? telegramBotApiHost : 'api.telegram.org'
+    }/bot${telegramBotToken}/sendMessage`;
     let agent;
     if (telegramBotProxyHost && telegramBotProxyPort) {
       const options: any = {
@@ -202,8 +202,7 @@ export default class NotificationService {
     }
     const res: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
         agent,
@@ -225,8 +224,7 @@ export default class NotificationService {
     const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
     const res: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         json: {
           msgtype: 'text',
           text: {
@@ -243,8 +241,7 @@ export default class NotificationService {
     const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
     const res: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         json: {
           msgtype: 'text',
           text: {
@@ -263,8 +260,7 @@ export default class NotificationService {
     const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
     const tokenRes: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         json: {
           corpid,
           corpsecret,
@@ -314,8 +310,7 @@ export default class NotificationService {
       .post(
         `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
         {
-          timeout: this.timeout,
-          retry: 0,
+          ...this.gotOption,
           json: {
             touser,
             agentid,
@@ -329,13 +324,53 @@ export default class NotificationService {
     return res.errcode === 0;
   }
 
+  private async aibotk() {
+    const { aibotkKey, aibotkType, aibotkName } = this.params;
+    let url = '';
+    let json = {};
+    switch (aibotkType) {
+      case 'room':
+        url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
+        json = {
+          apiKey: `${aibotkKey}`,
+          roomName: `${aibotkName}`,
+          message: {
+            type: 1,
+            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+          },
+        };
+        break;
+      case 'contact':
+        url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
+        json = {
+          apiKey: `${aibotkKey}`,
+          name: `${aibotkName}`,
+          message: {
+            type: 1,
+            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+          },
+        };
+        break;
+    }
+
+    const res: any = await got
+      .post(url, {
+        ...this.gotOption,
+        json: {
+          ...json,
+        },
+      })
+      .json();
+
+    return res.code === 0;
+  }
+
   private async iGot() {
     const { iGotPushKey } = this.params;
     const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
     const res: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         body: `title=${this.title}&content=${this.content}`,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       })
@@ -349,8 +384,7 @@ export default class NotificationService {
     const url = `https://www.pushplus.plus/send`;
     const res: any = await got
       .post(url, {
-        timeout: this.timeout,
-        retry: 0,
+        ...this.gotOption,
         json: {
           token: `${pushPlusToken}`,
           title: `${this.title}`,
@@ -363,6 +397,21 @@ export default class NotificationService {
     return res.code === 200;
   }
 
+  private async lark() {
+    const { larkKey } = this.params;
+    const res: any = await got
+      .post(`https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`, {
+        ...this.gotOption,
+        json: {
+          msg_type: 'text',
+          content: { text: `${this.title}\n\n${this.content}` },
+        },
+        headers: { 'Content-Type': 'application/json' },
+      })
+      .json();
+    return res.StatusCode === 0;
+  }
+
   private async email() {
     const { emailPass, emailService, emailUser } = this.params;
     const transporter = nodemailer.createTransport({
@@ -386,10 +435,18 @@ export default class NotificationService {
   }
 
   private async webhook() {
-    const { webhookUrl, webhookBody, webhookHeaders, webhookMethod, webhookContentType } =
-      this.params;
+    const {
+      webhookUrl,
+      webhookBody,
+      webhookHeaders,
+      webhookMethod,
+      webhookContentType,
+    } = this.params;
 
-    const { formatBody, formatUrl } = this.formatNotifyContent(webhookUrl, webhookBody);
+    const { formatBody, formatUrl } = this.formatNotifyContent(
+      webhookUrl,
+      webhookBody,
+    );
     if (!formatUrl && !formatBody) {
       return false;
     }
@@ -399,11 +456,10 @@ export default class NotificationService {
     const options = {
       method: webhookMethod,
       headers,
-      timeout: this.timeout,
-      retry: 0,
+      ...this.gotOption,
       allowGetBody: true,
-      ...bodyParam
-    }
+      ...bodyParam,
+    };
     const res = await got(formatUrl, options);
     return String(res.statusCode).startsWith('20');
   }
@@ -427,8 +483,12 @@ export default class NotificationService {
     }
 
     return {
-      formatUrl: url.replaceAll('$title', encodeURIComponent(this.title)).replaceAll('$content', encodeURIComponent(this.content)),
-      formatBody: body.replaceAll('$title', this.title).replaceAll('$content', this.content),
-    }
+      formatUrl: url
+        .replaceAll('$title', encodeURIComponent(this.title))
+        .replaceAll('$content', encodeURIComponent(this.content)),
+      formatBody: body
+        .replaceAll('$title', this.title)
+        .replaceAll('$content', this.content),
+    };
   }
 }

back/services/open.ts

@@ -119,7 +119,7 @@ export default class OpenService {
         (x) => x.expiration >= timestamp,
       );
       let tokens = invalidTokens;
-      if (invalidTokens.length > 5) {
+      if (invalidTokens.length >= 5) {
         tokens = [
           ...invalidTokens.slice(0, 4),
           { ...invalidTokens[4], expiration },

back/services/schedule.ts

@@ -42,7 +42,11 @@ export default class ScheduleService {
 
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  async runTask(command: string, callbacks: TaskCallbacks = {}) {
+  async runTask(
+    command: string,
+    callbacks: TaskCallbacks = {},
+    completionTime: 'start' | 'end' = 'end',
+  ) {
     return new Promise(async (resolve, reject) => {
       try {
         const startTime = dayjs();
@@ -52,6 +56,7 @@ export default class ScheduleService {
 
         // TODO:
         callbacks.onStart?.(cp, startTime);
+        completionTime === 'start' && resolve(cp.pid);
 
         cp.stdout.on('data', async (data) => {
           await callbacks.onLog?.(data.toString());
@@ -100,7 +105,6 @@ export default class ScheduleService {
           error,
         );
         await callbacks.onError?.(JSON.stringify(error));
-        resolve(null);
       }
     });
   }

back/services/script.ts

@@ -7,6 +7,7 @@ import CronService from './cron';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import config from '../config';
 import { LOG_END_SYMBOL } from '../config/const';
+import { getPid, killTask } from '../config/util';
 
 @Service()
 export default class ScriptService {
@@ -42,22 +43,24 @@ export default class ScriptService {
   public async runScript(filePath: string) {
     const relativePath = path.relative(config.scriptPath, filePath);
     const command = `task -l ${relativePath} now`;
-    this.scheduleService.runTask(command, this.taskCallbacks(filePath));
+    const pid = await this.scheduleService.runTask(
+      command,
+      this.taskCallbacks(filePath),
+      'start',
+    );
 
-    return { code: 200 };
+    return { code: 200, data: pid };
   }
 
-  public async stopScript(filePath: string) {
-    const relativePath = path.relative(config.scriptPath, filePath);
-    const err = await this.cronService.killTask(`task -l ${relativePath} now`);
-
-    const str = err ? `\n${err}` : '';
-    this.sockService.sendMessage({
-      type: 'manuallyRunScript',
-      message: `${str}\n## 执行结束...  ${new Date()
-        .toLocaleString('zh', { hour12: false })
-        .replace(' 24:', ' 00:')}${LOG_END_SYMBOL}`,
-    });
+  public async stopScript(filePath: string, pid: number) {
+    let str = '';
+    if (!pid) {
+      const relativePath = path.relative(config.scriptPath, filePath);
+      pid = await getPid(`task -l ${relativePath} now`);
+    }
+    try {
+      await killTask(pid);
+    } catch (error) {}
 
     return { code: 200 };
   }

back/services/sshKey.ts

@@ -14,7 +14,7 @@ export default class SshKeyService {
 
   private generatePrivateKeyFile(alias: string, key: string): void {
     try {
-      fs.writeFileSync(`${this.sshPath}/${alias}`, key, {
+      fs.writeFileSync(`${this.sshPath}/${alias}`, `${key}${os.EOL}`, {
         encoding: 'utf8',
         mode: '400',
       });
@@ -38,8 +38,16 @@ export default class SshKeyService {
     }
   }
 
-  private generateSingleSshConfig(alias: string, host: string): string {
-    return `\nHost ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no`;
+  private generateSingleSshConfig(
+    alias: string,
+    host: string,
+    proxy?: string,
+  ): string {
+    if (host === 'github.com') {
+      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa\n    PubkeyAcceptedAlgorithms +ssh-rsa`;
+    }
+    const proxyStr = proxy ? `    ProxyCommand nc -v -x ${proxy} %h %p\n` : '';
+    return `\nHost ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no\n${proxyStr}`;
   }
 
   private generateSshConfig(configs: string[]) {
@@ -69,16 +77,21 @@ export default class SshKeyService {
     }
   }
 
-  public addSSHKey(key: string, alias: string, host: string): void {
+  public addSSHKey(
+    key: string,
+    alias: string,
+    host: string,
+    proxy?: string,
+  ): void {
     this.generatePrivateKeyFile(alias, key);
-    const config = this.generateSingleSshConfig(alias, host);
+    const config = this.generateSingleSshConfig(alias, host, proxy);
     this.removeSshConfig(alias);
     this.generateSshConfig([config]);
   }
 
-  public removeSSHKey(alias: string, host: string): void {
+  public removeSSHKey(alias: string, host: string, proxy?: string): void {
     this.removePrivateKeyFile(alias);
-    const config = this.generateSingleSshConfig(alias, host);
+    const config = this.generateSingleSshConfig(alias, host, proxy);
     this.removeSshConfig(config);
   }
 }

back/services/subscription.ts

@@ -19,9 +19,9 @@ import {
   concurrentRun,
   fileExist,
   createFile,
+  killTask,
 } from '../config/util';
 import { promises, existsSync } from 'fs';
-import { promisify } from 'util';
 import { Op } from 'sequelize';
 import path from 'path';
 import ScheduleService, { TaskCallbacks } from './schedule';
@@ -77,13 +77,21 @@ export default class SubscriptionService {
   private formatCommand(doc: Subscription, url?: string) {
     let command = 'ql ';
     let _url = url || this.formatUrl(doc).url;
-    const { type, whitelist, blacklist, dependences, branch, extensions } = doc;
+    const {
+      type,
+      whitelist,
+      blacklist,
+      dependences,
+      branch,
+      extensions,
+      proxy,
+    } = doc;
     if (type === 'file') {
       command += `raw "${_url}"`;
     } else {
       command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
         dependences || ''
-      }" "${branch || ''}" "${extensions || ''}"`;
+      }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}"`;
     }
     return command;
   }
@@ -117,9 +125,10 @@ export default class SubscriptionService {
           (doc.pull_option as any).private_key,
           doc.alias,
           host,
+          doc.proxy,
         );
       } else {
-        this.sshKeyService.removeSSHKey(doc.alias, host);
+        this.sshKeyService.removeSSHKey(doc.alias, host, doc.proxy);
       }
     }
 
@@ -342,19 +351,18 @@ export default class SubscriptionService {
     for (const doc of docs) {
       if (doc.pid) {
         try {
-          process.kill(-doc.pid);
+          await killTask(doc.pid);
         } catch (error) {
           this.logger.silly(error);
         }
       }
-      const command = this.formatCommand(doc);
-      const err = await this.killTask(command);
       const absolutePath = await this.handleLogPath(doc.log_path as string);
-      const str = err ? `\n${err}` : '';
 
       fs.appendFileSync(
         `${absolutePath}`,
-        `${str}\n## 执行结束...  ${dayjs().format('YYYY-MM-DD HH:mm:ss')}${LOG_END_SYMBOL}`,
+        `\n## 执行结束...  ${dayjs().format(
+          'YYYY-MM-DD HH:mm:ss',
+        )}${LOG_END_SYMBOL}`,
       );
     }
 
@@ -364,41 +372,6 @@ export default class SubscriptionService {
     );
   }
 
-  public async killTask(name: string) {
-    let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
-    const execAsync = promisify(exec);
-    try {
-      let pid = (await execAsync(taskCommand)).stdout;
-      if (pid) {
-        pid = (await execAsync(`pstree -p ${pid}`)).stdout;
-      } else {
-        return;
-      }
-      let pids = pid.match(/\(\d+/g);
-      const killLogs = [];
-      if (pids && pids.length > 0) {
-        // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
-        for (const id of pids) {
-          const c = `kill -9 ${id.slice(1)}`;
-          try {
-            const { stdout, stderr } = await execAsync(c);
-            if (stderr) {
-              killLogs.push(stderr);
-            }
-            if (stdout) {
-              killLogs.push(stdout);
-            }
-          } catch (error: any) {
-            killLogs.push(error.message);
-          }
-        }
-      }
-      return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
-    } catch (e) {
-      return JSON.stringify(e);
-    }
-  }
-
   private async runSingle(subscriptionId: number) {
     const subscription = await this.getDb({ id: subscriptionId });
     if (subscription.status !== SubscriptionStatus.queued) {

back/services/system.ts

@@ -2,7 +2,6 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
 import * as fs from 'fs';
-import _ from 'lodash';
 import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
@@ -10,6 +9,7 @@ import ScheduleService from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import got from 'got';
+import { parseContentVersion, parseVersion } from '../config/util';
 
 @Service()
 export default class SystemService {
@@ -79,32 +79,33 @@ export default class SystemService {
 
   public async checkUpdate() {
     try {
-      const versionRegx = /.*export const version = \'(.*)\'\;/;
-      const logRegx = /.*export const changeLog = \`((.*\n.*)+)\`;/;
+      const currentVersionContent = await parseVersion(config.versionFile);
 
-      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
-      const currentVersion = currentVersionFile.match(versionRegx)![1];
-
-      let lastVersion = '';
-      let lastLog = '';
+      let lastVersionContent;
       try {
-        const result = await got.get(config.lastVersionFile, {
-          timeout: 6000,
-          retry: 0,
-        });
-        const lastVersionFileContent = result.body;
-        lastVersion = lastVersionFileContent.match(versionRegx)![1];
-        lastLog = lastVersionFileContent.match(logRegx)
-          ? lastVersionFileContent.match(logRegx)![1]
-          : '';
+        const result = await got.get(
+          `${config.lastVersionFile}?t=${Date.now()}`,
+          {
+            timeout: 30000,
+          },
+        );
+        lastVersionContent = await parseContentVersion(result.body);
       } catch (error) {}
 
+      if (!lastVersionContent) {
+        lastVersionContent = currentVersionContent;
+      }
+
       return {
         code: 200,
         data: {
-          hasNewVersion: this.checkHasNewVersion(currentVersion, lastVersion),
-          lastVersion,
-          lastLog,
+          hasNewVersion: this.checkHasNewVersion(
+            currentVersionContent.version,
+            lastVersionContent.version,
+          ),
+          lastVersion: lastVersionContent.version,
+          lastLog: lastVersionContent.changeLog,
+          lastLogLink: lastVersionContent.changeLogLink,
         },
       };
     } catch (error: any) {
@@ -137,10 +138,6 @@ export default class SystemService {
   public async updateSystem() {
     const cp = spawn('ql -l update', { shell: '/bin/bash' });
 
-    this.sockService.sendMessage({
-      type: 'updateSystemVersion',
-      message: `开始更新系统`,
-    });
     cp.stdout.on('data', (data) => {
       this.sockService.sendMessage({
         type: 'updateSystemVersion',

back/services/user.ts

@@ -3,7 +3,6 @@ import winston from 'winston';
 import { createRandomString, getNetIp, getPlatform } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
-import _ from 'lodash';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
@@ -24,7 +23,7 @@ export default class UserService {
     @Inject('logger') private logger: winston.Logger,
     private scheduleService: ScheduleService,
     private sockService: SockService,
-  ) { }
+  ) {}
 
   public async login(
     payloads: {
@@ -67,7 +66,9 @@ export default class UserService {
 
       const retriesTime = Math.pow(3, retries) * 1000;
       if (retries > 2 && timestamp - lastlogon < retriesTime) {
-        const waitTime = Math.ceil((retriesTime - (timestamp - lastlogon)) / 1000);
+        const waitTime = Math.ceil(
+          (retriesTime - (timestamp - lastlogon)) / 1000,
+        );
         return {
           code: 410,
           message: `失败次数过多，请${waitTime}秒后重试`,
@@ -75,18 +76,23 @@ export default class UserService {
         };
       }
 
+      if (
+        username === cUsername &&
+        password === cPassword &&
+        twoFactorActivated &&
+        needTwoFactor
+      ) {
+        this.updateAuthInfo(content, {
+          isTwoFactorChecking: true,
+        });
+        return {
+          code: 420,
+          message: '',
+        };
+      }
+
       const { ip, address } = await getNetIp(req);
       if (username === cUsername && password === cPassword) {
-        if (twoFactorActivated && needTwoFactor) {
-          this.updateAuthInfo(content, {
-            isTwoFactorChecking: true,
-          });
-          return {
-            code: 420,
-            message: '',
-          };
-        }
-
         const data = createRandomString(50, 100);
         const expiration = twoFactorActivated ? 60 : 20;
         let token = jwt.sign({ data }, config.secret as any, {
@@ -109,7 +115,8 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${req.platform
+          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+            req.platform
           }端 登录成功，ip地址 ${ip}`,
         );
         await this.getLoginLog();
@@ -137,7 +144,8 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${req.platform
+          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+            req.platform
           }端 登录失败，ip地址 ${ip}`,
         );
         await this.getLoginLog();

back/token.ts

@@ -5,6 +5,7 @@ import LoggerInstance from './loaders/logger';
 import fs from 'fs';
 import config from './config';
 import path from 'path';
+import os from 'os';
 
 const tokenFile = path.join(config.configPath, 'token.json');
 
@@ -25,9 +26,14 @@ async function getToken() {
 
 async function writeFile(data: any) {
   return new Promise<void>((resolve, reject) => {
-    fs.writeFile(tokenFile, JSON.stringify(data), { encoding: 'utf8' }, () => {
-      resolve();
-    });
+    fs.writeFile(
+      tokenFile,
+      `${JSON.stringify(data)}${os.EOL}`,
+      { encoding: 'utf8' },
+      () => {
+        resolve();
+      },
+    );
   });
 }
 

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:alpine
+FROM python:3.10-alpine
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"

package.json

@@ -4,7 +4,7 @@
     "start": "concurrently -n w: npm:start:*",
     "start:front": "max dev",
     "start:back": "nodemon",
-    "start:public": "ts-node back/public.ts",
+    "start:public": "ts-node --transpile-only ./back/public.ts",
     "build:front": "max build",
     "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.js",
@@ -69,15 +69,16 @@
     "got": "^11.8.2",
     "hpagent": "^0.1.2",
     "iconv-lite": "^0.6.3",
+    "js-yaml": "^4.1.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "multer": "^1.4.4",
     "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
-    "p-queue": "7.2.0",
+    "pstree.remy": "^1.1.8",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.20.1",
+    "sequelize": "^6.25.5",
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
     "sqlite3": "npm:@louislam/sqlite3@^15.0.6",
@@ -91,13 +92,15 @@
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.33.1",
     "@monaco-editor/react": "4.2.1",
+    "@react-hook/resize-observer": "^1.2.6",
     "@sentry/react": "^7.12.1",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "@types/express-jwt": "^6.0.4",
+    "@types/js-yaml": "^4.0.5",
     "@types/jsonwebtoken": "^8.5.8",
-    "@types/lodash": "^4.14.179",
+    "@types/lodash": "^4.14.185",
     "@types/multer": "^1.4.7",
     "@types/nedb": "^1.8.12",
     "@types/node": "^17.0.21",
@@ -118,7 +121,7 @@
     "codemirror": "^5.65.2",
     "compression-webpack-plugin": "9.2.0",
     "concurrently": "^7.0.0",
-    "lint-staged": "^12.3.4",
+    "lint-staged": "^13.0.3",
     "nodemon": "^2.0.15",
     "prettier": "^2.5.1",
     "qiniu": "^7.4.0",
@@ -135,7 +138,7 @@
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.6.0",
     "tslib": "^2.4.0",
-    "typescript": "^4.6.2",
+    "typescript": "4.8.4",
     "umi-request": "^1.4.0",
     "vh-check": "^2.0.5",
     "webpack": "^5.70.0",

sample/config.sample.sh

@@ -16,7 +16,7 @@ DefaultCronRule=""
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
 RepoFileExtensions="js py"
 
-## 代理地址，支持http/https/socks，例如 http://127.0.0.1:7890
+## 代理地址，支持HTTP/SOCK5，例如 http://127.0.0.1:7890
 ProxyUrl=""
 
 ## 资源告警阙值，默认CPU 80%、内存80%、磁盘90%
@@ -67,7 +67,7 @@ export PUSH_KEY=""
 ## 下方填写app提供的设备码，例如：https://api.day.app/123 那么此处的设备码就是123
 export BARK_PUSH=""
 ## 下方填写推送图标设置，自定义推送图标(需iOS15或以上)
-export BARK_ICON="http://qn.whyour.cn/logo.png"
+export BARK_ICON="https://qn.whyour.cn/logo.png"
 ## 下方填写推送声音设置，例如choo，具体值请在bark-推送铃声-查看所有铃声
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
@@ -151,4 +151,13 @@ export DEER_KEY=""
 export CHAT_URL=""
 export CHAT_TOKEN=""
 
+## 13. aibotk
+## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
+## aibotk_key (必填)填写智能微秘书个人中心的apikey
+export AIBOTK_KEY=""
+## aibotk_type (必填)填写发送的目标 room 或 contact, 填其他的不生效
+export AIBOTK_TYPE=""
+## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
+export AIBOTK_NAME=""
+
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.js

@@ -38,6 +38,7 @@ let SCKEY = '';
 //此处填你申请的PushDeer KEY.
 //(环境变量名 DEER_KEY)
 let PUSHDEER_KEY = '';
+let PUSHDEER_URL = '';
 
 // =======================================Synology Chat通知设置区域===========================================
 //此处填你申请的CHAT_URL与CHAT_TOKEN
@@ -49,7 +50,7 @@ let CHAT_TOKEN = '';
 //此处填你BarkAPP的信息(IP/设备码，例如：https://api.day.app/XXXXXXXX)
 let BARK_PUSH = '';
 //BARK app推送图标,自定义推送图标(需iOS15或以上)
-let BARK_ICON = 'http://qn.whyour.cn/logo.png';
+let BARK_ICON = 'https://qn.whyour.cn/logo.png';
 //BARK app推送铃声,铃声列表去APP查看复制填写
 let BARK_SOUND = '';
 //BARK app推送消息的分组, 默认为"QingLong"
@@ -110,6 +111,20 @@ let PUSH_PLUS_USER = '';
 let QQ_SKEY = '';
 let QQ_MODE = '';
 
+// =======================================智能微秘书设置区域=======================================
+//官方文档：http://wechat.aibotk.com/docs/about
+//AIBOTK_KEY： 填写智能微秘书个人中心的apikey
+//AIBOTK_TYPE：填写发送的目标 room 或 contact, 填其他的不生效
+//AIBOTK_NAME: 填写群名或用户昵称，和上面的type类型要对应
+let AIBOTK_KEY = '';
+let AIBOTK_TYPE = '';
+let AIBOTK_NAME = '';
+
+// =======================================飞书机器人设置区域=======================================
+//官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
+//FSKEY 飞书机器人的 FSKEY
+let FSKEY = '';
+
 //==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
   GOTIFY_URL = process.env.GOTIFY_URL;
@@ -137,6 +152,7 @@ if (process.env.PUSH_KEY) {
 
 if (process.env.DEER_KEY) {
   PUSHDEER_KEY = process.env.DEER_KEY;
+  PUSHDEER_URL = process.env.DEER_URL;
 }
 
 if (process.env.CHAT_URL) {
@@ -220,6 +236,20 @@ if (process.env.PUSH_PLUS_TOKEN) {
 if (process.env.PUSH_PLUS_USER) {
   PUSH_PLUS_USER = process.env.PUSH_PLUS_USER;
 }
+
+if (process.env.AIBOTK_KEY) {
+  AIBOTK_KEY = process.env.AIBOTK_KEY;
+}
+if (process.env.AIBOTK_TYPE) {
+  AIBOTK_TYPE = process.env.AIBOTK_TYPE;
+}
+if (process.env.AIBOTK_NAME) {
+  AIBOTK_NAME = process.env.AIBOTK_NAME;
+}
+
+if (process.env.FSKEY) {
+  FSKEY = process.env.FSKEY;
+}
 //==========================云端环境变量的判断与接收=========================
 
 /**
@@ -255,6 +285,8 @@ async function sendNotify(
     gotifyNotify(text, desp), //gotify
     ChatNotify(text, desp), //synolog chat
     PushDeerNotify(text, desp), //PushDeer
+    aibotkNotify(text, desp), //智能微秘书
+    fsBotNotify(text, desp), //飞书机器人
   ]);
 }
 
@@ -295,7 +327,7 @@ function gotifyNotify(text, desp) {
   });
 }
 
-function gobotNotify(text, desp, time = 2100) {
+function gobotNotify(text, desp) {
   return new Promise((resolve) => {
     if (GOBOT_URL) {
       const options = {
@@ -306,38 +338,34 @@ function gobotNotify(text, desp, time = 2100) {
         },
         timeout,
       };
-      setTimeout(() => {
-        $.post(options, (err, resp, data) => {
-          try {
-            if (err) {
-              console.log('发送go-cqhttp通知调用API失败！！\n');
-              console.log(err);
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送go-cqhttp通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.retcode === 0) {
+              console.log('go-cqhttp发送通知消息成功🎉\n');
+            } else if (data.retcode === 100) {
+              console.log(`go-cqhttp发送通知消息异常: ${data.errmsg}\n`);
             } else {
-              data = JSON.parse(data);
-              if (data.retcode === 0) {
-                console.log('go-cqhttp发送通知消息成功🎉\n');
-              } else if (data.retcode === 100) {
-                console.log(`go-cqhttp发送通知消息异常: ${data.errmsg}\n`);
-              } else {
-                console.log(
-                  `go-cqhttp发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
+              console.log(`go-cqhttp发送通知消息异常\n${JSON.stringify(data)}`);
             }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
           }
-        });
-      }, time);
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
     } else {
       resolve();
     }
   });
 }
 
-function serverNotify(text, desp, time = 2100) {
+function serverNotify(text, desp) {
   return new Promise((resolve) => {
     if (SCKEY) {
       //微信server酱推送通知一个\n不会换行，需要两个\n才能换行，故做此替换
@@ -352,33 +380,29 @@ function serverNotify(text, desp, time = 2100) {
         },
         timeout,
       };
-      setTimeout(() => {
-        $.post(options, (err, resp, data) => {
-          try {
-            if (err) {
-              console.log('发送通知调用API失败！！\n');
-              console.log(err);
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            //server酱和Server酱·Turbo版的返回json格式不太一样
+            if (data.errno === 0 || data.data.errno === 0) {
+              console.log('server酱发送通知消息成功🎉\n');
+            } else if (data.errno === 1024) {
+              // 一分钟内发送相同的内容会触发
+              console.log(`server酱发送通知消息异常: ${data.errmsg}\n`);
             } else {
-              data = JSON.parse(data);
-              //server酱和Server酱·Turbo版的返回json格式不太一样
-              if (data.errno === 0 || data.data.errno === 0) {
-                console.log('server酱发送通知消息成功🎉\n');
-              } else if (data.errno === 1024) {
-                // 一分钟内发送相同的内容会触发
-                console.log(`server酱发送通知消息异常: ${data.errmsg}\n`);
-              } else {
-                console.log(
-                  `server酱发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
+              console.log(`server酱发送通知消息异常\n${JSON.stringify(data)}`);
             }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
           }
-        });
-      }, time);
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
     } else {
       resolve();
     }
@@ -391,42 +415,36 @@ function PushDeerNotify(text, desp) {
       // PushDeer 建议对消息内容进行 urlencode
       desp = encodeURI(desp);
       const options = {
-        url: `https://api2.pushdeer.com/message/push`,
+        url: PUSHDEER_URL || `https://api2.pushdeer.com/message/push`,
         body: `pushkey=${PUSHDEER_KEY}&text=${text}&desp=${desp}&type=markdown`,
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
         },
         timeout,
       };
-      $.post(
-        options,
-        (err, resp, data) => {
-          try {
-            if (err) {
-              console.log('发送通知调用API失败！！\n');
-              console.log(err);
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            // 通过返回的result的长度来判断是否成功
+            if (
+              data.content.result.length !== undefined &&
+              data.content.result.length > 0
+            ) {
+              console.log('PushDeer发送通知消息成功🎉\n');
             } else {
-              data = JSON.parse(data);
-              // 通过返回的result的长度来判断是否成功
-              if (
-                data.content.result.length !== undefined &&
-                data.content.result.length > 0
-              ) {
-                console.log('PushDeer发送通知消息成功🎉\n');
-              } else {
-                console.log(
-                  `PushDeer发送通知消息异常\n${JSON.stringify(data)}`,
-                );
-              }
+              console.log(`PushDeer发送通知消息异常\n${JSON.stringify(data)}`);
             }
-          } catch (e) {
-            $.logErr(e, resp);
-          } finally {
-            resolve(data);
           }
-        },
-        time,
-      );
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
     } else {
       resolve();
     }
@@ -470,83 +488,6 @@ function ChatNotify(text, desp) {
   });
 }
 
-function CoolPush(text, desp) {
-  return new Promise((resolve) => {
-    if (QQ_SKEY) {
-      let options = {
-        url: `https://push.xuthus.cc/${QQ_MODE}/${QQ_SKEY}`,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      };
-
-      // 已知敏感词
-      text = text.replace(/京豆/g, '豆豆');
-      desp = desp.replace(/京豆/g, '');
-      desp = desp.replace(/🐶/g, '');
-      desp = desp.replace(/红包/g, 'H包');
-
-      switch (QQ_MODE) {
-        case 'email':
-          options.json = {
-            t: text,
-            c: desp,
-          };
-          break;
-        default:
-          options.body = `${text}\n\n${desp}`;
-      }
-
-      let pushMode = function (t) {
-        switch (t) {
-          case 'send':
-            return '个人';
-          case 'group':
-            return 'QQ群';
-          case 'wx':
-            return '微信';
-          case 'ww':
-            return '企业微信';
-          case 'email':
-            return '邮件';
-          default:
-            return '未知方式';
-        }
-      };
-
-      $.post(options, (err, resp, data) => {
-        try {
-          if (err) {
-            console.log(`发送${pushMode(QQ_MODE)}通知调用API失败！！\n`);
-            console.log(err);
-          } else {
-            data = JSON.parse(data);
-            if (data.code === 200) {
-              console.log(`酷推发送${pushMode(QQ_MODE)}通知消息成功🎉\n`);
-            } else if (data.code === 400) {
-              console.log(
-                `QQ酷推(Cool Push)发送${pushMode(QQ_MODE)}推送失败：${
-                  data.msg
-                }\n`,
-              );
-            } else if (data.code === 503) {
-              console.log(`QQ酷推出错，${data.message}：${data.data}\n`);
-            } else {
-              console.log(`酷推推送异常: ${JSON.stringify(data)}`);
-            }
-          }
-        } catch (e) {
-          $.logErr(e, resp);
-        } finally {
-          resolve(data);
-        }
-      });
-    } else {
-      resolve();
-    }
-  });
-}
-
 function BarkNotify(text, desp, params = {}) {
   return new Promise((resolve) => {
     if (BARK_PUSH) {
@@ -649,7 +590,7 @@ function ddBotNotify(text, desp) {
       json: {
         msgtype: 'text',
         text: {
-          content: ` ${text}\n\n${desp}`,
+          content: `${text}\n\n${desp}`,
         },
       },
       headers: {
@@ -716,7 +657,7 @@ function qywxBotNotify(text, desp) {
       json: {
         msgtype: 'text',
         text: {
-          content: ` ${text}\n\n${desp}`,
+          content: `${text}\n\n${desp}`,
         },
       },
       headers: {
@@ -983,6 +924,104 @@ function pushPlusNotify(text, desp) {
   });
 }
 
+function aibotkNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (AIBOTK_KEY && AIBOTK_TYPE && AIBOTK_NAME) {
+      let json = {};
+      let url = '';
+      switch (AIBOTK_TYPE) {
+        case 'room':
+          url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
+          json = {
+            apiKey: `${AIBOTK_KEY}`,
+            roomName: `${AIBOTK_NAME}`,
+            message: {
+              type: 1,
+              content: `【青龙快讯】\n\n${text}\n${desp}`,
+            },
+          };
+          break;
+        case 'contact':
+          url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
+          json = {
+            apiKey: `${AIBOTK_KEY}`,
+            name: `${AIBOTK_NAME}`,
+            message: {
+              type: 1,
+              content: `【青龙快讯】\n\n${text}\n${desp}`,
+            },
+          };
+          break;
+      }
+      const options = {
+        url: url,
+        json,
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        timeout,
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('智能微秘书发送通知消息失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.code === 0) {
+              console.log('智能微秘书发送通知消息成功🎉。\n');
+            } else {
+              console.log(`${data.error}\n`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
+function fsBotNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (FSKEY) {
+      const options = {
+        url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
+        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        timeout,
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.StatusCode === 0) {
+              console.log('飞书发送通知消息成功🎉\n');
+            } else {
+              console.log(`${data.msg}\n`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
 module.exports = {
   sendNotify,
   BARK_PUSH,

sample/notify.py

@@ -61,6 +61,7 @@ push_config = {
     'PUSH_KEY': '',                     # server 酱的 PUSH_KEY，兼容旧版与 Turbo 版
 
     'DEER_KEY': '',                     # PushDeer 的 PUSHDEER_KEY
+    'DEER_URL': '',                     # PushDeer 的 PUSHDEER_URL
   
     'CHAT_URL': '',                     # synology chat url
     'CHAT_TOKEN': '',                   # synology chat token
@@ -81,6 +82,10 @@ push_config = {
     'TG_PROXY_AUTH': '',                # tg 代理认证参数
     'TG_PROXY_HOST': '',                # tg 机器人的 TG_PROXY_HOST
     'TG_PROXY_PORT': '',                # tg 机器人的 TG_PROXY_PORT
+
+    'AIBOTK_KEY': '',                   # 智能微秘书 个人中心的apikey 文档地址：http://wechat.aibotk.com/docs/about
+    'AIBOTK_TYPE': '',                  # 智能微秘书 发送目标 room 或 contact
+    'AIBOTK_NAME': '',                  # 智能微秘书  发送群名 或者好友昵称和type要对应好
 }
 notify_function = []
 # fmt: on
@@ -276,6 +281,9 @@ def pushdeer(title: str, content: str) -> None:
     print("PushDeer 服务启动")
     data = {"text": title, "desp": content, "type": "markdown", "pushkey": push_config.get("DEER_KEY")}
     url = 'https://api2.pushdeer.com/message/push'
+    if push_config.get("DEER_URL"):
+      url = push_config.get("DEER_URL")
+      
     response = requests.post(url, data=data).json()
     
     if len(response.get("content").get("result")) > 0:
@@ -521,6 +529,39 @@ def telegram_bot(title: str, content: str) -> None:
         print("tg 推送失败！")
 
 
+def aibotk(title: str, content: str) -> None:
+    """
+    使用 智能微秘书 推送消息。
+    """
+    if not push_config.get("AIBOTK_KEY") or not push_config.get("AIBOTK_TYPE") or not push_config.get("AIBOTK_NAME"):
+        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
+        return
+    print("智能微秘书 服务启动")
+
+    if push_config.get("AIBOTK_TYPE") == 'room':
+        url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
+        data = {
+            "apiKey": push_config.get("AIBOTK_KEY"),
+            "roomName": push_config.get("AIBOTK_NAME"),
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+        }
+    else:
+        url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
+        data = {
+            "apiKey": push_config.get("AIBOTK_KEY"),
+            "name": push_config.get("AIBOTK_NAME"),
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+        }
+    body = json.dumps(data).encode(encoding="utf-8")
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, data=body, headers=headers).json()
+    print(response)
+    if response["code"] == 0:
+        print("智能微秘书 推送成功！")
+    else:
+        print(f'智能微秘书 推送失败！{response["error"]}')
+
+
 def one() -> str:
     """
     获取一条一言。
@@ -561,6 +602,8 @@ if push_config.get("QYWX_KEY"):
     notify_function.append(wecom_bot)
 if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
     notify_function.append(telegram_bot)
+if push_config.get("AIBOTK_KEY") and push_config.get("AIBOTK_TYPE") and push_config.get("AIBOTK_NAME"):
+    notify_function.append(aibotk)    
 
 
 def send(title: str, content: str) -> None:

sample/tool.ts

@@ -5,14 +5,14 @@ const envFound = dotenv.config();
 const accessKey = process.env.QINIU_AK;
 const secretKey = process.env.QINIU_SK;
 const mac = new qiniu.auth.digest.Mac(accessKey, secretKey);
-const key = 'version.ts';
+const key = 'version.yaml';
 const options = {
   scope: `${process.env.QINIU_SCOPE}:${key}`,
 };
 const putPolicy = new qiniu.rs.PutPolicy(options);
 const uploadToken = putPolicy.uploadToken(mac);
 
-const localFile = 'src/version.ts';
+const localFile = 'version.yaml';
 const config = new qiniu.conf.Config({ zone: qiniu.zone.Zone_z1 });
 const formUploader = new qiniu.form_up.FormUploader(config);
 const putExtra = new qiniu.form_up.PutExtra(

shell/api.sh

@@ -1,7 +1,16 @@
 #!/usr/bin/env bash
 
 get_token() {
-  token=$(cat $file_auth_token | jq -r .value)
+  if [[ -f $file_auth_token ]]; then
+    token=$(cat $file_auth_token | jq -r .value)
+  else
+    local token_command="ts-node-transpile-only ${dir_root}/back/token.ts"
+    local token_file="${dir_root}static/build/token.js"
+    if [[ -f $token_file ]]; then
+      token_command="node ${token_file}"
+    fi
+    token=$(eval "$token_command")
+  fi
 }
 
 add_cron_api() {

shell/check.sh

@@ -87,13 +87,18 @@ check_pm2() {
   fi
 }
 
+start_public() {
+  echo -e "=====> 启动公开服务\n"
+  pm2 delete public --source-map-support --time &>/dev/null
+  pm2 start $dir_static/build/public.js -n public --source-map-support --time &>/dev/null
+}
+
 main() {
   echo -e "=====> 开始检测"
   npm i -g pnpm
-  pnpm setup &>/dev/null
-  source ~/.bashrc
-  pnpm install -g &>/dev/null
   pnpm add -g pm2
+  patch_version
+  start_public
   copy_dep
   check_ql
   check_nginx

shell/otask.sh

@@ -5,6 +5,12 @@ dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
+trap "single_hanle" 2 20 15 14
+single_hanle() {
+  handle_task_after "$@"
+  exit 1
+}
+
 random_delay() {
   local random_delay_max=$RandomDelay
   if [[ $random_delay_max ]] && [[ $random_delay_max -gt 0 ]]; then
@@ -75,16 +81,17 @@ run_nohup() {
 }
 
 check_server() {
-  cpu_use=$(top -b -n 1 | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%")
+  local top_result=$(top -b -n 1)
+  cpu_use=$(echo "$top_result" | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
 
-  mem_free=$(free -m | grep "Mem" | awk '{print $3}')
-  mem_total=$(free -m | grep "Mem" | awk '{print $2}')
-  mem_use=$(printf "%d%%" $((mem_free * 100 / mem_total)) | cut -f 1 -d "%")
+  mem_free=$(free -m | grep "Mem" | awk '{print $3}' | head -n 1)
+  mem_total=$(free -m | grep "Mem" | awk '{print $2}' | head -n 1)
+  mem_use=$(printf "%d%%" $((mem_free * 100 / mem_total)) | cut -f 1 -d "%" | head -n 1)
 
-  disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%")
+  disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%" | head -n 1)
 
   if [[ $cpu_use -gt $cpu_warn ]] || [[ $mem_free -lt $mem_warn ]] || [[ $disk_use -gt $disk_warn ]]; then
-    local resource=$(top -b -n 1 | grep -v -E 'grep|Mem|idle|Load' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10)
+    local resource=$(echo "$top_result" | grep -v -E 'grep|Mem|idle|Load|tr' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10 | tr '\n' '|' | sed s/\|/\\\\n/g)
     notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource"
   fi
 }
@@ -97,7 +104,11 @@ handle_task_before() {
 
   [[ $is_macos -eq 0 ]] && check_server
 
-  [[ -f $task_error_log_path ]] && cat $task_error_log_path
+  if [[ -s $task_error_log_path ]]; then
+    eval cat $task_error_log_path $cmd
+    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
+    eval echo $cmd
+  fi
 
   [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
   . $file_task_before "$@"
@@ -105,9 +116,12 @@ handle_task_before() {
 
 handle_task_after() {
   . $file_task_after "$@"
-  local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-  local end_timestamp=$(date "+%s")
+
+  local etime=$(date "+$time_format")
+  local end_time=$(format_time "$time_format" "$etime")
+  local end_timestamp=$(format_timestamp "$time_format" "$etime")
   local diff_time=$(($end_timestamp - $begin_timestamp))
+
   [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
   echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒"
   echo -e "\n　　　　　"
@@ -142,7 +156,7 @@ run_concurrent() {
 
   local envs=$(eval echo "\$${env_param}")
   local array=($(echo $envs | sed 's/&/ /g'))
-  local tempArr=$(echo $num_param | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
   local runArr=($(eval echo $tempArr))
   runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
 
@@ -190,7 +204,7 @@ run_designated() {
 
   local envs=$(eval echo "\$${env_param}")
   local array=($(echo $envs | sed 's/&/ /g'))
-  local tempArr=$(echo $num_param | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
   local runArr=($(eval echo $tempArr))
   runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
 
@@ -225,8 +239,7 @@ run_else() {
 
   shift
 
-  local params=$(echo "$@" | sed 's/ /\" \"/g')
-  $timeoutCmd $which_program $file_param \"$params\"
+  $timeoutCmd $which_program $file_param "$@"
 }
 
 ## 命令检测

shell/pub.sh

@@ -13,7 +13,7 @@ git push
 echo -e "更新cdn文件"
 ts-node sample/tool.ts
 
-string=$(cat src/version.ts | grep "version" | egrep "[^\']*" -o | egrep "\d\.*")
+string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"
 echo -e "当前版本$version"
 

shell/share.sh

@@ -85,6 +85,10 @@ import_config() {
 }
 
 set_proxy() {
+  local proxy="$1"
+  if [[ $proxy ]]; then
+    proxy_url="$proxy"
+  fi
   if [[ $proxy_url ]]; then
     export http_proxy="${proxy_url}"
     export https_proxy="${proxy_url}"
@@ -303,13 +307,14 @@ update_depend() {
 }
 
 git_clone_scripts() {
-  local url=$1
-  local dir=$2
-  local branch=$3
+  local url="$1"
+  local dir="$2"
+  local branch="$3"
+  local proxy="$4"
   [[ $branch ]] && local part_cmd="-b $branch "
   echo -e "开始克隆仓库 $url 到 $dir\n"
 
-  set_proxy
+  set_proxy "$proxy"
   git clone $part_cmd $url $dir
   exit_status=$?
   unset_proxy
@@ -319,15 +324,15 @@ git_pull_scripts() {
   local dir_current=$(pwd)
   local dir_work="$1"
   local branch="$2"
+  local proxy="$3"
   cd $dir_work
   echo -e "开始更新仓库：$dir_work\n"
 
-  set_proxy
+  set_proxy "$proxy"
   git fetch --all
   exit_status=$?
   git pull &>/dev/null
   unset_proxy
-  reset_branch "$branch"
 
   cd $dir_current
 }
@@ -338,19 +343,21 @@ reset_romote_url() {
   local url=$2
   local branch="$3"
 
+  cd $dir_work
   if [[ -d "$dir_work/.git" ]]; then
-    cd $dir_work
     [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
     git remote set-url origin $url &>/dev/null
-
-    local part_cmd=""
-    reset_branch "$branch"
-    cd $dir_current
+  else
+    git init
+    git remote add origin $url &>/dev/null
   fi
+  reset_branch "$branch"
+  cd $dir_current
 }
 
 reset_branch() {
   local branch="$1"
+  local part_cmd=""
   if [[ $branch ]]; then
     part_cmd="origin/${branch}"
     git checkout -B "$branch" &>/dev/null
@@ -375,10 +382,6 @@ reload_pm2() {
   echo -e "启动定时任务服务\n"
   pm2 delete schedule --source-map-support --time &>/dev/null
   pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
-
-  echo -e "启动公开服务\n"
-  pm2 delete public --source-map-support --time &>/dev/null
-  pm2 start $dir_static/build/public.js -n public --source-map-support --time &>/dev/null
 }
 
 diff_time() {
@@ -486,4 +489,4 @@ detect_macos
 define_cmd
 fix_config
 
-import_config $1 >$task_error_log_path 2>&1
+import_config $1 2>$task_error_log_path

shell/task.sh

@@ -56,24 +56,32 @@ format_params() {
   time_format="%Y-%m-%d %H:%M:%S"
   timeoutCmd=""
   if type timeout &>/dev/null; then
-    timeoutCmd="timeout -k 10s $command_timeout_time "
+    timeoutCmd="timeout --foreground -s 14 -k 10s $command_timeout_time "
   fi
+  params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
 }
 
-show_log="false"
-while getopts ":l" opt; do
+while getopts ":lm:" opt; do
   case $opt in
   l)
     show_log="true"
     ;;
+  m)
+    max_time="$OPTARG"
+    ;;
   esac
 done
-[[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
+[[ $show_log ]] && shift $(($OPTIND - 1))
+if [[ $max_time ]]; then
+  shift $(($OPTIND - 1))
+  command_timeout_time="$max_time"
+fi
 
-format_params
+format_params "$@"
 define_program "$@"
 handle_log_path "$@"
-eval . $dir_shell/otask.sh "$@" "$cmd"
+
+eval . $dir_shell/otask.sh "$params" "$cmd"
 [[ -f "$dir_log/$log_path" ]] && cat "$dir_log/$log_path"
 
 exit 0

shell/update.sh

@@ -26,33 +26,6 @@ diff_cron() {
   fi
 }
 
-## 检测配置文件版本
-detect_config_version() {
-  ## 识别出两个文件的版本号
-  ver_config_sample=$(grep " Version: " $file_config_sample | perl -pe "s|.+v((\d+\.?){3})|\1|")
-  [[ -f $file_config_user ]] && ver_config_user=$(grep " Version: " $file_config_user | perl -pe "s|.+v((\d+\.?){3})|\1|")
-
-  ## 删除旧的发送记录文件
-  [[ -f $send_mark ]] && [[ $(cat $send_mark) != $ver_config_sample ]] && rm -f $send_mark
-
-  ## 识别出更新日期和更新内容
-  update_date=$(grep " Date: " $file_config_sample | awk -F ": " '{print $2}')
-  update_content=$(grep " Update Content: " $file_config_sample | awk -F ": " '{print $2}')
-
-  ## 如果是今天，并且版本号不一致，则发送通知
-  if [[ -f $file_config_user ]] && [[ $ver_config_user != $ver_config_sample ]] && [[ $update_date == $(date "+%Y-%m-%d") ]]; then
-    if [[ ! -f $send_mark ]]; then
-      local notify_title="配置文件更新通知"
-      local notify_content="更新日期: $update_date\n用户版本: $ver_config_user\n新的版本: $ver_config_sample\n更新内容: $update_content\n更新说明: 如需使用新功能请对照config.sample.sh，将相关新参数手动增加到你自己的config.sh中，否则请无视本消息。本消息只在该新版本配置文件更新当天发送一次。\n"
-      echo -e $notify_content
-      notify_api "$notify_title" "$notify_content"
-      [[ $? -eq 0 ]] && echo $ver_config_sample >$send_mark
-    fi
-  else
-    [[ -f $send_mark ]] && rm -f $send_mark
-  fi
-}
-
 ## 输出是否有新的或失效的定时任务，$1：新的或失效的任务清单文件路径，$2：新/失效
 output_list_add_drop() {
   local list=$1
@@ -144,6 +117,7 @@ update_repo() {
   local dependence="$4"
   local branch="$5"
   local extensions="$6"
+  local proxy="$7"
   local tmp="${url%/*}"
   local authorTmp1="${tmp##*/}"
   local authorTmp2="${authorTmp1##*:}"
@@ -156,9 +130,10 @@ update_repo() {
   local formatUrl="$url"
   if [[ -d ${repo_path}/.git ]]; then
     reset_romote_url ${repo_path} "${formatUrl}" "${branch}"
-    git_pull_scripts ${repo_path} "${branch}"
+    git_pull_scripts ${repo_path} "${branch}" "${proxy}"
   else
-    git_clone_scripts "${formatUrl}" ${repo_path} "${branch}"
+    rm -rf ${repo_path} &>/dev/null
+    git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
   fi
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新${repo_path}成功...\n"
@@ -186,7 +161,7 @@ update_raw() {
     echo -e "下载 ${raw_file_name} 成功...\n"
     cd $dir_raw
     local filename="raw_${raw_file_name}"
-    local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task $filename" | perl -pe "s|.*ID=(.*) $cmd_task $filename\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
+    local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* $filename" | perl -pe "s|.*ID=(.*) $cmd_task.* $filename\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
     cp -f $raw_file_name $dir_scripts/${filename}
     cron_line=$(
       perl -ne "{
@@ -230,10 +205,10 @@ run_extra_shell() {
 
 ## 脚本用法
 usage() {
-  echo -e "本脚本用法："
+  echo -e "ql命令使用方法："
   echo -e "1. $cmd_update update                                                                  # 更新并重启青龙"
   echo -e "2. $cmd_update extra                                                                   # 运行自定义脚本"
-  echo -e "3. $cmd_update raw <fileurl>                                                           # 更新单个脚本文件"
+  echo -e "3. $cmd_update raw <fileurl>                                                            # 更新单个脚本文件"
   echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch> <extensions>    # 更新单个仓库的脚本"
   echo -e "5. $cmd_update rmlog <days>                                                            # 删除旧日志"
   echo -e "6. $cmd_update bot                                                                     # 启动tg-bot"
@@ -244,23 +219,26 @@ usage() {
 
 ## 更新qinglong
 update_qinglong() {
-  patch_version &>/dev/null
-
+  local mirror="github"
+  local githubStatus=$(curl -s -m 2 -IL "https://github.com" | grep 200)
+  if [ "$githubStatus" == "" ]; then
+    mirror="gitee"
+  fi
+  echo -e "\n使用 ${mirror} 源更新...\n"
   export isFirstStartServer=false
 
-  local all_branch=$(git branch -a)
+  local all_branch=$(cd ${dir_root} && git branch -a)
   local primary_branch="master"
   if [[ "${all_branch}" =~ "${current_branch}" ]]; then
     primary_branch="${current_branch}"
   fi
   [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
-  reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" ${primary_branch}
+  reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
   git_pull_scripts $dir_root ${primary_branch}
 
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新青龙源文件成功...\n"
     cp -f $file_config_sample $dir_config/config.sample.sh
-    detect_config_version
     update_depend
 
     [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
@@ -275,17 +253,16 @@ update_qinglong() {
 update_qinglong_static() {
   local no_restart="$1"
   local primary_branch="$2"
-  local url="https://github.com/whyour/qinglong-static.git"
+  local url="https://${mirror}.com/whyour/qinglong-static.git"
   if [[ -d ${ql_static_repo}/.git ]]; then
     reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
     git_pull_scripts ${ql_static_repo} ${primary_branch}
   else
+    rm -rf ${ql_static_repo} &>/dev/null
     git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
   fi
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新青龙静态资源成功...\n"
-    local static_version=$(cat $dir_root/src/version.ts | perl -pe "s|.*\'(.*)\';\.*|\1|" | head -1)
-    echo -e "\n当前版本 $static_version...\n"
 
     rm -rf $dir_static/*
     cp -rf $ql_static_repo/* $dir_static
@@ -389,12 +366,12 @@ gen_list_repo() {
     filename=$(basename $file)
     cp -f $file "$dir_scripts/${uniq_path}/${filename}"
     echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
-    cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
-    if [[ $cron_id ]]; then
-      result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
-    fi
+    # cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task.* ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
+    # if [[ $cron_id ]]; then
+    #   result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
+    # fi
   done
-  grep -E "${cmd_task} ${uniq_path}" ${list_crontab_user} | perl -pe "s|.*ID=(.*) ${cmd_task} (${uniq_path}.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${uniq_path}_user.list"
+  grep -E "${cmd_task}.* ${uniq_path}" ${list_crontab_user} | perl -pe "s|.*ID=(.*) ${cmd_task}.* (${uniq_path}.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${uniq_path}_user.list"
   cd $dir_current
 }
 
@@ -440,18 +417,29 @@ main() {
 
   cmd=">> $file_path 2>&1"
   [[ "$show_log" == "true" ]] && cmd=""
-  [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-
-  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
-    eval echo -e "请移除 -l 参数" $cmd
-    exit 1
-  fi
 
   local time_format="%Y-%m-%d %H:%M:%S"
   local time=$(date "+$time_format")
   local begin_timestamp=$(format_timestamp "$time_format" "$time")
   [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
 
+  local begin_time=$(format_time "$time_format" "$time")
+
+  if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
+    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+  fi
+
+  if [[ -s $task_error_log_path ]]; then
+    eval cat $task_error_log_path $cmd
+    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
+    eval echo $cmd
+  fi
+
+  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
+    eval echo -e "请移除 -l 参数" $cmd
+    exit 1
+  fi
+
   case $p1 in
   update)
     eval update_qinglong "$2" $cmd
@@ -462,9 +450,9 @@ main() {
   repo)
     get_uniq_path "$p2" "$p6"
     if [[ -n $p2 ]]; then
-      update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7"
+      update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7" "$p8"
     else
-      eval echo -e "命令输入错误...\\\n"
+      eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd
     fi
     ;;
@@ -473,7 +461,7 @@ main() {
     if [[ -n $p2 ]]; then
       update_raw "$p2"
     else
-      eval echo -e "命令输入错误...\\\n"
+      eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd
     fi
     ;;
@@ -488,13 +476,13 @@ main() {
     ;;
   resetlet)
     auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
-    echo -e "重置登录错误次数成功 \n $auth_value" >>$log_path
     echo "$auth_value" >$file_auth_user
+    eval echo -e "重置登录错误次数成功" $cmd
     ;;
   resettfa)
     auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
-    echo -e "禁用两步验证成功 \n $auth_value" >>$log_path
     echo "$auth_value" >$file_auth_user
+    eval echo -e "禁用两步验证成功" $cmd
     ;;
   *)
     eval echo -e "命令输入错误...\\\n" $cmd
@@ -502,11 +490,18 @@ main() {
     ;;
   esac
 
-  if [[ -f $file_path ]]; then
-    local end_timestamp=$(date "+%s")
-    local diff_time=$(($end_timestamp - $begin_timestamp))
-    [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+  local etime=$(date "+$time_format")
+  local end_time=$(format_time "$time_format" "$etime")
+  local end_timestamp=$(format_timestamp "$time_format" "$etime")
+  local diff_time=$(($end_timestamp - $begin_timestamp))
+  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+
+  if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
     eval echo -e "\\\n　　　　　　　　　　" $cmd
+  fi
+
+  if [[ -f $file_path ]]; then
     cat $file_path
   fi
 }

src/components/iconfont.tsx

@@ -1,7 +1,7 @@
 import { createFromIconfontCN } from '@ant-design/icons';
 
 const IconFont = createFromIconfontCN({
-  scriptUrl: ['//at.alicdn.com/t/font_3354854_ds8pa06q1qa.js'],
+  scriptUrl: ['//at.alicdn.com/t/c/font_3354854_ob5y15ewlyq.js'],
 });
 
 export default IconFont;

src/hooks/useTableScrollHeight.ts

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

src/layouts/index.less

@@ -10,8 +10,8 @@
 }
 
 .ant-modal-body {
-  max-height: calc(85vh - 110px);
-  max-height: calc(85vh - var(--vh-offset, 110px));
+  max-height: calc(80vh - 110px);
+  max-height: calc(80vh - var(--vh-offset, 110px));
   overflow-y: auto;
 }
 
@@ -179,8 +179,8 @@
 
 .Resizer {
   background: @component-background;
-  opacity: 0.2;
-  z-index: 1;
+  opacity: 0.8;
+  z-index: 100;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
@@ -253,10 +253,11 @@ textarea:-webkit-autofill:focus,
 select:-webkit-autofill,
 select:-webkit-autofill:hover,
 select:-webkit-autofill:focus {
-  border: none;
   box-shadow: none;
   transition: background-color 5000s ease-in-out 0s;
   -webkit-text-fill-color: @text-color;
+  caret-color: @text-color;
+  color: @text-color;
 }
 
 ::placeholder {
@@ -342,3 +343,8 @@ select:-webkit-autofill:focus {
     width: auto !important;
   }
 }
+
+pre {
+  word-break: break-all !important;
+  white-space: break-spaces !important;
+}

src/layouts/index.tsx

@@ -13,9 +13,19 @@ import config from '@/utils/config';
 import { request } from '@/utils/http';
 import './index.less';
 import vhCheck from 'vh-check';
-import { version, changeLogLink, changeLog } from '../version';
 import { useCtx, useTheme } from '@/utils/hooks';
-import { message, Badge, Modal, Avatar, Dropdown, Menu, Image } from 'antd';
+import {
+  message,
+  Badge,
+  Modal,
+  Avatar,
+  Dropdown,
+  Menu,
+  Image,
+  Popover,
+  Descriptions,
+  Tooltip,
+} from 'antd';
 // @ts-ignore
 import SockJS from 'sockjs-client';
 import * as Sentry from '@sentry/react';
@@ -32,6 +42,17 @@ export interface SharedContext {
   reloadUser: (needLoading?: boolean) => void;
   reloadTheme: () => void;
   socketMessage: any;
+  systemInfo: TSystemInfo;
+}
+
+interface TSystemInfo {
+  branch: 'develop' | 'master';
+  isInitialized: boolean;
+  lastCommitId: string;
+  lastCommitTime: number;
+  version: string;
+  changeLog: string;
+  changeLogLink: string;
 }
 
 export default function () {
@@ -40,7 +61,7 @@ export default function () {
   const { theme, reloadTheme } = useTheme();
   const [user, setUser] = useState<any>({});
   const [loading, setLoading] = useState<boolean>(true);
-  const [systemInfo, setSystemInfo] = useState<{ isInitialized: boolean }>();
+  const [systemInfo, setSystemInfo] = useState<TSystemInfo>();
   const ws = useRef<any>(null);
   const [socketMessage, setSocketMessage] = useState<any>();
   const [collapsed, setCollapsed] = useState(false);
@@ -69,6 +90,7 @@ export default function () {
           if (!data.isInitialized) {
             history.push('/initialization');
           } else {
+            init(data.version);
             getUser();
           }
         }
@@ -123,7 +145,6 @@ export default function () {
 
   useEffect(() => {
     vhCheck();
-    init();
 
     const _theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
     if (typeof window === 'undefined') return;
@@ -244,29 +265,35 @@ export default function () {
       selectedKeys={[location.pathname]}
       loading={loading}
       ErrorBoundary={Sentry.ErrorBoundary}
-      logo={<Image preview={false} src="http://qn.whyour.cn/logo.png" />}
+      logo={<Image preview={false} src="https://qn.whyour.cn/logo.png" />}
       title={
         <>
           <span style={{ fontSize: 16 }}>控制面板</span>
           <a
-            href={changeLogLink}
+            href={systemInfo?.changeLogLink}
             target="_blank"
             rel="noopener noreferrer"
             onClick={(e) => {
               e.stopPropagation();
             }}
           >
-            <span
-              style={{
-                fontSize: isFirefox ? 9 : 12,
-                color: '#666',
-                marginLeft: 2,
-                zoom: isSafari ? 0.66 : 0.8,
-                letterSpacing: isQQBrowser ? -2 : 0,
-              }}
+            <Tooltip
+              title={systemInfo?.branch === 'develop' ? '开发版' : '正式版'}
             >
-              v{version}
-            </span>
+              <Badge size="small" dot={systemInfo?.branch === 'develop'}>
+                <span
+                  style={{
+                    fontSize: isFirefox ? 9 : 12,
+                    color: '#666',
+                    marginLeft: 2,
+                    zoom: isSafari ? 0.66 : 0.8,
+                    letterSpacing: isQQBrowser ? -2 : 0,
+                  }}
+                >
+                  v{systemInfo?.version}
+                </span>
+              </Badge>
+            </Tooltip>
           </a>
         </>
       }
@@ -342,6 +369,7 @@ export default function () {
           reloadUser,
           reloadTheme,
           socketMessage,
+          systemInfo,
         }}
       />
     </ProLayout>

src/pages/crontab/detail.tsx

@@ -29,6 +29,7 @@ import config from '@/utils/config';
 import CronLogModal from './logModal';
 import Editor from '@monaco-editor/react';
 import IconFont from '@/components/iconfont';
+import { getCommandScript } from '@/utils';
 
 const { Text } = Typography;
 
@@ -147,22 +148,10 @@ const CronDetailModal = ({
   };
 
   const getScript = () => {
-    const cmd = cron.command.split(' ') as string[];
-    if (cmd[0] === 'task') {
+    const result = getCommandScript(cron.command);
+    if (Array.isArray(result)) {
       setValidTabs(validTabs);
-      if (cmd[1].startsWith('/ql/data/scripts')) {
-        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
-      }
-
-      let p: string, s: string;
-      let index = cmd[1].lastIndexOf('/');
-      if (index >= 0) {
-        s = cmd[1].slice(index + 1);
-        p = cmd[1].slice(0, index);
-      } else {
-        s = cmd[1];
-        p = '';
-      }
+      const [s, p] = result;
       setScriptInfo({ parent: p, filename: s });
       request
         .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
@@ -171,7 +160,7 @@ const CronDetailModal = ({
             setValue(data);
           }
         });
-    } else {
+    } else if (result) {
       setValidTabs([validTabs[0]]);
     }
   };

src/pages/crontab/index.less

@@ -4,13 +4,10 @@
 
 .crontab-detail {
   .card-wrapper {
-    height: 80vh;
-    height: calc(80vh - var(--vh-offset, 0px));
-
     .ant-card:last-child {
       .ant-card-body {
-        height: calc(80vh - 238px);
-        height: calc(80vh - var(--vh-offset, 0px) - 238px);
+        height: calc(80vh - 367px);
+        height: calc(80vh - var(--vh-offset, 0px) - 367px);
         overflow-y: auto;
       }
     }
@@ -176,3 +173,9 @@ tr.drop-over-upward td {
     padding-top: 10px;
   }
 }
+
+.view-filters-container.active {
+  .filter-item > div > .ant-form-item-control {
+    margin-left: 40px;
+  }
+}

src/pages/crontab/index.tsx

@@ -1,4 +1,4 @@
-import React, { PureComponent, Fragment, useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import {
   Button,
   message,
@@ -43,14 +43,14 @@ import CronLogModal from './logModal';
 import CronDetailModal from './detail';
 import cron_parser from 'cron-parser';
 import { diffTime } from '@/utils/date';
-import { getTableScroll } from '@/utils/index';
 import { history, useOutletContext } from '@umijs/max';
 import './index.less';
 import ViewCreateModal from './viewCreateModal';
 import ViewManageModal from './viewManageModal';
-import pagination from 'antd/lib/pagination';
 import { FilterValue, SorterResult } from 'antd/lib/table/interface';
 import { SharedContext } from '@/layouts';
+import useTableScrollHeight from '@/hooks/useTableScrollHeight';
+import { getCommandScript } from '@/utils';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -376,7 +376,6 @@ const Crontab = () => {
     filters: any;
   }>({} as any);
   const [viewConf, setViewConf] = useState<any>();
-  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
   const [isDetailModalVisible, setIsDetailModalVisible] = useState(false);
   const [detailCron, setDetailCron] = useState<any>();
   const [searchValue, setSearchValue] = useState('');
@@ -388,26 +387,16 @@ const Crontab = () => {
   const [cronViews, setCronViews] = useState<any[]>([]);
   const [enabledCronViews, setEnabledCronViews] = useState<any[]>([]);
   const [moreMenuActive, setMoreMenuActive] = useState(false);
+  const tableRef = useRef<any>();
+  const tableScrollHeight = useTableScrollHeight(tableRef);
 
   const goToScriptManager = (record: any) => {
-    const cmd = record.command.split(' ') as string[];
-    if (cmd[0] === 'task') {
-      if (cmd[1].startsWith('/ql/data/scripts')) {
-        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
-      }
-
-      let p: string, s: string;
-      let index = cmd[1].lastIndexOf('/');
-      if (index >= 0) {
-        s = cmd[1].slice(index + 1);
-        p = cmd[1].slice(0, index);
-      } else {
-        s = cmd[1];
-        p = '';
-      }
+    const result = getCommandScript(record.command);
+    if (Array.isArray(result)) {
+      const [s, p] = result;
       history.push(`/script?p=${p}&s=${s}`);
-    } else if (cmd[1] === 'repo') {
-      location.href = cmd[2];
+    } else if (result) {
+      location.href = result;
     }
   };
 
@@ -429,6 +418,7 @@ const Crontab = () => {
       url += `&queryString=${JSON.stringify({
         filters: viewConf.filters,
         sorts: viewConf.sorts,
+        filterRelation: viewConf.filterRelation || 'and',
       })}`;
     }
     request
@@ -769,16 +759,10 @@ const Crontab = () => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
-
-    setTimeout(() => {
-      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll());
-      }
-    });
   };
 
   const rowSelection = {
-    selectedRowIds,
+    selectedRowKeys: selectedRowIds,
     onChange: onSelectChange,
   };
 
@@ -862,7 +846,7 @@ const Crontab = () => {
 
   useEffect(() => {
     if (viewConf && enabledCronViews && enabledCronViews.length > 0) {
-      const view = enabledCronViews.slice(2).find((x) => x.id === viewConf.id);
+      const view = enabledCronViews.slice(4).find((x) => x.id === viewConf.id);
       setMoreMenuActive(!!view);
     }
   }, [viewConf, enabledCronViews]);
@@ -874,96 +858,9 @@ const Crontab = () => {
       sorter: {},
       filters: {},
     });
-    setTimeout(() => {
-      setTableScrollHeight(getTableScroll());
-    });
     getCronViews();
   }, []);
 
-  const panelContent = (
-    <>
-      {selectedRowIds.length > 0 && (
-        <div style={{ marginBottom: 16 }}>
-          <Button type="primary" style={{ marginBottom: 5 }} onClick={delCrons}>
-            批量删除
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateCrons(0)}
-            style={{ marginLeft: 8, marginBottom: 5 }}
-          >
-            批量启用
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateCrons(1)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量禁用
-          </Button>
-          <Button
-            type="primary"
-            style={{ marginRight: 8 }}
-            onClick={() => operateCrons(2)}
-          >
-            批量运行
-          </Button>
-          <Button type="primary" onClick={() => operateCrons(3)}>
-            批量停止
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateCrons(4)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量置顶
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateCrons(5)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量取消置顶
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => setIsLabelModalVisible(true)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量修改标签
-          </Button>
-          <span style={{ marginLeft: 8 }}>
-            已选择
-            <a>{selectedRowIds?.length}</a>项
-          </span>
-        </div>
-      )}
-      <Table
-        columns={columns}
-        pagination={{
-          current: pageConf.page,
-          pageSize: pageConf.size,
-          showSizeChanger: true,
-          simple: isPhone,
-          total,
-          showTotal: (total: number, range: number[]) =>
-            `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
-          pageSizeOptions: [10, 20, 50, 100, 200, 500, total || 10000].sort(
-            (a, b) => a - b,
-          ),
-        }}
-        dataSource={value}
-        rowKey="id"
-        size="middle"
-        scroll={{ x: 1000, y: tableScrollHeight }}
-        loading={loading}
-        rowSelection={rowSelection}
-        rowClassName={getRowClassName}
-        onChange={onPageChange}
-      />
-    </>
-  );
-
   const viewAction = (key: string) => {
     switch (key) {
       case 'new':
@@ -986,7 +883,7 @@ const Crontab = () => {
         viewAction(key);
       }}
       items={[
-        ...[...enabledCronViews].slice(2).map((x) => ({
+        ...[...enabledCronViews].slice(4).map((x) => ({
           label: (
             <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
               <span>{x.name}</span>
@@ -1032,6 +929,7 @@ const Crontab = () => {
 
   const tabClick = (key: string) => {
     const view = enabledCronViews.find((x) => x.id == key);
+    setSelectedRowIds([]);
     setPageConf({ ...pageConf, page: 1 });
     setViewConf(view ? view : null);
   };
@@ -1081,27 +979,97 @@ const Crontab = () => {
         }
         onTabClick={tabClick}
         items={[
-          {
-            key: 'all',
-            label: '全部任务',
-            children: panelContent,
-          },
-          ...[...enabledCronViews].slice(0, 2).map((x) => ({
+          ...[...enabledCronViews].slice(0, 4).map((x) => ({
             key: x.id,
             label: x.name,
-            children: panelContent,
           })),
         ]}
-      >
-        <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>
+      />
+      <div ref={tableRef}>
+        {selectedRowIds.length > 0 && (
+          <div style={{ marginBottom: 16 }}>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5 }}
+              onClick={delCrons}
+            >
+              批量删除
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(0)}
+              style={{ marginLeft: 8, marginBottom: 5 }}
+            >
+              批量启用
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(1)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量禁用
+            </Button>
+            <Button
+              type="primary"
+              style={{ marginRight: 8 }}
+              onClick={() => operateCrons(2)}
+            >
+              批量运行
+            </Button>
+            <Button type="primary" onClick={() => operateCrons(3)}>
+              批量停止
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(4)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量置顶
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateCrons(5)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量取消置顶
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => setIsLabelModalVisible(true)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量修改标签
+            </Button>
+            <span style={{ marginLeft: 8 }}>
+              已选择
+              <a>{selectedRowIds?.length}</a>项
+            </span>
+          </div>
+        )}
+        <Table
+          columns={columns}
+          pagination={{
+            current: pageConf.page,
+            pageSize: pageConf.size,
+            showSizeChanger: true,
+            simple: isPhone,
+            total,
+            showTotal: (total: number, range: number[]) =>
+              `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
+            pageSizeOptions: [10, 20, 50, 100, 200, 500, total || 10000].sort(
+              (a, b) => a - b,
+            ),
+          }}
+          dataSource={value}
+          rowKey="id"
+          size="middle"
+          scroll={{ x: 1000, y: tableScrollHeight }}
+          loading={loading}
+          rowSelection={rowSelection}
+          rowClassName={getRowClassName}
+          onChange={onPageChange}
+        />
+      </div>
       <CronLogModal
         visible={isLogModalVisible}
         handleCancel={() => {

src/pages/crontab/viewCreateModal.tsx

@@ -12,19 +12,28 @@ import {
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import IconFont from '@/components/iconfont';
+import get from 'lodash/get';
 
 const PROPERTIES = [
   { name: '命令', value: 'command' },
   { name: '名称', value: 'name' },
   { name: '定时规则', value: 'schedule' },
   { name: '状态', value: 'status' },
+  { name: '标签', value: 'labels' },
 ];
 
+const EOperation: any = {
+  Reg: '',
+  NotReg: '',
+  In: 'select',
+  Nin: 'select',
+};
 const OPERATIONS = [
   { name: '包含', value: 'Reg' },
   { name: '不包含', value: 'NotReg' },
-  { name: '属于', value: 'In' },
-  { name: '不属于', value: 'Nin' },
+  { name: '属于', value: 'In', type: 'select' },
+  { name: '不属于', value: 'Nin', type: 'select' },
   // { name: '等于', value: 'Eq' },
   // { name: '不等于', value: 'Ne' },
   // { name: '为空', value: 'IsNull' },
@@ -36,11 +45,18 @@ const SORTTYPES = [
   { name: '倒序', value: 'DESC' },
 ];
 
-const STATUS = [
-  { name: '运行中', value: 0 },
-  { name: '空闲中', value: 1 },
-  { name: '已禁用', value: 2 },
-];
+const STATUS_MAP = {
+  status: [
+    { name: '运行中', value: 0 },
+    { name: '空闲中', value: 1 },
+    { name: '已禁用', value: 2 },
+  ],
+};
+
+enum ViewFilterRelation {
+  'and' = '且',
+  'or' = '或',
+}
 
 const ViewCreateModal = ({
   view,
@@ -53,10 +69,11 @@ const ViewCreateModal = ({
 }) => {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
-  const [operationMap, setOperationMap] = useState<any>();
+  const [filterRelation, setFilterRelation] = useState<'and' | 'or'>('and');
 
   const handleOk = async (values: any) => {
     setLoading(true);
+    values.filterRelation = filterRelation;
     const method = view ? 'put' : 'post';
     try {
       const { code, data } = await request[method](
@@ -87,12 +104,7 @@ const ViewCreateModal = ({
   }, [view, visible]);
 
   const operationElement = (
-    <Select
-      style={{ width: 100 }}
-      onChange={() => {
-        setOperationMap({});
-      }}
-    >
+    <Select style={{ width: 80 }}>
       {OPERATIONS.map((x) => (
         <Select.Option key={x.name} value={x.value}>
           {x.name}
@@ -123,15 +135,17 @@ const ViewCreateModal = ({
     </Select>
   );
 
-  const statusElement = (
-    <Select mode="multiple" allowClear placeholder="请选择状态">
-      {STATUS.map((x) => (
-        <Select.Option key={x.name} value={x.value}>
-          {x.name}
-        </Select.Option>
-      ))}
-    </Select>
-  );
+  const statusElement = (property: keyof typeof STATUS_MAP) => {
+    return (
+      <Select mode="tags" allowClear placeholder="输入后回车增加自定义选项">
+        {STATUS_MAP[property]?.map((x) => (
+          <Select.Option key={x.name} value={x.value}>
+            {x.name}
+          </Select.Option>
+        ))}
+      </Select>
+    );
+  };
 
   return (
     <Modal
@@ -164,57 +178,145 @@ const ViewCreateModal = ({
         </Form.Item>
         <Form.List name="filters">
           {(fields, { add, remove }) => (
-            <>
-              {fields.map(({ key, name, ...restField }, index) => (
-                <Form.Item
-                  label={index === 0 ? '筛选条件' : ''}
-                  key={key}
-                  style={{ marginBottom: 0 }}
-                  required
+            <div
+              style={{ position: 'relative' }}
+              className={`view-filters-container ${
+                fields.length > 1 ? 'active' : ''
+              }`}
+            >
+              {fields.length > 1 && (
+                <div
+                  style={{
+                    position: 'absolute',
+                    width: 50,
+                    borderRadius: 10,
+                    border: '1px solid rgb(190, 220, 255)',
+                    borderRight: 'none',
+                    height: 56 * (fields.length - 1),
+                    top: 46,
+                    left: 15,
+                  }}
                 >
-                  <Space className="view-create-modal-filters" align="baseline">
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'property']}
-                      rules={[{ required: true }]}
+                  <Button
+                    type="primary"
+                    size="small"
+                    style={{
+                      position: 'absolute',
+                      top: '50%',
+                      translate: '-50% -50%',
+                      padding: '0 0 0 3px',
+                      cursor: 'pointer',
+                    }}
+                    onClick={() => {
+                      setFilterRelation(
+                        filterRelation === 'and' ? 'or' : 'and',
+                      );
+                    }}
+                  >
+                    <>
+                      <span>{ViewFilterRelation[filterRelation]}</span>
+                      <IconFont type="ql-icon-d-caret" />
+                    </>
+                  </Button>
+                </div>
+              )}
+              <div>
+                {fields.map(({ key, name, ...restField }, index) => (
+                  <Form.Item
+                    label={index === 0 ? '筛选条件' : ''}
+                    key={key}
+                    style={{ marginBottom: 0 }}
+                    required
+                    className="filter-item"
+                  >
+                    <Space
+                      className="view-create-modal-filters"
+                      align="baseline"
+                      style={
+                        fields.length > 1 ? { width: 'calc(100% - 40px)' } : {}
+                      }
                     >
-                      {propertyElement(PROPERTIES, { width: 120 })}
-                    </Form.Item>
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'operation']}
-                      rules={[{ required: true }]}
-                    >
-                      {operationElement}
-                    </Form.Item>
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'value']}
-                      rules={[{ required: true, message: '请输入内容' }]}
-                    >
-                      {['In', 'Nin'].includes(
-                        form.getFieldValue(['filters', index, 'operation']),
-                      ) ? (
-                        statusElement
-                      ) : (
-                        <Input placeholder="请输入内容" />
+                      <Form.Item
+                        {...restField}
+                        name={[name, 'property']}
+                        rules={[{ required: true }]}
+                      >
+                        {propertyElement(PROPERTIES, { width: 90 })}
+                      </Form.Item>
+                      <Form.Item
+                        {...restField}
+                        name={[name, 'operation']}
+                        rules={[{ required: true }]}
+                      >
+                        {operationElement}
+                      </Form.Item>
+                      <Form.Item
+                        noStyle
+                        shouldUpdate={(prevValues, nextValues) => {
+                          const preOperation =
+                            EOperation[
+                              get(prevValues, ['filters', name, 'operation'])
+                            ];
+                          const nextOperation =
+                            EOperation[
+                              get(nextValues, ['filters', name, 'operation'])
+                            ];
+                          const flag = preOperation !== nextOperation;
+                          if (flag) {
+                            form.setFieldValue(
+                              ['filters', name, 'value'],
+                              nextOperation === 'select' ? [] : '',
+                            );
+                          }
+                          return flag;
+                        }}
+                      >
+                        {() => {
+                          const property = form.getFieldValue([
+                            'filters',
+                            index,
+                            'property',
+                          ]) as 'status';
+                          const operate = form.getFieldValue([
+                            'filters',
+                            name,
+                            'operation',
+                          ]);
+                          return (
+                            <Form.Item
+                              {...restField}
+                              name={[name, 'value']}
+                              rules={[
+                                { required: true, message: '请输入内容' },
+                              ]}
+                            >
+                              {EOperation[operate] === 'select' ? (
+                                statusElement(property)
+                              ) : (
+                                <Input placeholder="请输入内容" />
+                              )}
+                            </Form.Item>
+                          );
+                        }}
+                      </Form.Item>
+                      {index !== 0 && (
+                        <MinusCircleOutlined onClick={() => remove(name)} />
                       )}
-                    </Form.Item>
-                    {index !== 0 && (
-                      <MinusCircleOutlined onClick={() => remove(name)} />
-                    )}
-                  </Space>
+                    </Space>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <a
+                    onClick={() =>
+                      add({ property: 'command', operation: 'Reg' })
+                    }
+                  >
+                    <PlusOutlined />
+                    新增筛选条件
+                  </a>
                 </Form.Item>
-              ))}
-              <Form.Item>
-                <a
-                  onClick={() => add({ property: 'command', operation: 'Reg' })}
-                >
-                  <PlusOutlined />
-                  新增筛选条件
-                </a>
-              </Form.Item>
-            </>
+              </div>
+            </div>
           )}
         </Form.List>
         <Form.List name="sorts">

src/pages/crontab/viewManageModal.tsx

@@ -81,6 +81,16 @@ const ViewManageModal = ({
       dataIndex: 'name',
       key: 'name',
       align: 'center' as const,
+      render: (text) => (
+        <div style={{ textAlign: 'left', paddingLeft: 30 }}>{text}</div>
+      ),
+    },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center' as const,
+      render: (v) => (v === 1 ? '系统' : '个人'),
     },
     {
       title: '显示',
@@ -100,10 +110,10 @@ const ViewManageModal = ({
     {
       title: '操作',
       key: 'action',
-      width: 140,
+      width: 100,
       align: 'center' as const,
       render: (text: string, record: any, index: number) => {
-        return (
+        return record.type !== 1 ? (
           <Space size="middle">
             <a onClick={() => editView(record, index)}>
               <EditOutlined />
@@ -112,6 +122,8 @@ const ViewManageModal = ({
               <DeleteOutlined />
             </a>
           </Space>
+        ) : (
+          '-'
         );
       },
     },

src/pages/dependence/index.tsx

@@ -27,10 +27,11 @@ import DependenceModal from './modal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
-import { getTableScroll } from '@/utils/index';
 import DependenceLogModal from './logModal';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
+import useTableScrollHeight from '@/hooks/useTableScrollHeight';
+
 
 const { Text } = Typography;
 const { Search } = Input;
@@ -164,10 +165,11 @@ const Dependence = () => {
   const [editedDependence, setEditedDependence] = useState();
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
   const [searchText, setSearchText] = useState('');
-  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
   const [logDependence, setLogDependence] = useState<any>();
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
   const [type, setType] = useState('nodejs');
+  const tableRef = useRef<any>();
+  const tableScrollHeight = useTableScrollHeight(tableRef, 59)
 
   const getDependencies = () => {
     setLoading(true);
@@ -282,16 +284,10 @@ const Dependence = () => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
-
-    setTimeout(() => {
-      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-      }
-    });
   };
 
   const rowSelection = {
-    selectedRowIds,
+    selectedRowKeys: selectedRowIds,
     onChange: onSelectChange,
   };
 
@@ -367,12 +363,6 @@ const Dependence = () => {
     getDependencies();
   }, [searchText, type]);
 
-  useEffect(() => {
-    setTimeout(() => {
-      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-    });
-  }, []);
-
   useEffect(() => {
     if (logDependence) {
       localStorage.setItem('logDependence', logDependence.id);
@@ -421,53 +411,8 @@ const Dependence = () => {
     }
   }, [socketMessage]);
 
-  const panelContent = () => (
-    <>
-      {selectedRowIds.length > 0 && (
-        <div style={{ marginBottom: 16 }}>
-          <Button
-            type="primary"
-            style={{ marginBottom: 5, marginLeft: 8 }}
-            onClick={() => handlereInstallDependencies()}
-          >
-            批量安装
-          </Button>
-          <Button
-            type="primary"
-            style={{ marginBottom: 5, marginLeft: 8 }}
-            onClick={() => delDependencies(false)}
-          >
-            批量删除
-          </Button>
-          <Button
-            type="primary"
-            style={{ marginBottom: 5, marginLeft: 8 }}
-            onClick={() => delDependencies(true)}
-          >
-            批量强制删除
-          </Button>
-          <span style={{ marginLeft: 8 }}>
-            已选择
-            <a>{selectedRowIds?.length}</a>项
-          </span>
-        </div>
-      )}
-      <DndProvider backend={HTML5Backend}>
-        <Table
-          columns={columns}
-          rowSelection={rowSelection}
-          pagination={false}
-          dataSource={value}
-          rowKey="id"
-          size="middle"
-          scroll={{ x: 768, y: tableScrollHeight }}
-          loading={loading}
-        />
-      </DndProvider>
-    </>
-  );
-
   const onTabChange = (activeKey: string) => {
+    setSelectedRowIds([]);
     setType(activeKey);
   };
 
@@ -500,20 +445,60 @@ const Dependence = () => {
           {
             key: 'nodejs',
             label: 'NodeJs',
-            children: panelContent(),
           },
           {
             key: 'python3',
             label: 'Python3',
-            children: panelContent(),
           },
           {
             key: 'linux',
             label: 'Linux',
-            children: panelContent(),
           },
         ]}
       />
+      <div ref={tableRef}>
+        {selectedRowIds.length > 0 && (
+          <div style={{ marginBottom: 16 }}>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5, marginLeft: 8 }}
+              onClick={() => handlereInstallDependencies()}
+            >
+              批量安装
+            </Button>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5, marginLeft: 8 }}
+              onClick={() => delDependencies(false)}
+            >
+              批量删除
+            </Button>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5, marginLeft: 8 }}
+              onClick={() => delDependencies(true)}
+            >
+              批量强制删除
+            </Button>
+            <span style={{ marginLeft: 8 }}>
+              已选择
+              <a>{selectedRowIds?.length}</a>项
+            </span>
+          </div>
+        )}
+        <DndProvider backend={HTML5Backend}>
+          <Table
+            columns={columns}
+            rowSelection={rowSelection}
+            pagination={false}
+            dataSource={value}
+            rowKey="id"
+            size="middle"
+            scroll={{ x: 768, y: tableScrollHeight }}
+            loading={loading}
+          />
+        </DndProvider>
+      </div>
       <DependenceModal
         visible={isModalVisible}
         handleCancel={handleCancel}

src/pages/env/index.tsx

@@ -28,9 +28,10 @@ import EditNameModal from './editNameModal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
-import { exportJson, getTableScroll } from '@/utils/index';
+import { exportJson } from '@/utils/index';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
+import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -134,6 +135,7 @@ const Env = () => {
               textAlign: 'left',
             }}
             ellipsis={{ tooltip: text, rows: 2 }}
+            copyable
           >
             {text}
           </Paragraph>
@@ -252,8 +254,9 @@ const Env = () => {
   const [editedEnv, setEditedEnv] = useState();
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
   const [searchText, setSearchText] = useState('');
-  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
   const [importLoading, setImportLoading] = useState(false);
+  const tableRef = useRef<any>();
+  const tableScrollHeight = useTableScrollHeight(tableRef, 59)
 
   const getEnvs = () => {
     setLoading(true);
@@ -283,8 +286,7 @@ const Env = () => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}envs/${
-              record.status === Status.已禁用 ? 'enable' : 'disable'
+            `${config.apiPrefix}envs/${record.status === Status.已禁用 ? 'enable' : 'disable'
             }`,
             {
               data: [record.id],
@@ -406,16 +408,10 @@ const Env = () => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
-
-    setTimeout(() => {
-      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-      }
-    });
   };
 
   const rowSelection = {
-    selectedRowIds,
+    selectedRowKeys: selectedRowIds,
     onChange: onSelectChange,
   };
 
@@ -507,12 +503,6 @@ const Env = () => {
     getEnvs();
   }, [searchText]);
 
-  useEffect(() => {
-    setTimeout(() => {
-      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-    });
-  }, []);
-
   return (
     <PageContainer
       className="ql-container-wrapper env-wrapper"
@@ -587,6 +577,7 @@ const Env = () => {
       )}
       <DndProvider backend={HTML5Backend}>
         <Table
+          ref={tableRef}
           columns={columns}
           rowSelection={rowSelection}
           pagination={false}
@@ -596,7 +587,7 @@ const Env = () => {
           scroll={{ x: 1000, y: tableScrollHeight }}
           components={components}
           loading={loading}
-          onRow={(record: any, index: number) => {
+          onRow={(record: any, index: number | undefined) => {
             return {
               index,
               moveRow,

src/pages/initialization/index.tsx

@@ -232,7 +232,7 @@ const Initialization = () => {
           <img
             alt="logo"
             className={styles.logo}
-            src="http://qn.whyour.cn/logo.png"
+            src="https://qn.whyour.cn/logo.png"
           />
           <span className={styles.title}>初始化配置</span>
         </div>

src/pages/log/index.tsx

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

src/pages/login/index.tsx

@@ -129,7 +129,7 @@ const Login = () => {
           <img
             alt="logo"
             className={styles.logo}
-            src="http://qn.whyour.cn/logo.png"
+            src="https://qn.whyour.cn/logo.png"
           />
           <span className={styles.title}>
             {twoFactor ? '两步验证' : config.siteName}

src/pages/script/editModal.tsx

@@ -49,6 +49,7 @@ const EditModal = ({
   const { theme } = useTheme();
   const editorRef = useRef<any>(null);
   const [isRunning, setIsRunning] = useState(false);
+  const [currentPid, setCurrentPid] = useState(null);
 
   const cancel = () => {
     handleCancel();
@@ -94,6 +95,7 @@ const EditModal = ({
       .then(({ code, data }) => {
         if (code === 200) {
           setIsRunning(true);
+          setCurrentPid(data);
         }
       });
   };
@@ -102,13 +104,12 @@ const EditModal = ({
     if (!cNode || !cNode.title) {
       return;
     }
-    const content = editorRef.current.getValue().replace(/\r\n/g, '\n');
     request
       .put(`${config.apiPrefix}scripts/stop`, {
         data: {
           filename: cNode.title,
           path: cNode.parent || '',
-          content,
+          pid: currentPid,
         },
       })
       .then(({ code, data }) => {
@@ -253,7 +254,14 @@ const EditModal = ({
             editorRef.current = editor;
           }}
         />
-        <pre style={{ height: '100%', whiteSpace: 'break-spaces' }}>{log}</pre>
+        <pre
+          style={{
+            height: '100%',
+            padding: '0 15px',
+          }}
+        >
+          {log}
+        </pre>
       </SplitPane>
       <SaveModal
         visible={saveModalVisible}
@@ -264,7 +272,7 @@ const EditModal = ({
           content:
             editorRef.current &&
             editorRef.current.getValue().replace(/\r\n/g, '\n'),
-          filename: cNode?.title,
+          ...cNode,
         }}
       />
       <SettingModal

src/pages/script/index.tsx

@@ -38,7 +38,9 @@ import { parse } from 'query-string';
 import { depthFirstSearch } from '@/utils';
 import { SharedContext } from '@/layouts';
 import useFilterTreeData from '@/hooks/useFilterTreeData';
-import { uniq } from 'lodash';
+import uniq from 'lodash/uniq';
+import IconFont from '@/components/iconfont';
+import RenameModal from './renameModal';
 
 const { Text } = Typography;
 
@@ -64,20 +66,22 @@ const Script = () => {
   const [isEditing, setIsEditing] = useState(false);
   const editorRef = useRef<any>(null);
   const [isAddFileModalVisible, setIsAddFileModalVisible] = useState(false);
+  const [isRenameFileModalVisible, setIsRenameFileModalVisible] = useState(false);
   const [currentNode, setCurrentNode] = useState<any>();
   const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
 
-  const getScripts = () => {
-    setLoading(true);
+  const getScripts = (needLoading: boolean = true) => {
+    needLoading && setLoading(true);
     request
       .get(`${config.apiPrefix}scripts`)
       .then(({ code, data }) => {
         if (code === 200) {
           setData(data);
+          initState();
           initGetScript();
         }
       })
-      .finally(() => setLoading(false));
+      .finally(() => needLoading && setLoading(false));
   };
 
   const getDetail = (node: any) => {
@@ -287,6 +291,15 @@ const Script = () => {
     });
   };
 
+  const renameFile = () => {
+    setIsRenameFileModalVisible(true);
+  }
+
+  const handleRenameFileCancel = () => {
+    setIsRenameFileModalVisible(false);
+    getScripts(false);
+  }
+
   const addFile = () => {
     setIsAddFileModalVisible(true);
   };
@@ -381,6 +394,9 @@ const Script = () => {
       case 'delete':
         deleteFile();
         break;
+      case 'rename':
+        renameFile();
+        break;
       default:
         break;
     }
@@ -407,6 +423,12 @@ const Script = () => {
           icon: <EditOutlined />,
           disabled: !select,
         },
+        {
+          label: '重命名',
+          key: 'rename',
+          icon: <IconFont type="ql-icon-rename" />,
+          disabled: !select,
+        },
         {
           label: '删除',
           key: 'delete',
@@ -471,6 +493,14 @@ const Script = () => {
                   icon={<EditOutlined />}
                 />
               </Tooltip>,
+              <Tooltip title="重命名">
+                <Button
+                  disabled={!select}
+                  type="primary"
+                  onClick={renameFile}
+                  icon={<IconFont type="ql-icon-rename" />}
+                />
+              </Tooltip>,
               <Tooltip title="删除">
                 <Button
                   type="primary"
@@ -585,6 +615,11 @@ const Script = () => {
           treeData={data}
           handleCancel={addFileModalClose}
         />
+        <RenameModal
+          visible={isRenameFileModalVisible}
+          handleCancel={handleRenameFileCancel}
+          currentNode={currentNode}
+        />
       </div>
     </PageContainer>
   );

src/pages/script/renameModal.tsx

@@ -0,0 +1,79 @@
+import React, { useEffect, useState } from 'react';
+import { Modal, message, Input, Form } from 'antd';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+
+const RenameModal = ({
+  currentNode,
+  handleCancel,
+  visible,
+}: {
+  currentNode?: any;
+  visible: boolean;
+  handleCancel: () => void;
+}) => {
+  console.log(currentNode);
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+
+  const handleOk = async (values: any) => {
+    setLoading(true);
+    try {
+      const { code, data } = await request.put(
+        `${config.apiPrefix}scripts/rename`,
+        {
+          data: {
+            filename: currentNode.title,
+            path: currentNode.parent || '',
+            newFilename: values.name,
+          },
+        },
+      );
+
+      if (code === 200) {
+        message.success('更新名称成功');
+        handleCancel();
+      }
+      setLoading(false);
+    } catch (error) {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    form.resetFields();
+  }, [currentNode, visible]);
+
+  return (
+    <Modal
+      title="重命名"
+      open={visible}
+      forceRender
+      centered
+      maskClosable={false}
+      onOk={() => {
+        form
+          .validateFields()
+          .then((values) => {
+            handleOk(values);
+          })
+          .catch((info) => {
+            console.log('Validate Failed:', info);
+          });
+      }}
+      onCancel={() => handleCancel()}
+      confirmLoading={loading}
+    >
+      <Form form={form} layout="vertical" name="edit_name_modal">
+        <Form.Item
+          name="name"
+          rules={[{ required: true, message: '请输入新名称' }]}
+        >
+          <Input placeholder="请输入新名称" />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default RenameModal;

src/pages/script/saveModal.tsx

@@ -17,7 +17,7 @@ const SaveModal = ({
 
   const handleOk = async (values: any) => {
     setLoading(true);
-    const payload = { ...file, ...values, originFilename: file.filename };
+    const payload = { ...file, ...values, originFilename: file.title };
     request
       .post(`${config.apiPrefix}scripts`, {
         data: payload,
@@ -60,7 +60,7 @@ const SaveModal = ({
         form={form}
         layout="vertical"
         name="script_modal"
-        initialValues={file}
+        initialValues={{ filename: file?.title, path: file?.parent || '' }}
       >
         <Form.Item
           name="filename"

src/pages/setting/about.tsx

@@ -1,16 +1,23 @@
 import React, { useEffect, useState } from 'react';
-import { Typography, Input, Form, Button, message } from 'antd';
+import { Typography, Input, Form, Button, message, Descriptions } from 'antd';
 import styles from './index.less';
+import { SharedContext } from '@/layouts';
+import dayjs from 'dayjs';
 
 const { Link } = Typography;
 
-const About = () => {
+enum TVersion {
+  'develop' = '开发版',
+  'master' = '正式版',
+}
+
+const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
   return (
     <div className={styles.container}>
       <img
         alt="logo"
         style={{ width: 140, marginRight: 20 }}
-        src="http://qn.whyour.cn/logo.png"
+        src="https://qn.whyour.cn/logo.png"
       />
       <div className={styles.right}>
         <span className={styles.title}>青龙</span>
@@ -19,6 +26,27 @@ const About = () => {
           task management panel that supports typescript, javaScript, python3,
           and shell.）
         </span>
+        <Descriptions>
+          <Descriptions.Item label="版本" span={3}>
+            {TVersion[systemInfo.branch]} v{systemInfo.version}
+          </Descriptions.Item>
+          <Descriptions.Item label="更新时间" span={3}>
+            {dayjs(systemInfo.lastCommitTime * 1000).format(
+              'YYYY-MM-DD HH:mm:ss',
+            )}
+          </Descriptions.Item>
+          <Descriptions.Item label="更新ID" span={3}>
+            {systemInfo.lastCommitId}
+          </Descriptions.Item>
+          <Descriptions.Item label="更新日志" span={3}>
+            <Link
+              href={`https://qn.whyour.cn/version.yaml?t=${Date.now()}`}
+              target="_blank"
+            >
+              查看
+            </Link>
+          </Descriptions.Item>
+        </Descriptions>
         <div>
           <Link
             href="https://github.com/whyour/qinglong"

src/pages/setting/checkUpdate.tsx

@@ -2,11 +2,10 @@ import React, { useEffect, useState, useRef } from 'react';
 import { Statistic, Modal, Tag, Button, Spin, message } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
-import { version } from '../../version';
 
 const { Countdown } = Statistic;
 
-const CheckUpdate = ({ socketMessage }: any) => {
+const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
   const [updateLoading, setUpdateLoading] = useState(false);
   const [value, setValue] = useState('');
   const modalRef = useRef<any>();
@@ -23,7 +22,7 @@ const CheckUpdate = ({ socketMessage }: any) => {
           if (data.hasNewVersion) {
             showConfirmUpdateModal(data);
           } else {
-            showForceUpdateModal();
+            showForceUpdateModal(data);
           }
         }
       })
@@ -36,7 +35,7 @@ const CheckUpdate = ({ socketMessage }: any) => {
       });
   };
 
-  const showForceUpdateModal = () => {
+  const showForceUpdateModal = (data: any) => {
     Modal.confirm({
       width: 500,
       title: '更新',
@@ -44,7 +43,7 @@ const CheckUpdate = ({ socketMessage }: any) => {
         <>
           <div>已经是最新版了！</div>
           <div style={{ fontSize: 12, fontWeight: 400, marginTop: 5 }}>
-            青龙 {version} 是目前检测到的最新可用版本了。
+            青龙 {data.lastVersion} 是目前检测到的最新可用版本了。
           </div>
         </>
       ),
@@ -70,16 +69,13 @@ const CheckUpdate = ({ socketMessage }: any) => {
         <>
           <div>更新可用</div>
           <div style={{ fontSize: 12, fontWeight: 400, marginTop: 5 }}>
-            新版本{lastVersion}可用。你使用的版本为{version}。
+            新版本 {lastVersion} 可用，你使用的版本为 {systemInfo.version}。
           </div>
         </>
       ),
       content: (
         <pre
           style={{
-            wordBreak: 'break-all',
-            whiteSpace: 'pre-wrap',
-            paddingTop: 15,
             fontSize: 12,
             fontWeight: 400,
           }}
@@ -108,21 +104,17 @@ const CheckUpdate = ({ socketMessage }: any) => {
       maskClosable: false,
       closable: false,
       okButtonProps: { disabled: true },
-      title: '更新日志',
+      title: '更新中...',
       centered: true,
       content: (
-        <div style={{ height: '60vh', overflowY: 'auto' }}>
-          <pre
-            style={{
-              wordBreak: 'break-all',
-              whiteSpace: 'pre-wrap',
-              fontSize: 12,
-              fontWeight: 400,
-            }}
-          >
-            {value}
-          </pre>
-        </div>
+        <pre
+          style={{
+            fontSize: 12,
+            fontWeight: 400,
+          }}
+        >
+          {value}
+        </pre>
       ),
     });
   };
@@ -145,11 +137,9 @@ const CheckUpdate = ({ socketMessage }: any) => {
       closable: updateFailed,
       okButtonProps: { disabled: !updateFailed },
       content: (
-        <div style={{ height: '60vh', overflowY: 'auto' }}>
+        <>
           <pre
             style={{
-              wordBreak: 'break-all',
-              whiteSpace: 'pre-wrap',
               fontSize: 12,
               fontWeight: 400,
             }}
@@ -157,7 +147,7 @@ const CheckUpdate = ({ socketMessage }: any) => {
             {newMessage}
           </pre>
           <div id="log-identifier" style={{ paddingBottom: 5 }}></div>
-        </div>
+        </>
       ),
     });
 

src/pages/setting/index.less

@@ -18,5 +18,20 @@
     .desc {
       margin-bottom: 10px;
     }
+
+    :global {
+      .ant-descriptions-row > th,
+      .ant-descriptions-row > td {
+        padding-bottom: 10px;
+      }
+    }
+  }
+}
+
+.ql-setting-container {
+  .ant-tabs-content-holder {
+    max-height: calc(100vh - 114px);
+    max-height: calc(100vh - var(--vh-offset, 114px));
+    overflow-y: auto;
   }
 }

src/pages/setting/index.tsx

@@ -31,6 +31,7 @@ import CheckUpdate from './checkUpdate';
 import About from './about';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
+import './index.less';
 
 const { Text } = Typography;
 const optionsWithDisabled = [
@@ -40,8 +41,15 @@ const optionsWithDisabled = [
 ];
 
 const Setting = () => {
-  const { headerStyle, isPhone, user, reloadUser, reloadTheme, socketMessage } =
-    useOutletContext<SharedContext>();
+  const {
+    headerStyle,
+    isPhone,
+    user,
+    reloadUser,
+    reloadTheme,
+    socketMessage,
+    systemInfo,
+  } = useOutletContext<SharedContext>();
   const columns = [
     {
       title: '名称',
@@ -72,10 +80,15 @@ const Setting = () => {
       dataIndex: 'scopes',
       key: 'scopes',
       align: 'center' as const,
+      width: '40%',
       render: (text: string, record: any) => {
-        return record.scopes.map((scope: any) => {
-          return <Tag key={scope}>{(config.scopesMap as any)[scope]}</Tag>;
-        });
+        return (
+          <div style={{ textAlign: 'left' }}>
+            {record.scopes.map((scope: any) => {
+              return <Tag key={scope}>{(config.scopesMap as any)[scope]}</Tag>;
+            })}
+          </div>
+        );
       },
     },
     {
@@ -314,7 +327,7 @@ const Setting = () => {
 
   return (
     <PageContainer
-      className="ql-container-wrapper ql-container-wrapper-has-tab"
+      className="ql-container-wrapper ql-container-wrapper-has-tab ql-setting-container"
       title="系统设置"
       header={{
         style: headerStyle,
@@ -403,7 +416,10 @@ const Setting = () => {
                   </Input.Group>
                 </Form.Item>
                 <Form.Item label="检查更新" name="update">
-                  <CheckUpdate socketMessage={socketMessage} />
+                  <CheckUpdate
+                    systemInfo={systemInfo}
+                    socketMessage={socketMessage}
+                  />
                 </Form.Item>
               </Form>
             ),
@@ -411,7 +427,7 @@ const Setting = () => {
           {
             key: 'about',
             label: '关于',
-            children: <About />,
+            children: <About systemInfo={systemInfo} />,
           },
         ]}
       ></Tabs>

src/pages/subscription/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import {
   Button,
   message,
@@ -29,11 +29,11 @@ import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
 import { request } from '@/utils/http';
 import SubscriptionModal from './modal';
-import { getTableScroll } from '@/utils/index';
 import { history, useOutletContext } from '@umijs/max';
 import './index.less';
 import SubscriptionLogModal from './logModal';
 import { SharedContext } from '@/layouts';
+import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -243,10 +243,11 @@ const Subscription = () => {
   const [searchText, setSearchText] = useState('');
   const [currentPage, setCurrentPage] = useState(1);
   const [pageSize, setPageSize] = useState(20);
-  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
   const [searchValue, setSearchValue] = useState('');
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
   const [logSubscription, setLogSubscription] = useState<any>();
+  const tableRef = useRef<any>();
+  const tableScrollHeight = useTableScrollHeight(tableRef)
 
   const runSubscription = (record: any, index: number) => {
     Modal.confirm({
@@ -539,9 +540,6 @@ const Subscription = () => {
 
   useEffect(() => {
     setPageSize(parseInt(localStorage.getItem('pageSize') || '20'));
-    setTimeout(() => {
-      setTableScrollHeight(getTableScroll());
-    });
   }, []);
 
   return (
@@ -568,6 +566,7 @@ const Subscription = () => {
       }}
     >
       <Table
+        ref={tableRef}
         columns={columns}
         pagination={{
           current: currentPage,

src/pages/subscription/modal.tsx

@@ -439,6 +439,19 @@ const SubscriptionModal = ({
             </Form.Item>
           </>
         )}
+        <Form.Item
+          name="proxy"
+          label="代理"
+          tooltip="公开仓库支持HTTP/SOCK5代理，私有仓库支持SOCK5代理"
+        >
+          <Input
+            placeholder={
+              type === 'private-repo'
+                ? 'SOCK5代理，例如 IP:PORT'
+                : 'HTTP/SOCK5代理，例如 http://127.0.0.1:1080'
+            }
+          />
+        </Form.Item>
       </Form>
     </Modal>
   );

src/utils/config.ts

@@ -88,10 +88,12 @@ export default {
     { value: 'dingtalkBot', label: '钉钉机器人' },
     { value: 'weWorkBot', label: '企业微信机器人' },
     { value: 'weWorkApp', label: '企业微信应用' },
+    { value: 'aibotk', label: '智能微秘书' },
     { value: 'iGot', label: 'IGot' },
     { value: 'pushPlus', label: 'PushPlus' },
     { value: 'chat', label: '群辉chat' },
     { value: 'email', label: '邮箱' },
+    { value: 'lark', label: '飞书机器人' },
     { value: 'webhook', label: '自定义通知' },
     { value: 'closed', label: '已关闭' },
   ],
@@ -135,6 +137,10 @@ export default {
         tip: 'PushDeer的Key，https://github.com/easychen/pushdeer',
         required: true,
       },
+      {
+        label: 'pushDeerUrl',
+        tip: 'PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push',
+      },
     ],
     bark: [
       {
@@ -196,6 +202,28 @@ export default {
         required: true,
       },
     ],
+    aibotk: [
+      {
+        label: 'aibotkKey',
+        tip: '密钥key,智能微秘书个人中心获取apikey，申请地址：https://wechat.aibotk.com/signup?from=ql',
+        required: true,
+      },
+      {
+        label: 'aibotkType',
+        tip: '发送的目标，群组或者好友',
+        required: true,
+        placeholder: '请输入要发送的目标',
+        items: [
+          { value: 'room', label: '群聊' },
+          { value: 'contact', label: '好友' },
+        ],
+      },
+      {
+        label: 'aibotkName',
+        tip: '要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称',
+        required: true,
+      },
+    ],
     iGot: [
       {
         label: 'iGotPushKey',
@@ -214,6 +242,13 @@ export default {
         tip: '一对多推送的“群组编码”（一对多推送下面->您的群组(如无则新建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）',
       },
     ],
+    lark: [
+      {
+        label: 'larkKey',
+        tip: '飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973',
+        required: true,
+      },
+    ],
     email: [
       {
         label: 'emailService',
@@ -234,7 +269,11 @@ export default {
         label: 'webhookContentType',
         tip: '请求头Content-Type',
         required: true,
-        items: [{ value: 'application/json' }, { value: 'multipart/form-data' }, { value: 'application/x-www-form-urlencoded' }],
+        items: [
+          { value: 'application/json' },
+          { value: 'multipart/form-data' },
+          { value: 'application/x-www-form-urlencoded' },
+        ],
       },
       {
         label: 'webhookUrl',

src/utils/index.ts

@@ -180,19 +180,15 @@ export default function browserType() {
  */
 export function getTableScroll({
   extraHeight,
-  id,
-}: { extraHeight?: number; id?: string } = {}) {
+  target,
+}: { extraHeight?: number; target?: HTMLElement } = {}) {
   if (typeof extraHeight == 'undefined') {
     //  47 + 40 + 12
     extraHeight = 99;
   }
   let tHeader = null;
-  if (id) {
-    tHeader = document.getElementById(id)
-      ? document
-          .getElementById(id)!
-          .getElementsByClassName('ant-table-thead')[0]
-      : null;
+  if (target) {
+    tHeader = target;
   } else {
     tHeader = document.querySelector('.ant-table-wrapper');
   }
@@ -280,3 +276,31 @@ export function logEnded(log: string): boolean {
   const endTips = [LOG_END_SYMBOL, '执行结束'];
   return endTips.some((x) => log.includes(x));
 }
+
+export function getCommandScript(
+  command: string,
+): [string, string] | string | undefined {
+  const cmd = command.split(' ') as string[];
+  if (cmd[0] === 'task') {
+    let scriptsPart = cmd.find((x) =>
+      ['.js', '.ts', '.sh', '.py'].some((y) => x.endsWith(y)),
+    );
+    if (!scriptsPart) return;
+    if (scriptsPart.startsWith('/ql/data/scripts')) {
+      scriptsPart = scriptsPart.replace('/ql/data/scripts/', '');
+    }
+
+    let p: string, s: string;
+    let index = scriptsPart.lastIndexOf('/');
+    if (index >= 0) {
+      s = scriptsPart.slice(index + 1);
+      p = scriptsPart.slice(0, index);
+    } else {
+      s = scriptsPart;
+      p = '';
+    }
+    return [s, p];
+  } else if (cmd[1] === 'repo') {
+    return cmd[2];
+  }
+}

src/utils/init.ts

@@ -1,9 +1,8 @@
 import * as Sentry from '@sentry/react';
 import { Integrations } from '@sentry/tracing';
 import { loader } from '@monaco-editor/react';
-import { version } from '../version';
 
-export function init() {
+export function init(version: string) {
   // sentry监控 init
   Sentry.init({
     dsn: 'https://3406424fb1dc4813a62d39e844a9d0ac@o1098464.ingest.sentry.io/6122818',

src/version.ts

@@ -1,8 +0,0 @@
-export const version = '2.14.8';
-export const changeLogLink = 'https://t.me/jiao_long/335';
-export const changeLog = `2.14.8 版本说明
-1. 支持环境变量导入，导入格式参考导出文件
-2. 修复创建任务，命令中的引号丢失
-3. 修复调试选择脚本及语言识别
-4. 修复ql和task命令日志打印
-`;

typings.d.ts

@@ -8,3 +8,5 @@ declare module '*.svg' {
   const url: string;
   export default url;
 }
+
+declare module 'pstree.remy';

version.yaml

@@ -0,0 +1,6 @@
+version: 2.15.4
+changeLogLink: https://t.me/jiao_long/355
+changeLog: |
+  1. 脚本管理支持重命名文件/文件夹
+  2. 关于增加更新日志查看
+  3. 修复定时任务脚本识别和跳转