更新版本 v2.15.2

.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
@@ -98,7 +147,7 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-
+      
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v3
@@ -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
@@ -160,7 +160,11 @@ task <file_path> now
 # the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
 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>         
+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 部署
@@ -159,7 +159,11 @@ task <file_path> now
 # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
 task <file_path> conc <env_name> <account_number>(可选的) 
 # 指定账号执行，无论是否设置了随机延迟，均立即运行 
-task <file_path> desi <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/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

@@ -8,6 +8,7 @@ import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
 import { EnvModel } from '../data/env';
 import { promiseExec } from '../config/util';
+import dayjs from 'dayjs';
 
 const route = Router();
 
@@ -25,13 +26,17 @@ export default (app: Router) => {
       const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
       const version = currentVersionFile.match(versionRegx)![1];
       const lastCommitTime = (
-        await promiseExec('git show -s --format=%ai')
+        await promiseExec(
+          `cd ${config.rootPath} && git show -s --format=%ai | head -1`,
+        )
       ).replace('\n', '');
       const lastCommitId = (
-        await promiseExec('git rev-parse --short HEAD')
+        await promiseExec(`cd ${config.rootPath} && git rev-parse --short HEAD`)
       ).replace('\n', '');
       const branch = (
-        await promiseExec('git symbolic-ref --short HEAD')
+        await promiseExec(
+          `cd ${config.rootPath} && git symbolic-ref --short HEAD`,
+        )
       ).replace('\n', '');
 
       let isInitialized = true;
@@ -48,7 +53,7 @@ export default (app: Router) => {
         data: {
           isInitialized,
           version,
-          lastCommitTime,
+          lastCommitTime: dayjs(lastCommitTime).unix(),
           lastCommitId,
           branch,
         },

back/config/const.ts

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

back/config/util.ts

@@ -284,6 +284,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 +317,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 +327,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(

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

@@ -41,6 +41,7 @@ export class ServerChanNotification extends NotificationBaseInfo {
 
 export class PushDeerNotification extends NotificationBaseInfo {
   public pushDeerKey = '';
+  public pushDeerUrl = '';
 }
 
 export class ChatNotification extends NotificationBaseInfo {

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

@@ -8,12 +8,28 @@ 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 },

back/services/cron.ts

@@ -116,8 +116,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;
@@ -166,7 +167,7 @@ export default class CronService {
             ],
           };
         }
-        query[Op.and].push(q);
+        query[primaryOperate].push(q);
       }
     }
   }
@@ -325,10 +326,10 @@ export default class CronService {
 
       const endTime = dayjs();
       const diffTimeStr = doc.last_execution_time
-        ? `，耗时 ${endTime.diff(
+        ? `  耗时 ${endTime.diff(
             dayjs(doc.last_execution_time * 1000),
             'second',
-          )}`
+          )} 秒`
         : '';
       if (logFileExist) {
         const str = err ? `\n${err}` : '';

back/services/cronView.ts

@@ -1,7 +1,12 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import { CrontabView, CrontabViewModel } from '../data/cronView';
-import { initPosition } from '../data/env';
+import {
+  initPosition,
+  maxPosition,
+  minPosition,
+  stepPosition,
+} from '../data/env';
 
 @Service()
 export default class CronViewService {
@@ -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/notify.ts

@@ -123,8 +123,8 @@ 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, {
         ...this.gotOption,

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

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

@@ -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);
       }
     }
 
@@ -354,7 +363,9 @@ export default class SubscriptionService {
 
       fs.appendFileSync(
         `${absolutePath}`,
-        `${str}\n## 执行结束...  ${dayjs().format('YYYY-MM-DD HH:mm:ss')}${LOG_END_SYMBOL}`,
+        `${str}\n## 执行结束...  ${dayjs().format(
+          'YYYY-MM-DD HH:mm:ss',
+        )}${LOG_END_SYMBOL}`,
       );
     }
 

back/services/system.ts

@@ -9,7 +9,6 @@ import ScheduleService from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import got from 'got';
-import { promiseExec } from '../config/util';
 
 @Service()
 export default class SystemService {
@@ -88,9 +87,13 @@ export default class SystemService {
       let lastVersion = '';
       let lastLog = '';
       try {
-        const lastVersionFileContent = await promiseExec(
-          `curl ${config.lastVersionFile}?t=${Date.now()}`,
+        const result = await got.get(
+          `${config.lastVersionFile}?t=${Date.now()}`,
+          {
+            timeout: 30000,
+          },
         );
+        const lastVersionFileContent = result.body;
         lastVersion = lastVersionFileContent.match(versionRegx)![1];
         lastLog = lastVersionFileContent.match(logRegx)
           ? lastVersionFileContent.match(logRegx)![1]

package.json

@@ -75,9 +75,8 @@
     "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
-    "p-queue": "7.2.0",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.25.3",
+    "sequelize": "^6.25.5",
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
     "sqlite3": "npm:@louislam/sqlite3@^15.0.6",
@@ -119,7 +118,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",
@@ -136,7 +135,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%

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
@@ -151,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) {
@@ -413,7 +415,7 @@ 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',

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
@@ -280,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:

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

@@ -75,7 +75,8 @@ run_nohup() {
 }
 
 check_server() {
-  cpu_use=$(top -b -n 1 | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
+  local top_result=$(top -b -n 1)
+  cpu_use=$(echo "$top_result" | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
 
   mem_free=$(free -m | grep "Mem" | awk '{print $3}' | head -n 1)
   mem_total=$(free -m | grep "Mem" | awk '{print $2}' | head -n 1)
@@ -84,7 +85,7 @@ check_server() {
   disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%" | head -n 1)
 
   if [[ $cpu_use -gt $cpu_warn ]] || [[ $mem_free -lt $mem_warn ]] || [[ $disk_use -gt $disk_warn ]]; then
-    local resource=$(top -b -n 1 | grep -v -E 'grep|Mem|idle|Load|tr' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10 | tr '\n' '|' | sed s/\|/\\\\n/g)
+    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
 }

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

shell/task.sh

@@ -61,15 +61,21 @@ format_params() {
   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 "$@"
 define_program "$@"

shell/update.sh

@@ -144,6 +144,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 +157,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"
@@ -244,17 +246,21 @@ 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
@@ -275,11 +281,12 @@ 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
@@ -447,7 +454,10 @@ main() {
   [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
 
   local begin_time=$(format_time "$time_format" "$time")
-  eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+
+  if [[ "$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
@@ -470,7 +480,7 @@ 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" $cmd
       eval usage $cmd
@@ -497,7 +507,7 @@ main() {
   resetlet)
     auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
     echo "$auth_value" >$file_auth_user
-    echo -e "重置登录错误次数成功" $cmd
+    eval echo -e "重置登录错误次数成功" $cmd
     ;;
   resettfa)
     auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
@@ -514,10 +524,12 @@ main() {
   local end_time=$(format_time "$time_format" "$etime")
   local end_timestamp=$(format_timestamp "$time_format" "$etime")
   local diff_time=$(($end_timestamp - $begin_timestamp))
-  eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-
   [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-  eval echo -e "\\\n　　　　　　　　　　" $cmd
+
+  if [[ "$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

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_z0d9rbri1ci.js'],
 });
 
 export default IconFont;

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;
 }
 
@@ -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 {

src/layouts/index.tsx

@@ -50,7 +50,7 @@ interface TSystemInfo {
   branch: 'develop' | 'master';
   isInitialized: boolean;
   lastCommitId: string;
-  lastCommitTime: string;
+  lastCommitTime: number;
   version: string;
 }
 

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

@@ -201,10 +201,10 @@ const Crontab = () => {
           >
             {record.last_execution_time
               ? new Date(record.last_execution_time * 1000)
-                .toLocaleString(language, {
-                  hour12: false,
-                })
-                .replace(' 24:', ' 00:')
+                  .toLocaleString(language, {
+                    hour12: false,
+                  })
+                  .replace(' 24:', ' 00:')
               : '-'}
           </span>
         );
@@ -387,7 +387,7 @@ const Crontab = () => {
   const [enabledCronViews, setEnabledCronViews] = useState<any[]>([]);
   const [moreMenuActive, setMoreMenuActive] = useState(false);
   const tableRef = useRef<any>();
-  const tableScrollHeight = useTableScrollHeight(tableRef)
+  const tableScrollHeight = useTableScrollHeight(tableRef);
 
   const goToScriptManager = (record: any) => {
     const cmd = record.command.split(' ') as string[];
@@ -414,10 +414,11 @@ const Crontab = () => {
   const getCrons = () => {
     setLoading(true);
     const { page, size, sorter, filters } = pageConf;
-    let url = `${config.apiPrefix
-      }crons?searchValue=${searchText}&page=${page}&size=${size}&filters=${JSON.stringify(
-        filters,
-      )}`;
+    let url = `${
+      config.apiPrefix
+    }crons?searchValue=${searchText}&page=${page}&size=${size}&filters=${JSON.stringify(
+      filters,
+    )}`;
     if (sorter && sorter.field) {
       url += `&sorter=${JSON.stringify({
         field: sorter.field,
@@ -428,6 +429,7 @@ const Crontab = () => {
       url += `&queryString=${JSON.stringify({
         filters: viewConf.filters,
         sorts: viewConf.sorts,
+        filterRelation: viewConf.filterRelation || 'and',
       })}`;
     }
     request
@@ -582,7 +584,8 @@ const Crontab = () => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}crons/${record.isDisabled === 1 ? 'enable' : 'disable'
+            `${config.apiPrefix}crons/${
+              record.isDisabled === 1 ? 'enable' : 'disable'
             }`,
             {
               data: [record.id],
@@ -625,7 +628,8 @@ const Crontab = () => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}crons/${record.isPinned === 1 ? 'unpin' : 'pin'
+            `${config.apiPrefix}crons/${
+              record.isPinned === 1 ? 'unpin' : 'pin'
             }`,
             {
               data: [record.id],
@@ -853,7 +857,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]);
@@ -890,7 +894,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>
@@ -986,11 +990,7 @@ const Crontab = () => {
         }
         onTabClick={tabClick}
         items={[
-          {
-            key: 'all',
-            label: '全部任务',
-          },
-          ...[...enabledCronViews].slice(0, 2).map((x) => ({
+          ...[...enabledCronViews].slice(0, 4).map((x) => ({
             key: x.id,
             label: x.name,
           })),
@@ -999,7 +999,11 @@ const Crontab = () => {
       <div ref={tableRef}>
         {selectedRowIds.length > 0 && (
           <div style={{ marginBottom: 16 }}>
-            <Button type="primary" style={{ marginBottom: 5 }} onClick={delCrons}>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5 }}
+              onClick={delCrons}
+            >
               批量删除
             </Button>
             <Button

src/pages/crontab/viewCreateModal.tsx

@@ -12,6 +12,7 @@ import {
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import IconFont from '@/components/iconfont';
 
 const PROPERTIES = [
   { name: '命令', value: 'command' },
@@ -42,6 +43,11 @@ const STATUS = [
   { name: '已禁用', value: 2 },
 ];
 
+enum ViewFilterRelation {
+  'and' = '且',
+  'or' = '或',
+}
+
 const ViewCreateModal = ({
   view,
   handleCancel,
@@ -53,10 +59,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 +94,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}
@@ -164,57 +166,109 @@ 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
+                        {...restField}
+                        name={[name, 'value']}
+                        rules={[{ required: true, message: '请输入内容' }]}
+                      >
+                        {['In', 'Nin'].includes(
+                          form.getFieldValue(['filters', index, 'operation']),
+                        ) ? (
+                          statusElement
+                        ) : (
+                          <Input placeholder="请输入内容" />
+                        )}
+                      </Form.Item>
+                      {index !== 0 && (
+                        <MinusCircleOutlined onClick={() => remove(name)} />
                       )}
-                    </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/log/index.tsx

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

src/pages/setting/about.tsx

@@ -31,7 +31,9 @@ const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
             {TVersion[systemInfo.branch]} v{systemInfo.version}
           </Descriptions.Item>
           <Descriptions.Item label="更新时间" span={3}>
-            {dayjs(systemInfo.lastCommitTime).format('YYYY-MM-DD HH:mm:ss')}
+            {dayjs(systemInfo.lastCommitTime * 1000).format(
+              'YYYY-MM-DD HH:mm:ss',
+            )}
           </Descriptions.Item>
           <Descriptions.Item label="更新ID" span={3}>
             {systemInfo.lastCommitId}

src/pages/setting/index.less

@@ -27,3 +27,11 @@
     }
   }
 }
+
+.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 = [
@@ -79,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>
+        );
       },
     },
     {
@@ -321,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,

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

@@ -137,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: [
       {

src/version.ts

@@ -1,5 +1,8 @@
-export const version = '2.14.12';
-export const changeLogLink = 'https://t.me/jiao_long/339';
-export const changeLog = `2.14.12 版本说明
-1. 修复可能出现移动或者创建环境变量出错
+export const version = '2.15.2';
+export const changeLogLink = 'https://t.me/jiao_long/353';
+export const changeLog = `2.15.2 版本说明
+1. 任务视图增加系统视图排序
+2. task 命令增加 -m 参数，支持设置任务超时时间，格式参考 CommandTimeoutTime。例如 task -m 1h xxx.js
+3. 修复资源占用检查逻辑
+4. 其他优化
 `;