更新版本 v2.15.15

.github/workflows/build_docker_image.yml

@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: 7
+          version: '8.3.1'
 
       - uses: actions/setup-node@v3
         with:
@@ -85,8 +85,6 @@ jobs:
           git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}
 
   build:
-    if: github.ref != 'refs/heads/master'
-
     needs: build-static
 
     runs-on: ubuntu-latest
@@ -99,7 +97,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: 7
+          version: '8.3.1'
       - uses: actions/setup-node@v3
         with:
           cache: 'pnpm'
@@ -131,11 +129,14 @@ jobs:
             ghcr.io/${{ github.repository }}
           # generate Docker tags based on the following events/attributes
           #   nightly, master, pr-2, 1.2.3, 1.2, 1
+          flavor: |
+            latest=false
           tags: |
             type=schedule,pattern=nightly
             type=edge
-            type=ref,event=branch
             type=ref,event=pr
+            type=ref,event=branch,enable=${{ github.ref != format('refs/heads/{0}', 'master') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}

.umirc.ts

@@ -1,25 +1,28 @@
 import { defineConfig } from '@umijs/max';
 const CompressionPlugin = require('compression-webpack-plugin');
 
+const baseUrl = process.env.QlBaseUrl || '/';
 export default defineConfig({
   hash: true,
   antd: {},
   outputPath: 'static/dist',
   fastRefresh: true,
-  favicons: ['./images/favicon.svg'],
+  favicons: [`https://qn.whyour.cn/favicon.svg`],
   mfsu: {
     strategy: 'eager',
   },
   publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
   proxy: {
-    '/api/public': {
+    [`${baseUrl}api/public`]: {
       target: 'http://127.0.0.1:5400/',
       changeOrigin: true,
+      pathRewrite: { [`^${baseUrl}api/public`]: '/api' },
     },
-    '/api': {
+    [`${baseUrl}api`]: {
       target: 'http://127.0.0.1:5600/',
       changeOrigin: true,
       ws: true,
+      pathRewrite: { [`^${baseUrl}api`]: '/api' },
     },
   },
   chainWebpack: ((config: any) => {
@@ -37,6 +40,7 @@ export default defineConfig({
     'react-dom': 'window.ReactDOM',
   },
   headScripts: [
+    `./api/env.js`,
     'https://gw.alipayobjects.com/os/lib/react/18.2.0/umd/react.production.min.js',
     'https://gw.alipayobjects.com/os/lib/react-dom/18.2.0/umd/react-dom.production.min.js',
   ],

README-en.md

@@ -8,7 +8,7 @@
 
 <div align="center">
 
-Timed task management panel with python3, javaScript, shell, typescript support
+Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 
 [![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
 
@@ -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/203243067-1a8a570d-b1b4-4837-9f12-d78d83e31f35.jpg)](https://whyour.cn)
+[![](https://user-images.githubusercontent.com/22700758/229290661-03aabe84-8780-4ef0-8e75-2146f4636130.jpeg)](https://whyour.cn)
 
 [简体中文](./README.md) | English
 
@@ -198,7 +198,7 @@ $ git clone git@github.com:whyour/qinglong.git
 $ cd qinglong
 $ cp .env.example .env
 # Recommended use pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm
+$ npm install -g pnpm@8.3.1
 $ pnpm install
 $ pnpm start
 ```

README.md

@@ -8,7 +8,7 @@
 
 <div align="center">
 
-支持python3、javaScript、shell、typescript 的定时任务管理面板
+支持 Python3、JavaScript、Shell、Typescript 的定时任务管理平台
 
 [![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
 
@@ -22,7 +22,7 @@
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 </div>
 
-[![](https://user-images.githubusercontent.com/22700758/203243067-1a8a570d-b1b4-4837-9f12-d78d83e31f35.jpg)](https://whyour.cn)
+[![](https://user-images.githubusercontent.com/22700758/229290661-03aabe84-8780-4ef0-8e75-2146f4636130.jpeg)](https://whyour.cn)
 
 简体中文 | [English](./README-en.md)
 
@@ -59,6 +59,8 @@ podman run -dit \
   --network bridge \
   -v $PWD/ql/data:/ql/data \
   -p 5700:5700 \
+  # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+  -e QlBaseUrl="/" \
   --name qinglong \
   --hostname qinglong \
   docker.io/whyour/qinglong:latest
@@ -73,7 +75,6 @@ sudo curl -sSL get.docker.com | sh
 ```
 
 2. 配置国内镜像源
-Configure domestic mirror sources
 
 ```bash
 mkdir -p /etc/docker
@@ -98,6 +99,8 @@ systemctl restart docker
 docker run -dit \
   -v $PWD/ql/data:/ql/data \
   -p 5700:5700 \
+  # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+  -e QlBaseUrl="/" \
   --name qinglong \
   --hostname qinglong \
   --restart unless-stopped \
@@ -198,7 +201,7 @@ $ git clone git@github.com:whyour/qinglong.git
 $ cd qinglong
 $ cp .env.example .env
 # 推荐使用 pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm
+$ npm install -g pnpm@8.3.1
 $ pnpm install
 $ pnpm start
 ```

back/api/config.ts

@@ -5,6 +5,7 @@ import { Logger } from 'winston';
 import config from '../config';
 import * as fs from 'fs';
 import { celebrate, Joi } from 'celebrate';
+import { join } from 'path';
 const route = Router();
 
 export default (app: Router) => {
@@ -41,11 +42,11 @@ export default (app: Router) => {
         }
         if (req.params.file.includes('sample')) {
           content = getFileContentByName(
-            `${config.samplePath}${req.params.file}`,
+            join(config.samplePath, req.params.file),
           );
         } else {
           content = getFileContentByName(
-            `${config.configPath}${req.params.file}`,
+            join(config.configPath, req.params.file),
           );
         }
         res.send({ code: 200, data: content });
@@ -70,7 +71,7 @@ export default (app: Router) => {
         if (config.blackFileList.includes(name)) {
           res.send({ code: 403, message: '文件无法访问' });
         }
-        const path = `${config.configPath}${name}`;
+        const path = join(config.configPath, name);
         fs.writeFileSync(path, content);
         res.send({ code: 200, message: '保存成功' });
       } catch (e) {

back/api/script.ts

@@ -94,7 +94,7 @@ export default (app: Router) => {
           path += '/';
         }
         if (!path.startsWith('/')) {
-          path = `${config.scriptPath}${path}`;
+          path = join(config.scriptPath, path);
         }
         if (config.writePathList.every((x) => !path.startsWith(x))) {
           return res.send({
@@ -124,7 +124,7 @@ export default (app: Router) => {
         if (fs.existsSync(originFilePath)) {
           fs.copyFileSync(
             originFilePath,
-            `${config.bakPath}${originFilename.replace(/\//g, '')}`,
+            join(config.bakPath, originFilename.replace(/\//g, '')),
           );
           if (filename !== originFilename) {
             fs.unlinkSync(originFilePath);
@@ -207,7 +207,7 @@ export default (app: Router) => {
         let { filename } = req.body as {
           filename: string;
         };
-        const filePath = `${config.scriptPath}${filename}`;
+        const filePath = join(config.scriptPath, filename);
         // const stats = fs.statSync(filePath);
         // res.set({
         //   'Content-Type': 'application/octet-stream', //告诉浏览器这是一个二进制文件

back/api/system.ts

@@ -7,7 +7,12 @@ import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
 import { EnvModel } from '../data/env';
-import { parseVersion, promiseExec } from '../config/util';
+import {
+  getUniqPath,
+  handleLogPath,
+  parseVersion,
+  promiseExec,
+} from '../config/util';
 import dayjs from 'dayjs';
 
 const route = Router();
@@ -147,4 +152,64 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.put(
+    '/command-run',
+    celebrate({
+      body: Joi.object({
+        command: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const uniqPath = await getUniqPath(req.body.command);
+        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
+        const logPath = `${uniqPath}/${logTime}.log`;
+        res.setHeader('Content-type', 'application/octet-stream');
+        await systemService.run(
+          { ...req.body, logPath },
+          {
+            onStart: async (cp, startTime) => {
+              res.setHeader('QL-Task-Pid', `${cp.pid}`);
+            },
+            onEnd: async (cp, endTime, diff) => {
+              res.end();
+            },
+            onError: async (message: string) => {
+              res.write(`\n${message}`);
+              const absolutePath = await handleLogPath(logPath);
+              fs.appendFileSync(absolutePath, `\n${message}`);
+            },
+            onLog: async (message: string) => {
+              res.write(`\n${message}`);
+              const absolutePath = await handleLogPath(logPath);
+              fs.appendFileSync(absolutePath, `\n${message}`);
+            },
+          },
+        );
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/command-stop',
+    celebrate({
+      body: Joi.object({
+        command: Joi.string().optional(),
+        pid: Joi.number().optional(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.stop(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };

back/app.ts

@@ -18,6 +18,7 @@ async function startServer() {
   const server = app
     .listen(config.port, () => {
       Logger.debug(`✌️ 后端服务启动成功！`);
+      process.send?.('ready');
     })
     .on('error', (err) => {
       Logger.error(err);

back/config/index.ts

@@ -27,6 +27,7 @@ const bakPath = path.join(dataPath, 'bak/');
 const logPath = path.join(dataPath, 'log/');
 const dbPath = path.join(dataPath, 'db/');
 const uploadPath = path.join(dataPath, 'upload/');
+const sshdPath = path.join(dataPath, 'ssh.d/');
 
 const envFile = path.join(configPath, 'env.sh');
 const confFile = path.join(configPath, 'config.sh');
@@ -91,8 +92,14 @@ export default {
     '/api/system',
     '/api/user/init',
     '/api/user/notification/init',
+    '/open/user/login',
+    '/open/user/two-factor/login',
+    '/open/system',
+    '/open/user/init',
+    '/open/user/notification/init',
   ],
   versionFile,
   lastVersionFile,
   sqliteFile,
+  sshdPath,
 };

back/config/serverEnv.ts

@@ -0,0 +1,20 @@
+import { Request, Response } from 'express';
+import { pick } from 'lodash';
+
+let pickedEnv: Record<string, string>;
+
+function getPickedEnv() {
+  if (pickedEnv) return pickedEnv;
+  const picked = pick(process.env, ['QlBaseUrl']);
+  pickedEnv = picked as Record<string, string>;
+  return picked;
+}
+
+export function serveEnv(_req: Request, res: Response) {
+  res.type('.js');
+  res.send(
+    Object.entries(getPickedEnv())
+      .map(([k, v]) => `window.__ENV__${k}=${JSON.stringify(v)};`)
+      .join('\n'),
+  );
+}

back/config/util.ts

@@ -7,6 +7,8 @@ import FormData from 'form-data';
 import psTreeFun from 'pstree.remy';
 import { promisify } from 'util';
 import { load } from 'js-yaml';
+import config from './index';
+import { TASK_COMMAND } from './const';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -245,6 +247,18 @@ export async function createFile(file: string, data: string = '') {
   });
 }
 
+export async function handleLogPath(
+  logPath: string,
+  data: string = '',
+): Promise<string> {
+  const absolutePath = path.resolve(config.logPath, logPath);
+  const logFileExist = await fileExist(absolutePath);
+  if (!logFileExist) {
+    await createFile(absolutePath, data);
+  }
+  return absolutePath;
+}
+
 export async function concurrentRun(
   fnList: Array<() => Promise<any>> = [],
   max = 5,
@@ -469,19 +483,22 @@ export function psTree(pid: number): Promise<number[]> {
 
 export async function killTask(pid: number) {
   const pids = await psTree(pid);
-  // SIGALRM 14 时钟信号
+  // SIGINT 2 程序终止(interrupt)信号，不会打印额外信息
   if (pids.length) {
-    process.kill(pids[0], 14);
+    try {
+      [pid, ...pids].forEach((x) => {
+        process.kill(x, 2);
+      });
+    } catch (error) {}
   } else {
-    process.kill(pid, 14);
+    process.kill(pid, 2);
   }
 }
 
 export async function getPid(name: string) {
-  let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
+  const taskCommand = `ps -eo pid,command | grep "${name}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
-  const execAsync = promisify(exec);
+  const pid = await promiseExec(taskCommand);
-  let pid = (await execAsync(taskCommand)).stdout;
+  return pid ? Number(pid) : undefined;
-  return Number(pid);
 }
 
 interface IVersion {
@@ -497,3 +514,40 @@ export async function parseVersion(path: string): Promise<IVersion> {
 export async function parseContentVersion(content: string): Promise<IVersion> {
   return load(content) as IVersion;
 }
+
+export async function getUniqPath(command: string): Promise<string> {
+  const idStr = `cat ${config.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
+  let id = await promiseExec(idStr);
+
+  if (/^\d\d*\d$/.test(id)) {
+    id = `_${id}`;
+  } else {
+    id = '';
+  }
+
+  const items = command.split(/ +/);
+  let str = items[0];
+  if (items[0] === TASK_COMMAND) {
+    str = items[1];
+  }
+
+  const dotIndex = str.lastIndexOf('.');
+
+  if (dotIndex !== -1) {
+    str = str.slice(0, dotIndex);
+  }
+
+  const slashIndex = str.lastIndexOf('/');
+
+  let tempStr = '';
+  if (slashIndex !== -1) {
+    tempStr = str.slice(0, slashIndex);
+    const _slashIndex = tempStr.lastIndexOf('/');
+    if (_slashIndex !== -1) {
+      tempStr = tempStr.slice(_slashIndex + 1);
+    }
+    str = `${tempStr}_${str.slice(slashIndex + 1)}`;
+  }
+
+  return `${str}${id}`;
+}

back/data/cron.ts

@@ -26,7 +26,7 @@ export class Crontab {
     this.saved = options.saved;
     this.id = options.id;
     this.status =
-      options.status && CrontabStatus[options.status]
+      typeof options.status === 'number' && CrontabStatus[options.status]
         ? options.status
         : CrontabStatus.idle;
     this.timestamp = new Date().toString();

back/data/dependence.ts

@@ -12,7 +12,10 @@ export class Dependence {
 
   constructor(options: Dependence) {
     this.id = options.id;
-    this.status = options.status || DependenceStatus.installing;
+    this.status =
+      typeof options.status === 'number' && DependenceStatus[options.status]
+        ? options.status
+        : DependenceStatus.installing;
     this.type = options.type || DependenceTypes.nodejs;
     this.timestamp = new Date().toString();
     this.name = options.name;
@@ -28,6 +31,7 @@ export enum DependenceStatus {
   'removing',
   'removed',
   'removeFailed',
+  'queued',
 }
 
 export enum DependenceTypes {

back/data/env.ts

@@ -13,7 +13,10 @@ export class Env {
   constructor(options: Env) {
     this.value = options.value;
     this.id = options.id;
-    this.status = options.status || EnvStatus.normal;
+    this.status =
+      typeof options.status === 'number' && EnvStatus[options.status]
+        ? options.status
+        : EnvStatus.normal;
     this.timestamp = new Date().toString();
     this.position = options.position;
     this.name = options.name;

back/data/index.ts

@@ -1,9 +1,10 @@
 import { Sequelize, Transaction } from 'sequelize';
 import config from '../config/index';
+import { join } from 'path';
 
 export const sequelize = new Sequelize({
   dialect: 'sqlite',
-  storage: `${config.dbPath}database.sqlite`,
+  storage: join(config.dbPath, 'database.sqlite'),
   logging: false,
   retry: {
     max: 10,

back/data/subscription.ts

@@ -37,8 +37,8 @@ export class Subscription {
     this.name = options.name || options.alias;
     this.type = options.type;
     this.schedule = options.schedule;
-    this.status =
+    this.status = this.status =
-      options.status && SubscriptionStatus[options.status]
+      typeof options.status === 'number' && SubscriptionStatus[options.status]
         ? options.status
         : SubscriptionStatus.idle;
     this.url = options.url;

back/loaders/express.ts

@@ -14,22 +14,25 @@ import handler from 'serve-handler';
 import * as Sentry from '@sentry/node';
 import { EnvModel } from '../data/env';
 import { errors } from 'celebrate';
+import path from 'path';
+import { createProxyMiddleware } from 'http-proxy-middleware';
+import { serveEnv } from '../config/serverEnv';
 
 export default ({ app }: { app: Application }) => {
   app.enable('trust proxy');
   app.use(cors());
+  app.get(`${config.api.prefix}/env.js`, serveEnv);
   app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));
 
-  app.use((req, res, next) => {
+  app.use(
-    if (req.path.startsWith('/api') || req.path.startsWith('/open')) {
+    '/api/public',
-      next();
+    createProxyMiddleware({
-    } else {
+      target: `http://localhost:${config.publicPort}/api`,
-      return handler(req, res, {
+      changeOrigin: true,
-        public: 'static/dist',
+      pathRewrite: { '/api/public': '' },
-        rewrites: [{ source: '**', destination: '/index.html' }],
+    }),
-      });
+  );
-    }
+
-  });
   app.use(bodyParser.json({ limit: '50mb' }));
   app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
 

back/loaders/initData.ts

@@ -42,7 +42,7 @@ export default async () => {
     raw: true,
   }).then(async (docs) => {
     await DependenceModel.update(
-      { status: DependenceStatus.installing, log: [] },
+      { status: DependenceStatus.queued, log: [] },
       { where: { id: docs.map((x) => x.id!) } },
     );
     dependenceService.installDependenceOneByOne(docs);

back/loaders/initFile.ts

@@ -19,6 +19,7 @@ const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
 const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
 const homedir = os.homedir();
 const sshPath = path.resolve(homedir, '.ssh');
+const sshdPath = path.join(dataPath, 'ssh.d');
 
 export default async () => {
   const authFileExist = await fileExist(authConfigFile);
@@ -29,6 +30,7 @@ export default async () => {
   const uploadDirExist = await fileExist(uploadPath);
   const sshDirExist = await fileExist(sshPath);
   const bakDirExist = await fileExist(bakPath);
+  const sshdDirExist = await fileExist(sshdPath);
 
   if (!configDirExist) {
     fs.mkdirSync(configPath);
@@ -62,6 +64,10 @@ export default async () => {
     fs.mkdirSync(bakPath);
   }
 
+  if (!sshdDirExist) {
+    fs.mkdirSync(sshdPath);
+  }
+
   dotenv.config({ path: confFile });
 
   Logger.info('✌️ Init file down');

back/loaders/initTask.ts

@@ -4,6 +4,7 @@ import ScheduleService from '../services/schedule';
 import SubscriptionService from '../services/subscription';
 import config from '../config';
 import { fileExist } from '../config/util';
+import { join } from 'path';
 
 export default async () => {
   const systemService = Container.get(SystemService);
@@ -11,8 +12,9 @@ export default async () => {
   const subscriptionService = Container.get(SubscriptionService);
 
   // 生成内置token
-  let tokenCommand = `tsx ${config.rootPath}/back/token.ts`;
+  let tokenCommand = `tsx ${join(config.rootPath, 'back/token.ts')}`;
-  const tokenFile = `${config.rootPath}static/build/token.js`;
+  const tokenFile = join(config.rootPath, 'static/build/token.js');
+
   if (await fileExist(tokenFile)) {
     tokenCommand = `node ${tokenFile}`;
   }

back/loaders/server.ts

@@ -9,8 +9,14 @@ export default async ({ server }: { server: Server }) => {
   process.on('SIGINT', () => {
     Logger.info('✌️ Server need close');
     server.close(() => {
-      Logger.info('✌️ Server closed');
+      setTimeout(() => {
-      process.exit(0);
+        process.exit();
+      }, 10000);
     });
+
+    setTimeout(() => {
+      console.log('Forcing server close !!!');
+      process.exit(1);
+    }, 15000);
   });
 };

back/protos/cron.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package com.ql.cron;
+
+service Cron {
+  rpc addCron(AddCronRequest) returns (AddCronResponse);
+  rpc delCron(DeleteCronRequest) returns (DeleteCronResponse);
+}
+
+message ICron {
+  string id = 1;
+  string schedule = 2;
+  string command = 3;
+}
+
+message AddCronRequest { repeated ICron crons = 1; }
+
+message AddCronResponse {}
+
+message DeleteCronRequest { repeated string ids = 1; }
+
+message DeleteCronResponse {}

back/protos/cron.ts

@@ -0,0 +1,482 @@
+/* eslint-disable */
+import {
+  CallOptions,
+  ChannelCredentials,
+  Client,
+  ClientOptions,
+  ClientUnaryCall,
+  handleUnaryCall,
+  makeGenericClientConstructor,
+  Metadata,
+  ServiceError,
+  UntypedServiceImplementation,
+} from '@grpc/grpc-js';
+import _m0 from 'protobufjs/minimal';
+
+export const protobufPackage = 'com.ql.cron';
+
+export interface ICron {
+  id: string;
+  schedule: string;
+  command: string;
+}
+
+export interface AddCronRequest {
+  crons: ICron[];
+}
+
+export interface AddCronResponse {}
+
+export interface DeleteCronRequest {
+  ids: string[];
+}
+
+export interface DeleteCronResponse {}
+
+function createBaseICron(): ICron {
+  return { id: '', schedule: '', command: '' };
+}
+
+export const ICron = {
+  encode(message: ICron, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.id !== '') {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.schedule !== '') {
+      writer.uint32(18).string(message.schedule);
+    }
+    if (message.command !== '') {
+      writer.uint32(26).string(message.command);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ICron {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseICron();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag != 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        case 2:
+          if (tag != 18) {
+            break;
+          }
+
+          message.schedule = reader.string();
+          continue;
+        case 3:
+          if (tag != 26) {
+            break;
+          }
+
+          message.command = reader.string();
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ICron {
+    return {
+      id: isSet(object.id) ? String(object.id) : '',
+      schedule: isSet(object.schedule) ? String(object.schedule) : '',
+      command: isSet(object.command) ? String(object.command) : '',
+    };
+  },
+
+  toJSON(message: ICron): unknown {
+    const obj: any = {};
+    message.id !== undefined && (obj.id = message.id);
+    message.schedule !== undefined && (obj.schedule = message.schedule);
+    message.command !== undefined && (obj.command = message.command);
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<ICron>, I>>(base?: I): ICron {
+    return ICron.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<ICron>, I>>(object: I): ICron {
+    const message = createBaseICron();
+    message.id = object.id ?? '';
+    message.schedule = object.schedule ?? '';
+    message.command = object.command ?? '';
+    return message;
+  },
+};
+
+function createBaseAddCronRequest(): AddCronRequest {
+  return { crons: [] };
+}
+
+export const AddCronRequest = {
+  encode(
+    message: AddCronRequest,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    for (const v of message.crons) {
+      ICron.encode(v!, writer.uint32(10).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronRequest {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAddCronRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag != 10) {
+            break;
+          }
+
+          message.crons.push(ICron.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): AddCronRequest {
+    return {
+      crons: Array.isArray(object?.crons)
+        ? object.crons.map((e: any) => ICron.fromJSON(e))
+        : [],
+    };
+  },
+
+  toJSON(message: AddCronRequest): unknown {
+    const obj: any = {};
+    if (message.crons) {
+      obj.crons = message.crons.map((e) => (e ? ICron.toJSON(e) : undefined));
+    } else {
+      obj.crons = [];
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AddCronRequest>, I>>(
+    base?: I,
+  ): AddCronRequest {
+    return AddCronRequest.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(
+    object: I,
+  ): AddCronRequest {
+    const message = createBaseAddCronRequest();
+    message.crons = object.crons?.map((e) => ICron.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseAddCronResponse(): AddCronResponse {
+  return {};
+}
+
+export const AddCronResponse = {
+  encode(
+    _: AddCronResponse,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronResponse {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAddCronResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): AddCronResponse {
+    return {};
+  },
+
+  toJSON(_: AddCronResponse): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(
+    base?: I,
+  ): AddCronResponse {
+    return AddCronResponse.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(
+    _: I,
+  ): AddCronResponse {
+    const message = createBaseAddCronResponse();
+    return message;
+  },
+};
+
+function createBaseDeleteCronRequest(): DeleteCronRequest {
+  return { ids: [] };
+}
+
+export const DeleteCronRequest = {
+  encode(
+    message: DeleteCronRequest,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    for (const v of message.ids) {
+      writer.uint32(10).string(v!);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronRequest {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseDeleteCronRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag != 10) {
+            break;
+          }
+
+          message.ids.push(reader.string());
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): DeleteCronRequest {
+    return {
+      ids: Array.isArray(object?.ids)
+        ? object.ids.map((e: any) => String(e))
+        : [],
+    };
+  },
+
+  toJSON(message: DeleteCronRequest): unknown {
+    const obj: any = {};
+    if (message.ids) {
+      obj.ids = message.ids.map((e) => e);
+    } else {
+      obj.ids = [];
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
+    base?: I,
+  ): DeleteCronRequest {
+    return DeleteCronRequest.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
+    object: I,
+  ): DeleteCronRequest {
+    const message = createBaseDeleteCronRequest();
+    message.ids = object.ids?.map((e) => e) || [];
+    return message;
+  },
+};
+
+function createBaseDeleteCronResponse(): DeleteCronResponse {
+  return {};
+}
+
+export const DeleteCronResponse = {
+  encode(
+    _: DeleteCronResponse,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronResponse {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseDeleteCronResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): DeleteCronResponse {
+    return {};
+  },
+
+  toJSON(_: DeleteCronResponse): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
+    base?: I,
+  ): DeleteCronResponse {
+    return DeleteCronResponse.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
+    _: I,
+  ): DeleteCronResponse {
+    const message = createBaseDeleteCronResponse();
+    return message;
+  },
+};
+
+export type CronService = typeof CronService;
+export const CronService = {
+  addCron: {
+    path: '/com.ql.cron.Cron/addCron',
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: AddCronRequest) =>
+      Buffer.from(AddCronRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => AddCronRequest.decode(value),
+    responseSerialize: (value: AddCronResponse) =>
+      Buffer.from(AddCronResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => AddCronResponse.decode(value),
+  },
+  delCron: {
+    path: '/com.ql.cron.Cron/delCron',
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: DeleteCronRequest) =>
+      Buffer.from(DeleteCronRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => DeleteCronRequest.decode(value),
+    responseSerialize: (value: DeleteCronResponse) =>
+      Buffer.from(DeleteCronResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => DeleteCronResponse.decode(value),
+  },
+} as const;
+
+export interface CronServer extends UntypedServiceImplementation {
+  addCron: handleUnaryCall<AddCronRequest, AddCronResponse>;
+  delCron: handleUnaryCall<DeleteCronRequest, DeleteCronResponse>;
+}
+
+export interface CronClient extends Client {
+  addCron(
+    request: AddCronRequest,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  addCron(
+    request: AddCronRequest,
+    metadata: Metadata,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  addCron(
+    request: AddCronRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (error: ServiceError | null, response: AddCronResponse) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    callback: (
+      error: ServiceError | null,
+      response: DeleteCronResponse,
+    ) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    metadata: Metadata,
+    callback: (
+      error: ServiceError | null,
+      response: DeleteCronResponse,
+    ) => void,
+  ): ClientUnaryCall;
+  delCron(
+    request: DeleteCronRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (
+      error: ServiceError | null,
+      response: DeleteCronResponse,
+    ) => void,
+  ): ClientUnaryCall;
+}
+
+export const CronClient = makeGenericClientConstructor(
+  CronService,
+  'com.ql.cron.Cron',
+) as unknown as {
+  new (
+    address: string,
+    credentials: ChannelCredentials,
+    options?: Partial<ClientOptions>,
+  ): CronClient;
+  service: typeof CronService;
+};
+
+type Builtin =
+  | Date
+  | Function
+  | Uint8Array
+  | string
+  | number
+  | boolean
+  | undefined;
+
+export type DeepPartial<T> = T extends Builtin
+  ? T
+  : T extends Array<infer U>
+  ? Array<DeepPartial<U>>
+  : T extends ReadonlyArray<infer U>
+  ? ReadonlyArray<DeepPartial<U>>
+  : T extends {}
+  ? { [K in keyof T]?: DeepPartial<T[K]> }
+  : Partial<T>;
+
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin
+  ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
+      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+    };
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}

back/protos/health.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package com.ql.health;
+
+message HealthCheckRequest {
+  string service = 1;
+}
+
+message HealthCheckResponse {
+  enum ServingStatus {
+    UNKNOWN = 0;
+    SERVING = 1;
+    NOT_SERVING = 2;
+    SERVICE_UNKNOWN = 3;
+  }
+  ServingStatus status = 1;
+}
+
+service Health {
+  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
+  rpc Watch(HealthCheckRequest) returns (stream HealthCheckResponse);
+}

back/protos/health.ts

@@ -0,0 +1,317 @@
+/* eslint-disable */
+import {
+  CallOptions,
+  ChannelCredentials,
+  Client,
+  ClientOptions,
+  ClientReadableStream,
+  ClientUnaryCall,
+  handleServerStreamingCall,
+  handleUnaryCall,
+  makeGenericClientConstructor,
+  Metadata,
+  ServiceError,
+  UntypedServiceImplementation,
+} from '@grpc/grpc-js';
+import _m0 from 'protobufjs/minimal';
+
+export const protobufPackage = 'com.ql.health';
+
+export interface HealthCheckRequest {
+  service: string;
+}
+
+export interface HealthCheckResponse {
+  status: HealthCheckResponse_ServingStatus;
+}
+
+export enum HealthCheckResponse_ServingStatus {
+  UNKNOWN = 0,
+  SERVING = 1,
+  NOT_SERVING = 2,
+  SERVICE_UNKNOWN = 3,
+  UNRECOGNIZED = -1,
+}
+
+export function healthCheckResponse_ServingStatusFromJSON(
+  object: any,
+): HealthCheckResponse_ServingStatus {
+  switch (object) {
+    case 0:
+    case 'UNKNOWN':
+      return HealthCheckResponse_ServingStatus.UNKNOWN;
+    case 1:
+    case 'SERVING':
+      return HealthCheckResponse_ServingStatus.SERVING;
+    case 2:
+    case 'NOT_SERVING':
+      return HealthCheckResponse_ServingStatus.NOT_SERVING;
+    case 3:
+    case 'SERVICE_UNKNOWN':
+      return HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN;
+    case -1:
+    case 'UNRECOGNIZED':
+    default:
+      return HealthCheckResponse_ServingStatus.UNRECOGNIZED;
+  }
+}
+
+export function healthCheckResponse_ServingStatusToJSON(
+  object: HealthCheckResponse_ServingStatus,
+): string {
+  switch (object) {
+    case HealthCheckResponse_ServingStatus.UNKNOWN:
+      return 'UNKNOWN';
+    case HealthCheckResponse_ServingStatus.SERVING:
+      return 'SERVING';
+    case HealthCheckResponse_ServingStatus.NOT_SERVING:
+      return 'NOT_SERVING';
+    case HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN:
+      return 'SERVICE_UNKNOWN';
+    case HealthCheckResponse_ServingStatus.UNRECOGNIZED:
+    default:
+      return 'UNRECOGNIZED';
+  }
+}
+
+function createBaseHealthCheckRequest(): HealthCheckRequest {
+  return { service: '' };
+}
+
+export const HealthCheckRequest = {
+  encode(
+    message: HealthCheckRequest,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.service !== '') {
+      writer.uint32(10).string(message.service);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckRequest {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseHealthCheckRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag != 10) {
+            break;
+          }
+
+          message.service = reader.string();
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HealthCheckRequest {
+    return { service: isSet(object.service) ? String(object.service) : '' };
+  },
+
+  toJSON(message: HealthCheckRequest): unknown {
+    const obj: any = {};
+    message.service !== undefined && (obj.service = message.service);
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(
+    base?: I,
+  ): HealthCheckRequest {
+    return HealthCheckRequest.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(
+    object: I,
+  ): HealthCheckRequest {
+    const message = createBaseHealthCheckRequest();
+    message.service = object.service ?? '';
+    return message;
+  },
+};
+
+function createBaseHealthCheckResponse(): HealthCheckResponse {
+  return { status: 0 };
+}
+
+export const HealthCheckResponse = {
+  encode(
+    message: HealthCheckResponse,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.status !== 0) {
+      writer.uint32(8).int32(message.status);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckResponse {
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseHealthCheckResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag != 8) {
+            break;
+          }
+
+          message.status = reader.int32() as any;
+          continue;
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HealthCheckResponse {
+    return {
+      status: isSet(object.status)
+        ? healthCheckResponse_ServingStatusFromJSON(object.status)
+        : 0,
+    };
+  },
+
+  toJSON(message: HealthCheckResponse): unknown {
+    const obj: any = {};
+    message.status !== undefined &&
+      (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(
+    base?: I,
+  ): HealthCheckResponse {
+    return HealthCheckResponse.fromPartial(base ?? {});
+  },
+
+  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(
+    object: I,
+  ): HealthCheckResponse {
+    const message = createBaseHealthCheckResponse();
+    message.status = object.status ?? 0;
+    return message;
+  },
+};
+
+export type HealthService = typeof HealthService;
+export const HealthService = {
+  check: {
+    path: '/com.ql.health.Health/Check',
+    requestStream: false,
+    responseStream: false,
+    requestSerialize: (value: HealthCheckRequest) =>
+      Buffer.from(HealthCheckRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
+    responseSerialize: (value: HealthCheckResponse) =>
+      Buffer.from(HealthCheckResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
+  },
+  watch: {
+    path: '/com.ql.health.Health/Watch',
+    requestStream: false,
+    responseStream: true,
+    requestSerialize: (value: HealthCheckRequest) =>
+      Buffer.from(HealthCheckRequest.encode(value).finish()),
+    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
+    responseSerialize: (value: HealthCheckResponse) =>
+      Buffer.from(HealthCheckResponse.encode(value).finish()),
+    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
+  },
+} as const;
+
+export interface HealthServer extends UntypedServiceImplementation {
+  check: handleUnaryCall<HealthCheckRequest, HealthCheckResponse>;
+  watch: handleServerStreamingCall<HealthCheckRequest, HealthCheckResponse>;
+}
+
+export interface HealthClient extends Client {
+  check(
+    request: HealthCheckRequest,
+    callback: (
+      error: ServiceError | null,
+      response: HealthCheckResponse,
+    ) => void,
+  ): ClientUnaryCall;
+  check(
+    request: HealthCheckRequest,
+    metadata: Metadata,
+    callback: (
+      error: ServiceError | null,
+      response: HealthCheckResponse,
+    ) => void,
+  ): ClientUnaryCall;
+  check(
+    request: HealthCheckRequest,
+    metadata: Metadata,
+    options: Partial<CallOptions>,
+    callback: (
+      error: ServiceError | null,
+      response: HealthCheckResponse,
+    ) => void,
+  ): ClientUnaryCall;
+  watch(
+    request: HealthCheckRequest,
+    options?: Partial<CallOptions>,
+  ): ClientReadableStream<HealthCheckResponse>;
+  watch(
+    request: HealthCheckRequest,
+    metadata?: Metadata,
+    options?: Partial<CallOptions>,
+  ): ClientReadableStream<HealthCheckResponse>;
+}
+
+export const HealthClient = makeGenericClientConstructor(
+  HealthService,
+  'com.ql.health.Health',
+) as unknown as {
+  new (
+    address: string,
+    credentials: ChannelCredentials,
+    options?: Partial<ClientOptions>,
+  ): HealthClient;
+  service: typeof HealthService;
+};
+
+type Builtin =
+  | Date
+  | Function
+  | Uint8Array
+  | string
+  | number
+  | boolean
+  | undefined;
+
+export type DeepPartial<T> = T extends Builtin
+  ? T
+  : T extends Array<infer U>
+  ? Array<DeepPartial<U>>
+  : T extends ReadonlyArray<infer U>
+  ? ReadonlyArray<DeepPartial<U>>
+  : T extends {}
+  ? { [K in keyof T]?: DeepPartial<T[K]> }
+  : Partial<T>;
+
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin
+  ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
+      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+    };
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}

back/public.ts

@@ -1,16 +1,21 @@
 import express from 'express';
-import { exec } from 'child_process';
 import Logger from './loaders/logger';
 import config from './config';
+import { HealthClient } from './protos/health';
+import { credentials } from '@grpc/grpc-js';
 
 const app = express();
+const client = new HealthClient(
+  `localhost:${config.cronPort}`,
+  credentials.createInsecure(),
+);
 
-app.get('/api/public/panel/log', (req, res) => {
+app.get('/api/health', (req, res) => {
-  exec('tail -n 300 ~/.pm2/logs/panel-error.log', (err, stdout, stderr) => {
+  client.check({ service: 'cron' }, (err, response) => {
-    if (err || stderr) {
+    if (err) {
-      return res.send({ code: 400, message: (err && err.message) || stderr });
+      return res.status(500).send({ code: 500, error: err });
     }
-    return res.send({ code: 200, data: stdout });
+    return res.status(200).send({ code: 200, data: response });
   });
 });
 
@@ -20,6 +25,7 @@ app
     await require('./loaders/db').default();
 
     Logger.debug(`✌️ 公共服务启动成功！`);
+    process.send?.('ready');
   })
   .on('error', (err) => {
     Logger.error(err);

back/schedule.ts

@@ -1,56 +0,0 @@
-import schedule from 'node-schedule';
-import express from 'express';
-import { exec } from 'child_process';
-import Logger from './loaders/logger';
-import { CrontabModel, CrontabStatus } from './data/cron';
-import config from './config';
-import { QL_PREFIX, TASK_PREFIX } from './config/const';
-
-const app = express();
-
-const run = async () => {
-  CrontabModel.findAll({ where: {} })
-    .then((docs) => {
-      if (docs && docs.length > 0) {
-        for (let i = 0; i < docs.length; i++) {
-          const task = docs[i];
-          const _schedule = task.schedule && task.schedule.split(/ +/);
-          if (
-            _schedule &&
-            _schedule.length > 5 &&
-            task.status !== CrontabStatus.disabled &&
-            !task.isDisabled &&
-            task.schedule
-          ) {
-            schedule.scheduleJob(task.schedule, function () {
-              let command = task.command as string;
-              if (
-                !command.startsWith(TASK_PREFIX) &&
-                !command.startsWith(QL_PREFIX)
-              ) {
-                command = `${TASK_PREFIX}${command}`;
-              }
-              exec(`ID=${task.id} ${command}`);
-            });
-          }
-        }
-      }
-    })
-    .catch((err) => {
-      Logger.error(err);
-      process.exit(1);
-    });
-};
-
-app
-  .listen(config.cronPort, async () => {
-    await require('./loaders/sentry').default({ expressApp: app });
-    await require('./loaders/db').default();
-
-    await run();
-    Logger.debug('定时任务服务启动成功！');
-  })
-  .on('error', (err) => {
-    Logger.error(err);
-    process.exit(1);
-  });

back/schedule/addCron.ts

@@ -0,0 +1,27 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { AddCronRequest, AddCronResponse } from '../protos/cron';
+import nodeSchedule from 'node-schedule';
+import { scheduleStacks } from './data';
+import { exec } from 'child_process';
+
+const addCron = (
+  call: ServerUnaryCall<AddCronRequest, AddCronResponse>,
+  callback: sendUnaryData<AddCronResponse>,
+) => {
+  for (const item of call.request.crons) {
+    const { id, schedule, command } = item;
+    if (scheduleStacks.has(id)) {
+      scheduleStacks.get(id)?.cancel();
+    }
+    scheduleStacks.set(
+      id,
+      nodeSchedule.scheduleJob(id, schedule, async () => {
+        exec(`ID=${id} ${command}`);
+      }),
+    );
+  }
+
+  callback(null, null);
+};
+
+export { addCron };

back/schedule/client.ts

@@ -0,0 +1,40 @@
+import { credentials } from '@grpc/grpc-js';
+import {
+  AddCronRequest,
+  AddCronResponse,
+  CronClient,
+  DeleteCronRequest,
+  DeleteCronResponse,
+} from '../protos/cron';
+import config from '../config';
+
+class Client {
+  private client = new CronClient(
+    `localhost:${config.cronPort}`,
+    credentials.createInsecure(),
+  );
+
+  addCron(request: AddCronRequest['crons']): Promise<AddCronResponse> {
+    return new Promise((resolve, reject) => {
+      this.client.addCron({ crons: request }, (err, res) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(res);
+      });
+    });
+  }
+
+  delCron(request: DeleteCronRequest['ids']): Promise<DeleteCronResponse> {
+    return new Promise((resolve, reject) => {
+      this.client.delCron({ ids: request }, (err, res) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(res);
+      });
+    });
+  }
+}
+
+export default new Client();

back/schedule/data.ts

@@ -0,0 +1,6 @@
+import nodeSchedule from 'node-schedule';
+import { ToadScheduler } from 'toad-scheduler';
+
+export const scheduleStacks = new Map<string, nodeSchedule.Job>();
+
+export const intervalSchedule = new ToadScheduler();

back/schedule/delCron.ts

@@ -0,0 +1,19 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { DeleteCronRequest, DeleteCronResponse } from '../protos/cron';
+import { scheduleStacks } from './data';
+
+const delCron = (
+  call: ServerUnaryCall<DeleteCronRequest, DeleteCronResponse>,
+  callback: sendUnaryData<DeleteCronResponse>,
+) => {
+  for (const id of call.request.ids) {
+    if (scheduleStacks.has(id)) {
+      scheduleStacks.get(id)?.cancel();
+      scheduleStacks.delete(id);
+    }
+  }
+
+  callback(null, null);
+};
+
+export { delCron };

back/schedule/health.ts

@@ -0,0 +1,33 @@
+import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
+import { HealthCheckRequest, HealthCheckResponse } from '../protos/health';
+import { exec } from 'child_process';
+import config from '../config';
+import { promiseExec } from '../config/util';
+
+const check = async (
+  call: ServerUnaryCall<HealthCheckRequest, HealthCheckResponse>,
+  callback: sendUnaryData<HealthCheckResponse>,
+) => {
+  switch (call.request.service) {
+    case 'cron':
+      const res = await promiseExec(
+        `curl -sf http://localhost:${config.port}/api/system`,
+      );
+
+      if (res.includes('200')) {
+        return callback(null, { status: 1 });
+      }
+      const panelErrLog = await promiseExec(
+        `tail -n 300 ~/.pm2/logs/panel-error.log`,
+      );
+      const scheduleErrLog = await promiseExec(
+        `tail -n 300 ~/.pm2/logs/schedule-error.log`,
+      );
+      return callback(new Error(`${scheduleErrLog}\n${panelErrLog}`));
+
+    default:
+      return callback(null, { status: 1 });
+  }
+};
+
+export { check };

back/schedule/index.ts

@@ -0,0 +1,24 @@
+import { Server, ServerCredentials } from '@grpc/grpc-js';
+import { CronService } from '../protos/cron';
+import { addCron } from './addCron';
+import { delCron } from './delCron';
+import { HealthService } from '../protos/health';
+import { check } from './health';
+import config from '../config';
+import Logger from '../loaders/logger';
+
+const server = new Server();
+server.addService(HealthService, { check });
+server.addService(CronService, { addCron, delCron });
+server.bindAsync(
+  `localhost:${config.cronPort}`,
+  ServerCredentials.createInsecure(),
+  (err, port) => {
+    if (err) {
+      throw err;
+    }
+    server.start();
+    Logger.debug(`✌️ 定时服务启动成功！`);
+    process.send?.('ready');
+  },
+);

back/services/cron.ts

@@ -12,9 +12,10 @@ import {
   killTask,
 } from '../config/util';
 import { promises, existsSync } from 'fs';
-import { Op, where, col as colFn } from 'sequelize';
+import { Op, where, col as colFn, FindOptions } from 'sequelize';
 import path from 'path';
 import { TASK_PREFIX, QL_PREFIX } from '../config/const';
+import cronClient from '../schedule/client';
 
 @Service()
 export default class CronService {
@@ -32,6 +33,11 @@ export default class CronService {
     const tab = new Crontab(payload);
     tab.saved = false;
     const doc = await this.insert(tab);
+    if (this.isSixCron(doc)) {
+      await cronClient.addCron([
+        { id: String(doc.id), schedule: doc.schedule!, command: doc.command },
+      ]);
+    }
     await this.set_crontab();
     return doc;
   }
@@ -41,9 +47,25 @@ export default class CronService {
   }
 
   public async update(payload: Crontab): Promise<Crontab> {
-    const tab = new Crontab(payload);
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new Crontab({ ...doc, ...payload });
     tab.saved = false;
     const newDoc = await this.updateDb(tab);
+    if (doc.isDisabled === 1) {
+      return newDoc;
+    }
+    if (this.isSixCron(doc)) {
+      await cronClient.delCron([String(newDoc.id)]);
+    }
+    if (this.isSixCron(newDoc)) {
+      await cronClient.addCron([
+        {
+          id: String(newDoc.id),
+          schedule: newDoc.schedule!,
+          command: newDoc.command,
+        },
+      ]);
+    }
     await this.set_crontab();
     return newDoc;
   }
@@ -83,6 +105,7 @@ export default class CronService {
 
   public async remove(ids: number[]) {
     await CrontabModel.destroy({ where: { id: ids } });
+    await cronClient.delCron(ids.map(String));
     await this.set_crontab();
   }
 
@@ -246,8 +269,12 @@ export default class CronService {
       for (const key of filterKeys) {
         let q: any = {};
         if (!filterQuery[key]) continue;
-        if (key === 'status' && filterQuery[key].includes(2)) {
+        if (key === 'status') {
-          q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] };
+          if (filterQuery[key].includes(2)) {
+            q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] };
+          } else {
+            q = { [Op.and]: [{ [key]: filterQuery[key] }, { isDisabled: 0 }] };
+          }
         } else {
           q[key] = filterQuery[key];
         }
@@ -264,7 +291,11 @@ export default class CronService {
     }
   }
 
-  public async find({ log_path }: { log_path: string }): Promise<Crontab | null> {
+  public async find({
+    log_path,
+  }: {
+    log_path: string;
+  }): Promise<Crontab | null> {
     try {
       const result = await CrontabModel.findOne({ where: { log_path } });
       return result;
@@ -324,7 +355,7 @@ export default class CronService {
     }
   }
 
-  public async getDb(query: any): Promise<Crontab> {
+  public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Crontab);
   }
@@ -422,11 +453,21 @@ export default class CronService {
 
   public async disabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
+    await cronClient.delCron(ids.map(String));
     await this.set_crontab();
   }
 
   public async enabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
+    const docs = await CrontabModel.findAll({ where: { id: ids } });
+    const sixCron = docs
+      .filter((x) => this.isSixCron(x))
+      .map((doc) => ({
+        id: String(doc.id),
+        schedule: doc.schedule!,
+        command: doc.command,
+      }));
+    await cronClient.addCron(sixCron);
     await this.set_crontab();
   }
 
@@ -478,8 +519,8 @@ export default class CronService {
     return crontab_job_string;
   }
 
-  private async set_crontab() {
+  private async set_crontab(data?: { data: Crontab[]; total: number }) {
-    const tabs = await this.crontabs();
+    const tabs = data ?? (await this.crontabs());
     var crontab_string = '';
     tabs.data.forEach((tab) => {
       const _schedule = tab.schedule && tab.schedule.split(/ +/);
@@ -501,7 +542,6 @@ export default class CronService {
     fs.writeFileSync(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);
-    exec(`pm2 reload schedule`);
     await CrontabModel.update({ saved: true }, { where: {} });
   }
 
@@ -539,7 +579,17 @@ export default class CronService {
     });
   }
 
-  public autosave_crontab() {
+  public async autosave_crontab() {
-    return this.set_crontab();
+    const tabs = await this.crontabs();
+    this.set_crontab(tabs);
+
+    const sixCron = tabs.data
+      .filter((x) => this.isSixCron(x) && x.isDisabled !== 1)
+      .map((doc) => ({
+        id: String(doc.id),
+        schedule: doc.schedule!,
+        command: doc.command,
+      }));
+    await cronClient.addCron(sixCron);
   }
 }

back/services/cronView.ts

@@ -7,6 +7,7 @@ import {
   minPosition,
   stepPosition,
 } from '../data/env';
+import { FindOptions } from 'sequelize';
 
 @Service()
 export default class CronViewService {
@@ -31,7 +32,9 @@ export default class CronViewService {
   }
 
   public async update(payload: CrontabView): Promise<CrontabView> {
-    const newDoc = await this.updateDb(new CrontabView(payload));
+    const doc = await this.getDb({ id: payload.id })
+    const tab = new CrontabView({ ...doc, ...payload });
+    const newDoc = await this.updateDb(tab);
     return newDoc;
   }
 
@@ -56,7 +59,7 @@ export default class CronViewService {
     }
   }
 
-  public async getDb(query: any): Promise<CrontabView> {
+  public async getDb(query: FindOptions<CrontabView>['where']): Promise<CrontabView> {
     const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as CrontabView);
   }

back/services/dependence.ts

@@ -11,7 +11,7 @@ import {
 } from '../data/dependence';
 import { spawn } from 'child_process';
 import SockService from './sock';
-import { Op } from 'sequelize';
+import { FindOptions, Op } from 'sequelize';
 import { concurrentRun } from '../config/util';
 import dayjs from 'dayjs';
 
@@ -24,7 +24,7 @@ export default class DependenceService {
 
   public async create(payloads: Dependence[]): Promise<Dependence[]> {
     const tabs = payloads.map((x) => {
-      const tab = new Dependence({ ...x, status: DependenceStatus.installing });
+      const tab = new Dependence({ ...x, status: DependenceStatus.queued });
       return tab;
     });
     const docs = await this.insert(tabs);
@@ -45,7 +45,7 @@ export default class DependenceService {
     const tab = new Dependence({
       ...doc,
       ...other,
-      status: DependenceStatus.installing,
+      status: DependenceStatus.queued,
     });
     const newDoc = await this.updateDb(tab);
     this.installDependenceOneByOne([newDoc]);
@@ -59,7 +59,7 @@ export default class DependenceService {
 
   public async remove(ids: number[], force = false): Promise<Dependence[]> {
     await DependenceModel.update(
-      { status: DependenceStatus.removing, log: [] },
+      { status: DependenceStatus.queued, log: [] },
       { where: { id: ids } },
     );
     const docs = await DependenceModel.findAll({ where: { id: ids } });
@@ -105,17 +105,24 @@ export default class DependenceService {
     force: boolean = false,
   ) {
     concurrentRun(
-      docs.map(
+      docs.map((dep) => async () => {
-        (dep) => async () =>
+        const status = isInstall
-          await this.installOrUninstallDependencies([dep], isInstall, force),
+          ? DependenceStatus.installing
-      ),
+          : DependenceStatus.removing;
+        await DependenceModel.update({ status }, { where: { id: dep.id } });
+        return await this.installOrUninstallDependencies(
+          [dep],
+          isInstall,
+          force,
+        );
+      }),
       1,
     );
   }
 
   public async reInstall(ids: number[]): Promise<Dependence[]> {
     await DependenceModel.update(
-      { status: DependenceStatus.installing, log: [] },
+      { status: DependenceStatus.queued, log: [] },
       { where: { id: ids } },
     );
 
@@ -132,7 +139,9 @@ export default class DependenceService {
     return docs;
   }
 
-  public async getDb(query: any): Promise<Dependence> {
+  public async getDb(
+    query: FindOptions<Dependence>['where'],
+  ): Promise<Dependence> {
     const doc: any = await DependenceModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Dependence);
   }

back/services/env.ts

@@ -12,7 +12,7 @@ import {
   stepPosition,
 } from '../data/env';
 import groupBy from 'lodash/groupBy';
-import { Op } from 'sequelize';
+import { FindOptions, Op } from 'sequelize';
 
 @Service()
 export default class EnvService {
@@ -49,7 +49,9 @@ export default class EnvService {
   }
 
   public async update(payload: Env): Promise<Env> {
-    const newDoc = await this.updateDb(new Env(payload));
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new Env({ ...doc, ...payload });
+    const newDoc = await this.updateDb(tab);
     await this.set_envs();
     return newDoc;
   }
@@ -144,7 +146,6 @@ export default class EnvService {
     }
     try {
       const result = await this.find(condition, [
-        ['status', 'ASC'],
         ['position', 'DESC'],
         ['createdAt', 'ASC'],
       ]);
@@ -162,7 +163,7 @@ export default class EnvService {
     return docs;
   }
 
-  public async getDb(query: any): Promise<Env> {
+  public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
     const doc: any = await EnvModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Env);
   }

back/services/notify.ts

@@ -36,7 +36,7 @@ export default class NotificationService {
   private content = '';
   private params!: Omit<NotificationInfo, 'type'>;
   private gotOption = {
-    timeout: 30000,
+    timeout: 10000,
     retry: 1,
   };
 
@@ -78,33 +78,49 @@ export default class NotificationService {
   }
 
   private async gotify() {
-    const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
+    const { gotifyUrl, gotifyToken, gotifyPriority = 1 } = this.params;
-    const res: any = await got
+    try {
-      .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        body: `title=${encodeURIComponent(
+          ...this.gotOption,
-          this.title,
+          body: `title=${encodeURIComponent(
-        )}&message=${encodeURIComponent(
+            this.title,
-          this.content,
+          )}&message=${encodeURIComponent(
-        )}&priority=${gotifyPriority}`,
+            this.content,
-        headers: {
+          )}&priority=${gotifyPriority}`,
-          'Content-Type': 'application/x-www-form-urlencoded',
+          headers: {
-        },
+            'Content-Type': 'application/x-www-form-urlencoded',
-      })
+          },
-      .json();
+        })
-    return typeof res.id === 'number';
+        .json();
+      if (typeof res.id === 'number') {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async goCqHttpBot() {
     const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
-    const res: any = await got
+    try {
-      .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        json: { message: `${this.title}\n${this.content}` },
+          ...this.gotOption,
-        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+          json: { message: `${this.title}\n${this.content}` },
-      })
+          headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
-      .json();
+        })
-    return res.retcode === 0;
+        .json();
+      if (res.retcode === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async serverChan() {
@@ -112,49 +128,74 @@ export default class NotificationService {
     const url = serverChanKey.startsWith('SCT')
       ? `https://sctapi.ftqq.com/${serverChanKey}.send`
       : `https://sc.ftqq.com/${serverChanKey}.send`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `title=${this.title}&desp=${this.content}`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `title=${this.title}&desp=${this.content}`,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
-    return res.errno === 0 || res.data.errno === 0;
+        .json();
+      if (res.errno === 0 || res.data.errno === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async pushDeer() {
     const { pushDeerKey, pushDeerUrl } = this.params;
     const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
+          ...this.gotOption,
-          this.title,
+          body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
-        )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
+            this.title,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
-    return (
+        .json();
-      res.content.result.length !== undefined && res.content.result.length > 0
+      if (
-    );
+        res.content.result.length !== undefined &&
+        res.content.result.length > 0
+      ) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async chat() {
     const { chatUrl, chatToken } = this.params;
     const url = `${chatUrl}${chatToken}`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `payload={"text":"${this.title}\n${this.content}"}`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `payload={"text":"${this.title}\n${this.content}"}`,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
-    return res.success;
+        .json();
+      if (res.success) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async bark() {
     let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
-    if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
+    if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
     const url = `${barkPush}/${encodeURIComponent(
@@ -162,13 +203,22 @@ export default class NotificationService {
     )}/${encodeURIComponent(
       this.content,
     )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}`;
-    const res: any = await got
+
-      .get(url, {
+    try {
-        ...this.gotOption,
+      const res: any = await got
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        .get(url, {
-      })
+          ...this.gotOption,
-      .json();
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    return res.code === 200;
+        })
+        .json();
+      if (res.code === 200) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async telegramBot() {
@@ -200,15 +250,23 @@ export default class NotificationService {
         https: httpsAgent,
       };
     }
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
-        agent,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      })
+          agent,
-      .json();
+        })
-    return !!res.ok;
+        .json();
+      if (res.ok) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async dingtalkBot() {
@@ -222,35 +280,51 @@ export default class NotificationService {
       secretParam = `&timestamp=${dateNow}&sign=${result}`;
     }
     const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          msgtype: 'text',
+          json: {
-          text: {
+            msgtype: 'text',
-            content: ` ${this.title}\n\n${this.content}`,
+            text: {
+              content: ` ${this.title}\n\n${this.content}`,
+            },
           },
-        },
+        })
-      })
+        .json();
-      .json();
+      if (res.errcode === 0) {
-    return res.errcode === 0;
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async weWorkBot() {
     const { weWorkBotKey } = this.params;
     const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          msgtype: 'text',
+          json: {
-          text: {
+            msgtype: 'text',
-            content: ` ${this.title}\n\n${this.content}`,
+            text: {
+              content: ` ${this.title}\n\n${this.content}`,
+            },
           },
-        },
+        })
-      })
+        .json();
-      .json();
+      if (res.errcode === 0) {
-    return res.errcode === 0;
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async weWorkApp() {
@@ -306,22 +380,30 @@ export default class NotificationService {
         break;
     }
 
-    const res: any = await got
+    try {
-      .post(
+      const res: any = await got
-        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
+        .post(
-        {
+          `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
-          ...this.gotOption,
+          {
-          json: {
+            ...this.gotOption,
-            touser,
+            json: {
-            agentid,
+              touser,
-            safe: '0',
+              agentid,
-            ...options,
+              safe: '0',
+              ...options,
+            },
           },
-        },
+        )
-      )
+        .json();
-      .json();
 
-    return res.errcode === 0;
+      if (res.errcode === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async aibotk() {
@@ -353,85 +435,130 @@ export default class NotificationService {
         break;
     }
 
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          ...json,
+          json: {
-        },
+            ...json,
-      })
+          },
-      .json();
+        })
-
+        .json();
-    return res.code === 0;
+      if (res.code === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async iGot() {
     const { iGotPushKey } = this.params;
     const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `title=${this.title}&content=${this.content}`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `title=${this.title}&content=${this.content}`,
-      })
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      .json();
+        })
+        .json();
 
-    return res.ret === 0;
+      if (res.ret === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async pushPlus() {
     const { pushPlusToken, pushPlusUser } = this.params;
     const url = `https://www.pushplus.plus/send`;
-    const res: any = await got
+    try {
-      .post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          token: `${pushPlusToken}`,
+          json: {
-          title: `${this.title}`,
+            token: `${pushPlusToken}`,
-          content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
+            title: `${this.title}`,
-          topic: `${pushPlusUser || ''}`,
+            content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
-        },
+            topic: `${pushPlusUser || ''}`,
-      })
+          },
-      .json();
+        })
+        .json();
 
-    return res.code === 200;
+      if (res.code === 200) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async lark() {
-    const { larkKey } = this.params;
+    let { larkKey } = this.params;
-    const res: any = await got
+
-      .post(`https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`, {
+    if (!larkKey.startsWith('http')) {
-        ...this.gotOption,
+      larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
-        json: {
+    }
-          msg_type: 'text',
+
-          content: { text: `${this.title}\n\n${this.content}` },
+    try {
-        },
+      const res: any = await got
-        headers: { 'Content-Type': 'application/json' },
+        .post(larkKey, {
-      })
+          ...this.gotOption,
-      .json();
+          json: {
-    return res.StatusCode === 0;
+            msg_type: 'text',
+            content: { text: `${this.title}\n\n${this.content}` },
+          },
+          headers: { 'Content-Type': 'application/json' },
+        })
+        .json();
+      if (res.StatusCode === 0) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async email() {
     const { emailPass, emailService, emailUser } = this.params;
-    const transporter = nodemailer.createTransport({
-      service: emailService,
-      auth: {
-        user: emailUser,
-        pass: emailPass,
-      },
-    });
 
-    const info = await transporter.sendMail({
+    try {
-      from: `"青龙快讯" <${emailUser}>`,
+      const transporter = nodemailer.createTransport({
-      to: `${emailUser}`,
+        service: emailService,
-      subject: `${this.title}`,
+        auth: {
-      html: `${this.content.replace(/\n/g, '<br/>')}`,
+          user: emailUser,
-    });
+          pass: emailPass,
+        },
+      });
 
-    transporter.close();
+      const info = await transporter.sendMail({
+        from: `"青龙快讯" <${emailUser}>`,
+        to: `${emailUser}`,
+        subject: `${this.title}`,
+        html: `${this.content.replace(/\n/g, '<br/>')}`,
+      });
 
-    return !!info.messageId;
+      transporter.close();
+
+      if (info.messageId) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(info));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private async webhook() {
@@ -460,8 +587,16 @@ export default class NotificationService {
       allowGetBody: true,
       ...bodyParam,
     };
-    const res = await got(formatUrl, options);
+    try {
-    return String(res.statusCode).startsWith('20');
+      const res = await got(formatUrl, options);
+      if (String(res.statusCode).startsWith('20')) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
   }
 
   private formatBody(contentType: string, body: any): object {

back/services/schedule.ts

@@ -138,7 +138,10 @@ export default class ScheduleService {
   async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
     this.logger.info('[取消定时任务]，任务名：%s', name);
-    this.scheduleStacks.has(_id) && this.scheduleStacks.get(_id)?.cancel();
+    if (this.scheduleStacks.has(_id)) {
+      this.scheduleStacks.get(_id)?.cancel();
+      this.scheduleStacks.delete(_id);
+    }
   }
 
   async createIntervalTask(

back/services/sshKey.ts

@@ -5,18 +5,38 @@ import os from 'os';
 import path from 'path';
 import { Subscription } from '../data/subscription';
 import { formatUrl } from '../config/subscription';
+import config from '../config';
 
 @Service()
 export default class SshKeyService {
   private homedir = os.homedir();
-  private sshPath = path.resolve(this.homedir, '.ssh');
+  private sshPath = config.sshdPath;
-  private sshConfigFilePath = path.resolve(this.sshPath, 'config');
+  private sshConfigFilePath = path.resolve(this.homedir, '.ssh', 'config');
+  private sshConfigHeader = `Include ${path.join(this.sshPath, '*.config')}`;
 
-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor(@Inject('logger') private logger: winston.Logger) {
+    this.initSshConfigFile();
+  }
+
+  private initSshConfigFile() {
+    let config = '';
+    if (existsSync(this.sshConfigFilePath)) {
+      config = fs.readFileSync(this.sshConfigFilePath, { encoding: 'utf-8' });
+    } else {
+      fs.writeFileSync(this.sshConfigFilePath, '');
+    }
+    if (!config.includes(this.sshConfigHeader)) {
+      fs.writeFileSync(
+        this.sshConfigFilePath,
+        `${this.sshConfigHeader}\n\n${config}`,
+        { encoding: 'utf-8' },
+      );
+    }
+  }
 
   private generatePrivateKeyFile(alias: string, key: string): void {
     try {
-      fs.writeFileSync(`${this.sshPath}/${alias}`, `${key}${os.EOL}`, {
+      fs.writeFileSync(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
         encoding: 'utf8',
         mode: '400',
       });
@@ -25,56 +45,39 @@ export default class SshKeyService {
     }
   }
 
-  private getConfigRegx(alias: string) {
-    return new RegExp(
-      `Host ${alias}\n.*[^StrictHostKeyChecking]*.*[\n]*.*StrictHostKeyChecking no`,
-      'g',
-    );
-  }
-
   private removePrivateKeyFile(alias: string): void {
     try {
       const filePath = path.join(this.sshPath, alias);
       if (existsSync(filePath)) {
-        fs.unlinkSync(`${this.sshPath}/${alias}`);
+        fs.unlinkSync(filePath);
       }
     } catch (error) {
       this.logger.error('删除私钥文件失败', error);
     }
   }
 
-  private generateSingleSshConfig(
+  private generateSingleSshConfig(alias: string, host: string, proxy?: string) {
-    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` : '';
+    const proxyStr = proxy
-    return `Host ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no\n${proxyStr}`;
+      ? `    ProxyCommand nc -v -x ${proxy} %h %p 2>/dev/null\n`
-  }
+      : '';
-
+    const config = `Host ${alias}\n    Hostname ${host}\n    IdentityFile ${path.join(
-  private generateSshConfig(configs: string[]) {
+      this.sshPath,
-    try {
+      alias,
-      fs.writeFileSync(this.sshConfigFilePath, configs.join('\n'), {
+    )}\n    StrictHostKeyChecking no\n${proxyStr}`;
-        encoding: 'utf8',
+    fs.writeFileSync(`${path.join(this.sshPath, `${alias}.config`)}`, config, {
-      });
+      encoding: 'utf8',
-    } catch (error) {
+    });
-      this.logger.error('写入ssh配置文件失败', error);
-    }
   }
 
   private removeSshConfig(alias: string) {
     try {
-      const configRegx = this.getConfigRegx(alias);
+      const filePath = path.join(this.sshPath, `${alias}.config`);
-      const data = fs
+      if (existsSync(filePath)) {
-        .readFileSync(this.sshConfigFilePath, { encoding: 'utf8' })
+        fs.unlinkSync(filePath);
-        .replace(configRegx, '')
+      }
-        .replace(/\n[\n]+/g, '\n');
-      fs.writeFileSync(this.sshConfigFilePath, data, {
-        encoding: 'utf8',
-      });
     } catch (error) {
       this.logger.error(`删除ssh配置文件${alias}失败`, error);
     }
@@ -87,32 +90,27 @@ export default class SshKeyService {
     proxy?: string,
   ): void {
     this.generatePrivateKeyFile(alias, key);
-    const config = this.generateSingleSshConfig(alias, host, proxy);
+    this.generateSingleSshConfig(alias, host, proxy);
-    this.removeSshConfig(alias);
-    this.generateSshConfig([config]);
   }
 
   public removeSSHKey(alias: string, host: string, proxy?: string): void {
     this.removePrivateKeyFile(alias);
-    const config = this.generateSingleSshConfig(alias, host, proxy);
+    this.removeSshConfig(alias);
-    this.removeSshConfig(config);
   }
 
   public setSshConfig(docs: Subscription[]) {
-    let result = [];
     for (const doc of docs) {
       if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
         const { alias, proxy } = doc;
         const { host } = formatUrl(doc);
         this.removePrivateKeyFile(alias);
+        this.removeSshConfig(alias);
         this.generatePrivateKeyFile(
           alias,
           (doc.pull_option as any).private_key,
         );
-        const config = this.generateSingleSshConfig(alias, host, proxy);
+        this.generateSingleSshConfig(alias, host, proxy);
-        result.push(config);
       }
     }
-    this.generateSshConfig(result);
   }
 }

back/services/subscription.ts

@@ -19,9 +19,10 @@ import {
   fileExist,
   createFile,
   killTask,
+  handleLogPath,
 } from '../config/util';
 import { promises, existsSync } from 'fs';
-import { Op } from 'sequelize';
+import { FindOptions, Op } from 'sequelize';
 import path from 'path';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import { SimpleIntervalSchedule } from 'toad-scheduler';
@@ -121,18 +122,6 @@ export default class SubscriptionService {
     });
   }
 
-  private async handleLogPath(
-    logPath: string,
-    data: string = '',
-  ): Promise<string> {
-    const absolutePath = path.resolve(config.logPath, logPath);
-    const logFileExist = await fileExist(absolutePath);
-    if (!logFileExist) {
-      await createFile(absolutePath, data);
-    }
-    return absolutePath;
-  }
-
   private taskCallbacks(doc: Subscription): TaskCallbacks {
     return {
       onBefore: async (startTime) => {
@@ -145,7 +134,7 @@ export default class SubscriptionService {
           },
           { where: { id: doc.id } },
         );
-        const absolutePath = await this.handleLogPath(
+        const absolutePath = await handleLogPath(
           logPath as string,
           `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`,
         );
@@ -175,7 +164,7 @@ export default class SubscriptionService {
       },
       onEnd: async (cp, endTime, diff) => {
         const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);
 
         // 执行 sub_after
         let afterStr = '';
@@ -212,12 +201,12 @@ export default class SubscriptionService {
       },
       onError: async (message: string) => {
         const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);
         fs.appendFileSync(absolutePath, `\n${message}`);
       },
       onLog: async (message: string) => {
         const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        const absolutePath = await handleLogPath(sub.log_path as string);
         fs.appendFileSync(absolutePath, `\n${message}`);
       },
     };
@@ -236,7 +225,8 @@ export default class SubscriptionService {
   }
 
   public async update(payload: Subscription): Promise<Subscription> {
-    const tab = new Subscription(payload);
+    const doc = await this.getDb({ id: payload.id });
+    const tab = new Subscription({ ...doc, ...payload });
     const newDoc = await this.updateDb(tab);
     await this.handleTask(newDoc, !newDoc.is_disabled);
     await this.setSshConfig();
@@ -288,7 +278,9 @@ export default class SubscriptionService {
     await this.setSshConfig();
   }
 
-  public async getDb(query: any): Promise<Subscription> {
+  public async getDb(
+    query: FindOptions<Subscription>['where'],
+  ): Promise<Subscription> {
     const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Subscription);
   }
@@ -314,7 +306,7 @@ export default class SubscriptionService {
           this.logger.silly(error);
         }
       }
-      const absolutePath = await this.handleLogPath(doc.log_path as string);
+      const absolutePath = await handleLogPath(doc.log_path as string);
 
       fs.appendFileSync(
         `${absolutePath}`,
@@ -368,7 +360,7 @@ export default class SubscriptionService {
       return '';
     }
 
-    const absolutePath = await this.handleLogPath(doc.log_path as string);
+    const absolutePath = await handleLogPath(doc.log_path as string);
     return getFileContentByName(absolutePath);
   }
 

back/services/system.ts

@@ -5,11 +5,17 @@ import * as fs from 'fs';
 import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
-import ScheduleService from './schedule';
+import ScheduleService, { TaskCallbacks } from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import got from 'got';
-import { parseContentVersion, parseVersion } from '../config/util';
+import {
+  getPid,
+  killTask,
+  parseContentVersion,
+  parseVersion,
+} from '../config/util';
+import { TASK_COMMAND } from '../config/const';
 
 @Service()
 export default class SystemService {
@@ -170,4 +176,39 @@ export default class SystemService {
       return { code: 400, message: '通知发送失败，请检查系统设置/通知配置' };
     }
   }
+
+  public async run(
+    { command, logPath }: { command: string; logPath: string },
+    callback: TaskCallbacks,
+  ) {
+    if (!command.startsWith(TASK_COMMAND)) {
+      command = `${TASK_COMMAND} ${command}`;
+    }
+    this.scheduleService.runTask(
+      `real_log_path=${logPath} real_time=true ${command}`,
+      callback,
+    );
+  }
+
+  public async stop({ command, pid }: { command: string; pid: number }) {
+    if (!pid && !command) {
+      return { code: 400, message: '参数错误' };
+    }
+
+    if (pid) {
+      await killTask(pid);
+      return { code: 200 };
+    }
+
+    if (!command.startsWith(TASK_COMMAND)) {
+      command = `${TASK_COMMAND} ${command}`;
+    }
+    const _pid = await getPid(command);
+    if (_pid) {
+      await killTask(_pid);
+      return { code: 200 };
+    } else {
+      return { code: 400, message: '任务未找到' };
+    }
+  }
 }

back/services/user.ts

@@ -1,6 +1,11 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import { createRandomString, getNetIp, getPlatform } from '../config/util';
+import {
+  createRandomString,
+  fileExist,
+  getNetIp,
+  getPlatform,
+} from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
 import jwt from 'jsonwebtoken';
@@ -205,17 +210,16 @@ export default class UserService {
   }
 
   private initAuthInfo() {
-    const newPassword = createRandomString(16, 22);
     fs.writeFileSync(
       config.authConfigFile,
       JSON.stringify({
         username: 'admin',
-        password: newPassword,
+        password: 'admin',
       }),
     );
     return {
       code: 100,
-      message: '已初始化密码，请前往auth.json查看并重新登录',
+      message: '未找到认证文件，重新初始化',
     };
   }
 
@@ -240,13 +244,18 @@ export default class UserService {
     return { code: 200, data: avatar, message: '更新成功' };
   }
 
-  public getUserInfo(): Promise<any> {
+  public async getUserInfo(): Promise<any> {
-    return new Promise((resolve) => {
+    const authFileExist = await fileExist(config.authConfigFile);
-      fs.readFile(config.authConfigFile, 'utf8', (err, data) => {
+    if (!authFileExist) {
-        if (err) console.log(err);
+      fs.writeFileSync(
-        resolve(JSON.parse(data));
+        config.authConfigFile,
-      });
+        JSON.stringify({
-    });
+          username: 'admin',
+          password: 'admin',
+        }),
+      );
+    }
+    return this.getAuthInfo();
   }
 
   public initTwoFactor() {

docker/Dockerfile

@@ -1,11 +1,11 @@
 FROM python:3.10-alpine as builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
-    && apk update \
+  && apk update \
-    && apk add nodejs npm git \
+  && apk add nodejs npm git \
-    && npm i -g pnpm \
+  && npm i -g pnpm@8.3.1 \
-    && cd /tmp/build \
+  && cd /tmp/build \
-    && pnpm install --prod
+  && pnpm --registry https://registry.npmmirror.com install --prod
 
 FROM python:3.10-alpine
 
@@ -15,59 +15,64 @@ ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
 
 ENV PNPM_HOME=/root/.local/share/pnpm \
-    PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
-    NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
+  NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
-    LANG=zh_CN.UTF-8 \
+  LANG=C.UTF-8 \
-    SHELL=/bin/bash \
+  SHELL=/bin/bash \
-    PS1="\u@\h:\w \$ " \
+  PS1="\u@\h:\w \$ " \
-    QL_DIR=/ql \
+  QL_DIR=/ql \
-    QL_BRANCH=${QL_BRANCH}
+  QL_BRANCH=${QL_BRANCH}
 
 RUN set -x \
-    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
+  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
-    && apk update -f \
+  && apk update -f \
-    && apk upgrade \
+  && apk upgrade \
-    && apk --no-cache add -f bash \
+  && apk --no-cache add -f bash \
-                             coreutils \
+  coreutils \
-                             moreutils \
+  git \
-                             git \
+  curl \
-                             curl \
+  wget \
-                             wget \
+  tzdata \
-                             tzdata \
+  perl \
-                             perl \
+  openssl \
-                             openssl \
+  nginx \
-                             nginx \
+  nodejs \
-                             nodejs \
+  jq \
-                             jq \
+  openssh \
-                             openssh \
+  procps \
-                             npm \
+  netcat-openbsd \
-    && rm -rf /var/cache/apk/* \
+  npm \
-    && apk update \
+  && rm -rf /var/cache/apk/* \
-    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+  && apk update \
-    && echo "Asia/Shanghai" > /etc/timezone \
+  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && git config --global user.email "qinglong@@users.noreply.github.com" \
+  && echo "Asia/Shanghai" > /etc/timezone \
-    && git config --global user.name "qinglong" \
+  && git config --global user.email "qinglong@@users.noreply.github.com" \
-    && git config --global http.postBuffer 524288000 \
+  && git config --global user.name "qinglong" \
-    && npm install -g pnpm \
+  && git config --global http.postBuffer 524288000 \
-    && pnpm add -g pm2 tsx \
+  && npm install -g pnpm@8.3.1 \
-    && rm -rf /root/.pnpm-store \
+  && cd && pnpm config set registry https://registry.npmmirror.com \
-    && rm -rf /root/.local/share/pnpm/store \
+  && pnpm add -g pm2 tsx \
-    && rm -rf /root/.cache \
+  && rm -rf /root/.pnpm-store \
-    && rm -rf /root/.npm
+  && rm -rf /root/.local/share/pnpm/store \
+  && rm -rf /root/.cache \
+  && rm -rf /root/.npm
 
 ARG SOURCE_COMMIT
-RUN git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
+RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
-    && cd ${QL_DIR} \
+  && cd ${QL_DIR} \
-    && cp -f .env.example .env \
+  && cp -f .env.example .env \
-    && chmod 777 ${QL_DIR}/shell/*.sh \
+  && chmod 777 ${QL_DIR}/shell/*.sh \
-    && chmod 777 ${QL_DIR}/docker/*.sh \
+  && chmod 777 ${QL_DIR}/docker/*.sh \
-    && git clone -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
+  && git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
-    && mkdir -p ${QL_DIR}/static \
+  && mkdir -p ${QL_DIR}/static \
-    && cp -rf /static/* ${QL_DIR}/static \
+  && cp -rf /static/* ${QL_DIR}/static \
-    && rm -rf /static
+  && rm -rf /static
 
 COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 
 WORKDIR ${QL_DIR}
 
+HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
+  CMD curl -sf http://127.0.0.1:5400/api/health || exit 1
+
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]

docker/docker-compose.yml

@@ -1,9 +1,15 @@
 version: '2'
 services:
   web:
+    # alpine 基础镜像版本
     image: whyour/qinglong:latest
+    # debian-slim 基础镜像版本
+    # image: whyour/qinglong:debian  
     volumes:
       - ./data:/ql/data
     ports:
       - "0.0.0.0:5700:5700"
+    environment:
+      # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+      QlBaseUrl: '/'
     restart: unless-stopped

docker/docker-entrypoint.sh

@@ -10,13 +10,21 @@ echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
 init_nginx
+fix_config
 
 pm2 l &>/dev/null
 
-patch_version &>/dev/null
-echo
-
 echo -e "======================2. 安装依赖========================\n"
+patch_version
+if [[ $PipMirror ]]; then
+  pip3 config set global.index-url $PipMirror
+fi
+current_npm_registry=$(cd && pnpm config get registry)
+is_equal_registry=$(echo $current_npm_registry | grep "${NpmMirror}")
+if [[ "$is_equal_registry" == "" ]]; then
+  cd && pnpm config set registry $NpmMirror
+  pnpm install -g
+fi
 update_depend
 echo
 
@@ -24,36 +32,23 @@ echo -e "======================3. 启动nginx========================\n"
 nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
-echo -e "======================4. 启动面板监控========================\n"
+echo -e "======================4. 启动pm2服务========================\n"
-pm2 delete public &>/dev/null
+reload_pm2
-pm2 start $dir_static/build/public.js -n public --source-map-support --time
-echo -e "监控服务启动成功...\n"
-
-echo -e "======================5. 启动控制面板========================\n"
-pm2 delete panel &>/dev/null
-pm2 start $dir_static/build/app.js -n panel --source-map-support --time
-echo -e "控制面板启动成功...\n"
-
-echo -e "======================6. 启动定时任务========================\n"
-pm2 delete schedule &>/dev/null
-pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time
-echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
-  echo -e "======================7. 启动bot========================\n"
+  echo -e "======================5. 启动bot========================\n"
   nohup ql -l bot >$dir_log/bot.log 2>&1 &
   echo -e "bot后台启动中...\n"
 fi
 
 if [[ $EnableExtraShell == true ]]; then
-  echo -e "======================8. 执行自定义脚本========================\n"
+  echo -e "====================6. 执行自定义脚本========================\n"
   nohup ql -l extra >$dir_log/extra.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi
 
 echo -e "############################################################\n"
 echo -e "容器启动成功..."
-echo -e "\n请先访问5700端口，登录成功面板之后再执行添加定时任务..."
 echo -e "############################################################\n"
 
 crond -f >/dev/null

docker/front.conf

@@ -14,31 +14,33 @@ map $http_upgrade $connection_upgrade {
 server {
   listen 5700;
   IPV6_CONFIG
-  root /ql/static/dist;
   ssl_session_timeout 5m;
 
-  location QL_BASE_URL/api/public/ {
+  location QL_BASE_URLapi/public/ {
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_pass http://publicApi/api/public/;
+    proxy_pass http://publicApi/api/;
+    proxy_buffering off;
   }
 
-  location QL_BASE_URL/api/ {
+  location QL_BASE_URLapi/ {
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_pass http://baseApi/api/;
+    proxy_buffering off;
 
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
   }
 
-  location QL_BASE_URL/open/ {
+  location QL_BASE_URLopen/ {
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_pass http://baseApi/open/;
+    proxy_buffering off;
   }
 
   gzip on;
@@ -49,10 +51,12 @@ server {
   gzip_comp_level 6;
   gzip_buffers 16 8k;
   gzip_http_version 1.0;
+  QL_ROOT_CONFIG
 
-  location QL_BASE_URL/ {
+  location QL_BASE_URL_LOCATION {
+    QL_ALIAS_CONFIG
     index index.html index.htm;
-    try_files $uri $uri/ QL_BASE_URL/index.html;
+    try_files $uri QL_BASE_URLindex.html;
   }
 
   location ~ .*\.(html)$ {

ecosystem.config.js

@@ -0,0 +1,34 @@
+module.exports = {
+  apps: [
+    {
+      name: 'schedule',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      source_map_support: true,
+      time: true,
+      script: 'static/build/schedule/index.js',
+    },
+    {
+      name: 'public',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      source_map_support: true,
+      time: true,
+      script: 'static/build/public.js',
+    },
+    {
+      name: 'panel',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      source_map_support: true,
+      time: true,
+      script: 'static/build/app.js',
+    },
+  ],
+};

package.json

@@ -5,12 +5,13 @@
     "start:front": "max dev",
     "start:back": "nodemon",
     "start:public": "ts-node --transpile-only ./back/public.ts",
-    "start:schedule": "ts-node --transpile-only ./back/schedule.ts",
+    "start:rpc": "ts-node --transpile-only ./back/schedule/index.ts",
     "build:front": "max build",
     "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.js",
-    "schedule": "npm run build:back && node static/build/schedule.js",
+    "schedule": "npm run build:back && node static/build/schedule/index.js",
     "public": "npm run build:back && node static/build/public.js",
+    "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "postinstall": "max setup 2>/dev/null || true",
     "test": "umi-test",
@@ -54,6 +55,7 @@
     }
   },
   "dependencies": {
+    "@grpc/grpc-js": "^1.8.13",
     "@otplib/preset-default": "^12.0.1",
     "@sentry/node": "^7.12.1",
     "@sentry/tracing": "^7.12.1",
@@ -70,6 +72,7 @@
     "form-data": "^4.0.0",
     "got": "^11.8.2",
     "hpagent": "^0.1.2",
+    "http-proxy-middleware": "^2.0.6",
     "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^8.5.1",
@@ -78,12 +81,13 @@
     "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
+    "protobufjs": "^7.2.3",
     "pstree.remy": "^1.1.8",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.25.5",
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
-    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.2",
+    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
@@ -142,6 +146,7 @@
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.6.0",
+    "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
     "tsx": "^3.12.3",
     "typescript": "4.8.4",

sample/config.sample.sh

@@ -1,9 +1,3 @@
-## Version: v2.8.0
-## Date: 2021-06-20
-## Update Content: 可持续发展纲要\n1. session管理破坏性修改\n2. 配置管理可编辑config下文件\n3. 自定义脚本改为查看脚本\n4. 移除互助相关
-
-## 上面版本号中，如果第2位数字有变化，那么代表增加了新的参数，如果只有第3位数字有变化，仅代表更新了注释，没有增加新的参数，可更新可不更新
-
 ## 在运行 ql repo 命令时，是否自动删除失效的脚本与定时任务
 AutoDelCron="true"
 
@@ -24,11 +18,8 @@ CpuWarn=80
 MemoryWarn=80
 DiskWarn=90
 
-## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
+## 设置定时任务执行的超时时间，例如1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-CommandTimeoutTime="1h"
+CommandTimeoutTime=""
-
-## 设置批量执行任务时的并发数，默认同时执行5个任务
-MaxConcurrentNum="5"
 
 ## 在运行 task 命令时，随机延迟启动任务的最大延迟时间
 ## 默认给javascript任务加随机延迟，如 RandomDelay="300" ，表示任务将在 1-300 秒内随机延迟一个秒数，然后再运行，取消延迟赋值为空

sample/package.json

@@ -3,13 +3,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "crypto-js": "^4.0.0",
-    "download": "^8.0.0",
     "got": "^11.5.1",
-    "http-server": "^0.12.3",
     "nodemailer": "^6.8.0",
-    "qrcode-terminal": "^0.12.0",
-    "request": "^2.88.2",
     "tough-cookie": "^4.0.0",
     "tunnel": "0.0.6",
     "ws": "^7.4.3"

shell/api.sh

@@ -2,7 +2,7 @@
 
 create_token() {
   local token_command="tsx ${dir_root}/back/token.ts"
-  local token_file="${dir_root}static/build/token.js"
+  local token_file="${dir_root}/static/build/token.js"
   if [[ -f $token_file ]]; then
     token_command="node ${token_file}"
   fi
@@ -178,7 +178,7 @@ update_cron() {
   code=$(echo "$api" | jq -r .code)
   message=$(echo "$api" | jq -r .message)
   if [[ $code != 200 ]]; then
-    echo -e "\n## 更新任务状态失败(${message})\n" >>$dir_log/$log_path
+    echo -e "\n## 更新任务状态失败(${message})\n"
   fi
 }
 

shell/bot.sh

@@ -42,6 +42,6 @@ echo -e "\npython3依赖安装成功...\n"
 echo -e "4、启动bot程序...\n"
 make_dir $dir_log/bot
 cd $dir_data
-ps -ef | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
+ps -eo pid,command | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
 nohup python3 -m jbot >$dir_log/bot/nohup.log 2>&1 &
 echo -e "bot启动成功...\n"

shell/check.sh

@@ -33,12 +33,12 @@ pm2_log() {
   echo -e "---> pm2日志"
   local panelOut="/root/.pm2/logs/panel-out.log"
   local panelError="/root/.pm2/logs/panel-error.log"
-  tail -n 100 "$panelOut"
+  tail -n 300 "$panelOut"
-  tail -n 100 "$panelError"
+  tail -n 300 "$panelError"
 }
 
 check_nginx() {
-  local nginxPid=$(ps -ef | grep nginx | grep -v grep)
+  local nginxPid=$(ps -eo pid,command | grep nginx | grep -v grep)
   echo -e "=====> 检测nginx服务\n$nginxPid"
   if [[ $nginxPid ]]; then
     echo -e "\n=====> nginx服务正常\n"
@@ -54,9 +54,6 @@ check_ql() {
   echo -e "\n=====> 检测面板\n\n$api\n"
   if [[ $api =~ "<div id=\"root\"></div>" ]]; then
     echo -e "=====> 面板服务启动正常\n"
-  else
-    echo -e "=====> 面板服务异常，重置基础环境\n"
-    reset_env
   fi
 }
 
@@ -74,23 +71,26 @@ check_pm2() {
   echo -e "\n=====> 检测后台\n\n$api\n"
   if [[ $api =~ "{\"code\"" ]]; then
     echo -e "=====> 后台服务启动正常\n"
-  else
-    echo -e "=====> 后台服务异常，重置基础环境并重启后台\n"
-    reset_env
   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
+  npm i -g pnpm@8.3.1
   patch_version
-  start_public
+
+  apk add procps netcat-openbsd
+
+  if [[ $PipMirror ]]; then
+    pip3 config set global.index-url $PipMirror
+  fi
+  if [[ $NpmMirror ]]; then
+    cd && pnpm config set registry $NpmMirror
+    pnpm install -g
+  fi
+
+  pnpm add -g pm2 tsx
+  reset_env
   copy_dep
   check_ql
   check_nginx

shell/otask.sh

@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
 
-trap "single_hanle" 2 20 15 14
-single_hanle() {
-  handle_task_after "$@"
-  exit 1
-}
-
 random_delay() {
   local random_delay_max=$RandomDelay
   if [[ $random_delay_max ]] && [[ $random_delay_max -gt 0 ]]; then
@@ -30,7 +24,7 @@ random_delay() {
     done
 
     local delay_second=$(($(gen_random_num "$random_delay_max") + 1))
-    echo -e "\n命令未添加 \"now\"，随机延迟 $delay_second 秒后执行\n"
+    echo -e "任务随机延迟 $delay_second 秒，配置文件参数 RandomDelay 置空可取消延迟 \n"
     sleep $delay_second
   fi
 }
@@ -92,42 +86,10 @@ check_server() {
   fi
 }
 
-handle_task_before() {
-  begin_time=$(format_time "$time_format" "$time")
-  begin_timestamp=$(format_timestamp "$time_format" "$time")
-
-  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
-
-  echo -e "## 开始执行... $begin_time\n"
-
-  [[ $is_macos -eq 0 ]] && check_server
-
-  if [[ -s $task_error_log_path ]]; then
-    eval cat $task_error_log_path $cmd
-    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
-    eval echo $cmd
-  fi
-
-  . $file_task_before "$@"
-}
-
-handle_task_after() {
-  . $file_task_after "$@"
-
-  local etime=$(date "+$time_format")
-  local end_time=$(format_time "$time_format" "$etime")
-  local end_timestamp=$(format_timestamp "$time_format" "$etime")
-  local diff_time=$(($end_timestamp - $begin_timestamp))
-
-  echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
-
-  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
-}
-
 ## 正常运行单个脚本，$1：传入参数
 run_normal() {
   local file_param=$1
-  if [[ $# -eq 1 ]]; then
+  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]]; then
     random_delay "$file_param"
   fi
 
@@ -231,7 +193,7 @@ run_else() {
   local relative_path="${file_param%/*}"
   if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
     cd ${relative_path}
-    file_param=${file_param/$relative_path\//}
+    file_param=${file_param/$relative_path\//.\/}
   fi
 
   shift

shell/share.sh

@@ -18,6 +18,7 @@ dir_update_log=$dir_log/update
 ql_static_repo=$dir_repo/static
 
 ## 文件
+file_ecosystem_js=$dir_root/ecosystem.config.js
 file_config_sample=$dir_sample/config.sample.sh
 file_env=$dir_config/env.sh
 file_sharecode=$dir_config/sharecode.sh
@@ -34,7 +35,6 @@ file_notify_js_sample=$dir_sample/notify.js
 file_notify_py_sample=$dir_sample/notify.py
 file_notify_py=$dir_scripts/notify.py
 file_notify_js=$dir_scripts/sendNotify.js
-task_error_log_path=$dir_log/task_error.log
 nginx_app_conf=$dir_root/docker/front.conf
 nginx_conf=$dir_root/docker/nginx.conf
 dep_notify_py=$dir_dep/notify.py
@@ -67,8 +67,8 @@ import_config() {
   [[ -f $file_config_user ]] && . $file_config_user
   [[ -f $file_env ]] && . $file_env
 
-  ql_base_url=${QlBaseUrl:-""}
+  ql_base_url=${QlBaseUrl:-"/"}
-  command_timeout_time=${CommandTimeoutTime:-"1h"}
+  command_timeout_time=${CommandTimeoutTime:-""}
   proxy_url=${ProxyUrl:-""}
   file_extensions=${RepoFileExtensions:-"js py"}
   current_branch=${QL_BRANCH}
@@ -98,6 +98,9 @@ set_proxy() {
 unset_proxy() {
   unset http_proxy
   unset https_proxy
+  unset ftp_proxy
+  unset all_proxy
+  unset no_proxy
 }
 
 make_dir() {
@@ -262,28 +265,13 @@ npm_install_sub() {
   fi
 }
 
-npm_install_1() {
-  local dir_current=$(pwd)
-  local dir_work=$1
-
-  cd $dir_work
-  echo -e "运行 npm install...\n"
-  npm_install_sub
-  [[ $? -ne 0 ]] && echo -e "\nnpm install 运行不成功，请进入 $dir_work 目录后手动运行 npm install...\n"
-  cd $dir_current
-}
-
 npm_install_2() {
   local dir_current=$(pwd)
   local dir_work=$1
 
   cd $dir_work
-  echo -e "检测到 $dir_work 的依赖包有变化，运行 npm install...\n"
+  echo -e "安装 $dir_work 依赖包...\n"
   npm_install_sub
-  if [[ $? -ne 0 ]]; then
-    echo -e "\n安装 $dir_work 的依赖包运行不成功，再次尝试一遍...\n"
-    npm_install_1 $dir_work
-  fi
   cd $dir_current
 }
 
@@ -315,8 +303,12 @@ git_clone_scripts() {
   echo -e "开始克隆仓库 $url 到 $dir\n"
 
   set_proxy "$proxy"
-  git clone $part_cmd $url $dir
+
+  git clone --depth=1 $part_cmd $url $dir
   exit_status=$?
+
+  reset_branch "$branch" "$dir"
+
   unset_proxy
 }
 
@@ -327,13 +319,25 @@ git_pull_scripts() {
   local proxy="$3"
   cd $dir_work
   echo -e "开始更新仓库：$dir_work"
-
   set_proxy "$proxy"
-  git fetch --all
-  git pull 1>/dev/null
-  exit_status=$?
-  unset_proxy
 
+  if [[ ! $branch ]]; then
+    branch=$(cd $dir_work && git remote show origin | grep 'HEAD branch' | cut -d' ' -f5)
+  fi
+
+  local pre_commit_id=$(git rev-parse --short HEAD)
+  reset_branch "$branch" "$dir_work"
+
+  git fetch --depth 1 origin $branch
+  exit_status=$?
+
+  reset_branch "$branch" "$dir_work"
+  local cur_commit_id=$(git rev-parse --short HEAD)
+  if [[ $cur_commit_id != $pre_commit_id ]]; then
+    exit_status=0
+  fi
+
+  unset_proxy
   cd $dir_current
 }
 
@@ -351,19 +355,16 @@ reset_romote_url() {
     git init
     git remote add origin $url &>/dev/null
   fi
-  reset_branch "$branch"
+
   cd $dir_current
 }
 
 reset_branch() {
   local branch="$1"
-  local part_cmd="HEAD"
+  local part_cmd="origin/${branch}"
-  if [[ $branch ]]; then
+  git remote set-branches origin $branch
-    part_cmd="origin/${branch}"
-    git checkout -B "$branch" &>/dev/null
-    git branch --set-upstream-to=$part_cmd $branch &>/dev/null
-  fi
   git reset --hard $part_cmd &>/dev/null
+  git checkout -b $branch $part_cmd &>/dev/null
 }
 
 random_range() {
@@ -373,15 +374,11 @@ random_range() {
 }
 
 reload_pm2() {
-  pm2 l &>/dev/null
+  cd $dir_root
-
+  # 代理会影响 grpc 服务
-  echo -e "启动面板服务\n"
+  unset_proxy
-  pm2 delete panel --source-map-support --time &>/dev/null
+  pm2 flush &>/dev/null
-  pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
+  pm2 startOrGracefulReload $file_ecosystem_js
-
-  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
 }
 
 diff_time() {
@@ -431,18 +428,9 @@ format_timestamp() {
 }
 
 patch_version() {
-  # 兼容pnpm@7
+  git config --global pull.rebase false
-  pnpm setup &>/dev/null
-  source ~/.bashrc
 
-  if [[ $PipMirror ]]; then
+  cp -f $dir_root/.env.example $dir_root/.env
-    pip3 config set global.index-url $PipMirror
-  fi
-  if [[ $NpmMirror ]]; then
-    pnpm config set registry $NpmMirror
-  fi
-
-  pnpm install -g &>/dev/null
 
   if [[ -f "$dir_root/db/cookie.db" ]]; then
     echo -e "检测到旧的db文件，拷贝为新db...\n"
@@ -451,12 +439,6 @@ patch_version() {
     echo
   fi
 
-  pnpm add -g pm2 tsx
-
-  git config --global pull.rebase false
-
-  cp -f $dir_root/.env.example $dir_root/.env
-
   if [[ -d "$dir_root/db" ]]; then
     echo -e "检测到旧的db目录，拷贝到data目录...\n"
     cp -rf $dir_root/config $dir_root/data
@@ -485,7 +467,19 @@ patch_version() {
 init_nginx() {
   cp -fv $nginx_conf /etc/nginx/nginx.conf
   cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_BASE_URL,${qlBaseUrl},g" /etc/nginx/conf.d/front.conf
+  local location_url="/"
+  local aliasStr=""
+  local rootStr=""
+  if [[ $ql_base_url != "/" ]]; then
+    location_url="^~${ql_base_url%*/}"
+    aliasStr="alias ${dir_static}/dist;"
+  else
+    rootStr="root ${dir_static}/dist;"
+  fi
+  sed -i "s,QL_ALIAS_CONFIG,${aliasStr},g" /etc/nginx/conf.d/front.conf
+  sed -i "s,QL_ROOT_CONFIG,${rootStr},g" /etc/nginx/conf.d/front.conf
+  sed -i "s,QL_BASE_URL_LOCATION,${location_url},g" /etc/nginx/conf.d/front.conf
+  sed -i "s,QL_BASE_URL,${ql_base_url},g" /etc/nginx/conf.d/front.conf
 
   ipv6=$(ip a | grep inet6)
   ipv6Str=""
@@ -495,10 +489,34 @@ init_nginx() {
   sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf
 }
 
+handle_task_before() {
+  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
+
+  echo -e "## 开始执行... $begin_time\n"
+
+  [[ $is_macos -eq 0 ]] && check_server
+
+  . $file_task_before "$@"
+}
+
+handle_task_after() {
+  . $file_task_after "$@"
+
+  local etime=$(date "+$time_format")
+  local end_time=$(format_time "$time_format" "$etime")
+  local end_timestamp=$(format_timestamp "$time_format" "$etime")
+  local diff_time=$(($end_timestamp - $begin_timestamp))
+
+  [[ "$diff_time" == 0 ]] && diff_time=1
+
+  echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
+
+  [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+}
+
 init_env
 detect_termux
 detect_macos
 define_cmd
-fix_config
 
-import_config $1 2>$task_error_log_path
+import_config $1

shell/task.sh

@@ -5,6 +5,12 @@ dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
+trap "single_hanle" 2 3 20 15 14
+single_hanle() {
+  eval handle_task_after "$@" "$cmd"
+  exit 1
+}
+
 ## 选择python3还是node
 define_program() {
   local file_param=$1
@@ -28,14 +34,22 @@ define_program() {
 handle_log_path() {
   local file_param=$1
 
-  if [[ -z $file_param ]];then
+  if [[ -z $file_param ]]; then
     file_param="task"
   fi
 
+  if [[ -z $ID ]]; then
+    ID=$(cat $list_crontab_user | grep -E "$cmd_task.* $file_param" | perl -pe "s|.*ID=(.*) $cmd_task.* $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
+  fi
   local suffix=""
   if [[ ! -z $ID ]]; then
-    suffix="_${ID}"
+    if [[ "$ID" -gt 0 ]] 2>/dev/null; then
+      suffix="_${ID}"
+    else
+      ID=""
+    fi
   fi
+
   time=$(date "+$mtime_format")
   log_time=$(format_log_time "$mtime_format" "$time")
   log_dir_tmp="${file_param##*/}"
@@ -51,11 +65,19 @@ handle_log_path() {
   [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
   log_dir="${log_dir_tmp%.*}${suffix}"
   log_path="$log_dir/$log_time.log"
+
+  if [[ $real_log_path ]]; then
+    log_path="$real_log_path"
+  fi
+  
   cmd=">> $dir_log/$log_path 2>&1"
+  make_dir "$dir_log/$log_dir"
   if [[ "$show_log" == "true" ]]; then
+    cmd="2>&1 | tee -a $dir_log/$log_path"
+  fi
+
+  if [[ "$real_time" == "true" ]]; then
     cmd=""
-  else
-    make_dir "$dir_log/$log_dir"
   fi
 }
 
@@ -67,12 +89,19 @@ format_params() {
     mtime_format="%Y-%m-%d %H:%M:%S.%3N"
   fi
   timeoutCmd=""
-  if type timeout &>/dev/null; then
+  if [[ $command_timeout_time ]]; then
-    timeoutCmd="timeout --foreground -s 14 -k 10s $command_timeout_time "
+    if type timeout &>/dev/null; then
+      timeoutCmd="timeout --foreground -s 2 -k 10s $command_timeout_time "
+    fi
   fi
   # params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
 }
 
+init_begin_time() {
+  begin_time=$(format_time "$time_format" "$time")
+  begin_timestamp=$(format_timestamp "$time_format" "$time")
+}
+
 while getopts ":lm:" opt; do
   case $opt in
   l)
@@ -92,8 +121,9 @@ fi
 format_params "$@"
 define_program "$@"
 handle_log_path "$@"
+init_begin_time
 
 eval . $dir_shell/otask.sh "$cmd"
-[[ -f "$dir_log/$log_path" ]] && cat "$dir_log/$log_path"
+[[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
 
 exit 0

shell/update.sh

@@ -46,7 +46,7 @@ del_cron() {
   local ids=""
   echo -e "开始尝试自动删除失效的定时任务...\n"
   for cron in $(cat $list_drop); do
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $cron" | perl -pe "s|.*ID=(.*) $cmd_task $cron\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
+    local id=$(cat $list_crontab_user | grep -E "$cmd_task.* $cron" | perl -pe "s|.*ID=(.*) $cmd_task.* $cron\.*|\1|" | head -1 | awk -F " " '{print $1}')
     if [[ $ids ]]; then
       ids="$ids,\"$id\""
     else
@@ -243,10 +243,9 @@ update_qinglong() {
   echo -e "使用 ${mirror} 源更新...\n"
   export isFirstStartServer=false
 
-  local all_branch=$(cd ${dir_root} && git branch -a)
   local primary_branch="master"
-  if [[ "${all_branch}" =~ "${current_branch}" ]]; then
+  if [[ "${QL_BRANCH}" == "develop" ]]; then
-    primary_branch="${current_branch}"
+    primary_branch="develop"
   fi
   [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
   reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
@@ -254,7 +253,6 @@ update_qinglong() {
 
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新青龙源文件成功...\n"
-    reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
     cp -f $file_config_sample $dir_config/config.sample.sh
     update_depend
 
@@ -280,7 +278,6 @@ update_qinglong_static() {
   fi
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新青龙静态资源成功...\n"
-    reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
 
     rm -rf $dir_static/*
     cp -rf $ql_static_repo/* $dir_static
@@ -459,12 +456,6 @@ main() {
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
   fi
 
-  if [[ -s $task_error_log_path ]]; then
-    eval cat $task_error_log_path $cmd
-    eval echo -e "加载 config.sh 出错，请手动检查" $cmd
-    eval echo $cmd
-  fi
-
   if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
     eval echo -e "请移除 -l 参数" $cmd
     exit 1
@@ -472,6 +463,7 @@ main() {
 
   case $p1 in
   update)
+    fix_config
     eval update_qinglong "$2" $cmd
     ;;
   extra)

src/app.ts

@@ -0,0 +1,16 @@
+const baseUrl = window.__ENV__QlBaseUrl || '/';
+
+export function modifyClientRenderOpts(memo: any) {
+  return {
+    ...memo,
+    publicPath: baseUrl,
+    basename: baseUrl,
+  };
+}
+
+export function modifyContextOpts(memo: any) {
+  return {
+    ...memo,
+    basename: baseUrl,
+  };
+}

src/layouts/index.less

@@ -26,8 +26,8 @@ body {
 }
 
 .ant-modal-body {
-  max-height: calc(80vh - 110px);
+  max-height: calc(90vh - 110px);
-  max-height: calc(80vh - var(--vh-offset, 110px));
+  max-height: calc(90vh - var(--vh-offset, 110px));
   overflow-y: auto;
 }
 
@@ -327,24 +327,19 @@ select:-webkit-autofill:focus {
 .side-menu-user-drop-menu {
   position: relative;
   text-align: left;
-  outline: none;
+  padding: 2px 10px;
-  padding: 4px 0;
-  border: 1px solid fade(@component-background, 0.12);
-  border-radius: 4px;
-  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
   overflow: auto;
-  background-color: @component-background;
-}
-
-[data-dark='true'] .side-menu-user-drop-menu {
-  background-color: #373739;
 }
 
 .ant-pro-sider-logo {
-  padding: 16px 8px !important;
+  .title {
-
+    height: 32px;
-  h1 {
+    margin: 0 5px;
-    margin-left: 5px !important;
+    font-weight: 600;
+    font-size: 16px;
+    line-height: 32px;
+    vertical-align: middle;
+    animation: pro-layout-title-hide 0.3s;
   }
 
   img {

src/layouts/index.tsx

@@ -98,8 +98,7 @@ export default function () {
       })
       .catch((error) => {
         console.log(error);
-      })
+      });
-      .finally(() => setInitLoading(false));
   };
 
   const getUser = (needLoading = true) => {
@@ -120,6 +119,22 @@ export default function () {
       });
   };
 
+  const getHealthStatus = () => {
+    request
+      .get(`${config.apiPrefix}public/health`)
+      .then((res) => {
+        if (res?.data?.status === 1) {
+          getSystemInfo();
+        } else {
+          history.push('/error');
+        }
+      })
+      .catch((error) => {
+        history.push('/error');
+      })
+      .finally(() => setInitLoading(false));
+  };
+
   const reloadUser = (needLoading = false) => {
     getUser(needLoading);
   };
@@ -131,10 +146,8 @@ export default function () {
   }, [location.pathname]);
 
   useEffect(() => {
-    if (!systemInfo) {
+    getHealthStatus();
-      getSystemInfo();
+  }, []);
-    }
-  }, [systemInfo]);
 
   useEffect(() => {
     if (theme === 'vs-dark') {
@@ -267,11 +280,10 @@ export default function () {
       selectedKeys={[location.pathname]}
       loading={loading}
       ErrorBoundary={Sentry.ErrorBoundary}
-      logo={<Image preview={false} src="https://qn.whyour.cn/logo.png" />}
+      logo={
-      // @ts-ignore
-      title={
         <>
-          <span style={{ fontSize: 16 }}>控制面板</span>
+          <Image preview={false} src="https://qn.whyour.cn/logo.png" />
+          <span className="title">青龙</span>
           <a
             href={systemInfo?.changeLogLink}
             target="_blank"
@@ -300,6 +312,7 @@ export default function () {
           </a>
         </>
       }
+      title={false}
       menuItemRender={(menuItemProps: any, defaultDom: any) => {
         if (
           menuItemProps.isUrl ||
@@ -313,7 +326,7 @@ export default function () {
       pageTitleRender={(props, pageName, info) => {
         const title =
           (config.documentTitleMap as any)[location.pathname] || '未找到';
-        return `${title} - 控制面板`;
+        return `${title} - 青龙`;
       }}
       onCollapse={setCollapsed}
       collapsed={collapsed}

src/pages/crontab/index.less

@@ -6,8 +6,9 @@
   .card-wrapper {
     .ant-card:last-child {
       .ant-card-body {
-        height: calc(80vh - 367px);
+        min-height: 300px;
-        height: calc(80vh - var(--vh-offset, 0px) - 367px);
+        height: calc(90vh - 367px);
+        height: calc(90vh - var(--vh-offset, 0px) - 367px);
         overflow-y: auto;
       }
     }
@@ -193,8 +194,10 @@ tr.drop-over-upward td {
   }
 }
 
-.crontab-wrapper {
+body[data-mode='desktop'] {
-  tbody .ant-table-cell {
+  .crontab-wrapper {
-    height: 69px !important;
+    tbody .ant-table-cell {
+      height: 69px !important;
+    }
   }
 }

src/pages/crontab/index.tsx

@@ -279,13 +279,6 @@ const Crontab = () => {
           value: 3,
         },
       ],
-      onFilter: (value, record) => {
-        if (record.isDisabled && record.status !== 0) {
-          return value === 2;
-        } else {
-          return record.status === value;
-        }
-      },
       render: (text, record) => (
         <>
           {(!record.isDisabled || record.status !== CrontabStatus.idle) && (
@@ -321,7 +314,7 @@ const Crontab = () => {
     {
       title: '操作',
       key: 'action',
-      width: 100,
+      width: 130,
       render: (text, record, index) => {
         const isPc = !isPhone;
         return (
@@ -672,7 +665,6 @@ const Crontab = () => {
     index: number;
   }> = ({ record, index }) => (
     <Dropdown
-      arrow={{ pointAtCenter: true }}
       placement="bottomRight"
       trigger={['click']}
       menu={{
@@ -1051,7 +1043,7 @@ const Crontab = () => {
           rowSelection={rowSelection}
           rowClassName={getRowClassName}
           onChange={onPageChange}
-          components={isPhone ? undefined : vt}
+          // components={isPhone ? undefined : vt}
         />
       </div>
       <CronLogModal

src/pages/crontab/viewCreateModal.tsx

@@ -253,9 +253,9 @@ const ViewCreateModal = ({
                         name={[name, 'value']}
                         rules={[{ required: true, message: '请输入内容' }]}
                       >
-                        {EOperation[filtersValue[name]['operation']] ===
+                        {EOperation[filtersValue?.[name]['operation']] ===
                         'select' ? (
-                          statusElement(filtersValue[name]['property'])
+                          statusElement(filtersValue?.[name]['property'])
                         ) : (
                           <Input placeholder="请输入内容" />
                         )}

src/pages/dependence/index.tsx

@@ -19,6 +19,8 @@ import {
   DeleteFilled,
   BugOutlined,
   FileTextOutlined,
+  CloseCircleOutlined,
+  ClockCircleOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -42,6 +44,7 @@ enum Status {
   '删除中',
   '已删除',
   '删除失败',
+  '队列中',
 }
 
 enum StatusColor {
@@ -50,6 +53,37 @@ enum StatusColor {
   'error',
 }
 
+const StatusMap: Record<number, { icon: React.ReactNode; color: string }> = {
+  0: {
+    icon: <SyncOutlined spin />,
+    color: 'processing',
+  },
+  1: {
+    icon: <CheckCircleOutlined />,
+    color: 'success',
+  },
+  2: {
+    icon: <CloseCircleOutlined />,
+    color: 'error',
+  },
+  3: {
+    icon: <SyncOutlined spin />,
+    color: 'processing',
+  },
+  4: {
+    icon: <CheckCircleOutlined />,
+    color: 'success',
+  },
+  5: {
+    icon: <CloseCircleOutlined />,
+    color: 'error',
+  },
+  6: {
+    icon: <ClockCircleOutlined />,
+    color: 'default',
+  },
+};
+
 const Dependence = () => {
   const { headerStyle, isPhone, socketMessage } =
     useOutletContext<SharedContext>();
@@ -74,7 +108,8 @@ const Dependence = () => {
         return (
           <Space size="middle" style={{ cursor: 'text' }}>
             <Tag
-              color={StatusColor[record.status % 3]}
+              color={StatusMap[record.status].color}
+              icon={StatusMap[record.status].icon}
               style={{ marginRight: 0 }}
             >
               {Status[record.status]}
@@ -211,7 +246,7 @@ const Dependence = () => {
           })
           .then(({ code, data }) => {
             if (code === 200 && force) {
-              const i = value.findIndex((x) => x.id === data.data[0].id);
+              const i = value.findIndex((x) => x.id === data[0].id);
               if (i !== -1) {
                 const result = [...value];
                 result.splice(i, 1);
@@ -366,6 +401,23 @@ const Dependence = () => {
   useEffect(() => {
     if (!socketMessage) return;
     const { type, message, references } = socketMessage;
+    if (
+      type === 'installDependence' &&
+      message.includes('开始时间') &&
+      references.length > 0
+    ) {
+      const result = [...value];
+      for (let i = 0; i < references.length; i++) {
+        const index = value.findIndex((x) => x.id === references[i]);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...value[index],
+            status: message.includes('安装') ? Status.安装中 : Status.删除中,
+          });
+        }
+      }
+      setValue(result);
+    }
     if (
       type === 'installDependence' &&
       message.includes('结束时间') &&

src/pages/env/index.tsx

@@ -394,7 +394,7 @@ const Env = () => {
           if (code === 200) {
             const newData = [...value];
             newData.splice(dragIndex, 1);
-            newData.splice(hoverIndex, 0, { ...dragRow, ...data.data });
+            newData.splice(hoverIndex, 0, { ...dragRow, ...data });
             setValue([...newData]);
           }
         });

src/pages/error/index.less

@@ -9,4 +9,46 @@
     height: calc(100vh - 80px);
     overflow-y: auto;
   }
+
+  .code-box {
+    position: relative;
+    display: inline-block;
+    width: 80vw;
+    height: 90vh;
+    margin: 16px;
+    background-color: #ffffff;
+    border: 1px solid rgba(5, 5, 5, 0.06);
+    border-radius: 6px;
+    -webkit-transition: all 0.2s;
+    transition: all 0.2s;
+    border-radius: 6px 6px 0 0;
+    color: rgba(0, 0, 0, 0.88);
+    border-bottom: 1px solid rgba(5, 5, 5, 0.06);
+
+    .browser-markup {
+      position: relative;
+      border-top: 2em solid rgba(230, 230, 230, 0.7);
+      border-radius: 3px 3px 0 0;
+
+      &::before {
+        position: absolute;
+        top: -1.25em;
+        left: 1em;
+        display: block;
+        width: 0.5em;
+        height: 0.5em;
+        background-color: #f44;
+        border-radius: 50%;
+        box-shadow: 0 0 0 2px #f44, 1.5em 0 0 2px #9b3, 3em 0 0 2px #fb5;
+        content: '';
+      }
+    }
+
+    .log {
+      height: calc(90vh - 150px);
+      overflow-y: auto;
+      padding: 12px;
+      white-space: pre-line;
+    }
+  }
 }

src/pages/error/index.tsx

@@ -1,43 +1,34 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import config from '@/utils/config';
 import { request } from '@/utils/http';
-import Terminal, { ColorMode, LineType } from '../../components/terminal';
 import { PageLoading } from '@ant-design/pro-layout';
 import { history, useOutletContext } from '@umijs/max';
-import Ansi from 'ansi-to-react';
 import './index.less';
 import { SharedContext } from '@/layouts';
+import { Alert, Typography } from 'antd';
 
 const Error = () => {
   const { user, theme, reloadUser } = useOutletContext<SharedContext>();
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState('暂无日志');
-
+  const retryTimes = useRef(1);
-  const getTimes = () => {
-    return parseInt(localStorage.getItem('error_retry_times') || '0', 10);
-  };
-
-  let times = getTimes();
 
   const getLog = (needLoading: boolean = true) => {
     needLoading && setLoading(true);
     request
-      .get(`${config.apiPrefix}public/panel/log`)
+      .get(`${config.apiPrefix}public/health`)
-      .then(({ code, data }) => {
+      .then(({ error, data }) => {
-        if (code === 200) {
+        if (data?.status === 1) {
-          setData(data);
+          return;
-          if (!data) {
-            times = getTimes();
-            if (times > 5) {
-              return;
-            }
-            localStorage.setItem('error_retry_times', `${times + 1}`);
-            setTimeout(() => {
-              reloadUser();
-              getLog(false);
-            }, 3000);
-          }
         }
+        if (retryTimes.current > 3) {
+          setData(error?.details);
+          return;
+        }
+        retryTimes.current += 1;
+        setTimeout(() => {
+          getLog(false);
+        }, 3000);
       })
       .finally(() => needLoading && setLoading(false));
   };
@@ -56,24 +47,39 @@ const Error = () => {
     <div className="error-wrapper">
       {loading ? (
         <PageLoading />
-      ) : data ? (
+      ) : retryTimes.current > 3 ? (
-        <Terminal
+        <div className="code-box">
-          name="服务错误"
+          <div className="browser-markup"></div>
-          colorMode={theme === 'vs-dark' ? ColorMode.Dark : ColorMode.Light}
+          <Alert
-          lineData={[
+            type="error"
-            { type: LineType.Input, value: 'pm2 logs panel' },
+            message={
-            {
+              <Typography.Title level={5} type="danger">
-              type: LineType.Output,
+                服务启动超时
-              value: (
+              </Typography.Title>
-                <pre>
+            }
-                  <Ansi>{data}</Ansi>
+            description={
-                </pre>
+              <Typography.Text type="danger">
-              ),
+                <div>请先按如下方式修复：</div>
-            },
+                <div>
-          ]}
+                  1. 宿主机执行 docker run --rm -v
-        />
+                  /var/run/docker.sock:/var/run/docker.sock
-      ) : times > 5 ? (
+                  containrrr/watchtower -cR &lt;容器名&gt;
-        <>服务启动超时，请手动进入容器执行 ql -l check 后刷新再试</>
+                </div>
+                <div>2. 容器内执行 ql -l check、ql -l update</div>
+                <div>
+                  3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果
+                  <Typography.Link href="https://github.com/whyour/qinglong/issues/new?assignees=&labels=&template=bug_report.yml">
+                    提交 issue
+                  </Typography.Link>
+                </div>
+              </Typography.Text>
+            }
+            banner
+          />
+          <Typography.Paragraph code className="log">
+            {data}
+          </Typography.Paragraph>
+        </div>
       ) : (
         <PageLoading tip="启动中，请稍后..." />
       )}

src/pages/initialization/index.tsx

@@ -78,9 +78,14 @@ const Initialization = () => {
     {
       title: '欢迎使用',
       content: (
-        <div className={styles.top} style={{ marginTop: 100 }}>
+        <div className={styles.top} style={{ marginTop: 30 }}>
           <div className={styles.header}>
-            <span className={styles.title}>欢迎使用青龙控制面板</span>
+            <span className={styles.title}>欢迎使用青龙</span>
+            <span className={styles.desc}>
+              支持python3、javaScript、shell、typescript 的定时任务管理面板（A
+              timed task management panel that supports typescript, javaScript,
+              python3, and shell.）
+            </span>
           </div>
           <div className={styles.action}>
             <Button
@@ -214,7 +219,7 @@ const Initialization = () => {
             <Button
               type="primary"
               onClick={() => {
-                history.push('/login');
+                window.location.reload();
               }}
             >
               去登录

src/pages/setting/notification.tsx

@@ -12,6 +12,7 @@ const NotificationSetting = ({ data }: any) => {
   const [form] = Form.useForm();
 
   const handleOk = (values: any) => {
+    setLoading(true);
     const { type } = values;
     if (type == 'closed') {
       values.type = '';
@@ -30,7 +31,8 @@ const NotificationSetting = ({ data }: any) => {
       })
       .catch((error: any) => {
         console.log(error);
-      });
+      })
+      .finally(() => setLoading(false));
   };
 
   const notificationModeChange = (value: string) => {
@@ -56,7 +58,7 @@ const NotificationSetting = ({ data }: any) => {
           style={{ maxWidth: 400 }}
           initialValue={notificationMode}
         >
-          <Select onChange={notificationModeChange}>
+          <Select onChange={notificationModeChange} disabled={loading}>
             {config.notificationModes.map((x) => (
               <Option key={x.value} value={x.value}>
                 {x.label}
@@ -74,7 +76,10 @@ const NotificationSetting = ({ data }: any) => {
             style={{ maxWidth: 400 }}
           >
             {x.items ? (
-              <Select placeholder={x.placeholder || `请选择${x.label}`}>
+              <Select
+                placeholder={x.placeholder || `请选择${x.label}`}
+                disabled={loading}
+              >
                 {x.items.map((y) => (
                   <Option key={y.value} value={y.value}>
                     {y.label || y.value}
@@ -83,14 +88,15 @@ const NotificationSetting = ({ data }: any) => {
               </Select>
             ) : (
               <Input.TextArea
+                disabled={loading}
                 autoSize={true}
                 placeholder={x.placeholder || `请输入${x.label}`}
               />
             )}
           </Form.Item>
         ))}
-        <Button type="primary" htmlType="submit">
+        <Button type="primary" htmlType="submit" disabled={loading}>
-          保存
+          {loading ? '测试中...' : '保存'}
         </Button>
       </Form>
     </div>

src/pages/subscription/index.tsx

@@ -416,7 +416,6 @@ const Subscription = () => {
     index: number;
   }> = ({ record, index }) => (
     <Dropdown
-      arrow={{ pointAtCenter: true }}
       placement="bottomRight"
       trigger={['click']}
       menu={{

src/utils/config.ts

@@ -1,6 +1,8 @@
+const baseUrl = window.__ENV__QlBaseUrl || '/';
+
 export default {
-  siteName: '青龙控制面板',
+  siteName: '青龙',
-  apiPrefix: '/api/',
+  apiPrefix: `${baseUrl}api/`,
   authKey: 'token',
 
   /* Layout configuration, specify which layout to use for route. */
@@ -91,7 +93,7 @@ export default {
     { value: 'aibotk', label: '智能微秘书' },
     { value: 'iGot', label: 'IGot' },
     { value: 'pushPlus', label: 'PushPlus' },
-    { value: 'chat', label: '群辉chat' },
+    { value: 'chat', label: '群晖chat' },
     { value: 'email', label: '邮箱' },
     { value: 'lark', label: '飞书机器人' },
     { value: 'webhook', label: '自定义通知' },

src/utils/hooks.ts

@@ -4,7 +4,7 @@ import browserType from './index';
 export const useCtx = () => {
   const [width, setWidth] = useState('100%');
   const [marginLeft, setMarginLeft] = useState(0);
-  const [marginTop, setMarginTop] = useState(-72);
+  const [marginTop, setMarginTop] = useState(-48);
   const [isPhone, setIsPhone] = useState(false);
   const { platform } = useMemo(() => browserType(), []);
 
@@ -14,11 +14,13 @@ export const useCtx = () => {
       setMarginLeft(0);
       setMarginTop(0);
       setIsPhone(true);
+      document.body.setAttribute('data-mode', 'phone');
     } else {
       setWidth('100%');
       setMarginLeft(0);
-      setMarginTop(-72);
+      setMarginTop(-48);
       setIsPhone(false);
+      document.body.setAttribute('data-mode', 'desktop');
     }
   }, []);
 

src/utils/http.ts

@@ -4,7 +4,7 @@ import config from './config';
 import { history } from '@umijs/max';
 
 message.config({
-  duration: 1.5,
+  duration: 2,
 });
 
 const time = Date.now();
@@ -23,7 +23,10 @@ const errorHandler = function (error: any) {
         history.push('/login');
       }
     } else {
-      message.error(msg);
+      message.error({
+        content: msg,
+        style: { maxWidth: 500, margin: '0 auto' },
+      });
     }
   } else {
     console.log(error.message);
@@ -66,7 +69,11 @@ _request.interceptors.response.use(async (response) => {
     const res = await response.clone().json();
     if (res.code !== 200) {
       const msg = res.message || res.data;
-      msg && message.error(msg);
+      msg &&
+        message.error({
+          content: msg,
+          style: { maxWidth: 500, margin: '0 auto' },
+        });
     }
     return res;
   }

typings.d.ts

@@ -10,3 +10,7 @@ declare module '*.svg' {
 }
 
 declare module 'pstree.remy';
+
+interface Window {
+  __ENV__QlBaseUrl: string;
+}

version.yaml

@@ -1,9 +1,6 @@
-version: 2.15.11
+version: 2.15.15
-changeLogLink: https://t.me/jiao_long/366
+changeLogLink: https://t.me/jiao_long/376
 changeLog: |
-  1. 优化手机端操作，更丝滑
+  1. 支持非跟目录部署，启动时增加参数 -e QlBaseUrl="/test/"，参数前后需要斜杠
-  2. 修复 python Server酱 推送
+  2. 修复 task 执行可执行文件路径，感谢 https://github.com/jzksnsjswkw
-  3. 修改初始化依赖安装逻辑
+  3. 其他 bug 修复
-  4. 修复删除视图筛选条件
-  5. 修改定时任务和环境变量列表滚动
-  6. 其他优化