更新版本 v2.15.1

.github/workflows/build_docker_image.yml

@@ -17,6 +17,32 @@ 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:
@@ -34,6 +60,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 +73,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
 

README.md

@@ -41,7 +41,7 @@
 ### 本机部署
 
 ```bash
-# 待完善
+# 待完善，可先参考开发步骤
 ```
 
 ### podman 部署

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,6 +52,7 @@ 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) => {

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/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 { promiseExec } from '../config/util';
+import dayjs from 'dayjs';
+
 const route = Router();
 
 export default (app: Router) => {
@@ -22,6 +25,19 @@ export default (app: Router) => {
 
       const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
       const version = currentVersionFile.match(versionRegx)![1];
+      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 +53,9 @@ export default (app: Router) => {
         data: {
           isInitialized,
           version,
+          lastCommitTime: dayjs(lastCommitTime).unix(),
+          lastCommitId,
+          branch,
         },
       });
     } 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.ts`;
 
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });

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(
+          mtime: stats.mtime.getTime(),
-            (a: any, b: any) =>
+          children: readDirs(subPath, baseDir).sort(dirSort),
-              (FileType as any)[a.type] - (FileType as any)[b.type],
-          ),
         };
       }
       return {
@@ -315,11 +327,10 @@ export function readDirs(
         isLeaf: true,
         key,
         parent: relativePath,
+        mtime: stats.mtime.getTime(),
       };
     });
-  return result.sort(
+  return result.sort(dirSort);
-    (a: any, b: any) => (FileType as any)[a.type] - (FileType as any)[b.type],
-  );
 }
 
 export function readDir(

back/data/cronView.ts

@@ -7,7 +7,8 @@ interface SortType {
 }
 
 interface FilterType {
-  type: 'or' | 'and';
+  property: string;
+  operation: string;
   value: string;
 }
 
@@ -18,6 +19,7 @@ export class CrontabView {
   isDisabled?: 1 | 0;
   filters?: FilterType[];
   sorts?: SortType[];
+  filterRelation?: 'and' | 'or';
 
   constructor(options: CrontabView) {
     this.name = options.name;
@@ -26,6 +28,7 @@ export class CrontabView {
     this.isDisabled = options.isDisabled || 0;
     this.filters = options.filters;
     this.sorts = options.sorts;
+    this.filterRelation = options.filterRelation;
   }
 }
 
@@ -43,5 +46,9 @@ export const CrontabViewModel = sequelize.define<CronViewInstance>(
     isDisabled: DataTypes.NUMBER,
     filters: DataTypes.JSON,
     sorts: DataTypes.JSON,
+    filterRelation: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
   },
 );

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: {
+  retry: {
-    max: 6,
+    max: 10,
-    min: 0,
+    match: ['SQLITE_BUSY: database is locked'],
-    idle: 30000,
   },
+  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

@@ -41,6 +41,7 @@ export class ServerChanNotification extends NotificationBaseInfo {
 
 export class PushDeerNotification extends NotificationBaseInfo {
   public pushDeerKey = '';
+  public pushDeerUrl = '';
 }
 
 export class ChatNotification extends NotificationBaseInfo {
@@ -50,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';
 }

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,13 @@ export default async () => {
     await SubscriptionModel.sync();
     await CrontabViewModel.sync();
 
-    // try {
+    // 初始化新增字段
-    //   const queryInterface = sequelize.getQueryInterface();
+    try {
-    //   await queryInterface.addIndex('Crontabs', ['command'], { unique: true });
+      await sequelize.query('alter table CrontabViews add column filterRelation VARCHAR(255)')
-    //   await queryInterface.addIndex('Envs', ['name', 'value'], { unique: true });
+    } catch (error) {}
-    //   await queryInterface.addIndex('Apps', ['name'], { unique: true });
+    try {
-    // } catch (error) { }
+      await sequelize.query('alter table Subscriptions add column proxy VARCHAR(255)')
+    } catch (error) {}
 
     // 2.10-2.11 升级
     const cronDbFile = path.join(config.rootPath, 'db/crontab.db');

back/loaders/initData.ts

@@ -4,10 +4,11 @@ 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 } from '../data/cronView';
 
 export default async () => {
   const cronService = Container.get(CronService);
@@ -26,7 +27,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/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]) {
+      const primaryOperate = viewQuery.filterRelation === 'or' ? Op.or : Op.and;
-        query[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);
       }
     }
   }

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 {
-import _ from 'lodash';
+  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;
+    let position = initPosition;
-    if (envs && envs.length > 0 && envs[envs.length - 1].position) {
+    if (
-      position = envs[envs.length - 1].position as number;
+      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[0].position! + stepPosition
-        : envs[toIndex].position! / 2;
+        : 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(
+  private async checkPosition(position: number) {
-    searchText: string = '',
+    const precisionPosition = parseFloat(position.toPrecision(16));
-    sort: any = { position: -1 },
+    if (precisionPosition < minPosition || precisionPosition > maxPosition) {
-    query: any = {},
+      const envs = await this.envs();
-  ): Promise<Env[]> {
+      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);
@@ -155,12 +182,11 @@ export default class EnvService {
   }
 
   public async set_envs() {
-    const envs = await this.envs(
+    const envs = await this.envs('', {
-      '',
+      name: { [Op.not]: null },
-      { position: -1 },
+      status: EnvStatus.normal,
-      { name: { [Op.not]: null }, status: EnvStatus.normal },
+    });
-    );
+    const groups = groupBy(envs, 'name');
-    const groups = _.groupBy(envs, 'name');
     let env_string = '';
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
@@ -168,8 +194,8 @@ export default class EnvService {
 
         // 忽略不符合bash要求的环境变量名称
         if (/^[a-zA-Z_][0-9a-zA-Z_]*$/.test(key)) {
-          let value = _(group)
+          let value = group
-            .map('value')
+            .map((x) => x.value)
             .join('&')
             .replace(/(\\)[^n]/g, '\\\\')
             .replace(/(\\$)/, '\\\\')

back/services/notify.ts

@@ -123,8 +123,8 @@ export default class NotificationService {
   }
 
   private async pushDeer() {
-    const { pushDeerKey } = this.params;
+    const { pushDeerKey, pushDeerUrl } = this.params;
-    const url = `https://api2.pushdeer.com/message/push`;
+    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 {
+  private generateSingleSshConfig(
-    return `\nHost ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no`;
+    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

@@ -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';
@@ -88,9 +87,12 @@ export default class SystemService {
       let lastVersion = '';
       let lastLog = '';
       try {
-        const result = await got.get(config.lastVersionFile, {
+        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)

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';

package.json

@@ -77,7 +77,7 @@
     "nodemailer": "^6.7.2",
     "p-queue": "7.2.0",
     "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 +91,14 @@
     "@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/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 +119,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 +136,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"

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"
@@ -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',
@@ -987,7 +989,7 @@ function fsBotNotify(text, desp) {
     if (FSKEY) {
       const options = {
         url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
-        json: { msg_type: 'text', content: { text: `${title}\n\n${content}` } },
+        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
         headers: {
           'Content-Type': 'application/json',
         },

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/otask.sh

@@ -84,7 +84,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' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10)
+    local resource=$(top -b -n 1 | grep -v -E 'grep|Mem|idle|Load|tr' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10 | tr '\n' '|' | sed s/\|/\\\\n/g)
     notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource"
   fi
 }
@@ -232,8 +232,7 @@ run_else() {
 
   shift
 
-  local params=$(echo "$@" | sed 's/ /\" \"/g')
+  $timeoutCmd $which_program $file_param "$@"
-  $timeoutCmd $which_program $file_param \"$params\"
 }
 
 ## 命令检测

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 url="$1"
-  local dir=$2
+  local dir="$2"
-  local branch=$3
+  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"
 
-  if [[ -d "$dir_work/.git" ]]; then
   cd $dir_work
+  if [[ -d "$dir_work/.git" ]]; then
     [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
     git remote set-url origin $url &>/dev/null
-
+  else
-    local part_cmd=""
+    git init
+    git remote add origin $url &>/dev/null
+  fi
   reset_branch "$branch"
   cd $dir_current
-  fi
 }
 
 reset_branch() {
   local branch="$1"
+  local part_cmd=""
   if [[ $branch ]]; then
     part_cmd="origin/${branch}"
     git checkout -B "$branch" &>/dev/null

shell/task.sh

@@ -58,6 +58,7 @@ format_params() {
   if type timeout &>/dev/null; then
     timeoutCmd="timeout -k 10s $command_timeout_time "
   fi
+  params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
 }
 
 show_log="false"
@@ -70,10 +71,11 @@ while getopts ":l" opt; do
 done
 [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
 
-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

@@ -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,9 @@ 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}"
+    git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
   fi
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新${repo_path}成功...\n"
@@ -246,6 +247,12 @@ usage() {
 update_qinglong() {
   patch_version &>/dev/null
 
+  local mirror="github"
+  local githubStatus=$(curl -s -m 3 -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)
@@ -254,7 +261,7 @@ update_qinglong() {
     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,7 +282,7 @@ 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}
@@ -447,7 +454,10 @@ main() {
   [[ $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
@@ -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"
+
+  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/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

@@ -179,8 +179,8 @@
 
 .Resizer {
   background: @component-background;
-  opacity: 0.2;
+  opacity: 0.8;
-  z-index: 1;
+  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

@@ -15,7 +15,18 @@ 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 +43,15 @@ 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;
 }
 
 export default function () {
@@ -40,7 +60,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);
@@ -244,7 +264,7 @@ 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>
@@ -256,6 +276,10 @@ export default function () {
               e.stopPropagation();
             }}
           >
+            <Tooltip
+              title={systemInfo?.branch === 'develop' ? '开发版' : '正式版'}
+            >
+              <Badge size="small" dot={systemInfo?.branch === 'develop'}>
                 <span
                   style={{
                     fontSize: isFirefox ? 9 : 12,
@@ -267,6 +291,8 @@ export default function () {
                 >
                   v{version}
                 </span>
+              </Badge>
+            </Tooltip>
           </a>
         </>
       }
@@ -342,6 +368,7 @@ export default function () {
           reloadUser,
           reloadTheme,
           socketMessage,
+          systemInfo,
         }}
       />
     </ProLayout>

src/pages/crontab/index.less

@@ -176,3 +176,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

@@ -43,14 +43,13 @@ 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';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -376,7 +375,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('');
@@ -389,6 +387,7 @@ const Crontab = () => {
   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[];
@@ -430,6 +429,7 @@ const Crontab = () => {
       url += `&queryString=${JSON.stringify({
         filters: viewConf.filters,
         sorts: viewConf.sorts,
+        filterRelation: viewConf.filterRelation || 'and',
       })}`;
     }
     request
@@ -770,16 +770,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,
   };
 
@@ -878,97 +872,6 @@ const Crontab = () => {
     getCronViews();
   }, []);
 
-  useEffect(() => {
-    if (tableRef.current) {
-      setTableScrollHeight(getTableScroll());
-    }
-  }, [tableRef.current]);
-
-  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
-        ref={tableRef}
-        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':
@@ -1037,6 +940,7 @@ const Crontab = () => {
 
   const tabClick = (key: string) => {
     const view = enabledCronViews.find((x) => x.id == key);
+    setSelectedRowIds([]);
     setPageConf({ ...pageConf, page: 1 });
     setViewConf(view ? view : null);
   };
@@ -1089,24 +993,98 @@ const Crontab = () => {
           {
             key: 'all',
             label: '全部任务',
-            children: panelContent,
           },
           ...[...enabledCronViews].slice(0, 2).map((x) => ({
             key: x.id,
             label: x.name,
-            children: panelContent,
           })),
         ]}
+      />
+      <div ref={tableRef}>
+        {selectedRowIds.length > 0 && (
+          <div style={{ marginBottom: 16 }}>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5 }}
+              onClick={delCrons}
             >
-        <Tabs.TabPane tab="全部任务" key="all">
+              批量删除
-          {panelContent}
+            </Button>
-        </Tabs.TabPane>
+            <Button
-        {[...enabledCronViews].slice(0, 2).map((x) => (
+              type="primary"
-          <Tabs.TabPane tab={x.name} key={x.id}>
+              onClick={() => operateCrons(0)}
-            {panelContent}
+              style={{ marginLeft: 8, marginBottom: 5 }}
-          </Tabs.TabPane>
+            >
-        ))}
+              批量启用
-      </Tabs>
+            </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,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
+    <Select style={{ width: 80 }}>
-      style={{ width: 100 }}
-      onChange={() => {
-        setOperationMap({});
-      }}
-    >
       {OPERATIONS.map((x) => (
         <Select.Option key={x.name} value={x.value}>
           {x.name}
@@ -164,21 +166,70 @@ const ViewCreateModal = ({
         </Form.Item>
         <Form.List name="filters">
           {(fields, { add, remove }) => (
+            <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,
+                  }}
+                >
+                  <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)' } : {}
+                      }
                     >
-                  <Space className="view-create-modal-filters" align="baseline">
                       <Form.Item
                         {...restField}
                         name={[name, 'property']}
                         rules={[{ required: true }]}
                       >
-                      {propertyElement(PROPERTIES, { width: 120 })}
+                        {propertyElement(PROPERTIES, { width: 90 })}
                       </Form.Item>
                       <Form.Item
                         {...restField}
@@ -208,13 +259,16 @@ const ViewCreateModal = ({
                 ))}
                 <Form.Item>
                   <a
-                  onClick={() => add({ property: 'command', operation: 'Reg' })}
+                    onClick={() =>
+                      add({ property: 'command', operation: 'Reg' })
+                    }
                   >
                     <PlusOutlined />
                     新增筛选条件
                   </a>
                 </Form.Item>
-            </>
+              </div>
+            </div>
           )}
         </Form.List>
         <Form.List name="sorts">

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,11 +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);
@@ -283,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,
   };
 
@@ -368,12 +363,6 @@ const Dependence = () => {
     getDependencies();
   }, [searchText, type]);
 
-  useEffect(() => {
-    if (tableRef.current) {
-      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-    }
-  }, [tableRef.current]);
-
   useEffect(() => {
     if (logDependence) {
       localStorage.setItem('logDependence', logDependence.id);
@@ -422,54 +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
-          ref={tableRef}
-          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);
   };
 
@@ -502,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,9 +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);
@@ -284,8 +286,7 @@ const Env = () => {
       onOk() {
         request
           .put(
-            `${config.apiPrefix}envs/${
+            `${config.apiPrefix}envs/${record.status === Status.已禁用 ? 'enable' : 'disable'
-              record.status === Status.已禁用 ? 'enable' : 'disable'
             }`,
             {
               data: [record.id],
@@ -407,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,
   };
 
@@ -508,12 +503,6 @@ const Env = () => {
     getEnvs();
   }, [searchText]);
 
-  useEffect(() => {
-    if (tableRef.current) {
-      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
-    }
-  }, [tableRef.current]);
-
   return (
     <PageContainer
       className="ql-container-wrapper env-wrapper"
@@ -598,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

@@ -253,7 +253,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}

src/pages/script/index.tsx

@@ -38,7 +38,7 @@ 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';
 
 const { Text } = Typography;
 

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,19 @@ 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>
         <div>
           <Link
             href="https://github.com/whyour/qinglong"

src/pages/setting/checkUpdate.tsx

@@ -77,8 +77,6 @@ const CheckUpdate = ({ socketMessage }: any) => {
       content: (
         <pre
           style={{
-            wordBreak: 'break-all',
-            whiteSpace: 'pre-wrap',
             paddingTop: 15,
             fontSize: 12,
             fontWeight: 400,
@@ -113,8 +111,6 @@ const CheckUpdate = ({ socketMessage }: any) => {
       content: (
         <pre
           style={{
-              wordBreak: 'break-all',
-              whiteSpace: 'pre-wrap',
             fontSize: 12,
             fontWeight: 400,
           }}
@@ -146,8 +142,6 @@ const CheckUpdate = ({ socketMessage }: any) => {
         <>
           <pre
             style={{
-              wordBreak: 'break-all',
-              whiteSpace: 'pre-wrap',
               fontSize: 12,
               fontWeight: 400,
             }}

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 } =
+  const {
-    useOutletContext<SharedContext>();
+    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 (
+          <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,
@@ -411,7 +424,7 @@ const Setting = () => {
           {
             key: 'about',
             label: '关于',
-            children: <About />,
+            children: <About systemInfo={systemInfo} />,
           },
         ]}
       ></Tabs>

src/pages/subscription/index.tsx

@@ -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,11 +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({
@@ -542,12 +542,6 @@ const Subscription = () => {
     setPageSize(parseInt(localStorage.getItem('pageSize') || '20'));
   }, []);
 
-  useEffect(() => {
-    if (tableRef.current) {
-      setTableScrollHeight(getTableScroll());
-    }
-  }, [tableRef.current]);
-
   return (
     <PageContainer
       className="ql-container-wrapper subscriptiontab-wrapper"

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/utils/index.ts

@@ -180,19 +180,15 @@ export default function browserType() {
  */
 export function getTableScroll({
   extraHeight,
-  id,
+  target,
-}: { extraHeight?: number; id?: string } = {}) {
+}: { extraHeight?: number; target?: HTMLElement } = {}) {
   if (typeof extraHeight == 'undefined') {
     //  47 + 40 + 12
     extraHeight = 99;
   }
   let tHeader = null;
-  if (id) {
+  if (target) {
-    tHeader = document.getElementById(id)
+    tHeader = target;
-      ? document
-          .getElementById(id)!
-          .getElementsByClassName('ant-table-thead')[0]
-      : null;
   } else {
     tHeader = document.querySelector('.ant-table-wrapper');
   }

src/version.ts

@@ -1,9 +1,8 @@
-export const version = '2.14.9';
+export const version = '2.15.1';
-export const changeLogLink = 'https://t.me/jiao_long/336';
+export const changeLogLink = 'https://t.me/jiao_long/341';
-export const changeLog = `2.14.9 版本说明
+export const changeLog = `2.15.1 版本说明
-1. 通知支持飞书和智能微秘书，感谢 https://github.com/leochen-g
+1. 系统更新增加 gitee 更新源
-2. webhook通知body支持嵌套json
+2. pushDeer 通知增加自架版
-3. 修复shell获取磁盘占用
+3. 修复移动端最后更新时间展示
-4. 修复定时任务移动端滚动
+4. 其他优化
-5. 其他bug修复
 `;