更新版本 v2.18.0

* 增加 wxPusher 推送方式

* 补全 wxPusher 推送方式代码

* fix js 方法多进行了一次 JSON 格式化

.github/workflows/build_docker_image.yml

@@ -103,7 +103,7 @@ jobs:
           cache: "pnpm"
 
       - name: Setup timezone
-        uses: szenius/set-timezone@v1.2
+        uses: szenius/set-timezone@v2.0
         with:
           timezoneLinux: Asia/Shanghai
 
@@ -149,7 +149,7 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MAINTAINER=${{ github.repository_owner }}
@@ -190,7 +190,7 @@ jobs:
           cache: "pnpm"
 
       - name: Setup timezone
-        uses: szenius/set-timezone@v1.2
+        uses: szenius/set-timezone@v2.0
         with:
           timezoneLinux: Asia/Shanghai
 
@@ -215,7 +215,7 @@ jobs:
 
       - name: Build and push python3.10
         id: docker_build_310
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MAINTAINER=${{ github.repository_owner }}

.gitignore

@@ -23,3 +23,7 @@
 .history
 .version.ts
 /.tmp
+__pycache__
+/shell/preload/env.*
+/shell/preload/notify.*
+/shell/preload/*-notify.json

.prettierignore

@@ -2,23 +2,22 @@
 **/*.svg
 **/*.ejs
 **/*.html
-package.json
-.umi
-.umi-production
-.umi-test
-.history
-.tmp
-node_modules
+/.umi
+/.umi-production
+/.umi-test
+/.history
+/.tmp
+/node_modules
 npm-debug.log*
 yarn-error.log
 yarn.lock
 package-lock.json
-static
-data
+/static
+/data
 DS_Store
-src/.umi
-src/.umi-production
-src/.umi-test
+/src/.umi
+/src/.umi-production
+/src/.umi-test
 .env.local
 .env
 version.ts

.umirc.ts

@@ -43,19 +43,12 @@ export default defineConfig({
       }),
     );
   }) as any,
-  externals: {
-    react: 'window.React',
-    'react-dom': 'window.ReactDOM',
-  },
-  headScripts: [
-    `./api/env.js`,
-    'https://gw.alipayobjects.com/os/lib/react/18.2.0/umd/react.production.min.js',
-    'https://gw.alipayobjects.com/os/lib/react-dom/18.2.0/umd/react-dom.production.min.js',
-  ],
+  headScripts: [`./api/env.js`],
   copy: [
     {
       from: 'node_modules/monaco-editor/min/vs',
       to: 'static/dist/monaco-editor/min/vs',
     },
   ],
+  npmClient: 'pnpm',
 });

README-en.md

@@ -18,9 +18,9 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 
-[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+[Demo](http://demo.ninesix.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
 
-[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
+[演示](http://demo.ninesix.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>
 
 ![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
@@ -48,12 +48,91 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
+The npm version supports `debian/ubuntu/alpine` systems and requires `node/npm/python3/pip3/pnpm` 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
+```
+
+### BaoTa Panel one-click deployment (Recommended)
+
+1. To install Pagoda Panel, go to the official website of [BaoTa Panel](https://www.bt.cn/u/EcDAFU), select the official version of the script to download and install.
+
+2. After installation, login to Pagoda Panel, click `Docker` in the menu bar, the first time you enter, you will be prompted to install `Docker` service, click Install Now, follow the prompts to complete the installation.
+
+3. After the installation is complete, find `Qinglong Panel` in the app shop, click Install, configure the domain name and other basic information to complete the installation.
+
+### 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 (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/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, QL_DATA_DIR must end with /data.
+export QL_DIR=""
+export QL_DATA_DIR=""
+# Run again
+qinglong
+```
+
 ## Built-in commands
 
 - task
@@ -110,89 +189,16 @@ 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
-$ cd qinglong
-$ cp .env.example .env
+git clone https://github.com/whyour/qinglong.git
+cd qinglong
+cp .env.example .env
 # Recommended use pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
-$ pnpm install
-$ pnpm start
+npm install -g pnpm@8.3.1
+pnpm install
+pnpm start
 ```
 
 Open your browser and visit <http://127.0.0.1:5700>

README.md

@@ -20,9 +20,9 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 
-[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+[Demo](http://demo.ninesix.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
 
-[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
+[演示](http://demo.ninesix.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>
 
 ![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
@@ -50,12 +50,91 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
+npm 版本支持 `debian/ubuntu/alpine` 系统，需要自行安装 `node/npm/python3/pip3/pnpm`
 
 ```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
+```
+
+### 宝塔面板一键部署（推荐）
+
+1. 安装宝塔面板，前往 [宝塔面板](https://www.bt.cn/u/EcDAFU) 官网，选择正式版的脚本下载安装
+
+2. 安装后登录宝塔面板，在菜单栏中点击 `Docker`，首次进入会提示安装`Docker`服务，点击立即安装，按提示完成安装
+
+3. 安装完成后在应用商店中找到`青龙面板`，点击安装，配置域名等基本信息即可完成安装
+
+### 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 && cd $_
+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，QL_DATA_DIR 必须以 /data 结尾
+export QL_DIR=""
+export QL_DATA_DIR=""
+# 再次执行
+qinglong
+```
+
 ## 内置命令
 
 - task
@@ -110,89 +189,16 @@ 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
-$ cd qinglong
-$ cp .env.example .env
+git clone https://github.com/whyour/qinglong.git
+cd qinglong
+cp .env.example .env
 # 推荐使用 pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
-$ pnpm install
-$ pnpm start
+npm install -g pnpm@8.3.1
+pnpm install
+pnpm start
 ```
 
 打开你的浏览器，访问 <http://127.0.0.1:5700>

back/api/config.ts

@@ -1,4 +1,3 @@
-import { getFileContentByName, getLastModifyFilePath } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
@@ -8,6 +7,7 @@ import { celebrate, Joi } from 'celebrate';
 import { join } from 'path';
 import { SAMPLE_FILES } from '../config/const';
 import ConfigService from '../services/config';
+import { writeFileWithLock } from '../shared/utils';
 const route = Router();
 
 export default (app: Router) => {
@@ -78,7 +78,7 @@ export default (app: Router) => {
         if (name.startsWith('data/scripts/')) {
           path = join(config.rootPath, name);
         }
-        await fs.writeFile(path, content);
+        await writeFileWithLock(path, content);
         res.send({ code: 200, message: '保存成功' });
       } catch (e) {
         return next(e);

back/api/env.ts

@@ -51,6 +51,9 @@ 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) {
@@ -217,7 +220,7 @@ export default (app: Router) => {
         } else {
           return res.send({
             code: 400,
-            message: '文件缺少name或者value字段，参考导出文件格式',
+            message: '每条数据 name 或者 value 字段不能为空，参考导出文件格式',
           });
         }
       } catch (e) {

back/api/log.ts

@@ -1,10 +1,9 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
-import * as fs from 'fs';
 import config from '../config';
 import { getFileContentByName, readDirs, rmPath } from '../config/util';
-import { join } from 'path';
+import { join, resolve } from 'path';
 import { celebrate, Joi } from 'celebrate';
 const route = Router();
 const blacklist = ['.tmp'];
@@ -30,15 +29,19 @@ export default (app: Router) => {
     '/detail',
     async (req: Request, res: Response, next: NextFunction) => {
       try {
-        if (blacklist.includes(req.path)) {
+        const finalPath = resolve(
+          config.logPath,
+          (req.query.path as string) || '',
+          (req.query.file as string) || '',
+        );
+
+        if (
+          blacklist.includes(req.query.path as string) ||
+          !finalPath.startsWith(config.logPath)
+        ) {
           return res.send({ code: 403, message: '暂无权限' });
         }
-        const filePath = join(
-          config.logPath,
-          (req.query.path || '') as string,
-          req.query.file as string,
-        );
-        const content = await getFileContentByName(filePath);
+        const content = await getFileContentByName(finalPath);
         res.send({ code: 200, data: content });
       } catch (e) {
         return next(e);
@@ -50,15 +53,18 @@ export default (app: Router) => {
     '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       try {
-        if (blacklist.includes(req.path)) {
+        const finalPath = resolve(
+          config.logPath,
+          (req.query.path as string) || '',
+          (req.params.file as string) || '',
+        );
+        if (
+          blacklist.includes(req.path) ||
+          !finalPath.startsWith(config.logPath)
+        ) {
           return res.send({ code: 403, message: '暂无权限' });
         }
-        const filePath = join(
-          config.logPath,
-          (req.query.path || '') as string,
-          req.params.file,
-        );
-        const content = await getFileContentByName(filePath);
+        const content = await getFileContentByName(finalPath);
         res.send({ code: 200, data: content });
       } catch (e) {
         return next(e);

back/api/script.ts

@@ -1,11 +1,4 @@
-import {
-  fileExist,
-  getFileContentByName,
-  readDirs,
-  getLastModifyFilePath,
-  readDir,
-  rmPath,
-} from '../config/util';
+import { fileExist, readDirs, readDir, rmPath } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
@@ -15,6 +8,7 @@ import { celebrate, Joi } from 'celebrate';
 import path, { join, parse } from 'path';
 import ScriptService from '../services/script';
 import multer from 'multer';
+import { writeFileWithLock } from '../shared/utils';
 const route = Router();
 
 const storage = multer.diskStorage({
@@ -163,7 +157,7 @@ export default (app: Router) => {
             await rmPath(originFilePath);
           }
         }
-        await fs.writeFile(filePath, content);
+        await writeFileWithLock(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
         return next(e);
@@ -189,7 +183,7 @@ export default (app: Router) => {
           path: string;
         };
         const filePath = join(config.scriptPath, path, filename);
-        await fs.writeFile(filePath, content);
+        await writeFileWithLock(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
         return next(e);
@@ -268,7 +262,7 @@ export default (app: Router) => {
         let { filename, content, path } = req.body;
         const { name, ext } = parse(filename);
         const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
-        await fs.writeFile(filePath, content || '', { encoding: 'utf8' });
+        await writeFileWithLock(filePath, content || '');
 
         const scriptService = Container.get(ScriptService);
         const result = await scriptService.runScript(filePath);

back/api/subscription.ts

@@ -15,6 +15,7 @@ export default (app: Router) => {
       const subscriptionService = Container.get(SubscriptionService);
       const data = await subscriptionService.list(
         req.query.searchValue as string,
+        req.query.ids as string,
       );
       return res.send({ code: 200, data });
     } catch (e) {
@@ -212,8 +213,8 @@ export default (app: Router) => {
       body: Joi.array().items(Joi.number().required()),
       query: Joi.object({
         force: Joi.boolean().optional(),
-        t: Joi.number()
-      })
+        t: Joi.number(),
+      }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');

back/api/system.ts

@@ -33,7 +33,7 @@ export default (app: Router) => {
     const logger: Logger = Container.get('logger');
     try {
       const userService = Container.get(UserService);
-      const authInfo = await userService.getUserInfo();
+      const authInfo = await userService.getAuthInfo();
       const { version, changeLog, changeLogLink, publishTime } =
         await parseVersion(config.versionFile);
 
@@ -340,12 +340,60 @@ export default (app: Router) => {
     },
   );
 
-  route.get('/log', async (req: Request, res: Response, next: NextFunction) => {
+  route.get(
+    '/log',
+    celebrate({
+      query: {
+        startTime: Joi.string().allow('').optional(),
+        endTime: Joi.string().allow('').optional(),
+        t: Joi.string().optional(),
+      },
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
       try {
         const systemService = Container.get(SystemService);
-      await systemService.getSystemLog(res);
+        await systemService.getSystemLog(
+          res,
+          req.query as {
+            startTime?: string;
+            endTime?: string;
+          },
+        );
       } catch (e) {
         return next(e);
       }
-  });
+    },
+  );
+
+  route.delete(
+    '/log',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        await systemService.deleteSystemLog();
+        res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/auth/reset',
+    celebrate({
+      body: Joi.object({
+        retries: Joi.number().optional(),
+        twoFactorActivated: Joi.boolean().optional(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const userService = Container.get(UserService);
+        await userService.resetAuthInfo(req.body);
+        res.send({ code: 200, message: '更新成功' });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };

back/api/user.ts

@@ -90,7 +90,7 @@ export default (app: Router) => {
     const logger: Logger = Container.get('logger');
     try {
       const userService = Container.get(UserService);
-      const authInfo = await userService.getUserInfo();
+      const authInfo = await userService.getAuthInfo();
       res.send({
         code: 200,
         data: {

back/app.ts

@@ -1,3 +1,4 @@
+import './loaders/sentry'
 import 'reflect-metadata'; // We need this in order to use @Decorators
 import config from './config';
 import express from 'express';
@@ -10,12 +11,10 @@ async function startServer() {
 
   await require('./loaders/initFile').default();
 
-  await require('./loaders/sentry').default({ expressApp: app });
-
   await require('./loaders/app').default({ expressApp: app });
 
   const server = app
-    .listen(config.port, () => {
+    .listen(config.port, '0.0.0.0', () => {
       Logger.debug(`✌️ 后端服务启动成功！`);
       console.debug(`✌️ 后端服务启动成功！`);
       process.send?.('ready');

back/config/index.ts

@@ -19,12 +19,19 @@ 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') });
 
-const dataPath = path.join(rootPath, 'data/');
+let 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/');
 const scriptPath = path.join(dataPath, 'scripts/');
+const repoPath = path.join(dataPath, 'repo/');
 const bakPath = path.join(dataPath, 'bak/');
 const logPath = path.join(dataPath, 'log/');
 const dbPath = path.join(dataPath, 'db/');
@@ -32,7 +39,11 @@ const uploadPath = path.join(dataPath, 'upload/');
 const sshdPath = path.join(dataPath, 'ssh.d/');
 const systemLogPath = path.join(dataPath, 'syslog/');
 
-const envFile = path.join(configPath, 'env.sh');
+const envFile = path.join(preloadPath, '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');
@@ -40,6 +51,7 @@ const extraFile = path.join(configPath, 'extra.sh');
 const confBakDir = path.join(dataPath, 'config/bak/');
 const sampleFile = path.join(samplePath, 'config.sample.sh');
 const sqliteFile = path.join(samplePath, 'database.sqlite');
+const systemNotifyFile = path.join(preloadPath, 'system-notify.json');
 
 const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
@@ -82,10 +94,15 @@ export default {
   sampleFile,
   confFile,
   envFile,
+  jsEnvFile,
+  pyEnvFile,
+  jsNotifyFile,
+  pyNotifyFile,
   dbPath,
   uploadPath,
   configPath,
   scriptPath,
+  repoPath,
   samplePath,
   blackFileList: [
     'auth.json',
@@ -94,6 +111,8 @@ export default {
     'crontab.list',
     'dependence-proxy.sh',
     'env.sh',
+    'env.js',
+    'env.py',
     'token.json',
   ],
   writePathList: [configPath, scriptPath],
@@ -116,4 +135,5 @@ export default {
   sqliteFile,
   sshdPath,
   systemLogPath,
+  systemNotifyFile,
 };

back/config/serverEnv.ts

@@ -5,13 +5,13 @@ let pickedEnv: Record<string, string>;
 
 function getPickedEnv() {
   if (pickedEnv) return pickedEnv;
-  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv']);
+  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv', 'QL_DIR']);
   if (picked.QlBaseUrl) {
     if (!picked.QlBaseUrl.startsWith('/')) {
-      picked.QlBaseUrl = `/${picked.QlBaseUrl}`
+      picked.QlBaseUrl = `/${picked.QlBaseUrl}`;
     }
     if (!picked.QlBaseUrl.endsWith('/')) {
-      picked.QlBaseUrl = `${picked.QlBaseUrl}/`
+      picked.QlBaseUrl = `${picked.QlBaseUrl}/`;
     }
   }
   pickedEnv = picked as Record<string, string>;

back/config/subscription.ts

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

back/config/util.ts

@@ -10,6 +10,7 @@ import { load } from 'js-yaml';
 import config from './index';
 import { TASK_COMMAND } from './const';
 import Logger from '../loaders/logger';
+import { writeFileWithLock } from '../shared/utils';
 
 export * from './share';
 
@@ -145,12 +146,14 @@ export function getPlatform(userAgent: string): 'mobile' | 'desktop' {
     system = 'android'; // android系统
   } else if (testUa(/ios|iphone|ipad|ipod|iwatch/g)) {
     system = 'ios'; // ios系统
+  } else if (testUa(/openharmony/g)) {
+    system = 'openharmony'; // openharmony系统
   }
 
   let platform = 'desktop';
   if (system === 'windows' || system === 'macos' || system === 'linux') {
     platform = 'desktop';
-  } else if (system === 'android' || system === 'ios' || testUa(/mobile/g)) {
+  } else if (system === 'android' || system === 'ios' || system === 'openharmony' || testUa(/mobile/g)) {
     platform = 'mobile';
   }
 
@@ -168,7 +171,7 @@ export async function fileExist(file: any) {
 
 export async function createFile(file: string, data: string = '') {
   await fs.mkdir(path.dirname(file), { recursive: true });
-  await fs.writeFile(file, data);
+  await writeFileWithLock(file, data);
 }
 
 export async function handleLogPath(
@@ -461,7 +464,7 @@ export async function parseVersion(path: string): Promise<IVersion> {
   return load(await fs.readFile(path, 'utf8')) as IVersion;
 }
 
-export async function parseContentVersion(content: string): Promise<IVersion> {
+export function parseContentVersion(content: string): IVersion {
   return load(content) as IVersion;
 }
 
@@ -469,13 +472,18 @@ export async function getUniqPath(
   command: string,
   id: string,
 ): Promise<string> {
+  let suffix = '';
   if (/^\d+$/.test(id)) {
-    id = `_${id}`;
-  } else {
-    id = '';
+    suffix = `_${id}`;
+  }
+
+  let items = command.split(/ +/);
+
+  const maxTimeCommandIndex = items.findIndex((x) => x === '-m');
+  if (maxTimeCommandIndex !== -1) {
+    items = items.slice(maxTimeCommandIndex + 2);
   }
 
-  const items = command.split(/ +/);
   let str = items[0];
   if (items[0] === TASK_COMMAND) {
     str = items[1];
@@ -499,7 +507,7 @@ export async function getUniqPath(
     str = `${tempStr}_${str.slice(slashIndex + 1)}`;
   }
 
-  return `${str}${id}`;
+  return `${str}${suffix}`;
 }
 
 export function safeJSONParse(value?: string) {

back/data/notify.ts

@@ -14,11 +14,14 @@ export enum NotificationMode {
   'aibotk' = 'aibotk',
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
+  'wePlusBot' = 'wePlusBot',
   'email' = 'email',
   'pushMe' = 'pushMe',
   'feishu' = 'feishu',
   'webhook' = 'webhook',
   'chronocat' = 'Chronocat',
+  'ntfy' = 'ntfy',
+  'wxPusherBot' = 'wxPusherBot',
 }
 
 abstract class NotificationBaseInfo {
@@ -58,6 +61,7 @@ export class BarkNotification extends NotificationBaseInfo {
   public barkGroup = 'qinglong';
   public barkLevel = 'active';
   public barkUrl = '';
+  public barkArchive=""
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -97,6 +101,17 @@ export class IGotNotification extends NotificationBaseInfo {
 export class PushPlusNotification extends NotificationBaseInfo {
   public pushPlusToken = '';
   public pushPlusUser = '';
+  public pushPlusTemplate = '';
+  public pushplusChannel = '';
+  public pushplusWebhook = '';
+  public pushplusCallbackUrl = '';
+  public pushplusTo = '';
+}
+
+export class WePlusBotNotification extends NotificationBaseInfo {
+  public wePlusBotToken = '';
+  public wePlusBotReceiver = '';
+  public wePlusBotVersion = '';
 }
 
 export class EmailNotification extends NotificationBaseInfo {
@@ -107,6 +122,7 @@ export class EmailNotification extends NotificationBaseInfo {
 
 export class PushMeNotification extends NotificationBaseInfo {
   public pushMeKey: string = '';
+  public pushMeUrl: string = '';
 }
 
 export class ChronocatNotification extends NotificationBaseInfo {
@@ -130,6 +146,18 @@ export class LarkNotification extends NotificationBaseInfo {
   public larkKey = '';
 }
 
+export class NtfyNotification extends NotificationBaseInfo {
+  public ntfyUrl = '';
+  public ntfyTopic = '';
+  public ntfyPriority = '';
+}
+
+export class WxPusherBotNotification extends NotificationBaseInfo {
+  public wxPusherBotAppToken = '';
+  public wxPusherBotTopicIds = '';
+  public wxPusherBotUids = '';
+}
+
 export interface NotificationInfo
   extends GoCqHttpBotNotification,
     GotifyNotification,
@@ -144,9 +172,11 @@ export interface NotificationInfo
     AibotkNotification,
     IGotNotification,
     PushPlusNotification,
+    WePlusBotNotification,
     EmailNotification,
     PushMeNotification,
     WebhookNotification,
     ChronocatNotification,
-    LarkNotification {}
-    
+    LarkNotification,
+    NtfyNotification,
+    WxPusherBotNotification {}

back/data/open.ts

@@ -24,7 +24,7 @@ export interface AppToken {
   expiration: number;
 }
 
-export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs';
+export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs' | 'system';
 
 export interface AppInstance extends Model<App, App>, App {}
 export const AppModel = sequelize.define<AppInstance>('App', {

back/data/system.ts

@@ -2,13 +2,13 @@ import { sequelize } from '.';
 import { DataTypes, Model, ModelDefined } from 'sequelize';
 import { NotificationInfo } from './notify';
 
-export class AuthInfo {
+export class SystemInfo {
   ip?: string;
   type: AuthDataType;
   info?: SystemModelInfo;
   id?: number;
 
-  constructor(options: AuthInfo) {
+  constructor(options: SystemInfo) {
     this.ip = options.ip;
     this.info = options.info;
     this.type = options.type;
@@ -27,6 +27,7 @@ export enum AuthDataType {
   'notification' = 'notification',
   'removeLogFrequency' = 'removeLogFrequency',
   'systemConfig' = 'systemConfig',
+  'authConfig' = 'authConfig',
 }
 
 export interface SystemConfigInfo {
@@ -46,11 +47,30 @@ export interface LoginLogInfo {
   status?: LoginStatus;
 }
 
+export interface AuthInfo {
+  username: string;
+  password: string;
+  retries: number;
+  lastlogon: number;
+  lastip: string;
+  lastaddr: string;
+  platform: string;
+  isTwoFactorChecking: boolean;
+  token: string;
+  tokens: Record<string, string>;
+  twoFactorActivated: boolean;
+  twoFactorSecret: string;
+  avatar: string;
+}
+
 export type SystemModelInfo = SystemConfigInfo &
   Partial<NotificationInfo> &
-  LoginLogInfo;
+  LoginLogInfo &
+  Partial<AuthInfo>;
 
-export interface SystemInstance extends Model<AuthInfo, AuthInfo>, AuthInfo { }
+export interface SystemInstance
+  extends Model<SystemInfo, SystemInfo>,
+    SystemInfo {}
 export const SystemModel = sequelize.define<SystemInstance>('Auth', {
   ip: DataTypes.STRING,
   type: DataTypes.STRING,

back/loaders/app.ts

@@ -7,28 +7,23 @@ import linkDeps from './deps';
 import initTask from './initTask';
 
 export default async ({ expressApp }: { expressApp: Application }) => {
-  try {
   depInjectorLoader();
-    Logger.info('✌️ Dependency Injector loaded');
-    console.log('✌️ Dependency Injector loaded');
+  Logger.info('✌️ Dependency loaded');
+  console.log('✌️ Dependency loaded');
+
+  await initData();
+  Logger.info('✌️ Init data loaded');
+  console.log('✌️ Init data loaded');
+
+  await linkDeps();
+  Logger.info('✌️ Link deps loaded');
+  console.log('✌️ Link deps loaded');
+
+  initTask();
+  Logger.info('✌️ Init task loaded');
+  console.log('✌️ Init task loaded');
 
   expressLoader({ app: expressApp });
   Logger.info('✌️ Express loaded');
   console.log('✌️ Express loaded');
-  
-    await initData();
-    Logger.info('✌️ init data loaded');
-    console.log('✌️ init data loaded');
-  
-    await linkDeps();
-    Logger.info('✌️ link deps loaded');
-    console.log('✌️ link deps loaded');
-  
-    initTask();
-    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,18 +23,21 @@ 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);
-    await rmPath(target);
-    await fs.symlink(source, target);
+    const tmpTarget = path.join(commandDir, link.tmp);
+    await fs.symlink(source, tmpTarget);
+    await fs.rename(tmpTarget, target);
   }
 }
 

back/loaders/express.ts

@@ -3,19 +3,15 @@ import bodyParser from 'body-parser';
 import cors from 'cors';
 import routes from '../api';
 import config from '../config';
-import jwt, { UnauthorizedError } from 'express-jwt';
-import fs from 'fs/promises';
-import { getPlatform, getToken, safeJSONParse } from '../config/util';
-import Container from 'typedi';
-import OpenService from '../services/open';
+import { UnauthorizedError, expressjwt } from 'express-jwt';
+import { getPlatform, getToken } from '../config/util';
 import rewrite from 'express-urlrewrite';
-import UserService from '../services/user';
 import * as Sentry from '@sentry/node';
-import { EnvModel } from '../data/env';
 import { errors } from 'celebrate';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { serveEnv } from '../config/serverEnv';
 import Logger from './logger';
+import { IKeyvStore, shareStore } from '../shared/store';
 
 export default ({ app }: { app: Application }) => {
   app.set('trust proxy', 'loopback');
@@ -29,7 +25,7 @@ export default ({ app }: { app: Application }) => {
       target: `http://0.0.0.0:${config.publicPort}/api`,
       changeOrigin: true,
       pathRewrite: { '/api/public': '' },
-      logProvider: () => Logger,
+      logger: Logger,
     }),
   );
 
@@ -37,7 +33,7 @@ export default ({ app }: { app: Application }) => {
   app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
 
   app.use(
-    jwt({
+    expressjwt({
       secret: config.secret,
       algorithms: ['HS384'],
     }).unless({
@@ -58,8 +54,10 @@ export default ({ app }: { app: Application }) => {
   app.use(async (req, res, next) => {
     const headerToken = getToken(req);
     if (req.path.startsWith('/open/')) {
-      const openService = Container.get(OpenService);
-      const doc = await openService.findTokenByValue(headerToken);
+      const apps = await shareStore.getApps();
+      const doc = apps?.filter((x) =>
+        x.tokens?.find((y) => y.value === headerToken),
+      )?.[0];
       if (doc && doc.tokens && doc.tokens.length > 0) {
         const currentToken = doc.tokens.find((x) => x.value === headerToken);
         const keyMatch = req.path.match(/\/open\/([a-z]+)\/*/);
@@ -83,9 +81,9 @@ export default ({ app }: { app: Application }) => {
       return next();
     }
 
-    const data = await fs.readFile(config.authConfigFile, 'utf8');
-    if (data && headerToken) {
-      const { token = '', tokens = {} } = safeJSONParse(data);
+    const authInfo = await shareStore.getAuthInfo();
+    if (authInfo && headerToken) {
+      const { token = '', tokens = {} } = authInfo;
       if (headerToken === token || tokens[req.platform] === headerToken) {
         return next();
       }
@@ -103,8 +101,8 @@ export default ({ app }: { app: Application }) => {
     if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
       return next();
     }
-    const userService = Container.get(UserService);
-    const authInfo = await userService.getUserInfo();
+    const authInfo =
+      (await shareStore.getAuthInfo()) || ({} as IKeyvStore['authInfo']);
 
     let isInitialized = true;
     if (
@@ -133,6 +131,8 @@ export default ({ app }: { app: Application }) => {
 
   app.use(errors());
 
+  Sentry.setupExpressErrorHandler(app);
+
   app.use(
     (
       err: Error & { status: number },
@@ -178,8 +178,6 @@ export default ({ app }: { app: Application }) => {
       res: Response,
       next: NextFunction,
     ) => {
-      Sentry.captureException(err);
-
       res.status(err.status || 500);
       res.json({
         code: err.status || 500,

back/loaders/initData.ts

@@ -11,12 +11,53 @@ import { CrontabViewModel, CronViewType } from '../data/cronView';
 import { initPosition } from '../data/env';
 import { AuthDataType, SystemModel } from '../data/system';
 import SystemService from '../services/system';
+import UserService from '../services/user';
+import { writeFile, readFile } from 'fs/promises';
+import { safeJSONParse } from '../config/util';
+import OpenService from '../services/open';
+import { shareStore } from '../shared/store';
+import Logger from './logger';
 
 export default async () => {
   const cronService = Container.get(CronService);
   const envService = Container.get(EnvService);
   const dependenceService = Container.get(DependenceService);
   const systemService = Container.get(SystemService);
+  const userService = Container.get(UserService);
+  const openService = Container.get(OpenService);
+
+  // 初始化增加系统配置
+  const [systemConfig] = await SystemModel.findOrCreate({
+    where: { type: AuthDataType.systemConfig },
+  });
+  const [notifyConfig] = await SystemModel.findOrCreate({
+    where: { type: AuthDataType.notification },
+  });
+  const [authConfig] = await SystemModel.findOrCreate({
+    where: { type: AuthDataType.authConfig },
+  });
+  if (!authConfig?.info) {
+    let authInfo = {
+      username: 'admin',
+      password: 'admin',
+    };
+    try {
+      const content = await readFile(config.authConfigFile, 'utf8');
+      authInfo = safeJSONParse(content);
+    } catch (error) {
+      Logger.warn('Failed to read auth config file, using default credentials');
+    }
+    await SystemModel.upsert({
+      id: authConfig?.id,
+      info: authInfo,
+      type: AuthDataType.authConfig,
+    });
+  }
+
+  // 初始化通知配置
+  if (notifyConfig.info) {
+    await writeFile(config.systemNotifyFile, JSON.stringify(notifyConfig.info));
+  }
 
   const installDependencies = () => {
     // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
@@ -39,7 +80,6 @@ export default async () => {
   };
 
   // 初始化更新 linux/python/nodejs 镜像源配置
-  const systemConfig = await systemService.getSystemConfig();
   if (systemConfig.info?.pythonMirror) {
     systemService.updatePythonMirror({
       pythonMirror: systemConfig.info?.pythonMirror,
@@ -121,7 +161,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/log/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/log/${doc.command.replace(
+              command: `${config.dataPath}/log/${doc.command.replace(
                 `${config.rootPath}/log/`,
                 '',
               )}`,
@@ -132,7 +172,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/config/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/config/${doc.command.replace(
+              command: `${config.dataPath}/config/${doc.command.replace(
                 `${config.rootPath}/config/`,
                 '',
               )}`,
@@ -143,7 +183,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/db/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/db/${doc.command.replace(
+              command: `${config.dataPath}/db/${doc.command.replace(
                 `${config.rootPath}/db/`,
                 '',
               )}`,
@@ -159,6 +199,10 @@ export default async () => {
   await cronService.autosave_crontab();
   await envService.set_envs();
 
-  // 初始化增加系统配置
-  await SystemModel.upsert({ type: AuthDataType.systemConfig });
+  const authInfo = await userService.getAuthInfo();
+  const apps = await openService.findApps();
+  await shareStore.updateAuthInfo(authInfo);
+  if (apps?.length) {
+    await shareStore.updateApps(apps);
+  }
 };

back/loaders/initFile.ts

@@ -3,9 +3,16 @@ import path from 'path';
 import os from 'os';
 import Logger from './logger';
 import { fileExist } from '../config/util';
+import { writeFileWithLock } from '../shared/utils';
 
 const rootPath = process.env.QL_DIR as string;
-const dataPath = path.join(rootPath, 'data/');
+let 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/');
@@ -14,103 +21,104 @@ const bakPath = path.join(dataPath, 'bak/');
 const samplePath = path.join(rootPath, 'sample/');
 const tmpPath = path.join(logPath, '.tmp/');
 const confFile = path.join(configPath, 'config.sh');
-const authConfigFile = path.join(configPath, 'auth.json');
 const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
-const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
 const sampleTaskShellFile = path.join(samplePath, 'task.sample.sh');
 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');
 const sshdPath = path.join(dataPath, 'ssh.d');
 const systemLogPath = path.join(dataPath, 'syslog');
 
+const directories = [
+  configPath,
+  scriptPath,
+  preloadPath,
+  logPath,
+  tmpPath,
+  uploadPath,
+  sshPath,
+  bakPath,
+  sshdPath,
+  systemLogPath,
+];
+
+const files = [
+  {
+    target: confFile,
+    source: sampleConfigFile,
+    checkExistence: true,
+  },
+  {
+    target: jsNotifyFile,
+    source: sampleNotifyJsFile,
+    checkExistence: false,
+  },
+  {
+    target: pyNotifyFile,
+    source: sampleNotifyPyFile,
+    checkExistence: false,
+  },
+  {
+    target: scriptNotifyJsFile,
+    source: sampleNotifyJsFile,
+    checkExistence: true,
+  },
+  {
+    target: scriptNotifyPyFile,
+    source: sampleNotifyPyFile,
+    checkExistence: true,
+  },
+  {
+    target: TaskBeforeFile,
+    source: sampleTaskShellFile,
+    checkExistence: true,
+  },
+  {
+    target: TaskBeforeJsFile,
+    content:
+      '// The JavaScript code that executes before the JavaScript task execution will execute.',
+    checkExistence: true,
+  },
+  {
+    target: TaskBeforePyFile,
+    content:
+      '# The Python code that executes before the Python task execution will execute.',
+    checkExistence: true,
+  },
+  {
+    target: TaskAfterFile,
+    source: sampleTaskShellFile,
+    checkExistence: true,
+  },
+];
+
 export default async () => {
-  const authFileExist = await fileExist(authConfigFile);
-  const confFileExist = await fileExist(confFile);
-  const scriptDirExist = await fileExist(scriptPath);
-  const logDirExist = await fileExist(logPath);
-  const configDirExist = await fileExist(configPath);
-  const uploadDirExist = await fileExist(uploadPath);
-  const sshDirExist = await fileExist(sshPath);
-  const bakDirExist = await fileExist(bakPath);
-  const sshdDirExist = await fileExist(sshdPath);
-  const systemLogDirExist = await fileExist(systemLogPath);
-  const tmpDirExist = await fileExist(tmpPath);
-  const scriptNotifyJsFileExist = await fileExist(scriptNotifyJsFile);
-  const scriptNotifyPyFileExist = await fileExist(scriptNotifyPyFile);
-  const TaskBeforeFileExist = await fileExist(TaskBeforeFile);
-  const TaskAfterFileExist = await fileExist(TaskAfterFile);
-
-  if (!configDirExist) {
-    await fs.mkdir(configPath);
+  for (const dirPath of directories) {
+    if (!(await fileExist(dirPath))) {
+      await fs.mkdir(dirPath);
+    }
   }
 
-  if (!scriptDirExist) {
-    await fs.mkdir(scriptPath);
-  }
-
-  if (!logDirExist) {
-    await fs.mkdir(logPath);
-  }
-
-  if (!tmpDirExist) {
-    await fs.mkdir(tmpPath);
-  }
-
-  if (!uploadDirExist) {
-    await fs.mkdir(uploadPath);
-  }
-
-  if (!sshDirExist) {
-    await fs.mkdir(sshPath);
-  }
-
-  if (!bakDirExist) {
-    await fs.mkdir(bakPath);
-  }
-
-  if (!sshdDirExist) {
-    await fs.mkdir(sshdPath);
-  }
-
-  if (!systemLogDirExist) {
-    await fs.mkdir(systemLogPath);
-  }
-
-  // 初始化文件
-  if (!authFileExist) {
-    await fs.writeFile(authConfigFile, await fs.readFile(sampleAuthFile));
-  }
-
-  if (!confFileExist) {
-    await fs.writeFile(confFile, await fs.readFile(sampleConfigFile));
-  }
-
-  if (!scriptNotifyJsFileExist) {
-    await fs.writeFile(
-      scriptNotifyJsFile,
-      await fs.readFile(sampleNotifyJsFile),
+  for (const item of files) {
+    const exists = await fileExist(item.target);
+    if (!item.checkExistence || !exists) {
+      if (!item.content && !item.source) {
+        throw new Error(
+          `Neither content nor source specified for ${item.target}`,
         );
       }
-
-  if (!scriptNotifyPyFileExist) {
-    await fs.writeFile(
-      scriptNotifyPyFile,
-      await fs.readFile(sampleNotifyPyFile),
-    );
+      const content = item.content || (await fs.readFile(item.source!));
+      await writeFileWithLock(item.target, content);
     }
-
-  if (!TaskBeforeFileExist) {
-    await fs.writeFile(TaskBeforeFile, await fs.readFile(sampleTaskShellFile));
-  }
-
-  if (!TaskAfterFileExist) {
-    await fs.writeFile(TaskAfterFile, await fs.readFile(sampleTaskShellFile));
   }
 
   Logger.info('✌️ Init file down');

back/loaders/initTask.ts

@@ -12,7 +12,10 @@ export default async () => {
   const subscriptionService = Container.get(SubscriptionService);
 
   // 生成内置token
-  let tokenCommand = `tsx ${join(config.rootPath, 'back/token.ts')}`;
+  let tokenCommand = `ts-node-transpile-only ${join(
+    config.rootPath,
+    'back/token.ts',
+  )}`;
   const tokenFile = join(config.rootPath, 'static/build/token.js');
 
   if (await fileExist(tokenFile)) {
@@ -22,11 +25,16 @@ export default async () => {
     id: NaN,
     name: '生成token',
     command: tokenCommand,
+    runOrigin: 'system',
   } as ScheduleTaskType;
   await scheduleService.cancelIntervalTask(cron);
-  scheduleService.createIntervalTask(cron, {
+  scheduleService.createIntervalTask(
+    cron,
+    {
       days: 28,
-  });
+    },
+    true,
+  );
 
   // 运行删除日志任务
   const data = await systemService.getSystemConfig();
@@ -35,17 +43,21 @@ export default async () => {
       id: data.id as number,
       name: '删除日志',
       command: `ql rmlog ${data.info.logRemoveFrequency}`,
+      runOrigin: 'system' as const,
     };
     await scheduleService.cancelIntervalTask(rmlogCron);
-    scheduleService.createIntervalTask(rmlogCron, {
+    scheduleService.createIntervalTask(
+      rmlogCron,
+      {
         days: data.info.logRemoveFrequency,
-    });
+      },
+      true,
+    );
   }
 
-  // 运行所有订阅
   await subscriptionService.setSshConfig();
   const subs = await subscriptionService.list();
   for (const sub of subs) {
-    subscriptionService.handleTask(sub, !sub.is_disabled, !sub.is_disabled);
+    subscriptionService.handleTask(sub.get({ plain: true }), !sub.is_disabled);
   }
 };

back/loaders/logger.ts

@@ -4,10 +4,10 @@ import config from '../config';
 import path from 'path';
 
 const levelMap: Record<string, string> = {
-  info: '🔵',
-  warn: '🟡',
-  error: '🔴',
-  debug: '🔶'
+  info: '\ue6f5',
+  warn: '\ue880',
+  error: '\ue602',
+  debug: '\ue67f'
 }
 
 const customFormat = winston.format.combine(

back/loaders/sentry.ts

@@ -1,14 +1,16 @@
-import { Application } from 'express';
 import * as Sentry from '@sentry/node';
 import Logger from './logger';
-import config from '../config';
 import fs from 'fs';
-import { parseVersion } from '../config/util';
+import config from '../config';
+import { parseContentVersion } from '../config/util';
 
-export default async ({ expressApp }: { expressApp: Application }) => {
-  const { version } = await parseVersion(config.versionFile);
+let version = '1.0.0';
+try {
+  const content = fs.readFileSync(config.versionFile, 'utf-8');
+  ({ version } = parseContentVersion(content));
+} catch (error) {}
 
-  Sentry.init({
+Sentry.init({
   ignoreErrors: [
     /SequelizeUniqueConstraintError/i,
     /Validation error/i,
@@ -16,17 +18,9 @@ export default async ({ expressApp }: { expressApp: Application }) => {
     /celebrate request validation failed/i,
   ],
   dsn: 'https://8b5c84cfef3e22541bc84de0ed00497b@o1098464.ingest.sentry.io/6122819',
-    integrations: [
-      new Sentry.Integrations.Http({ tracing: true }),
-      new Sentry.Integrations.Express({ app: expressApp }),
-    ],
-    tracesSampleRate: 0.8,
+  tracesSampleRate: 0.5,
   release: version,
-  });
+});
 
-  expressApp.use(Sentry.Handlers.requestHandler());
-  expressApp.use(Sentry.Handlers.tracingHandler());
-
-  Logger.info('✌️ Sentry loaded');
-  console.log('✌️ Sentry loaded');
-};
+Logger.info('✌️ Sentry loaded');
+console.log('✌️ Sentry loaded');

back/loaders/sock.ts

@@ -2,9 +2,8 @@ import sockJs from 'sockjs';
 import { Server } from 'http';
 import { Container } from 'typedi';
 import SockService from '../services/sock';
-import config from '../config/index';
-import fs from 'fs/promises';
-import { getPlatform, safeJSONParse } from '../config/util';
+import { getPlatform } from '../config/util';
+import { shareStore } from '../shared/store';
 
 export default async ({ server }: { server: Server }) => {
   const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
@@ -15,13 +14,12 @@ export default async ({ server }: { server: Server }) => {
       conn.close('404');
     }
 
-    const data = await fs.readFile(config.authConfigFile, 'utf8');
+    const authInfo = await shareStore.getAuthInfo();
     const platform = getPlatform(conn.headers['user-agent'] || '') || 'desktop';
     const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
-    if (data) {
-      const { token = '', tokens = {} } = safeJSONParse(data);
+    if (authInfo) {
+      const { token = '', tokens = {} } = authInfo;
       if (headerToken === token || tokens[platform] === headerToken) {
-        conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
         sockService.addClient(conn);
 
         conn.on('data', (message) => {
@@ -33,8 +31,6 @@ export default async ({ server }: { server: Server }) => {
         });
 
         return;
-      } else {
-        conn.write(JSON.stringify({ type: 'ping', message: 'whyour' }));
       }
     }
 

back/loaders/update.ts

@@ -2,7 +2,7 @@ import bodyParser from 'body-parser';
 import { errors } from 'celebrate';
 import cors from 'cors';
 import { Application, NextFunction, Request, Response } from 'express';
-import jwt from 'express-jwt';
+import { expressjwt } from 'express-jwt';
 import Container from 'typedi';
 import config from '../config';
 import SystemService from '../services/system';
@@ -16,7 +16,7 @@ export default ({ app }: { app: Application }) => {
   app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
 
   app.use(
-    jwt({
+    expressjwt({
       secret: config.secret,
       algorithms: ['HS384'],
     }),

back/public.ts

@@ -21,8 +21,7 @@ app.get('/api/health', (req, res) => {
 });
 
 app
-  .listen(config.publicPort, async () => {
-    await require('./loaders/sentry').default({ expressApp: app });
+  .listen(config.publicPort, '0.0.0.0', async () => {
     await require('./loaders/db').default();
 
     Logger.debug(`✌️ 公共服务启动成功！`);

back/schedule/addCron.ts

@@ -24,7 +24,7 @@ const addCron = (
     );
 
     if (extraSchedules?.length) {
-      extraSchedules.forEach(x => {
+      extraSchedules.forEach((x) => {
         Logger.info(
           '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
           id,
@@ -32,19 +32,19 @@ const addCron = (
           x.schedule,
           command,
         );
-      })
+      });
     }
 
     scheduleStacks.set(id, [
       nodeSchedule.scheduleJob(id, schedule, async () => {
         Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
-        runCron(command, { name, schedule, extraSchedules });
+        runCron(command, item);
       }),
       ...(extraSchedules?.length
         ? extraSchedules.map((x) =>
             nodeSchedule.scheduleJob(id, x.schedule, async () => {
               Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
-            runCron(command, { name, schedule, extraSchedules });
+              runCron(command, item);
             }),
           )
         : []),

back/schedule/index.ts

@@ -17,7 +17,6 @@ server.bindAsync(
     if (err) {
       throw err;
     }
-    server.start();
     Logger.debug(`✌️ 定时服务启动成功！`);
     console.debug(`✌️ 定时服务启动成功！`);
     process.send?.('ready');

back/services/config.ts

@@ -11,9 +11,21 @@ export default class ConfigService {
 
   public async getFile(filePath: string, res: Response) {
     let content = '';
-    if (config.blackFileList.includes(filePath) || !filePath) {
-      res.send({ code: 403, message: '文件无法访问' });
+    const avaliablePath = [config.rootPath, config.configPath].map((x) =>
+      path.resolve(x, filePath),
+    );
+
+    if (
+      config.blackFileList.includes(filePath) ||
+      avaliablePath.every(
+        (x) =>
+          !x.startsWith(config.scriptPath) && !x.startsWith(config.configPath),
+      ) ||
+      !filePath
+    ) {
+      return res.send({ code: 403, message: '文件无法访问' });
     }
+
     if (filePath.startsWith('sample/')) {
       const res = await got.get(
         `https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`,

back/services/cron.ts

@@ -12,7 +12,7 @@ import {
   getUniqPath,
   safeJSONParse,
 } from '../config/util';
-import { Op, where, col as colFn, FindOptions, fn } from 'sequelize';
+import { Op, where, col as colFn, FindOptions, fn, Order } from 'sequelize';
 import path from 'path';
 import { TASK_PREFIX, QL_PREFIX } from '../config/const';
 import cronClient from '../schedule/client';
@@ -21,6 +21,7 @@ import { spawn } from 'cross-spawn';
 import dayjs from 'dayjs';
 import pickBy from 'lodash/pickBy';
 import omit from 'lodash/omit';
+import { writeFileWithLock } from '../shared/utils';
 
 @Service()
 export default class CronService {
@@ -114,7 +115,13 @@ export default class CronService {
     }
 
     for (const id of ids) {
-      const cron = await this.getDb({ id });
+      let cron;
+      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']);
       }
@@ -356,9 +363,9 @@ export default class CronService {
         order.unshift([field, type]);
       }
     }
-    let condition: any = {
+    let condition: FindOptions<Crontab> = {
       where: query,
-      order: order,
+      order: order as Order,
     };
     if (page && size) {
       condition.offset = (page - 1) * size;
@@ -375,7 +382,10 @@ export default class CronService {
 
   public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Crontab);
+    if (!doc) {
+      throw new Error(`Cron ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -407,7 +417,7 @@ export default class CronService {
   }
 
   private async runSingle(cronId: number): Promise<number | void> {
-    return taskLimit.runWithCronLimit(() => {
+    return taskLimit.manualRunWithCronLimit(() => {
       return new Promise(async (resolve: any) => {
         const cron = await this.getDb({ id: cronId });
         const params = {
@@ -422,7 +432,7 @@ export default class CronService {
         }
 
         this.logger.info(
-          `[panel][开始执行任务] 参数 ${JSON.stringify(params)}`,
+          `[panel][开始执行任务] 参数: ${JSON.stringify(params)}`,
         );
 
         let { id, command, log_path } = cron;
@@ -434,9 +444,11 @@ 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(cron)}`,
+          `real_log_path=${logPath} no_delay=true ${this.makeCommand(
+            cron,
+            true,
+          )}`,
           { shell: '/bin/bash' },
         );
 
@@ -444,14 +456,32 @@ 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()}`);
+          this.logger.info(
+            '[panel][执行任务失败] 命令: %s, 错误信息: %j',
+            command,
+            data.toString(),
+          );
+          await fs.appendFile(absolutePath, data.toString());
         });
         cp.on('error', async (err) => {
-          await fs.appendFile(`${absolutePath}`, `${JSON.stringify(err)}`);
+          this.logger.error(
+            '[panel][创建任务失败] 命令: %s, 错误信息: %j',
+            command,
+            err,
+          );
+          await fs.appendFile(absolutePath, JSON.stringify(err));
         });
 
         cp.on('exit', async (code) => {
+          this.logger.info(
+            '[panel][执行任务结束] 参数: %s, 退出码: %j',
+            JSON.stringify(params),
+            code,
+          );
           await CrontabModel.update(
             { status: CrontabStatus.idle, pid: undefined },
             { where: { id } },
@@ -524,20 +554,24 @@ export default class CronService {
     }
   }
 
-  private makeCommand(tab: Crontab) {
+  private makeCommand(tab: Crontab, realTime?: boolean) {
     let command = tab.command.trim();
     if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
       command = `${TASK_PREFIX}${tab.command}`;
     }
-    let commandVariable = `no_tee=true ID=${tab.id} `;
+    let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${
+      tab.id
+    } `;
     if (tab.task_before) {
       commandVariable += `task_before='${tab.task_before
         .replace(/'/g, "'\\''")
+        .replace(/;? *\n/g, ';')
         .trim()}' `;
     }
     if (tab.task_after) {
       commandVariable += `task_after='${tab.task_after
         .replace(/'/g, "'\\''")
+        .replace(/;? *\n/g, ';')
         .trim()}' `;
     }
 
@@ -568,7 +602,7 @@ export default class CronService {
       }
     });
 
-    await fs.writeFile(config.crontabFile, crontab_string);
+    await writeFileWithLock(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);
     await CrontabModel.update({ saved: true }, { where: {} });

back/services/cronView.ts

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

back/services/dependence.ts

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

back/services/env.ts

@@ -13,6 +13,7 @@ import {
 } from '../data/env';
 import groupBy from 'lodash/groupBy';
 import { FindOptions, Op } from 'sequelize';
+import { writeFileWithLock } from '../shared/utils';
 
 @Service()
 export default class EnvService {
@@ -165,7 +166,10 @@ export default class EnvService {
 
   public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
     const doc: any = await EnvModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Env);
+    if (!doc) {
+      throw new Error(`Env ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async disabled(ids: string[]) {
@@ -193,6 +197,8 @@ 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];
@@ -205,9 +211,23 @@ 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 writeFileWithLock(config.envFile, env_string);
+    await writeFileWithLock(config.jsEnvFile, js_env_string);
+    await writeFileWithLock(config.pyEnvFile, py_env_string);
   }
 }

back/services/notify.ts

@@ -4,9 +4,11 @@ import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 import nodemailer from 'nodemailer';
 import { Inject, Service } from 'typedi';
 import winston from 'winston';
-import { parseBody, parseHeaders } from '../config/util';
+import { parseBody, parseHeaders, safeJSONParse } from '../config/util';
 import { NotificationInfo } from '../data/notify';
 import UserService from './user';
+import { readFile } from 'fs/promises';
+import config from '../config';
 
 @Service()
 export default class NotificationService {
@@ -27,11 +29,14 @@ 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],
     ['lark', this.lark],
     ['chronocat', this.chronocat],
+    ['ntfy', this.ntfy],
+    ['wxPusherBot', this.wxPusherBot],
   ]);
 
   private title = '';
@@ -42,7 +47,28 @@ export default class NotificationService {
     retry: 1,
   };
 
-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor() {}
+
+  public async externalNotify(
+    title: string,
+    content: string,
+  ): Promise<boolean | undefined> {
+    const { type, ...rest } = safeJSONParse(
+      await readFile(config.systemNotifyFile, 'utf-8'),
+    );
+    if (type) {
+      this.title = title;
+      this.content = content;
+      this.params = rest;
+      const notificationModeAction = this.modeMap.get(type);
+      try {
+        return await notificationModeAction?.call(this);
+      } catch (error: any) {
+        throw error;
+      }
+    }
+    return false;
+  }
 
   public async notify(
     title: string,
@@ -127,14 +153,16 @@ export default class NotificationService {
 
   private async serverChan() {
     const { serverChanKey } = this.params;
-    const url = serverChanKey.startsWith('SCT')
-      ? `https://sctapi.ftqq.com/${serverChanKey}.send`
-      : `https://sc.ftqq.com/${serverChanKey}.send`;
+    const matchResult = serverChanKey.match(/^sctp(\d+)t/i);
+    const url = matchResult && matchResult[1]
+      ? `https://${matchResult[1]}.push.ft07.com/send/${serverChanKey}.send`
+      : `https://sctapi.ftqq.com/${serverChanKey}.send`;
+
     try {
       const res: any = await got
         .post(url, {
           ...this.gotOption,
-          body: `title=${this.title}&desp=${this.content}`,
+          body: `title=${encodeURIComponent(this.title)}&desp=${encodeURIComponent(this.content)}`,
           headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
         })
         .json();
@@ -196,22 +224,35 @@ export default class NotificationService {
   }
 
   private async bark() {
-    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
-      this.params;
+    let {
+      barkPush,
+      barkIcon = '',
+      barkSound = '',
+      barkGroup = '',
+      barkLevel = '',
+      barkUrl = '',
+      barkArchive = '',
+    } = this.params;
     if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
-    const url = `${barkPush}/${encodeURIComponent(
-      this.title,
-    )}/${encodeURIComponent(
-      this.content,
-    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
-
+    const url = `${barkPush}`;
+    const body = {
+      title: this.title,
+      body: this.content,
+      icon: barkIcon,
+      sound: barkSound,
+      group: barkGroup,
+      isArchive: barkArchive,
+      level: barkLevel,
+      url: barkUrl,
+    };
     try {
       const res: any = await got
-        .get(url, {
+        .post(url, {
           ...this.gotOption,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          json: body,
+          headers: { 'Content-Type': 'application/json' },
         })
         .json();
       if (res.code === 200) {
@@ -482,17 +523,60 @@ export default class NotificationService {
  }
 
   private async pushPlus() {
-    const { pushPlusToken, pushPlusUser } = this.params;
+    const { pushPlusToken, pushPlusUser, pushplusWebhook, pushPlusTemplate, pushplusChannel, pushplusCallbackUrl, pushplusTo} = this.params;
     const url = `https://www.pushplus.plus/send`;
     try {
-      const res: any = await got
-        .post(url, {
+      let body = {
         ...this.gotOption,
         json: {
           token: `${pushPlusToken}`,
           title: `${this.title}`,
           content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
           topic: `${pushPlusUser || ''}`,
+          template: `${pushPlusTemplate || 'html'}`,
+          channel: `${pushplusChannel || 'wechat'}`,
+          webhook: `${pushplusWebhook || ''}`,
+          callbackUrl: `${pushplusCallbackUrl || ''}`,
+          to: `${pushplusTo || ''}`
+        },
+      }
+
+      const res: any = await got
+        .post(url, body)
+        .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 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();
@@ -567,19 +651,17 @@ export default class NotificationService {
   }
 
   private async pushMe() {
-    const { pushMeKey } = this.params;
+    const { pushMeKey, pushMeUrl } = this.params;
     try {
-      const res: any = await got.post(
-        `https://push.i-i.me/?push_key=${pushMeKey}`,
-        {
+      const res: any = await got.post(pushMeUrl || 'https://push.i-i.me/', {
         ...this.gotOption,
         json: {
+          push_key: pushMeKey,
           title: this.title,
           content: this.content,
         },
         headers: { 'Content-Type': 'application/json' },
-        },
-      );
+      });
       if (res.body === 'success') {
         return true;
       } else {
@@ -590,6 +672,77 @@ export default class NotificationService {
     }
   }
 
+  private async ntfy() {
+    const { ntfyUrl, ntfyTopic, ntfyPriority } = this.params;
+    // 编码函数
+    const encodeRfc2047 = (text: string, charset: string = 'UTF-8'): string => {
+      const encodedText = Buffer.from(text).toString('base64');
+      return `=?${charset}?B?${encodedText}?=`;
+  };
+    try {
+        const encodedTitle = encodeRfc2047(this.title);
+        const res: any = await got
+          .post(`${ntfyUrl || 'https://ntfy.sh'}/${ntfyTopic}`, {
+              ...this.gotOption,
+              body: `${this.content}`,
+              headers: { 'Title': encodedTitle, 'Priority': `${ntfyPriority || '3'}` },
+          });
+          if (res.statusCode === 200) {
+            return true;
+          } else {
+            throw new Error(JSON.stringify(res));
+          }
+    } catch (error: any) {
+        throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
+  private async wxPusherBot() {
+    const { wxPusherBotAppToken, wxPusherBotTopicIds, wxPusherBotUids } = this.params;
+    // 处理 topicIds，将分号分隔的字符串转为数组
+    const topicIds = wxPusherBotTopicIds ? wxPusherBotTopicIds.split(';')
+      .map(id => id.trim())
+      .filter(id => id)
+      .map(id => parseInt(id)) : [];
+
+    // 处理 uids，将分号分隔的字符串转为数组  
+    const uids = wxPusherBotUids ? wxPusherBotUids.split(';')
+      .map(uid => uid.trim())
+      .filter(uid => uid) : [];
+
+    // topic_ids 和 uids 至少要有一个
+    if (!topicIds.length && !uids.length) {
+      throw new Error('wxPusher 服务的 TopicIds 和 Uids 至少配置一个才行');
+    }
+
+    const url = `https://wxpusher.zjiecode.com/api/send/message`;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          json: {
+            appToken: wxPusherBotAppToken,
+            content: `<h1>${this.title}</h1><br/><div style='white-space: pre-wrap;'>${this.content}</div>`,
+            summary: this.title,
+            contentType: 2,
+            topicIds: topicIds,
+            uids: uids,
+            verifyPayType: 0
+          },
+        })
+        .json();
+
+      if (res.code === 1000) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
+  
   private async chronocat() {
     const { chronocatURL, chronocatQQ, chronocatToken } = this.params;
     try {

back/services/open.ts

@@ -1,19 +1,18 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import { createRandomString } from '../config/util';
-import config from '../config';
 import { App, AppModel } from '../data/open';
 import { v4 as uuidV4 } from 'uuid';
 import sequelize, { Op } from 'sequelize';
+import { shareStore } from '../shared/store';
 
 @Service()
 export default class OpenService {
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  public async findTokenByValue(token: string): Promise<App | null> {
+  public async findApps(): Promise<App[] | null> {
     const docs = await this.find({});
-    const doc = docs.filter((x) => x.tokens?.find((y) => y.value === token));
-    return doc[0];
+    return docs;
   }
 
   public async create(payload: App): Promise<App> {
@@ -21,12 +20,14 @@ export default class OpenService {
     tab.client_id = createRandomString(12, 12);
     tab.client_secret = createRandomString(24, 24);
     const doc = await this.insert(tab);
+    const apps = await this.find({});
+    await shareStore.updateApps(apps);
     return { ...doc, tokens: [] };
   }
 
   public async insert(payload: App): Promise<App> {
     const doc = await AppModel.create(payload, { returning: true });
-    return doc.get({ plain: true }) as App;
+    return doc.get({ plain: true });
   }
 
   public async update(payload: App): Promise<App> {
@@ -34,26 +35,33 @@ export default class OpenService {
       name: payload.name,
       scopes: payload.scopes,
       id: payload.id,
-    } as any);
+    } as App);
     return { ...newDoc, tokens: [] };
   }
 
-  private async updateDb(payload: App): Promise<App> {
+  private async updateDb(payload: Partial<App>): Promise<App> {
     await AppModel.update(payload, { where: { id: payload.id } });
-    return await this.getDb({ id: payload.id });
+    const apps = await this.find({});
+    await shareStore.updateApps(apps);
+    return apps?.find((x) => x.id === payload.id) as App;
   }
 
-  public async getDb(query: any): Promise<App> {
-    const doc: any = await AppModel.findOne({ where: query });
-    return doc && (doc.get({ plain: true }) as App);
+  public async getDb(query: Record<string, any>): Promise<App> {
+    const doc = await AppModel.findOne({ where: query });
+    if (!doc) {
+      throw new Error(`App ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async remove(ids: number[]) {
     await AppModel.destroy({ where: { id: ids } });
+    const apps = await this.find({});
+    await shareStore.updateApps(apps);
   }
 
   public async resetSecret(id: number): Promise<App> {
-    const tab: any = {
+    const tab: Partial<App> = {
       client_secret: createRandomString(24, 24),
       tokens: [],
       id,
@@ -71,7 +79,7 @@ export default class OpenService {
   public async list(
     searchText: string = '',
     sort: any = {},
-    query: any = {},
+    query: Record<string, any> = {},
   ): Promise<App[]> {
     let condition = { ...query };
     if (searchText) {
@@ -98,7 +106,7 @@ export default class OpenService {
     }
   }
 
-  private async find(query: any, sort?: any): Promise<App[]> {
+  private async find(query: Record<string, any>, sort?: any): Promise<App[]> {
     const docs = await AppModel.findAll({ where: { ...query } });
     return docs.map((x) => x.get({ plain: true }));
   }
@@ -132,6 +140,8 @@ export default class OpenService {
         { tokens },
         { where: { client_id, client_secret } },
       );
+      const apps = await this.find({});
+      await shareStore.updateApps(apps);
       return {
         code: 200,
         data: {
@@ -141,7 +151,7 @@ export default class OpenService {
         },
       };
     } else {
-      return { code: 400, message: 'client_id或client_seret有误' };
+      return { code: 400, message: 'client_id 或 client_seret 有误' };
     }
   }
 
@@ -149,9 +159,11 @@ export default class OpenService {
     value: string;
     expiration: number;
   }> {
-    let systemApp = (await AppModel.findOne({
+    let systemApp = (
+      await AppModel.findOne({
         where: { name: 'system' },
-    })) as App;
+      })
+    )?.get({ plain: true });
     if (!systemApp) {
       systemApp = await this.create({
         name: 'system',

back/services/schedule.ts

@@ -13,10 +13,11 @@ import taskLimit from '../shared/pLimit';
 import { spawn } from 'cross-spawn';
 
 export interface ScheduleTaskType {
-  id: number;
+  id?: number;
   command: string;
   name?: string;
   schedule?: string;
+  runOrigin: 'subscription' | 'system' | 'script';
 }
 
 export interface TaskCallbacks {
@@ -40,9 +41,13 @@ export default class ScheduleService {
 
   private intervalSchedule = new ToadScheduler();
 
-  private maxBuffer = 200 * 1024 * 1024;
+  private taskLimitMap = {
+    system: 'runWithSystemLimit' as const,
+    script: 'runWithScriptLimit' as const,
+    subscription: 'runWithSubscriptionLimit' as const,
+  };
 
-  constructor(@Inject('logger') private logger: winston.Logger) { }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   async runTask(
     command: string,
@@ -51,12 +56,21 @@ export default class ScheduleService {
       schedule?: string;
       name?: string;
       command?: string;
+      id: string;
+      runOrigin: 'subscription' | 'system' | 'script';
     },
     completionTime: 'start' | 'end' = 'end',
   ) {
-    return taskLimit.runWithCronLimit(() => {
+    const { runOrigin, ...others } = params;
+
+    return taskLimit[this.taskLimitMap[runOrigin]](others, () => {
       return new Promise(async (resolve, reject) => {
-        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify({ ...params, command })}`);
+        this.logger.info(
+          `[panel][开始执行任务] 参数: ${JSON.stringify({
+            ...others,
+            command,
+          })}`,
+        );
 
         try {
           const startTime = dayjs();
@@ -90,13 +104,21 @@ export default class ScheduleService {
           });
 
           cp.on('exit', async (code) => {
+            this.logger.info(
+              '[panel][执行任务结束] 参数: %s, 退出码: %j',
+              JSON.stringify({
+                ...others,
+                command,
+              }),
+              code,
+            );
             const endTime = dayjs();
             await callbacks.onEnd?.(
               cp,
               endTime,
               endTime.diff(startTime, 'seconds'),
             );
-            resolve({ ...params, pid: cp.pid, code });
+            resolve({ ...others, pid: cp.pid, code });
           });
         } catch (error) {
           this.logger.error(
@@ -111,7 +133,7 @@ export default class ScheduleService {
   }
 
   async createCronTask(
-    { id = 0, command, name, schedule = '' }: ScheduleTaskType,
+    { id = 0, command, name, schedule = '', runOrigin }: ScheduleTaskType,
     callbacks?: TaskCallbacks,
     runImmediately = false,
   ) {
@@ -131,6 +153,8 @@ export default class ScheduleService {
           name,
           schedule,
           command,
+          id: _id,
+          runOrigin,
         });
       }),
     );
@@ -140,6 +164,8 @@ export default class ScheduleService {
         name,
         schedule,
         command,
+        id: _id,
+        runOrigin,
       });
     }
   }
@@ -154,7 +180,7 @@ export default class ScheduleService {
   }
 
   async createIntervalTask(
-    { id = 0, command, name = '' }: ScheduleTaskType,
+    { id = 0, command, name = '', runOrigin }: ScheduleTaskType,
     schedule: SimpleIntervalSchedule,
     runImmediately = true,
     callbacks?: TaskCallbacks,
@@ -172,11 +198,13 @@ export default class ScheduleService {
         this.runTask(command, callbacks, {
           name,
           command,
+          id: _id,
+          runOrigin,
         });
       },
       (err) => {
         this.logger.error(
-          '[执行任务失败] 命令: %s, 错误信息: %j',
+          '[panel][执行任务失败] 命令: %s, 错误信息: %j',
           command,
           err,
         );
@@ -186,7 +214,7 @@ export default class ScheduleService {
     const job = new LongIntervalJob(
       { runImmediately: false, ...schedule },
       task,
-      _id,
+      { id: _id },
     );
 
     this.intervalSchedule.addIntervalJob(job);
@@ -195,13 +223,19 @@ export default class ScheduleService {
       this.runTask(command, callbacks, {
         name,
         command,
+        id: _id,
+        runOrigin,
       });
     }
   }
 
   async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
-    this.logger.info('[取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
+    this.logger.info(
+      '[panel][取消interval任务], 任务ID: %s, 任务名: %s',
+      _id,
+      name,
+    );
     this.intervalSchedule.removeById(_id);
   }
 

back/services/script.ts

@@ -7,6 +7,7 @@ import ScheduleService, { TaskCallbacks } from './schedule';
 import config from '../config';
 import { TASK_COMMAND } from '../config/const';
 import { getFileContentByName, getPid, killTask, rmPath } from '../config/util';
+import taskLimit from '../shared/pLimit';
 
 @Service()
 export default class ScriptService {
@@ -41,9 +42,9 @@ export default class ScriptService {
     const relativePath = path.relative(config.scriptPath, filePath);
     const command = `${TASK_COMMAND} ${relativePath} now`;
     const pid = await this.scheduleService.runTask(
-      command,
+      `real_time=true ${command}`,
       this.taskCallbacks(filePath),
-      { command },
+      { command, id: relativePath.replace(/ /g, '-'), runOrigin: 'script' },
       'start',
     );
 
@@ -53,6 +54,7 @@ export default class ScriptService {
   public async stopScript(filePath: string, pid: number) {
     if (!pid) {
       const relativePath = path.relative(config.scriptPath, filePath);
+      taskLimit.removeQueuedCron(relativePath.replace(/ /g, '-'));
       pid = (await getPid(`${TASK_COMMAND} ${relativePath} now`)) as number;
     }
     try {
@@ -63,8 +65,13 @@ export default class ScriptService {
   }
 
   public async getFile(filePath: string, fileName: string) {
-    const _filePath = join(config.scriptPath, filePath, fileName);
-    const content = await getFileContentByName(_filePath);
+    const finalPath = path.resolve(config.scriptPath, filePath, fileName);
+
+    if (!finalPath.startsWith(config.scriptPath)) {
+      return '';
+    }
+
+    const content = await getFileContentByName(finalPath);
     return content;
   }
 }

back/services/sshKey.ts

@@ -7,6 +7,7 @@ import { Subscription } from '../data/subscription';
 import { formatUrl } from '../config/subscription';
 import config from '../config';
 import { fileExist, rmPath } from '../config/util';
+import { writeFileWithLock } from '../shared/utils';
 
 @Service()
 export default class SshKeyService {
@@ -25,13 +26,12 @@ export default class SshKeyService {
     if (_exist) {
       config = await fs.readFile(this.sshConfigFilePath, { encoding: 'utf-8' });
     } else {
-      await fs.writeFile(this.sshConfigFilePath, '');
+      await writeFileWithLock(this.sshConfigFilePath, '');
     }
     if (!config.includes(this.sshConfigHeader)) {
-      await fs.writeFile(
+      await writeFileWithLock(
         this.sshConfigFilePath,
         `${this.sshConfigHeader}\n\n${config}`,
-        { encoding: 'utf-8' },
       );
     }
   }
@@ -41,10 +41,14 @@ export default class SshKeyService {
     key: string,
   ): Promise<void> {
     try {
-      await fs.writeFile(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
+      await writeFileWithLock(
+        path.join(this.sshPath, alias),
+        `${key}${os.EOL}`,
+        {
           encoding: 'utf8',
           mode: '400',
-      });
+        },
+      );
     } catch (error) {
       this.logger.error('生成私钥文件失败', error);
     }
@@ -74,12 +78,9 @@ export default class SshKeyService {
       this.sshPath,
       alias,
     )}\n    StrictHostKeyChecking no\n${proxyStr}`;
-    await fs.writeFile(
+    await writeFileWithLock(
       `${path.join(this.sshPath, `${alias}.config`)}`,
       config,
-      {
-        encoding: 'utf8',
-      },
     );
   }
 
@@ -102,7 +103,11 @@ export default class SshKeyService {
     await this.generateSingleSshConfig(alias, host, proxy);
   }
 
-  public async removeSSHKey(alias: string, host: string, proxy?: string): Promise<void> {
+  public async removeSSHKey(
+    alias: string,
+    host: string,
+    proxy?: string,
+  ): Promise<void> {
     await this.removePrivateKeyFile(alias);
     await this.removeSshConfig(alias);
   }

back/services/subscription.ts

@@ -3,6 +3,7 @@ import winston from 'winston';
 import config from '../config';
 import {
   Subscription,
+  SubscriptionInstance,
   SubscriptionModel,
   SubscriptionStatus,
 } from '../data/subscription';
@@ -29,6 +30,7 @@ import { LOG_END_SYMBOL } from '../config/const';
 import { formatCommand, formatUrl } from '../config/subscription';
 import { CrontabModel } from '../data/cron';
 import CrontabService from './cron';
+import taskLimit from '../shared/pLimit';
 
 @Service()
 export default class SubscriptionService {
@@ -40,8 +42,12 @@ export default class SubscriptionService {
     private crontabService: CrontabService,
   ) {}
 
-  public async list(searchText?: string): Promise<Subscription[]> {
+  public async list(
+    searchText?: string,
+    ids?: string,
+  ): Promise<SubscriptionInstance[]> {
     let query = {};
+    const subIds = JSON.parse(ids || '[]');
     if (searchText) {
       const reg = {
         [Op.or]: [
@@ -62,7 +68,7 @@ export default class SubscriptionService {
     }
     try {
       const result = await SubscriptionModel.findAll({
-        where: query,
+        where: { ...query, ...(ids ? { id: subIds } : undefined) },
         order: [
           ['is_disabled', 'ASC'],
           ['createdAt', 'DESC'],
@@ -87,16 +93,16 @@ export default class SubscriptionService {
       this.scheduleService.cancelCronTask(doc as any);
       needCreate &&
         (await this.scheduleService.createCronTask(
-          doc as any,
+          { ...doc, runOrigin: 'subscription' } as any,
           this.taskCallbacks(doc),
           runImmediately,
         ));
-    } else {
+    } else if (doc.interval_schedule) {
       this.scheduleService.cancelIntervalTask(doc as any);
-      const { type, value } = doc.interval_schedule as any;
+      const { type, value } = doc.interval_schedule;
       needCreate &&
         (await this.scheduleService.createIntervalTask(
-          doc as any,
+          { ...doc, runOrigin: 'subscription' } as any,
           { [type]: value } as SimpleIntervalSchedule,
           runImmediately,
           this.taskCallbacks(doc),
@@ -202,12 +208,12 @@ export default class SubscriptionService {
   public async create(payload: Subscription): Promise<Subscription> {
     const tab = new Subscription(payload);
     const doc = await this.insert(tab);
-    await this.handleTask(doc);
+    await this.handleTask(doc.get({ plain: true }));
     await this.setSshConfig();
     return doc;
   }
 
-  public async insert(payload: Subscription): Promise<Subscription> {
+  public async insert(payload: Subscription): Promise<SubscriptionInstance> {
     return await SubscriptionModel.create(payload, { returning: true });
   }
 
@@ -256,10 +262,10 @@ export default class SubscriptionService {
     );
   }
 
-  public async remove(ids: number[], query: any) {
+  public async remove(ids: number[], query: { force?: boolean }) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      await this.handleTask(doc, false);
+      await this.handleTask(doc.get({ plain: true }), false);
     }
     await SubscriptionModel.destroy({ where: { id: ids } });
     await this.setSshConfig();
@@ -271,7 +277,9 @@ export default class SubscriptionService {
       }
       for (const doc of docs) {
         const filePath = join(config.scriptPath, doc.alias);
+        const repoPath = join(config.repoPath, doc.alias);
         await rmPath(filePath);
+        await rmPath(repoPath);
       }
     }
   }
@@ -279,8 +287,11 @@ export default class SubscriptionService {
   public async getDb(
     query: FindOptions<Subscription>['where'],
   ): Promise<Subscription> {
-    const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Subscription);
+    const doc = await SubscriptionModel.findOne({ where: { ...query } });
+    if (!doc) {
+      throw new Error(`Subscription ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -323,6 +334,8 @@ export default class SubscriptionService {
       name: subscription.name,
       schedule: subscription.schedule,
       command,
+      id: String(subscription.id),
+      runOrigin: 'subscription',
     });
   }
 
@@ -331,7 +344,7 @@ export default class SubscriptionService {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     await this.setSshConfig();
     for (const doc of docs) {
-      await this.handleTask(doc, false);
+      await this.handleTask(doc.get({ plain: true }), false);
     }
   }
 
@@ -340,7 +353,7 @@ export default class SubscriptionService {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     await this.setSshConfig();
     for (const doc of docs) {
-      await this.handleTask(doc);
+      await this.handleTask(doc.get({ plain: true }));
     }
   }
 

back/services/system.ts

@@ -15,6 +15,7 @@ import {
   parseVersion,
   promiseExec,
   readDirs,
+  rmPath,
 } from '../config/util';
 import {
   DependenceModel,
@@ -24,7 +25,7 @@ import {
 import { NotificationInfo } from '../data/notify';
 import {
   AuthDataType,
-  AuthInfo,
+  SystemInfo,
   SystemInstance,
   SystemModel,
   SystemModelInfo,
@@ -33,6 +34,8 @@ import taskLimit from '../shared/pLimit';
 import NotificationService from './notify';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import SockService from './sock';
+import os from 'os';
+import dayjs from 'dayjs';
 
 @Service()
 export default class SystemService {
@@ -47,18 +50,22 @@ export default class SystemService {
 
   public async getSystemConfig() {
     const doc = await this.getDb({ type: AuthDataType.systemConfig });
-    return doc || ({} as SystemInstance);
-  }
-
-  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<SystemInstance> {
-    const doc: any = await SystemModel.findOne({ where: { ...query } });
-    return doc && doc.get({ plain: true });
+  private async updateAuthDb(payload: SystemInfo): Promise<SystemInfo> {
+    const { id, ...others } = payload;
+    await SystemModel.update(others, { where: { id } });
+    const doc = await this.getDb({ id });
+    return doc;
+  }
+
+  public async getDb(query: any): Promise<SystemInfo> {
+    const doc = await SystemModel.findOne({ where: query });
+    if (!doc) {
+      throw new Error(`System ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -86,17 +93,22 @@ export default class SystemService {
       info: { ...oDoc.info, ...info },
     });
     const cron = {
-      id: result.id || NaN,
+      id: result.id as number,
       name: '删除日志',
       command: `ql rmlog ${info.logRemoveFrequency}`,
+      runOrigin: 'system' as const,
     };
     if (oDoc.info?.logRemoveFrequency) {
       await this.scheduleService.cancelIntervalTask(cron);
     }
     if (info.logRemoveFrequency && info.logRemoveFrequency > 0) {
-      this.scheduleService.createIntervalTask(cron, {
+      this.scheduleService.createIntervalTask(
+        cron,
+        {
           days: info.logRemoveFrequency,
-      });
+        },
+        true,
+      );
     }
     return { code: 200, data: info };
   }
@@ -172,6 +184,8 @@ export default class SystemService {
       },
       {
         command,
+        id: 'update-node-mirror',
+        runOrigin: 'system',
       },
     );
   }
@@ -202,6 +216,9 @@ 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',
     });
@@ -243,6 +260,8 @@ export default class SystemService {
       },
       {
         command,
+        id: 'update-linux-mirror',
+        runOrigin: 'system',
       },
     );
   }
@@ -259,7 +278,7 @@ export default class SystemService {
             timeout: 30000,
           },
         );
-        lastVersionContent = await parseContentVersion(result.body);
+        lastVersionContent = parseContentVersion(result.body);
       } catch (error) {}
 
       if (!lastVersionContent) {
@@ -348,20 +367,15 @@ export default class SystemService {
     }
   }
 
-  public async run(
-    { command, logPath }: { command: string; logPath: string },
-    callback: TaskCallbacks,
-  ) {
+  public async run({ command }: { command: string }, callback: TaskCallbacks) {
     if (!command.startsWith(TASK_COMMAND)) {
       command = `${TASK_COMMAND} ${command}`;
     }
-    this.scheduleService.runTask(
-      `real_log_path=${logPath} real_time=true ${command}`,
-      callback,
-      {
+    this.scheduleService.runTask(`real_time=true ${command}`, callback, {
       command,
-      },
-    );
+      id: command.replace(/ /g, '-'),
+      runOrigin: 'system',
+    });
   }
 
   public async stop({ command, pid }: { command: string; pid: number }) {
@@ -388,7 +402,9 @@ export default class SystemService {
 
   public async exportData(res: Response) {
     try {
-      await promiseExec(`cd ${config.rootPath} && tar -zcvf ${config.dataTgzFile} data/`);
+      await promiseExec(
+        `cd ${config.dataPath} && cd ../ && tar -zcvf ${config.dataTgzFile} data/`,
+      );
       res.download(config.dataTgzFile);
     } catch (error: any) {
       return res.send({ code: 400, message: error.message });
@@ -399,7 +415,7 @@ export default class SystemService {
     try {
       await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
       const res = await promiseExec(
-        `cd ${config.tmpPath} && tar -zxvf data.tgz`,
+        `cd ${config.tmpPath} && tar -zxvf ${config.dataTgzFile}`,
       );
       return { code: 200, data: res };
     } catch (error: any) {
@@ -407,9 +423,25 @@ export default class SystemService {
     }
   }
 
-  public async getSystemLog(res: Response) {
+  public async getSystemLog(
+    res: Response,
+    query: {
+      startTime?: string;
+      endTime?: string;
+    },
+  ) {
+    const startTime = dayjs(query.startTime || undefined)
+      .startOf('d')
+      .valueOf();
+    const endTime = dayjs(query.endTime || undefined)
+      .endOf('d')
+      .valueOf();
     const result = await readDirs(config.systemLogPath, config.systemLogPath);
-    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+    const logs = result
+      .reverse()
+      .filter((x) => x.title.endsWith('.log'))
+      .filter((x) => x.mtime >= startTime && x.mtime <= endTime);
+
     res.set({
       'Content-Length': sum(logs.map((x) => x.size)),
     });
@@ -431,4 +463,12 @@ export default class SystemService {
       }
     })(res, logs);
   }
+
+  public async deleteSystemLog() {
+    const result = await readDirs(config.systemLogPath, config.systemLogPath);
+    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+    for (const log of logs) {
+      await rmPath(path.join(config.systemLogPath, log.title));
+    }
+  }
 }

back/services/user.ts

@@ -1,6 +1,7 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import {
+  createFile,
   createRandomString,
   fileExist,
   getNetIp,
@@ -13,10 +14,11 @@ import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import {
   AuthDataType,
-  AuthInfo,
+  SystemInfo,
   SystemModel,
   SystemModelInfo,
   LoginStatus,
+  AuthInfo,
 } from '../data/system';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
@@ -27,6 +29,7 @@ import dayjs from 'dayjs';
 import IP2Region from 'ip2region';
 import requestIp from 'request-ip';
 import uniq from 'lodash/uniq';
+import { shareStore } from '../shared/store';
 
 @Service()
 export default class UserService {
@@ -47,15 +50,9 @@ export default class UserService {
     req: Request,
     needTwoFactor = true,
   ): Promise<any> {
-    const _exist = await fileExist(config.authConfigFile);
-    if (!_exist) {
-      return this.initAuthInfo();
-    }
-
     let { username, password } = payloads;
     const content = await this.getAuthInfo();
     const timestamp = Date.now();
-    if (content) {
     let {
       username: cUsername,
       password: cPassword,
@@ -64,21 +61,9 @@ export default class UserService {
       lastip,
       lastaddr,
       twoFactorActivated,
-        twoFactorActived,
       tokens = {},
       platform,
     } = content;
-      // patch old field
-      twoFactorActivated = twoFactorActivated || twoFactorActived;
-
-      if (
-        (cUsername === 'admin' && cPassword === 'admin') ||
-        !cUsername ||
-        !cPassword
-      ) {
-        return this.initAuthInfo();
-      }
-
     const retriesTime = Math.pow(3, retries) * 1000;
     if (retries > 2 && timestamp - lastlogon < retriesTime) {
       const waitTime = Math.ceil(
@@ -97,7 +82,7 @@ export default class UserService {
       twoFactorActivated &&
       needTwoFactor
     ) {
-        this.updateAuthInfo(content, {
+      await this.updateAuthInfo(content, {
         isTwoFactorChecking: true,
       });
       return {
@@ -112,9 +97,7 @@ export default class UserService {
     let address = '';
     if (ipAddress) {
       const { country, province, city, isp } = ipAddress;
-        address = uniq([country, province, city, isp])
-          .filter(Boolean)
-          .join(' ');
+      address = uniq([country, province, city, isp]).filter(Boolean).join(' ');
     }
     if (username === cUsername && password === cPassword) {
       const data = createRandomString(50, 100);
@@ -124,7 +107,7 @@ export default class UserService {
         algorithm: 'HS384',
       });
 
-        this.updateAuthInfo(content, {
+      await this.updateAuthInfo(content, {
         token,
         tokens: {
           ...tokens,
@@ -153,12 +136,13 @@ export default class UserService {
           status: LoginStatus.success,
         },
       });
+      this.getLoginLog();
       return {
         code: 200,
         data: { token, lastip, lastaddr, lastlogon, retries, platform },
       };
     } else {
-        this.updateAuthInfo(content, {
+      await this.updateAuthInfo(content, {
         retries: retries + 1,
         lastlogon: timestamp,
         lastip: ip,
@@ -181,6 +165,7 @@ export default class UserService {
           status: LoginStatus.fail,
         },
       });
+      this.getLoginLog();
       if (retries > 2) {
         const waitTime = Math.round(Math.pow(3, retries + 1));
         return {
@@ -192,14 +177,11 @@ export default class UserService {
         return { code: 400, message: config.authError };
       }
     }
-    } else {
-      return this.initAuthInfo();
-    }
   }
 
   public async logout(platform: string): Promise<any> {
     const authInfo = await this.getAuthInfo();
-    this.updateAuthInfo(authInfo, {
+    await this.updateAuthInfo(authInfo, {
       token: '',
       tokens: { ...authInfo.tokens, [platform]: '' },
     });
@@ -214,8 +196,9 @@ export default class UserService {
         (a, b) => b.info!.timestamp! - a.info!.timestamp!,
       );
       if (result.length > 100) {
+        const ids = result.slice(100).map((x) => x.id!);
         await SystemModel.destroy({
-          where: { id: result[result.length - 1].id },
+          where: { id: ids },
         });
       }
       return result.map((x) => x.info);
@@ -223,25 +206,11 @@ export default class UserService {
     return [];
   }
 
-  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
+  private async insertDb(payload: SystemInfo): Promise<SystemInfo> {
     const doc = await SystemModel.create({ ...payload }, { returning: true });
     return doc;
   }
 
-  private async initAuthInfo() {
-    await fs.writeFile(
-      config.authConfigFile,
-      JSON.stringify({
-        username: 'admin',
-        password: 'admin',
-      }),
-    );
-    return {
-      code: 100,
-      message: '未找到认证文件，重新初始化',
-    };
-  }
-
   public async updateUsernameAndPassword({
     username,
     password,
@@ -253,35 +222,21 @@ export default class UserService {
       return { code: 400, message: '密码不能设置为admin' };
     }
     const authInfo = await this.getAuthInfo();
-    this.updateAuthInfo(authInfo, { username, password });
+    await this.updateAuthInfo(authInfo, { username, password });
     return { code: 200, message: '更新成功' };
   }
 
   public async updateAvatar(avatar: string) {
     const authInfo = await this.getAuthInfo();
-    this.updateAuthInfo(authInfo, { avatar });
+    await this.updateAuthInfo(authInfo, { avatar });
     return { code: 200, data: avatar, message: '更新成功' };
   }
 
-  public async getUserInfo(): Promise<any> {
-    const authFileExist = await fileExist(config.authConfigFile);
-    if (!authFileExist) {
-      await fs.writeFile(
-        config.authConfigFile,
-        JSON.stringify({
-          username: 'admin',
-          password: 'admin',
-        }),
-      );
-    }
-    return await this.getAuthInfo();
-  }
-
   public async initTwoFactor() {
     const secret = authenticator.generateSecret();
     const authInfo = await this.getAuthInfo();
     const otpauth = authenticator.keyuri(authInfo.username, 'qinglong', secret);
-    this.updateAuthInfo(authInfo, { twoFactorSecret: secret });
+    await this.updateAuthInfo(authInfo, { twoFactorSecret: secret });
     return { secret, url: otpauth };
   }
 
@@ -292,7 +247,7 @@ export default class UserService {
       secret: authInfo.twoFactorSecret,
     });
     if (isValid) {
-      this.updateAuthInfo(authInfo, { twoFactorActivated: true });
+      await this.updateAuthInfo(authInfo, { twoFactorActivated: true });
     }
     return isValid;
   }
@@ -318,7 +273,7 @@ export default class UserService {
       return this.login({ username, password }, req, false);
     } else {
       const { ip, address } = await getNetIp(req);
-      this.updateAuthInfo(authInfo, {
+      await this.updateAuthInfo(authInfo, {
         lastip: ip,
         lastaddr: address,
         platform: req.platform,
@@ -329,33 +284,38 @@ export default class UserService {
 
   public async deactiveTwoFactor() {
     const authInfo = await this.getAuthInfo();
-    this.updateAuthInfo(authInfo, {
+    await this.updateAuthInfo(authInfo, {
       twoFactorActivated: false,
-      twoFactorActived: false,
       twoFactorSecret: '',
     });
     return true;
   }
 
-  private async getAuthInfo() {
-    const content = await fs.readFile(config.authConfigFile, 'utf8');
-    return safeJSONParse(content);
+  public async getAuthInfo() {
+    const authInfo = await shareStore.getAuthInfo();
+    if (authInfo) {
+      return authInfo;
+    }
+    const doc = await this.getDb({ type: AuthDataType.authConfig });
+    return (doc.info || {}) as AuthInfo;
   }
 
-  private async updateAuthInfo(authInfo: any, info: any) {
-    await fs.writeFile(
-      config.authConfigFile,
-      JSON.stringify({ ...authInfo, ...info }),
-    );
+  private async updateAuthInfo(authInfo: AuthInfo, info: Partial<AuthInfo>) {
+    const result = { ...authInfo, ...info };
+    await shareStore.updateAuthInfo(result);
+    await this.updateAuthDb({
+      type: AuthDataType.authConfig,
+      info: result,
+    });
   }
 
   public async getNotificationMode(): Promise<NotificationInfo> {
     const doc = await this.getDb({ type: AuthDataType.notification });
-    return (doc && doc.info) || {};
+    return (doc.info || {}) as NotificationInfo;
   }
 
-  private async updateAuthDb(payload: AuthInfo): Promise<any> {
-    let doc = await SystemModel.findOne({ type: payload.type });
+  private async updateAuthDb(payload: SystemInfo): Promise<any> {
+    let doc = await SystemModel.findOne({ where: { type: payload.type } });
     if (doc) {
       const updateResult = await SystemModel.update(payload, {
         where: { id: doc.id },
@@ -368,9 +328,12 @@ export default class UserService {
     return doc;
   }
 
-  public async getDb(query: any): Promise<any> {
-    const doc: any = await SystemModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as any);
+  public async getDb(query: any): Promise<SystemInfo> {
+    const doc = await SystemModel.findOne({ where: { ...query } });
+    if (!doc) {
+      throw new Error(`${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -390,4 +353,13 @@ export default class UserService {
       return { code: 400, message: '通知发送失败，请检查参数' };
     }
   }
+
+  public async resetAuthInfo(info: Partial<AuthInfo>) {
+    const { retries, twoFactorActivated } = info;
+    const authInfo = await this.getAuthInfo();
+    await this.updateAuthInfo(authInfo, {
+      retries,
+      twoFactorActivated,
+    });
+  }
 }

back/shared/interface.ts

@@ -0,0 +1,33 @@
+import { Dependence } from '../data/dependence';
+import { ICron } from '../protos/cron';
+
+export 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 type TCron = Override<Partial<ICron>, { id: string }>;
+
+export interface IDependencyFn<T> {
+  (): Promise<T>;
+  dependency?: Dependence;
+}
+
+export interface ICronFn<T> {
+  (): Promise<T>;
+  cron?: TCron;
+}
+
+export interface ISchedule {
+  schedule?: string;
+  name?: string;
+  command?: string;
+  id: string;
+}
+
+export interface IScheduleFn<T> {
+  (): Promise<T>;
+  schedule?: ISchedule;
+}

back/shared/pLimit.ts

@@ -3,18 +3,36 @@ import os from 'os';
 import { AuthDataType, SystemModel } from '../data/system';
 import Logger from '../loaders/logger';
 import { Dependence } from '../data/dependence';
+import NotificationService from '../services/notify';
+import {
+  ICronFn,
+  IDependencyFn,
+  ISchedule,
+  IScheduleFn,
+  TCron,
+} from './interface';
 
-interface IDependencyFn<T> {
-  (): Promise<T>;
-  dependency?: Dependence;
-}
 class TaskLimit {
   private dependenyLimit = new PQueue({ concurrency: 1 });
   private queuedDependencyIds = new Set<number>([]);
+  private queuedCrons = new Map<string, ICronFn<any>[]>();
+  private repeatCronNotifyMap = new Map<string, number>();
   private updateLogLimit = new PQueue({ concurrency: 1 });
   private cronLimit = new PQueue({
     concurrency: Math.max(os.cpus().length, 4),
   });
+  private manualCronoLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
+  private subscriptionLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
+  private scriptLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
+  private systemLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
 
   get cronLimitActiveCount() {
     return this.cronLimit.pending;
@@ -28,6 +46,8 @@ class TaskLimit {
     return [...this.queuedDependencyIds.values()][0];
   }
 
+  private notificationService: NotificationService = new NotificationService();
+
   constructor() {
     this.setCustomLimit();
     this.handleEvents();
@@ -68,9 +88,20 @@ class TaskLimit {
     }
   }
 
+  public removeQueuedCron(id: string) {
+    if (this.queuedCrons.has(id)) {
+      const runs = this.queuedCrons.get(id);
+      if (runs && runs.length > 0) {
+        runs.pop();
+        this.queuedCrons.set(id, runs);
+      }
+    }
+  }
+
   public async setCustomLimit(limit?: number) {
     if (limit) {
       this.cronLimit.concurrency = limit;
+      this.manualCronoLimit.concurrency = limit;
       return;
     }
     await SystemModel.sync();
@@ -79,14 +110,66 @@ class TaskLimit {
     });
     if (doc?.info?.cronConcurrency) {
       this.cronLimit.concurrency = doc.info.cronConcurrency;
+      this.manualCronoLimit.concurrency = doc.info.cronConcurrency;
     }
   }
 
   public async runWithCronLimit<T>(
+    cron: TCron,
+    fn: ICronFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    fn.cron = cron;
+    let runs = this.queuedCrons.get(cron.id);
+    const result = runs?.length ? [...runs, fn] : [fn];
+    const repeatTimes = this.repeatCronNotifyMap.get(cron.id) || 0;
+    if (result?.length > 5) {
+      if (repeatTimes < 3) {
+        this.repeatCronNotifyMap.set(cron.id, repeatTimes + 1);
+        this.notificationService.externalNotify(
+          '任务重复运行',
+          `任务：${cron.name}，命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 5 个，请检查定时设置`,
+        );
+      }
+      Logger.warn(`[schedule][任务重复运行] 参数 ${JSON.stringify(cron)}`);
+      return;
+    }
+    this.queuedCrons.set(cron.id, result);
+    return this.cronLimit.add(fn, options);
+  }
+
+  public async manualRunWithCronLimit<T>(
     fn: () => Promise<T>,
     options?: Partial<QueueAddOptions>,
   ): Promise<T | void> {
-    return this.cronLimit.add(fn, options);
+    return this.manualCronoLimit.add(fn, options);
+  }
+
+  public async runWithSubscriptionLimit<T>(
+    schedule: TCron,
+    fn: IScheduleFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    fn.schedule = schedule;
+    return this.subscriptionLimit.add(fn, options);
+  }
+
+  public async runWithSystemLimit<T>(
+    schedule: TCron,
+    fn: IScheduleFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    fn.schedule = schedule;
+    return this.systemLimit.add(fn, options);
+  }
+
+  public async runWithScriptLimit<T>(
+    schedule: ISchedule,
+    fn: IScheduleFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    fn.schedule = schedule;
+    return this.scriptLimit.add(fn, options);
   }
 
   public runDependeny<T>(

back/shared/runCron.ts

@@ -1,11 +1,17 @@
 import { spawn } from 'cross-spawn';
 import taskLimit from './pLimit';
 import Logger from '../loaders/logger';
+import { ICron } from '../protos/cron';
 
-export function runCron(cmd: string, options?: { schedule: string; extraSchedules: Array<{ schedule: string }>; name: string }): Promise<number | void> {
-  return taskLimit.runWithCronLimit(() => {
+export function runCron(cmd: string, cron: ICron): Promise<number | void> {
+  return taskLimit.runWithCronLimit(cron, () => {
     return new Promise(async (resolve: any) => {
-      Logger.info(`[schedule][开始执行任务] 参数 ${JSON.stringify({ ...options, command: cmd })}`);
+      Logger.info(
+        `[schedule][开始执行任务] 参数 ${JSON.stringify({
+          ...cron,
+          command: cmd,
+        })}`,
+      );
       const cp = spawn(cmd, { shell: '/bin/bash' });
 
       cp.stderr.on('data', (data) => {
@@ -24,7 +30,16 @@ export function runCron(cmd: string, options?: { schedule: string; extraSchedule
       });
 
       cp.on('exit', async (code) => {
-        resolve({ ...options, command: cmd, pid: cp.pid, code });
+        taskLimit.removeQueuedCron(cron.id);
+        Logger.info(
+          '[schedule][执行任务结束] 参数: %s, 退出码: %j',
+          JSON.stringify({
+            ...cron,
+            command: cmd,
+          }),
+          code,
+        );
+        resolve({ ...cron, command: cmd, pid: cp.pid, code });
       });
     });
   });

back/shared/store.ts

@@ -0,0 +1,34 @@
+import { AuthInfo } from '../data/system';
+import { App } from '../data/open';
+import Keyv from 'keyv';
+import KeyvSqlite from '@keyv/sqlite';
+import config from '../config';
+import path from 'path';
+
+export enum EKeyv {
+  'apps' = 'apps',
+  'authInfo' = 'authInfo',
+}
+
+export interface IKeyvStore {
+  apps: App[];
+  authInfo: AuthInfo;
+}
+
+const keyvSqlite = new KeyvSqlite(path.join(config.dbPath, 'keyv.sqlite'));
+export const keyvStore = new Keyv<IKeyvStore>({ store: keyvSqlite });
+
+export const shareStore = {
+  getAuthInfo() {
+    return keyvStore.get<IKeyvStore['authInfo']>(EKeyv.authInfo);
+  },
+  updateAuthInfo(value: IKeyvStore['authInfo']) {
+    return keyvStore.set<IKeyvStore['authInfo']>(EKeyv.authInfo, value);
+  },
+  getApps() {
+    return keyvStore.get<IKeyvStore['apps']>(EKeyv.apps);
+  },
+  updateApps(apps: App[]) {
+    return keyvStore.set<IKeyvStore['apps']>(EKeyv.apps, apps);
+  },
+};

back/shared/utils.ts

@@ -0,0 +1,27 @@
+import { lock } from 'proper-lockfile';
+import { writeFile, open } from 'fs/promises';
+import { fileExist } from '../config/util';
+
+export async function writeFileWithLock(
+  path: string,
+  content: string | Buffer,
+  options: Parameters<typeof writeFile>[2] = {},
+) {
+  if (typeof options === 'string') {
+    options = { encoding: options };
+  }
+  if (!(await fileExist(path))) {
+    const fileHandle = await open(path, 'w');
+    fileHandle.close();
+  }
+  const release = await lock(path, {
+    retries: {
+      retries: 10,
+      factor: 2,
+      minTimeout: 100,
+      maxTimeout: 3000,
+    },
+  });
+  await writeFile(path, content, { encoding: 'utf8', ...options });
+  await release();
+}

back/token.ts

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

back/update.ts

@@ -12,7 +12,7 @@ async function startServer() {
   await require('./loaders/update').default({ app });
 
   app
-    .listen(config.updatePort, () => {
+    .listen(config.updatePort, '0.0.0.0', () => {
       Logger.debug(`✌️ 更新服务启动成功！`);
       console.debug(`✌️ 更新服务启动成功！`);
       process.send?.('ready');

cli/commands/update.ts

@@ -1,13 +0,0 @@
-import { CommandModule } from 'yargs';
-export const updateCommand: CommandModule = {
-  command: 'update',
-  describe: 'Update and restart qinglong',
-  builder: (yargs) => {
-    return yargs.option('repositority', {
-      type: 'string',
-      alias: 'r',
-      describe: `Specify the release warehouse address of the package`,
-    });
-  },
-  handler: async (argv) => {},
-};

cli/index.ts

@@ -1,13 +0,0 @@
-import * as yargs from 'yargs';
-import { green, red } from 'chalk';
-import { updateCommand } from './commands/update';
-
-yargs
-  .usage('Usage: ql [command] <options>')
-  .command(updateCommand)
-  .fail((err) => {
-    console.error(`${red(err)}`);
-  })
-  .alias('h', 'help')
-  .showHelp()
-  .recommendCommands().argv;

docker/310.Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.10-alpine3.18 as builder
+FROM python:3.10-alpine3.18 AS builder
 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 tsx \
+  && npm i -g pnpm@8.3.1 pm2 ts-node \
   && cd /tmp/build \
   && pnpm install --prod
 
@@ -15,7 +15,7 @@ ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
 
 ENV PNPM_HOME=/root/.local/share/pnpm \
-  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \
   NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
   LANG=C.UTF-8 \
   SHELL=/bin/bash \
@@ -59,7 +59,8 @@ RUN set -x \
   && rm -rf /root/.pnpm-store \
   && rm -rf /root/.local/share/pnpm/store \
   && rm -rf /root/.cache \
-  && ulimit -c 0
+  && ulimit -c 0 \
+  && pip3 install requests
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \

docker/Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.11-alpine3.18 as builder
+FROM python:3.11-alpine3.18 AS builder
 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 tsx \
+  && npm i -g pnpm@8.3.1 pm2 ts-node \
   && cd /tmp/build \
   && pnpm install --prod
 
@@ -15,7 +15,7 @@ ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
 
 ENV PNPM_HOME=/root/.local/share/pnpm \
-  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \
   NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
   LANG=C.UTF-8 \
   SHELL=/bin/bash \
@@ -59,7 +59,8 @@ RUN set -x \
   && rm -rf /root/.pnpm-store \
   && rm -rf /root/.local/share/pnpm/store \
   && rm -rf /root/.cache \
-  && ulimit -c 0
+  && ulimit -c 0 \
+  && pip3 install requests
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \

docker/docker-compose.yml

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

docker/docker-entrypoint.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 dir_shell=/ql/shell
-. $dir_shell/env.sh
 . $dir_shell/share.sh
-link_shell
+. $dir_shell/env.sh
 
 echo -e "======================1. 检测配置文件========================\n"
+import_config "$@"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
 init_nginx

package.json

@@ -2,11 +2,11 @@
   "private": true,
   "scripts": {
     "start": "concurrently -n w: npm:start:*",
-    "start:front": "max dev",
-    "start:back": "nodemon",
     "start:update": "ts-node -P tsconfig.back.json ./back/update.ts",
     "start:public": "ts-node -P tsconfig.back.json ./back/public.ts",
     "start:rpc": "ts-node -P tsconfig.back.json ./back/schedule/index.ts",
+    "start:back": "nodemon",
+    "start:front": "max dev",
     "build:front": "max build",
     "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.js",
@@ -54,60 +54,68 @@
         "react-dom": "18",
         "dva-core": "2"
       }
+    },
+    "overrides": {
+      "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3"
     }
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.8.13",
+    "@grpc/grpc-js": "^1.12.3",
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^7.12.1",
-    "body-parser": "^1.19.2",
-    "celebrate": "^15.0.1",
-    "chokidar": "^3.5.3",
+    "@sentry/node": "^8.42.0",
+    "body-parser": "^1.20.3",
+    "celebrate": "^15.0.3",
+    "chokidar": "^4.0.1",
     "cors": "^2.8.5",
-    "cron-parser": "^4.2.1",
-    "cross-spawn": "^7.0.3",
-    "dayjs": "^1.11.2",
-    "dotenv": "^16.0.0",
-    "express": "^4.17.3",
-    "express-jwt": "^6.1.1",
-    "express-rate-limit": "^7.0.0",
-    "express-urlrewrite": "^1.4.0",
+    "cron-parser": "^4.9.0",
+    "cross-spawn": "^7.0.6",
+    "dayjs": "^1.11.13",
+    "dotenv": "^16.4.6",
+    "express": "^4.21.1",
+    "express-jwt": "^8.4.1",
+    "express-rate-limit": "^7.4.1",
+    "express-urlrewrite": "^2.0.3",
     "form-data": "^4.0.0",
     "got": "^11.8.2",
     "hpagent": "^1.2.0",
-    "http-proxy-middleware": "^2.0.6",
+    "http-proxy-middleware": "^3.0.3",
     "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
     "multer": "1.4.5-lts.1",
     "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
-    "nodemailer": "^6.7.2",
+    "nodemailer": "^6.9.16",
     "p-queue-cjs": "7.3.4",
-    "protobufjs": "^7.2.3",
+    "protobufjs": "^7.4.0",
     "pstree.remy": "^1.1.8",
-    "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.25.5",
-    "serve-handler": "^6.1.3",
+    "reflect-metadata": "^0.2.2",
+    "sequelize": "^6.37.5",
+    "serve-handler": "^6.1.6",
     "sockjs": "^0.3.24",
     "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
-    "toad-scheduler": "^1.6.0",
+    "toad-scheduler": "^3.0.1",
     "typedi": "^0.10.0",
-    "uuid": "^8.3.2",
-    "winston": "^3.6.0",
-    "winston-daily-rotate-file": "^4.7.1",
-    "yargs": "^17.3.1",
-    "tough-cookie": "^4.0.0",
+    "uuid": "^11.0.3",
+    "winston": "^3.17.0",
+    "winston-daily-rotate-file": "^5.0.0",
     "request-ip": "3.3.0",
-    "ip2region": "2.3.0"
+    "ip2region": "2.3.0",
+    "keyv": "^5.2.3",
+    "@keyv/sqlite": "^4.0.1",
+    "proper-lockfile": "^4.1.2"
   },
   "devDependencies": {
-    "@ant-design/icons": "^4.7.0",
+    "moment": "2.30.1",
+    "@ant-design/icons": "^5.0.1",
     "@ant-design/pro-layout": "6.38.22",
+    "@codemirror/view": "^6.34.1",
+    "@codemirror/state": "^6.4.1",
     "@monaco-editor/react": "4.2.1",
-    "@react-hook/resize-observer": "^1.2.6",
-    "@sentry/react": "^7.12.1",
+    "@react-hook/resize-observer": "^2.0.2",
+    "react-router-dom": "6.26.1",
+    "@sentry/react": "^8.42.0",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/cross-spawn": "^6.0.2",
@@ -131,18 +139,19 @@
     "@types/sockjs-client": "^1.5.1",
     "@types/uuid": "^8.3.4",
     "@types/request-ip": "0.0.41",
+    "@types/proper-lockfile": "^4.1.4",
     "@uiw/codemirror-extensions-langs": "^4.21.9",
     "@uiw/react-codemirror": "^4.21.9",
-    "@umijs/max": "^4.0.72",
+    "@umijs/max": "^4.3.36",
     "@umijs/ssr-darkreader": "^4.9.45",
     "ahooks": "^3.7.8",
     "ansi-to-react": "^6.1.6",
     "antd": "^4.24.8",
-    "antd-img-crop": "^4.2.3",
+    "antd-img-crop": "^4.23.0",
     "axios": "^1.4.0",
     "compression-webpack-plugin": "9.2.0",
     "concurrently": "^7.0.0",
-    "react-hotkeys-hook": "^4.4.1",
+    "react-hotkeys-hook": "^4.6.1",
     "file-saver": "2.0.2",
     "lint-staged": "^13.0.3",
     "monaco-editor": "0.33.0",
@@ -153,24 +162,22 @@
     "qrcode.react": "^1.0.1",
     "query-string": "^7.1.1",
     "rc-tween-one": "^3.0.6",
-    "rc-virtual-list": "3.5.3",
-    "react": "18.2.0",
+    "rc-virtual-list": "3.15.0",
+    "react": "18.3.1",
     "react-copy-to-clipboard": "^5.1.0",
     "react-diff-viewer": "^3.1.1",
-    "react-dnd": "^14.0.2",
-    "react-dnd-html5-backend": "^14.0.0",
-    "react-dom": "18.2.0",
-    "react-intl-universal": "^2.6.21",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "react-dom": "18.3.1",
+    "react-intl-universal": "^2.12.0",
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
-    "ts-node": "^10.6.0",
+    "ts-node": "^10.9.2",
     "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
-    "tsx": "^4.7.3",
     "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",
-    "webpack": "^5.70.0",
     "yorkie": "^2.0.0"
   }
 }

sample/config.sample.sh

@@ -8,7 +8,7 @@ AutoAddCron="true"
 DefaultCronRule=""
 
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
-RepoFileExtensions="js py"
+RepoFileExtensions="js mjs py pyc"
 
 ## 代理地址，支持HTTP/SOCK5，例如 http://127.0.0.1:7890
 ProxyUrl=""
@@ -43,7 +43,7 @@ BotRepoUrl=""
 
 ## 通知环境变量
 ## 1. Server酱
-## https://sct.ftqq.com
+## https://sct.ftqq.com/r/13363
 ## 下方填写 SCHKEY 值或 SendKey 值
 export PUSH_KEY=""
 
@@ -56,6 +56,12 @@ 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
@@ -111,8 +117,29 @@ export PUSH_PLUS_TOKEN=""
 ## 下方填写您的一对多推送的 "群组编码" ，（一对多推送下面->您的群组(如无则新建)->群组编码）
 ## 1. 需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送
 export PUSH_PLUS_USER=""
+## 发送模板，支持html,txt,json,markdown,cloudMonitor,jenkins,route,pay
+export PUSH_PLUS_TEMPLATE="html"
+## 发送渠道，支持wechat,webhook,cp,mail,sms
+export PUSH_PLUS_CHANNEL="wechat"
+## webhook编码，可在pushplus公众号上扩展配置出更多渠道
+export PUSH_PLUS_WEBHOOK=""
+## 发送结果回调地址，会把推送最终结果通知到这个地址上
+export PUSH_PLUS_CALLBACKURL=""
+## 好友令牌，微信公众号渠道填写好友令牌，企业微信渠道填写企业微信用户id
+export PUSH_PLUS_TO=""
 
-## 9. go-cqhttp
+## 9. 微加机器人
+## 官方网站：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群
@@ -121,7 +148,7 @@ export GOBOT_URL=""
 export GOBOT_TOKEN=""
 export GOBOT_QQ=""
 
-## 10. gotify
+## 11. gotify
 ## gotify_url 填写gotify地址,如https://push.example.de:8080
 ## gotify_token 填写gotify的消息应用token
 ## gotify_priority 填写推送消息优先级,默认为0
@@ -129,17 +156,17 @@ export GOTIFY_URL=""
 export GOTIFY_TOKEN=""
 export GOTIFY_PRIORITY=0
 
-## 11. PushDeer
+## 12. PushDeer
 ## deer_key 填写PushDeer的key
 export DEER_KEY=""
 
-## 12. Chat
+## 13. Chat
 ## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
 ## chat_token 填写后面的token
 export CHAT_URL=""
 export CHAT_TOKEN=""
 
-## 13. aibotk
+## 14. aibotk
 ## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
 ## aibotk_key (必填)填写智能微秘书个人中心的apikey
 export AIBOTK_KEY=""
@@ -148,7 +175,7 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""
 
-## 13. CHRONOCAT
+## 15. CHRONOCAT
 ## 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
@@ -157,9 +184,17 @@ export CHRONOCAT_URL=""
 export CHRONOCAT_QQ=""
 export CHRONOCAT_TOKEN=""
 
-## 14. SMTP
+## 16. SMTP
+## JavaScript 参数
 ## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
 export SMTP_SERVICE=""
+
+## Python 参数
+## SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
+export SMTP_SERVER=""
+## SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false
+export SMTP_SSL=""
+
 ## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
 export SMTP_EMAIL=""
 ## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
@@ -167,12 +202,45 @@ export SMTP_PASSWORD=""
 ## smtp_name 填写 SMTP 收发件人姓名，可随意填写
 export SMTP_NAME=""
 
-## 15. PushMe
+## 17. 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=""
 
-## 15. 自定义通知
+## 18. 飞书机器人
+## 官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
+## FSKEY 飞书机器人的 FSKEY
+export FSKEY=""
+
+## 19. Qmsg酱
+## 官方文档：https://qmsg.zendee.cn/docs/api/
+## qmsg 酱的 QMSG_KEY
+## qmsg 酱的 QMSG_TYPE send 为私聊，group 为群聊
+export QMSG_KEY=""
+export QMSG_TYPE=""
+
+## 20.Ntfy
+## 官方文档: https://docs.ntfy.sh
+## ntfy_url 填写ntfy地址,如https://ntfy.sh
+## ntfy_topic 填写ntfy的消息应用topic
+## ntfy_priority 填写推送消息优先级,默认为3
+export NTFY_URL=""
+export NTFY_TOPIC=""
+export NTFY_PRIORITY="3"
+
+## 21. wxPusher
+## 官方文档: https://wxpusher.zjiecode.com/docs/
+## 管理后台: https://wxpusher.zjiecode.com/admin/
+## wxPusher 的 appToken
+export WXPUSHER_APP_TOKEN=""
+## wxPusher 的 topicIds，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
+export WXPUSHER_TOPIC_IDS=""
+## wxPusher 的 用户ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
+export WXPUSHER_UIDS=""
+
+## 22. 自定义通知
 ## 自定义通知 接收回调的URL
 export WEBHOOK_URL=""
 ## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"

sample/notify.py

@@ -33,7 +33,7 @@ def print(text, *args, **kw):
 # 通知服务
 # fmt: off
 push_config = {
-    'HITOKOTO': False,                  # 启用一言（随机句子）
+    'HITOKOTO': True,                  # 启用一言（随机句子）
 
     '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': True,                    # 控制台输出
+    'CONSOLE': False,                    # 控制台输出
 
     'DD_BOT_SECRET': '',                # 钉钉机器人的 DD_BOT_SECRET
     'DD_BOT_TOKEN': '',                 # 钉钉机器人的 DD_BOT_TOKEN
@@ -72,8 +72,17 @@ push_config = {
     'CHAT_URL': '',                     # synology chat url
     'CHAT_TOKEN': '',                   # synology chat token
 
-    'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
-    'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
+    'PUSH_PLUS_TOKEN': '',              # pushplus 推送的用户令牌
+    'PUSH_PLUS_USER': '',               # pushplus 推送的群组编码
+    'PUSH_PLUS_TEMPLATE': 'html',       # pushplus 发送模板，支持html,txt,json,markdown,cloudMonitor,jenkins,route,pay
+    'PUSH_PLUS_CHANNEL': 'wechat',      # pushplus 发送渠道，支持wechat,webhook,cp,mail,sms
+    'PUSH_PLUS_WEBHOOK': '',            # pushplus webhook编码，可在pushplus公众号上扩展配置出更多渠道
+    'PUSH_PLUS_CALLBACKURL': '',        # pushplus 发送结果回调地址，会把推送最终结果通知到这个地址上
+    'PUSH_PLUS_TO': '',                 # pushplus 好友令牌，微信公众号渠道填写好友令牌，企业微信渠道填写企业微信用户id
+
+    'WE_PLUS_BOT_TOKEN': '',            # 微加机器人的用户令牌
+    'WE_PLUS_BOT_RECEIVER': '',         # 微加机器人的消息接收者
+    'WE_PLUS_BOT_VERSION': 'pro',          # 微加机器人的调用版本
 
     'QMSG_KEY': '',                     # qmsg 酱的 QMSG_KEY
     'QMSG_TYPE': '',                    # qmsg 酱的 QMSG_TYPE
@@ -101,7 +110,8 @@ 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
@@ -111,11 +121,18 @@ push_config = {
     'WEBHOOK_BODY': '',                 # 自定义通知 请求体
     'WEBHOOK_HEADERS': '',              # 自定义通知 请求头
     'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
-    'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
+    'WEBHOOK_CONTENT_TYPE': '',         # 自定义通知 content-type
+
+    'NTFY_URL': '',                     # ntfy地址,如https://ntfy.sh
+    'NTFY_TOPIC': '',                   # ntfy的消息应用topic
+    'NTFY_PRIORITY':'3',                # 推送消息优先级,默认为3
+
+    'WXPUSHER_APP_TOKEN': '',           # wxpusher 的 appToken 官方文档: https://wxpusher.zjiecode.com/docs/ 管理后台: https://wxpusher.zjiecode.com/admin/
+    'WXPUSHER_TOPIC_IDS': '',           # wxpusher 的 主题ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
+    'WXPUSHER_UIDS': '',                # wxpusher 的 用户ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
 }
 # fmt: on
 
-# 首先读取 面板变量 或者 github action 运行变量
 for k in push_config:
     if os.getenv(k):
         v = os.getenv(k)
@@ -127,14 +144,13 @@ def bark(title: str, content: str) -> None:
     使用 bark 推送消息。
     """
     if not push_config.get("BARK_PUSH"):
-        print("bark 服务的 BARK_PUSH 未设置!!\n取消推送")
         return
     print("bark 服务启动")
 
     if push_config.get("BARK_PUSH").startswith("http"):
-        url = f'{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f'{push_config.get("BARK_PUSH")}'
     else:
-        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}'
 
     bark_params = {
         "BARK_ARCHIVE": "isArchive",
@@ -144,7 +160,10 @@ def bark(title: str, content: str) -> None:
         "BARK_LEVEL": "level",
         "BARK_URL": "url",
     }
-    params = ""
+    data = {
+        "title": title,
+        "body": content,
+    }
     for pair in filter(
         lambda pairs: pairs[0].startswith("BARK_")
         and pairs[0] != "BARK_PUSH"
@@ -152,10 +171,11 @@ def bark(title: str, content: str) -> None:
         and bark_params.get(pairs[0]),
         push_config.items(),
     ):
-        params += f"{bark_params.get(pair[0])}={pair[1]}&"
-    if params:
-        url = url + "?" + params.rstrip("&")
-    response = requests.get(url).json()
+        data[bark_params.get(pair[0])] = pair[1]
+    headers = {"Content-Type": "application/json;charset=utf-8"}
+    response = requests.post(
+        url=url, data=json.dumps(data), headers=headers, timeout=15
+    ).json()
 
     if response["code"] == 200:
         print("bark 推送成功！")
@@ -175,7 +195,6 @@ def dingding_bot(title: str, content: str) -> None:
     使用 钉钉机器人 推送消息。
     """
     if not push_config.get("DD_BOT_SECRET") or not push_config.get("DD_BOT_TOKEN"):
-        print("钉钉机器人 服务的 DD_BOT_SECRET 或者 DD_BOT_TOKEN 未设置!!\n取消推送")
         return
     print("钉钉机器人 服务启动")
 
@@ -205,7 +224,6 @@ def feishu_bot(title: str, content: str) -> None:
     使用 飞书机器人 推送消息。
     """
     if not push_config.get("FSKEY"):
-        print("飞书 服务的 FSKEY 未设置!!\n取消推送")
         return
     print("飞书 服务启动")
 
@@ -224,7 +242,6 @@ def go_cqhttp(title: str, content: str) -> None:
     使用 go_cqhttp 推送消息。
     """
     if not push_config.get("GOBOT_URL") or not push_config.get("GOBOT_QQ"):
-        print("go-cqhttp 服务的 GOBOT_URL 或 GOBOT_QQ 未设置!!\n取消推送")
         return
     print("go-cqhttp 服务启动")
 
@@ -242,7 +259,6 @@ def gotify(title: str, content: str) -> None:
     使用 gotify 推送消息。
     """
     if not push_config.get("GOTIFY_URL") or not push_config.get("GOTIFY_TOKEN"):
-        print("gotify 服务的 GOTIFY_URL 或 GOTIFY_TOKEN 未设置!!\n取消推送")
         return
     print("gotify 服务启动")
 
@@ -265,7 +281,6 @@ def iGot(title: str, content: str) -> None:
     使用 iGot 推送消息。
     """
     if not push_config.get("IGOT_PUSH_KEY"):
-        print("iGot 服务的 IGOT_PUSH_KEY 未设置!!\n取消推送")
         return
     print("iGot 服务启动")
 
@@ -285,15 +300,18 @@ def serverJ(title: str, content: str) -> None:
     通过 serverJ 推送消息。
     """
     if not push_config.get("PUSH_KEY"):
-        print("serverJ 服务的 PUSH_KEY 未设置!!\n取消推送")
         return
     print("serverJ 服务启动")
 
     data = {"text": title, "desp": content.replace("\n", "\n\n")}
-    if push_config.get("PUSH_KEY").find("SCT") != -1:
-        url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+
+    match = re.match(r"sctp(\d+)t", push_config.get("PUSH_KEY"))
+    if match:
+        num = match.group(1)
+        url = f'https://{num}.push.ft07.com/send/{push_config.get("PUSH_KEY")}.send'
     else:
-        url = f'https://sc.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+        url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+
     response = requests.post(url, data=data).json()
 
     if response.get("errno") == 0 or response.get("code") == 0:
@@ -307,7 +325,6 @@ def pushdeer(title: str, content: str) -> None:
     通过PushDeer 推送消息
     """
     if not push_config.get("DEER_KEY"):
-        print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
         return
     print("PushDeer 服务启动")
     data = {
@@ -333,7 +350,6 @@ def chat(title: str, content: str) -> None:
     通过Chat 推送消息
     """
     if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
-        print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
         return
     print("chat 服务启动")
     data = "payload=" + json.dumps({"text": title + "\n" + content})
@@ -348,26 +364,36 @@ def chat(title: str, content: str) -> None:
 
 def pushplus_bot(title: str, content: str) -> None:
     """
-    通过 push+ 推送消息。
+    通过 pushplus 推送消息。
     """
     if not push_config.get("PUSH_PLUS_TOKEN"):
-        print("PUSHPLUS 服务的 PUSH_PLUS_TOKEN 未设置!!\n取消推送")
         return
     print("PUSHPLUS 服务启动")
 
-    url = "http://www.pushplus.plus/send"
+    url = "https://www.pushplus.plus/send"
     data = {
         "token": push_config.get("PUSH_PLUS_TOKEN"),
         "title": title,
         "content": content,
         "topic": push_config.get("PUSH_PLUS_USER"),
+        "template": push_config.get("PUSH_PLUS_TEMPLATE"),
+        "channel": push_config.get("PUSH_PLUS_CHANNEL"),
+        "webhook": push_config.get("PUSH_PLUS_WEBHOOK"),
+        "callbackUrl": push_config.get("PUSH_PLUS_CALLBACKURL"),
+        "to": push_config.get("PUSH_PLUS_TO"),
     }
     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("PUSHPLUS 推送成功！")
+    code = response["code"]
+    if code == 200:
+        print("PUSHPLUS 推送请求成功，可根据流水号查询推送结果:" + response["data"])
+        print(
+            "注意：请求成功并不代表推送成功，如未收到消息，请到pushplus官网使用流水号查询推送最终结果"
+        )
+    elif code == 900 or code == 903 or code == 905 or code == 999:
+        print(response["msg"])
 
     else:
         url_old = "http://pushplus.hxtrip.com/send"
@@ -381,12 +407,42 @@ def pushplus_bot(title: str, content: str) -> None:
             print("PUSHPLUS 推送失败！")
 
 
+def weplus_bot(title: str, content: str) -> None:
+    """
+    通过 微加机器人 推送消息。
+    """
+    if not push_config.get("WE_PLUS_BOT_TOKEN"):
+        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"):
-        print("qmsg 的 QMSG_KEY 或者 QMSG_TYPE 未设置!!\n取消推送")
         return
     print("qmsg 服务启动")
 
@@ -405,11 +461,10 @@ def wecom_app(title: str, content: str) -> None:
     通过 企业微信 APP 推送消息。
     """
     if not push_config.get("QYWX_AM"):
-        print("QYWX_AM 未设置!!\n取消推送")
         return
     QYWX_AM_AY = re.split(",", push_config.get("QYWX_AM"))
     if 4 < len(QYWX_AM_AY) > 5:
-        print("QYWX_AM 设置错误!!\n取消推送")
+        print("QYWX_AM 设置错误!!")
         return
     print("企业微信 APP 服务启动")
 
@@ -502,7 +557,6 @@ def wecom_bot(title: str, content: str) -> None:
     通过 企业微信机器人 推送消息。
     """
     if not push_config.get("QYWX_KEY"):
-        print("企业微信机器人 服务的 QYWX_KEY 未设置!!\n取消推送")
         return
     print("企业微信机器人服务启动")
 
@@ -528,7 +582,6 @@ def telegram_bot(title: str, content: str) -> None:
     使用 telegram 机器人 推送消息。
     """
     if not push_config.get("TG_BOT_TOKEN") or not push_config.get("TG_USER_ID"):
-        print("tg 服务的 bot_token 或者 user_id 未设置!!\n取消推送")
         return
     print("tg 服务启动")
 
@@ -577,9 +630,6 @@ def aibotk(title: str, content: str) -> None:
         or not push_config.get("AIBOTK_TYPE")
         or not push_config.get("AIBOTK_NAME")
     ):
-        print(
-            "智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送"
-        )
         return
     print("智能微秘书 服务启动")
 
@@ -618,9 +668,6 @@ def smtp(title: str, content: str) -> None:
         or not push_config.get("SMTP_PASSWORD")
         or not push_config.get("SMTP_NAME")
     ):
-        print(
-            "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送"
-        )
         return
     print("SMTP 邮件 服务启动")
 
@@ -664,14 +711,20 @@ def pushme(title: str, content: str) -> None:
     使用 PushMe 推送消息。
     """
     if not push_config.get("PUSHME_KEY"):
-        print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送")
         return
     print("PushMe 服务启动")
 
-    url = f'https://push.i-i.me/?push_key={push_config.get("PUSHME_KEY")}'
+    url = (
+        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)
 
@@ -690,7 +743,6 @@ def chronocat(title: str, content: str) -> None:
         or not push_config.get("CHRONOCAT_QQ")
         or not push_config.get("CHRONOCAT_TOKEN")
     ):
-        print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送")
         return
 
     print("CHRONOCAT 服务启动")
@@ -730,6 +782,96 @@ def chronocat(title: str, content: str) -> None:
                     print(f"QQ群消息:{ids}推送失败！")
 
 
+def ntfy(title: str, content: str) -> None:
+    """
+    通过 Ntfy 推送消息
+    """
+
+    def encode_rfc2047(text: str) -> str:
+        """将文本编码为符合 RFC 2047 标准的格式"""
+        encoded_bytes = base64.b64encode(text.encode("utf-8"))
+        encoded_str = encoded_bytes.decode("utf-8")
+        return f"=?utf-8?B?{encoded_str}?="
+
+    if not push_config.get("NTFY_TOPIC"):
+        return
+    print("ntfy 服务启动")
+    priority = "3"
+    if not push_config.get("NTFY_PRIORITY"):
+        print("ntfy 服务的NTFY_PRIORITY 未设置!!默认设置为3")
+    else:
+        priority = push_config.get("NTFY_PRIORITY")
+
+    # 使用 RFC 2047 编码 title
+    encoded_title = encode_rfc2047(title)
+
+    data = content.encode(encoding="utf-8")
+    headers = {"Title": encoded_title, "Priority": priority}  # 使用编码后的 title
+
+    url = push_config.get("NTFY_URL") + "/" + push_config.get("NTFY_TOPIC")
+    response = requests.post(url, data=data, headers=headers)
+    if response.status_code == 200:  # 使用 response.status_code 进行检查
+        print("Ntfy 推送成功！")
+    else:
+        print("Ntfy 推送失败！错误信息：", response.text)
+
+
+def wxpusher_bot(title: str, content: str) -> None:
+    """
+    通过 wxpusher 推送消息。
+    支持的环境变量:
+    - WXPUSHER_APP_TOKEN: appToken
+    - WXPUSHER_TOPIC_IDS: 主题ID, 多个用英文分号;分隔
+    - WXPUSHER_UIDS: 用户ID, 多个用英文分号;分隔
+    """
+    if not push_config.get("WXPUSHER_APP_TOKEN"):
+        return
+
+    url = "https://wxpusher.zjiecode.com/api/send/message"
+
+    # 处理topic_ids和uids，将分号分隔的字符串转为数组
+    topic_ids = []
+    if push_config.get("WXPUSHER_TOPIC_IDS"):
+        topic_ids = [
+            int(id.strip())
+            for id in push_config.get("WXPUSHER_TOPIC_IDS").split(";")
+            if id.strip()
+        ]
+
+    uids = []
+    if push_config.get("WXPUSHER_UIDS"):
+        uids = [
+            uid.strip()
+            for uid in push_config.get("WXPUSHER_UIDS").split(";")
+            if uid.strip()
+        ]
+
+    # topic_ids uids 至少有一个
+    if not topic_ids and not uids:
+        print("wxpusher 服务的 WXPUSHER_TOPIC_IDS 和 WXPUSHER_UIDS 至少设置一个!!")
+        return
+
+    print("wxpusher 服务启动")
+
+    data = {
+        "appToken": push_config.get("WXPUSHER_APP_TOKEN"),
+        "content": f"<h1>{title}</h1><br/><div style='white-space: pre-wrap;'>{content}</div>",
+        "summary": title,
+        "contentType": 2,
+        "topicIds": topic_ids,
+        "uids": uids,
+        "verifyPayType": 0,
+    }
+
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, json=data, headers=headers).json()
+
+    if response.get("code") == 1000:
+        print("wxpusher 推送成功！")
+    else:
+        print(f"wxpusher 推送失败！错误信息：{response.get('msg')}")
+
+
 def parse_headers(headers):
     if not headers:
         return {}
@@ -786,7 +928,6 @@ def custom_notify(title: str, content: str) -> None:
     通过 自定义通知 推送消息。
     """
     if not push_config.get("WEBHOOK_URL") or not push_config.get("WEBHOOK_METHOD"):
-        print("自定义通知的 WEBHOOK_URL 或 WEBHOOK_METHOD 未设置!!\n取消推送")
         return
 
     print("自定义通知服务启动")
@@ -805,7 +946,9 @@ def custom_notify(title: str, content: str) -> None:
     body = parse_body(
         WEBHOOK_BODY,
         WEBHOOK_CONTENT_TYPE,
-        lambda v: v.replace("$title", title).replace("$content", content),
+        lambda v: v.replace("$title", title.replace("\n", "\\n")).replace(
+            "$content", content.replace("\n", "\\n")
+        ),
     )
     formatted_url = WEBHOOK_URL.replace(
         "$title", urllib.parse.quote_plus(title)
@@ -854,6 +997,8 @@ 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"):
@@ -886,7 +1031,12 @@ def add_notify_function():
         notify_function.append(chronocat)
     if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
         notify_function.append(custom_notify)
-
+    if push_config.get("NTFY_TOPIC"):
+        notify_function.append(ntfy)
+    if push_config.get("WXPUSHER_APP_TOKEN") and (
+        push_config.get("WXPUSHER_TOPIC_IDS") or push_config.get("WXPUSHER_UIDS")
+    ):
+        notify_function.append(wxpusher_bot)
     if not notify_function:
         print(f"无推送渠道，请检查通知变量是否正确")
     return notify_function
@@ -912,7 +1062,7 @@ def send(title: str, content: str, ignore_default_config: bool = False, **kwargs
             return
 
     hitokoto = push_config.get("HITOKOTO")
-    content += "\n\n" + one() if hitokoto else ""
+    content += "\n\n" + one() if hitokoto != "false" else ""
 
     notify_function = add_notify_function()
     ts = [

sample/ql_sample.js

@@ -4,5 +4,6 @@
  * 定时规则
  * cron: 1 9 * * *
  */
-
 console.log('test scripts');
+QLAPI.notify('test scripts', 'test desc');
+console.log('test desc');

sample/ql_sample.py

@@ -4,5 +4,6 @@ name: script name
 定时规则
 cron: 1 9 * * *
 """
-
 print("test script")
+QLAPI.notify('test script', 'test desc')
+print("test desc")

shell/api.sh

@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
 
 create_token() {
-  local token_command="tsx ${dir_root}/back/token.ts"
+  local token_command="ts-node-transpile-only ${dir_root}/back/token.ts"
   local token_file="${dir_root}/static/build/token.js"
   if [[ -f $token_file ]]; then
     token_command="node ${token_file}"
   fi
-  token=$(eval "$token_command")
+  __ql_token__=$(eval "$token_command")
 }
 
 get_token() {
   if [[ -f $file_auth_token ]]; then
-    token=$(cat $file_auth_token | jq -r .value)
+    __ql_token__=$(cat $file_auth_token | jq -r .value)
     local expiration=$(cat $file_auth_token | jq -r .expiration)
     local currentTimeStamp=$(date +%s)
     if [[ $currentTimeStamp -ge $expiration ]]; then
@@ -43,7 +43,7 @@ add_cron_api() {
   local api=$(
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -79,7 +79,7 @@ update_cron_api() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -111,7 +111,7 @@ update_cron_command_api() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -136,7 +136,7 @@ del_cron_api() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
       -X 'DELETE' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -166,7 +166,7 @@ update_cron() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -190,7 +190,7 @@ notify_api() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -214,7 +214,7 @@ find_cron_api() {
   local api=$(
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -231,4 +231,30 @@ find_cron_api() {
   fi
 }
 
+update_auth_config() {
+  local body="$1"
+  local tip="$2"
+  local currentTimeStamp=$(date +%s)
+  local api=$(
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/auth/reset?t=$currentTimeStamp" \
+      -X 'PUT' \
+      -H "Accept: application/json" \
+      -H "Authorization: Bearer ${__ql_token__}" \
+      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -H "Origin: http://0.0.0.0:5700" \
+      -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      --data-raw "{$body}" \
+      --compressed
+  )
+  code=$(echo "$api" | jq -r .code)
+  message=$(echo "$api" | jq -r .message)
+  if [[ $code == 200 ]]; then
+    echo -e "${tip}成功🎉"
+  else
+    echo -e "${tip}失败(${message})"
+  fi
+}
+
 get_token

shell/check.sh

@@ -73,7 +73,7 @@ check_pm2() {
 
 main() {
   echo -e "=====> 开始检测"
-  npm i -g pnpm@8.3.1 pm2 tsx
+  npm i -g pnpm@8.3.1 pm2 ts-node
   patch_version
 
   reset_env

shell/otask.sh

@@ -69,26 +69,18 @@ run_nohup() {
   nohup node $file_name &>$log_path &
 }
 
-check_server() {
-  if [[ $cpu_warn ]] && [[ $mem_warn ]] && [[ $disk_warn ]]; then
-    local top_result=$(top -b -n 1)
-    cpu_use=$(echo "$top_result" | grep CPU | grep -v -E 'grep|PID' | awk '{print $2}' | cut -f 1 -d "%" | head -n 1)
-
-    mem_free=$(free -m | grep "Mem" | awk '{print $3}' | head -n 1)
-    mem_total=$(free -m | grep "Mem" | awk '{print $2}' | head -n 1)
-    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
-}
-
 env_str_to_array() {
+  . $file_env
   local IFS="&"
   read -ra array <<<"${!env_param}"
+  array_length=${#array[@]}
+  clear_env
+}
+
+clear_non_sh_env() {
+  if [[ $file_param != *.sh ]]; then
+    clear_env
+  fi
 }
 
 ## 正常运行单个脚本，$1：传入参数
@@ -105,38 +97,36 @@ 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|")
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|" | awk '{$1=$1};1')
   if [[ ! $env_param ]]; then
     echo -e "\n 缺少并发运行的环境变量参数"
     exit 1
   fi
 
-  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")
+  handle_env_split
+  time=$(date "+$mtime_format")
+  single_log_time=$(format_log_time "$mtime_format" "$time")
 
   cd $dir_scripts
   local relative_path="${file_param%/*}"
@@ -144,15 +134,24 @@ run_concurrent() {
     cd ${relative_path}
     file_param=${file_param/$relative_path\//}
   fi
-  for i in "${!array[@]}"; do
-    export "${env_param}=${array[i]}"
-    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-    eval $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
+
+  local j=0
+  for i in ${array_run[@]}; do
+    single_log_path="$dir_log/$log_dir/${single_log_time}_$((j + 1)).log"
+    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
-  for i in "${!array[@]}"; do
-    single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
+  local k=0
+  for i in ${array_run[@]}; do
+    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
@@ -161,28 +160,27 @@ run_concurrent() {
 run_designated() {
   local file_param="$1"
   local env_param="$2"
-  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
-  if [[ ! $env_param ]] || [[ ! $num_param ]]; then
-    echo -e "\n 缺少单独运行的参数 task xxx.js desi Test 1 3"
+  local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|" | awk '{$1=$1};1')
+  if [[ ! $env_param ]]; then
+    echo -e "\n 缺少单独运行的参数 task xxx.js desi Test"
     exit 1
   fi
 
-  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[@]}))
+  handle_env_split
 
+  if [[ $isJsOrPythonFile == 'false' ]]; then
     local n=0
-  for i in ${runArr[@]}; do
-    array_run[n]=${array[$i - 1]}
+    for i in ${array_run[@]}; do
+      array_str[n]=${array[$i - 1]}
       let n++
     done
-
-  local cookieStr=$(
+    local envStr=$(
       IFS="&"
-    echo "${array_run[*]}"
+      echo "${array_str[*]}"
     )
-  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
+    [[ ! -z $envStr ]] && export "${env_param}=${envStr}"
+    clear_non_sh_env
+  fi
 
   cd $dir_scripts
   local relative_path="${file_param%/*}"
@@ -190,7 +188,8 @@ 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[@]}"
 }
 
 ## 运行其他命令
@@ -206,12 +205,48 @@ run_else() {
 
   shift
 
+  clear_non_sh_env
   $timeoutCmd $which_program $file_param "$@"
 }
 
-## 命令检测
+check_file() {
+  isJsOrPythonFile="false"
+  if [[ $1 == *.js ]] || [[ $1 == *.mjs ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.ts ]]; then
+    isJsOrPythonFile="true"
+  fi
+  if [[ -f $file_env ]]; then
+    get_env_array
+    if [[ $isJsOrPythonFile == 'true' ]]; then
+      export PREV_NODE_OPTIONS="${NODE_OPTIONS:=}"
+      export PREV_PYTHONPATH="${PYTHONPATH:=}"
+      if [[ $1 == *.js ]] || [[ $1 == *.ts ]] || [[ $1 == *.mjs ]]; then
+        export NODE_OPTIONS="-r ${file_preload_js} ${NODE_OPTIONS}"
+      else
+        export PYTHONPATH="${dir_preload}:${dir_config}:${PYTHONPATH}"
+      fi
+    else
+      . $file_env
+    fi
+  fi
+}
+
+check_nounset() {
+  local output=$(set -o)
+  while read -r line; do
+    if [[ "$line" =~ "nounset" ]] && [[ "$line" =~ "on" ]]; then
+      set_u_on="true"
+      set +u
+      break
+    fi
+  done <<<"$output"
+}
+
 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"
@@ -242,7 +277,20 @@ main() {
 }
 
 handle_task_start "${task_shell_params[@]}"
-run_task_before "${task_shell_params[@]}"
+check_file "${task_shell_params[@]}"
+if [[ $isJsOrPythonFile == 'false' ]]; then
+  run_task_before "${task_shell_params[@]}"
+fi
+set_u_on="false"
+check_nounset
 main "${task_shell_params[@]}"
+if [[ "$set_u_on" == 'true' ]]; then
+  set -u
+fi
+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

@@ -0,0 +1,106 @@
+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,
+    PREV_NODE_OPTIONS,
+  } = process.env;
+
+  try {
+    process.env.NODE_OPTIONS = PREV_NODE_OPTIONS;
+
+    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, '\\"')
+        .replace(/\$/g, '\\$');
+      command = `${command} && eval '${escapeTaskBefore}'`;
+      console.log('执行前置命令\n');
+    }
+    const res = execSync(
+      `${command} && echo -e '${splitStr}' && 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];
+    }
+    if (output) {
+      console.log(output);
+    }
+    if (task_before) {
+      console.log('执行前置命令结束\n');
+    }
+  } catch (error) {
+    if (!error.message.includes('spawnSync /bin/sh E2BIG')) {
+      console.log(`\ue926 run task before error: `, error);
+    } else {
+      console.log(
+        `\ue926 The environment variable is too large. It is recommended to use task_before.js instead of task_before.sh\n`,
+      );
+    }
+    if (task_before) {
+      console.log('执行前置命令结束\n');
+    }
+  }
+
+  require(file_task_before_js);
+
+  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 {
+  if (!process.argv[1]) {
+    return;
+  }
+
+  process.on('SIGTERM', (code) => {
+    process.exit(15);
+  });
+
+  run();
+
+  const { sendNotify } = require('./notify.js');
+  global.QLAPI = {
+    notify: sendNotify,
+  };
+} catch (error) {
+  console.log(`run builtin code error: `, error, '\n');
+}

shell/preload/sitecustomize.py

@@ -0,0 +1,118 @@
+import os
+import re
+import subprocess
+import json
+import builtins
+import sys
+import env
+import signal
+
+
+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():
+    try:
+        prev_pythonpath = os.getenv("PREV_PYTHONPATH", "")
+        os.environ["PYTHONPATH"] = prev_pythonpath
+
+        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('"', '\\"').replace("$", "\\$")
+            command += f" && eval '{escape_task_before}'"
+            print("执行前置命令\n")
+
+        prev_pythonpath = os.getenv("PREV_PYTHONPATH", "")
+        python_command = (
+            "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
+
+        if len(output) > 0:
+            print(output)
+        if task_before:
+            print("执行前置命令结束")
+
+    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"\ue926 run task before error: {error}")
+        else:
+            print(
+                "\ue926 The environment variable is too large. It is recommended to use task_before.py instead of task_before.sh\n"
+            )
+        if task_before:
+            print("执行前置命令结束")
+    except Exception as error:
+        print(f"run task before error: {error}")
+
+    import task_before
+
+    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
+
+
+def handle_sigterm(signum, frame):
+    sys.exit(15)
+
+
+try:
+    signal.signal(signal.SIGTERM, handle_sigterm)
+
+    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文件"
-tsx sample/tool.ts
+ts-node-transpile-only sample/tool.ts
 
 string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"

shell/rmlog.sh

@@ -2,13 +2,18 @@
 
 days=$1
 
-## 删除运行脚本的旧日志
 remove_js_log() {
-  local log_full_path_list=$(find $dir_log/ -name "*.log")
+  local log_full_path_list=$(find $dir_log -name "*.log")
   local diff_time
   for log in $log_full_path_list; do
-    local log_date=$(echo $log | awk -F "/" '{print $NF}' | cut -c1-10) #文件名比文件属性获得的日期要可靠
-    if [[ $(date +%s -d $log_date 2>/dev/null) ]]; then
+    local log_date=$(echo $log | awk -F "/" '{print $NF}' | cut -c1-10)
+    if ! [[ $log_date =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]]; then
+      if [[ $is_macos -eq 1 ]]; then
+        log_date=$(stat -f %Sm -t "%Y-%m-%d" "$log")
+      else
+        log_date=$(stat -c %y "$log" | cut -d ' ' -f 1)
+      fi
+    fi
     if [[ $is_macos -eq 1 ]]; then
       diff_time=$(($(date +%s) - $(date -j -f "%Y-%m-%d" "$log_date" +%s)))
     else
@@ -25,11 +30,9 @@ remove_js_log() {
         echo -e "正在被 $result 使用，跳过~"
       fi
     fi
-    fi
   done
 }
 
-## 删除空文件夹
 remove_empty_dir() {
   cd $dir_log
   for dir in $(ls); do
@@ -39,7 +42,6 @@ remove_empty_dir() {
   done
 }
 
-## 运行
 if [[ ${days} ]]; then
   echo -e "查找旧日志文件中...\n"
   remove_js_log

shell/share.sh

@@ -1,48 +1,57 @@
 #!/usr/bin/env bash
 
 ## 目录
-dir_root=$QL_DIR
-dir_tmp=$dir_root/.tmp
-dir_data=$dir_root/data
-dir_shell=$dir_root/shell
-dir_sample=$dir_root/sample
-dir_static=$dir_root/static
-dir_config=$dir_data/config
-dir_scripts=$dir_data/scripts
-dir_repo=$dir_data/repo
-dir_raw=$dir_data/raw
-dir_log=$dir_data/log
-dir_db=$dir_data/db
-dir_dep=$dir_data/deps
-dir_list_tmp=$dir_log/.tmp
-dir_update_log=$dir_log/update
-ql_static_repo=$dir_repo/static
+export dir_root=$QL_DIR
+export dir_tmp=$dir_root/.tmp
+export dir_data=$dir_root/data
+
+if [[ ${QL_DATA_DIR:=} ]]; then
+  export dir_data="${QL_DATA_DIR%/}"
+fi
+
+export dir_shell=$dir_root/shell
+export dir_preload=$dir_shell/preload
+export dir_sample=$dir_root/sample
+export dir_static=$dir_root/static
+export dir_config=$dir_data/config
+export dir_scripts=$dir_data/scripts
+export dir_repo=$dir_data/repo
+export dir_raw=$dir_data/raw
+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
 
 ## 文件
-file_config_sample=$dir_sample/config.sample.sh
-file_env=$dir_config/env.sh
-file_sharecode=$dir_config/sharecode.sh
-file_config_user=$dir_config/config.sh
-file_auth_sample=$dir_sample/auth.sample.json
-file_auth_user=$dir_config/auth.json
-file_auth_token=$dir_config/token.json
-file_extra_shell=$dir_config/extra.sh
-file_task_before=$dir_config/task_before.sh
-file_task_after=$dir_config/task_after.sh
-file_task_sample=$dir_sample/task.sample.sh
-file_extra_sample=$dir_sample/extra.sample.sh
-file_notify_js_sample=$dir_sample/notify.js
-file_notify_py_sample=$dir_sample/notify.py
-file_test_js_sample=$dir_sample/test.js
-file_test_py_sample=$dir_sample/test.py
-file_notify_py=$dir_scripts/notify.py
-file_notify_js=$dir_scripts/sendNotify.js
-file_test_js=$dir_scripts/test.js
-file_test_py=$dir_scripts/test.py
-nginx_app_conf=$dir_root/docker/front.conf
-nginx_conf=$dir_root/docker/nginx.conf
-dep_notify_py=$dir_dep/notify.py
-dep_notify_js=$dir_dep/sendNotify.js
+export file_config_sample=$dir_sample/config.sample.sh
+export file_env=$dir_preload/env.sh
+export file_preload_js=$dir_preload/sitecustomize.js
+export file_sharecode=$dir_config/sharecode.sh
+export file_config_user=$dir_config/config.sh
+export file_auth_sample=$dir_sample/auth.sample.json
+export file_auth_user=$dir_config/auth.json
+export file_auth_token=$dir_config/token.json
+export file_extra_shell=$dir_config/extra.sh
+export file_task_before=$dir_config/task_before.sh
+export file_task_before_js=$dir_config/task_before.js
+export file_task_before_py=$dir_config/task_before.py
+export file_task_after=$dir_config/task_after.sh
+export file_task_sample=$dir_sample/task.sample.sh
+export file_extra_sample=$dir_sample/extra.sample.sh
+export file_notify_js_sample=$dir_sample/notify.js
+export file_notify_py_sample=$dir_sample/notify.py
+export file_test_js_sample=$dir_sample/ql_sample.js
+export file_test_py_sample=$dir_sample/ql_sample.py
+export file_notify_py=$dir_scripts/notify.py
+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
@@ -69,24 +78,19 @@ init_env() {
 
 import_config() {
   [[ -f $file_config_user ]] && . $file_config_user
-  [[ -f $file_env ]] && . $file_env
 
   ql_base_url=${QlBaseUrl:-"/"}
   ql_port=${QlPort:-"5700"}
   command_timeout_time=${CommandTimeoutTime:-""}
   file_extensions=${RepoFileExtensions:-"js py"}
   proxy_url=${ProxyUrl:-""}
-  current_branch=${QL_BRANCH}
+  current_branch=${QL_BRANCH:-""}
 
   if [[ -n "${DefaultCronRule}" ]]; then
     default_cron="${DefaultCronRule}"
   else
     default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
   fi
-
-  cpu_warn=${CpuWarn}
-  mem_warn=${MemoryWarn}
-  disk_warn=${DiskWarn}
 }
 
 set_proxy() {
@@ -129,31 +133,6 @@ 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
@@ -196,12 +175,6 @@ 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
@@ -220,12 +193,6 @@ fix_config() {
     echo
   fi
 
-  if [[ ! -s $file_auth_user ]]; then
-    echo -e "复制一份 $file_auth_sample 为 $file_auth_user\n"
-    cp -fv $file_auth_sample $file_auth_user
-    echo
-  fi
-
   if [[ ! -s $file_notify_py ]]; then
     echo -e "复制一份 $file_notify_py_sample 为 $file_notify_py\n"
     cp -fv $file_notify_py_sample $file_notify_py
@@ -367,7 +334,7 @@ format_log_time() {
   local time="$2"
 
   if [[ $is_macos -eq 1 ]]; then
-    echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
+    echo $(python3 -c 'from datetime import datetime; print(datetime.now().strftime("%Y-%m-%d-%H-%M-%S-%f")[:-3])')
   else
     echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S-%3N")
   fi
@@ -396,25 +363,25 @@ patch_version() {
 
   if [[ -d "$dir_root/db" ]]; then
     echo -e "检测到旧的db目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    cp -rf $dir_root/config $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/scripts" ]]; then
     echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-    cp -rf $dir_root/scripts $dir_root/data
+    cp -rf $dir_root/scripts $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/log" ]]; then
     echo -e "检测到旧的log目录，拷贝到data目录...\n"
-    cp -rf $dir_root/log $dir_root/data
+    cp -rf $dir_root/log $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/config" ]]; then
     echo -e "检测到旧的config目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    cp -rf $dir_root/config $dir_data
     echo
   fi
 }
@@ -457,19 +424,30 @@ 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
+  if [[ ${task_before:=} ]]; then
     echo -e "执行前置命令\n"
-    eval "$task_before"
+    eval "${task_before%;}"
     echo -e "\n执行前置命令结束\n"
   fi
 }
@@ -477,9 +455,9 @@ run_task_before() {
 run_task_after() {
   . $file_task_after "$@"
 
-  if [[ $task_after ]]; then
+  if [[ ${task_after:=} ]]; then
     echo -e "\n执行后置命令\n"
-    eval "$task_after"
+    eval "${task_after%;}"
     echo -e "\n执行后置命令结束"
   fi
 }
@@ -489,10 +467,12 @@ handle_task_end() {
   local end_time=$(format_time "$time_format" "$etime")
   local end_timestamp=$(format_timestamp "$time_format" "$etime")
   local diff_time=$(($end_timestamp - $begin_timestamp))
+  local suffix=""
+  [[ "$MANUAL" == "true" ]] && suffix="(手动停止)"
 
   [[ "$diff_time" == 0 ]] && diff_time=1
 
-  echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
+  echo -e "\n## 执行结束$suffix... $end_time  耗时 $diff_time 秒　　　　　"
   [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
 }
 
@@ -500,5 +480,3 @@ init_env
 detect_termux
 detect_macos
 define_cmd
-
-import_config $1

shell/task.sh

@@ -1,17 +1,15 @@
 #!/usr/bin/env bash
 
-## 导入通用变量与函数
 dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
 trap "single_hanle" 2 3 20 15 14 19 1
 single_hanle() {
-  eval handle_task_end "$@" "$cmd"
+  eval MANUAL=true handle_task_end "$@" "$cmd"
   exit 1
 }
 
-## 选择python3还是node
 define_program() {
   local file_param=$1
   if [[ $file_param == *.js ]] || [[ $file_param == *.mjs ]]; then
@@ -19,13 +17,9 @@ define_program() {
   elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
     which_program="python3"
   elif [[ $file_param == *.sh ]]; then
-    which_program="bash"
+    which_program="."
   elif [[ $file_param == *.ts ]]; then
-    if ! type tsx &>/dev/null; then
     which_program="ts-node-transpile-only"
-    else
-      which_program="tsx"
-    fi
   else
     which_program=""
   fi
@@ -38,7 +32,7 @@ handle_log_path() {
     file_param="task"
   fi
 
-  if [[ -z $ID ]]; then
+  if [[ -z ${ID:=} ]]; then
     ID=$(cat $list_crontab_user | grep -E "$cmd_task.* $file_param" | perl -pe "s|.*ID=(.*) $cmd_task.* $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
   fi
   local suffix=""
@@ -66,17 +60,17 @@ handle_log_path() {
   log_dir="${log_dir_tmp%.*}${suffix}"
   log_path="$log_dir/$log_time.log"
 
-  if [[ $real_log_path ]]; then
+  if [[ ${real_log_path:=} ]]; then
     log_path="$real_log_path"
   fi
 
   cmd="2>&1 | tee -a $dir_log/$log_path"
   make_dir "$dir_log/$log_dir"
-  if [[ "$no_tee" == "true" ]]; then
+  if [[ "${no_tee:=}" == "true" ]]; then
     cmd=">> $dir_log/$log_path 2>&1"
   fi
 
-  if [[ "$real_time" == "true" ]]; then
+  if [[ "${real_time:=}" == "true" ]]; then
     cmd=""
   fi
 }
@@ -117,6 +111,7 @@ init_begin_time() {
   begin_timestamp=$(format_timestamp "$time_format" "$time")
 }
 
+import_config "$@"
 while getopts ":lm:" opt; do
   case $opt in
   l)
@@ -127,8 +122,8 @@ while getopts ":lm:" opt; do
     ;;
   esac
 done
-[[ $show_log ]] && shift $(($OPTIND - 1))
-if [[ $max_time ]]; then
+[[ ${show_log:=} ]] && shift $(($OPTIND - 1))
+if [[ ${max_time:=} ]]; then
   shift $(($OPTIND - 1))
   command_timeout_time="$max_time"
 fi

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
 
@@ -156,21 +156,15 @@ 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"
 
-  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  set_proxy "$proxy"
+  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}"
@@ -248,14 +242,14 @@ reload_qinglong() {
   fi
 
   if [[ "$reload_target" == 'data' ]]; then
-    rm -rf ${dir_root}/data/*
-    mv -f ${dir_tmp}/data/* ${dir_root}/data/
+    rm -rf ${dir_data}/*
+    mv -f ${dir_tmp}/data/* ${dir_data}/
   fi
 
   reload_pm2
 }
 
-## 更新qinglong
+## 更新 qinglong
 update_qinglong() {
   rm -rf ${dir_tmp}/*
   local mirror="gitee"
@@ -527,7 +521,7 @@ main() {
   raw)
     get_uniq_path "$p2"
     if [[ -n $p2 ]]; then
-      update_raw "$p2" "$p3" "$p4"
+      update_raw "$p2" "$p3" "$p4" "$p5"
     else
       eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd
@@ -543,14 +537,10 @@ main() {
     eval . $dir_shell/check.sh $cmd
     ;;
   resetlet)
-    auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
-    echo "$auth_value" >$file_auth_user
-    eval echo -e "重置登录错误次数成功" $cmd
+    eval update_auth_config "\\\"retries\\\":0" "重置登录错误次数" $cmd
     ;;
   resettfa)
-    auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
-    echo "$auth_value" >$file_auth_user
-    eval echo -e "禁用两步验证成功" $cmd
+    eval update_auth_config "\\\"twoFactorActivated\\\":false" "禁用两步验证" $cmd
     ;;
   *)
     eval echo -e "命令输入错误...\\\n" $cmd
@@ -569,6 +559,7 @@ main() {
   fi
 }
 
+import_config "$@"
 main "$@"
 
 exit 0

src/layouts/index.less

@@ -8,6 +8,13 @@
     url('../assets/fonts/SourceCodePro-Regular.ttf') format('truetype');
 }
 
+@font-face {
+  font-family: Log;
+  src: url('../assets/fonts/log.woff2') format('woff2'),
+    url('../assets/fonts/log.woff') format('woff'),
+    url('../assets/fonts/log.ttf') format('truetype');
+}
+
 body {
   // 禁止手机页面下拉刷新
   overflow: hidden;
@@ -52,6 +59,11 @@ body {
       width: 100%;
       padding: 24px;
       overflow-y: auto;
+      code,
+      span {
+        font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo,
+          Courier, monospace, Log;
+      }
     }
   }
 
@@ -63,6 +75,10 @@ body {
   }
 }
 
+.ͼ1 .cm-scroller {
+  font-family: monospace, Log;
+}
+
 .monaco-editor:not(.rename-box) {
   height: calc(100vh - 128px) !important;
   height: calc(100vh - var(--vh-offset, 0px) - 128px) !important;
@@ -462,3 +478,8 @@ body[data-dark='true'] {
     --antd-arrow-background-color: rgb(24, 26, 27);
   }
 }
+
+.ant-tabs-content-holder {
+  flex: 1;
+  overflow-y: auto;
+}

src/locales/en-US.json

@@ -336,6 +336,7 @@
   "企业微信应用": "WeChat Work App",
   "智能微秘书": "Smart WeChat Assistant",
   "群晖chat": "Synology Chat",
+  "微加机器人": "WePlusBot",
   "邮箱": "Email",
   "飞书机器人": "Feishu Bot",
   "自定义通知": "Custom Notification",
@@ -348,7 +349,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",
+  "Server酱SENDKEY": "ServerChan SENDKEY, https://sct.ftqq.com/r/13363",
   "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",
@@ -357,6 +358,7 @@
   "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",
@@ -377,11 +379,25 @@
   "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.",
+  "发送模板": "send template, can use type: 'html,txt,json,markdown,cloudMonitor,jenkins,route,pay'",
+  "发送渠道": "send channel, can use type: 'wechat,webhook,cp,mail,sms'",
+  "webhook编码": "webhook code",
+  "发送结果回调地址": "send result callback url",
+  "好友令牌": "friend token",
+  "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 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",
+  "ntfy的url地址，例如 https://ntfy.sh'": "The URL address of ntfy, for example, https://ntfy.sh.",
+  "ntfy的消息应用topic": "The topic for ntfy's messaging application.",
+  "wxPusherBot的appToken": "wxPusherBot's appToken, obtain according to docs https://wxpusher.zjiecode.com/docs/",
+  "wxPusherBot的topicIds": "wxPusherBot's topicIds, at least one of topicIds or uids must be configured",
+  "wxPusherBot的uids": "wxPusherBot's uids, at least one of topicIds or uids must be configured",
   "请求方法": "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.",

src/locales/zh-CN.json

@@ -336,6 +336,7 @@
   "企业微信应用": "企业微信应用",
   "智能微秘书": "智能微秘书",
   "群晖chat": "群晖chat",
+  "微加机器人": "微加机器人",
   "邮箱": "邮箱",
   "飞书机器人": "飞书机器人",
   "自定义通知": "自定义通知",
@@ -348,7 +349,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",
+  "Server酱SENDKEY": "Server 酱 SENDKEY，https://sct.ftqq.com/r/13363",
   "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",
@@ -357,6 +358,7 @@
   "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",
@@ -375,13 +377,27 @@
   "好友": "好友",
   "要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称": "要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称",
   "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/",
+  "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "微信扫码登录后一对一推送或一对多推送下面的token(你的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/",
   "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）",
+  "发送模板": "发送模板，支持html,txt,json,markdown,cloudMonitor,jenkins,route,pay",
+  "发送渠道": "发送渠道，支持wechat,webhook,cp,mail,sms",
+  "webhook编码": "webhook编码，可在pushplus公众号上扩展配置出更多渠道",
+  "发送结果回调地址": "发送结果回调地址，会把推送最终结果通知到这个地址上",
+  "好友令牌": "好友令牌，微信公众号渠道填写好友令牌，企业微信渠道填写企业微信用户id",
+  "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 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，不填则使用官方消息接口",
+  "ntfy的url地址，例如 https://ntfy.sh": "ntfy的url地址，例如 https://ntfy.sh",
+  "ntfy的消息应用topic": "ntfy的消息应用topic",
+  "wxPusherBot的appToken": "wxPusherBot的appToken, 按照文档获取 https://wxpusher.zjiecode.com/docs/",
+  "wxPusherBot的topicIds": "wxPusherBot的topicIds, topicIds 和 uids 至少配置一个才行",
+  "wxPusherBot的uids": "wxPusherBot的uids, topicIds 和 uids 至少配置一个才行",
   "请求方法": "请求方法",
   "请求头Content-Type": "请求头Content-Type",
   "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置",

src/pages/config/index.tsx

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

src/pages/crontab/detail.tsx

@@ -110,6 +110,7 @@ const CronDetailModal = ({
           minimap: { enabled: false },
           lineNumbersMinChars: 3,
           glyphMargin: false,
+          accessibilitySupport: 'off',
         }}
         onMount={(editor, monaco) => {
           editorRef.current = editor;
@@ -161,8 +162,9 @@ const CronDetailModal = ({
             setValue(data);
           }
         });
-    } else if (result) {
+    } else {
       setValidTabs([validTabs[0]]);
+      setActiveTabKey('log');
     }
   };
 
@@ -358,10 +360,15 @@ const CronDetailModal = ({
     <Modal
       title={
         <div className="crontab-title-wrapper">
-          <div style={{ minWidth: 0 }}>
+          <div style={{ minWidth: 0, display: 'flex', alignItems: 'center' }}>
             <Typography.Text
-              style={{ width: '100%' }}
-              ellipsis={{ tooltip: currentCron.name }}
+              style={{ width: 200, boxSizing: 'content-box' }}
+              ellipsis={{
+                onEllipsis(ellipsis) {
+                  return ellipsis;
+                },
+                tooltip: currentCron.name,
+              }}
             >
               {currentCron.name}
             </Typography.Text>

src/pages/crontab/index.less

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

src/pages/crontab/index.tsx

@@ -36,6 +36,7 @@ import {
   PlusOutlined,
   UnorderedListOutlined,
   CheckOutlined,
+  CopyOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -57,9 +58,11 @@ import { useVT } from 'virtualizedtableforantd4';
 import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type';
 import Name from '@/components/name';
 import dayjs from 'dayjs';
+import { noop, omit } from 'lodash';
 
 const { Text, Paragraph, Link } = Typography;
 const { Search } = Input;
+const SHOW_TAB_COUNT = 10;
 
 const Crontab = () => {
   const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
@@ -75,18 +78,16 @@ const Crontab = () => {
           style={{
             wordBreak: 'break-all',
             marginBottom: 0,
-            color: '#1890ff'
+            color: '#1890ff',
+            cursor: 'pointer',
           }}
           ellipsis={{ tooltip: text, rows: 2 }}
-        >
-          <Link
           onClick={() => {
             setDetailCron(record);
             setIsDetailModalVisible(true);
           }}
         >
-            {record.name || '-'}
-          </Link>
+          <Link>{record.name || '-'}</Link>
         </Paragraph>
       ),
       sorter: {
@@ -268,17 +269,7 @@ const Crontab = () => {
     {
       title: intl.get('关联订阅'),
       width: 185,
-      render: (text, record: any) =>
-        record.sub_id ? (
-          <Name
-            service={() =>
-              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`)
-            }
-            options={{ ready: record?.sub_id, cacheKey: record.sub_id }}
-          />
-        ) : (
-          '-'
-        ),
+      render: (text, record: any) => record?.subscription?.name || '-',
     },
     {
       title: intl.get('操作'),
@@ -388,14 +379,27 @@ const Crontab = () => {
     }
     request
       .get(url)
-      .then(({ code, data: _data }) => {
+      .then(async ({ code, data: _data }) => {
         if (code === 200) {
           const { data, total } = _data;
+          const subscriptions = await request.get(
+            `${config.apiPrefix}subscriptions?ids=${JSON.stringify([
+              ...new Set(data.map((x) => x.sub_id).filter(Boolean)),
+            ])}`,
+            {
+              onError: noop,
+            },
+          );
+          const subscriptionMap = Object.fromEntries(
+            subscriptions?.data?.map((x) => [x.id, x]),
+          );
+
           setValue(
             data.map((x) => {
               return {
                 ...x,
                 nextRunTime: getCrontabsNextDate(x.schedule, x.extra_schedules),
+                subscription: subscriptionMap?.[x.sub_id],
               };
             }),
           );
@@ -618,6 +622,7 @@ const Crontab = () => {
         icon:
           record.isDisabled === 1 ? <CheckCircleOutlined /> : <StopOutlined />,
       },
+      { label: intl.get('复制'), key: 'copy', icon: <CopyOutlined /> },
       { label: intl.get('删除'), key: 'delete', icon: <DeleteOutlined /> },
       {
         label: record.isPinned === 1 ? intl.get('取消置顶') : intl.get('置顶'),
@@ -653,6 +658,9 @@ const Crontab = () => {
       case 'edit':
         editCron(record, index);
         break;
+      case 'copy':
+        editCron(omit(record, 'id'), index);
+        break;
       case 'enableOrDisable':
         enabledOrDisabledCron(record, index);
         break;
@@ -798,7 +806,7 @@ const Crontab = () => {
 
   useEffect(() => {
     if (viewConf && enabledCronViews && enabledCronViews.length > 0) {
-      const view = enabledCronViews.slice(4).find((x) => x.id === viewConf.id);
+      const view = enabledCronViews.slice(SHOW_TAB_COUNT).find((x) => x.id === viewConf.id);
       setMoreMenuActive(!!view);
     }
   }, [viewConf, enabledCronViews]);
@@ -828,7 +836,7 @@ const Crontab = () => {
       viewAction(key);
     },
     items: [
-      ...[...enabledCronViews].slice(4).map((x) => ({
+      ...[...enabledCronViews].slice(SHOW_TAB_COUNT).map((x) => ({
         label: (
           <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
             <span>{x.name}</span>
@@ -854,6 +862,10 @@ const Crontab = () => {
         icon: <SettingOutlined />,
       },
     ],
+    style: {
+      maxHeight: 350,
+      overflowY: 'auto',
+    },
   };
 
   const getCronViews = () => {
@@ -944,7 +956,7 @@ const Crontab = () => {
         }
         onTabClick={tabClick}
         items={[
-          ...[...enabledCronViews].slice(0, 4).map((x) => ({
+          ...[...enabledCronViews].slice(0, SHOW_TAB_COUNT).map((x) => ({
             key: x.id,
             label: x.name,
           })),

src/pages/crontab/modal.tsx

@@ -21,9 +21,9 @@ const CronModal = ({
 
   const handleOk = async (values: any) => {
     setLoading(true);
-    const method = cron ? 'put' : 'post';
+    const method = cron?.id ? 'put' : 'post';
     const payload = { ...values };
-    if (cron) {
+    if (cron?.id) {
       payload.id = cron.id;
     }
     try {
@@ -34,7 +34,7 @@ const CronModal = ({
 
       if (code === 200) {
         message.success(
-          cron ? intl.get('更新任务成功') : intl.get('创建任务成功'),
+          cron?.id ? intl.get('更新任务成功') : intl.get('创建任务成功'),
         );
         handleCancel(data);
       }
@@ -50,7 +50,7 @@ const CronModal = ({
 
   return (
     <Modal
-      title={cron ? intl.get('编辑任务') : intl.get('创建任务')}
+      title={cron?.id ? intl.get('编辑任务') : intl.get('创建任务')}
       open={visible}
       forceRender
       centered

src/pages/dependence/index.tsx

@@ -39,6 +39,7 @@ import dayjs from 'dayjs';
 import WebSocketManager from '@/utils/websocket';
 import { DependenceStatus, Status } from './type';
 import IconFont from '@/components/iconfont';
+import useResizeObserver from '@react-hook/resize-observer';
 
 const { Text } = Typography;
 const { Search } = Input;
@@ -240,7 +241,19 @@ const Dependence = () => {
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
   const [type, setType] = useState('nodejs');
   const tableRef = useRef<HTMLDivElement>(null);
-  const tableScrollHeight = useTableScrollHeight(tableRef, 59);
+  const [height, setHeight] = useState<number>(0);
+
+  useResizeObserver(tableRef, (entry) => {
+    const _height =
+      entry.target?.parentElement?.parentElement?.parentElement?.offsetHeight;
+    let threshold = 113;
+    if (selectedRowIds.length) {
+      threshold += 53;
+    }
+    if (_height && height !== _height - threshold) {
+      setHeight(_height - threshold);
+    }
+  });
 
   const getDependencies = (status?: number[]) => {
     setLoading(true);
@@ -528,46 +541,7 @@ const Dependence = () => {
     setType(activeKey);
   };
 
-  return (
-    <PageContainer
-      className="ql-container-wrapper dependence-wrapper ql-container-wrapper-has-tab"
-      title={intl.get('依赖管理')}
-      extra={[
-        <Search
-          placeholder={intl.get('请输入名称')}
-          style={{ width: 'auto' }}
-          enterButton
-          loading={loading}
-          onSearch={onSearch}
-        />,
-        <Button key="2" type="primary" onClick={() => addDependence()}>
-          {intl.get('创建依赖')}
-        </Button>,
-      ]}
-      header={{
-        style: headerStyle,
-      }}
-    >
-      <Tabs
-        defaultActiveKey="nodejs"
-        size="small"
-        tabPosition="top"
-        onChange={onTabChange}
-        items={[
-          {
-            key: 'nodejs',
-            label: 'NodeJs',
-          },
-          {
-            key: 'python3',
-            label: 'Python3',
-          },
-          {
-            key: 'linux',
-            label: 'Linux',
-          },
-        ]}
-      />
+  const children = (
     <div ref={tableRef}>
       {selectedRowIds.length > 0 && (
         <div style={{ marginBottom: 16 }}>
@@ -607,7 +581,7 @@ const Dependence = () => {
           dataSource={value}
           rowKey="id"
           size="middle"
-            scroll={{ x: 768, y: tableScrollHeight }}
+          scroll={{ x: 768, y: height }}
           loading={loading}
           onChange={(pagination, filters) => {
             getDependencies(filters?.status as number[]);
@@ -615,6 +589,50 @@ const Dependence = () => {
         />
       </DndProvider>
     </div>
+  );
+
+  return (
+    <PageContainer
+      className="ql-container-wrapper dependence-wrapper ql-container-wrapper-has-tab"
+      title={intl.get('依赖管理')}
+      extra={[
+        <Search
+          placeholder={intl.get('请输入名称')}
+          style={{ width: 'auto' }}
+          enterButton
+          loading={loading}
+          onSearch={onSearch}
+        />,
+        <Button key="2" type="primary" onClick={() => addDependence()}>
+          {intl.get('创建依赖')}
+        </Button>,
+      ]}
+      header={{
+        style: headerStyle,
+      }}
+    >
+      <Tabs
+        defaultActiveKey="nodejs"
+        size="small"
+        tabPosition="top"
+        destroyInactiveTabPane
+        onChange={onTabChange}
+        items={[
+          {
+            key: 'nodejs',
+            label: 'NodeJs',
+          },
+          {
+            key: 'python3',
+            label: 'Python3',
+          },
+          {
+            key: 'linux',
+            label: 'Linux',
+          },
+        ]}
+      />
+      {children}
       <DependenceModal
         visible={isModalVisible}
         handleCancel={handleCancel}

src/pages/script/editModal.tsx

@@ -34,7 +34,7 @@ const EditModal = ({
   handleCancel: () => void;
 }) => {
   const [value, setValue] = useState('');
-  const [language, setLanguage] = useState<string>('javascript');
+  const [language, setLanguage] = useState<string>();
   const [cNode, setCNode] = useState<any>();
   const [selectedKey, setSelectedKey] = useState<string>();
   const [saveModalVisible, setSaveModalVisible] = useState<boolean>(false);
@@ -242,6 +242,7 @@ const EditModal = ({
             minimap: { enabled: false },
             lineNumbersMinChars: 3,
             glyphMargin: false,
+            accessibilitySupport: 'off',
           }}
           onMount={(editor) => {
             editorRef.current = editor;

src/pages/script/index.tsx

@@ -108,6 +108,7 @@ const Script = () => {
       };
       const item = findNode(_data, (c) => c.key === obj.node.key);
       if (item) {
+        obj.node = item;
         setExpandedKeys([p as string]);
         onTreeSelect([vkey], obj);
       }
@@ -377,7 +378,7 @@ const Script = () => {
 
   useEffect(() => {
     if (treeDom.current) {
-      setHeight(treeDom.current.clientHeight);
+      setHeight(treeDom.current.clientHeight - 6);
     }
   }, [treeDom.current, data]);
 
@@ -643,6 +644,7 @@ const Script = () => {
                 fontSize: 12,
                 lineNumbersMinChars: 3,
                 glyphMargin: false,
+                accessibilitySupport: 'off',
               }}
               onMount={(editor) => {
                 editorRef.current = editor;

src/pages/setting/dependence.tsx

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

src/pages/setting/index.tsx

@@ -124,15 +124,14 @@ const Setting = () => {
   const [editedApp, setEditedApp] = useState<any>();
   const [tabActiveKey, setTabActiveKey] = useState('security');
   const [loginLogData, setLoginLogData] = useState<any[]>([]);
-  const [systemLogData, setSystemLogData] = useState<string>('');
   const [notificationInfo, setNotificationInfo] = useState<any>();
   const containergRef = useRef<HTMLDivElement>(null);
   const [height, setHeight] = useState<number>(0);
 
   useResizeObserver(containergRef, (entry) => {
-    const _height = entry.target.parentElement?.parentElement?.offsetHeight;
-    if (_height && height !== _height - 66) {
-      setHeight(_height - 66);
+    const _height = (entry.target as HTMLElement)?.offsetHeight;
+    if (_height && height !== _height - 101) {
+      setHeight(_height - 101);
     }
   });
 
@@ -253,19 +252,6 @@ const Setting = () => {
       });
   };
 
-  const getSystemLog = () => {
-    request
-      .get<Blob>(`${config.apiPrefix}system/log`, {
-        responseType: 'blob',
-      })
-      .then(async (res) => {
-        setSystemLogData(await res.text());
-      })
-      .catch((error: any) => {
-        console.log(error);
-      });
-  };
-
   const tabChange = (activeKey: string) => {
     setTabActiveKey(activeKey);
     if (activeKey === 'app') {
@@ -274,8 +260,6 @@ const Setting = () => {
       getLoginLog();
     } else if (activeKey === 'notification') {
       getNotification();
-    } else if (activeKey === 'syslog') {
-      getSystemLog();
     }
   };
 
@@ -315,12 +299,14 @@ const Setting = () => {
           : []
       }
     >
-      <div ref={containergRef}>
+      <div ref={containergRef} style={{ height: '100%' }}>
         <Tabs
+          style={{ height: '100%' }}
           defaultActiveKey="security"
           size="small"
           tabPosition="top"
           onChange={tabChange}
+          destroyInactiveTabPane
           items={[
             ...(!isDemoEnv
               ? [
@@ -343,7 +329,7 @@ const Setting = () => {
                   dataSource={dataSource}
                   rowKey="id"
                   size="middle"
-                  scroll={{ x: 1000 }}
+                  scroll={{ x: 1000, y: height }}
                   loading={loading}
                 />
               ),
@@ -356,14 +342,12 @@ const Setting = () => {
             {
               key: 'syslog',
               label: intl.get('系统日志'),
-              children: (
-                <SystemLog data={systemLogData} height={height} theme={theme} />
-              ),
+              children: <SystemLog height={height} theme={theme} />,
             },
             {
               key: 'login',
               label: intl.get('登录日志'),
-              children: <LoginLog data={loginLogData} />,
+              children: <LoginLog height={height} data={loginLogData} />,
             },
             {
               key: 'dependence',
@@ -383,7 +367,7 @@ const Setting = () => {
               children: <About systemInfo={systemInfo} />,
             },
           ]}
-        ></Tabs>
+        />
       </div>
       <AppModal
         visible={isModalVisible}

src/pages/setting/loginLog.tsx

@@ -67,7 +67,13 @@ const columns = [
   },
 ];
 
-const LoginLog = ({ data }: any) => {
+const LoginLog = ({
+  data,
+  height,
+}: {
+  data: Array<object>;
+  height: number;
+}) => {
   return (
     <>
       <Table
@@ -76,8 +82,7 @@ const LoginLog = ({ data }: any) => {
         dataSource={data}
         rowKey="id"
         size="middle"
-        scroll={{ x: 1000 }}
-        sticky
+        scroll={{ x: 1000, y: height }}
       />
     </>
   );

src/pages/setting/systemLog.tsx

@@ -1,13 +1,47 @@
-import React, { useRef } from 'react';
+import intl from 'react-intl-universal';
+import React, { useRef, useState } from 'react';
 import CodeMirror from '@uiw/react-codemirror';
-import { Button } from 'antd';
+import { Button, DatePicker, Empty, message, Spin } from 'antd';
 import {
   VerticalAlignBottomOutlined,
   VerticalAlignTopOutlined,
 } from '@ant-design/icons';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+import { useRequest } from 'ahooks';
+import moment from 'moment';
+import {
+  systemLogDebugHighlightPlugin,
+  systemLogErrorHighlightPlugin,
+  systemLogInfoHighlightPlugin,
+  systemLogTheme,
+  systemLogWarnHighlightPlugin,
+} from '@/utils/codemirror/systemLog';
 
-const SystemLog = ({ data, height, theme }: any) => {
+const { RangePicker } = DatePicker;
+
+const SystemLog = ({ height, theme }: any) => {
   const editorRef = useRef<any>(null);
+  const panelVisiableRef = useRef<[string, string] | false>();
+  const [range, setRange] = useState<string[]>(['', '']);
+  const [systemLogData, setSystemLogData] = useState<string>('');
+
+  const { loading, refresh } = useRequest(
+    () => {
+      return request.get<Blob>(
+        `${config.apiPrefix}system/log?startTime=${range[0]}&endTime=${range[1]}`,
+        {
+          responseType: 'blob',
+        },
+      );
+    },
+    {
+      refreshDeps: [range],
+      async onSuccess(res) {
+        setSystemLogData(await res.text());
+      },
+    },
+  );
 
   const scrollTo = (position: 'start' | 'end') => {
     editorRef.current.scrollDOM.scrollTo({
@@ -15,14 +49,66 @@ const SystemLog = ({ data, height, theme }: any) => {
     });
   };
 
+  const deleteLog = () => {
+    request.delete(`${config.apiPrefix}system/log`).then((x) => {
+      message.success('删除成功');
+      refresh();
+    });
+  };
+
   return (
     <div style={{ position: 'relative' }}>
+      <div>
+        <RangePicker
+          style={{ marginBottom: 12, marginRight: 12 }}
+          disabledDate={(date) =>
+            date > moment() || date < moment().subtract(7, 'days')
+          }
+          defaultValue={[moment(), moment()]}
+          onOpenChange={(v) => {
+            panelVisiableRef.current = v ? ['', ''] : false;
+          }}
+          onCalendarChange={(_, dates, { range }) => {
+            if (
+              !panelVisiableRef.current ||
+              typeof panelVisiableRef.current === 'boolean'
+            ) {
+              return;
+            }
+            if (range === 'start') {
+              panelVisiableRef.current[0] = dates[0];
+            }
+            if (range === 'end') {
+              panelVisiableRef.current[1] = dates[1];
+            }
+            if (panelVisiableRef.current[0] && panelVisiableRef.current[1]) {
+              setRange(dates);
+            }
+          }}
+        />
+        <Button
+          onClick={() => {
+            deleteLog();
+          }}
+        >
+          {intl.get('清空日志')}
+        </Button>
+      </div>
+      {systemLogData ? (
+        <>
           <CodeMirror
             maxHeight={`${height}px`}
-        value={data}
+            value={systemLogData}
             onCreateEditor={(view) => {
               editorRef.current = view;
             }}
+            extensions={[
+              systemLogDebugHighlightPlugin,
+              systemLogErrorHighlightPlugin,
+              systemLogInfoHighlightPlugin,
+              systemLogWarnHighlightPlugin,
+              systemLogTheme,
+            ]}
             readOnly={true}
             theme={theme.includes('dark') ? 'dark' : 'light'}
           />
@@ -37,20 +123,26 @@ const SystemLog = ({ data, height, theme }: any) => {
             }}
           >
             <Button
-          size='small'
+              size="small"
               icon={<VerticalAlignTopOutlined />}
               onClick={() => {
                 scrollTo('start');
               }}
             />
             <Button
-          size='small'
+              size="small"
               icon={<VerticalAlignBottomOutlined />}
               onClick={() => {
                 scrollTo('end');
               }}
             />
           </div>
+        </>
+      ) : loading ? (
+        <Spin />
+      ) : (
+        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+      )}
     </div>
   );
 };

src/utils/codemirror/systemLog.ts

@@ -0,0 +1,174 @@
+import {
+  Decoration,
+  EditorView,
+  ViewPlugin,
+  ViewUpdate,
+} from '@codemirror/view';
+import { RangeSet, RangeSetBuilder } from '@codemirror/state';
+
+const infoWord = /\[\ue6f5info\]/g;
+const debugWord = /\[\ue67fdebug\]/g;
+const warnWord = /\[\ue880warn\]/g;
+const errorWord = /\[\ue602error\]/g;
+
+const customWordClassMap = {
+  info: 'system-log-info',
+  warn: 'system-warn-info',
+  error: 'system-error-info',
+  debug: 'system-debug-info',
+};
+
+export const systemLogInfoHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: RangeSet<Decoration>;
+
+    constructor(view: EditorView) {
+      this.decorations = this.getDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged) {
+        this.decorations = this.getDecorations(update.view);
+      }
+    }
+
+    getDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+      const doc = view.state.doc.toString();
+      let match;
+
+      while ((match = infoWord.exec(doc)) !== null) {
+        const deco = Decoration.mark({
+          class: customWordClassMap.info,
+        });
+
+        builder.add(match.index, match.index + match[0].length, deco);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+export const systemLogWarnHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: RangeSet<Decoration>;
+
+    constructor(view: EditorView) {
+      this.decorations = this.getDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged) {
+        this.decorations = this.getDecorations(update.view);
+      }
+    }
+
+    getDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+      const doc = view.state.doc.toString();
+      let match;
+
+      while ((match = warnWord.exec(doc)) !== null) {
+        const deco = Decoration.mark({
+          class: customWordClassMap.warn,
+        });
+
+        builder.add(match.index, match.index + match[0].length, deco);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+export const systemLogDebugHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: RangeSet<Decoration>;
+
+    constructor(view: EditorView) {
+      this.decorations = this.getDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged) {
+        this.decorations = this.getDecorations(update.view);
+      }
+    }
+
+    getDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+      const doc = view.state.doc.toString();
+      let match;
+
+      while ((match = debugWord.exec(doc)) !== null) {
+        const deco = Decoration.mark({
+          class: customWordClassMap.debug,
+        });
+
+        builder.add(match.index, match.index + match[0].length, deco);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+export const systemLogErrorHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: RangeSet<Decoration>;
+
+    constructor(view: EditorView) {
+      this.decorations = this.getDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged) {
+        this.decorations = this.getDecorations(update.view);
+      }
+    }
+
+    getDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+      const doc = view.state.doc.toString();
+      let match;
+
+      while ((match = errorWord.exec(doc)) !== null) {
+        const deco = Decoration.mark({
+          class: customWordClassMap.error,
+        });
+
+        builder.add(match.index, match.index + match[0].length, deco);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+export const systemLogTheme = EditorView.baseTheme({
+  '.system-log-info': {
+    color: '#2196F3',
+  },
+  '.system-warn-info': {
+    color: '#FFB827',
+  },
+  '.system-error-info': {
+    color: '#FA5151',
+  },
+  '.system-debug-info': {
+    color: '#009A29',
+  },
+});

src/utils/config.ts

@@ -84,6 +84,7 @@ export default {
   },
   notificationModes: [
     { value: 'gotify', label: 'Gotify' },
+    { value: 'ntfy', label: 'Ntfy' },
     { value: 'goCqHttpBot', label: 'GoCqHttpBot' },
     { value: 'serverChan', label: intl.get('Server酱') },
     { value: 'pushDeer', label: 'PushDeer' },
@@ -95,6 +96,8 @@ export default {
     { value: 'aibotk', label: intl.get('智能微秘书') },
     { value: 'iGot', label: 'IGot' },
     { value: 'pushPlus', label: 'PushPlus' },
+    { value: 'wePlusBot', label: intl.get('微加机器人') },
+    { value: 'wxPusherBot', label: 'wxPusher' },
     { value: 'chat', label: intl.get('群晖chat') },
     { value: 'email', label: intl.get('邮箱') },
     { value: 'lark', label: intl.get('飞书机器人') },
@@ -117,6 +120,19 @@ export default {
       },
       { label: 'gotifyPriority', tip: intl.get('推送消息的优先级') },
     ],
+    ntfy: [
+      {
+        label: 'ntfyUrl',
+        tip: intl.get('ntfy的url地址，例如 https://ntfy.sh'),
+        required: true,
+      },
+      {
+        label: 'ntfyTopic',
+        tip: intl.get('ntfy的消息应用topic'),
+        required: true,
+      },
+      { label: 'ntfyPriority', tip: intl.get('推送消息的优先级') },
+    ],
     chat: [
       {
         label: 'chatUrl',
@@ -190,6 +206,10 @@ export default {
         label: 'barkUrl',
         tip: intl.get('BARK推送消息的跳转URL'),
       },
+      {
+        label: 'barkArchive',
+        tip: intl.get('BARK是否保存推送消息'),
+      },
     ],
     telegramBot: [
       {
@@ -307,6 +327,74 @@ export default {
           '一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）',
         ),
       },
+      {
+        label: 'pushplusTemplate',
+        tip: intl.get(
+          '发送模板',
+        ),
+      },
+      {
+        label: 'pushplusChannel',
+        tip: intl.get(
+          '发送渠道',
+        ),
+      },
+      {
+        label: 'pushplusWebhook',
+        tip: intl.get(
+          'webhook编码',
+        ),
+      },
+      {
+        label: 'pushplusCallbackUrl',
+        tip: intl.get(
+          '发送结果回调地址',
+        ),
+      },
+      {
+        label: 'pushplusTo',
+        tip: intl.get(
+          '好友令牌',
+        ),
+      },
+    ],
+    wePlusBot: [
+      {
+        label: 'wePlusBotToken',
+        tip: intl.get(
+          '用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/',
+        ),
+        required: true,
+      },
+      {
+        label: 'wePlusBotReceiver',
+        tip: intl.get(
+          '消息接收人',
+        ),
+      },
+      {
+        label: 'wePlusBotVersion',
+        tip: intl.get(
+          '调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版',
+        ),
+      },
+    ],
+    wxPusherBot: [
+      {
+        label: 'wxPusherBotAppToken',
+        tip: intl.get('wxPusherBot的appToken'),
+        required: true,
+      },
+      {
+        label: 'wxPusherBotTopicIds',
+        tip: intl.get('wxPusherBot的topicIds'),
+        required: false,
+      },
+      {
+        label: 'wxPusherBotUids',
+        tip: intl.get('wxPusherBot的uids'),
+        required: false,
+      },
     ],
     lark: [
       {
@@ -334,6 +422,11 @@ 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/const.ts

@@ -6,4 +6,6 @@ export const LANG_MAP = {
   '.mjs': 'javascript',
   '.sh': 'shell',
   '.ts': 'typescript',
+  '.ini': 'ini',
+  '.json': 'json'
 };

src/utils/http.ts

@@ -1,29 +1,44 @@
-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, { AxiosError, AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios, {
+  AxiosError,
+  AxiosInstance,
+  AxiosRequestConfig,
+  AxiosResponse,
+  InternalAxiosRequestConfig,
+} from 'axios';
 
-interface IResponseData {
+export interface IResponseData {
   code?: number;
   data?: any;
   message?: string;
   error?: any;
 }
 
-type Override<
+export 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 (error: AxiosError) {
+const errorHandler = function (
+  error: Override<
+    AxiosError<IResponseData>,
+    { config: InternalAxiosRequestConfig & ICustomConfig }
+  >,
+) {
   if (error.response) {
     const msg = error.response.data
       ? error.response.data.message || error.message || error.response.data
@@ -38,6 +53,10 @@ const errorHandler = function (error: AxiosError) {
         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' },
@@ -105,21 +124,21 @@ export const request = _request as Override<
   {
     get<T = IResponseData, D = any>(
       url: string,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     delete<T = IResponseData, D = any>(
       url: string,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     post<T = IResponseData, D = any>(
       url: string,
       data?: D,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     put<T = IResponseData, D = any>(
       url: string,
       data?: D,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
   }
 >;