测试

.github/workflows/build_docker_image.yml

@@ -2,16 +2,8 @@ name: Build And Push Docker Image
 
 on:
   push:
-    paths-ignore:
-      - "*.md"
     branches:
-      - "master"
+      - "npm-debug"
-      - "develop"
-      - "test-overlay"
-    tags:
-      - "v*"
-  schedule:
-    - cron: "00 20 * * *"
   workflow_dispatch:
 
 jobs:
@@ -164,73 +156,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=whyour/qinglong:cache
-          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
 
       - name: Image digest
         run: |
           echo ${{ steps.docker_build.outputs.digest }}
-  
+  
-  build310:
-    if: ${{ github.ref_name == 'master' }}
-    needs: build-static
-
-    runs-on: ubuntu-20.04
-
-    permissions:
-      packages: write
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v3
-        with:
-          version: "8.3.1"
-      - uses: actions/setup-node@v4
-        with:
-          cache: "pnpm"
-
-      - name: Setup timezone
-        uses: szenius/set-timezone@v1.2
-        with:
-          timezoneLinux: Asia/Shanghai
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push python3.10
-        id: docker_build_310
-        uses: docker/build-push-action@v5
-        with:
-          build-args: |
-            MAINTAINER=${{ github.repository_owner }}
-            QL_BRANCH=${{ github.ref_name }}
-            SOURCE_COMMIT=${{ github.sha }}
-          network: host
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
-          context: .
-          file: ./docker/310.Dockerfile
-          push: true
-          tags: whyour/qinglong:python3.10
-          cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
-          cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
-
-      - name: Image digest
-        run: |
-          echo ${{ steps.docker_build_310.outputs.digest }}

.gitignore

@@ -22,7 +22,4 @@
 .env
 .history
 .version.ts
-/.tmp
+/.tmp
-__pycache__
-/shell/preload/env.*
-/shell/preload/notify.*

.prettierignore

@@ -2,6 +2,7 @@
 **/*.svg
 **/*.ejs
 **/*.html
+package.json
 .umi
 .umi-production
 .umi-test

README-en.md

@@ -48,83 +48,12 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-The npm version supports `debian/ubuntu/alpine` systems and requires `node/npm/python3/pip3/pnpm` to be installed.
+The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
 
 ```bash
 npm i @whyour/qinglong
 ```
 
-## Deployment
-
-### Docker (Recommended)
-
-```bash
-# curl -sSL get.docker.com | sh
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
-  -p 5700:5700 \
-  # Deployment paths are not required, e.g. /test.
-  -e QlBaseUrl="/" \
-  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### Docker-compose (Recommended)
-
-```bash
-# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# start
-docker-compose up -d
-# stop
-docker-compose down
-```
-
-### Podman (Recommended)
-
-```bash
-# https://podman.io/getting-started/installation
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
-  -p 5700:5700 \
-  # Deployment paths are not required, e.g. /test.
-  -e QlBaseUrl="/" \
-  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
-```
-
-### Npm
-
-It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3/pnpm yourself
-
-```bash
-# Debian/Ubuntu
-curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-```
-
-```bash
-npm install -g node-pre-gyp pnpm@8.3.1
-npm install -g @whyour/qinglong
-qinglong
-# Add the environment variables QL_DIR and QL_DATA_DIR when prompted
-export QL_DIR=""
-export QL_DATA_DIR=""
-# Run again
-qinglong
-```
-
 ## Built-in commands
 
 - task
@@ -181,16 +110,89 @@ ql resettfa
 | days | File path for task execution |
 | file_path | The name of the environment variable that needs to be concurrent or specified at the time of task execution |
 
+## Deployment
+
+### Docker (Recommended)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
+  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### Docker-compose (Recommended)
+
+```bash
+# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# start
+docker-compose up -d
+# stop
+docker-compose down
+```
+
+### Podman (Recommended)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
+  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### Local
+
+It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3 yourself
+
+```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+# Centos
+curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
+npm install -g @whyour/qinglong
+qinglong
+# Add the environment variables QL_DIR and QL_DATA_DIR when prompted
+export QL_DIR=""
+export QL_DATA_DIR=""
+# Run again
+qinglong
+```
+
 ## Development
 
 ```bash
-git clone https://github.com/whyour/qinglong.git
+$ git clone https://github.com/whyour/qinglong.git
-cd qinglong
+$ cd qinglong
-cp .env.example .env
+$ cp .env.example .env
 # Recommended use pnpm https://pnpm.io/zh/installation
-npm install -g pnpm@8.3.1
+$ npm install -g pnpm@8.3.1
-pnpm install
+$ pnpm install
-pnpm start
+$ pnpm start
 ```
 
 Open your browser and visit <http://127.0.0.1:5700>

README.md

@@ -50,83 +50,12 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-npm 版本支持 `debian/ubuntu/alpine` 系统，需要自行安装 `node/npm/python3/pip3/pnpm`
+npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
 
 ```bash
 npm i @whyour/qinglong
 ```
 
-## 部署
-
-### docker (推荐)
-
-```bash
-# curl -sSL get.docker.com | sh
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
-  -p 5700:5700 \
-  # 部署路径非必须，比如 /test
-  -e QlBaseUrl="/" \
-  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### docker-compose (推荐)
-
-```bash
-#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# 启动
-docker-compose up -d
-# 停止
-docker-compose down
-```
-
-### podman (推荐)
-
-```bash
-# https://podman.io/getting-started/installation
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
-  -p 5700:5700 \
-  # 部署路径非必须，比如 /test
-  -e QlBaseUrl="/" \
-  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
-```
-
-### npm
-
-建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3/pnpm
-
-```bash
-# Debian/Ubuntu
-curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-```
-
-```bash
-npm install -g node-pre-gyp pnpm@8.3.1
-npm install -g @whyour/qinglong
-qinglong
-# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
-export QL_DIR=""
-export QL_DATA_DIR=""
-# 再次执行
-qinglong
-```
-
 ## 内置命令
 
 - task
@@ -181,16 +110,89 @@ ql resettfa
 | days       | 需要保留的日志的天数                                                                        |
 | file_path  | 任务执行时的文件路径                                                                        |
 
+## 部署
+
+### docker (推荐)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### docker-compose (推荐)
+
+```bash
+#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# 启动
+docker-compose up -d
+# 停止
+docker-compose down
+```
+
+### podman (推荐)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### 本机
+
+建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3
+
+```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+# Centos
+curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
+npm install -g @whyour/qinglong
+qinglong
+# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
+export QL_DIR=""
+export QL_DATA_DIR=""
+# 再次执行
+qinglong
+```
+
 ## 开发
 
 ```bash
-git clone https://github.com/whyour/qinglong.git
+$ git clone https://github.com/whyour/qinglong.git
-cd qinglong
+$ cd qinglong
-cp .env.example .env
+$ cp .env.example .env
 # 推荐使用 pnpm https://pnpm.io/zh/installation
-npm install -g pnpm@8.3.1
+$ npm install -g pnpm@8.3.1
-pnpm install
+$ pnpm install
-pnpm start
+$ pnpm start
 ```
 
 打开你的浏览器，访问 <http://127.0.0.1:5700>

back/api/env.ts

@@ -51,9 +51,6 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
-        if (!req.body?.length) {
-          return res.send({ code: 400, message: '参数不正确' });
-        }
         const data = await envService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
@@ -220,7 +217,7 @@ export default (app: Router) => {
         } else {
           return res.send({
             code: 400,
-            message: '每条数据 name 或者 value 字段不能为空，参考导出文件格式',
+            message: '文件缺少name或者value字段，参考导出文件格式',
           });
         }
       } catch (e) {

back/api/script.ts

@@ -136,7 +136,7 @@ export default (app: Router) => {
         }
 
         if (req.file) {
-          await fs.rename(req.file.path, join(path, filename));
+          await fs.rename(req.file.path, join(path, req.file.filename));
           return res.send({ code: 200 });
         }
 

back/app.ts

@@ -15,7 +15,7 @@ async function startServer() {
   await require('./loaders/app').default({ expressApp: app });
 
   const server = app
-    .listen(config.port, '0.0.0.0', () => {
+    .listen(config.port, () => {
       Logger.debug(`✌️ 后端服务启动成功！`);
       console.debug(`✌️ 后端服务启动成功！`);
       process.send?.('ready');

back/config/index.ts

@@ -19,14 +19,8 @@ const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
 
-let dataPath = path.join(rootPath, 'data/');
+const dataPath = path.join(rootPath, 'data/');
-
-if (process.env.QL_DATA_DIR) {
-  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
-}
-
 const shellPath = path.join(rootPath, 'shell/');
-const preloadPath = path.join(shellPath, 'preload/');
 const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');
@@ -38,11 +32,7 @@ const uploadPath = path.join(dataPath, 'upload/');
 const sshdPath = path.join(dataPath, 'ssh.d/');
 const systemLogPath = path.join(dataPath, 'syslog/');
 
-const envFile = path.join(preloadPath, 'env.sh');
+const envFile = path.join(configPath, 'env.sh');
-const jsEnvFile = path.join(preloadPath, 'env.js');
-const pyEnvFile = path.join(preloadPath, 'env.py');
-const jsNotifyFile = path.join(preloadPath, 'notify.js');
-const pyNotifyFile = path.join(preloadPath, 'notify.py');
 const confFile = path.join(configPath, 'config.sh');
 const crontabFile = path.join(configPath, 'crontab.list');
 const authConfigFile = path.join(configPath, 'auth.json');
@@ -92,10 +82,6 @@ export default {
   sampleFile,
   confFile,
   envFile,
-  jsEnvFile,
-  pyEnvFile,
-  jsNotifyFile,
-  pyNotifyFile,
   dbPath,
   uploadPath,
   configPath,
@@ -108,8 +94,6 @@ export default {
     'crontab.list',
     'dependence-proxy.sh',
     'env.sh',
-    'env.js',
-    'env.py',
     'token.json',
   ],
   writePathList: [configPath, scriptPath],

back/config/subscription.ts

@@ -32,9 +32,7 @@ export function formatCommand(doc: Subscription, url?: string) {
     autoDelCron,
   } = doc;
   if (type === 'file') {
-    command += `raw "${_url}" "${proxy || ''}" "${
+    command += `raw "${_url}"`;
-      isNil(autoAddCron) ? true : Boolean(autoAddCron)
-    }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
   } else {
     command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
       dependences || ''

back/config/util.ts

@@ -30,7 +30,7 @@ export async function getLastModifyFilePath(dir: string) {
 
     arr.forEach(async (item) => {
       const fullpath = path.join(dir, item);
-      const stats = await fs.lstat(fullpath);
+      const stats = await fs.stat(fullpath);
       if (stats.isFile()) {
         if (stats.mtimeMs >= 0) {
           filePath = fullpath;
@@ -257,7 +257,7 @@ export async function readDirs(
 
   for (const file of files) {
     const subPath = path.join(dir, file);
-    const stats = await fs.lstat(subPath);
+    const stats = await fs.stat(subPath);
     const key = path.join(relativePath, file);
 
     if (blacklist.includes(file) || stats.isSymbolicLink()) {
@@ -300,7 +300,7 @@ export async function readDir(
     .filter((x) => !blacklist.includes(x))
     .map(async (file: string) => {
       const subPath = path.join(dir, file);
-      const stats = await fs.lstat(subPath);
+      const stats = await fs.stat(subPath);
       const key = path.join(relativePath, file);
       return {
         title: file,
@@ -360,10 +360,7 @@ export function parseHeaders(headers: string) {
   return parsed;
 }
 
-function parseString(
+function parseString(input: string): Record<string, string> {
-  input: string,
-  valueFormatFn?: (v: string) => string,
-): Record<string, string> {
   const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
   const matches: Record<string, string> = {};
 
@@ -375,10 +372,9 @@ function parseString(
       continue;
     }
 
-    let _value = value.trim();
+    const _value = value.trim();
 
     try {
-      _value = valueFormatFn ? valueFormatFn(_value) : _value;
       const jsonValue = JSON.parse(_value);
       matches[_key] = jsonValue;
     } catch (error) {
@@ -396,13 +392,12 @@ export function parseBody(
     | 'multipart/form-data'
     | 'application/x-www-form-urlencoded'
     | 'text/plain',
-  valueFormatFn?: (v: string) => string,
 ) {
   if (contentType === 'text/plain' || !body) {
-    return valueFormatFn && body ? valueFormatFn(body) : body;
+    return body;
   }
 
-  const parsed = parseString(body, valueFormatFn);
+  const parsed = parseString(body);
 
   switch (contentType) {
     case 'multipart/form-data':

back/data/notify.ts

@@ -14,7 +14,6 @@ export enum NotificationMode {
   'aibotk' = 'aibotk',
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
-  'wePlusBot' = 'wePlusBot',
   'email' = 'email',
   'pushMe' = 'pushMe',
   'feishu' = 'feishu',
@@ -59,7 +58,6 @@ export class BarkNotification extends NotificationBaseInfo {
   public barkGroup = 'qinglong';
   public barkLevel = 'active';
   public barkUrl = '';
-  public barkArchive=""
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -101,12 +99,6 @@ export class PushPlusNotification extends NotificationBaseInfo {
   public pushPlusUser = '';
 }
 
-export class WePlusBotNotification extends NotificationBaseInfo {
-  public wePlusBotToken = '';
-  public wePlusBotReceiver = '';
-  public wePlusBotVersion = '';
-}
-
 export class EmailNotification extends NotificationBaseInfo {
   public emailService: string = '';
   public emailUser: string = '';
@@ -115,7 +107,6 @@ export class EmailNotification extends NotificationBaseInfo {
 
 export class PushMeNotification extends NotificationBaseInfo {
   public pushMeKey: string = '';
-  public pushMeUrl: string = '';
 }
 
 export class ChronocatNotification extends NotificationBaseInfo {
@@ -153,10 +144,9 @@ export interface NotificationInfo
     AibotkNotification,
     IGotNotification,
     PushPlusNotification,
-    WePlusBotNotification,
     EmailNotification,
     PushMeNotification,
     WebhookNotification,
     ChronocatNotification,
     LarkNotification {}
-
+    

back/data/system.ts

@@ -2,13 +2,13 @@ import { sequelize } from '.';
 import { DataTypes, Model, ModelDefined } from 'sequelize';
 import { NotificationInfo } from './notify';
 
-export class SystemInfo {
+export class AuthInfo {
   ip?: string;
   type: AuthDataType;
   info?: SystemModelInfo;
   id?: number;
 
-  constructor(options: SystemInfo) {
+  constructor(options: AuthInfo) {
     this.ip = options.ip;
     this.info = options.info;
     this.type = options.type;
@@ -50,7 +50,7 @@ export type SystemModelInfo = SystemConfigInfo &
   Partial<NotificationInfo> &
   LoginLogInfo;
 
-export interface SystemInstance extends Model<SystemInfo, SystemInfo>, SystemInfo { }
+export interface SystemInstance extends Model<AuthInfo, AuthInfo>, AuthInfo { }
 export const SystemModel = sequelize.define<SystemInstance>('Auth', {
   ip: DataTypes.STRING,
   type: DataTypes.STRING,

back/loaders/app.ts

@@ -7,23 +7,28 @@ import linkDeps from './deps';
 import initTask from './initTask';
 
 export default async ({ expressApp }: { expressApp: Application }) => {
-  depInjectorLoader();
+  try {
-  Logger.info('✌️ Dependency loaded');
+    depInjectorLoader();
-  console.log('✌️ Dependency loaded');
+    Logger.info('✌️ Dependency Injector loaded');
-
+    console.log('✌️ Dependency Injector loaded');
-  await initData();
+  
-  Logger.info('✌️ Init data loaded');
+    expressLoader({ app: expressApp });
-  console.log('✌️ Init data loaded');
+    Logger.info('✌️ Express loaded');
-
+    console.log('✌️ Express loaded');
-  await linkDeps();
+  
-  Logger.info('✌️ Link deps loaded');
+    await initData();
-  console.log('✌️ Link deps loaded');
+    Logger.info('✌️ init data loaded');
-
+    console.log('✌️ init data loaded');
-  initTask();
+  
-  Logger.info('✌️ Init task loaded');
+    await linkDeps();
-  console.log('✌️ Init task loaded');
+    Logger.info('✌️ link deps loaded');
-
+    console.log('✌️ link deps loaded');
-  expressLoader({ app: expressApp });
+  
-  Logger.info('✌️ Express loaded');
+    initTask();
-  console.log('✌️ Express loaded');
+    Logger.info('✌️ init task loaded');
+    console.log('✌️ init task loaded');
+  } catch (error) {
+    Logger.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`);
+    console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`);
+  }
 };

back/loaders/deps.ts

@@ -23,21 +23,18 @@ async function linkCommand() {
     {
       src: 'update.sh',
       dest: 'ql',
-      tmp: 'ql_tmp',
     },
     {
       src: 'task.sh',
       dest: 'task',
-      tmp: 'task_tmp',
     },
   ];
 
   for (const link of linkShell) {
     const source = path.join(config.rootPath, 'shell', link.src);
     const target = path.join(commandDir, link.dest);
-    const tmpTarget = path.join(commandDir, link.tmp);
+    await rmPath(target);
-    await fs.symlink(source, tmpTarget);
+    await fs.symlink(source, target);
-    await fs.rename(tmpTarget, target);
   }
 }
 

back/loaders/initData.ts

@@ -18,10 +18,6 @@ export default async () => {
   const dependenceService = Container.get(DependenceService);
   const systemService = Container.get(SystemService);
 
-  // 初始化增加系统配置
-  await SystemModel.upsert({ type: AuthDataType.systemConfig });
-  await SystemModel.upsert({ type: AuthDataType.notification });
-
   const installDependencies = () => {
     // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
     DependenceModel.findAll({
@@ -125,7 +121,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/log/`)) {
           await CrontabModel.update(
             {
-              command: `${config.dataPath}/log/${doc.command.replace(
+              command: `${config.rootPath}/data/log/${doc.command.replace(
                 `${config.rootPath}/log/`,
                 '',
               )}`,
@@ -136,7 +132,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/config/`)) {
           await CrontabModel.update(
             {
-              command: `${config.dataPath}/config/${doc.command.replace(
+              command: `${config.rootPath}/data/config/${doc.command.replace(
                 `${config.rootPath}/config/`,
                 '',
               )}`,
@@ -147,7 +143,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/db/`)) {
           await CrontabModel.update(
             {
-              command: `${config.dataPath}/db/${doc.command.replace(
+              command: `${config.rootPath}/data/db/${doc.command.replace(
                 `${config.rootPath}/db/`,
                 '',
               )}`,
@@ -162,4 +158,7 @@ export default async () => {
   // 初始化保存一次ck和定时任务数据
   await cronService.autosave_crontab();
   await envService.set_envs();
+
+  // 初始化增加系统配置
+  await SystemModel.upsert({ type: AuthDataType.systemConfig });
 };

back/loaders/initFile.ts

@@ -5,13 +5,7 @@ import Logger from './logger';
 import { fileExist } from '../config/util';
 
 const rootPath = process.env.QL_DIR as string;
-let dataPath = path.join(rootPath, 'data/');
+const dataPath = path.join(rootPath, 'data/');
-
-if (process.env.QL_DATA_DIR) {
-  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
-}
-
-const preloadPath = path.join(rootPath, 'shell/preload/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');
@@ -28,11 +22,7 @@ const sampleNotifyJsFile = path.join(samplePath, 'notify.js');
 const sampleNotifyPyFile = path.join(samplePath, 'notify.py');
 const scriptNotifyJsFile = path.join(scriptPath, 'sendNotify.js');
 const scriptNotifyPyFile = path.join(scriptPath, 'notify.py');
-const jsNotifyFile = path.join(preloadPath, 'notify.js');
-const pyNotifyFile = path.join(preloadPath, 'notify.py');
 const TaskBeforeFile = path.join(configPath, 'task_before.sh');
-const TaskBeforeJsFile = path.join(configPath, 'task_before.js');
-const TaskBeforePyFile = path.join(configPath, 'task_before.py');
 const TaskAfterFile = path.join(configPath, 'task_after.sh');
 const homedir = os.homedir();
 const sshPath = path.resolve(homedir, '.ssh');
@@ -43,7 +33,6 @@ export default async () => {
   const authFileExist = await fileExist(authConfigFile);
   const confFileExist = await fileExist(confFile);
   const scriptDirExist = await fileExist(scriptPath);
-  const preloadDirExist = await fileExist(preloadPath);
   const logDirExist = await fileExist(logPath);
   const configDirExist = await fileExist(configPath);
   const uploadDirExist = await fileExist(uploadPath);
@@ -55,8 +44,6 @@ export default async () => {
   const scriptNotifyJsFileExist = await fileExist(scriptNotifyJsFile);
   const scriptNotifyPyFileExist = await fileExist(scriptNotifyPyFile);
   const TaskBeforeFileExist = await fileExist(TaskBeforeFile);
-  const TaskBeforeJsFileExist = await fileExist(TaskBeforeJsFile);
-  const TaskBeforePyFileExist = await fileExist(TaskBeforePyFile);
   const TaskAfterFileExist = await fileExist(TaskAfterFile);
 
   if (!configDirExist) {
@@ -67,10 +54,6 @@ export default async () => {
     await fs.mkdir(scriptPath);
   }
 
-  if (!preloadDirExist) {
-    await fs.mkdir(preloadPath);
-  }
-
   if (!logDirExist) {
     await fs.mkdir(logPath);
   }
@@ -108,9 +91,6 @@ export default async () => {
     await fs.writeFile(confFile, await fs.readFile(sampleConfigFile));
   }
 
-  await fs.writeFile(jsNotifyFile, await fs.readFile(sampleNotifyJsFile));
-  await fs.writeFile(pyNotifyFile, await fs.readFile(sampleNotifyPyFile));
-
   if (!scriptNotifyJsFileExist) {
     await fs.writeFile(
       scriptNotifyJsFile,
@@ -129,20 +109,6 @@ export default async () => {
     await fs.writeFile(TaskBeforeFile, await fs.readFile(sampleTaskShellFile));
   }
 
-  if (!TaskBeforeJsFileExist) {
-    await fs.writeFile(
-      TaskBeforeJsFile,
-      '// The JavaScript code that executes before the JavaScript task execution will execute.',
-    );
-  }
-
-  if (!TaskBeforePyFileExist) {
-    await fs.writeFile(
-      TaskBeforePyFile,
-      '# The Python code that executes before the Python task execution will execute.',
-    );
-  }
-
   if (!TaskAfterFileExist) {
     await fs.writeFile(TaskAfterFile, await fs.readFile(sampleTaskShellFile));
   }

back/loaders/initTask.ts

@@ -12,7 +12,7 @@ export default async () => {
   const subscriptionService = Container.get(SubscriptionService);
 
   // 生成内置token
-  let tokenCommand = `ts-node-transpile-only ${join(config.rootPath, 'back/token.ts')}`;
+  let tokenCommand = `tsx ${join(config.rootPath, 'back/token.ts')}`;
   const tokenFile = join(config.rootPath, 'static/build/token.js');
 
   if (await fileExist(tokenFile)) {

back/loaders/server.ts

@@ -5,6 +5,28 @@ import Sock from './sock';
 export default async ({ server }: { server: Server }) => {
   await Sock({ server });
   Logger.info('✌️ Sock loaded');
+  let exitTime = 0;
+  let timer: NodeJS.Timeout;
+
+  process.on('SIGINT', (singal) => {
+    Logger.warn(`Server need close, singal ${singal}`);
+    console.warn(`Server need close, singal ${singal}`);
+    exitTime++;
+    if (exitTime >= 3) {
+      Logger.warn('Forcing server close');
+      console.warn('Forcing server close');
+      clearTimeout(timer);
+      process.exit(1);
+    }
+    server.close(() => {
+      if (timer) {
+        clearTimeout(timer);
+      }
+      timer = setTimeout(() => {
+        process.exit();
+      }, 15000);
+    });
+  });
 
   process.on('uncaughtException', (error) => {
     Logger.error('Uncaught exception:', error);

back/loaders/update.ts

@@ -4,9 +4,9 @@ import cors from 'cors';
 import { Application, NextFunction, Request, Response } from 'express';
 import jwt from 'express-jwt';
 import Container from 'typedi';
+import { Logger } from 'winston';
 import config from '../config';
 import SystemService from '../services/system';
-import Logger from './logger';
 
 export default ({ app }: { app: Application }) => {
   app.set('trust proxy', 'loopback');
@@ -22,43 +22,30 @@ export default ({ app }: { app: Application }) => {
     }),
   );
 
-  app.put(
-    '/api/reload',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.reloadSystem();
-        res.send(result);
-      } catch (e) {
-        Logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
   app.put(
     '/api/system',
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const systemService = Container.get(SystemService);
         const result = await systemService.reloadSystem('system');
         res.send(result);
       } catch (e) {
-        Logger.error('🔥 error: %o', e);
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
   );
-
   app.put(
     '/api/data',
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const systemService = Container.get(SystemService);
         const result = await systemService.reloadSystem('data');
         res.send(result);
       } catch (e) {
-        Logger.error('🔥 error: %o', e);
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/public.ts

@@ -21,7 +21,7 @@ app.get('/api/health', (req, res) => {
 });
 
 app
-  .listen(config.publicPort, '0.0.0.0', async () => {
+  .listen(config.publicPort, async () => {
     await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/db').default();
 

back/services/cron.ts

@@ -114,13 +114,7 @@ export default class CronService {
     }
 
     for (const id of ids) {
-      let cron;
+      const cron = await this.getDb({ id });
-      try {
-        cron = await this.getDb({ id });
-      } catch (err) {}
-      if (!cron) {
-        continue;
-      }
       if (status === CrontabStatus.idle && log_path !== cron.log_path) {
         options = omit(options, ['status', 'log_path', 'pid']);
       }
@@ -381,10 +375,7 @@ export default class CronService {
 
   public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as Crontab);
-      throw new Error(`Cron ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -416,7 +407,7 @@ export default class CronService {
   }
 
   private async runSingle(cronId: number): Promise<number | void> {
-    return taskLimit.manualRunWithCronLimit(() => {
+    return taskLimit.runWithCronLimit(() => {
       return new Promise(async (resolve: any) => {
         const cron = await this.getDb({ id: cronId });
         const params = {
@@ -443,11 +434,9 @@ export default class CronService {
         }
         const logPath = `${uniqPath}/${logTime}.log`;
         const absolutePath = path.resolve(config.logPath, `${logPath}`);
+
         const cp = spawn(
-          `real_log_path=${logPath} no_delay=true ${this.makeCommand(
+          `real_log_path=${logPath} no_delay=true ${this.makeCommand(cron)}`,
-            cron,
-            true,
-          )}`,
           { shell: '/bin/bash' },
         );
 
@@ -455,14 +444,11 @@ export default class CronService {
           { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
           { where: { id } },
         );
-        cp.stdout.on('data', async (data) => {
-          await fs.appendFile(absolutePath, data.toString());
-        });
         cp.stderr.on('data', async (data) => {
-          await fs.appendFile(absolutePath, data.toString());
+          await fs.appendFile(`${absolutePath}`, `${data.toString()}`);
         });
         cp.on('error', async (err) => {
-          await fs.appendFile(absolutePath, JSON.stringify(err));
+          await fs.appendFile(`${absolutePath}`, `${JSON.stringify(err)}`);
         });
 
         cp.on('exit', async (code) => {
@@ -529,7 +515,7 @@ export default class CronService {
           files.map(async (x) => ({
             filename: x,
             directory: relativeDir.replace(config.logPath, ''),
-            time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
+            time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
           })),
         )
       ).sort((a, b) => b.time - a.time);
@@ -538,14 +524,12 @@ export default class CronService {
     }
   }
 
-  private makeCommand(tab: Crontab, realTime?: boolean) {
+  private makeCommand(tab: Crontab) {
     let command = tab.command.trim();
     if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
       command = `${TASK_PREFIX}${tab.command}`;
     }
-    let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${
+    let commandVariable = `no_tee=true ID=${tab.id} `;
-      tab.id
-    } `;
     if (tab.task_before) {
       commandVariable += `task_before='${tab.task_before
         .replace(/'/g, "'\\''")

back/services/cronView.ts

@@ -63,10 +63,7 @@ export default class CronViewService {
     query: FindOptions<CrontabView>['where'],
   ): Promise<CrontabView> {
     const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as CrontabView);
-      throw new Error(`CronView ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async disabled(ids: number[]) {

back/services/dependence.ts

@@ -183,10 +183,7 @@ export default class DependenceService {
     query: FindOptions<Dependence>['where'],
   ): Promise<Dependence> {
     const doc: any = await DependenceModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as Dependence);
-      throw new Error(`Dependency ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   private async updateLog(ids: number[], log: string): Promise<void> {

back/services/env.ts

@@ -165,10 +165,7 @@ export default class EnvService {
 
   public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
     const doc: any = await EnvModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as Env);
-      throw new Error(`Env ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async disabled(ids: string[]) {
@@ -196,8 +193,6 @@ export default class EnvService {
     });
     const groups = groupBy(envs, 'name');
     let env_string = '';
-    let js_env_string = '';
-    let py_env_string = 'import os\n';
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
         const group = groups[key];
@@ -210,23 +205,9 @@ export default class EnvService {
             .replace(/'/g, "'\\''")
             .trim();
           env_string += `export ${key}='${value}'\n`;
-          const _env_value = `${group
-            .map((x) => x.value)
-            .join('&')
-            .replace(/\\/g, '\\\\')}`;
-          js_env_string += `process.env.${key}=\`${_env_value.replace(
-            /\`/g,
-            '\\`',
-          )}\`;\n`;
-          py_env_string += `os.environ['${key}']='''${_env_value.replace(
-            /\'/g,
-            "\\'",
-          )}'''\n`;
         }
       }
     }
     await fs.writeFile(config.envFile, env_string);
-    await fs.writeFile(config.jsEnvFile, js_env_string);
-    await fs.writeFile(config.pyEnvFile, py_env_string);
   }
 }

back/services/notify.ts

@@ -27,7 +27,6 @@ export default class NotificationService {
     ['aibotk', this.aibotk],
     ['iGot', this.iGot],
     ['pushPlus', this.pushPlus],
-    ['wePlusBot', this.wePlusBot],
     ['email', this.email],
     ['pushMe', this.pushMe],
     ['webhook', this.webhook],
@@ -197,35 +196,22 @@ export default class NotificationService {
   }
 
   private async bark() {
-    let {
+    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
-      barkPush,
+      this.params;
-      barkIcon = '',
-      barkSound = '',
-      barkGroup = '',
-      barkLevel = '',
-      barkUrl = '',
-      barkArchive = '',
-    } = this.params;
     if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
-    const url = `${barkPush}`;
+    const url = `${barkPush}/${encodeURIComponent(
-    const body = {
+      this.title,
-      title: this.title,
+    )}/${encodeURIComponent(
-      body: this.content,
+      this.content,
-      icon: barkIcon,
+    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
-      sound: barkSound,
+
-      group: barkGroup,
-      isArchive: barkArchive,
-      level: barkLevel,
-      url: barkUrl,
-    };
     try {
       const res: any = await got
-        .post(url, {
+        .get(url, {
           ...this.gotOption,
-          json: body,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-          headers: { 'Content-Type': 'application/json' },
         })
         .json();
       if (res.code === 200) {
@@ -521,42 +507,6 @@ export default class NotificationService {
     }
   }
 
-  private async wePlusBot() {
-    const { wePlusBotToken, wePlusBotReceiver, wePlusBotVersion } = this.params;
-
-    let content = this.content;
-    let template = 'txt';
-    if (this.content.length > 800) {
-      template = 'html';
-      content = content.replace(/[\n\r]/g, '<br>');
-    }
-
-    const url = `https://www.weplusbot.com/send`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          json: {
-            token: `${wePlusBotToken}`,
-            title: `${this.title}`,
-            template: `${template}`,
-            content: `${content}`,
-            receiver: `${wePlusBotReceiver || ''}`,
-            version: `${wePlusBotVersion || 'pro'}`,
-          },
-        })
-        .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 lark() {
     let { larkKey } = this.params;
 
@@ -575,7 +525,7 @@ export default class NotificationService {
           headers: { 'Content-Type': 'application/json' },
         })
         .json();
-      if (res.StatusCode === 0 || res.code === 0) {
+      if (res.StatusCode === 0) {
         return true;
       } else {
         throw new Error(JSON.stringify(res));
@@ -617,17 +567,19 @@ export default class NotificationService {
   }
 
   private async pushMe() {
-    const { pushMeKey, pushMeUrl } = this.params;
+    const { pushMeKey } = this.params;
     try {
-      const res: any = await got.post(pushMeUrl || 'https://push.i-i.me/', {
+      const res: any = await got.post(
-        ...this.gotOption,
+        `https://push.i-i.me/?push_key=${pushMeKey}`,
-        json: {
+        {
-          push_key: pushMeKey,
+          ...this.gotOption,
-          title: this.title,
+          json: {
-          content: this.content,
+            title: this.title,
+            content: this.content,
+          },
+          headers: { 'Content-Type': 'application/json' },
         },
-        headers: { 'Content-Type': 'application/json' },
+      );
-      });
       if (res.body === 'success') {
         return true;
       } else {
@@ -704,14 +656,17 @@ export default class NotificationService {
       webhookContentType,
     } = this.params;
 
-    if (!webhookUrl.includes('$title') && !webhookBody.includes('$title')) {
+    const { formatBody, formatUrl } = this.formatNotifyContent(
+      webhookUrl,
+      webhookBody,
+    );
+
+    if (!formatUrl && !formatBody) {
       throw new Error('Url 或者 Body 中必须包含 $title');
     }
 
     const headers = parseHeaders(webhookHeaders);
-    const body = parseBody(webhookBody, webhookContentType, (v) =>
+    const body = parseBody(formatBody, webhookContentType);
-      v?.replaceAll('$title', this.title)?.replaceAll('$content', this.content),
-    );
     const bodyParam = this.formatBody(webhookContentType, body);
     const options = {
       method: webhookMethod,
@@ -721,9 +676,6 @@ export default class NotificationService {
       ...bodyParam,
     };
     try {
-      const formatUrl = webhookUrl
-        ?.replaceAll('$title', encodeURIComponent(this.title))
-        ?.replaceAll('$content', encodeURIComponent(this.content));
       const res = await got(formatUrl, options);
       if (String(res.statusCode).startsWith('20')) {
         return true;
@@ -748,4 +700,19 @@ export default class NotificationService {
     }
     return {};
   }
+
+  private formatNotifyContent(url: string, body: string) {
+    if (!url.includes('$title') && !body.includes('$title')) {
+      return {};
+    }
+
+    return {
+      formatUrl: url
+        ?.replaceAll('$title', encodeURIComponent(this.title))
+        ?.replaceAll('$content', encodeURIComponent(this.content)),
+      formatBody: body
+        ?.replaceAll('$title', this.title)
+        ?.replaceAll('$content', this.content),
+    };
+  }
 }

back/services/open.ts

@@ -26,7 +26,7 @@ export default class OpenService {
 
   public async insert(payload: App): Promise<App> {
     const doc = await AppModel.create(payload, { returning: true });
-    return doc.get({ plain: true });
+    return doc.get({ plain: true }) as App;
   }
 
   public async update(payload: App): Promise<App> {
@@ -45,10 +45,7 @@ export default class OpenService {
 
   public async getDb(query: any): Promise<App> {
     const doc: any = await AppModel.findOne({ where: query });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as App);
-      throw new Error(`App ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async remove(ids: number[]) {

back/services/schedule.ts

@@ -13,7 +13,7 @@ import taskLimit from '../shared/pLimit';
 import { spawn } from 'cross-spawn';
 
 export interface ScheduleTaskType {
-  id?: number;
+  id: number;
   command: string;
   name?: string;
   schedule?: string;

back/services/script.ts

@@ -41,7 +41,7 @@ export default class ScriptService {
     const relativePath = path.relative(config.scriptPath, filePath);
     const command = `${TASK_COMMAND} ${relativePath} now`;
     const pid = await this.scheduleService.runTask(
-      `real_time=true ${command}`,
+      command,
       this.taskCallbacks(filePath),
       { command },
       'start',
@@ -63,10 +63,7 @@ export default class ScriptService {
   }
 
   public async getFile(filePath: string, fileName: string) {
-    let _filePath = join(config.scriptPath, filePath, fileName);
+    const _filePath = join(config.scriptPath, filePath, fileName);
-    if (filePath.startsWith(config.dataPath)) {
-      _filePath = join(filePath, fileName);
-    }
     const content = await getFileContentByName(_filePath);
     return content;
   }

back/services/subscription.ts

@@ -91,9 +91,9 @@ export default class SubscriptionService {
           this.taskCallbacks(doc),
           runImmediately,
         ));
-    } else if (doc.interval_schedule) {
+    } else {
       this.scheduleService.cancelIntervalTask(doc as any);
-      const { type, value } = doc.interval_schedule;
+      const { type, value } = doc.interval_schedule as any;
       needCreate &&
         (await this.scheduleService.createIntervalTask(
           doc as any,
@@ -256,7 +256,7 @@ export default class SubscriptionService {
     );
   }
 
-  public async remove(ids: number[], query: { force?: boolean }) {
+  public async remove(ids: number[], query: any) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       await this.handleTask(doc, false);
@@ -279,11 +279,8 @@ export default class SubscriptionService {
   public async getDb(
     query: FindOptions<Subscription>['where'],
   ): Promise<Subscription> {
-    const doc = await SubscriptionModel.findOne({ where: { ...query } });
+    const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as Subscription);
-      throw new Error(`Subscription ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -374,7 +371,7 @@ export default class SubscriptionService {
             files.map(async (x) => ({
               filename: x,
               directory: relativeDir.replace(config.logPath, ''),
-              time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
+              time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
             })),
           )
         ).sort((a, b) => b.time - a.time);

back/services/system.ts

@@ -1,13 +1,20 @@
-import { spawn } from 'cross-spawn';
 import { Response } from 'express';
-import fs from 'fs';
+import { Service, Inject } from 'typedi';
-import got from 'got';
-import sum from 'lodash/sum';
-import path from 'path';
-import { Inject, Service } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import { TASK_COMMAND } from '../config/const';
+import {
+  AuthDataType,
+  AuthInfo,
+  SystemInstance,
+  SystemModel,
+  SystemModelInfo,
+} from '../data/system';
+import { NotificationInfo } from '../data/notify';
+import NotificationService from './notify';
+import ScheduleService, { TaskCallbacks } from './schedule';
+import { spawn } from 'cross-spawn';
+import SockService from './sock';
+import got from 'got';
 import {
   getPid,
   killTask,
@@ -16,24 +23,13 @@ import {
   promiseExec,
   readDirs,
 } from '../config/util';
-import {
+import { TASK_COMMAND } from '../config/const';
-  DependenceModel,
-  DependenceStatus,
-  DependenceTypes,
-} from '../data/dependence';
-import { NotificationInfo } from '../data/notify';
-import {
-  AuthDataType,
-  SystemInfo,
-  SystemInstance,
-  SystemModel,
-  SystemModelInfo,
-} from '../data/system';
 import taskLimit from '../shared/pLimit';
-import NotificationService from './notify';
+import tar from 'tar';
-import ScheduleService, { TaskCallbacks } from './schedule';
+import path from 'path';
-import SockService from './sock';
+import fs from 'fs';
-import os from 'os';
+import sum from 'lodash/sum';
+import { DependenceModel, DependenceStatus, DependenceTypes } from '../data/dependence';
 
 @Service()
 export default class SystemService {
@@ -48,21 +44,18 @@ export default class SystemService {
 
   public async getSystemConfig() {
     const doc = await this.getDb({ type: AuthDataType.systemConfig });
-    return doc;
+    return doc || ({} as SystemInstance);
   }
 
-  private async updateAuthDb(payload: SystemInfo): Promise<SystemInfo> {
+  private async updateAuthDb(payload: AuthInfo): Promise<SystemInstance> {
     await SystemModel.upsert({ ...payload });
     const doc = await this.getDb({ type: payload.type });
     return doc;
   }
 
-  public async getDb(query: any): Promise<SystemInfo> {
+  public async getDb(query: any): Promise<SystemInstance> {
-    const doc = await SystemModel.findOne({ where: { ...query } });
+    const doc: any = await SystemModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && doc.get({ plain: true });
-      throw new Error(`System ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -146,10 +139,7 @@ export default class SystemService {
     }
     let command = `cd && ${cmd}`;
     const docs = await DependenceModel.findAll({
-      where: {
+      where: { type: DependenceTypes.nodejs, status: DependenceStatus.installed },
-        type: DependenceTypes.nodejs,
-        status: DependenceStatus.installed,
-      },
     });
     if (docs.length > 0) {
       command += ` && pnpm i -g`;
@@ -206,9 +196,6 @@ export default class SystemService {
     });
     let defaultDomain = 'https://dl-cdn.alpinelinux.org';
     let targetDomain = 'https://dl-cdn.alpinelinux.org';
-    if (os.platform() !== 'linux') {
-      return;
-    }
     const content = await fs.promises.readFile('/etc/apk/repositories', {
       encoding: 'utf-8',
     });
@@ -339,10 +326,31 @@ export default class SystemService {
     return { code: 200 };
   }
 
-  public async reloadSystem(target?: 'system' | 'data') {
+  public async reloadSystem(target: 'system' | 'data') {
     const cmd = `real_time=true ql reload ${target || ''}`;
     const cp = spawn(cmd, { shell: '/bin/bash' });
-    cp.unref();
+
+    cp.stdout.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: data.toString(),
+      });
+    });
+
+    cp.stderr.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: data.toString(),
+      });
+    });
+
+    cp.on('error', (err) => {
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: JSON.stringify(err),
+      });
+    });
+
     return { code: 200 };
   }
 
@@ -355,13 +363,20 @@ export default class SystemService {
     }
   }
 
-  public async run({ command }: { command: string }, callback: TaskCallbacks) {
+  public async run(
+    { command, logPath }: { command: string; logPath: string },
+    callback: TaskCallbacks,
+  ) {
     if (!command.startsWith(TASK_COMMAND)) {
       command = `${TASK_COMMAND} ${command}`;
     }
-    this.scheduleService.runTask(`real_time=true ${command}`, callback, {
+    this.scheduleService.runTask(
-      command,
+      `real_log_path=${logPath} real_time=true ${command}`,
-    });
+      callback,
+      {
+        command,
+      },
+    );
   }
 
   public async stop({ command, pid }: { command: string; pid: number }) {
@@ -388,8 +403,9 @@ export default class SystemService {
 
   public async exportData(res: Response) {
     try {
-      await promiseExec(
+      await tar.create(
-        `cd ${config.rootPath} && tar -zcvf ${config.dataTgzFile} data/`,
+        { gzip: true, file: config.dataTgzFile, cwd: config.rootPath },
+        ['data'],
       );
       res.download(config.dataTgzFile);
     } catch (error: any) {
@@ -400,10 +416,8 @@ export default class SystemService {
   public async importData() {
     try {
       await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
-      const res = await promiseExec(
+      await tar.x({ file: config.dataTgzFile, cwd: config.tmpPath });
-        `cd ${config.tmpPath} && tar -zxvf data.tgz`,
+      return { code: 200 };
-      );
-      return { code: 200, data: res };
     } catch (error: any) {
       return { code: 400, message: error.message };
     }

back/services/user.ts

@@ -1,7 +1,6 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import {
-  createFile,
   createRandomString,
   fileExist,
   getNetIp,
@@ -14,7 +13,7 @@ import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import {
   AuthDataType,
-  SystemInfo,
+  AuthInfo,
   SystemModel,
   SystemModelInfo,
   LoginStatus,
@@ -224,7 +223,7 @@ export default class UserService {
     return [];
   }
 
-  private async insertDb(payload: SystemInfo): Promise<SystemInfo> {
+  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
     const doc = await SystemModel.create({ ...payload }, { returning: true });
     return doc;
   }
@@ -267,7 +266,7 @@ export default class UserService {
   public async getUserInfo(): Promise<any> {
     const authFileExist = await fileExist(config.authConfigFile);
     if (!authFileExist) {
-      await createFile(
+      await fs.writeFile(
         config.authConfigFile,
         JSON.stringify({
           username: 'admin',
@@ -352,10 +351,10 @@ export default class UserService {
 
   public async getNotificationMode(): Promise<NotificationInfo> {
     const doc = await this.getDb({ type: AuthDataType.notification });
-    return (doc.info || {}) as NotificationInfo;
+    return (doc && doc.info) || {};
   }
 
-  private async updateAuthDb(payload: SystemInfo): Promise<any> {
+  private async updateAuthDb(payload: AuthInfo): Promise<any> {
     let doc = await SystemModel.findOne({ type: payload.type });
     if (doc) {
       const updateResult = await SystemModel.update(payload, {
@@ -369,12 +368,9 @@ export default class UserService {
     return doc;
   }
 
-  public async getDb(query: any): Promise<SystemInfo> {
+  public async getDb(query: any): Promise<any> {
-    const doc = await SystemModel.findOne({ where: { ...query } });
+    const doc: any = await SystemModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as any);
-      throw new Error(`${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {

back/shared/pLimit.ts

@@ -15,9 +15,6 @@ class TaskLimit {
   private cronLimit = new PQueue({
     concurrency: Math.max(os.cpus().length, 4),
   });
-  private manualCronoLimit = new PQueue({
-    concurrency: Math.max(os.cpus().length, 4),
-  });
 
   get cronLimitActiveCount() {
     return this.cronLimit.pending;
@@ -74,7 +71,6 @@ class TaskLimit {
   public async setCustomLimit(limit?: number) {
     if (limit) {
       this.cronLimit.concurrency = limit;
-      this.manualCronoLimit.concurrency = limit;
       return;
     }
     await SystemModel.sync();
@@ -83,7 +79,6 @@ class TaskLimit {
     });
     if (doc?.info?.cronConcurrency) {
       this.cronLimit.concurrency = doc.info.cronConcurrency;
-      this.manualCronoLimit.concurrency = doc.info.cronConcurrency;
     }
   }
 
@@ -94,13 +89,6 @@ class TaskLimit {
     return this.cronLimit.add(fn, options);
   }
 
-  public async manualRunWithCronLimit<T>(
-    fn: () => Promise<T>,
-    options?: Partial<QueueAddOptions>,
-  ): Promise<T | void> {
-    return this.manualCronoLimit.add(fn, options);
-  }
-
   public runDependeny<T>(
     dependency: Dependence,
     fn: IDependencyFn<T>,

back/update.ts

@@ -1,18 +1,15 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
 import config from './config';
 import express from 'express';
-import depInjectorLoader from './loaders/depInjector';
 import Logger from './loaders/logger';
 
-
 async function startServer() {
   const app = express();
-  depInjectorLoader();
 
   await require('./loaders/update').default({ app });
 
   app
-    .listen(config.updatePort, '0.0.0.0', () => {
+    .listen(config.updatePort, () => {
       Logger.debug(`✌️ 更新服务启动成功！`);
       console.debug(`✌️ 更新服务启动成功！`);
       process.send?.('ready');

docker/310.Dockerfile

@@ -3,11 +3,11 @@ COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
   && apk update \
   && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 pm2 ts-node \
+  && npm i -g pnpm@8.3.1 \
   && cd /tmp/build \
   && pnpm install --prod
 
-FROM python:3.10-alpine
+FROM python:3.10-alpine3.18
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -23,13 +23,6 @@ ENV PNPM_HOME=/root/.local/share/pnpm \
   QL_DIR=/ql \
   QL_BRANCH=${QL_BRANCH}
 
-VOLUME /ql/data
-  
-EXPOSE 5700
-
-COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
-COPY --from=builder /usr/local/bin/. /usr/local/bin/
-
 RUN set -x \
   && apk update -f \
   && apk upgrade \
@@ -56,9 +49,11 @@ RUN set -x \
   && git config --global user.email "qinglong@@users.noreply.github.com" \
   && git config --global user.name "qinglong" \
   && git config --global http.postBuffer 524288000 \
+  && npm install -g pnpm@8.3.1 pm2 tsx \
   && rm -rf /root/.pnpm-store \
   && rm -rf /root/.local/share/pnpm/store \
   && rm -rf /root/.cache \
+  && rm -rf /root/.npm \
   && ulimit -c 0
 
 ARG SOURCE_COMMIT

docker/Dockerfile

@@ -3,7 +3,7 @@ COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
   && apk update \
   && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 pm2 ts-node \
+  && npm i -g pnpm@8.3.1 pm2 tsx \
   && cd /tmp/build \
   && pnpm install --prod
 
@@ -76,31 +76,7 @@ COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 
 WORKDIR ${QL_DIR}
 
-RUN apk --no-cache add -f s6-overlay
-# ENV S6_VERSION=v3.2.0.0
-
-# RUN ARCH=$(uname -m) && \
-#     case "$ARCH" in \
-#         x86_64) ARCH="amd64" ;; \
-#         aarch64) ARCH="aarch64" ;; \
-#         armv6l) ARCH="arm" ;; \
-#         armv7l) ARCH="armhf" ;; \
-#         i386) ARCH="x86" ;; \
-#         s390x) ARCH="s390x" ;; \
-#         ppc64le) ARCH="powerpc64le" ;; \
-#         *) echo "unsupported architecture"; exit 1 ;; \
-#     esac && \
-#     S6_OVERLAY_URL=https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${ARCH}.tar.xz && \
-#     apk add --no-cache curl && \
-#     curl -L $S6_OVERLAY_URL -o /tmp/s6-overlay.tar.xz && \
-#     tar -C / -Jxpf /tmp/s6-overlay.tar.xz
-
-COPY docker/s6-rc.d /etc/s6-overlay/s6-rc.d/
-
-RUN chmod +x /etc/s6-overlay/s6-rc.d/*/run && \
-    chmod +x /etc/s6-overlay/s6-rc.d/*/finish
-
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
   CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
 
-ENTRYPOINT ["/init"]
+ENTRYPOINT ["./docker/docker-entrypoint.sh"]

docker/docker-entrypoint.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 dir_shell=/ql/shell
-. $dir_shell/share.sh
 . $dir_shell/env.sh
+. $dir_shell/share.sh
+link_shell
 
 echo -e "======================1. 检测配置文件========================\n"
-import_config "$@"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
 init_nginx
@@ -21,7 +21,6 @@ nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
 echo -e "======================4. 启动pm2服务========================\n"
-reload_update
 reload_pm2
 
 if [[ $AutoStartBot == true ]]; then

docker/s6-rc.d/crond/finish

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "finish crond"

docker/s6-rc.d/crond/run

@@ -1,2 +0,0 @@
-#!/bin/bash
-crond -f

docker/s6-rc.d/crond/type

@@ -1 +0,0 @@
-longrun

docker/s6-rc.d/nginx/finish

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "finish ngnix"

docker/s6-rc.d/nginx/run

@@ -1,12 +0,0 @@
-#!/bin/bash
-dir_shell=/ql/shell
-. $dir_shell/share.sh
-. $dir_shell/env.sh
-
-import_config "$@"
-make_dir /etc/nginx/conf.d
-make_dir /run/nginx
-init_nginx
-fix_config
-
-nginx -g "daemon off;"

docker/s6-rc.d/nginx/type

@@ -1 +0,0 @@
-longrun

docker/s6-rc.d/panel/finish

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "finish panel"

docker/s6-rc.d/panel/run

@@ -1,12 +0,0 @@
-#!/bin/bash
-dir_shell=/ql/shell
-. $dir_shell/share.sh
-. $dir_shell/env.sh
-
-import_config "$@"
-make_dir /etc/nginx/conf.d
-make_dir /run/nginx
-init_nginx
-fix_config
-
-node ${dir_static}/build/app.js

docker/s6-rc.d/panel/type

@@ -1 +0,0 @@
-longrun

docker/s6-rc.d/publilc/finish

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "finish public"

docker/s6-rc.d/publilc/run

@@ -1,12 +0,0 @@
-#!/bin/bash
-dir_shell=/ql/shell
-. $dir_shell/share.sh
-. $dir_shell/env.sh
-
-import_config "$@"
-make_dir /etc/nginx/conf.d
-make_dir /run/nginx
-init_nginx
-fix_config
-
-node ${dir_static}/build/public.js

docker/s6-rc.d/publilc/type

@@ -1 +0,0 @@
-longrun

docker/s6-rc.d/schedule/finish

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "finish schedule"

docker/s6-rc.d/schedule/run

@@ -1,12 +0,0 @@
-#!/bin/bash
-dir_shell=/ql/shell
-. $dir_shell/share.sh
-. $dir_shell/env.sh
-
-import_config "$@"
-make_dir /etc/nginx/conf.d
-make_dir /run/nginx
-init_nginx
-fix_config
-
-node ${dir_static}/build/schedule/index.js

docker/s6-rc.d/schedule/type

@@ -1 +0,0 @@
-longrun

docker/s6-rc.d/update/finish

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "finish update"

docker/s6-rc.d/update/run

@@ -1,12 +0,0 @@
-#!/bin/bash
-dir_shell=/ql/shell
-. $dir_shell/share.sh
-. $dir_shell/env.sh
-
-import_config "$@"
-make_dir /etc/nginx/conf.d
-make_dir /run/nginx
-init_nginx
-fix_config
-
-node ${dir_static}/build/update.js

docker/s6-rc.d/update/type

@@ -1 +0,0 @@
-longrun

ecosystem.config.js

@@ -1,5 +1,14 @@
 module.exports = {
   apps: [
+    {
+      name: 'update',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      time: true,
+      script: 'static/build/update.js',
+    },
     {
       name: 'schedule',
       max_restarts: 10,

other.config.js

@@ -1,13 +0,0 @@
-module.exports = {
-  apps: [
-    {
-      name: 'update',
-      max_restarts: 10,
-      kill_timeout: 15000,
-      wait_ready: true,
-      listen_timeout: 10000,
-      time: true,
-      script: 'static/build/update.js',
-    },
-  ],
-};

package.json

@@ -85,13 +85,14 @@
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
     "p-queue-cjs": "7.3.4",
-    "protobufjs": "^7.3.0",
+    "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.3",
+    "tar": "^6.1.15",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
@@ -129,6 +130,7 @@
     "@types/serve-handler": "^6.1.1",
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
+    "@types/tar": "^6.1.5",
     "@types/uuid": "^8.3.4",
     "@types/request-ip": "0.0.41",
     "@uiw/codemirror-extensions-langs": "^4.21.9",
@@ -163,9 +165,10 @@
     "react-intl-universal": "^2.6.21",
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
-    "ts-node": "^10.9.2",
+    "ts-node": "^10.6.0",
     "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
+    "tsx": "^3.12.3",
     "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",

pnpm-lock.yaml

@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 dependencies:
   '@grpc/grpc-js':
     specifier: ^1.8.13
@@ -93,8 +89,8 @@ dependencies:
     specifier: 7.3.4
     version: 7.3.4
   protobufjs:
-    specifier: ^7.3.0
+    specifier: ^7.2.3
-    version: 7.3.0
+    version: 7.2.3
   pstree.remy:
     specifier: ^1.1.8
     version: 1.1.8
@@ -116,6 +112,9 @@ dependencies:
   sqlite3:
     specifier: git+https://github.com/whyour/node-sqlite3.git#v1.0.3
     version: github.com/whyour/node-sqlite3/3a00af0b5d7603b7f1b290032507320b18a6b741
+  tar:
+    specifier: ^6.1.15
+    version: 6.1.15
   toad-scheduler:
     specifier: ^1.6.0
     version: 1.6.1
@@ -220,6 +219,9 @@ devDependencies:
   '@types/sockjs-client':
     specifier: ^1.5.1
     version: 1.5.1
+  '@types/tar':
+    specifier: ^6.1.5
+    version: 6.1.5
   '@types/uuid':
     specifier: ^8.3.4
     version: 8.3.4
@@ -320,14 +322,17 @@ devDependencies:
     specifier: ^1.6.0
     version: 1.6.1
   ts-node:
-    specifier: ^10.9.2
+    specifier: ^10.6.0
-    version: 10.9.2(@types/node@17.0.45)(typescript@5.2.2)
+    version: 10.9.1(@types/node@17.0.45)(typescript@5.2.2)
   ts-proto:
     specifier: ^1.146.0
     version: 1.148.2
   tslib:
     specifier: ^2.4.0
     version: 2.5.3
+  tsx:
+    specifier: ^3.12.3
+    version: 3.12.7
   typescript:
     specifier: 5.2.2
     version: 5.2.2
@@ -3379,7 +3384,7 @@ packages:
     resolution: {integrity: sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==}
     dependencies:
       '@esbuild-kit/core-utils': 3.1.0
-      get-tsconfig: 4.7.3
+      get-tsconfig: 4.6.0
     dev: true
 
   /@esbuild-kit/core-utils@3.1.0:
@@ -3393,7 +3398,7 @@ packages:
     resolution: {integrity: sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==}
     dependencies:
       '@esbuild-kit/core-utils': 3.1.0
-      get-tsconfig: 4.7.3
+      get-tsconfig: 4.6.0
     dev: true
 
   /@esbuild/android-arm64@0.17.19:
@@ -3724,7 +3729,7 @@ packages:
       '@types/long': 4.0.2
       lodash.camelcase: 4.3.0
       long: 4.0.0
-      protobufjs: 7.3.0
+      protobufjs: 7.2.3
       yargs: 17.7.2
     dev: false
 
@@ -5123,6 +5128,13 @@ packages:
       '@types/node': 17.0.45
     dev: true
 
+  /@types/tar@6.1.5:
+    resolution: {integrity: sha512-qm2I/RlZij5RofuY7vohTpYNaYcrSQlN2MyjucQc7ZweDwaEWkdN/EeNh6e9zjK6uEm6PwjdMXkcj05BxZdX1Q==}
+    dependencies:
+      '@types/node': 17.0.45
+      minipass: 4.2.8
+    dev: true
+
   /@types/triple-beam@1.3.2:
     resolution: {integrity: sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==}
     dev: false
@@ -7180,7 +7192,7 @@ packages:
       normalize-path: 3.0.0
       readdirp: 3.6.0
     optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: 2.3.2
 
   /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
@@ -9123,8 +9135,8 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     requiresBuild: true
 
-  /fsevents@2.3.3:
+  /fsevents@2.3.2:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
@@ -9238,8 +9250,8 @@ packages:
       get-intrinsic: 1.2.1
     dev: true
 
-  /get-tsconfig@4.7.3:
+  /get-tsconfig@4.6.0:
-    resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==}
+    resolution: {integrity: sha512-lgbo68hHTQnFddybKbbs/RDRJnJT5YyGy2kQzVwbq+g67X73i+5MVTval34QxGkOe9X5Ujf1UYpCaphLyltjEg==}
     dependencies:
       resolve-pkg-maps: 1.0.0
     dev: true
@@ -10223,7 +10235,7 @@ packages:
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: 2.3.2
     dev: true
 
   /jest-regex-util@29.4.3:
@@ -11078,6 +11090,11 @@ packages:
       yallist: 4.0.0
     dev: false
 
+  /minipass@4.2.8:
+    resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
+    engines: {node: '>=8'}
+    dev: true
+
   /minipass@5.0.0:
     resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
     engines: {node: '>=8'}
@@ -12589,8 +12606,8 @@ packages:
       long: 4.0.0
     dev: true
 
-  /protobufjs@7.3.0:
+  /protobufjs@7.2.3:
-    resolution: {integrity: sha512-YWD03n3shzV9ImZRX3ccbjqLxj7NokGN0V/ESiBV5xWqrommYHYiihuIyavq03pWSGqlyvYUFmfoMKd+1rPA/g==}
+    resolution: {integrity: sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==}
     engines: {node: '>=12.0.0'}
     requiresBuild: true
     dependencies:
@@ -14316,7 +14333,7 @@ packages:
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: 2.3.2
     dev: true
 
   /run-applescript@5.0.0:
@@ -15476,8 +15493,8 @@ packages:
     resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==}
     dev: false
 
-  /ts-node@10.9.2(@types/node@17.0.45)(typescript@5.2.2):
+  /ts-node@10.9.1(@types/node@17.0.45)(typescript@5.2.2):
-    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
+    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
       '@swc/core': '>=1.2.50'
@@ -15562,7 +15579,7 @@ packages:
       '@esbuild-kit/core-utils': 3.1.0
       '@esbuild-kit/esm-loader': 2.5.5
     optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: 2.3.2
     dev: true
 
   /tty-browserify@0.0.0:
@@ -16042,7 +16059,7 @@ packages:
       postcss: 8.4.24
       rollup: 3.24.0
     optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: 2.3.2
     dev: true
 
   /vm-browserify@1.1.2:
@@ -16417,3 +16434,7 @@ packages:
       - encoding
       - supports-color
     dev: false
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false

sample/config.sample.sh

@@ -8,7 +8,7 @@ AutoAddCron="true"
 DefaultCronRule=""
 
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
-RepoFileExtensions="js mjs py pyc"
+RepoFileExtensions="js py"
 
 ## 代理地址，支持HTTP/SOCK5，例如 http://127.0.0.1:7890
 ProxyUrl=""
@@ -43,7 +43,7 @@ BotRepoUrl=""
 
 ## 通知环境变量
 ## 1. Server酱
-## https://sct.ftqq.com/r/13363
+## https://sct.ftqq.com
 ## 下方填写 SCHKEY 值或 SendKey 值
 export PUSH_KEY=""
 
@@ -56,12 +56,6 @@ export BARK_ICON="https://qn.whyour.cn/logo.png"
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
 export BARK_GROUP="QingLong"
-## bark 推送时效性
-export BARK_LEVEL="active"
-## bark 推送是否存档
-export BARK_ARCHIVE=""
-## bark 推送跳转 URL
-export BARK_URL=""
 
 ## 3. Telegram
 ## 下方填写自己申请@BotFather的Token，如10xxx4:AAFcqxxxxgER5uw
@@ -118,18 +112,7 @@ export PUSH_PLUS_TOKEN=""
 ## 1. 需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送
 export PUSH_PLUS_USER=""
 
-## 9. 微加机器人
+## 9. go-cqhttp
-## 官方网站：http://www.weplusbot.com
-## 下方填写您的Token；微信扫描登录后在"我的"->"设置"->"令牌"中获取
-export WE_PLUS_BOT_TOKEN=""
-## 消息接收人；
-## 个人版填写接收消息的群编码，不填发送给自己的微信号
-## 专业版不填默认发给机器人自己，发送给好友填写wxid，发送给微信群填写群编码
-export WE_PLUS_BOT_RECEIVER=""
-## 调用版本；分为专业版和个人版，专业版填写pro，个人版填写personal
-export WE_PLUS_BOT_VERSION="pro"
-
-## 10. go-cqhttp
 ## gobot_url 推送到个人QQ: http://127.0.0.1/send_private_msg  群：http://127.0.0.1/send_group_msg
 ## gobot_token 填写在go-cqhttp文件设置的访问密钥
 ## gobot_qq 如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群
@@ -138,7 +121,7 @@ export GOBOT_URL=""
 export GOBOT_TOKEN=""
 export GOBOT_QQ=""
 
-## 11. gotify
+## 10. gotify
 ## gotify_url 填写gotify地址,如https://push.example.de:8080
 ## gotify_token 填写gotify的消息应用token
 ## gotify_priority 填写推送消息优先级,默认为0
@@ -146,17 +129,17 @@ export GOTIFY_URL=""
 export GOTIFY_TOKEN=""
 export GOTIFY_PRIORITY=0
 
-## 12. PushDeer
+## 11. PushDeer
 ## deer_key 填写PushDeer的key
 export DEER_KEY=""
 
-## 13. Chat
+## 12. Chat
 ## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
 ## chat_token 填写后面的token
 export CHAT_URL=""
 export CHAT_TOKEN=""
 
-## 14. aibotk
+## 13. aibotk
 ## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
 ## aibotk_key (必填)填写智能微秘书个人中心的apikey
 export AIBOTK_KEY=""
@@ -165,16 +148,7 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""
 
-## 15. CHRONOCAT
+## 14. SMTP
-## CHRONOCAT_URL 推送 http://127.0.0.1:16530
-## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
-## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
-## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
-export CHRONOCAT_URL=""
-export CHRONOCAT_QQ=""
-export CHRONOCAT_TOKEN=""
-
-## 16. SMTP
 ## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
 export SMTP_SERVICE=""
 ## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
@@ -184,34 +158,18 @@ export SMTP_PASSWORD=""
 ## smtp_name 填写 SMTP 收发件人姓名，可随意填写
 export SMTP_NAME=""
 
-## 17. PushMe
+## 15. PushMe
 ## 官方说明文档：https://push.i-i.me/
 ## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
-## PUSHME_URL (选填)填写自建的PushMeServer消息服务接口地址，例如：http://127.0.0.1:3010，不填则使用官方接口服务
 export PUSHME_KEY=""
-export PUSHME_URL=""
 
-## 18. 飞书机器人
+## 13. CHRONOCAT
-## 官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
+## CHRONOCAT_URL 推送 http://127.0.0.1:16530
-## FSKEY 飞书机器人的 FSKEY
+## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
-export FSKEY=""
+## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
-
+## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
-## 19. Qmsg酱
+export CHRONOCAT_URL=""
-## 官方文档：https://qmsg.zendee.cn/docs/api/
+export CHRONOCAT_QQ=""
-## qmsg 酱的 QMSG_KEY
+export CHRONOCAT_TOKEN=""
-## qmsg 酱的 QMSG_TYPE send 为私聊，group 为群聊
-export QMSG_KEY=""
-export QMSG_TYPE=""
-
-## 20. 自定义通知
-## 自定义通知 接收回调的URL
-export WEBHOOK_URL=""
-## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"
-export WEBHOOK_BODY=""
-export WEBHOOK_HEADERS=""
-## 支持 GET/POST/PUT
-export WEBHOOK_METHOD=""
-## 支持 text/plain、application/json、multipart/form-data、application/x-www-form-urlencoded
-export WEBHOOK_CONTENT_TYPE=""
 
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.py

@@ -33,7 +33,7 @@ def print(text, *args, **kw):
 # 通知服务
 # fmt: off
 push_config = {
-    'HITOKOTO': True,                  # 启用一言（随机句子）
+    'HITOKOTO': False,                  # 启用一言（随机句子）
 
     'BARK_PUSH': '',                    # bark IP 或设备码，例：https://api.day.app/DxHcxxxxxRxxxxxxcm/
     'BARK_ARCHIVE': '',                 # bark 推送是否存档
@@ -43,7 +43,7 @@ push_config = {
     'BARK_LEVEL': '',                   # bark 推送时效性
     'BARK_URL': '',                     # bark 推送跳转URL
 
-    'CONSOLE': False,                    # 控制台输出
+    'CONSOLE': True,                    # 控制台输出
 
     'DD_BOT_SECRET': '',                # 钉钉机器人的 DD_BOT_SECRET
     'DD_BOT_TOKEN': '',                 # 钉钉机器人的 DD_BOT_TOKEN
@@ -75,10 +75,6 @@ push_config = {
     'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
     'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
 
-    'WE_PLUS_BOT_TOKEN': '',            # 微加机器人的用户令牌
-    'WE_PLUS_BOT_RECEIVER': '',         # 微加机器人的消息接收者
-    'WE_PLUS_BOT_VERSION': 'pro',          # 微加机器人的调用版本
-
     'QMSG_KEY': '',                     # qmsg 酱的 QMSG_KEY
     'QMSG_TYPE': '',                    # qmsg 酱的 QMSG_TYPE
 
@@ -105,8 +101,7 @@ push_config = {
     'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
     'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
 
-    'PUSHME_KEY': '',                   # PushMe 的 PUSHME_KEY
+    'PUSHME_KEY': '',                   # PushMe 酱的 PUSHME_KEY
-    'PUSHME_URL': '',                   # PushMe 的 PUSHME_URL
 
     'CHRONOCAT_QQ': '',                 # qq号
     'CHRONOCAT_TOKEN': '',              # CHRONOCAT 的token
@@ -118,27 +113,29 @@ push_config = {
     'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
     'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
 }
+notify_function = []
 # fmt: on
 
+# 首先读取 面板变量 或者 github action 运行变量
 for k in push_config:
     if os.getenv(k):
         v = os.getenv(k)
         push_config[k] = v
 
 
-def bark(title: str, content: str) -> None:
+def bark(title: str, content: str, **kwargs) -> None:
     """
     使用 bark 推送消息。
     """
-    if not push_config.get("BARK_PUSH"):
+    if not (push_config.get("BARK_PUSH") or kwargs.get("BARK_PUSH")):
         print("bark 服务的 BARK_PUSH 未设置!!\n取消推送")
         return
     print("bark 服务启动")
-
+    BARK_PUSH = kwargs.get("BARK_PUSH", push_config.get("BARK_PUSH"))
-    if push_config.get("BARK_PUSH").startswith("http"):
+    if BARK_PUSH.startswith("http"):
-        url = f'{push_config.get("BARK_PUSH")}'
+        url = f'{BARK_PUSH}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
     else:
-        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}'
+        url = f'https://api.day.app/{BARK_PUSH}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
 
     bark_params = {
         "BARK_ARCHIVE": "isArchive",
@@ -148,22 +145,19 @@ def bark(title: str, content: str) -> None:
         "BARK_LEVEL": "level",
         "BARK_URL": "url",
     }
-    data = {
+    params = ""
-        "title": title,
-        "body": content,
-    }
     for pair in filter(
         lambda pairs: pairs[0].startswith("BARK_")
         and pairs[0] != "BARK_PUSH"
-        and pairs[1]
+        and (pairs[1] or kwargs.get(pairs[0]))
         and bark_params.get(pairs[0]),
         push_config.items(),
     ):
-        data[bark_params.get(pair[0])] = pair[1]
+        value = kwargs.get(pair[0], pair[1])
-    headers = {"Content-Type": "application/json;charset=utf-8"}
+        params += f"{bark_params.get(pair[0])}={value}&"
-    response = requests.post(
+    if params:
-        url=url, data=json.dumps(data), headers=headers, timeout=15
+        url = url + "?" + params.rstrip("&")
-    ).json()
+    response = requests.get(url).json()
 
     if response["code"] == 200:
         print("bark 推送成功！")
@@ -171,31 +165,37 @@ def bark(title: str, content: str) -> None:
         print("bark 推送失败！")
 
 
-def console(title: str, content: str) -> None:
+def console(title: str, content: str, **kwargs) -> None:
     """
     使用 控制台 推送消息。
     """
     print(f"{title}\n\n{content}")
 
 
-def dingding_bot(title: str, content: str) -> None:
+def dingding_bot(title: str, content: str, **kwargs) -> None:
     """
     使用 钉钉机器人 推送消息。
     """
-    if not push_config.get("DD_BOT_SECRET") or not push_config.get("DD_BOT_TOKEN"):
+    if not ((kwargs.get("DD_BOT_SECRET") and kwargs.get("DD_BOT_TOKEN")) or (push_config.get("DD_BOT_SECRET") and push_config.get("DD_BOT_TOKEN"))):
         print("钉钉机器人 服务的 DD_BOT_SECRET 或者 DD_BOT_TOKEN 未设置!!\n取消推送")
         return
     print("钉钉机器人 服务启动")
+    if kwargs.get("DD_BOT_SECRET") and kwargs.get("DD_BOT_TOKEN"):
+        DD_BOT_SECRET = kwargs.get("DD_BOT_SECRET")
+        DD_BOT_TOKEN = kwargs.get("DD_BOT_TOKEN")
+    else:
+        DD_BOT_SECRET = push_config.get("DD_BOT_SECRET")
+        DD_BOT_TOKEN = push_config.get("DD_BOT_TOKEN")
 
     timestamp = str(round(time.time() * 1000))
-    secret_enc = push_config.get("DD_BOT_SECRET").encode("utf-8")
+    secret_enc = DD_BOT_SECRET.encode("utf-8")
-    string_to_sign = "{}\n{}".format(timestamp, push_config.get("DD_BOT_SECRET"))
+    string_to_sign = "{}\n{}".format(timestamp, DD_BOT_SECRET)
     string_to_sign_enc = string_to_sign.encode("utf-8")
     hmac_code = hmac.new(
         secret_enc, string_to_sign_enc, digestmod=hashlib.sha256
     ).digest()
     sign = urllib.parse.quote_plus(base64.b64encode(hmac_code))
-    url = f'https://oapi.dingtalk.com/robot/send?access_token={push_config.get("DD_BOT_TOKEN")}&timestamp={timestamp}&sign={sign}'
+    url = f'https://oapi.dingtalk.com/robot/send?access_token={DD_BOT_TOKEN}&timestamp={timestamp}&sign={sign}'
     headers = {"Content-Type": "application/json;charset=utf-8"}
     data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
     response = requests.post(
@@ -208,35 +208,43 @@ def dingding_bot(title: str, content: str) -> None:
         print("钉钉机器人 推送失败！")
 
 
-def feishu_bot(title: str, content: str) -> None:
+def feishu_bot(title: str, content: str, **kwargs) -> None:
     """
     使用 飞书机器人 推送消息。
     """
-    if not push_config.get("FSKEY"):
+    if not (kwargs.get("DD_BOT_SECRET") or push_config.get("FSKEY")):
         print("飞书 服务的 FSKEY 未设置!!\n取消推送")
         return
     print("飞书 服务启动")
-
+    FSKEY = kwargs.get("DD_BOT_SECRET", push_config.get("FSKEY"))
-    url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{push_config.get("FSKEY")}'
+    url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{FSKEY}'
     data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}}
     response = requests.post(url, data=json.dumps(data)).json()
 
-    if response.get("StatusCode") == 0 or response.get("code") == 0:
+    if response.get("StatusCode") == 0:
         print("飞书 推送成功！")
     else:
         print("飞书 推送失败！错误信息如下：\n", response)
 
 
-def go_cqhttp(title: str, content: str) -> None:
+def go_cqhttp(title: str, content: str, **kwargs) -> None:
     """
     使用 go_cqhttp 推送消息。
     """
-    if not push_config.get("GOBOT_URL") or not push_config.get("GOBOT_QQ"):
+    if not ((kwargs.get("GOBOT_URL") and kwargs.get("GOBOT_QQ")) or (push_config.get("GOBOT_URL") and push_config.get("GOBOT_QQ"))):
         print("go-cqhttp 服务的 GOBOT_URL 或 GOBOT_QQ 未设置!!\n取消推送")
         return
     print("go-cqhttp 服务启动")
+    if kwargs.get("GOBOT_URL") and kwargs.get("GOBOT_QQ"):
+        GOBOT_URL = kwargs.get("GOBOT_URL")
+        GOBOT_QQ = kwargs.get("GOBOT_QQ")
+        GOBOT_TOKEN = kwargs.get("GOBOT_TOKEN")
+    else:
+        GOBOT_URL = push_config.get("GOBOT_URL")
+        GOBOT_QQ = push_config.get("GOBOT_QQ")
+        GOBOT_TOKEN = push_config.get("GOBOT_TOKEN")
 
-    url = f'{push_config.get("GOBOT_URL")}?access_token={push_config.get("GOBOT_TOKEN")}&{push_config.get("GOBOT_QQ")}&message=标题:{title}\n内容:{content}'
+    url = f'{GOBOT_URL}?access_token={GOBOT_TOKEN}&{GOBOT_QQ}&message=标题:{title}\n内容:{content}'
     response = requests.get(url).json()
 
     if response["status"] == "ok":
@@ -245,20 +253,28 @@ def go_cqhttp(title: str, content: str) -> None:
         print("go-cqhttp 推送失败！")
 
 
-def gotify(title: str, content: str) -> None:
+def gotify(title: str, content: str, **kwargs) -> None:
     """
     使用 gotify 推送消息。
     """
-    if not push_config.get("GOTIFY_URL") or not push_config.get("GOTIFY_TOKEN"):
+    if not ((kwargs.get("GOTIFY_URL") and kwargs.get("GOTIFY_TOKEN")) or (push_config.get("GOTIFY_URL") and push_config.get("GOTIFY_TOKEN"))):
         print("gotify 服务的 GOTIFY_URL 或 GOTIFY_TOKEN 未设置!!\n取消推送")
         return
     print("gotify 服务启动")
+    if kwargs.get("GOTIFY_URL") and kwargs.get("GOTIFY_TOKEN"):
+        GOTIFY_URL = kwargs.get("GOTIFY_URL")
+        GOTIFY_TOKEN = kwargs.get("GOBOTGOTIFY_TOKEN_QQ")
+        GOTIFY_PRIORITY = kwargs.get("GOTIFY_PRIORITY")
+    else:
+        GOTIFY_URL = push_config.get("GOTIFY_URL")
+        GOTIFY_TOKEN = push_config.get("GOTIFY_TOKEN")
+        GOTIFY_PRIORITY = kwargs.get("GOTIFY_PRIORITY")
 
-    url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}'
+    url = f'{GOTIFY_URL}/message?token={GOTIFY_TOKEN}'
     data = {
         "title": title,
         "message": content,
-        "priority": push_config.get("GOTIFY_PRIORITY"),
+        "priority": GOTIFY_PRIORITY,
     }
     response = requests.post(url, data=data).json()
 
@@ -268,16 +284,16 @@ def gotify(title: str, content: str) -> None:
         print("gotify 推送失败！")
 
 
-def iGot(title: str, content: str) -> None:
+def iGot(title: str, content: str, **kwargs) -> None:
     """
     使用 iGot 推送消息。
     """
-    if not push_config.get("IGOT_PUSH_KEY"):
+    if not (kwargs.get("IGOT_PUSH_KEY") or push_config.get("IGOT_PUSH_KEY")):
         print("iGot 服务的 IGOT_PUSH_KEY 未设置!!\n取消推送")
         return
     print("iGot 服务启动")
-
+    IGOT_PUSH_KEY = kwargs.get("IGOT_PUSH_KEY", push_config.get("IGOT_PUSH_KEY"))
-    url = f'https://push.hellyw.com/{push_config.get("IGOT_PUSH_KEY")}'
+    url = f'https://push.hellyw.com/{IGOT_PUSH_KEY}'
     data = {"title": title, "content": content}
     headers = {"Content-Type": "application/x-www-form-urlencoded"}
     response = requests.post(url, data=data, headers=headers).json()
@@ -288,20 +304,21 @@ def iGot(title: str, content: str) -> None:
         print(f'iGot 推送失败！{response["errMsg"]}')
 
 
-def serverJ(title: str, content: str) -> None:
+def serverJ(title: str, content: str, **kwargs) -> None:
     """
     通过 serverJ 推送消息。
     """
-    if not push_config.get("PUSH_KEY"):
+    if not (kwargs.get("PUSH_KEY") or push_config.get("PUSH_KEY")):
         print("serverJ 服务的 PUSH_KEY 未设置!!\n取消推送")
         return
     print("serverJ 服务启动")
+    PUSH_KEY = kwargs.get("PUSH_KEY", push_config.get("PUSH_KEY"))
 
     data = {"text": title, "desp": content.replace("\n", "\n\n")}
-    if push_config.get("PUSH_KEY").find("SCT") != -1:
+    if PUSH_KEY.find("SCT") != -1:
-        url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+        url = f'https://sctapi.ftqq.com/{PUSH_KEY}.send'
     else:
-        url = f'https://sc.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+        url = f'https://sc.ftqq.com/{PUSH_KEY}.send'
     response = requests.post(url, data=data).json()
 
     if response.get("errno") == 0 or response.get("code") == 0:
@@ -310,23 +327,27 @@ def serverJ(title: str, content: str) -> None:
         print(f'serverJ 推送失败！错误码：{response["message"]}')
 
 
-def pushdeer(title: str, content: str) -> None:
+def pushdeer(title: str, content: str, **kwargs) -> None:
     """
     通过PushDeer 推送消息
     """
-    if not push_config.get("DEER_KEY"):
+    if not (kwargs.get("DEER_KEY") or push_config.get("DEER_KEY")):
         print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
         return
     print("PushDeer 服务启动")
+    DEER_KEY = kwargs.get("DEER_KEY", push_config.get("DEER_KEY"))
+
     data = {
         "text": title,
         "desp": content,
         "type": "markdown",
-        "pushkey": push_config.get("DEER_KEY"),
+        "pushkey": DEER_KEY,
     }
     url = "https://api2.pushdeer.com/message/push"
     if push_config.get("DEER_URL"):
         url = push_config.get("DEER_URL")
+    if kwargs.get("DEER_URL"):
+        url = kwargs.get("DEER_URL")
 
     response = requests.post(url, data=data).json()
 
@@ -336,16 +357,23 @@ def pushdeer(title: str, content: str) -> None:
         print("PushDeer 推送失败！错误信息：", response)
 
 
-def chat(title: str, content: str) -> None:
+def chat(title: str, content: str, **kwargs) -> None:
     """
     通过Chat 推送消息
     """
-    if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
+    if not ((kwargs.get("CHAT_URL") and kwargs.get("CHAT_TOKEN")) or (push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"))):
         print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
         return
     print("chat 服务启动")
+    if kwargs.get("CHAT_URL") and kwargs.get("CHAT_TOKEN"):
+        CHAT_URL = kwargs.get("CHAT_URL")
+        CHAT_TOKEN = kwargs.get("CHAT_TOKEN")
+    else:
+        CHAT_URL = push_config.get("CHAT_URL")
+        CHAT_TOKEN = push_config.get("CHAT_TOKEN")
+
     data = "payload=" + json.dumps({"text": title + "\n" + content})
-    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
+    url = CHAT_URL + CHAT_TOKEN
     response = requests.post(url, data=data)
 
     if response.status_code == 200:
@@ -354,21 +382,23 @@ def chat(title: str, content: str) -> None:
         print("Chat 推送失败！错误信息：", response)
 
 
-def pushplus_bot(title: str, content: str) -> None:
+def pushplus_bot(title: str, content: str, **kwargs) -> None:
     """
     通过 push+ 推送消息。
     """
-    if not push_config.get("PUSH_PLUS_TOKEN"):
+    if not (kwargs.get("PUSH_PLUS_TOKEN") or push_config.get("PUSH_PLUS_TOKEN")):
         print("PUSHPLUS 服务的 PUSH_PLUS_TOKEN 未设置!!\n取消推送")
         return
     print("PUSHPLUS 服务启动")
+    PUSH_PLUS_TOKEN = kwargs.get("PUSH_PLUS_TOKEN", push_config.get("PUSH_PLUS_TOKEN"))
+    PUSH_PLUS_USER = kwargs.get("PUSH_PLUS_USER", push_config.get("PUSH_PLUS_USER"))
 
     url = "http://www.pushplus.plus/send"
     data = {
-        "token": push_config.get("PUSH_PLUS_TOKEN"),
+        "token": PUSH_PLUS_TOKEN,
         "title": title,
         "content": content,
-        "topic": push_config.get("PUSH_PLUS_USER"),
+        "topic": PUSH_PLUS_USER,
     }
     body = json.dumps(data).encode(encoding="utf-8")
     headers = {"Content-Type": "application/json"}
@@ -389,48 +419,22 @@ def pushplus_bot(title: str, content: str) -> None:
             print("PUSHPLUS 推送失败！")
 
 
-def weplus_bot(title: str, content: str) -> None:
+def qmsg_bot(title: str, content: str, **kwargs) -> None:
-    """
-    通过 微加机器人 推送消息。
-    """
-    if not push_config.get("WE_PLUS_BOT_TOKEN"):
-        print("微加机器人 服务的 WE_PLUS_BOT_TOKEN 未设置!!\n取消推送")
-        return
-    print("微加机器人 服务启动")
-
-    template = "txt"
-    if len(content) > 800:
-        template = "html"
-
-    url = "https://www.weplusbot.com/send"
-    data = {
-        "token": push_config.get("WE_PLUS_BOT_TOKEN"),
-        "title": title,
-        "content": content,
-        "template": template,
-        "receiver": push_config.get("WE_PLUS_BOT_RECEIVER"),
-        "version": push_config.get("WE_PLUS_BOT_VERSION"),
-    }
-    body = json.dumps(data).encode(encoding="utf-8")
-    headers = {"Content-Type": "application/json"}
-    response = requests.post(url=url, data=body, headers=headers).json()
-
-    if response["code"] == 200:
-        print("微加机器人 推送成功！")
-    else:
-        print("微加机器人 推送失败！")
-
-
-def qmsg_bot(title: str, content: str) -> None:
     """
     使用 qmsg 推送消息。
     """
-    if not push_config.get("QMSG_KEY") or not push_config.get("QMSG_TYPE"):
+    if not ((kwargs.get("QMSG_KEY") and kwargs.get("QMSG_TYPE")) or (push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"))):
         print("qmsg 的 QMSG_KEY 或者 QMSG_TYPE 未设置!!\n取消推送")
         return
     print("qmsg 服务启动")
+    if kwargs.get("QMSG_KEY") and kwargs.get("QMSG_TYPE"):
+        QMSG_KEY = kwargs.get("QMSG_KEY")
+        QMSG_TYPE = kwargs.get("QMSG_TYPE")
+    else:
+        QMSG_KEY = push_config.get("QMSG_KEY")
+        QMSG_TYPE = push_config.get("QMSG_TYPE")
 
-    url = f'https://qmsg.zendee.cn/{push_config.get("QMSG_TYPE")}/{push_config.get("QMSG_KEY")}'
+    url = f'https://qmsg.zendee.cn/{QMSG_TYPE}/{QMSG_KEY}'
     payload = {"msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
     response = requests.post(url=url, params=payload).json()
 
@@ -440,14 +444,15 @@ def qmsg_bot(title: str, content: str) -> None:
         print(f'qmsg 推送失败！{response["reason"]}')
 
 
-def wecom_app(title: str, content: str) -> None:
+def wecom_app(title: str, content: str, **kwargs) -> None:
     """
     通过 企业微信 APP 推送消息。
     """
-    if not push_config.get("QYWX_AM"):
+    if not (kwargs.get("QYWX_AM") or push_config.get("QYWX_AM")):
         print("QYWX_AM 未设置!!\n取消推送")
         return
-    QYWX_AM_AY = re.split(",", push_config.get("QYWX_AM"))
+    QYWX_AM = kwargs.get("QYWX_AM", push_config.get("QYWX_AM"))
+    QYWX_AM_AY = re.split(",", QYWX_AM)
     if 4 < len(QYWX_AM_AY) > 5:
         print("QYWX_AM 设置错误!!\n取消推送")
         return
@@ -537,20 +542,23 @@ class WeCom:
         return respone["errmsg"]
 
 
-def wecom_bot(title: str, content: str) -> None:
+def wecom_bot(title: str, content: str, **kwargs) -> None:
     """
     通过 企业微信机器人 推送消息。
     """
-    if not push_config.get("QYWX_KEY"):
+    if not (kwargs.get("QYWX_KEY") or push_config.get("QYWX_KEY")):
         print("企业微信机器人 服务的 QYWX_KEY 未设置!!\n取消推送")
         return
     print("企业微信机器人服务启动")
+    QYWX_KEY = kwargs.get("QYWX_KEY", push_config.get("QYWX_KEY"))
 
     origin = "https://qyapi.weixin.qq.com"
     if push_config.get("QYWX_ORIGIN"):
         origin = push_config.get("QYWX_ORIGIN")
+    if kwargs.get("QYWX_ORIGIN"):
+        origin = kwargs.get("QYWX_ORIGIN")
 
-    url = f"{origin}/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
+    url = f"{origin}/cgi-bin/webhook/send?key={QYWX_KEY}"
     headers = {"Content-Type": "application/json;charset=utf-8"}
     data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
     response = requests.post(
@@ -563,39 +571,52 @@ def wecom_bot(title: str, content: str) -> None:
         print("企业微信机器人推送失败！")
 
 
-def telegram_bot(title: str, content: str) -> None:
+def telegram_bot(title: str, content: str, **kwargs) -> None:
     """
     使用 telegram 机器人 推送消息。
     """
-    if not push_config.get("TG_BOT_TOKEN") or not push_config.get("TG_USER_ID"):
+    if not ((kwargs.get("TG_BOT_TOKEN") and kwargs.get("TG_USER_ID")) or (push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"))):
-        print("tg 服务的 bot_token 或者 user_id 未设置!!\n取消推送")
+        print("tg 服务的 TG_BOT_TOKEN 或者 TG_USER_ID 未设置!!\n取消推送")
         return
     print("tg 服务启动")
+    if kwargs.get("TG_BOT_TOKEN") and kwargs.get("TG_USER_ID"):
+        TG_BOT_TOKEN = kwargs.get("TG_BOT_TOKEN")
+        TG_USER_ID = kwargs.get("TG_USER_ID")
+    else:
+        TG_BOT_TOKEN = push_config.get("TG_BOT_TOKEN")
+        TG_USER_ID = push_config.get("TG_USER_ID")
 
-    if push_config.get("TG_API_HOST"):
+    if kwargs.get("TG_API_HOST") or push_config.get("TG_API_HOST"):
-        url = f"{push_config.get('TG_API_HOST')}/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
+        TG_API_HOST = kwargs.get("TG_API_HOST", push_config.get("TG_API_HOST"))
+        url = f"{TG_API_HOST}/bot{TG_BOT_TOKEN}/sendMessage"
     else:
         url = (
-            f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
+            f"https://api.telegram.org/bot{TG_BOT_TOKEN}/sendMessage"
         )
     headers = {"Content-Type": "application/x-www-form-urlencoded"}
     payload = {
-        "chat_id": str(push_config.get("TG_USER_ID")),
+        "chat_id": str(TG_USER_ID),
         "text": f"{title}\n\n{content}",
         "disable_web_page_preview": "true",
     }
     proxies = None
-    if push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"):
+    if not ((kwargs.get("TG_PROXY_HOST") and kwargs.get("TG_PROXY_PORT")) or (push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"))):
-        if push_config.get("TG_PROXY_AUTH") is not None and "@" not in push_config.get(
+        if kwargs.get("TG_PROXY_HOST") and kwargs.get("TG_PROXY_PORT"):
-            "TG_PROXY_HOST"
+            TG_PROXY_HOST = kwargs.get("TG_PROXY_HOST")
-        ):
+            TG_PROXY_PORT = kwargs.get("TG_PROXY_PORT")
-            push_config["TG_PROXY_HOST"] = (
+        else:
-                push_config.get("TG_PROXY_AUTH")
+            TG_PROXY_HOST = kwargs.get("TG_PROXY_HOST")
+            TG_PROXY_PORT = kwargs.get("TG_PROXY_PORT")
+        if kwargs.get("TG_PROXY_AUTH") or push_config.get("TG_PROXY_AUTH"):
+            TG_PROXY_AUTH = kwargs.get("TG_PROXY_AUTH", push_config.get("TG_PROXY_AUTH"))
+        if TG_PROXY_AUTH is not None and "@" not in TG_PROXY_HOST:
+            TG_PROXY_HOST = (
+                TG_PROXY_AUTH
                 + "@"
-                + push_config.get("TG_PROXY_HOST")
+                + TG_PROXY_HOST
             )
         proxyStr = "http://{}:{}".format(
-            push_config.get("TG_PROXY_HOST"), push_config.get("TG_PROXY_PORT")
+            TG_PROXY_HOST, TG_PROXY_PORT
         )
         proxies = {"http": proxyStr, "https": proxyStr}
     response = requests.post(
@@ -608,33 +629,48 @@ def telegram_bot(title: str, content: str) -> None:
         print("tg 推送失败！")
 
 
-def aibotk(title: str, content: str) -> None:
+def aibotk(title: str, content: str, **kwargs) -> None:
     """
     使用 智能微秘书 推送消息。
     """
-    if (
+    if not (
-        not push_config.get("AIBOTK_KEY")
+        (
-        or not push_config.get("AIBOTK_TYPE")
+            kwargs.get("AIBOTK_KEY")
-        or not push_config.get("AIBOTK_NAME")
+            and kwargs.get("AIBOTK_TYPE")
-    ):
+            and kwargs.get("AIBOTK_NAME")
+        ) 
+        or
+        (
+            push_config.get("AIBOTK_KEY")
+            and push_config.get("AIBOTK_TYPE")
+            and push_config.get("AIBOTK_NAME")
+        )
+        ):
         print(
             "智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送"
         )
         return
     print("智能微秘书 服务启动")
-
+    if kwargs.get("AIBOTK_KEY") and kwargs.get("AIBOTK_TYPE") and kwargs.get("AIBOTK_NAME"):
-    if push_config.get("AIBOTK_TYPE") == "room":
+        AIBOTK_KEY = kwargs.get("AIBOTK_KEY")
+        AIBOTK_TYPE = kwargs.get("AIBOTK_TYPE")
+        AIBOTK_NAME = kwargs.get("AIBOTK_NAME")
+    else:
+        AIBOTK_KEY = push_config.get("AIBOTK_KEY")
+        AIBOTK_TYPE = push_config.get("AIBOTK_TYPE")
+        AIBOTK_NAME = push_config.get("AIBOTK_NAME")
+    if AIBOTK_TYPE == "room":
         url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
         data = {
-            "apiKey": push_config.get("AIBOTK_KEY"),
+            "apiKey": AIBOTK_KEY,
-            "roomName": push_config.get("AIBOTK_NAME"),
+            "roomName": AIBOTK_NAME,
             "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
         }
     else:
         url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
         data = {
-            "apiKey": push_config.get("AIBOTK_KEY"),
+            "apiKey": AIBOTK_KEY,
-            "name": push_config.get("AIBOTK_NAME"),
+            "name": AIBOTK_NAME,
             "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
         }
     body = json.dumps(data).encode(encoding="utf-8")
@@ -647,50 +683,74 @@ def aibotk(title: str, content: str) -> None:
         print(f'智能微秘书 推送失败！{response["error"]}')
 
 
-def smtp(title: str, content: str) -> None:
+def smtp(title: str, content: str, **kwargs) -> None:
     """
     使用 SMTP 邮件 推送消息。
     """
-    if (
+    if not ((
-        not push_config.get("SMTP_SERVER")
+        kwargs.get("SMTP_SERVER")
-        or not push_config.get("SMTP_SSL")
+        and kwargs.get("SMTP_SSL")
-        or not push_config.get("SMTP_EMAIL")
+        and kwargs.get("SMTP_EMAIL")
-        or not push_config.get("SMTP_PASSWORD")
+        and kwargs.get("SMTP_PASSWORD")
-        or not push_config.get("SMTP_NAME")
+        and kwargs.get("SMTP_NAME")
-    ):
+    ) or (
+        push_config.get("SMTP_SERVER")
+        and push_config.get("SMTP_SSL")
+        and push_config.get("SMTP_EMAIL")
+        and push_config.get("SMTP_PASSWORD")
+        and push_config.get("SMTP_NAME")
+    )):
         print(
             "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送"
         )
         return
     print("SMTP 邮件 服务启动")
+    if (
+        kwargs.get("SMTP_SERVER")
+        and kwargs.get("SMTP_SSL")
+        and kwargs.get("SMTP_EMAIL")
+        and kwargs.get("SMTP_PASSWORD")
+        and kwargs.get("SMTP_NAME")
+    ):
+        SMTP_SERVER = kwargs.get("SMTP_SERVER")
+        SMTP_SSL = kwargs.get("SMTP_SSL")
+        SMTP_EMAIL = kwargs.get("SMTP_EMAIL")
+        SMTP_PASSWORD = kwargs.get("SMTP_PASSWORD")
+        SMTP_NAME = kwargs.get("SMTP_NAME")
+    else:
+        SMTP_SERVER = push_config.get("SMTP_SERVER")
+        SMTP_SSL = push_config.get("SMTP_SSL")
+        SMTP_EMAIL = push_config.get("SMTP_EMAIL")
+        SMTP_PASSWORD = push_config.get("SMTP_PASSWORD")
+        SMTP_NAME = push_config.get("SMTP_NAME")
 
     message = MIMEText(content, "plain", "utf-8")
     message["From"] = formataddr(
         (
-            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
+            Header(SMTP_NAME, "utf-8").encode(),
-            push_config.get("SMTP_EMAIL"),
+            SMTP_EMAIL,
         )
     )
     message["To"] = formataddr(
         (
-            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
+            Header(SMTP_NAME, "utf-8").encode(),
-            push_config.get("SMTP_EMAIL"),
+            SMTP_EMAIL,
         )
     )
     message["Subject"] = Header(title, "utf-8")
 
     try:
         smtp_server = (
-            smtplib.SMTP_SSL(push_config.get("SMTP_SERVER"))
+            smtplib.SMTP_SSL(SMTP_SERVER)
-            if push_config.get("SMTP_SSL") == "true"
+            if SMTP_SSL == "true"
-            else smtplib.SMTP(push_config.get("SMTP_SERVER"))
+            else smtplib.SMTP(SMTP_SERVER)
         )
         smtp_server.login(
-            push_config.get("SMTP_EMAIL"), push_config.get("SMTP_PASSWORD")
+            SMTP_EMAIL, SMTP_PASSWORD
         )
         smtp_server.sendmail(
-            push_config.get("SMTP_EMAIL"),
+            SMTP_EMAIL,
-            push_config.get("SMTP_EMAIL"),
+            SMTP_EMAIL,
             message.as_bytes(),
         )
         smtp_server.close()
@@ -699,26 +759,20 @@ def smtp(title: str, content: str) -> None:
         print(f"SMTP 邮件 推送失败！{e}")
 
 
-def pushme(title: str, content: str) -> None:
+def pushme(title: str, content: str, **kwargs) -> None:
     """
     使用 PushMe 推送消息。
     """
-    if not push_config.get("PUSHME_KEY"):
+    if not (kwargs.get("PUSHME_KEY") or push_config.get("PUSHME_KEY")):
         print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送")
         return
     print("PushMe 服务启动")
+    PUSHME_KEY = kwargs.get("PUSHME_KEY", push_config.get("PUSHME_KEY"))
 
-    url = (
+    url = f'https://push.i-i.me/?push_key={PUSHME_KEY}'
-        push_config.get("PUSHME_URL")
-        if push_config.get("PUSHME_URL")
-        else "https://push.i-i.me/"
-    )
     data = {
-        "push_key": push_config.get("PUSHME_KEY"),
         "title": title,
         "content": content,
-        "date": push_config.get("date") if push_config.get("date") else "",
-        "type": push_config.get("type") if push_config.get("type") else "",
     }
     response = requests.post(url, data=data)
 
@@ -728,27 +782,42 @@ def pushme(title: str, content: str) -> None:
         print(f"PushMe 推送失败！{response.status_code} {response.text}")
 
 
-def chronocat(title: str, content: str) -> None:
+def chronocat(title: str, content: str, **kwargs) -> None:
     """
     使用 CHRONOCAT 推送消息。
     """
-    if (
+    if not ((
-        not push_config.get("CHRONOCAT_URL")
+        push_config.get("CHRONOCAT_URL")
-        or not push_config.get("CHRONOCAT_QQ")
+        and push_config.get("CHRONOCAT_QQ")
-        or not push_config.get("CHRONOCAT_TOKEN")
+        and push_config.get("CHRONOCAT_TOKEN")
-    ):
+    ) or (
+        push_config.get("CHRONOCAT_URL")
+        and push_config.get("CHRONOCAT_QQ")
+        and push_config.get("CHRONOCAT_TOKEN")
+    )):
         print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送")
         return
-
     print("CHRONOCAT 服务启动")
+    if (
+        kwargs.get("CHRONOCAT_URL")
+        and kwargs.get("CHRONOCAT_QQ")
+        and kwargs.get("CHRONOCAT_TOKEN")
+    ):
+        CHRONOCAT_URL = kwargs.get("CHRONOCAT_URL")
+        CHRONOCAT_QQ = kwargs.get("CHRONOCAT_QQ")
+        CHRONOCAT_TOKEN = kwargs.get("CHRONOCAT_TOKEN")
+    else:
+        CHRONOCAT_URL = push_config.get("CHRONOCAT_URL")
+        CHRONOCAT_QQ = push_config.get("CHRONOCAT_QQ")
+        CHRONOCAT_TOKEN = push_config.get("CHRONOCAT_TOKEN")
 
-    user_ids = re.findall(r"user_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+    user_ids = re.findall(r"user_id=(\d+)", CHRONOCAT_QQ)
-    group_ids = re.findall(r"group_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+    group_ids = re.findall(r"group_id=(\d+)", CHRONOCAT_QQ)
 
-    url = f'{push_config.get("CHRONOCAT_URL")}/api/message/send'
+    url = f'{CHRONOCAT_URL}/api/message/send'
     headers = {
         "Content-Type": "application/json",
-        "Authorization": f'Bearer {push_config.get("CHRONOCAT_TOKEN")}',
+        "Authorization": f'Bearer {CHRONOCAT_TOKEN}',
     }
 
     for chat_type, ids in [(1, user_ids), (2, group_ids)]:
@@ -796,14 +865,13 @@ def parse_headers(headers):
     return parsed
 
 
-def parse_string(input_string, value_format_fn=None):
+def parse_string(input_string):
     matches = {}
-    pattern = r"(\w+):\s*((?:(?!\n\w+:).)*)"
+    pattern = r'(\w+):\s*((?:(?!\n\w+:).)*)'
     regex = re.compile(pattern)
     for match in regex.finditer(input_string):
         key, value = match.group(1).strip(), match.group(2).strip()
         try:
-            value = value_format_fn(value) if value_format_fn else value
             json_value = json.loads(value)
             matches[key] = json_value
         except:
@@ -811,14 +879,14 @@ def parse_string(input_string, value_format_fn=None):
     return matches
 
 
-def parse_body(body, content_type, value_format_fn=None):
+def parse_body(body, content_type):
     if not body or content_type == "text/plain":
-        return value_format_fn(body) if value_format_fn and body else body
+        return body
 
-    parsed = parse_string(body, value_format_fn)
+    parsed = parse_string(input_string)
 
     if content_type == "application/x-www-form-urlencoded":
-        data = urllib.parse.urlencode(parsed, doseq=True)
+        data = urlencode(parsed, doseq=True)
         return data
 
     if content_type == "application/json":
@@ -828,6 +896,18 @@ def parse_body(body, content_type, value_format_fn=None):
     return parsed
 
 
+def format_notify_content(url, body, title, content):
+    if "$title" not in url and "$title" not in body:
+        return {}
+
+    formatted_url = url.replace("$title", urllib.parse.quote_plus(title)).replace(
+        "$content", urllib.parse.quote_plus(content)
+    )
+    formatted_body = body.replace("$title", title).replace("$content", content)
+
+    return formatted_url, formatted_body
+
+
 def custom_notify(title: str, content: str) -> None:
     """
     通过 自定义通知 推送消息。
@@ -844,21 +924,18 @@ def custom_notify(title: str, content: str) -> None:
     WEBHOOK_BODY = push_config.get("WEBHOOK_BODY")
     WEBHOOK_HEADERS = push_config.get("WEBHOOK_HEADERS")
 
-    if "$title" not in WEBHOOK_URL and "$title" not in WEBHOOK_BODY:
+    formatUrl, formatBody = format_notify_content(
+        WEBHOOK_URL, WEBHOOK_BODY, title, content
+    )
+
+    if not formatUrl and not formatBody:
         print("请求头或者请求体中必须包含 $title 和 $content")
         return
 
     headers = parse_headers(WEBHOOK_HEADERS)
-    body = parse_body(
+    body = parse_body(formatBody, WEBHOOK_CONTENT_TYPE)
-        WEBHOOK_BODY,
-        WEBHOOK_CONTENT_TYPE,
-        lambda v: v.replace("$title", title).replace("$content", content),
-    )
-    formatted_url = WEBHOOK_URL.replace(
-        "$title", urllib.parse.quote_plus(title)
-    ).replace("$content", urllib.parse.quote_plus(content))
     response = requests.request(
-        method=WEBHOOK_METHOD, url=formatted_url, headers=headers, timeout=15, data=body
+        method=WEBHOOK_METHOD, url=formatUrl, headers=headers, timeout=15, data=body
     )
 
     if response.status_code == 200:
@@ -878,7 +955,6 @@ def one() -> str:
 
 
 def add_notify_function():
-    notify_function = []
     if push_config.get("BARK_PUSH"):
         notify_function.append(bark)
     if push_config.get("CONSOLE"):
@@ -901,8 +977,6 @@ def add_notify_function():
         notify_function.append(chat)
     if push_config.get("PUSH_PLUS_TOKEN"):
         notify_function.append(pushplus_bot)
-    if push_config.get("WE_PLUS_BOT_TOKEN"):
-        notify_function.append(weplus_bot)
     if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"):
         notify_function.append(qmsg_bot)
     if push_config.get("QYWX_AM"):
@@ -936,19 +1010,8 @@ def add_notify_function():
     if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
         notify_function.append(custom_notify)
 
-    if not notify_function:
-        print(f"无推送渠道，请检查通知变量是否正确")
-    return notify_function
-
-
-def send(title: str, content: str, ignore_default_config: bool = False, **kwargs):
-    if kwargs:
-        global push_config
-        if ignore_default_config:
-            push_config = kwargs  # 清空从环境变量获取的配置
-        else:
-            push_config.update(kwargs)
 
+def send(title: str, content: str, **kwargs) -> None:
     if not content:
         print(f"{title} 推送内容为空！")
         return
@@ -961,11 +1024,11 @@ def send(title: str, content: str, ignore_default_config: bool = False, **kwargs
             return
 
     hitokoto = push_config.get("HITOKOTO")
-    content += "\n\n" + one() if hitokoto != "false" else ""
+    content += "\n\n" + one() if hitokoto else ""
 
-    notify_function = add_notify_function()
+    add_notify_function()
     ts = [
-        threading.Thread(target=mode, args=(title, content), name=mode.__name__)
+        threading.Thread(target=mode, args=(title, content),kwargs=kwargs, name=mode.__name__)
         for mode in notify_function
     ]
     [t.start() for t in ts]

sample/ql_sample.js

@@ -1,9 +0,0 @@
-/**
- * 任务名称
- * name: script name
- * 定时规则
- * cron: 1 9 * * *
- */
-console.log('test scripts');
-QLAPI.notify('test scripts', 'test desc');
-console.log('test desc');

sample/ql_sample.py

@@ -1,9 +0,0 @@
-"""
-任务名称
-name: script name
-定时规则
-cron: 1 9 * * *
-"""
-print("test script")
-QLAPI.notify('test script', 'test desc')
-print("test desc")

shell/api.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 create_token() {
-  local token_command="ts-node-transpile-only ${dir_root}/back/token.ts"
+  local token_command="tsx ${dir_root}/back/token.ts"
   local token_file="${dir_root}/static/build/token.js"
   if [[ -f $token_file ]]; then
     token_command="node ${token_file}"

shell/check.sh

@@ -73,7 +73,7 @@ check_pm2() {
 
 main() {
   echo -e "=====> 开始检测"
-  npm i -g pnpm@8.3.1 pm2 ts-node
+  npm i -g pnpm@8.3.1 pm2 tsx
   patch_version
 
   reset_env
@@ -81,7 +81,6 @@ main() {
   check_ql
   check_nginx
   check_pm2
-  reload_update
   reload_pm2
   echo -e "\n=====> 检测结束\n"
 }

shell/otask.sh

@@ -69,18 +69,26 @@ run_nohup() {
   nohup node $file_name &>$log_path &
 }
 
-env_str_to_array() {
+check_server() {
-  . $file_env
+  if [[ $cpu_warn ]] && [[ $mem_warn ]] && [[ $disk_warn ]]; then
-  local IFS="&"
+    local top_result=$(top -b -n 1)
-  read -ra array <<<"${!env_param}"
+    cpu_use=$(echo "$top_result" | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
-  array_length=${#array[@]}
+
-  clear_env
+    mem_free=$(free -m | grep "Mem" | awk '{print $3}' | head -n 1)
+    mem_total=$(free -m | grep "Mem" | awk '{print $2}' | head -n 1)
+    mem_use=$(printf "%d%%" $((mem_free * 100 / mem_total)) | cut -f 1 -d "%" | head -n 1)
+
+    disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%" | head -n 1)
+    if [[ $cpu_use -gt $cpu_warn ]] && [[ $cpu_warn ]] || [[ $mem_free -lt $mem_warn ]] || [[ $disk_use -gt $disk_warn ]]; then
+      local resource=$(echo "$top_result" | grep -v -E 'grep|Mem|idle|Load|tr' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10 | tr '\n' '|' | sed s/\|/\\\\n/g)
+      notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource"
+    fi
+  fi
 }
 
-clear_non_sh_env() {
+env_str_to_array() {
-  if [[ $file_param != *.sh ]]; then
+  local IFS="&"
-    clear_env
+  read -ra array <<<"${!env_param}"
-  fi
 }
 
 ## 正常运行单个脚本，$1：传入参数
@@ -97,34 +105,37 @@ run_normal() {
     file_param=${file_param/$relative_path\//}
   fi
 
-  if [[ $isJsOrPythonFile == 'false' ]]; then
-    clear_non_sh_env
-  fi
   $timeoutCmd $which_program $file_param "${script_params[@]}"
 }
 
-handle_env_split() {
-  if [[ ! $num_param ]]; then
-    num_param="1-max"
-  fi
-
-  env_str_to_array
-  local tempArr=$(echo $num_param | sed "s/-max/-${array_length}/g" | sed "s/max-/${array_length}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
-  local runArr=($(eval echo $tempArr))
-  array_run=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
-}
-
 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
 run_concurrent() {
   local file_param="$1"
   local env_param="$2"
-  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|" | awk '{$1=$1};1')
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
   if [[ ! $env_param ]]; then
     echo -e "\n 缺少并发运行的环境变量参数"
     exit 1
   fi
 
-  handle_env_split
+  env_str_to_array
+  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local runArr=($(eval echo $tempArr))
+  runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
+
+  local n=0
+  for i in ${runArr[@]}; do
+    array_run[n]=${array[$i - 1]}
+    let n++
+  done
+
+  local cookieStr=$(
+    IFS="&"
+    echo "${array_run[*]}"
+  )
+  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
+
+  env_str_to_array
   single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%3N")
 
   cd $dir_scripts
@@ -133,24 +144,15 @@ run_concurrent() {
     cd ${relative_path}
     file_param=${file_param/$relative_path\//}
   fi
-
+  for i in "${!array[@]}"; do
-  local j=0
+    export "${env_param}=${array[i]}"
-  for i in ${array_run[@]}; do
+    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-    single_log_path="$dir_log/$log_dir/${single_log_time}_$((j + 1)).log"
+    eval $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
-    let j++
-
-    if [[ $isJsOrPythonFile == 'false' ]]; then
-      export "${env_param}=${array[$i - 1]}"
-      clear_non_sh_env
-    fi
-    eval envParam="${env_param}" numParam="${i}" $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
   done
 
   wait
-  local k=0
+  for i in "${!array[@]}"; do
-  for i in ${array_run[@]}; do
+    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-    single_log_path="$dir_log/$log_dir/${single_log_time}_$((k + 1)).log"
-    let k++
     cat $single_log_path
     [[ -f $single_log_path ]] && rm -f $single_log_path
   done
@@ -159,27 +161,28 @@ run_concurrent() {
 run_designated() {
   local file_param="$1"
   local env_param="$2"
-  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|" | awk '{$1=$1};1')
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
-  if [[ ! $env_param ]]; then
+  if [[ ! $env_param ]] || [[ ! $num_param ]]; then
-    echo -e "\n 缺少单独运行的参数 task xxx.js desi Test"
+    echo -e "\n 缺少单独运行的参数 task xxx.js desi Test 1 3"
     exit 1
   fi
 
-  handle_env_split
+  env_str_to_array
+  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local runArr=($(eval echo $tempArr))
+  runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
 
-  if [[ $isJsOrPythonFile == 'false' ]]; then
+  local n=0
-    local n=0
+  for i in ${runArr[@]}; do
-    for i in ${array_run[@]}; do
+    array_run[n]=${array[$i - 1]}
-      array_str[n]=${array[$i - 1]}
+    let n++
-      let n++
+  done
-    done
+
-    local envStr=$(
+  local cookieStr=$(
-      IFS="&"
+    IFS="&"
-      echo "${array_str[*]}"
+    echo "${array_run[*]}"
-    )
+  )
-    [[ ! -z $envStr ]] && export "${env_param}=${envStr}"
+  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
-    clear_non_sh_env
-  fi
 
   cd $dir_scripts
   local relative_path="${file_param%/*}"
@@ -187,8 +190,7 @@ run_designated() {
     cd ${relative_path}
     file_param=${file_param/$relative_path\//}
   fi
-
+  $timeoutCmd $which_program $file_param "${script_params[@]}"
-  envParam="${env_param}" numParam="${num_param}" $timeoutCmd $which_program $file_param "${script_params[@]}"
 }
 
 ## 运行其他命令
@@ -204,37 +206,12 @@ run_else() {
 
   shift
 
-  clear_non_sh_env
   $timeoutCmd $which_program $file_param "$@"
 }
 
-check_file() {
+## 命令检测
-  isJsOrPythonFile="false"
-  if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.ts ]]; then
-    isJsOrPythonFile="true"
-  fi
-  if [[ -f $file_env ]]; then
-    get_env_array
-    if [[ $isJsOrPythonFile == 'true' ]]; then
-      PREV_NODE_OPTIONS="${NODE_OPTIONS}"
-      PREV_PYTHONPATH="${PYTHONPATH}"
-      if [[ $1 == *.js ]] || [[ $1 == *.ts ]]; then
-        export NODE_OPTIONS="${NODE_OPTIONS} -r ${file_preload_js}"
-      else
-        export PYTHONPATH="${PYTHONPATH}:${dir_preload}:${dir_config}"
-      fi
-    else
-      . $file_env
-    fi
-  fi
-}
-
 main() {
   if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
-    if [[ $1 == *.sh ]]; then
-      timeoutCmd=""
-    fi
-
     case $# in
     1)
       run_normal "$1"
@@ -265,15 +242,7 @@ main() {
 }
 
 handle_task_start "${task_shell_params[@]}"
-check_file "${task_shell_params[@]}"
+run_task_before "${task_shell_params[@]}"
-if [[ $isJsOrPythonFile == 'false' ]]; then
-  run_task_before "${task_shell_params[@]}"
-fi
 main "${task_shell_params[@]}"
-if [[ $isJsOrPythonFile == 'true' ]]; then
-  export NODE_OPTIONS="${PREV_NODE_OPTIONS}"
-  export PYTHONPATH="${PREV_PYTHONPATH}"
-fi
 run_task_after "${task_shell_params[@]}"
-clear_env
 handle_task_end "${task_shell_params[@]}"

shell/preload/sitecustomize.js

@@ -1,79 +0,0 @@
-const { execSync } = require('child_process');
-require(`./env.js`);
-function expandRange(rangeStr, max) {
-  const tempRangeStr = rangeStr
-    .trim()
-    .replace(/-max/g, `-${max}`)
-    .replace(/max-/g, `${max}-`);
-
-  return tempRangeStr.split(' ').flatMap((part) => {
-    const rangeMatch = part.match(/^(\d+)([-~_])(\d+)$/);
-    if (rangeMatch) {
-      const [, start, , end] = rangeMatch.map(Number);
-      const step = start < end ? 1 : -1;
-      return Array.from(
-        { length: Math.abs(end - start) + 1 },
-        (_, i) => start + i * step,
-      );
-    }
-    return Number(part);
-  });
-}
-
-function run() {
-  const {
-    envParam,
-    numParam,
-    file_task_before,
-    file_task_before_js,
-    dir_scripts,
-    task_before,
-  } = process.env;
-
-  require(file_task_before_js);
-
-  try {
-    const splitStr = '__sitecustomize__';
-    const fileName = process.argv[1].replace(`${dir_scripts}/`, '');
-    let command = `bash -c "source ${file_task_before} ${fileName}`;
-    if (task_before) {
-      const escapeTaskBefore = task_before.replace(/"/g, '\\"');
-      command = `${command} && echo -e '执行前置命令\n' && eval '${escapeTaskBefore}' && echo -e '\n执行前置命令结束\n'`;
-    }
-    const res = execSync(
-      `${command} && echo -e '${splitStr}' && NODE_OPTIONS= node -p 'JSON.stringify(process.env)'"`,
-      {
-        encoding: 'utf-8',
-      },
-    );
-    const [output, envStr] = res.split(splitStr);
-    const newEnvObject = JSON.parse(envStr.trim());
-    for (const key in newEnvObject) {
-      process.env[key] = newEnvObject[key];
-    }
-    console.log(output);
-  } catch (error) {
-    if (!error.message.includes('spawnSync /bin/sh E2BIG')) {
-      console.log(`run task before error: `, error);
-    }
-  }
-
-  if (envParam && numParam) {
-    const array = (process.env[envParam] || '').split('&');
-    const runArr = expandRange(numParam, array.length);
-    const arrayRun = runArr.map((i) => array[i - 1]);
-    const envStr = arrayRun.join('&');
-    process.env[envParam] = envStr;
-  }
-}
-
-try {
-  run();
-
-  const { sendNotify } = require('./notify.js');
-  global.QLAPI = {
-    notify: sendNotify,
-  };
-} catch (error) {
-  console.log(`run builtin code error: `, error, '\n');
-}

shell/preload/sitecustomize.py

@@ -1,95 +0,0 @@
-import os
-import re
-import subprocess
-import json
-import builtins
-import sys
-import env
-
-
-def try_parse_int(value):
-    try:
-        return int(value)
-    except ValueError:
-        return None
-
-
-def expand_range(range_str, max_value):
-    temp_range_str = (
-        range_str.strip()
-        .replace("-max", f"-{max_value}")
-        .replace("max-", f"{max_value}-")
-    )
-
-    result = []
-    for part in temp_range_str.split(" "):
-        range_match = re.match(r"^(\d+)([-~_])(\d+)$", part)
-        if range_match:
-            start, _, end = map(try_parse_int, range_match.groups())
-            step = 1 if start < end else -1
-            result.extend(range(start, end + step, step))
-        else:
-            result.append(int(part))
-
-    return result
-
-
-def run():
-    import task_before
-
-    try:
-        split_str = "__sitecustomize__"
-        file_name = sys.argv[0].replace(f"{os.getenv('dir_scripts')}/", "")
-        command = f'bash -c "source {os.getenv("file_task_before")} {file_name}'
-        task_before = os.getenv("task_before")
-
-        if task_before:
-            escape_task_before = task_before.replace('"', '\\"')
-            command += f" && echo -e '执行前置命令\n' && eval '{escape_task_before}' && echo -e '\n执行前置命令结束\n'"
-
-        python_command = "PYTHONPATH= python3 -c 'import os, json; print(json.dumps(dict(os.environ)))'"
-        command += f" && echo -e '{split_str}' && {python_command}\""
-
-        res = subprocess.check_output(command, shell=True, encoding="utf-8")
-        output, env_str = res.split(split_str)
-
-        env_json = json.loads(env_str.strip())
-
-        for key, value in env_json.items():
-            os.environ[key] = value
-
-        print(output)
-
-    except subprocess.CalledProcessError as error:
-        print(f"run task before error: {error}")
-    except OSError as error:
-        error_message = str(error)
-        if "Argument list too long" not in error_message:
-            print(f"run task before error: {error}")
-    except Exception as error:
-        print(f"run task before error: {error}")
-
-    env_param = os.getenv("envParam")
-    num_param = os.getenv("numParam")
-
-    if env_param and num_param:
-        array = (os.getenv(env_param) or "").split("&")
-        run_arr = expand_range(num_param, len(array))
-        array_run = [array[i - 1] for i in run_arr if i - 1 < len(array) and i > 0]
-        env_str = "&".join(array_run)
-        os.environ[env_param] = env_str
-
-
-try:
-    run()
-    
-    from notify import send
-
-    class BaseApi:
-        def notify(self, *args, **kwargs):
-            return send(*args, **kwargs)
-
-    QLAPI = BaseApi()
-    builtins.QLAPI = QLAPI
-except Exception as error:
-    print(f"run builtin code error: {error}\n")

shell/pub.sh

@@ -11,7 +11,7 @@ echo -e "提交master代码"
 git push
 
 echo -e "更新cdn文件"
-ts-node-transpile-only sample/tool.ts
+tsx sample/tool.ts
 
 string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"

shell/share.sh

@@ -1,57 +1,44 @@
 #!/usr/bin/env bash
 
 ## 目录
-export dir_root=$QL_DIR
+dir_root=$QL_DIR
-export dir_tmp=$dir_root/.tmp
+dir_tmp=$dir_root/.tmp
-export dir_data=$dir_root/data
+dir_data=$dir_root/data
-
+dir_shell=$dir_root/shell
-if [[ $QL_DATA_DIR ]]; then
+dir_sample=$dir_root/sample
-  export dir_data="${QL_DATA_DIR%/}"
+dir_static=$dir_root/static
-fi
+dir_config=$dir_data/config
-
+dir_scripts=$dir_data/scripts
-export dir_shell=$dir_root/shell
+dir_repo=$dir_data/repo
-export dir_preload=$dir_shell/preload
+dir_raw=$dir_data/raw
-export dir_sample=$dir_root/sample
+dir_log=$dir_data/log
-export dir_static=$dir_root/static
+dir_db=$dir_data/db
-export dir_config=$dir_data/config
+dir_dep=$dir_data/deps
-export dir_scripts=$dir_data/scripts
+dir_list_tmp=$dir_log/.tmp
-export dir_repo=$dir_data/repo
+dir_update_log=$dir_log/update
-export dir_raw=$dir_data/raw
+ql_static_repo=$dir_repo/static
-export dir_log=$dir_data/log
-export dir_db=$dir_data/db
-export dir_dep=$dir_data/deps
-export dir_list_tmp=$dir_log/.tmp
-export dir_update_log=$dir_log/update
-export ql_static_repo=$dir_repo/static
 
 ## 文件
-export file_config_sample=$dir_sample/config.sample.sh
+file_config_sample=$dir_sample/config.sample.sh
-export file_env=$dir_preload/env.sh
+file_env=$dir_config/env.sh
-export file_preload_js=$dir_preload/sitecustomize.js
+file_sharecode=$dir_config/sharecode.sh
-export file_sharecode=$dir_config/sharecode.sh
+file_config_user=$dir_config/config.sh
-export file_config_user=$dir_config/config.sh
+file_auth_sample=$dir_sample/auth.sample.json
-export file_auth_sample=$dir_sample/auth.sample.json
+file_auth_user=$dir_config/auth.json
-export file_auth_user=$dir_config/auth.json
+file_auth_token=$dir_config/token.json
-export file_auth_token=$dir_config/token.json
+file_extra_shell=$dir_config/extra.sh
-export file_extra_shell=$dir_config/extra.sh
+file_task_before=$dir_config/task_before.sh
-export file_task_before=$dir_config/task_before.sh
+file_task_after=$dir_config/task_after.sh
-export file_task_before_js=$dir_config/task_before.js
+file_task_sample=$dir_sample/task.sample.sh
-export file_task_before_py=$dir_config/task_before.py
+file_extra_sample=$dir_sample/extra.sample.sh
-export file_task_after=$dir_config/task_after.sh
+file_notify_js_sample=$dir_sample/notify.js
-export file_task_sample=$dir_sample/task.sample.sh
+file_notify_py_sample=$dir_sample/notify.py
-export file_extra_sample=$dir_sample/extra.sample.sh
+file_notify_py=$dir_scripts/notify.py
-export file_notify_js_sample=$dir_sample/notify.js
+file_notify_js=$dir_scripts/sendNotify.js
-export file_notify_py_sample=$dir_sample/notify.py
+nginx_app_conf=$dir_root/docker/front.conf
-export file_test_js_sample=$dir_sample/ql_sample.js
+nginx_conf=$dir_root/docker/nginx.conf
-export file_test_py_sample=$dir_sample/ql_sample.py
+dep_notify_py=$dir_dep/notify.py
-export file_notify_py=$dir_scripts/notify.py
+dep_notify_js=$dir_dep/sendNotify.js
-export file_notify_js=$dir_scripts/sendNotify.js
-export file_test_js=$dir_scripts/ql_sample.js
-export file_test_py=$dir_scripts/ql_sample.py
-export nginx_app_conf=$dir_root/docker/front.conf
-export nginx_conf=$dir_root/docker/nginx.conf
-export dep_notify_py=$dir_dep/notify.py
-export dep_notify_js=$dir_dep/sendNotify.js
 
 ## 清单文件
 list_crontab_user=$dir_config/crontab.list
@@ -78,6 +65,7 @@ init_env() {
 
 import_config() {
   [[ -f $file_config_user ]] && . $file_config_user
+  [[ -f $file_env ]] && . $file_env
 
   ql_base_url=${QlBaseUrl:-"/"}
   ql_port=${QlPort:-"5700"}
@@ -91,6 +79,10 @@ import_config() {
   else
     default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
   fi
+
+  cpu_warn=${CpuWarn}
+  mem_warn=${MemoryWarn}
+  disk_warn=${DiskWarn}
 }
 
 set_proxy() {
@@ -133,6 +125,31 @@ gen_random_num() {
   echo $((${RANDOM} % $divi))
 }
 
+link_shell_sub() {
+  local link_path="$1"
+  local original_path="$2"
+  if [[ ! -L $link_path ]] || [[ $(readlink -f $link_path) != $original_path ]]; then
+    rm -f $link_path 2>/dev/null
+    ln -sf $original_path $link_path
+  fi
+}
+
+link_shell() {
+  if [[ $is_termux -eq 1 ]]; then
+    local path="/data/data/com.termux/files/usr/bin/"
+  elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
+    local path="/usr/local/bin/"
+  else
+    local path=""
+    echo -e "脚本功能受限，请自行添加命令的软连接...\n"
+  fi
+  if [[ $path ]]; then
+    for ((i = 0; i < ${#link_name[*]}; i++)); do
+      link_shell_sub "$path${link_name[i]}" "$dir_shell/${original_name[i]}"
+    done
+  fi
+}
+
 define_cmd() {
   local cmd_prefix cmd_suffix
   if type task &>/dev/null; then
@@ -175,6 +192,12 @@ fix_config() {
     echo
   fi
 
+  if [[ ! -f $file_env ]]; then
+    echo -e "检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...\n"
+    touch $file_env
+    echo
+  fi
+
   if [[ ! -f $file_task_before ]]; then
     echo -e "复制一份 $file_task_sample 为 $file_task_before\n"
     cp -fv $file_task_sample $file_task_before
@@ -211,16 +234,6 @@ fix_config() {
     echo
   fi
 
-  if [[ ! -s $file_test_js ]]; then
-    cp -fv $file_test_js_sample $file_test_js
-    echo
-  fi
-
-  if [[ ! -s $file_test_py ]]; then
-    cp -fv $file_test_py_sample $file_test_py
-    echo
-  fi
-
   if [[ -s /etc/nginx/conf.d/default.conf ]]; then
     echo -e "检测到默认nginx配置文件，清空...\n"
     cat /dev/null >/etc/nginx/conf.d/default.conf
@@ -280,7 +293,7 @@ git_clone_scripts() {
 
   set_proxy "$proxy"
 
-  git clone -q --depth=1 $part_cmd $url $dir
+  git clone --depth=1 $part_cmd $url $dir
   exit_status=$?
 
   unset_proxy
@@ -292,11 +305,6 @@ random_range() {
   echo $((RANDOM % ($end - $beg) + $beg))
 }
 
-delete_pm2() {
-  cd $dir_root
-  pm2 delete ecosystem.config.js
-}
-
 reload_pm2() {
   cd $dir_root
   restore_env_vars
@@ -304,13 +312,6 @@ reload_pm2() {
   pm2 startOrGracefulReload ecosystem.config.js
 }
 
-reload_update() {
-  cd $dir_root
-  restore_env_vars
-  pm2 flush &>/dev/null
-  pm2 startOrGracefulReload other.config.js
-}
-
 diff_time() {
   local format="$1"
   local begin_time="$2"
@@ -369,25 +370,25 @@ patch_version() {
 
   if [[ -d "$dir_root/db" ]]; then
     echo -e "检测到旧的db目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_data
+    cp -rf $dir_root/config $dir_root/data
     echo
   fi
 
   if [[ -d "$dir_root/scripts" ]]; then
     echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-    cp -rf $dir_root/scripts $dir_data
+    cp -rf $dir_root/scripts $dir_root/data
     echo
   fi
 
   if [[ -d "$dir_root/log" ]]; then
     echo -e "检测到旧的log目录，拷贝到data目录...\n"
-    cp -rf $dir_root/log $dir_data
+    cp -rf $dir_root/log $dir_root/data
     echo
   fi
 
   if [[ -d "$dir_root/config" ]]; then
     echo -e "检测到旧的config目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_data
+    cp -rf $dir_root/config $dir_root/data
     echo
   fi
 }
@@ -430,30 +431,19 @@ init_nginx() {
   sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf
 }
 
-get_env_array() {
-  exported_variables=()
-  while IFS= read -r line; do
-    exported_variables+=("$line")
-  done < <(grep '^export ' $file_env | awk '{print $2}' | cut -d= -f1)
-}
-
-clear_env() {
-  for var in "${exported_variables[@]}"; do
-    unset "$var"
-  done
-}
-
 handle_task_start() {
   [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
   echo -e "## 开始执行... $begin_time\n"
 }
 
 run_task_before() {
+  [[ $is_macos -eq 0 ]] && check_server
+
   . $file_task_before "$@"
 
   if [[ $task_before ]]; then
     echo -e "执行前置命令\n"
-    eval "$task_before" "$@"
+    eval "$task_before"
     echo -e "\n执行前置命令结束\n"
   fi
 }
@@ -463,7 +453,7 @@ run_task_after() {
 
   if [[ $task_after ]]; then
     echo -e "\n执行后置命令\n"
-    eval "$task_after" "$@"
+    eval "$task_after"
     echo -e "\n执行后置命令结束"
   fi
 }
@@ -484,3 +474,5 @@ init_env
 detect_termux
 detect_macos
 define_cmd
+
+import_config $1

shell/task.sh

@@ -19,9 +19,13 @@ define_program() {
   elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
     which_program="python3"
   elif [[ $file_param == *.sh ]]; then
-    which_program="."
+    which_program="bash"
   elif [[ $file_param == *.ts ]]; then
-    which_program="ts-node-transpile-only"
+    if ! type tsx &>/dev/null; then
+      which_program="ts-node-transpile-only"
+    else
+      which_program="tsx"
+    fi
   else
     which_program=""
   fi
@@ -113,7 +117,6 @@ init_begin_time() {
   begin_timestamp=$(format_timestamp "$time_format" "$time")
 }
 
-import_config "$@"
 while getopts ":lm:" opt; do
   case $opt in
   l)

shell/update.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 dir_shell=$QL_DIR/shell
+. $dir_shell/env.sh
 . $dir_shell/share.sh
 . $dir_shell/api.sh
-. $dir_shell/env.sh
 
 send_mark=$dir_shell/send_mark
 
@@ -34,6 +34,7 @@ output_list_add_drop() {
   if [[ -s $list ]]; then
     echo -e "检测到有${type}的定时任务:"
     cat $list
+    echo
   fi
 }
 
@@ -44,7 +45,7 @@ del_cron() {
   local path=$2
   local detail=""
   local ids=""
-  echo -e "\n开始尝试自动删除失效的定时任务..."
+  echo -e "开始尝试自动删除失效的定时任务..."
   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 | awk -F " " '{print $1}')
     if [[ $ids ]]; then
@@ -75,7 +76,7 @@ del_cron() {
 add_cron() {
   local list_add=$1
   local path=$2
-  echo -e "\n开始尝试自动添加定时任务..."
+  echo -e "开始尝试自动添加定时任务..."
   local detail=""
   cd $dir_scripts
   for file in $(cat $list_add); do
@@ -85,20 +86,19 @@ add_cron() {
       cron_line=$(
         perl -ne "{
                         print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$file_name/
-                    }" $file 2>/dev/null |
+                    }" $file |
           perl -pe "{
                         s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$file_name.*|\1|g;
                         s|\*([\d\*])(.*)|\1\2|g;
                         s|  | |g;
-                    }" 2>/dev/null | sort -u | head -1
+                    }" | sort -u | head -1
       )
+      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
+      [[ -z $cron_name ]] && cron_name="$file_name"
       [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line="$default_cron"
-      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
+      result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name:$SUB_ID")
-      [[ -z $cron_name ]] && cron_name=$(grep "name:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
-      [[ -z $cron_name ]] && cron_name=$(basename "$file_name")
-      result=$(add_cron_api "${cron_line}:${cmd_task} ${file}:${cron_name}:${SUB_ID}")
       echo -e "$result"
       if [[ $detail ]]; then
         detail="${detail}${result}\n"
@@ -135,10 +135,10 @@ update_repo() {
   git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "拉取 ${uniq_path} 成功...\n"
+    echo -e "\n拉取 ${uniq_path} 成功...\n"
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
-    echo -e "拉取 ${uniq_path} 失败，请检查日志...\n"
+    echo -e "\n拉取 ${uniq_path} 失败，请检查日志...\n"
   fi
 }
 
@@ -156,15 +156,21 @@ update_raw() {
     autoDelCron=${AutoDelCron}
   fi
 
+  local proxyStr=""
+  if [[ $proxy ]]; then
+    if [[ $url == http:* ]]; then
+      proxyStr="-e \"http_proxy=${proxy}\""
+    elif [[ $url == https:* ]]; then
+      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
+    fi
+  fi
+
   local raw_url="$url"
   local suffix="${raw_url##*.}"
   local raw_file_name="${uniq_path}.${suffix}"
   echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"
 
-  set_proxy "$proxy"
+  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
-  wget -q --no-check-certificate -O "$dir_raw/${raw_file_name}.new" ${raw_url}
-  exit_status=$?
-  unset_proxy
 
   if [[ $? -eq 0 ]]; then
     mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
@@ -189,7 +195,7 @@ update_raw() {
       [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line="$default_cron"
-      result=$(add_cron_api "${cron_line}:${cmd_task} ${filename}:${cron_name}:${SUB_ID}")
+      result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name:$SUB_ID")
       echo -e "$result\n"
       notify_api "新增任务通知" "\n$result"
       # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
@@ -225,37 +231,34 @@ usage() {
 }
 
 reload_qinglong() {
-  delete_pm2
-
   local reload_target="${1}"
   local primary_branch="master"
-  if [[ "${QL_BRANCH}" == "develop" ]] || [[ "${QL_BRANCH}" == "debian" ]] || [[ "${QL_BRANCH}" == "debian-dev" ]]; then
+  if [[ "${QL_BRANCH}" == "develop" ]]; then
-    primary_branch="${QL_BRANCH}"
+    primary_branch="develop"
   fi
 
   if [[ "$reload_target" == 'system' ]]; then
-    rm -rf ${dir_root}/back ${dir_root}/cli ${dir_root}/docker ${dir_root}/sample ${dir_root}/shell ${dir_root}/src
+    cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
-    mv -f ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
     rm -rf $dir_static/*
-    mv -f ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+    cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
     cp -f $file_config_sample $dir_config/config.sample.sh
   fi
 
   if [[ "$reload_target" == 'data' ]]; then
-    rm -rf ${dir_data}/*
+    rm -rf ${dir_root}/data
-    mv -f ${dir_tmp}/data/* ${dir_data}/
+    cp -rf ${dir_tmp}/data ${dir_root}/
   fi
 
   reload_pm2
 }
 
-## 更新 qinglong
+## 更新qinglong
 update_qinglong() {
   rm -rf ${dir_tmp}/*
   local mirror="gitee"
   local downloadQLUrl="https://gitee.com/whyour/qinglong/repository/archive"
   local downloadStaticUrl="https://gitee.com/whyour/qinglong-static/repository/archive"
-  local githubStatus=$(curl -s --noproxy "*" -m 2 -IL "https://google.com" | grep 200)
+  local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200)
   if [[ ! -z $githubStatus ]]; then
     mirror="github"
     downloadQLUrl="https://github.com/whyour/qinglong/archive/refs/heads"
@@ -307,12 +310,9 @@ check_update_dep() {
     echo -e "更新包下载成功..."
 
     if [[ "$needRestart" == 'true' ]]; then
-      delete_pm2
+      cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
-
-      rm -rf ${dir_root}/back ${dir_root}/cli ${dir_root}/docker ${dir_root}/sample ${dir_root}/shell ${dir_root}/src
-      mv -f ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
       rm -rf $dir_static/*
-      mv -f ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+      cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
       cp -f $file_config_sample $dir_config/config.sample.sh
 
       reload_pm2
@@ -417,15 +417,9 @@ gen_list_repo() {
   fi
 
   for file in ${files}; do
-    dirPath=$(dirname "$file")
     filename=$(basename "$file")
-    filePath="${uniq_path}/${filename}"
+    cp -f $file "$dir_scripts/${uniq_path}/${filename}"
-    if [[ $dirPath ]] && [[ $dirPath != '.' ]]; then
+    echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
-      mkdir -p "${dir_scripts}/${uniq_path}/${dirPath}"
-      filePath="${uniq_path}/${dirPath}/${filename}"
-    fi
-    cp -f $file "${dir_scripts}/$filePath"
-    echo "$filePath" >>"$dir_list_tmp/${uniq_path}_scripts.list"
     # cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task.* ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
     # if [[ $cron_id ]]; then
     #   result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
@@ -521,7 +515,7 @@ main() {
   raw)
     get_uniq_path "$p2"
     if [[ -n $p2 ]]; then
-      update_raw "$p2" "$p3" "$p4" "$p5"
+      update_raw "$p2" "$p3" "$p4"
     else
       eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd
@@ -563,7 +557,6 @@ main() {
   fi
 }
 
-import_config "$@"
 main "$@"
 
 exit 0

src/locales/en-US.json

@@ -336,7 +336,6 @@
   "企业微信应用": "WeChat Work App",
   "智能微秘书": "Smart WeChat Assistant",
   "群晖chat": "Synology Chat",
-  "微加机器人": "WePlusBot",
   "邮箱": "Email",
   "飞书机器人": "Feishu Bot",
   "自定义通知": "Custom Notification",
@@ -349,7 +348,7 @@
   "推送到个人QQ: http://127.0.0.1/send_private_msg，群：http://127.0.0.1/send_group_msg": "Push to personal QQ: http://127.0.0.1/send_private_msg, group: http://127.0.0.1/send_group_msg",
   "访问密钥": "Access Key",
   "如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群": "If GOBOT_URL is set to /send_private_msg, enter user_id=personal QQ; if set to /send_group_msg, enter group_id=QQ group",
-  "Server酱SENDKEY": "ServerChan SENDKEY, https://sct.ftqq.com/r/13363",
+  "Server酱SENDKEY": "ServerChan SENDKEY",
   "PushDeer的Key，https://github.com/easychen/pushdeer": "PushDeer Key, https://github.com/easychen/pushdeer",
   "PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push": "PushDeer's self-hosted API endpoint, default is https://api2.pushdeer.com/message/push",
   "Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX": "Bark information IP/device code, e.g., https://api.day.app/XXXXXXXX",
@@ -358,7 +357,6 @@
   "BARK推送消息的分组，默认为qinglong": "BARK push message grouping, default is qinglong",
   "BARK推送消息的时效性，默认为active": "BARK push message redirecting URL",
   "BARK推送消息的跳转URL": "BARK push message grouping, default is qinglong",
-  "BARK是否保存推送消息": "Does BARK save push messages",
   "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "Telegram Bot token, e.g., 1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
   "telegram用户的id，例如：129xxx206": "Telegram user ID, e.g., 129xxx206",
   "代理IP": "Proxy IP",
@@ -379,15 +377,11 @@
   "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot information push key, e.g., https://push.hellyw.com/XXXXXXXX",
   "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "After WeChat scan login, one-to-one or one-to-many push using the provided token (your Token). If PUSH_PLUS_USER is not provided, it defaults to one-to-one push. See reference at https://www.pushplus.plus/",
   "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "The 'group code' for one-to-many push (one-to-many push -> your group (if none, create one) -> group code). If you are the creator of the group, you need to click 'View QR code' to scan and bind, otherwise, you won't receive group messages.",
-  "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/": "Token, which can be obtained after scanning and logging in, is available under 'My Account' -> 'Settings' -> 'Tokens'. Please refer to the instructions for detailed steps: https://www.weplusbot.com/",
-  "消息接收人": "message recipient",
-  "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "Version, you can specify 'pro' for the Professional version and 'personal' for the Personal version. If left blank, it will default to the Professional version.",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "Feishu group bot: https://www.feishu.cn/hc/zh-CN/articles/360024984973",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "Email Address",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "The SMTP login password may also be a special passphrase, depending on the specific email service provider's instructions",
   "PushMe的Key，https://push.i-i.me/": "PushMe key, https://push.i-i.me/",
-  "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口": "The self built PushMeServer message interface address, for example: http://127.0.0.1:3010 If left blank, use the official message interface",
   "请求方法": "Request Method",
   "请求头Content-Type": "Request Header Content-Type",
   "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "Request URL should start with http or https. URL or body must contain $title, $content is optional and corresponds to the API content position.",
@@ -432,7 +426,7 @@
   "创建变量成功": "Variable created successfully",
   "编辑变量": "Edit Variable",
   "加载中...": "Loading...",
-  "夹下所有日志": "Folder and All Subfiles",
+  "夹下所以日志": "Folder and All Subfiles",
   "创建文件夹成功": "Folder created successfully",
   "创建文件成功": "File created successfully",
   "夹及其子文件": "Folder and Its Subfiles",

src/locales/zh-CN.json

@@ -336,7 +336,6 @@
   "企业微信应用": "企业微信应用",
   "智能微秘书": "智能微秘书",
   "群晖chat": "群晖chat",
-  "微加机器人": "微加机器人",
   "邮箱": "邮箱",
   "飞书机器人": "飞书机器人",
   "自定义通知": "自定义通知",
@@ -349,7 +348,7 @@
   "推送到个人QQ: http://127.0.0.1/send_private_msg，群：http://127.0.0.1/send_group_msg": "推送到个人QQ: http://127.0.0.1/send_private_msg，群：http://127.0.0.1/send_group_msg",
   "访问密钥": "访问密钥",
   "如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群": "如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群",
-  "Server酱SENDKEY": "Server 酱 SENDKEY，https://sct.ftqq.com/r/13363",
+  "Server酱SENDKEY": "Server酱SENDKEY",
   "PushDeer的Key，https://github.com/easychen/pushdeer": "PushDeer的Key，https://github.com/easychen/pushdeer",
   "PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push": "PushDeer的自架API endpoint，默认是 https://api2.pushdeer.com/message/push",
   "Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX": "Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX",
@@ -358,7 +357,6 @@
   "BARK推送消息的分组，默认为qinglong": "BARK推送消息的分组，默认为qinglong",
   "BARK推送消息的时效性，默认为active": "BARK推送消息的时效性，默认为active",
   "BARK推送消息的跳转URL": "BARK推送消息的跳转URL",
-  "BARK是否保存推送消息": "BARK是否保存推送消息",
   "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
   "telegram用户的id，例如：129xxx206": "telegram用户的id，例如：129xxx206",
   "代理IP": "代理IP",
@@ -379,15 +377,11 @@
   "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX",
   "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/",
   "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）",
-  "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/": "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/",
-  "消息接收人": "消息接收人",
-  "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "邮箱地址",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",
   "PushMe的Key，https://push.i-i.me/": "PushMe的Key，https://push.i-i.me/",
-  "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口": "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口",
   "请求方法": "请求方法",
   "请求头Content-Type": "请求头Content-Type",
   "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置",
@@ -432,7 +426,7 @@
   "创建变量成功": "创建变量成功",
   "编辑变量": "编辑变量",
   "加载中...": "加载中...",
-  "夹下所有日志": "夹下所有日志",
+  "夹下所以日志": "夹下所以日志",
   "创建文件夹成功": "创建文件夹成功",
   "创建文件成功": "创建文件成功",
   "夹及其子文件": "夹及其子文件",

src/pages/config/index.tsx

@@ -136,7 +136,6 @@ const Config = () => {
             lineNumbersMinChars: 3,
             folding: false,
             glyphMargin: false,
-            accessibilitySupport: 'off'
           }}
           onMount={(editor) => {
             editorRef.current = editor;

src/pages/crontab/detail.tsx

@@ -110,7 +110,6 @@ const CronDetailModal = ({
           minimap: { enabled: false },
           lineNumbersMinChars: 3,
           glyphMargin: false,
-          accessibilitySupport: 'off',
         }}
         onMount={(editor, monaco) => {
           editorRef.current = editor;
@@ -162,9 +161,8 @@ const CronDetailModal = ({
             setValue(data);
           }
         });
-    } else {
+    } else if (result) {
       setValidTabs([validTabs[0]]);
-      setActiveTabKey('log');
     }
   };
 
@@ -175,9 +173,8 @@ const CronDetailModal = ({
         <>
           {intl.get('确认保存文件')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {' '}
             {scriptInfo.filename}
-          </Text>
+          </Text>{' '}
           {intl.get('，保存后不可恢复')}
         </>
       ),
@@ -360,15 +357,10 @@ const CronDetailModal = ({
     <Modal
       title={
         <div className="crontab-title-wrapper">
-          <div style={{ minWidth: 0, display: 'flex', alignItems: 'center' }}>
+          <div style={{ minWidth: 0 }}>
             <Typography.Text
-              style={{ width: 200, boxSizing: 'content-box' }}
+              style={{ width: '100%' }}
-              ellipsis={{
+              ellipsis={{ tooltip: currentCron.name }}
-                onEllipsis(ellipsis) {
-                  return ellipsis;
-                },
-                tooltip: currentCron.name,
-              }}
             >
               {currentCron.name}
             </Typography.Text>

src/pages/crontab/index.less

@@ -81,7 +81,6 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    gap: 24px;
 
     .operations {
       display: flex;

src/pages/crontab/index.tsx

@@ -57,7 +57,6 @@ import { useVT } from 'virtualizedtableforantd4';
 import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type';
 import Name from '@/components/name';
 import dayjs from 'dayjs';
-import { noop } from 'lodash';
 
 const { Text, Paragraph, Link } = Typography;
 const { Search } = Input;
@@ -76,16 +75,18 @@ const Crontab = () => {
           style={{
             wordBreak: 'break-all',
             marginBottom: 0,
-            color: '#1890ff',
+            color: '#1890ff'
-            cursor: 'pointer',
           }}
           ellipsis={{ tooltip: text, rows: 2 }}
-          onClick={() => {
-            setDetailCron(record);
-            setIsDetailModalVisible(true);
-          }}
         >
-          <Link>{record.name || '-'}</Link>
+          <Link
+            onClick={() => {
+              setDetailCron(record);
+              setIsDetailModalVisible(true);
+            }}
+          >
+            {record.name || '-'}
+          </Link>
         </Paragraph>
       ),
       sorter: {
@@ -271,14 +272,9 @@ const Crontab = () => {
         record.sub_id ? (
           <Name
             service={() =>
-              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`, {
+              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`)
-                onError: noop,
-              })
             }
-            options={{
+            options={{ ready: record?.sub_id, cacheKey: record.sub_id }}
-              ready: record?.sub_id,
-              cacheKey: record.sub_id,
-            }}
           />
         ) : (
           '-'

src/pages/log/index.tsx

@@ -120,11 +120,10 @@ const Log = () => {
         <>
           {intl.get('确认删除')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {' '}
+            {select}
-            {select}{' '}
           </Text>
           {intl.get('文件')}
-          {currentNode.type === 'directory' ? intl.get('夹下所有日志') : ''}
+          {currentNode.type === 'directory' ? intl.get('夹下所以日志') : ''}
           {intl.get('，删除后不可恢复')}
         </>
       ),

src/pages/script/editModal.tsx

@@ -242,7 +242,6 @@ const EditModal = ({
             minimap: { enabled: false },
             lineNumbersMinChars: 3,
             glyphMargin: false,
-            accessibilitySupport: 'off'
           }}
           onMount={(editor) => {
             editorRef.current = editor;

src/pages/script/editNameModal.tsx

@@ -39,8 +39,8 @@ const EditScriptNameModal = ({
     setLoading(true);
     const { path = '', filename: inputFilename, directory = '' } = values;
     const formData = new FormData();
-    formData.append('file', file || '');
+    formData.append('file', file as any);
-    formData.append('filename', file?.name || inputFilename);
+    formData.append('filename', inputFilename);
     formData.append('path', path);
     formData.append('content', '');
     formData.append('directory', directory);

src/pages/script/index.tsx

@@ -218,9 +218,8 @@ const Script = () => {
         <>
           {intl.get('确认保存文件')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {' '}
             {currentNode.title}
-          </Text>
+          </Text>{' '}
           {intl.get('，保存后不可恢复')}
         </>
       ),
@@ -259,8 +258,7 @@ const Script = () => {
         <>
           {intl.get('确认删除')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {' '}
+            {select}
-            {select}{' '}
           </Text>
           {intl.get('文件')}
           {currentNode.type === 'directory' ? intl.get('夹及其子文件') : ''}
@@ -643,7 +641,6 @@ const Script = () => {
                 fontSize: 12,
                 lineNumbersMinChars: 3,
                 glyphMargin: false,
-                accessibilitySupport: 'off'
               }}
               onMount={(editor) => {
                 editorRef.current = editor;

src/pages/setting/checkUpdate.tsx

@@ -1,11 +1,10 @@
-import { disableBody } from '@/utils';
+import intl from 'react-intl-universal';
-import config from '@/utils/config';
+import React, { useEffect, useState, useRef, useCallback } from 'react';
+import { Statistic, Modal, Tag, Button, Spin, message } from 'antd';
 import { request } from '@/utils/http';
+import config from '@/utils/config';
 import WebSocketManager from '@/utils/websocket';
 import Ansi from 'ansi-to-react';
-import { Button, Modal, Statistic, message } from 'antd';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import intl from 'react-intl-universal';
 
 const { Countdown } = Statistic;
 
@@ -133,7 +132,6 @@ const CheckUpdate = ({ systemInfo }: any) => {
           ),
           duration: 30,
         });
-        disableBody();
         setTimeout(() => {
           window.location.reload();
         }, 30000);
@@ -222,7 +220,7 @@ const CheckUpdate = ({ systemInfo }: any) => {
       </Button>
       <Button
         type="primary"
-        onClick={() => reloadSystem('reload')}
+        onClick={() => reloadSystem('system')}
         style={{ marginLeft: 8 }}
       >
         {intl.get('重新启动')}

src/pages/setting/dependence.tsx

@@ -48,9 +48,8 @@ const Dependence = () => {
         pick(systemConfig, dataMap[path]),
       )
       .then((res) => {})
-      .catch(() => {
+      .catch((error: any) => {
-        setLoading(false);
+        console.log(error);
-        setLog((p) => `${p}update mirror error`);
       });
   };
 

src/pages/setting/other.tsx

@@ -22,7 +22,6 @@ import { UploadOutlined } from '@ant-design/icons';
 import Countdown from 'antd/lib/statistic/Countdown';
 import useProgress from './progress';
 import pick from 'lodash/pick';
-import { disableBody } from '@/utils';
 
 const dataMap = {
   'log-remove-frequency': 'logRemoveFrequency',
@@ -158,7 +157,6 @@ const Other = ({
               ),
               duration: 30,
             });
-            disableBody();
             setTimeout(() => {
               window.location.reload();
             }, 30000);
@@ -273,18 +271,12 @@ const Other = ({
           showUploadList={false}
           maxCount={1}
           action={`${config.apiPrefix}system/data/import`}
-          onChange={({ file, event }) => {
+          onChange={(e) => {
-            if (event?.percent) {
+            if (e.event?.percent) {
-              showUploadProgress(
+              showUploadProgress(parseFloat(e.event?.percent.toFixed(1)));
-                Math.min(parseFloat(event?.percent.toFixed(1)), 99),
+              if (e.event?.percent === 100) {
-              );
+                showReloadModal();
-            }
+              }
-            if (file.status === 'done') {
-              showUploadProgress(100);
-              showReloadModal();
-            }
-            if (file.status === 'error') {
-              message.error('上传失败');
             }
           }}
           name="data"

src/pages/setting/progress.tsx

@@ -2,42 +2,30 @@ import intl from 'react-intl-universal';
 import { Modal, Progress } from 'antd';
 import { useRef } from 'react';
 
-const ProgressElement = ({ percent }: { percent: number }) => (
-  <Progress
-    style={{ display: 'flex', justifyContent: 'center' }}
-    type="circle"
-    percent={percent}
-  />
-);
-
 export default function useProgress(title: string) {
-  const modalRef = useRef<ReturnType<typeof Modal.info> | null>();
+  const modalRef = useRef<ReturnType<typeof Modal.info>>();
+
+  const ProgressElement = ({ percent }: { percent: number }) => (
+    <Progress
+      style={{ display: 'flex', justifyContent: 'center' }}
+      type="circle"
+      percent={percent}
+    />
+  );
 
   const showProgress = (percent: number) => {
     if (modalRef.current) {
       modalRef.current.update({
-        title: `${title}${
+        title: `${title}${percent >= 100 ? intl.get('成功') : intl.get('中...')}`,
-          percent >= 100 ? intl.get('成功') : intl.get('中...')
-        }`,
         content: <ProgressElement percent={percent} />,
-        okButtonProps: { disabled: percent !== 100 },
       });
-      if (percent === 100) {
-        setTimeout(() => {
-          modalRef.current?.destroy();
-          modalRef.current = null;
-        });
-      }
     } else {
       modalRef.current = Modal.info({
         width: 600,
         maskClosable: false,
-        title: `${title}${
+        title: `${title}${percent >= 100 ? intl.get('成功') : intl.get('中...')}`,
-          percent >= 100 ? intl.get('成功') : intl.get('中...')
-        }`,
         centered: true,
         content: <ProgressElement percent={percent} />,
-        okButtonProps: { disabled: true },
       });
     }
   };

src/utils/config.ts

@@ -95,7 +95,6 @@ export default {
     { value: 'aibotk', label: intl.get('智能微秘书') },
     { value: 'iGot', label: 'IGot' },
     { value: 'pushPlus', label: 'PushPlus' },
-    { value: 'wePlusBot', label: intl.get('微加机器人') },
     { value: 'chat', label: intl.get('群晖chat') },
     { value: 'email', label: intl.get('邮箱') },
     { value: 'lark', label: intl.get('飞书机器人') },
@@ -191,10 +190,6 @@ export default {
         label: 'barkUrl',
         tip: intl.get('BARK推送消息的跳转URL'),
       },
-      {
-        label: 'barkArchive',
-        tip: intl.get('BARK是否保存推送消息'),
-      },
     ],
     telegramBot: [
       {
@@ -313,27 +308,6 @@ export default {
         ),
       },
     ],
-    wePlusBot: [
-      {
-        label: 'wePlusBotToken',
-        tip: intl.get(
-          '用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/',
-        ),
-        required: true,
-      },
-      {
-        label: 'wePlusBotReceiver',
-        tip: intl.get(
-          '消息接收人',
-        ),
-      },
-      {
-        label: 'wePlusBotVersion',
-        tip: intl.get(
-          '调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版',
-        ),
-      },
-    ],
     lark: [
       {
         label: 'larkKey',
@@ -360,11 +334,6 @@ export default {
         tip: intl.get('PushMe的Key，https://push.i-i.me/'),
         required: true,
       },
-      {
-        label: 'pushMeUrl',
-        tip: intl.get('自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口'),
-        required: false,
-      },
     ],
     chronocat: [
       {

src/utils/http.ts

@@ -1,44 +1,29 @@
-import intl from 'react-intl-universal';
+import intl from 'react-intl-universal'
 import { message } from 'antd';
 import config from './config';
 import { history } from '@umijs/max';
-import axios, {
+import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from 'axios';
-  AxiosError,
-  AxiosInstance,
-  AxiosRequestConfig,
-  AxiosResponse,
-  InternalAxiosRequestConfig,
-} from 'axios';
 
-export interface IResponseData {
+interface IResponseData {
   code?: number;
   data?: any;
   message?: string;
   error?: any;
 }
 
-export type Override<
+type Override<
   T,
   K extends Partial<{ [P in keyof T]: any }> | string,
 > = K extends string
   ? Omit<T, K> & { [P in keyof T]: T[P] | unknown }
   : Omit<T, keyof K> & K;
 
-export interface ICustomConfig {
-  onError?: (res: AxiosResponse<unknown, any>) => void;
-}
-
 message.config({
   duration: 2,
 });
 
 const time = Date.now();
-const errorHandler = function (
+const errorHandler = function (error: AxiosError) {
-  error: Override<
-    AxiosError<IResponseData>,
-    { config: InternalAxiosRequestConfig & ICustomConfig }
-  >,
-) {
   if (error.response) {
     const msg = error.response.data
       ? error.response.data.message || error.message || error.response.data
@@ -53,10 +38,6 @@ const errorHandler = function (
         history.push('/login');
       }
     } else {
-      if (typeof error.config?.onError === 'function') {
-        return error.config?.onError(error.response);
-      }
-
       message.error({
         content: msg,
         style: { maxWidth: 500, margin: '0 auto' },
@@ -124,21 +105,21 @@ export const request = _request as Override<
   {
     get<T = IResponseData, D = any>(
       url: string,
-      config?: AxiosRequestConfig<D> & ICustomConfig,
+      config?: AxiosRequestConfig<D>,
     ): Promise<T>;
     delete<T = IResponseData, D = any>(
       url: string,
-      config?: AxiosRequestConfig<D> & ICustomConfig,
+      config?: AxiosRequestConfig<D>,
     ): Promise<T>;
     post<T = IResponseData, D = any>(
       url: string,
       data?: D,
-      config?: AxiosRequestConfig<D> & ICustomConfig,
+      config?: AxiosRequestConfig<D>,
     ): Promise<T>;
     put<T = IResponseData, D = any>(
       url: string,
       data?: D,
-      config?: AxiosRequestConfig<D> & ICustomConfig,
+      config?: AxiosRequestConfig<D>,
     ): Promise<T>;
   }
 >;

src/utils/index.ts

@@ -154,9 +154,9 @@ export default function browserType() {
     shell === 'none'
       ? {}
       : {
-          shell, // wechat qq uc 360 2345 sougou liebao maxthon
+        shell, // wechat qq uc 360 2345 sougou liebao maxthon
-          shellVs,
+        shellVs,
-        },
+      },
   );
 
   console.log(
@@ -335,23 +335,20 @@ export function parseCrontab(schedule: string): Date | null {
     if (time) {
       return time.next().toDate();
     }
-  } catch (error) {}
+  } catch (error) { }
 
   return null;
 }
 
-export function getCrontabsNextDate(
+export function getCrontabsNextDate(schedule: string, extra_schedules: string[]): Date | null {
-  schedule: string,
+  let date = parseCrontab(schedule)
-  extra_schedules: string[],
-): Date | null {
-  let date = parseCrontab(schedule);
   if (extra_schedules?.length) {
-    extra_schedules.forEach((x) => {
+    extra_schedules.forEach(x => {
-      const _date = parseCrontab(x);
+      const _date = parseCrontab(x)
       if (_date && (!date || _date < date)) {
         date = _date;
       }
-    });
+    })
   }
   return date;
 }
@@ -365,23 +362,4 @@ export function getExtension(filename: string) {
 export function getEditorMode(filename: string) {
   const extension = getExtension(filename) as keyof typeof LANG_MAP;
   return LANG_MAP[extension];
-}
+}
-
-export function disableBody() {
-  const overlay = document.createElement('div');
-  overlay.style.position = 'fixed';
-  overlay.style.top = '0px';
-  overlay.style.left = '0px';
-  overlay.style.width = '100%';
-  overlay.style.height = '100%';
-  overlay.style.backgroundColor = 'transparent';
-  overlay.style.zIndex = '9999';
-  document.body.appendChild(overlay);
-
-  overlay.addEventListener('click', function (event) {
-    event.stopPropagation();
-    event.preventDefault();
-  });
-
-  document.body.style.overflow = 'hidden';
-}

version.yaml

@@ -1,8 +1,7 @@
-version: 2.17.9
+version: 2.17.2
-changeLogLink: https://t.me/jiao_long/420
+changeLogLink: https://t.me/jiao_long/403
-publishTime: 2024-07-23 23:00
+publishTime: 2024-03-02 17:00
 changeLog: |
-  1. Javascript 和 Python 增加内置API QLAPI.notify
+  1. 依赖管理支持队列中依赖取消安装，支持状态筛选
-  2. 配置管理增加 task_before.js 和 task_before.py 文件，在执行任务前执行，避免环境变量过大报错
+  2. 修复 webhook 通知 body 拆分逻辑
-  3. 修复执行任务 JavaScript 和 Python 任务前未执行 task_before.sh
+  3. 企业微信有长度限制，超长的进行分段提交 https://github.com/pharaoh2012
-