更新版本 v2.12.0

* 增加PushDeer推送

.env.example

@@ -1,9 +1,12 @@
-MONGODB_URI='mongodb://'
-YIYAN_MONGODB_URI=''
-
+PUBLIC_PORT=5400
 CRON_PORT=5500
-PORT=5600
+BACK_PORT=5600
+PORT=5700
 
 LOG_LEVEL='debug'
 
 SECRET='whyour'
+
+QINIU_AK = ''
+QINIU_SK = ''
+QINIU_SCOPE = ''

.github/workflows/build.yml

@@ -1,34 +0,0 @@
-name: BuildStatic
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '14'
-      
-      - name: build front and back
-        run: |
-          yarn install
-          yarn build
-          yarn build-back
-        
-      - name: copy to static repo
-        env: 
-          # GITHUB_REPO: gitee.com/whyour/qinglong-static
-          GITHUB_REPO: github.com/whyour/qinglong-static
-        run: |
-          mkdir -p static
-          cd ./static 
-          cp -rf ../dist ./ && cp -rf ../build ./
-          git init && git add .
-          git config user.name "whyour"
-          git config user.email "imwhyour@gmail.com"
-          git commit --allow-empty -m "copy static at $(date +'%Y-%m-%d %H:%M:%S')"
-          git push --force --quiet "https://whyour:${{ secrets.API_TOKEN }}@${GITHUB_REPO}.git" master:master

.github/workflows/build_docker_image.yml

@@ -0,0 +1,118 @@
+name: Build And Push Docker Image
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'develop'
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+  schedule:
+    # 参考 https://jasonet.co/posts/scheduled-actions/
+    # note: 这里是GMT时间，北京时间减去八小时即可。如北京时间 22:30 => GMT 14:30
+    # minute hour day month dayOfWeek
+    - cron: '00 14 * * *' # GMT 14:00 => 北京时间 22:00
+    #- cron: '30 16 * * *' # GMT 16:30（前一天） => 北京时间 00:30
+  workflow_dispatch:
+
+jobs:
+  build-static:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+
+      - name: build front and back
+        run: |
+          yarn install
+          yarn build:front
+          yarn build:back
+
+      - name: copy to static repo
+        env:
+          GITHUB_REPO: github.com/${{ github.repository_owner }}/qinglong-static
+          GITHUB_BRANCH: ${{ github.ref_name }}
+        run: |
+          mkdir -p tmp
+          cd ./tmp
+          cp -rf ../static/* ./
+          git init -b ${GITHUB_BRANCH} && git add .
+          git config --local user.name 'github-actions[bot]'
+          git config --local user.email 'github-actions[bot]@users.noreply.github.com'
+          git commit --allow-empty -m "copy static at $(date +'%Y-%m-%d %H:%M:%S')"
+          git push --force --quiet "https://${{ secrets.API_TOKEN }}@${GITHUB_REPO}.git" ${GITHUB_BRANCH}:${GITHUB_BRANCH}
+
+  build:
+    needs: build-static
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+
+      - name: Set time zone
+        uses: szenius/set-timezone@v1.0
+        with:
+          timezoneLinux: "Asia/Shanghai"
+          timezoneMacos: "Asia/Shanghai"
+          timezoneWindows: "China Standard Time"
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            ${{ github.repository }}
+            ghcr.io/${{ github.repository }}
+          # generate Docker tags based on the following events/attributes
+          #   nightly, master, pr-2, 1.2.3, 1.2, 1
+          tags: |
+            type=schedule,pattern=nightly
+            type=edge
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          build-args: |
+            MAINTAINER=${{ github.repository_owner }}
+            QL_BRANCH=${{ github.ref_name }}
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          context: docker/
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker.yml

@@ -1,13 +1,6 @@
 name: PublishDockerImage
 on:
   workflow_dispatch:
-  # workflow_run:
-  #   workflows:
-  #     - BuildStatic
-  #   branches:
-  #     - master
-  #   types:
-  #     - completed
 
 jobs:
   build:

.gitignore

@@ -5,11 +5,12 @@
 /npm-debug.log*
 /yarn-error.log
 /yarn.lock
+/pnpm-lock.yaml
 /package-lock.json
 
 # production
-/dist
-/build
+/static
+/data
 
 # misc
 .DS_Store
@@ -21,9 +22,11 @@
 /.env.local
 .env
 .history
+.version.ts
 
 /config
 /log
 /db
 /manual_log
 /scripts
+/bak

.npmrc

@@ -0,0 +1 @@
+sentrycli_cdnurl=https://cdn.npm.taobao.org/dist/sentry-cli

.umirc.ts

@@ -4,16 +4,27 @@ const CompressionPlugin = require('compression-webpack-plugin');
 export default defineConfig({
   hash: true,
   layout: false,
+  outputPath: 'static/dist',
   nodeModulesTransform: {
     type: 'none',
   },
   fastRefresh: {},
-  favicon: 'https://qinglong.whyour.cn/g5.ico',
+  esbuild: {},
+  webpack5: {},
+  dynamicImport: {
+    loading: '@/components/pageLoading',
+  },
+  favicon: '/images/g5.ico',
   proxy: {
-    '/api': {
-      target: 'http://127.0.0.1:5678/',
+    '/api/public': {
+      target: 'http://127.0.0.1:5400/',
       changeOrigin: true,
     },
+    '/api': {
+      target: 'http://127.0.0.1:5600/',
+      changeOrigin: true,
+      ws: true,
+    },
   },
   chainWebpack: (config) => {
     config.plugin('compression-webpack-plugin').use(
@@ -28,16 +39,9 @@ export default defineConfig({
   externals: {
     react: 'window.React',
     'react-dom': 'window.ReactDOM',
-    darkreader: 'window.DarkReader',
-    codemirror: 'window.CodeMirror',
   },
   scripts: [
     'https://gw.alipayobjects.com/os/lib/react/16.13.1/umd/react.production.min.js',
     'https://gw.alipayobjects.com/os/lib/react-dom/16.13.1/umd/react-dom.production.min.js',
-    'https://cdn.jsdelivr.net/npm/darkreader@4.9.34/darkreader.min.js',
-    'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/lib/codemirror.min.js',
-    'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/shell/shell.js',
-    'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/python/python.js',
-    'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/javascript/javascript.js',
   ],
 });

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://github.com/whyour/qinglong">
-    <img width="150" src="https://qinglong.whyour.cn/qinglong.png">
+    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
   </a>
 </p>
 
@@ -8,12 +8,10 @@
 
 <div align="center">
 
-Python/JavaScript/Shell/Typescript 定时任务管理
+支持python3、javaScript、shell、typescript 的定时任务管理面板（A timed task management panel that supports typescript, javaScript, python3, and shell.）
 
-[![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url] [![donate][donate-image]][donate-url]
+[![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
 
-[donate-image]: https://img.shields.io/badge/donate-wechat-green?style=flat
-[donate-url]: https://qinglong.whyour.cn/nice.png
 [docker-pulls-image]: https://img.shields.io/docker/pulls/whyour/qinglong?style=flat
 [docker-pulls-url]: https://hub.docker.com/r/whyour/qinglong
 [docker-version-image]: https://img.shields.io/docker/v/whyour/qinglong?style=flat
@@ -24,27 +22,166 @@ Python/JavaScript/Shell/Typescript 定时任务管理
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 </div>
 
-<p align="center">
-  <img width="49%" src="https://qinglong.whyour.cn/login.png">
-  <img width="49%" src="https://qinglong.whyour.cn/home.png">
-</p>
+[![](https://z3.ax1x.com/2021/11/18/I7KrTg.jpg)](https://whyour.cn)
+
+简体中文 | [English](./README-en.md)
+
+## 功能
+
+- 支持多种脚本语言（python3、javaScript、shell、typescript）
+- 支持在线管理脚本、环境变量、配置文件
+- 支持在线查看任务日志
+- 支持秒级任务设置
+- 支持系统级通知
+- 支持暗黑模式
+- 支持手机端操作
+
+## 部署
+
+### 本机部署
+
+```bash
+# 待完善
+```
+
+### podman 部署
+
+1. podman 安装
+
+```bash
+https://podman.io/getting-started/installation
+```
+
+2. 启动容器
+
+```bash
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql:/ql/data \
+  -p 5700:5700 \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  docker.io/whyour/qinglong:latest
+```
+
+### docker 部署
+
+1. docker 安装
+
+```bash
+sudo curl -sSL get.docker.com | sh
+```
+
+2. 启动容器
+
+```bash
+docker run -dit \
+  -v $PWD/ql:/ql/data \
+  -p 5700:5700 \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### docker-compose 部署
+
+1. docker-compose 安装
+
+```bash
+sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+```
+
+2. 启动容器
+
+```bash
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# 启动
+docker-compose up -d
+# 停止
+docker-compose down
+```
+
+## 使用
+
+1. 内置命令
+
+```bash
+# 更新并重启青龙
+ql update                                                    
+# 运行自定义脚本extra.sh
+ql extra                                                     
+# 添加单个脚本文件
+ql raw <file_url>                                             
+# 添加单个仓库的指定脚本
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+# 删除旧日志
+ql rmlog <days>                                              
+# 启动tg-bot
+ql bot                                                       
+# 检测青龙环境并修复
+ql check                                                     
+# 重置登录错误次数
+ql resetlet                                                  
+# 禁用两步登录
+ql resettfa                                                  
+
+# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
+task <file_path>                                             
+# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
+task <file_path> now                                         
+# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
+task <file_path> conc <env_name> <account_number>(可选的) 
+# 指定账号执行，无论是否设置了随机延迟，均立即运行 
+task <file_path> desi <env_name> <account_number>         
+```
+
+2. 参数说明
+
+* file_url: 脚本地址
+* repo_url: 仓库地址
+* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串
+* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串
+* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响
+* branch: 拉取仓库的分支
+* days: 需要保留的日志的天数
+* file_path: 任务执行时的文件路径
+* env_name: 任务执行时需要并发或者指定时的环境变量名称
+* account_number: 任务执行时指定某个环境变量需要执行的账号序号
+
+## 链接
+
+- [nevinee](https://gitee.com/evine)
+- [crontab-ui](https://github.com/alseambusher/crontab-ui)
+- [Ant Design](https://ant.design)
+- [Ant Design Pro](https://pro.ant.design/)
+- [Umijs3.0](https://umijs.org)
+- [darkreader](https://github.com/darkreader/darkreader)
+- [admin-server](https://github.com/sunpu007/admin-server)
+
+## 开发
+
+```bash
+$ git clone git@github.com:whyour/qinglong.git
+$ cd qinglong
+$ cp .env.example .env
+$ yarn install
+$ yarn start
+```
+
+打开你的浏览器，访问 http://127.0.0.1:5700
+
+## 交流
+
+[telegram频道](https://t.me/jiao_long)
+
+## 名称来源
 
 青龙，又名苍龙，在中国传统文化中是四象之一、[天之四灵](https://zh.wikipedia.org/wiki/%E5%A4%A9%E4%B9%8B%E5%9B%9B%E7%81%B5)之一，根据五行学说，它是代表东方的灵兽，为青色的龙，五行属木，代表的季节是春季，八卦主震。苍龙与应龙一样，都是身具羽翼。《张果星宗》称“又有辅翼，方为真龙”。
 
 《后汉书·律历志下》记载：日周于天，一寒一暑，四时备成，万物毕改，摄提迁次，青龙移辰，谓之岁。
 
 在中国[二十八宿](https://zh.wikipedia.org/wiki/%E4%BA%8C%E5%8D%81%E5%85%AB%E5%AE%BF)中，青龙是东方七宿（角、亢、氐、房、心、尾、箕）的总称。 在早期星宿信仰中，祂是最尊贵的天神。 但被道教信仰吸纳入其神系后，神格大跌，道教将其称为“孟章”，在不同的道经中有“帝君”、“圣将”、“神将”和“捕鬼将”等称呼，与白虎监兵神君一起，是道教的护卫天神。
-
-## 多谢
-
-* [nevinee](https://gitee.com/evine)
-
-* [crontab-ui](https://github.com/alseambusher/crontab-ui)
-
-* [Ant Design](https://ant.design)
-
-* [Ant Design Pro](https://pro.ant.design/)
-
-* [Umijs3.0](https://umijs.org)
-
-* [darkreader](https://github.com/darkreader/darkreader)

back/api/auth.ts

@@ -1,129 +0,0 @@
-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 jwt from 'jsonwebtoken';
-import { createRandomString } from '../config/util';
-import crypto from 'crypto';
-const route = Router();
-
-export default (app: Router) => {
-  app.use('/', route);
-  route.post(
-    '/login',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        let username = req.body.username;
-        let password = req.body.password;
-        fs.readFile(config.authConfigFile, 'utf8', function (err, data) {
-          if (err) console.log(err);
-          const authInfo = JSON.parse(data);
-          if (username && password) {
-            if (
-              authInfo.username === 'admin' &&
-              authInfo.password === 'adminadmin'
-            ) {
-              const newPassword = createRandomString(16, 22);
-              fs.writeFileSync(
-                config.authConfigFile,
-                JSON.stringify({
-                  username: authInfo.username,
-                  password: newPassword,
-                }),
-              );
-              return res.send({
-                code: 100,
-                message: '已初始化密码，请前往auth.json查看并重新登录',
-              });
-            }
-            if (
-              username == authInfo.username &&
-              password == authInfo.password
-            ) {
-              const data = createRandomString(50, 100);
-              let token = jwt.sign({ data }, config.secret as any, {
-                expiresIn: 60 * 60 * 24 * 3,
-                algorithm: 'HS384',
-              });
-              fs.writeFileSync(
-                config.authConfigFile,
-                JSON.stringify({
-                  username: authInfo.username,
-                  password: authInfo.password,
-                  token,
-                }),
-              );
-              res.send({ code: 200, token });
-            } else {
-              res.send({ code: 400, message: config.authError });
-            }
-          } else {
-            res.send({ err: 400, message: '请输入用户名密码!' });
-          }
-        });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
-  route.post(
-    '/logout',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        fs.readFile(config.authConfigFile, 'utf8', function (err, data) {
-          if (err) console.log(err);
-          const authInfo = JSON.parse(data);
-          fs.writeFileSync(
-            config.authConfigFile,
-            JSON.stringify({
-              username: authInfo.username,
-              password: authInfo.password,
-            }),
-          );
-          res.send({ code: 200 });
-        });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
-  route.post(
-    '/user',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        fs.writeFile(config.authConfigFile, JSON.stringify(req.body), (err) => {
-          if (err) console.log(err);
-          res.send({ code: 200, message: '更新成功' });
-        });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
-  route.get(
-    '/user',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        fs.readFile(config.authConfigFile, 'utf8', (err, data) => {
-          if (err) console.log(err);
-          const authInfo = JSON.parse(data);
-          res.send({ code: 200, data: { username: authInfo.username } });
-        });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-};

back/api/config.ts

@@ -8,10 +8,10 @@ import { celebrate, Joi } from 'celebrate';
 const route = Router();
 
 export default (app: Router) => {
-  app.use('/', route);
+  app.use('/configs', route);
 
   route.get(
-    '/configs/files',
+    '/files',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
@@ -32,11 +32,14 @@ export default (app: Router) => {
   );
 
   route.get(
-    '/configs/:file',
+    '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         let content = '';
+        if (config.blackFileList.includes(req.params.file)) {
+          res.send({ code: 403, message: '文件无法访问' });
+        }
         if (req.params.file.includes('sample')) {
           content = getFileContentByName(
             `${config.samplePath}${req.params.file}`,
@@ -55,7 +58,7 @@ export default (app: Router) => {
   );
 
   route.post(
-    '/configs/save',
+    '/save',
     celebrate({
       body: Joi.object({
         name: Joi.string().required(),
@@ -66,6 +69,9 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const { name, content } = req.body;
+        if (config.blackFileList.includes(name)) {
+          res.send({ code: 403, message: '文件无法访问' });
+        }
         const path = `${config.configPath}${name}`;
         fs.writeFileSync(path, content);
         res.send({ code: 200, message: '保存成功' });

back/api/cron.ts

@@ -7,31 +7,28 @@ import cron_parser from 'cron-parser';
 const route = Router();
 
 export default (app: Router) => {
-  app.use('/', route);
-  route.get(
-    '/crons',
-    async (req: Request, res: Response, next: NextFunction) => {
+  app.use('/crons', route);
+
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
       const cronService = Container.get(CronService);
-        const data = await cronService.crontabs(
-          req.query.searchValue as string,
-        );
+      const data = await cronService.crontabs(req.query.searchValue as string);
       return res.send({ code: 200, data });
     } catch (e) {
       logger.error('🔥 error: %o', e);
       return next(e);
     }
-    },
-  );
+  });
 
   route.post(
-    '/crons',
+    '/',
     celebrate({
       body: Joi.object({
         command: Joi.string().required(),
         schedule: Joi.string().required(),
         name: Joi.string().optional(),
+        labels: Joi.array().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -52,9 +49,9 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/crons/run',
+    '/run',
     celebrate({
-      body: Joi.array().items(Joi.string().required()),
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -70,9 +67,9 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/crons/stop',
+    '/stop',
     celebrate({
-      body: Joi.array().items(Joi.string().required()),
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -87,10 +84,55 @@ export default (app: Router) => {
     },
   );
 
-  route.put(
-    '/crons/disable',
+  route.delete(
+    '/labels',
     celebrate({
-      body: Joi.array().items(Joi.string().required()),
+      body: Joi.object({
+        ids: Joi.array().items(Joi.number().required()),
+        labels: Joi.array().items(Joi.string().required()),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronService = Container.get(CronService);
+        const data = await cronService.removeLabels(
+          req.body.ids,
+          req.body.labels,
+        );
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.post(
+    '/labels',
+    celebrate({
+      body: Joi.object({
+        ids: Joi.array().items(Joi.number().required()),
+        labels: Joi.array().items(Joi.string().required()),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronService = Container.get(CronService);
+        const data = await cronService.addLabels(req.body.ids, req.body.labels);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/disable',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -106,9 +148,9 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/crons/enable',
+    '/enable',
     celebrate({
-      body: Joi.array().items(Joi.string().required()),
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -124,13 +166,13 @@ export default (app: Router) => {
   );
 
   route.get(
-    '/crons/:id/log',
+    '/:id/log',
     celebrate({
       params: Joi.object({
-        id: Joi.string().required(),
+        id: Joi.number().required(),
       }),
     }),
-    async (req: Request, res: Response, next: NextFunction) => {
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         const cronService = Container.get(CronService);
@@ -144,13 +186,14 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/crons',
+    '/',
     celebrate({
       body: Joi.object({
+        labels: Joi.array().optional().allow(null),
         command: Joi.string().optional(),
         schedule: Joi.string().optional(),
         name: Joi.string().optional(),
-        _id: Joi.string().required(),
+        id: Joi.number().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -174,9 +217,9 @@ export default (app: Router) => {
   );
 
   route.delete(
-    '/crons',
+    '/',
     celebrate({
-      body: Joi.array().items(Joi.string().required()),
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -191,8 +234,44 @@ export default (app: Router) => {
     },
   );
 
+  route.put(
+    '/pin',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronService = Container.get(CronService);
+        const data = await cronService.pin(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/unpin',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronService = Container.get(CronService);
+        const data = await cronService.unPin(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
   route.get(
-    '/crons/import',
+    '/import',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
@@ -207,17 +286,17 @@ export default (app: Router) => {
   );
 
   route.get(
-    '/crons/:id',
+    '/:id',
     celebrate({
       params: Joi.object({
-        id: Joi.string().required(),
+        id: Joi.number().required(),
       }),
     }),
-    async (req: Request, res: Response, next: NextFunction) => {
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         const cronService = Container.get(CronService);
-        const data = await cronService.get(req.params.id);
+        const data = await cronService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
         logger.error('🔥 error: %o', e);
@@ -227,13 +306,15 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/crons/status',
+    '/status',
     celebrate({
       body: Joi.object({
-        ids: Joi.array().items(Joi.string().required()),
+        ids: Joi.array().items(Joi.number().required()),
         status: Joi.string().required(),
         pid: Joi.string().optional(),
         log_path: Joi.string().optional(),
+        last_running_time: Joi.number().optional(),
+        last_execution_time: Joi.number().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -252,4 +333,24 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.get(
+    '/:id/logs',
+    celebrate({
+      params: Joi.object({
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronService = Container.get(CronService);
+        const data = await cronService.logs(req.params.id);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
 };

back/api/dependence.ts

@@ -0,0 +1,143 @@
+import { Router, Request, Response, NextFunction } from 'express';
+import { Container } from 'typedi';
+import DependenceService from '../services/dependence';
+import { Logger } from 'winston';
+import { celebrate, Joi } from 'celebrate';
+const route = Router();
+
+export default (app: Router) => {
+  app.use('/dependencies', route);
+
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
+    const logger: Logger = Container.get('logger');
+    try {
+      const dependenceService = Container.get(DependenceService);
+      const data = await dependenceService.dependencies(req.query as any);
+      return res.send({ code: 200, data });
+    } catch (e) {
+      logger.error('🔥 error: %o', e);
+      return next(e);
+    }
+  });
+
+  route.post(
+    '/',
+    celebrate({
+      body: Joi.array().items(
+        Joi.object({
+          name: Joi.string().required(),
+          type: Joi.number().required(),
+          remark: Joi.string().optional().allow(''),
+        }),
+      ),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const dependenceService = Container.get(DependenceService);
+        const data = await dependenceService.create(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/',
+    celebrate({
+      body: Joi.object({
+        name: Joi.string().required(),
+        id: Joi.number().required(),
+        type: Joi.number().required(),
+        remark: Joi.string().optional().allow(''),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const dependenceService = Container.get(DependenceService);
+        const data = await dependenceService.update(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.delete(
+    '/',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const dependenceService = Container.get(DependenceService);
+        const data = await dependenceService.remove(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.delete(
+    '/force',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const dependenceService = Container.get(DependenceService);
+        const data = await dependenceService.removeDb(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/:id',
+    celebrate({
+      params: Joi.object({
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const dependenceService = Container.get(DependenceService);
+        const data = await dependenceService.getDb({ id: req.params.id });
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/reinstall',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const dependenceService = Container.get(DependenceService);
+        const data = await dependenceService.reInstall(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+};

back/api/env.ts

@@ -6,10 +6,9 @@ import { celebrate, Joi } from 'celebrate';
 const route = Router();
 
 export default (app: Router) => {
-  app.use('/', route);
-  route.get(
-    '/envs',
-    async (req: Request, res: Response, next: NextFunction) => {
+  app.use('/envs', route);
+
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
       const envService = Container.get(EnvService);
@@ -19,17 +18,18 @@ export default (app: Router) => {
       logger.error('🔥 error: %o', e);
       return next(e);
     }
-    },
-  );
+  });
 
   route.post(
-    '/envs',
+    '/',
     celebrate({
-      body: Joi.object({
+      body: Joi.array().items(
+        Joi.object({
           value: Joi.string().required(),
           name: Joi.string().required(),
-        remarks: Joi.string().optional(),
+          remarks: Joi.string().optional().allow(''),
         }),
+      ),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -45,13 +45,13 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/envs',
+    '/',
     celebrate({
       body: Joi.object({
         value: Joi.string().required(),
         name: Joi.string().required(),
-        remarks: Joi.string().optional(),
-        _id: Joi.string().required(),
+        remarks: Joi.string().optional().allow('').allow(null),
+        id: Joi.number().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -68,9 +68,9 @@ export default (app: Router) => {
   );
 
   route.delete(
-    '/envs',
+    '/',
     celebrate({
-      body: Joi.array().items(Joi.string().required()),
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -86,17 +86,17 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/envs/:id/move',
+    '/:id/move',
     celebrate({
       params: Joi.object({
-        id: Joi.string().required(),
+        id: Joi.number().required(),
       }),
       body: Joi.object({
         fromIndex: Joi.number().required(),
         toIndex: Joi.number().required(),
       }),
     }),
-    async (req: Request, res: Response, next: NextFunction) => {
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
@@ -110,9 +110,9 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/envs/disable',
+    '/disable',
     celebrate({
-      body: Joi.array().items(Joi.string().required()),
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -128,9 +128,9 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/envs/enable',
+    '/enable',
     celebrate({
-      body: Joi.array().items(Joi.string().required()),
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -146,10 +146,10 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/envs/name',
+    '/name',
     celebrate({
       body: Joi.object({
-        ids: Joi.array().items(Joi.string().required()),
+        ids: Joi.array().items(Joi.number().required()),
         name: Joi.string().required(),
       }),
     }),
@@ -167,17 +167,17 @@ export default (app: Router) => {
   );
 
   route.get(
-    '/envs/:id',
+    '/:id',
     celebrate({
       params: Joi.object({
-        id: Joi.string().required(),
+        id: Joi.number().required(),
       }),
     }),
-    async (req: Request, res: Response, next: NextFunction) => {
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
-        const data = await envService.get(req.params.id);
+        const data = await envService.getDb(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
         logger.error('🔥 error: %o', e);

back/api/index.ts

@@ -1,19 +1,25 @@
 import { Router } from 'express';
-import auth from './auth';
+import user from './user';
 import env from './env';
 import config from './config';
 import log from './log';
 import cron from './cron';
 import script from './script';
+import open from './open';
+import dependence from './dependence';
+import system from './system';
 
 export default () => {
   const app = Router();
-  auth(app);
+  user(app);
   env(app);
   config(app);
   log(app);
   cron(app);
   script(app);
+  open(app);
+  dependence(app);
+  system(app);
 
   return app;
 };

back/api/log.ts

@@ -7,10 +7,9 @@ import { getFileContentByName } from '../config/util';
 const route = Router();
 
 export default (app: Router) => {
-  app.use('/', route);
-  route.get(
-    '/logs',
-    async (req: Request, res: Response, next: NextFunction) => {
+  app.use('/logs', route);
+
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
       const fileList = fs.readdirSync(config.logPath, 'utf-8');
@@ -40,11 +39,10 @@ export default (app: Router) => {
       logger.error('🔥 error: %o', e);
       return next(e);
     }
-    },
-  );
+  });
 
   route.get(
-    '/logs/:dir/:file',
+    '/:dir/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
@@ -61,7 +59,7 @@ export default (app: Router) => {
   );
 
   route.get(
-    '/logs/:file',
+    '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {

back/api/open.ts

@@ -0,0 +1,126 @@
+import { Router, Request, Response, NextFunction } from 'express';
+import { Container } from 'typedi';
+import OpenService from '../services/open';
+import { Logger } from 'winston';
+import { celebrate, Joi } from 'celebrate';
+const route = Router();
+
+export default (app: Router) => {
+  app.use('/', route);
+  route.get(
+    '/apps',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const openService = Container.get(OpenService);
+        const data = await openService.list();
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.post(
+    '/apps',
+    celebrate({
+      body: Joi.object({
+        name: Joi.string().optional().allow(''),
+        scopes: Joi.array().items(Joi.string().required()),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const openService = Container.get(OpenService);
+        const data = await openService.create(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/apps',
+    celebrate({
+      body: Joi.object({
+        name: Joi.string().optional().allow(''),
+        scopes: Joi.array().items(Joi.string()),
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const openService = Container.get(OpenService);
+        const data = await openService.update(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.delete(
+    '/apps',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const openService = Container.get(OpenService);
+        const data = await openService.remove(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/apps/:id/reset-secret',
+    celebrate({
+      params: Joi.object({
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const openService = Container.get(OpenService);
+        const data = await openService.resetSecret(req.params.id);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/auth/token',
+    celebrate({
+      query: {
+        client_id: Joi.string().required(),
+        client_secret: Joi.string().required(),
+      },
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const openService = Container.get(OpenService);
+        const result = await openService.authToken(req.query as any);
+        return res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+};

back/api/script.ts

@@ -1,30 +1,76 @@
-import { getFileContentByName, getLastModifyFilePath } from '../config/util';
+import {
+  fileExist,
+  getFileContentByName,
+  getLastModifyFilePath,
+} from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import config from '../config';
 import * as fs from 'fs';
 import { celebrate, Joi } from 'celebrate';
+import path, { join } from 'path';
+import ScriptService from '../services/script';
 const route = Router();
 
 export default (app: Router) => {
-  app.use('/', route);
+  app.use('/scripts', route);
 
   route.get(
-    '/scripts/files',
+    '/files',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         const fileList = fs.readdirSync(config.scriptPath, 'utf-8');
+
+        let result = [];
+        for (let i = 0; i < fileList.length; i++) {
+          const fileOrDir = fileList[i];
+          const fPath = path.join(config.scriptPath, fileOrDir);
+          const dirStat = fs.statSync(fPath);
+          if (['node_modules'].includes(fileOrDir)) {
+            continue;
+          }
+
+          if (dirStat.isDirectory()) {
+            const childFileList = fs.readdirSync(fPath, 'utf-8');
+            let children = [];
+            for (let j = 0; j < childFileList.length; j++) {
+              const childFile = childFileList[j];
+              const sPath = path.join(config.scriptPath, fileOrDir, childFile);
+              const _fileExist = await fileExist(sPath);
+              if (_fileExist && fs.statSync(sPath).isFile()) {
+                const statObj = fs.statSync(sPath);
+                children.push({
+                  title: childFile,
+                  value: childFile,
+                  key: `${fileOrDir}/${childFile}`,
+                  mtime: statObj.mtimeMs,
+                  parent: fileOrDir,
+                });
+              }
+            }
+            result.push({
+              title: fileOrDir,
+              value: fileOrDir,
+              key: fileOrDir,
+              mtime: dirStat.mtimeMs,
+              disabled: true,
+              children: children.sort((a, b) => b.mtime - a.mtime),
+            });
+          } else {
+            result.push({
+              title: fileOrDir,
+              value: fileOrDir,
+              key: fileOrDir,
+              mtime: dirStat.mtimeMs,
+            });
+          }
+        }
+
         res.send({
           code: 200,
-          data: fileList
-            .filter((x) => {
-              return !fs.lstatSync(config.scriptPath + x).isDirectory();
-            })
-            .map((x) => {
-              return { title: x, value: x, key: x };
-            }),
+          data: result,
         });
       } catch (e) {
         logger.error('🔥 error: %o', e);
@@ -34,13 +80,16 @@ export default (app: Router) => {
   );
 
   route.get(
-    '/scripts/:file',
+    '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        const content = getFileContentByName(
-          `${config.scriptPath}${req.params.file}`,
+        const filePath = join(
+          config.scriptPath,
+          req.query.path as string,
+          req.params.file,
         );
+        const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
         logger.error('🔥 error: %o', e);
@@ -50,35 +99,55 @@ export default (app: Router) => {
   );
 
   route.post(
-    '/scripts',
+    '/',
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
-        path: Joi.string().required(),
-        content: Joi.string().required(),
+        path: Joi.string().optional().allow(''),
+        content: Joi.string().allow(''),
+        originFilename: Joi.string().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, content } = req.body as {
+        let { filename, path, content, originFilename } = req.body as {
           filename: string;
           path: string;
           content: string;
+          originFilename: string;
         };
+        if (!path) {
+          path = config.scriptPath;
+        }
         if (!path.endsWith('/')) {
           path += '/';
         }
+        if (!path.startsWith('/')) {
+          path = `${config.scriptPath}${path}`;
+        }
         if (config.writePathList.every((x) => !path.startsWith(x))) {
-          return res.send({ code: 400, data: '文件路径错误，可保存目录/ql/scripts、/ql/config、/ql/jbot、/ql/bak' });
+          return res.send({
+            code: 430,
+            data: '文件路径禁止访问',
+          });
         }
+        if (!originFilename) {
+          originFilename = filename;
+        }
+        const originFilePath = `${path}${originFilename.replace(/\//g, '')}`;
         const filePath = `${path}${filename.replace(/\//g, '')}`;
-        const bakPath = '/ql/bak';
-        if (fs.existsSync(filePath)) {
-          if (!fs.existsSync(bakPath)) {
-            fs.mkdirSync(bakPath);
+        if (fs.existsSync(originFilePath)) {
+          if (!fs.existsSync(config.bakPath)) {
+            fs.mkdirSync(config.bakPath);
+          }
+          fs.copyFileSync(
+            originFilePath,
+            `${config.bakPath}${originFilename.replace(/\//g, '')}`,
+          );
+          if (filename !== originFilename) {
+            fs.unlinkSync(originFilePath);
           }
-          fs.copyFileSync(filePath, bakPath);
         }
         fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
@@ -88,4 +157,139 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.put(
+    '/',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().optional().allow(''),
+        content: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        let { filename, content, path } = req.body as {
+          filename: string;
+          content: string;
+          path: string;
+        };
+        const filePath = join(config.scriptPath, path, filename);
+        fs.writeFileSync(filePath, content);
+        return res.send({ code: 200 });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.delete(
+    '/',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().allow(''),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        let { filename, path } = req.body as {
+          filename: string;
+          path: string;
+        };
+        const filePath = join(config.scriptPath, path, filename);
+        fs.unlinkSync(filePath);
+        res.send({ code: 200 });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.post(
+    '/download',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        let { filename } = req.body as {
+          filename: string;
+        };
+        const filePath = `${config.scriptPath}${filename}`;
+        // const stats = fs.statSync(filePath);
+        // res.set({
+        //   'Content-Type': 'application/octet-stream', //告诉浏览器这是一个二进制文件
+        //   'Content-Disposition': 'attachment; filename=' + filename, //告诉浏览器这是一个需要下载的文件
+        //   'Content-Length': stats.size  //文件大小
+        // });
+        // fs.createReadStream(filePath).pipe(res);
+        return res.download(filePath, filename, (err) => {
+          return next(err);
+        });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/run',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().optional().allow(''),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        let { filename, path } = req.body as {
+          filename: string;
+          path: string;
+        };
+        const filePath = join(path, filename);
+        const scriptService = Container.get(ScriptService);
+        const result = await scriptService.runScript(filePath);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/stop',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().optional().allow(''),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        let { filename, path } = req.body as {
+          filename: string;
+          path: string;
+        };
+        const filePath = join(path, filename);
+        const scriptService = Container.get(ScriptService);
+        const result = await scriptService.stopScript(filePath);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
 };

back/api/system.ts

@@ -0,0 +1,135 @@
+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 SystemService from '../services/system';
+import { celebrate, Joi } from 'celebrate';
+import UserService from '../services/user';
+import { EnvModel } from '../data/env';
+const route = Router();
+
+export default (app: Router) => {
+  app.use('/system', route);
+
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
+    const logger: Logger = Container.get('logger');
+    try {
+      const userService = Container.get(UserService);
+      const authInfo = await userService.getUserInfo();
+      const envCount = await EnvModel.count();
+      const versionRegx = /.*export const version = \'(.*)\'\;/;
+
+      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
+      const version = currentVersionFile.match(versionRegx)![1];
+
+      let isInitialized = true;
+      if (
+        Object.keys(authInfo).length === 2 &&
+        authInfo.username === 'admin' &&
+        authInfo.password === 'admin' &&
+        envCount === 0
+      ) {
+        isInitialized = false;
+      }
+      res.send({
+        code: 200,
+        data: {
+          isInitialized,
+          version,
+        },
+      });
+    } catch (e) {
+      logger.error('🔥 error: %o', e);
+      return next(e);
+    }
+  });
+
+  route.get(
+    '/log/remove',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const systemService = Container.get(SystemService);
+        const data = await systemService.getLogRemoveFrequency();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/log/remove',
+    celebrate({
+      body: Joi.object({
+        frequency: Joi.number().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.updateLogRemoveFrequency(
+          req.body.frequency,
+        );
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/update-check',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.checkUpdate();
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/update',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.updateSystem();
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/notify',
+    celebrate({
+      body: Joi.object({
+        title: Joi.string().required(),
+        content: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.notify(req.body);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+};

back/api/user.ts

@@ -0,0 +1,241 @@
+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 UserService from '../services/user';
+import { celebrate, Joi } from 'celebrate';
+import { getFileContentByName } from '../config/util';
+const route = Router();
+
+export default (app: Router) => {
+  app.use('/user', route);
+
+  route.post(
+    '/login',
+    celebrate({
+      body: Joi.object({
+        username: Joi.string().required(),
+        password: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.login({ ...req.body }, req);
+        return res.send(data);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.post(
+    '/logout',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        await userService.logout(req.platform);
+        res.send({ code: 200 });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/',
+    celebrate({
+      body: Joi.object({
+        username: Joi.string().required(),
+        password: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        await userService.updateUsernameAndPassword(req.body);
+        res.send({ code: 200, message: '更新成功' });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
+    const logger: Logger = Container.get('logger');
+    try {
+      const userService = Container.get(UserService);
+      const authInfo = await userService.getUserInfo();
+      res.send({
+        code: 200,
+        data: {
+          username: authInfo.username,
+          twoFactorActivated: authInfo.twoFactorActivated,
+        },
+      });
+    } catch (e) {
+      logger.error('🔥 error: %o', e);
+      return next(e);
+    }
+  });
+
+  route.get(
+    '/two-factor/init',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.initTwoFactor();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/two-factor/active',
+    celebrate({
+      body: Joi.object({
+        code: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.activeTwoFactor(req.body.code);
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/two-factor/deactive',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.deactiveTwoFactor();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/two-factor/login',
+    celebrate({
+      body: Joi.object({
+        code: Joi.string().required(),
+        username: Joi.string().required(),
+        password: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.twoFactorLogin(req.body, req);
+        res.send(data);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/login-log',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.getLoginLog();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/notification',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.getNotificationMode();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/notification',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const result = await userService.updateNotificationMode(req.body);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/init',
+    celebrate({
+      body: Joi.object({
+        username: Joi.string().required(),
+        password: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        await userService.updateUsernameAndPassword(req.body);
+        res.send({ code: 200, message: '更新成功' });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/notification/init',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const result = await userService.updateNotificationMode(req.body);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+};

back/app.ts

@@ -9,9 +9,15 @@ import Logger from './loaders/logger';
 async function startServer() {
   const app = express();
 
-  await require('./loaders').default({ expressApp: app });
+  await require('./loaders/initFile').default();
 
-  app
+  await require('./loaders/sentry').default({ expressApp: app });
+
+  await require('./loaders/db').default();
+
+  await require('./loaders/app').default({ expressApp: app });
+
+  const server = app
     .listen(config.port, () => {
       Logger.info(`
       ################################################
@@ -23,6 +29,8 @@ async function startServer() {
       Logger.error(err);
       process.exit(1);
     });
+
+  await require('./loaders/server').default({ server });
 }
 
 startServer();

back/config/index.ts

@@ -4,38 +4,40 @@ import { createRandomString } from './util';
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
+const lastVersionFile = 'https://qn.whyour.cn/version.ts';
+
 const envFound = dotenv.config();
-const rootPath = path.resolve(__dirname, '../../');
-const envFile = path.join(rootPath, 'config/env.sh');
-const confFile = path.join(rootPath, 'config/config.sh');
-const sampleFile = path.join(rootPath, 'sample/config.sample.sh');
-const crontabFile = path.join(rootPath, 'config/crontab.list');
-const confBakDir = path.join(rootPath, 'config/bak/');
-const authConfigFile = path.join(rootPath, 'config/auth.json');
-const extraFile = path.join(rootPath, 'config/extra.sh');
-const configPath = path.join(rootPath, 'config/');
-const scriptPath = path.join(rootPath, 'scripts/');
+const rootPath = process.cwd();
+const dataPath = path.join(rootPath, 'data/');
 const samplePath = path.join(rootPath, 'sample/');
-const logPath = path.join(rootPath, 'log/');
+const configPath = path.join(dataPath, 'config/');
+const scriptPath = path.join(dataPath, 'scripts/');
+const bakPath = path.join(dataPath, 'bak/');
+const logPath = path.join(dataPath, 'log/');
+const dbPath = path.join(dataPath, 'db/');
+
+const envFile = path.join(configPath, 'env.sh');
+const confFile = path.join(configPath, 'config.sh');
+const crontabFile = path.join(configPath, 'crontab.list');
+const authConfigFile = path.join(configPath, 'auth.json');
+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 authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
-const dbPath = path.join(rootPath, 'db/');
-const cronDbFile = path.join(rootPath, 'db/crontab.db');
-const envDbFile = path.join(rootPath, 'db/env.db');
-const configFound = dotenv.config({ path: confFile });
+const versionFile = path.join(rootPath, 'src/version.ts');
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");
 }
 
-if (configFound.error) {
-  throw new Error("⚠️  Couldn't find config.sh file  ⚠️");
-}
-
 export default {
-  port: parseInt(process.env.PORT as string, 10),
+  port: parseInt(process.env.BACK_PORT as string, 10),
   cronPort: parseInt(process.env.CRON_PORT as string, 10),
+  publicPort: parseInt(process.env.PUBLIC_PORT as string, 10),
   secret: process.env.SECRET || createRandomString(16, 32),
   logs: {
     level: process.env.LOG_LEVEL || 'silly',
@@ -43,6 +45,7 @@ export default {
   api: {
     prefix: '/api',
   },
+  rootPath,
   configString,
   loginFaild,
   authError,
@@ -55,8 +58,6 @@ export default {
   confFile,
   envFile,
   dbPath,
-  cronDbFile,
-  envDbFile,
   configPath,
   scriptPath,
   samplePath,
@@ -67,10 +68,17 @@ export default {
     'crontab.list',
     'env.sh',
   ],
-  writePathList: [
-    '/ql/scripts/',
-    '/ql/config/',
-    '/ql/jbot/',
-    '/ql/bak/',
+  writePathList: [configPath, scriptPath],
+  bakPath,
+  apiWhiteList: [
+    '/api/user/login',
+    '/open/auth/token',
+    '/api/user/two-factor/login',
+    '/api/system',
+    '/api/user/init',
+    '/api/user/notification/init',
   ],
+  versionFile,
+  lastVersionFile,
+  sqliteFile,
 };

back/config/util.ts

@@ -1,5 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
+import got from 'got';
+import iconv from 'iconv-lite';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -85,7 +87,7 @@ export function createRandomString(min: number, max: number): string {
     'Y',
     'Z',
   ];
-  const special = ['-', '_', '#'];
+  const special = ['-', '_'];
   const config = num.concat(english).concat(ENGLISH).concat(special);
 
   const arr = [];
@@ -105,7 +107,7 @@ export function createRandomString(min: number, max: number): string {
     newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
   }
 
-  function getOne(arr) {
+  function getOne(arr: any[]) {
     return arr[Math.floor(Math.random() * arr.length)];
   }
 
@@ -113,9 +115,156 @@ export function createRandomString(min: number, max: number): string {
 }
 
 export function getToken(req: any) {
-  const { authorization } = req.headers;
+  const { authorization = '' } = req.headers;
   if (authorization && authorization.split(' ')[0] === 'Bearer') {
-    return authorization.split(' ')[1];
+    return (authorization as string)
+      .replace('Bearer ', '')
+      .replace('mobile-', '')
+      .replace('desktop-', '');
   }
   return '';
 }
+
+export async function getNetIp(req: any) {
+  const ipArray = [
+    ...new Set([
+      ...(req.headers['x-real-ip'] || '').split(','),
+      ...(req.headers['x-forwarded-for'] || '').split(','),
+      req.ip,
+      ...req.ips,
+      req.socket.remoteAddress,
+    ]),
+  ];
+  let ip = ipArray[0];
+
+  if (ipArray.length > 1) {
+    for (let i = 0; i < ipArray.length; i++) {
+      const ipNumArray = ipArray[i].split('.');
+      const tmp = ipNumArray[0] + '.' + ipNumArray[1];
+      if (
+        tmp === '192.168' ||
+        (ipNumArray[0] === '172' &&
+          ipNumArray[1] >= 16 &&
+          ipNumArray[1] <= 32) ||
+        tmp === '10.7' ||
+        tmp === '127.0'
+      ) {
+        continue;
+      }
+      ip = ipArray[i];
+      break;
+    }
+  }
+  ip = ip.substr(ip.lastIndexOf(':') + 1, ip.length);
+  if (ip.includes('127.0') || ip.includes('192.168') || ip.includes('10.7')) {
+    ip = '';
+  }
+  try {
+    const baiduApi = got
+      .get(`https://www.cip.cc/${ip}`, { timeout: 10000, retry: 0 })
+      .text();
+    const ipApi = got
+      .get(`https://whois.pconline.com.cn/ipJson.jsp?ip=${ip}&json=true`, {
+        timeout: 10000,
+        retry: 0,
+      })
+      .buffer();
+    const [data, ipApiBody] = await await Promise.all<any>([baiduApi, ipApi]);
+
+    const ipRegx = /.*IP	:(.*)\n/;
+    const addrRegx = /.*数据二	:(.*)\n/;
+    if (data && ipRegx.test(data) && addrRegx.test(data)) {
+      const ip = data.match(ipRegx)[1];
+      const addr = data.match(addrRegx)[1];
+      return { address: addr, ip };
+    } else if (ipApiBody) {
+      const { addr, ip } = JSON.parse(iconv.decode(ipApiBody, 'GBK'));
+      return { address: `${addr}`, ip };
+    } else {
+      return { address: `获取失败`, ip };
+    }
+  } catch (error) {
+    return { address: `获取失败`, ip };
+  }
+}
+
+export function getPlatform(userAgent: string): 'mobile' | 'desktop' {
+  const ua = userAgent.toLowerCase();
+  const testUa = (regexp: RegExp) => regexp.test(ua);
+  const testVs = (regexp: RegExp) =>
+    (ua.match(regexp) || [])
+      .toString()
+      .replace(/[^0-9|_.]/g, '')
+      .replace(/_/g, '.');
+
+  // 系统
+  let system = 'unknow';
+  if (testUa(/windows|win32|win64|wow32|wow64/g)) {
+    system = 'windows'; // windows系统
+  } else if (testUa(/macintosh|macintel/g)) {
+    system = 'macos'; // macos系统
+  } else if (testUa(/x11/g)) {
+    system = 'linux'; // linux系统
+  } else if (testUa(/android|adr/g)) {
+    system = 'android'; // android系统
+  } else if (testUa(/ios|iphone|ipad|ipod|iwatch/g)) {
+    system = 'ios'; // ios系统
+  }
+
+  let platform = 'desktop';
+  if (system === 'windows' || system === 'macos' || system === 'linux') {
+    platform = 'desktop';
+  } else if (system === 'android' || system === 'ios' || testUa(/mobile/g)) {
+    platform = 'mobile';
+  }
+
+  return platform as 'mobile' | 'desktop';
+}
+
+export async function fileExist(file: any) {
+  return new Promise((resolve) => {
+    try {
+      fs.accessSync(file);
+      resolve(true);
+    } catch (error) {
+      resolve(false);
+    }
+  });
+}
+
+export async function concurrentRun(
+  fnList: Array<() => Promise<any>> = [],
+  max = 5,
+) {
+  if (!fnList.length) return;
+
+  const replyList: any[] = []; // 收集任务执行结果
+  const startTime = new Date().getTime(); // 记录任务执行开始时间
+
+  // 任务执行程序
+  const schedule = async (index: number) => {
+    return new Promise(async (resolve) => {
+      const fn = fnList[index];
+      if (!fn) return resolve(null);
+
+      // 执行当前异步任务
+      const reply = await fn();
+      replyList[index] = reply;
+
+      // 执行完当前任务后，继续执行任务池的剩余任务
+      await schedule(index + max);
+      resolve(null);
+    });
+  };
+
+  // 任务池执行程序
+  const scheduleList = new Array(max)
+    .fill(0)
+    .map((_, index) => schedule(index));
+
+  // 使用 Promise.all 批量执行
+  const r = await Promise.all(scheduleList);
+  const cost = (new Date().getTime() - startTime) / 1000;
+
+  return replyList;
+}

back/data/auth.ts

@@ -0,0 +1,38 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
+export class AuthInfo {
+  ip?: string;
+  type: AuthDataType;
+  info?: any;
+  id?: number;
+
+  constructor(options: AuthInfo) {
+    this.ip = options.ip;
+    this.info = options.info;
+    this.type = options.type;
+    this.id = options.id;
+  }
+}
+
+export enum LoginStatus {
+  'success',
+  'fail',
+}
+
+export enum AuthDataType {
+  'loginLog' = 'loginLog',
+  'authToken' = 'authToken',
+  'notification' = 'notification',
+  'removeLogFrequency' = 'removeLogFrequency',
+}
+
+interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
+export const AuthModel = sequelize.define<AuthInstance>('Auth', {
+  ip: DataTypes.STRING,
+  type: DataTypes.STRING,
+  info: {
+    type: DataTypes.JSON,
+    allowNull: true,
+  },
+});

back/data/cron.ts

@@ -1,25 +1,31 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
 export class Crontab {
   name?: string;
   command: string;
-  schedule: string;
+  schedule?: string;
   timestamp?: string;
-  created?: number;
   saved?: boolean;
-  _id?: string;
+  id?: number;
   status?: CrontabStatus;
   isSystem?: 1 | 0;
   pid?: number;
   isDisabled?: 1 | 0;
   log_path?: string;
+  isPinned?: 1 | 0;
+  labels?: string[];
+  last_running_time?: number;
+  last_execution_time?: number;
 
   constructor(options: Crontab) {
     this.name = options.name;
     this.command = options.command;
     this.schedule = options.schedule;
     this.saved = options.saved;
-    this._id = options._id;
-    this.created = options.created;
-    this.status = CrontabStatus[options.status]
+    this.id = options.id;
+    this.status =
+      options.status && CrontabStatus[options.status]
         ? options.status
         : CrontabStatus.idle;
     this.timestamp = new Date().toString();
@@ -27,6 +33,10 @@ export class Crontab {
     this.pid = options.pid;
     this.isDisabled = options.isDisabled || 0;
     this.log_path = options.log_path || '';
+    this.isPinned = options.isPinned || 0;
+    this.labels = options.labels || [''];
+    this.last_running_time = options.last_running_time || 0;
+    this.last_execution_time = options.last_execution_time || 0;
   }
 }
 
@@ -36,3 +46,30 @@ export enum CrontabStatus {
   'disabled',
   'queued',
 }
+
+interface CronInstance extends Model<Crontab, Crontab>, Crontab {}
+export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
+  name: {
+    unique: 'compositeIndex',
+    type: DataTypes.STRING,
+  },
+  command: {
+    unique: 'compositeIndex',
+    type: DataTypes.STRING,
+  },
+  schedule: {
+    unique: 'compositeIndex',
+    type: DataTypes.STRING,
+  },
+  timestamp: DataTypes.STRING,
+  saved: DataTypes.BOOLEAN,
+  status: DataTypes.NUMBER,
+  isSystem: DataTypes.NUMBER,
+  pid: DataTypes.NUMBER,
+  isDisabled: DataTypes.NUMBER,
+  isPinned: DataTypes.NUMBER,
+  log_path: DataTypes.STRING,
+  labels: DataTypes.JSON,
+  last_running_time: DataTypes.NUMBER,
+  last_execution_time: DataTypes.NUMBER,
+});

back/data/dependence.ts

@@ -0,0 +1,64 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
+export class Dependence {
+  timestamp?: string;
+  id?: number;
+  status?: DependenceStatus;
+  type?: DependenceTypes;
+  name?: number;
+  log?: string[];
+  remark?: string;
+
+  constructor(options: Dependence) {
+    this.id = options.id;
+    this.status = options.status || DependenceStatus.installing;
+    this.type = options.type || DependenceTypes.nodejs;
+    this.timestamp = new Date().toString();
+    this.name = options.name;
+    this.log = options.log || [];
+    this.remark = options.remark || '';
+  }
+}
+
+export enum DependenceStatus {
+  'installing',
+  'installed',
+  'installFailed',
+  'removing',
+  'removed',
+  'removeFailed',
+}
+
+export enum DependenceTypes {
+  'nodejs',
+  'python3',
+  'linux',
+}
+
+export enum InstallDependenceCommandTypes {
+  'npm i -g --force',
+  'pip3 install',
+  'apk add --no-cache -f',
+}
+
+export enum unInstallDependenceCommandTypes {
+  'npm uninstall -g --force',
+  'pip3 uninstall -y',
+  'apk del -f',
+}
+
+interface DependenceInstance
+  extends Model<Dependence, Dependence>,
+    Dependence {}
+export const DependenceModel = sequelize.define<DependenceInstance>(
+  'Dependence',
+  {
+    name: DataTypes.STRING,
+    type: DataTypes.NUMBER,
+    timestamp: DataTypes.STRING,
+    status: DataTypes.NUMBER,
+    log: DataTypes.JSON,
+    remark: DataTypes.STRING,
+  },
+);

back/data/env.ts

@@ -1,17 +1,18 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
 export class Env {
   value?: string;
   timestamp?: string;
-  created?: number;
-  _id?: string;
+  id?: number;
   status?: EnvStatus;
   position?: number;
-  name?: number;
-  remarks?: number;
+  name?: string;
+  remarks?: string;
 
   constructor(options: Env) {
     this.value = options.value;
-    this._id = options._id;
-    this.created = options.created || new Date().valueOf();
+    this.id = options.id;
     this.status = options.status || EnvStatus.normal;
     this.timestamp = new Date().toString();
     this.position = options.position;
@@ -26,3 +27,13 @@ export enum EnvStatus {
 }
 
 export const initEnvPosition = 9999999999;
+
+interface EnvInstance extends Model<Env, Env>, Env {}
+export const EnvModel = sequelize.define<EnvInstance>('Env', {
+  value: { type: DataTypes.STRING, unique: 'compositeIndex' },
+  timestamp: DataTypes.STRING,
+  status: DataTypes.NUMBER,
+  position: DataTypes.NUMBER,
+  name: { type: DataTypes.STRING, unique: 'compositeIndex' },
+  remarks: DataTypes.STRING,
+});

back/data/index.ts

@@ -0,0 +1,15 @@
+import { Sequelize } from 'sequelize';
+import config from '../config/index';
+
+export const sequelize = new Sequelize({
+  dialect: 'sqlite',
+  storage: `${config.dbPath}database.sqlite`,
+  logging: false,
+  pool: {
+    max: 6,
+    min: 0,
+    idle: 30000,
+  },
+});
+
+export type ResponseType<T> = { code: number; data?: T; message?: string };

back/data/notify.ts

@@ -0,0 +1,96 @@
+export enum NotificationMode {
+  'gotify' = 'gotify',
+  'goCqHttpBot' = 'goCqHttpBot',
+  'serverChan' = 'serverChan',
+  'pushDeer' = 'pushDeer',
+  'bark' = 'bark',
+  'telegramBot' = 'telegramBot',
+  'dingtalkBot' = 'dingtalkBot',
+  'weWorkBot' = 'weWorkBot',
+  'weWorkApp' = 'weWorkApp',
+  'iGot' = 'iGot',
+  'pushPlus' = 'pushPlus',
+  'email' = 'email',
+}
+
+abstract class NotificationBaseInfo {
+  public type!: NotificationMode;
+}
+
+export class GotifyNotification extends NotificationBaseInfo {
+  public gotifyUrl = '';
+  public gotifyToken = '';
+  public gotifyPriority = 0;
+}
+
+export class GoCqHttpBotNotification extends NotificationBaseInfo {
+  public goCqHttpBotUrl = '';
+  public goCqHttpBotToken = '';
+  public goCqHttpBotQq = '';
+}
+
+export class ServerChanNotification extends NotificationBaseInfo {
+  public serverChanKey = '';
+}
+
+export class PushDeerNotification extends NotificationBaseInfo {
+  public pushDeerKey = '';
+}
+
+export class BarkNotification extends NotificationBaseInfo {
+  public barkPush = '';
+  public barkIcon = 'https://qn.whyour.cn/logo.png';
+  public barkSound = '';
+  public barkGroup = 'qinglong';
+}
+
+export class TelegramBotNotification extends NotificationBaseInfo {
+  public telegramBotToken = '';
+  public telegramBotUserId = '';
+  public telegramBotProxyHost = '';
+  public telegramBotProxyPort = '';
+  public telegramBotProxyAuth = '';
+  public telegramBotApiHost = 'api.telegram.org';
+}
+
+export class DingtalkBotNotification extends NotificationBaseInfo {
+  public dingtalkBotToken = '';
+  public dingtalkBotSecret = '';
+}
+
+export class WeWorkBotNotification extends NotificationBaseInfo {
+  public weWorkBotKey = '';
+}
+
+export class WeWorkAppNotification extends NotificationBaseInfo {
+  public weWorkAppKey = '';
+}
+
+export class IGotNotification extends NotificationBaseInfo {
+  public iGotPushKey = '';
+}
+
+export class PushPlusNotification extends NotificationBaseInfo {
+  public pushPlusToken = '';
+  public pushPlusUser = '';
+}
+
+export class EmailNotification extends NotificationBaseInfo {
+  public emailService: string = '';
+  public emailUser: string = '';
+  public emailPass: string = '';
+}
+
+export interface NotificationInfo
+  extends GoCqHttpBotNotification,
+    GotifyNotification,
+    ServerChanNotification,
+    PushDeerNotification,
+    BarkNotification,
+    TelegramBotNotification,
+    DingtalkBotNotification,
+    WeWorkBotNotification,
+    WeWorkAppNotification,
+    IGotNotification,
+    PushPlusNotification,
+    EmailNotification {}

back/data/open.ts

@@ -0,0 +1,43 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
+export class App {
+  name: string;
+  scopes: AppScope[];
+  client_id: string;
+  client_secret: string;
+  tokens?: AppToken[];
+  id?: number;
+
+  constructor(options: App) {
+    this.name = options.name;
+    this.scopes = options.scopes;
+    this.client_id = options.client_id;
+    this.client_secret = options.client_secret;
+    this.id = options.id;
+  }
+}
+
+export interface AppToken {
+  value: string;
+  type?: 'Bearer';
+  expiration: number;
+}
+
+export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs';
+
+export enum CrontabStatus {
+  'running',
+  'idle',
+  'disabled',
+  'queued',
+}
+
+interface AppInstance extends Model<App, App>, App {}
+export const AppModel = sequelize.define<AppInstance>('App', {
+  name: { type: DataTypes.STRING, unique: 'name' },
+  scopes: DataTypes.JSON,
+  client_id: DataTypes.STRING,
+  client_secret: DataTypes.STRING,
+  tokens: DataTypes.JSON,
+});

back/data/sock.ts

@@ -0,0 +1,17 @@
+export class SockMessage {
+  message?: string;
+  type?: SockMessageType;
+  references?: number[];
+
+  constructor(options: SockMessage) {
+    this.type = options.type;
+    this.message = options.message;
+    this.references = options.references;
+  }
+}
+
+export type SockMessageType =
+  | 'ping'
+  | 'installDependence'
+  | 'updateSystemVersion'
+  | 'manuallyRunScript';

back/index.d.ts

@@ -0,0 +1,5 @@
+declare namespace Express {
+  interface Request {
+    platform: 'desktop' | 'mobile';
+  }
+}

back/loaders/app.ts

@@ -2,10 +2,10 @@ import expressLoader from './express';
 import dependencyInjectorLoader from './dependencyInjector';
 import Logger from './logger';
 import initData from './initData';
+import { Application } from 'express';
+import linkDeps from './deps';
 
-export default async ({ expressApp }: { expressApp: any }) => {
-  Logger.info('✌️ DB loaded and connected!');
-
+export default async ({ expressApp }: { expressApp: Application }) => {
   await dependencyInjectorLoader({
     models: [],
   });
@@ -16,4 +16,7 @@ export default async ({ expressApp }: { expressApp: any }) => {
 
   await initData();
   Logger.info('✌️ init data loaded');
+
+  await linkDeps();
+  Logger.info('✌️ link deps');
 };

back/loaders/db.ts

@@ -0,0 +1,106 @@
+import Logger from './logger';
+import path from 'path';
+import DataStore from 'nedb';
+import { EnvModel } from '../data/env';
+import { CrontabModel } from '../data/cron';
+import { DependenceModel } from '../data/dependence';
+import { AppModel } from '../data/open';
+import { AuthModel } from '../data/auth';
+import { sequelize } from '../data';
+import { fileExist } from '../config/util';
+import config from '../config';
+
+export default async () => {
+  try {
+    await CrontabModel.sync();
+    await DependenceModel.sync();
+    await AppModel.sync();
+    await AuthModel.sync();
+    await EnvModel.sync();
+    await sequelize.sync();
+
+    // try {
+    //   const queryInterface = sequelize.getQueryInterface();
+    //   await queryInterface.addIndex('Crontabs', ['command'], { unique: true });
+    //   await queryInterface.addIndex('Envs', ['name', 'value'], { unique: true });
+    //   await queryInterface.addIndex('Apps', ['name'], { unique: true });
+    // } catch (error) { }
+
+    // 2.10-2.11 升级
+    const cronDbFile = path.join(config.rootPath, 'db/crontab.db');
+    const envDbFile = path.join(config.rootPath, 'db/env.db');
+    const appDbFile = path.join(config.rootPath, 'db/app.db');
+    const authDbFile = path.join(config.rootPath, 'db/auth.db');
+    const dependenceDbFile = path.join(config.rootPath, 'db/dependence.db');
+    const crondbExist = await fileExist(cronDbFile);
+    const dependenceDbExist = await fileExist(dependenceDbFile);
+    const envDbExist = await fileExist(envDbFile);
+    const appDbExist = await fileExist(appDbFile);
+    const authDbExist = await fileExist(authDbFile);
+
+    const cronCount = await CrontabModel.count();
+    const dependenceCount = await DependenceModel.count();
+    const envCount = await EnvModel.count();
+    const appCount = await AppModel.count();
+    const authCount = await AuthModel.count();
+    if (crondbExist && cronCount === 0) {
+      const cronDb = new DataStore({
+        filename: cronDbFile,
+        autoload: true,
+      });
+      cronDb.persistence.compactDatafile();
+      cronDb.find({}).exec(async (err, docs) => {
+        await CrontabModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    if (dependenceDbExist && dependenceCount === 0) {
+      const dependenceDb = new DataStore({
+        filename: dependenceDbFile,
+        autoload: true,
+      });
+      dependenceDb.persistence.compactDatafile();
+      dependenceDb.find({}).exec(async (err, docs) => {
+        await DependenceModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    if (envDbExist && envCount === 0) {
+      const envDb = new DataStore({
+        filename: envDbFile,
+        autoload: true,
+      });
+      envDb.persistence.compactDatafile();
+      envDb.find({}).exec(async (err, docs) => {
+        await EnvModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    if (appDbExist && appCount === 0) {
+      const appDb = new DataStore({
+        filename: appDbFile,
+        autoload: true,
+      });
+      appDb.persistence.compactDatafile();
+      appDb.find({}).exec(async (err, docs) => {
+        await AppModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    if (authDbExist && authCount === 0) {
+      const authDb = new DataStore({
+        filename: authDbFile,
+        autoload: true,
+      });
+      authDb.persistence.compactDatafile();
+      authDb.find({}).exec(async (err, docs) => {
+        await AuthModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    Logger.info('✌️ DB loaded');
+  } catch (error) {
+    Logger.info('✌️ DB load failed');
+    Logger.info(error);
+  }
+};

back/loaders/deps.ts

@@ -0,0 +1,31 @@
+import path from 'path';
+import fs from 'fs';
+import chokidar from 'chokidar';
+import config from '../config/index';
+
+function linkToNodeModule(src: string, dst?: string) {
+  const target = path.join(config.rootPath, 'node_modules', dst || src);
+  const source = path.join(config.rootPath, src);
+
+  fs.lstat(target, (err, stat) => {
+    if (!stat) {
+      fs.symlink(source, target, 'dir', (err) => {
+        if (err) throw err;
+      });
+    }
+  });
+}
+
+export default async (src: string = 'deps') => {
+  linkToNodeModule(src);
+
+  const source = path.join(config.rootPath, src);
+  const watcher = chokidar.watch(source, {
+    ignored: /(^|[\/\\])\../, // ignore dotfiles
+    persistent: true,
+  });
+
+  watcher
+    .on('add', (path) => linkToNodeModule(src))
+    .on('change', (path) => linkToNodeModule(src));
+};

back/loaders/express.ts

@@ -5,42 +5,126 @@ import routes from '../api';
 import config from '../config';
 import jwt from 'express-jwt';
 import fs from 'fs';
-import { getToken } from '../config/util';
+import { getPlatform, getToken } from '../config/util';
+import Container from 'typedi';
+import OpenService from '../services/open';
+import rewrite from 'express-urlrewrite';
+import UserService from '../services/user';
+import handler from 'serve-handler';
+import * as Sentry from '@sentry/node';
+import { EnvModel } from '../data/env';
 
 export default ({ app }: { app: Application }) => {
   app.enable('trust proxy');
   app.use(cors());
 
+  app.use((req, res, next) => {
+    if (req.path.startsWith('/api') || req.path.startsWith('/open')) {
+      next();
+    } else {
+      return handler(req, res, {
+        public: 'static/dist',
+        rewrites: [{ source: '**', destination: '/index.html' }],
+      });
+    }
+  });
   app.use(bodyParser.json({ limit: '50mb' }));
   app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
+
   app.use(
-    jwt({ secret: config.secret as string, algorithms: ['HS384'] }).unless({
-      path: ['/api/login', '/api/crons/status'],
+    jwt({
+      secret: config.secret as string,
+      algorithms: ['HS384'],
+    }).unless({
+      path: [...config.apiWhiteList, /^\/open\//],
     }),
   );
-  app.use((req, res, next) => {
-    const data = fs.readFileSync(config.authConfigFile, 'utf8');
+
+  app.use((req: Request, res, next) => {
+    if (!req.headers) {
+      req.platform = 'desktop';
+    } else {
+      const platform = getPlatform(req.headers['user-agent'] || '');
+      req.platform = platform;
+    }
+    return next();
+  });
+
+  app.use(async (req, res, next) => {
     const headerToken = getToken(req);
-    if (data) {
-      const { token } = JSON.parse(data);
-      if (token && headerToken === token) {
+    if (req.path.startsWith('/open/')) {
+      const openService = Container.get(OpenService);
+      const doc = await openService.findTokenByValue(headerToken);
+      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]+)\/*/);
+        const key = keyMatch && keyMatch[1];
+        if (
+          doc.scopes.includes(key as any) &&
+          currentToken &&
+          currentToken.expiration >= Math.round(Date.now() / 1000)
+        ) {
           return next();
         }
       }
-    if (!headerToken && req.path && req.path === '/api/login') {
+    }
+
+    const originPath = `${req.baseUrl}${req.path === '/' ? '' : req.path}`;
+    if (
+      !headerToken &&
+      originPath &&
+      config.apiWhiteList.includes(originPath) &&
+      originPath !== '/api/crons/status'
+    ) {
       return next();
     }
     const remoteAddress = req.socket.remoteAddress;
     if (
       remoteAddress === '::ffff:127.0.0.1' &&
-      req.path === '/api/crons/status'
+      originPath === '/api/crons/status'
     ) {
       return next();
     }
+
+    const data = fs.readFileSync(config.authConfigFile, 'utf8');
+    if (data) {
+      const { token = '', tokens = {} } = JSON.parse(data);
+      if (headerToken === token || tokens[req.platform] === headerToken) {
+        return next();
+      }
+    }
+
     const err: any = new Error('UnauthorizedError');
-    err['status'] = 401;
+    err.status = 401;
     next(err);
   });
+
+  app.use(async (req, res, next) => {
+    if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
+      return next();
+    }
+    const userService = Container.get(UserService);
+    const authInfo = await userService.getUserInfo();
+    const envCount = await EnvModel.count();
+
+    let isInitialized = true;
+    if (
+      Object.keys(authInfo).length === 2 &&
+      authInfo.username === 'admin' &&
+      authInfo.password === 'admin' &&
+      envCount === 0
+    ) {
+      isInitialized = false;
+    }
+
+    if (isInitialized) {
+      return res.send({ code: 450, message: '未知错误' });
+    } else {
+      return next();
+    }
+  });
+
+  app.use(rewrite('/open/*', '/api/$1'));
   app.use(config.api.prefix, routes());
 
   app.use((req, res, next) => {
@@ -49,6 +133,8 @@ export default ({ app }: { app: Application }) => {
     next(err);
   });
 
+  app.use(Sentry.Handlers.errorHandler());
+
   app.use(
     (
       err: Error & { status: number },
@@ -73,6 +159,8 @@ 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

@@ -1,64 +1,54 @@
+import DependenceService from '../services/dependence';
 import { exec } from 'child_process';
 import { Container } from 'typedi';
-import { Crontab, CrontabStatus } from '../data/cron';
+import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import CronService from '../services/cron';
 import EnvService from '../services/env';
-
-const initData = [
-  {
-    name: '更新面板',
-    command: `ql update`,
-    schedule: `${randomSchedule(60, 1)} ${randomSchedule(
-      6,
-      1,
-    ).toString()} * * *`,
-    isDisabled: 1,
-  },
-  {
-    name: '删除日志',
-    command: 'ql rmlog 7',
-    schedule: '30 7 */7 * *',
-    isDisabled: 1,
-  },
-];
+import _ from 'lodash';
+import { DependenceModel } from '../data/dependence';
+import { Op } from 'sequelize';
+import SystemService from '../services/system';
+import ScheduleService from '../services/schedule';
+import config from '../config';
 
 export default async () => {
   const cronService = Container.get(CronService);
   const envService = Container.get(EnvService);
-  const cronDb = cronService.getDb();
-
-  cronDb.count({}, async (err, count) => {
-    if (count === 0) {
-      const data = initData.map((x: any) => {
-        const tab = new Crontab(x);
-        tab.created = new Date().valueOf();
-        tab.saved = false;
-        if (tab.name === '更新面板') {
-          tab.isSystem = 1;
-        } else {
-          tab.isSystem = 0;
-        }
-        return tab;
-      });
-      cronDb.insert(data);
-      await cronService.autosave_crontab();
-    }
-  });
+  const dependenceService = Container.get(DependenceService);
+  const systemService = Container.get(SystemService);
+  const scheduleService = Container.get(ScheduleService);
 
   // 初始化更新所有任务状态为空闲
-  cronDb.update(
-    { status: { $in: [CrontabStatus.running, CrontabStatus.queued] } },
-    { $set: { status: CrontabStatus.idle } },
-    { multi: true },
+  await CrontabModel.update(
+    { status: CrontabStatus.idle },
+    { where: { status: [CrontabStatus.running, CrontabStatus.queued] } },
   );
 
+  // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
+  DependenceModel.findAll({ where: {} }).then(async (docs) => {
+    const groups = _.groupBy(docs, 'type');
+    for (const key in groups) {
+      if (Object.prototype.hasOwnProperty.call(groups, key)) {
+        const group = groups[key];
+        const depIds = group.map((x) => x.id);
+        for (const dep of depIds) {
+          if (dep) {
+            await dependenceService.reInstall([dep]);
+          }
+        }
+      }
+    }
+  });
+
   // 初始化时执行一次所有的ql repo 任务
-  cronDb
-    .find({
-      command: /ql (repo|raw)/,
-      isDisabled: { $ne: 1 },
-    })
-    .exec((err, docs) => {
+  CrontabModel.findAll({
+    where: {
+      isDisabled: { [Op.ne]: 1 },
+      command: {
+        [Op.or]: [{ [Op.like]: `%ql repo%` }, { [Op.like]: `%ql raw%` }],
+      },
+    },
+  }).then((docs) => {
     for (let i = 0; i < docs.length; i++) {
       const doc = docs[i];
       if (doc) {
@@ -67,32 +57,86 @@ export default async () => {
     }
   });
 
-  // patch 禁用状态字段改变
-  cronDb
-    .find({
-      status: CrontabStatus.disabled,
-    })
-    .exec((err, docs) => {
-      if (docs.length > 0) {
-        const ids = docs.map((x) => x._id);
-        cronDb.update(
-          { _id: { $in: ids } },
-          { $set: { status: CrontabStatus.idle, isDisabled: 1 } },
-          { multi: true },
-          (err) => {
-            cronService.autosave_crontab();
+  // 更新2.11.3以前的脚本路径
+  CrontabModel.findAll({
+    where: {
+      command: {
+        [Op.or]: [
+          { [Op.like]: `%\/${config.rootPath}\/scripts\/%` },
+          { [Op.like]: `%\/${config.rootPath}\/config\/%` },
+          { [Op.like]: `%\/${config.rootPath}\/log\/%` },
+          { [Op.like]: `%\/${config.rootPath}\/db\/%` },
+        ],
       },
+    },
+  }).then(async (docs) => {
+    for (let i = 0; i < docs.length; i++) {
+      const doc = docs[i];
+      if (doc) {
+        if (doc.command.includes(`${config.rootPath}/scripts/`)) {
+          await CrontabModel.update(
+            { command: doc.command.replace(`${config.rootPath}/scripts/`, '') },
+            { where: { id: doc.id } },
           );
         }
+        if (doc.command.includes(`${config.rootPath}/log/`)) {
+          await CrontabModel.update(
+            {
+              command: `${config.rootPath}/data/log/${doc.command.replace(
+                `${config.rootPath}/log/`,
+                '',
+              )}`,
+            },
+            { where: { id: doc.id } },
+          );
+        }
+        if (doc.command.includes(`${config.rootPath}/config/`)) {
+          await CrontabModel.update(
+            {
+              command: `${config.rootPath}/data/config/${doc.command.replace(
+                `${config.rootPath}/config/`,
+                '',
+              )}`,
+            },
+            { where: { id: doc.id } },
+          );
+        }
+        if (doc.command.includes(`${config.rootPath}/db/`)) {
+          await CrontabModel.update(
+            {
+              command: `${config.rootPath}/data/db/${doc.command.replace(
+                `${config.rootPath}/db/`,
+                '',
+              )}`,
+            },
+            { where: { id: doc.id } },
+          );
+        }
+      }
+    }
   });
 
   // 初始化保存一次ck和定时任务数据
   await cronService.autosave_crontab();
   await envService.set_envs();
+
+  // 运行删除日志任务
+  const data = await systemService.getLogRemoveFrequency();
+  if (data && data.info && data.info.frequency) {
+    const cron = {
+      id: data.id,
+      name: '删除日志',
+      command: `ql rmlog ${data.info.frequency}`,
+    };
+    await scheduleService.createIntervalTask(cron, {
+      days: data.info.frequency,
+      runImmediately: true,
+    });
+  }
 };
 
 function randomSchedule(from: number, to: number) {
-  const result = [];
+  const result: any[] = [];
   const arr = [...Array(from).keys()];
   let count = arr.length;
   for (let i = 0; i < to; i++) {

back/loaders/initFile.ts

@@ -0,0 +1,48 @@
+import fs from 'fs';
+import path from 'path';
+import dotenv from 'dotenv';
+import Logger from './logger';
+import { fileExist } from '../config/util';
+
+const rootPath = process.cwd();
+const dataPath = path.join(rootPath, 'data/');
+const configPath = path.join(dataPath, 'config/');
+const scriptPath = path.join(dataPath, 'scripts/');
+const logPath = path.join(dataPath, 'log/');
+const samplePath = path.join(rootPath, 'sample/');
+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');
+
+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);
+
+  if (!configDirExist) {
+    fs.mkdirSync(configPath);
+  }
+
+  if (!authFileExist) {
+    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
+  }
+
+  if (!confFileExist) {
+    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
+  }
+
+  if (!scriptDirExist) {
+    fs.mkdirSync(scriptPath);
+  }
+
+  if (!logDirExist) {
+    fs.mkdirSync(logPath);
+  }
+
+  dotenv.config({ path: confFile });
+
+  Logger.info('✌️ Init file down');
+};

back/loaders/sentry.ts

@@ -0,0 +1,21 @@
+import { Application } from 'express';
+import * as Sentry from '@sentry/node';
+import * as Tracing from '@sentry/tracing';
+import Logger from './logger';
+
+export default ({ expressApp }: { expressApp: Application }) => {
+  Sentry.init({
+    dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
+    integrations: [
+      new Sentry.Integrations.Http({ tracing: true }),
+      new Tracing.Integrations.Express({ app: expressApp }),
+    ],
+
+    tracesSampleRate: 1.0,
+  });
+
+  expressApp.use(Sentry.Handlers.requestHandler());
+  expressApp.use(Sentry.Handlers.tracingHandler());
+
+  Logger.info('✌️ Sentry loaded');
+};

back/loaders/server.ts

@@ -0,0 +1,16 @@
+import { Server } from 'http';
+import Logger from './logger';
+import Sock from './sock';
+
+export default async ({ server }: { server: Server }) => {
+  await Sock({ server });
+  Logger.info('✌️ Sock loaded');
+
+  process.on('SIGINT', () => {
+    Logger.info('✌️ Server need close');
+    server.close(() => {
+      Logger.info('✌️ Server closed');
+      process.exit(0);
+    });
+  });
+};

back/loaders/sock.ts

@@ -0,0 +1,46 @@
+import sockJs from 'sockjs';
+import { Server } from 'http';
+import Logger from './logger';
+import { Container } from 'typedi';
+import SockService from '../services/sock';
+import config from '../config/index';
+import fs from 'fs';
+import { getPlatform } from '../config/util';
+
+export default async ({ server }: { server: Server }) => {
+  const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
+  const sockService = Container.get(SockService);
+
+  echo.on('connection', (conn) => {
+    if (!conn.headers || !conn.url || !conn.pathname) {
+      conn.close('404');
+    }
+
+    const data = fs.readFileSync(config.authConfigFile, 'utf8');
+    const platform = getPlatform(conn.headers['user-agent'] || '') || 'desktop';
+    const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
+    if (data) {
+      const { token = '', tokens = {} } = JSON.parse(data);
+      if (headerToken === token || tokens[platform] === headerToken) {
+        conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
+        sockService.addClient(conn);
+
+        conn.on('data', (message) => {
+          conn.write(message);
+        });
+
+        conn.on('close', function () {
+          sockService.removeClient(conn);
+        });
+
+        return;
+      } else {
+        conn.write(JSON.stringify({ type: 'ping', message: 'whyour' }));
+      }
+    }
+
+    conn.close('404');
+  });
+
+  echo.installHandlers(server);
+};

back/public.ts

@@ -0,0 +1,34 @@
+import express from 'express';
+import { exec } from 'child_process';
+import Logger from './loaders/logger';
+import config from './config';
+
+const app = express();
+
+app.get('/api/public/panel/log', (req, res) => {
+  exec(
+    'pm2 logs panel --lines 500 --nostream --timestamp',
+    (err, stdout, stderr) => {
+      if (err || stderr) {
+        return res.send({ code: 400, data: err || stderr });
+      }
+      return res.send({ code: 200, data: stdout });
+    },
+  );
+});
+
+app
+  .listen(config.publicPort, async () => {
+    await require('./loaders/sentry').default({ expressApp: app });
+    await require('./loaders/db').default();
+
+    Logger.info(`
+      ################################################
+      🛡️  Public listening on port: ${config.publicPort} 🛡️
+      ################################################
+    `);
+  })
+  .on('error', (err) => {
+    Logger.error(err);
+    process.exit(1);
+  });

back/schedule.ts

@@ -2,30 +2,18 @@ import schedule from 'node-schedule';
 import express from 'express';
 import { exec } from 'child_process';
 import Logger from './loaders/logger';
-import { Container } from 'typedi';
-import CronService from './services/cron';
-import { CrontabStatus } from './data/cron';
+import { CrontabModel, CrontabStatus } from './data/cron';
 import config from './config';
 
 const app = express();
 
 const run = async () => {
-  const cronService = Container.get(CronService);
-  const cronDb = cronService.getDb();
-
-  cronDb
-    .find({})
-    .sort({ created: 1 })
-    .exec((err, docs) => {
-      if (err) {
-        Logger.error(err);
-        process.exit(1);
-      }
-
+  CrontabModel.findAll({ where: {} })
+    .then((docs) => {
       if (docs && docs.length > 0) {
         for (let i = 0; i < docs.length; i++) {
           const task = docs[i];
-          const _schedule = task.schedule && task.schedule.split(' ');
+          const _schedule = task.schedule && task.schedule.split(/ +/);
           if (
             _schedule &&
             _schedule.length > 5 &&
@@ -42,12 +30,19 @@ const run = async () => {
           }
         }
       }
+    })
+    .catch((err) => {
+      Logger.error(err);
+      process.exit(1);
     });
 };
 
 app
-  .listen(config.cronPort, () => {
-    run();
+  .listen(config.cronPort, async () => {
+    await require('./loaders/sentry').default({ expressApp: app });
+    await require('./loaders/db').default();
+
+    await run();
     Logger.info(`
       ################################################
       🛡️  Schedule listening on port: ${config.cronPort} 🛡️

back/services/cron.ts

@@ -1,37 +1,22 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import DataStore from 'nedb';
 import config from '../config';
-import { Crontab, CrontabStatus } from '../data/cron';
+import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import { exec, execSync, spawn } from 'child_process';
 import fs from 'fs';
 import cron_parser from 'cron-parser';
-import { getFileContentByName } from '../config/util';
-import PQueue from 'p-queue';
+import { getFileContentByName, concurrentRun, fileExist } from '../config/util';
 import { promises, existsSync } from 'fs';
 import { promisify } from 'util';
+import { Op } from 'sequelize';
 
 @Service()
 export default class CronService {
-  private cronDb = new DataStore({ filename: config.cronDbFile });
-
-  private queue = new PQueue({
-    concurrency: parseInt(process.env.MaxConcurrentNum) || 5,
-  });
-
-  constructor(@Inject('logger') private logger: winston.Logger) {
-    this.cronDb.loadDatabase((err) => {
-      if (err) throw err;
-    });
-  }
-
-  public getDb(): DataStore {
-    return this.cronDb;
-  }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   private isSixCron(cron: Crontab) {
     const { schedule } = cron;
-    if (schedule.split(' ').length === 6) {
+    if (schedule.split(/ +/).length === 6) {
       return true;
     }
     return false;
@@ -39,7 +24,6 @@ export default class CronService {
 
   public async create(payload: Crontab): Promise<Crontab> {
     const tab = new Crontab(payload);
-    tab.created = new Date().valueOf();
     tab.saved = false;
     const doc = await this.insert(tab);
     await this.set_crontab(this.isSixCron(doc));
@@ -47,42 +31,19 @@ export default class CronService {
   }
 
   public async insert(payload: Crontab): Promise<Crontab> {
-    return new Promise((resolve) => {
-      this.cronDb.insert(payload, (err, docs) => {
-        if (err) {
-          this.logger.error(err);
-        } else {
-          resolve(docs);
-        }
-      });
-    });
+    return await CrontabModel.create(payload, { returning: true });
   }
 
   public async update(payload: Crontab): Promise<Crontab> {
-    const { _id, ...other } = payload;
-    const doc = await this.get(_id);
-    const tab = new Crontab({ ...doc, ...other });
-    tab.saved = false;
-    const newDoc = await this.updateDb(tab);
+    payload.saved = false;
+    const newDoc = await this.updateDb(payload);
     await this.set_crontab(this.isSixCron(newDoc));
     return newDoc;
   }
 
   public async updateDb(payload: Crontab): Promise<Crontab> {
-    return new Promise((resolve) => {
-      this.cronDb.update(
-        { _id: payload._id },
-        payload,
-        { returnUpdatedDocs: true },
-        (err, num, docs: any) => {
-          if (err) {
-            this.logger.error(err);
-          } else {
-            resolve(docs);
-          }
-        },
-      );
-    });
+    await CrontabModel.update(payload, { where: { id: payload.id } });
+    return await this.getDb({ id: payload.id });
   }
 
   public async status({
@@ -90,37 +51,94 @@ export default class CronService {
     status,
     pid,
     log_path,
+    last_running_time = 0,
+    last_execution_time = 0,
   }: {
-    ids: string[];
+    ids: number[];
     status: CrontabStatus;
     pid: number;
     log_path: string;
+    last_running_time: number;
+    last_execution_time: number;
   }) {
-    this.cronDb.update(
-      { _id: { $in: ids } },
-      { $set: { status, pid, log_path } },
-    );
+    const options: any = {
+      status,
+      pid,
+      log_path,
+      last_execution_time,
+    };
+    if (last_running_time > 0) {
+      options.last_running_time = last_running_time;
     }
 
-  public async remove(ids: string[]) {
-    return new Promise((resolve: any) => {
-      this.cronDb.remove(
-        { _id: { $in: ids } },
-        { multi: true },
-        async (err) => {
+    return await CrontabModel.update({ ...options }, { where: { id: ids } });
+  }
+
+  public async remove(ids: number[]) {
+    await CrontabModel.destroy({ where: { id: ids } });
     await this.set_crontab(true);
-          resolve();
+  }
+
+  public async pin(ids: number[]) {
+    await CrontabModel.update({ isPinned: 1 }, { where: { id: ids } });
+  }
+
+  public async unPin(ids: number[]) {
+    await CrontabModel.update({ isPinned: 0 }, { where: { id: ids } });
+  }
+
+  public async addLabels(ids: string[], labels: string[]) {
+    const docs = await CrontabModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      await CrontabModel.update(
+        {
+          labels: Array.from(new Set((doc.labels || []).concat(labels))),
         },
+        { where: { id: doc.id } },
       );
-    });
+    }
+  }
+
+  public async removeLabels(ids: string[], labels: string[]) {
+    const docs = await CrontabModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      await CrontabModel.update(
+        {
+          labels: (doc.labels || []).filter((label) => !labels.includes(label)),
+        },
+        { where: { id: doc.id } },
+      );
+    }
   }
 
   public async crontabs(searchText?: string): Promise<Crontab[]> {
     let query = {};
     if (searchText) {
-      const reg = new RegExp(searchText, 'i');
+      const textArray = searchText.split(':');
+      switch (textArray[0]) {
+        case 'name':
+        case 'command':
+        case 'schedule':
+        case 'label':
+          const column = textArray[0] === 'label' ? 'labels' : textArray[0];
           query = {
-        $or: [
+            [column]: {
+              [Op.or]: [
+                { [Op.like]: `%${textArray[1]}%` },
+                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
+              ],
+            },
+          };
+          break;
+        default:
+          const reg = {
+            [Op.or]: [
+              { [Op.like]: `%${searchText}%` },
+              { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+            ],
+          };
+          query = {
+            [Op.or]: [
               {
                 name: reg,
               },
@@ -130,44 +148,43 @@ export default class CronService {
               {
                 schedule: reg,
               },
+              {
+                labels: reg,
+              },
             ],
           };
+          break;
       }
-    return new Promise((resolve) => {
-      this.cronDb
-        .find(query)
-        .sort({ created: -1 })
-        .exec((err, docs) => {
-          resolve(docs);
-        });
+    }
+    try {
+      const result = await CrontabModel.findAll({
+        where: query,
+        order: [['createdAt', 'DESC']],
       });
+      return result as any;
+    } catch (error) {
+      throw error;
+    }
   }
 
-  public async get(_id: string): Promise<Crontab> {
-    return new Promise((resolve) => {
-      this.cronDb.find({ _id }).exec((err, docs) => {
-        resolve(docs[0]);
-      });
-    });
+  public async getDb(query: any): Promise<Crontab> {
+    const doc: any = await CrontabModel.findOne({ where: { ...query } });
+    return doc && (doc.get({ plain: true }) as Crontab);
   }
 
-  public async run(ids: string[]) {
-    this.cronDb.update(
-      { _id: { $in: ids } },
-      { $set: { status: CrontabStatus.queued } },
-      { multi: true },
+  public async run(ids: number[]) {
+    await CrontabModel.update(
+      { status: CrontabStatus.queued },
+      { where: { id: ids } },
+    );
+    concurrentRun(
+      ids.map((id) => async () => await this.runSingle(id)),
+      10,
     );
-    for (let i = 0; i < ids.length; i++) {
-      const id = ids[i];
-      this.queue.add(() => this.runSingle(id));
-    }
   }
 
-  public async stop(ids: string[]) {
-    return new Promise((resolve: any) => {
-      this.cronDb
-        .find({ _id: { $in: ids } })
-        .exec(async (err, docs: Crontab[]) => {
+  public async stop(ids: number[]) {
+    const docs = await CrontabModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       if (doc.pid) {
         try {
@@ -177,39 +194,41 @@ export default class CronService {
         }
       }
       const err = await this.killTask(doc.command);
-            if (doc.log_path) {
+      const logFileExist = await fileExist(doc.log_path);
+      if (doc.log_path && logFileExist) {
         const str = err ? `\n${err}` : '';
         fs.appendFileSync(
           `${doc.log_path}`,
-                `${str}\n## 执行结束...  ${new Date().toLocaleString()} `,
+          `${str}\n## 执行结束...  ${new Date()
+            .toLocaleString('zh', { hour12: false })
+            .replace(' 24:', ' 00:')} `,
         );
       }
     }
-          this.cronDb.update(
-            { _id: { $in: ids } },
-            { $set: { status: CrontabStatus.idle }, $unset: { pid: true } },
-            { multi: true },
-          );
-          this.queue.clear();
-          resolve();
-        });
-    });
-  }
 
-  private async killTask(name: string) {
-    let taskCommond = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
+    await CrontabModel.update(
+      { status: CrontabStatus.idle, pid: undefined },
+      { where: { id: ids } },
+    );
+  }
+
+  public async killTask(name: string) {
+    let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
     const execAsync = promisify(exec);
     try {
-      let pid = (await execAsync(taskCommond)).stdout;
+      let pid = (await execAsync(taskCommand)).stdout;
       if (pid) {
         pid = (await execAsync(`pstree -p ${pid}`)).stdout;
       } else {
         return;
       }
-      const pids = pid.match(/\d+/g);
+      let pids = pid.match(/\(\d+/g);
       const killLogs = [];
+      if (pids && pids.length > 0) {
+        // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
         for (const id of pids) {
-        const c = `kill -9 ${id}`;
+          const c = `kill -9 ${id.slice(1)}`;
+          try {
             const { stdout, stderr } = await execAsync(c);
             if (stderr) {
               killLogs.push(stderr);
@@ -217,6 +236,10 @@ export default class CronService {
             if (stdout) {
               killLogs.push(stdout);
             }
+          } catch (error: any) {
+            killLogs.push(error.message);
+          }
+        }
       }
       return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
     } catch (e) {
@@ -224,18 +247,18 @@ export default class CronService {
     }
   }
 
-  private async runSingle(id: string): Promise<number> {
+  private async runSingle(cronId: number): Promise<number> {
     return new Promise(async (resolve: any) => {
-      const cron = await this.get(id);
+      const cron = await this.getDb({ id: cronId });
       if (cron.status !== CrontabStatus.queued) {
         resolve();
         return;
       }
 
-      let { _id, command } = cron;
+      let { id, command, log_path } = cron;
 
       this.logger.silly('Running job');
-      this.logger.silly('ID: ' + _id);
+      this.logger.silly('ID: ' + id);
       this.logger.silly('Original command: ' + command);
 
       let cmdStr = command;
@@ -246,55 +269,64 @@ export default class CronService {
         cmdStr = `${cmdStr} now`;
       }
 
-      const cp = spawn(cmdStr, { shell: '/bin/bash', detached: true });
-      this.cronDb.update(
-        { _id },
-        { $set: { status: CrontabStatus.running, pid: cp.pid } },
+      const cp = spawn(cmdStr, { shell: '/bin/bash' });
+
+      await CrontabModel.update(
+        { status: CrontabStatus.running, pid: cp.pid },
+        { where: { id } },
       );
-      cp.on('close', (code) => {
-        this.cronDb.update(
-          { _id },
-          { $set: { status: CrontabStatus.idle }, $unset: { pid: true } },
+      cp.stderr.on('data', (data) => {
+        if (log_path) {
+          fs.appendFileSync(`${log_path}`, `${data}`);
+        }
+      });
+      cp.on('error', (err) => {
+        if (log_path) {
+          fs.appendFileSync(`${log_path}`, `${JSON.stringify(err)}`);
+        }
+      });
+
+      cp.on('exit', async (code, signal) => {
+        this.logger.info(
+          `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
+        );
+        await CrontabModel.update(
+          { status: CrontabStatus.idle, pid: undefined },
+          { where: { id } },
+        );
+        resolve();
+      });
+      cp.on('close', async (code) => {
+        this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
+        await CrontabModel.update(
+          { status: CrontabStatus.idle, pid: undefined },
+          { where: { id } },
         );
         resolve();
       });
     });
   }
 
-  public async disabled(ids: string[]) {
-    return new Promise((resolve: any) => {
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        { $set: { isDisabled: 1 } },
-        { multi: true },
-        async (err) => {
+  public async disabled(ids: number[]) {
+    await CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
     await this.set_crontab(true);
-          resolve();
-        },
-      );
-    });
   }
 
-  public async enabled(ids: string[]) {
-    return new Promise((resolve: any) => {
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        { $set: { isDisabled: 0 } },
-        { multi: true },
-        async (err) => {
+  public async enabled(ids: number[]) {
+    await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
     await this.set_crontab(true);
-          resolve();
-        },
-      );
-    });
   }
 
-  public async log(_id: string) {
-    const doc = await this.get(_id);
+  public async log(id: number) {
+    const doc = await this.getDb({ id });
+    if (!doc) {
+      return '';
+    }
+
     if (doc.log_path) {
       return getFileContentByName(`${doc.log_path}`);
     }
-    const [, commandStr, url] = doc.command.split(' ');
+    const [, commandStr, url] = doc.command.split(/ +/);
     let logPath = this.getKey(commandStr);
     const isQlCommand = doc.command.startsWith('ql ');
     const key =
@@ -315,6 +347,39 @@ export default class CronService {
     }
   }
 
+  public async logs(id: number) {
+    const doc = await this.getDb({ id });
+    if (!doc) {
+      return [];
+    }
+
+    const [, commandStr, url] = doc.command.split(/ +/);
+    let logPath = this.getKey(commandStr);
+    const isQlCommand = doc.command.startsWith('ql ');
+    const key =
+      (url && ['repo', 'raw'].includes(commandStr) && this.getKey(url)) ||
+      logPath;
+    if (isQlCommand) {
+      logPath = 'update';
+    }
+    let logDir = `${config.logPath}${logPath}`;
+    if (existsSync(logDir)) {
+      let files = await promises.readdir(logDir);
+      if (isQlCommand) {
+        files = files.filter((x) => x.includes(key));
+      }
+      return files
+        .map((x) => ({
+          filename: x,
+          directory: logPath,
+          time: fs.statSync(`${logDir}/${x}`).mtime.getTime(),
+        }))
+        .sort((a, b) => b.time - a.time);
+    } else {
+      return [];
+    }
+  }
+
   private getKey(command: string) {
     const start =
       command.lastIndexOf('/') !== -1 ? command.lastIndexOf('/') + 1 : 0;
@@ -326,7 +391,7 @@ export default class CronService {
   }
 
   private make_command(tab: Crontab) {
-    const crontab_job_string = `ID=${tab._id} ${tab.command}`;
+    const crontab_job_string = `ID=${tab.id} ${tab.command}`;
     return crontab_job_string;
   }
 
@@ -334,7 +399,7 @@ export default class CronService {
     const tabs = await this.crontabs();
     var crontab_string = '';
     tabs.forEach((tab) => {
-      const _schedule = tab.schedule && tab.schedule.split(' ');
+      const _schedule = tab.schedule && tab.schedule.split(/ +/);
       if (tab.isDisabled === 1 || _schedule.length !== 5) {
         crontab_string += '# ';
         crontab_string += tab.schedule;
@@ -356,11 +421,7 @@ export default class CronService {
     if (needReloadSchedule) {
       exec(`pm2 reload schedule`);
     }
-    this.cronDb.update({}, { $set: { saved: true } }, { multi: true });
-  }
-
-  private reload_db() {
-    this.cronDb.loadDatabase();
+    await CrontabModel.update({ saved: true }, { where: {} });
   }
 
   public import_crontab() {
@@ -368,7 +429,7 @@ export default class CronService {
       var lines = stdout.split('\n');
       var namePrefix = new Date().getTime();
 
-      lines.reverse().forEach((line, index) => {
+      lines.reverse().forEach(async (line, index) => {
         line = line.replace(/\t+/g, ' ');
         var regex =
           /^((\@[a-zA-Z]+\s+)|(([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+))/;
@@ -382,18 +443,16 @@ export default class CronService {
         ) {
           var name = namePrefix + '_' + index;
 
-          this.cronDb.findOne({ command, schedule }, (err, doc) => {
-            if (err) {
-              throw err;
-            }
-            if (!doc) {
-              this.create({ name, command, schedule });
-            } else {
-              doc.command = command;
-              doc.schedule = schedule;
-              this.update(doc);
-            }
+          const _crontab = await CrontabModel.findOne({
+            where: { command, schedule },
           });
+          if (!_crontab) {
+            await this.create({ name, command, schedule });
+          } else {
+            _crontab.command = command;
+            _crontab.schedule = schedule;
+            await this.update(_crontab);
+          }
         }
       });
     });

back/services/dependence.ts

@@ -0,0 +1,230 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import config from '../config';
+import {
+  Dependence,
+  InstallDependenceCommandTypes,
+  DependenceStatus,
+  DependenceTypes,
+  unInstallDependenceCommandTypes,
+  DependenceModel,
+} from '../data/dependence';
+import _ from 'lodash';
+import { spawn } from 'child_process';
+import SockService from './sock';
+import { Op } from 'sequelize';
+
+@Service()
+export default class DependenceService {
+  constructor(
+    @Inject('logger') private logger: winston.Logger,
+    private sockService: SockService,
+  ) {}
+
+  public async create(payloads: Dependence[]): Promise<Dependence[]> {
+    const tabs = payloads.map((x) => {
+      const tab = new Dependence({ ...x, status: DependenceStatus.installing });
+      return tab;
+    });
+    const docs = await this.insert(tabs);
+    this.installOrUninstallDependencies(docs);
+    return docs;
+  }
+
+  public async insert(payloads: Dependence[]): Promise<Dependence[]> {
+    const docs = await DependenceModel.bulkCreate(payloads);
+    return docs;
+  }
+
+  public async update(
+    payload: Dependence & { id: string },
+  ): Promise<Dependence> {
+    const { id, ...other } = payload;
+    const doc = await this.getDb({ id });
+    const tab = new Dependence({
+      ...doc,
+      ...other,
+      status: DependenceStatus.installing,
+    });
+    const newDoc = await this.updateDb(tab);
+    this.installOrUninstallDependencies([newDoc]);
+    return newDoc;
+  }
+
+  private async updateDb(payload: Dependence): Promise<Dependence> {
+    await DependenceModel.update(payload, { where: { id: payload.id } });
+    return await this.getDb({ id: payload.id });
+  }
+
+  public async remove(ids: number[]) {
+    await DependenceModel.update(
+      { status: DependenceStatus.removing, log: [] },
+      { where: { id: ids } },
+    );
+    const docs = await DependenceModel.findAll({ where: { id: ids } });
+    this.installOrUninstallDependencies(docs, false);
+    return docs;
+  }
+
+  public async removeDb(ids: number[]) {
+    await DependenceModel.destroy({ where: { id: ids } });
+  }
+
+  public async dependencies(
+    { searchValue, type }: { searchValue: string; type: string },
+    sort: any = { position: -1 },
+    query: any = {},
+  ): Promise<Dependence[]> {
+    let condition = { ...query, type: DependenceTypes[type as any] };
+    if (searchValue) {
+      const encodeText = encodeURIComponent(searchValue);
+      const reg = {
+        [Op.or]: [
+          { [Op.like]: `%${searchValue}%` },
+          { [Op.like]: `%${encodeText}%` },
+        ],
+      };
+
+      condition = {
+        ...condition,
+        name: reg,
+      };
+    }
+    try {
+      const result = await this.find(condition);
+      return result as any;
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  public async reInstall(ids: number[]): Promise<Dependence[]> {
+    await DependenceModel.update(
+      { status: DependenceStatus.installing, log: [] },
+      { where: { id: ids } },
+    );
+
+    const docs = await DependenceModel.findAll({ where: { id: ids } });
+    await this.installOrUninstallDependencies(docs);
+    return docs;
+  }
+
+  private async find(query: any, sort?: any): Promise<Dependence[]> {
+    const docs = await DependenceModel.findAll({ where: { ...query } });
+    return docs;
+  }
+
+  public async getDb(query: any): Promise<Dependence> {
+    const doc: any = await DependenceModel.findOne({ where: { ...query } });
+    return doc && (doc.get({ plain: true }) as Dependence);
+  }
+
+  private async updateLog(ids: number[], log: string): Promise<void> {
+    const doc = await DependenceModel.findOne({ where: { id: ids } });
+    const newLog = doc?.log ? [...doc.log, log] : [log];
+    await DependenceModel.update({ log: newLog }, { where: { id: ids } });
+  }
+
+  public installOrUninstallDependencies(
+    dependencies: Dependence[],
+    isInstall: boolean = true,
+  ) {
+    return new Promise(async (resolve) => {
+      if (dependencies.length === 0) {
+        resolve(null);
+        return;
+      }
+      const depNames = dependencies.map((x) => x.name).join(' ');
+      const depRunCommand = (
+        isInstall
+          ? InstallDependenceCommandTypes
+          : unInstallDependenceCommandTypes
+      )[dependencies[0].type as any];
+      const actionText = isInstall ? '安装' : '删除';
+      const depIds = dependencies.map((x) => x.id) as number[];
+      const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
+      const startTime = Date.now();
+      this.sockService.sendMessage({
+        type: 'installDependence',
+        message: `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
+          startTime,
+        ).toLocaleString()}`,
+        references: depIds,
+      });
+      await this.updateLog(
+        depIds,
+        `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
+          startTime,
+        ).toLocaleString()}\n`,
+      );
+      cp.stdout.on('data', async (data) => {
+        this.sockService.sendMessage({
+          type: 'installDependence',
+          message: data.toString(),
+          references: depIds,
+        });
+        await this.updateLog(depIds, data.toString());
+      });
+
+      cp.stderr.on('data', async (data) => {
+        this.sockService.sendMessage({
+          type: 'installDependence',
+          message: data.toString(),
+          references: depIds,
+        });
+        await this.updateLog(depIds, data.toString());
+      });
+
+      cp.on('error', async (err) => {
+        this.sockService.sendMessage({
+          type: 'installDependence',
+          message: JSON.stringify(err),
+          references: depIds,
+        });
+        await this.updateLog(depIds, JSON.stringify(err));
+        resolve(null);
+      });
+
+      cp.on('close', async (code) => {
+        const endTime = Date.now();
+        const isSucceed = code === 0;
+        const resultText = isSucceed ? '成功' : '失败';
+
+        this.sockService.sendMessage({
+          type: 'installDependence',
+          message: `依赖${actionText}${resultText}，结束时间 ${new Date(
+            endTime,
+          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
+          references: depIds,
+        });
+        await this.updateLog(
+          depIds,
+          `依赖${actionText}${resultText}，结束时间 ${new Date(
+            endTime,
+          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
+        );
+
+        let status = null;
+        if (isSucceed) {
+          status = isInstall
+            ? DependenceStatus.installed
+            : DependenceStatus.removed;
+        } else {
+          status = isInstall
+            ? DependenceStatus.installFailed
+            : DependenceStatus.removeFailed;
+        }
+        await DependenceModel.update({ status }, { where: { id: depIds } });
+
+        // 如果删除依赖成功，3秒后删除数据库记录
+        if (isSucceed && !isInstall) {
+          setTimeout(() => {
+            this.removeDb(depIds);
+          }, 5000);
+        }
+
+        resolve(null);
+      });
+    });
+  }
+}

back/services/env.ts

@@ -3,84 +3,57 @@ import winston from 'winston';
 import { getFileContentByName } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
-import DataStore from 'nedb';
-import { Env, EnvStatus, initEnvPosition } from '../data/env';
+import { Env, EnvModel, EnvStatus, initEnvPosition } from '../data/env';
 import _ from 'lodash';
+import { Op } from 'sequelize';
 
 @Service()
 export default class EnvService {
-  private cronDb = new DataStore({ filename: config.envDbFile });
-  constructor(@Inject('logger') private logger: winston.Logger) {
-    this.cronDb.loadDatabase((err) => {
-      if (err) throw err;
-    });
-  }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  public async create(payload: Env): Promise<Env> {
+  public async create(payloads: Env[]): Promise<Env[]> {
     const envs = await this.envs();
     let position = initEnvPosition;
     if (envs && envs.length > 0 && envs[envs.length - 1].position) {
-      position = envs[envs.length - 1].position;
+      position = envs[envs.length - 1].position as number;
     }
-    const tab = new Env({ ...payload, position: position / 2 });
-    const doc = await this.insert(tab);
+    const tabs = payloads.map((x) => {
+      position = position / 2;
+      const tab = new Env({ ...x, position });
+      return tab;
+    });
+    const docs = await this.insert(tabs);
     await this.set_envs();
-    return doc;
+    return docs;
   }
 
-  public async insert(payload: Env): Promise<Env> {
-    return new Promise((resolve) => {
-      this.cronDb.insert(payload, (err, doc) => {
-        if (err) {
-          this.logger.error(err);
-        } else {
-          resolve(doc);
+  public async insert(payloads: Env[]): Promise<Env[]> {
+    const result = [];
+    for (const env of payloads) {
+      const doc = await EnvModel.create(env, { returning: true });
+      result.push(doc);
     }
-      });
-    });
+    return result;
   }
 
   public async update(payload: Env): Promise<Env> {
-    const { _id, ...other } = payload;
-    const doc = await this.get(_id);
-    const tab = new Env({ ...doc, ...other });
-    const newDoc = await this.updateDb(tab);
+    const newDoc = await this.updateDb(payload);
     await this.set_envs();
     return newDoc;
   }
 
   private async updateDb(payload: Env): Promise<Env> {
-    return new Promise((resolve) => {
-      this.cronDb.update(
-        { _id: payload._id },
-        payload,
-        { returnUpdatedDocs: true },
-        (err, num, doc) => {
-          if (err) {
-            this.logger.error(err);
-          } else {
-            resolve(doc as Env);
-          }
-        },
-      );
-    });
+    await EnvModel.update({ ...payload }, { where: { id: payload.id } });
+    return await this.getDb({ id: payload.id });
   }
 
   public async remove(ids: string[]) {
-    return new Promise((resolve: any) => {
-      this.cronDb.remove(
-        { _id: { $in: ids } },
-        { multi: true },
-        async (err) => {
+    await EnvModel.destroy({ where: { id: ids } });
     await this.set_envs();
-          resolve();
-        },
-      );
-    });
   }
 
   public async move(
-    _id: string,
+    id: number,
     {
       fromIndex,
       toIndex,
@@ -88,7 +61,7 @@ export default class EnvService {
       fromIndex: number;
       toIndex: number;
     },
-  ) {
+  ): Promise<Env> {
     let targetPosition: number;
     const isUpward = fromIndex > toIndex;
     const envs = await this.envs();
@@ -101,11 +74,11 @@ export default class EnvService {
         ? (envs[toIndex].position + envs[toIndex - 1].position) / 2
         : (envs[toIndex].position + envs[toIndex + 1].position) / 2;
     }
-    this.update({
-      _id,
+    const newDoc = await this.update({
+      id,
       position: targetPosition,
     });
-    await this.set_envs();
+    return newDoc;
   }
 
   public async envs(
@@ -115,114 +88,94 @@ export default class EnvService {
   ): Promise<Env[]> {
     let condition = { ...query };
     if (searchText) {
-      const reg = new RegExp(searchText);
+      const encodeText = encodeURIComponent(searchText);
+      const reg = {
+        [Op.or]: [
+          { [Op.like]: `%${searchText}%` },
+          { [Op.like]: `%${encodeText}%` },
+        ],
+      };
+
       condition = {
-        $or: [
-          {
-            value: reg,
-          },
+        ...condition,
+        [Op.or]: [
           {
             name: reg,
           },
+          {
+            value: reg,
+          },
           {
             remarks: reg,
           },
         ],
       };
     }
-    const newDocs = await this.find(condition, sort);
-    return newDocs;
+    try {
+      const result = await this.find(condition, [['position', 'DESC']]);
+      return result as any;
+    } catch (error) {
+      throw error;
+    }
   }
 
-  private async find(query: any, sort: any): Promise<Env[]> {
-    return new Promise((resolve) => {
-      this.cronDb
-        .find(query)
-        .sort({ ...sort })
-        .exec((err, docs) => {
-          resolve(docs);
-        });
+  private async find(query: any, sort: any = []): Promise<Env[]> {
+    const docs = await EnvModel.findAll({
+      where: { ...query },
+      order: [...sort],
     });
+    return docs;
   }
 
-  public async get(_id: string): Promise<Env> {
-    return new Promise((resolve) => {
-      this.cronDb.find({ _id }).exec((err, docs) => {
-        resolve(docs[0]);
-      });
-    });
-  }
-
-  public async getBySort(sort: any): Promise<Env> {
-    return new Promise((resolve) => {
-      this.cronDb
-        .find({})
-        .sort({ ...sort })
-        .limit(1)
-        .exec((err, docs) => {
-          resolve(docs[0]);
-        });
-    });
+  public async getDb(query: any): Promise<Env> {
+    const doc: any = await EnvModel.findOne({ where: { ...query } });
+    return doc && (doc.get({ plain: true }) as Env);
   }
 
   public async disabled(ids: string[]) {
-    return new Promise((resolve: any) => {
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        { $set: { status: EnvStatus.disabled } },
-        { multi: true },
-        async (err) => {
-          await this.set_envs();
-          resolve();
-        },
+    await EnvModel.update(
+      { status: EnvStatus.disabled },
+      { where: { id: ids } },
     );
-    });
+    await this.set_envs();
   }
 
   public async enabled(ids: string[]) {
-    return new Promise((resolve: any) => {
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        { $set: { status: EnvStatus.normal } },
-        { multi: true },
-        async (err, num) => {
+    await EnvModel.update({ status: EnvStatus.normal }, { where: { id: ids } });
     await this.set_envs();
-          resolve();
-        },
-      );
-    });
   }
 
   public async updateNames({ ids, name }: { ids: string[]; name: string }) {
-    return new Promise((resolve: any) => {
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        { $set: { name } },
-        { multi: true },
-        async (err, num) => {
+    await EnvModel.update({ name }, { where: { id: ids } });
     await this.set_envs();
-          resolve();
-        },
-      );
-    });
   }
 
   public async set_envs() {
     const envs = await this.envs(
       '',
       { position: -1 },
-      { name: { $exists: true } },
+      { name: { [Op.not]: null } },
     );
     const groups = _.groupBy(envs, 'name');
     let env_string = '';
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
         const group = groups[key];
-        env_string += `export ${key}="${_(group)
+
+        // 忽略不符合bash要求的环境变量名称
+        if (/^[a-zA-Z_][0-9a-zA-Z_]+$/.test(key)) {
+          let value = _(group)
             .filter((x) => x.status !== EnvStatus.disabled)
             .map('value')
             .join('&')
-          .replace(/ /g, '')}"\n`;
+            .replace(/ /g, '');
+          if (/"/.test(value)) {
+            value = `'${value}'`;
+          } else {
+            value = `"${value}"`;
+          }
+          env_string += `export ${key}=${value}\n`;
+        }
       }
     }
     fs.writeFileSync(config.envFile, env_string);

back/services/notify.ts

@@ -0,0 +1,372 @@
+import { NotificationInfo } from '../data/notify';
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import UserService from './user';
+import got from 'got';
+import nodemailer from 'nodemailer';
+import crypto from 'crypto';
+import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
+
+@Service()
+export default class NotificationService {
+  @Inject((type) => UserService)
+  private userService!: UserService;
+
+  private modeMap = new Map([
+    ['gotify', this.gotify],
+    ['goCqHttpBot', this.goCqHttpBot],
+    ['serverChan', this.serverChan],
+    ['pushDeer', this.pushDeer],
+    ['bark', this.bark],
+    ['telegramBot', this.telegramBot],
+    ['dingtalkBot', this.dingtalkBot],
+    ['weWorkBot', this.weWorkBot],
+    ['weWorkApp', this.weWorkApp],
+    ['iGot', this.iGot],
+    ['pushPlus', this.pushPlus],
+    ['email', this.email],
+  ]);
+
+  private timeout = 10000;
+  private title = '';
+  private content = '';
+  private params!: Omit<NotificationInfo, 'type'>;
+
+  constructor(@Inject('logger') private logger: winston.Logger) {}
+
+  public async notify(
+    title: string,
+    content: string,
+  ): Promise<boolean | undefined> {
+    const { type, ...rest } = await this.userService.getNotificationMode();
+    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) {
+        return false;
+      }
+    }
+    return false;
+  }
+
+  public async testNotify(
+    info: NotificationInfo,
+    title: string,
+    content: string,
+  ) {
+    const { type, ...rest } = info;
+    if (type) {
+      this.title = title;
+      this.content = content;
+      this.params = rest;
+      const notificationModeAction = this.modeMap.get(type);
+      return await notificationModeAction?.call(this);
+    }
+    return true;
+  }
+
+  private async gotify() {
+    const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
+    const res: any = await got
+      .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `title=${encodeURIComponent(
+          this.title,
+        )}&message=${encodeURIComponent(
+          this.content,
+        )}&priority=${gotifyPriority}`,
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+        },
+      })
+      .json();
+    return typeof res.id === 'number';
+  }
+
+  private async goCqHttpBot() {
+    const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
+    const res: any = await got
+      .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
+        timeout: this.timeout,
+        retry: 0,
+        json: { message: `${this.title}\n${this.content}` },
+        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+      })
+      .json();
+    return res.retcode === 0;
+  }
+
+  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 res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `title=${this.title}&desp=${this.content}`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+    return res.errno === 0 || res.data.errno === 0;
+  }
+
+  private async pushDeer() {
+    const { pushDeerKey } = this.params;
+    // https://api2.pushdeer.com/message/push?pushkey=<key>&text=标题&desp=<markdown>&type=markdown
+    const url = `https://api2.pushdeer.com/message/push`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `pushkey=${pushDeerKey}&text=${
+          this.title
+        }&desp=${encodeURIComponent(this.content)}&type=markdown`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+    return (
+      res.content.result.length !== undefined && res.content.result.length > 0
+    );
+  }
+
+  private async bark() {
+    let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
+    if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
+      barkPush = `https://api.day.app/${barkPush}`;
+    }
+    const url = `${barkPush}/${encodeURIComponent(
+      this.title,
+    )}/${encodeURIComponent(
+      this.content,
+    )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
+    const res: any = await got
+      .get(url, {
+        timeout: this.timeout,
+        retry: 0,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+    return res.code === 200;
+  }
+
+  private async telegramBot() {
+    const {
+      telegramBotApiHost,
+      telegramBotProxyAuth,
+      telegramBotProxyHost,
+      telegramBotProxyPort,
+      telegramBotToken,
+      telegramBotUserId,
+    } = this.params;
+    const authStr = telegramBotProxyAuth ? `${telegramBotProxyAuth}@` : '';
+    const url = `https://${
+      telegramBotApiHost ? telegramBotApiHost : 'api.telegram.org'
+    }/bot${telegramBotToken}/sendMessage`;
+    let agent;
+    if (telegramBotProxyHost && telegramBotProxyPort) {
+      const options: any = {
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 256,
+        maxFreeSockets: 256,
+        proxy: `http://${authStr}${telegramBotProxyHost}:${telegramBotProxyPort}`,
+      };
+      const httpAgent = new HttpProxyAgent(options);
+      const httpsAgent = new HttpsProxyAgent(options);
+      agent = {
+        http: httpAgent,
+        https: httpsAgent,
+      };
+    }
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        agent,
+      })
+      .json();
+    return !!res.ok;
+  }
+
+  private async dingtalkBot() {
+    const { dingtalkBotSecret, dingtalkBotToken } = this.params;
+    let secretParam = '';
+    if (dingtalkBotSecret) {
+      const dateNow = Date.now();
+      const hmac = crypto.createHmac('sha256', dingtalkBotSecret);
+      hmac.update(`${dateNow}\n${dingtalkBotSecret}`);
+      const result = encodeURIComponent(hmac.digest('base64'));
+      secretParam = `&timestamp=${dateNow}&sign=${result}`;
+    }
+    const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        json: {
+          msgtype: 'text',
+          text: {
+            content: ` ${this.title}\n\n${this.content}`,
+          },
+        },
+      })
+      .json();
+    return res.errcode === 0;
+  }
+
+  private async weWorkBot() {
+    const { weWorkBotKey } = this.params;
+    const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        json: {
+          msgtype: 'text',
+          text: {
+            content: ` ${this.title}\n\n${this.content}`,
+          },
+        },
+      })
+      .json();
+    return res.errcode === 0;
+  }
+
+  private async weWorkApp() {
+    const { weWorkAppKey } = this.params;
+    const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] =
+      weWorkAppKey.split(',');
+    const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
+    const { access_token } = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        json: {
+          corpid,
+          corpsecret,
+        },
+      })
+      .json();
+
+    let options: any = {
+      msgtype: 'mpnews',
+      mpnews: {
+        articles: [
+          {
+            title: `${this.title}`,
+            thumb_media_id,
+            author: `智能助手`,
+            content_source_url: ``,
+            content: `${this.content.replace(/\n/g, '<br/>')}`,
+            digest: `${this.content}`,
+          },
+        ],
+      },
+    };
+    switch (thumb_media_id) {
+      case '0':
+        options = {
+          msgtype: 'textcard',
+          textcard: {
+            title: `${this.title}`,
+            description: `${this.content}`,
+            url: 'https://github.com/whyour/qinglong',
+            btntxt: '更多',
+          },
+        };
+        break;
+
+      case '1':
+        options = {
+          msgtype: 'text',
+          text: {
+            content: `${this.title}\n\n${this.content}`,
+          },
+        };
+        break;
+    }
+
+    const res: any = await got
+      .post(
+        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
+        {
+          timeout: this.timeout,
+          retry: 0,
+          json: {
+            touser,
+            agentid,
+            safe: '0',
+            ...options,
+          },
+        },
+      )
+      .json();
+
+    return res.errcode === 0;
+  }
+
+  private async iGot() {
+    const { iGotPushKey } = this.params;
+    const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `title=${this.title}&content=${this.content}`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+
+    return res.ret === 0;
+  }
+
+  private async pushPlus() {
+    const { pushPlusToken, pushPlusUser } = this.params;
+    const url = `https://www.pushplus.plus/send`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        json: {
+          token: `${pushPlusToken}`,
+          title: `${this.title}`,
+          content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
+          topic: `${pushPlusUser || ''}`,
+        },
+      })
+      .json();
+
+    return res.code === 200;
+  }
+
+  private async email() {
+    const { emailPass, emailService, emailUser } = this.params;
+    const transporter = nodemailer.createTransport({
+      service: emailService,
+      auth: {
+        user: emailUser,
+        pass: emailPass,
+      },
+    });
+
+    const info = await transporter.sendMail({
+      from: `"青龙快讯" <${emailUser}>`,
+      to: `${emailUser}`,
+      subject: `${this.title}`,
+      html: `${this.content.replace(/\n/g, '<br/>')}`,
+    });
+
+    transporter.close();
+
+    return !!info.messageId;
+  }
+}

back/services/open.ts

@@ -0,0 +1,145 @@
+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';
+
+@Service()
+export default class OpenService {
+  constructor(@Inject('logger') private logger: winston.Logger) {}
+
+  public async findTokenByValue(token: string): Promise<App | null> {
+    const docs = await this.find({});
+    const doc = docs.filter((x) => x.tokens?.find((y) => y.value === token));
+    return doc[0];
+  }
+
+  public async create(payload: App): Promise<App> {
+    const tab = { ...payload };
+    tab.client_id = createRandomString(12, 12);
+    tab.client_secret = createRandomString(24, 24);
+    const doc = await this.insert(tab);
+    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;
+  }
+
+  public async update(payload: App): Promise<App> {
+    const newDoc = await this.updateDb({
+      name: payload.name,
+      scopes: payload.scopes,
+      id: payload.id,
+    } as any);
+    return { ...newDoc, tokens: [] };
+  }
+
+  private async updateDb(payload: App): Promise<App> {
+    await AppModel.update(payload, { where: { id: payload.id } });
+    return await this.getDb({ id: payload.id });
+  }
+
+  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 remove(ids: number[]) {
+    await AppModel.destroy({ where: { id: ids } });
+  }
+
+  public async resetSecret(id: number): Promise<App> {
+    const tab: any = {
+      client_secret: createRandomString(24, 24),
+      tokens: [],
+      id,
+    };
+    // const doc = await this.get(id);
+    // const tab = new App({ ...doc });
+    // tab.client_secret = createRandomString(24, 24);
+    // tab.tokens = [];
+    // const newDoc = await this.updateDb(tab);
+    // return newDoc;
+    const newDoc = await this.updateDb(tab);
+    return newDoc;
+  }
+
+  public async list(
+    searchText: string = '',
+    sort: any = {},
+    query: any = {},
+  ): Promise<App[]> {
+    let condition = { ...query };
+    if (searchText) {
+      const encodeText = encodeURIComponent(searchText);
+      const reg = {
+        [Op.or]: [
+          { [Op.like]: `%${searchText}%` },
+          { [Op.like]: `%${encodeText}%` },
+        ],
+      };
+
+      condition = {
+        ...condition,
+        name: reg,
+      };
+    }
+    try {
+      const result = await this.find(condition);
+      return result.map((x) => ({ ...x, tokens: [] }));
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  private async find(query: any, sort?: any): Promise<App[]> {
+    const docs = await AppModel.findAll({ where: { ...query } });
+    return docs.map((x) => x.get({ plain: true }));
+  }
+
+  public async authToken({
+    client_id,
+    client_secret,
+  }: {
+    client_id: string;
+    client_secret: string;
+  }): Promise<any> {
+    let token = uuidV4();
+    const expiration = Math.round(Date.now() / 1000) + 2592000; // 2592000 30天
+    const doc = await AppModel.findOne({ where: { client_id, client_secret } });
+    if (doc) {
+      const timestamp = Math.round(Date.now() / 1000);
+      const invalidTokens = (doc.tokens || []).filter(
+        (x) => x.expiration >= timestamp,
+      );
+      let tokens = invalidTokens;
+      if (invalidTokens.length > 5) {
+        tokens = [
+          ...invalidTokens.slice(0, 4),
+          { ...invalidTokens[4], expiration },
+        ];
+        token = invalidTokens[4].value;
+      } else {
+        tokens = [...invalidTokens, { value: token, expiration }];
+      }
+      await AppModel.update(
+        { tokens },
+        { where: { client_id, client_secret } },
+      );
+      return {
+        code: 200,
+        data: {
+          token,
+          token_type: 'Bearer',
+          expiration,
+        },
+      };
+    } else {
+      return { code: 400, message: 'client_id或client_seret有误' };
+    }
+  }
+}

back/services/schedule.ts

@@ -0,0 +1,130 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import nodeSchedule from 'node-schedule';
+import { Crontab } from '../data/cron';
+import { exec } from 'child_process';
+import {
+  ToadScheduler,
+  SimpleIntervalJob,
+  Task,
+  SimpleIntervalSchedule,
+} from 'toad-scheduler';
+
+@Service()
+export default class ScheduleService {
+  private scheduleStacks = new Map<string, nodeSchedule.Job>();
+
+  private intervalSchedule = new ToadScheduler();
+
+  constructor(@Inject('logger') private logger: winston.Logger) {}
+
+  async createCronTask({ id = 0, command, name, schedule = '' }: Crontab) {
+    const _id = this.formatId(id);
+    this.logger.info(
+      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
+      _id,
+      schedule,
+      name,
+      command,
+    );
+
+    this.scheduleStacks.set(
+      _id,
+      nodeSchedule.scheduleJob(id + '', schedule, async () => {
+        try {
+          exec(command, async (error, stdout, stderr) => {
+            if (error) {
+              await this.logger.info(
+                '执行任务%s失败，时间：%s, 错误信息：%j',
+                command,
+                new Date().toLocaleString(),
+                error,
+              );
+            }
+
+            if (stderr) {
+              await this.logger.info(
+                '执行任务%s失败，时间：%s, 错误信息：%j',
+                command,
+                new Date().toLocaleString(),
+                stderr,
+              );
+            }
+          });
+        } catch (error) {
+          await this.logger.info(
+            '执行任务%s失败，时间：%s, 错误信息：%j',
+            command,
+            new Date().toLocaleString(),
+            error,
+          );
+        } finally {
+        }
+      }),
+    );
+  }
+
+  async cancelCronTask({ id = 0, name }: Crontab) {
+    const _id = this.formatId(id);
+    this.logger.info('[取消定时任务]，任务名：%s', name);
+    this.scheduleStacks.has(_id) && this.scheduleStacks.get(_id)?.cancel();
+  }
+
+  async createIntervalTask(
+    { id = 0, command, name = '' }: Crontab,
+    schedule: SimpleIntervalSchedule,
+  ) {
+    const _id = this.formatId(id);
+    this.logger.info(
+      '[创建interval任务]，任务ID: %s，任务名: %s，执行命令: %s',
+      _id,
+      name,
+      command,
+    );
+    const task = new Task(name, async () => {
+      try {
+        exec(command, async (error, stdout, stderr) => {
+          if (error) {
+            await this.logger.info(
+              '执行任务%s失败，时间：%s, 错误信息：%j',
+              command,
+              new Date().toLocaleString(),
+              error,
+            );
+          }
+
+          if (stderr) {
+            await this.logger.info(
+              '执行任务%s失败，时间：%s, 错误信息：%j',
+              command,
+              new Date().toLocaleString(),
+              stderr,
+            );
+          }
+        });
+      } catch (error) {
+        await this.logger.info(
+          '执行任务%s失败，时间：%s, 错误信息：%j',
+          command,
+          new Date().toLocaleString(),
+          error,
+        );
+      } finally {
+      }
+    });
+
+    const job = new SimpleIntervalJob({ ...schedule }, task, _id);
+
+    this.intervalSchedule.addIntervalJob(job);
+  }
+
+  async cancelIntervalTask({ id = 0, name }: Crontab) {
+    const _id = this.formatId(id);
+    this.logger.info('[取消interval任务]，任务ID: %s，任务名：%s', _id, name);
+    this.intervalSchedule.removeById(_id);
+  }
+
+  private formatId(id: number): string {
+    return String(id);
+  }
+}

back/services/script.ts

@@ -0,0 +1,61 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import { spawn } from 'child_process';
+import SockService from './sock';
+import CronService from './cron';
+
+@Service()
+export default class ScriptService {
+  constructor(
+    @Inject('logger') private logger: winston.Logger,
+    private sockService: SockService,
+    private cronService: CronService,
+  ) {}
+
+  public async runScript(path: string) {
+    const cp = spawn(`task -l ${path} now`, { shell: '/bin/bash' });
+
+    cp.stdout.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: data.toString(),
+      });
+    });
+
+    cp.stderr.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: data.toString(),
+      });
+    });
+
+    cp.on('error', (err) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: JSON.stringify(err),
+      });
+    });
+
+    cp.on('close', (err) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: `执行结束`,
+      });
+    });
+
+    return { code: 200 };
+  }
+
+  public async stopScript(path: string) {
+    const err = await this.cronService.killTask(`task -l ${path} now`);
+    const str = err ? `\n${err}` : '';
+    this.sockService.sendMessage({
+      type: 'manuallyRunScript',
+      message: `${str}\n## 执行结束...  ${new Date()
+        .toLocaleString('zh', { hour12: false })
+        .replace(' 24:', ' 00:')} `,
+    });
+
+    return { code: 200 };
+  }
+}

back/services/sock.ts

@@ -0,0 +1,34 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import { Connection } from 'sockjs';
+import { SockMessage } from '../data/sock';
+
+@Service()
+export default class SockService {
+  private clients: Connection[] = [];
+
+  constructor(@Inject('logger') private logger: winston.Logger) {}
+
+  public getClients() {
+    return this.clients;
+  }
+
+  public addClient(conn: Connection) {
+    if (this.clients.indexOf(conn) === -1) {
+      this.clients.push(conn);
+    }
+  }
+
+  public removeClient(conn: Connection) {
+    const index = this.clients.indexOf(conn);
+    if (index !== -1) {
+      this.clients.splice(index, 1);
+    }
+  }
+
+  public sendMessage(msg: SockMessage) {
+    this.clients.forEach((x) => {
+      x.write(JSON.stringify(msg));
+    });
+  }
+}

back/services/system.ts

@@ -0,0 +1,175 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import config from '../config';
+import * as fs from 'fs';
+import _ from 'lodash';
+import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
+import { NotificationInfo } from '../data/notify';
+import NotificationService from './notify';
+import ScheduleService from './schedule';
+import { spawn } from 'child_process';
+import SockService from './sock';
+import got from 'got';
+
+@Service()
+export default class SystemService {
+  @Inject((type) => NotificationService)
+  private notificationService!: NotificationService;
+
+  constructor(
+    @Inject('logger') private logger: winston.Logger,
+    private scheduleService: ScheduleService,
+    private sockService: SockService,
+  ) {}
+
+  public async getLogRemoveFrequency() {
+    const doc = await this.getDb({ type: AuthDataType.removeLogFrequency });
+    return doc || {};
+  }
+
+  private async updateAuthDb(payload: AuthInfo): Promise<any> {
+    await AuthModel.upsert({ ...payload });
+    const doc = await this.getDb({ type: payload.type });
+    return doc;
+  }
+
+  public async getDb(query: any): Promise<any> {
+    const doc: any = await AuthModel.findOne({ where: { ...query } });
+    return doc && (doc.get({ plain: true }) as any);
+  }
+
+  public async updateNotificationMode(notificationInfo: NotificationInfo) {
+    const code = Math.random().toString().slice(-6);
+    const isSuccess = await this.notificationService.testNotify(
+      notificationInfo,
+      '青龙',
+      `【蛟龙】测试通知 https://t.me/jiao_long`,
+    );
+    if (isSuccess) {
+      const result = await this.updateAuthDb({
+        type: AuthDataType.notification,
+        info: { ...notificationInfo },
+      });
+      return { code: 200, data: { ...result, code } };
+    } else {
+      return { code: 400, data: '通知发送失败，请检查参数' };
+    }
+  }
+
+  public async updateLogRemoveFrequency(frequency: number) {
+    const result = await this.updateAuthDb({
+      type: AuthDataType.removeLogFrequency,
+      info: { frequency },
+    });
+    const cron = {
+      id: result.id,
+      name: '删除日志',
+      command: `ql rmlog ${frequency}`,
+    };
+    await this.scheduleService.cancelIntervalTask(cron);
+    if (frequency > 0) {
+      await this.scheduleService.createIntervalTask(cron, {
+        days: frequency,
+        runImmediately: true,
+      });
+    }
+    return { code: 200, data: { ...cron } };
+  }
+
+  public async checkUpdate() {
+    try {
+      const versionRegx = /.*export const version = \'(.*)\'\;/;
+      const logRegx = /.*export const changeLog = \`((.*\n.*)+)\`;/;
+
+      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
+      const currentVersion = currentVersionFile.match(versionRegx)![1];
+
+      let lastVersion = '';
+      let lastLog = '';
+      try {
+        const result = await got.get(config.lastVersionFile, {
+          timeout: 6000,
+          retry: 0,
+        });
+        const lastVersionFileContent = result.body;
+        lastVersion = lastVersionFileContent.match(versionRegx)![1];
+        lastLog = lastVersionFileContent.match(logRegx)
+          ? lastVersionFileContent.match(logRegx)![1]
+          : '';
+      } catch (error) {}
+
+      return {
+        code: 200,
+        data: {
+          hasNewVersion: this.checkHasNewVersion(currentVersion, lastVersion),
+          lastVersion,
+          lastLog,
+        },
+      };
+    } catch (error: any) {
+      return {
+        code: 400,
+        data: error.message,
+      };
+    }
+  }
+
+  private checkHasNewVersion(curVersion: string, lastVersion: string) {
+    const curArr = curVersion.split('.').map((x) => parseInt(x, 10));
+    const lastArr = lastVersion.split('.').map((x) => parseInt(x, 10));
+    if (curArr[0] < lastArr[0]) {
+      return true;
+    }
+    if (curArr[0] === lastArr[0] && curArr[1] < lastArr[1]) {
+      return true;
+    }
+    if (
+      curArr[0] === lastArr[0] &&
+      curArr[1] === lastArr[1] &&
+      curArr[2] < lastArr[2]
+    ) {
+      return true;
+    }
+    return false;
+  }
+
+  public async updateSystem() {
+    const cp = spawn('ql -l update', { shell: '/bin/bash' });
+
+    this.sockService.sendMessage({
+      type: 'updateSystemVersion',
+      message: `开始更新系统`,
+    });
+    cp.stdout.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'updateSystemVersion',
+        message: data.toString(),
+      });
+    });
+
+    cp.stderr.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'updateSystemVersion',
+        message: data.toString(),
+      });
+    });
+
+    cp.on('error', (err) => {
+      this.sockService.sendMessage({
+        type: 'updateSystemVersion',
+        message: JSON.stringify(err),
+      });
+    });
+
+    return { code: 200 };
+  }
+
+  public async notify({ title, content }: { title: string; content: string }) {
+    const isSuccess = await this.notificationService.notify(title, content);
+    if (isSuccess) {
+      return { code: 200, data: '通知发送成功' };
+    } else {
+      return { code: 400, data: '通知发送失败，请检查参数' };
+    }
+  }
+}

back/services/user.ts

@@ -0,0 +1,346 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import { createRandomString, getNetIp, getPlatform } from '../config/util';
+import config from '../config';
+import * as fs from 'fs';
+import _ from 'lodash';
+import jwt from 'jsonwebtoken';
+import { authenticator } from '@otplib/preset-default';
+import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
+import { NotificationInfo } from '../data/notify';
+import NotificationService from './notify';
+import { Request } from 'express';
+import ScheduleService from './schedule';
+import { spawn } from 'child_process';
+import SockService from './sock';
+import got from 'got';
+
+@Service()
+export default class UserService {
+  @Inject((type) => NotificationService)
+  private notificationService!: NotificationService;
+
+  constructor(
+    @Inject('logger') private logger: winston.Logger,
+    private scheduleService: ScheduleService,
+    private sockService: SockService,
+  ) {}
+
+  public async login(
+    payloads: {
+      username: string;
+      password: string;
+    },
+    req: Request,
+    needTwoFactor = true,
+  ): Promise<any> {
+    if (!fs.existsSync(config.authConfigFile)) {
+      return this.initAuthInfo();
+    }
+
+    let { username, password } = payloads;
+    const content = this.getAuthInfo();
+    const timestamp = Date.now();
+    if (content) {
+      let {
+        username: cUsername,
+        password: cPassword,
+        retries = 0,
+        lastlogon,
+        lastip,
+        lastaddr,
+        twoFactorActivated,
+        twoFactorActived,
+        tokens = {},
+        platform,
+      } = content;
+      // patch old field
+      twoFactorActivated = twoFactorActivated || twoFactorActived;
+
+      if (
+        (cUsername === 'admin' && cPassword === 'admin') ||
+        !cUsername ||
+        !cPassword
+      ) {
+        return this.initAuthInfo();
+      }
+
+      if (retries > 2 && Date.now() - lastlogon < Math.pow(3, retries) * 1000) {
+        return {
+          code: 410,
+          message: `失败次数过多，请${Math.round(
+            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
+          )}秒后重试`,
+          data: Math.round(
+            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
+          ),
+        };
+      }
+
+      const { ip, address } = await getNetIp(req);
+      if (username === cUsername && password === cPassword) {
+        if (twoFactorActivated && needTwoFactor) {
+          this.updateAuthInfo(content, {
+            isTwoFactorChecking: true,
+          });
+          return {
+            code: 420,
+            message: '请输入两步验证token',
+          };
+        }
+
+        const data = createRandomString(50, 100);
+        const expiration = twoFactorActivated ? 30 : 3;
+        let token = jwt.sign({ data }, config.secret as any, {
+          expiresIn: 60 * 60 * 24 * expiration,
+          algorithm: 'HS384',
+        });
+
+        this.updateAuthInfo(content, {
+          token,
+          tokens: {
+            ...tokens,
+            [req.platform]: token,
+          },
+          lastlogon: timestamp,
+          retries: 0,
+          lastip: ip,
+          lastaddr: address,
+          platform: req.platform,
+          isTwoFactorChecking: false,
+        });
+        await this.notificationService.notify(
+          '登录通知',
+          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
+            req.platform
+          }端 登录成功，ip地址 ${ip}`,
+        );
+        await this.getLoginLog();
+        await this.insertDb({
+          type: AuthDataType.loginLog,
+          info: {
+            timestamp,
+            address,
+            ip,
+            platform: req.platform,
+            status: LoginStatus.success,
+          },
+        });
+        return {
+          code: 200,
+          data: { token, lastip, lastaddr, lastlogon, retries, platform },
+        };
+      } else {
+        this.updateAuthInfo(content, {
+          retries: retries + 1,
+          lastlogon: timestamp,
+          lastip: ip,
+          lastaddr: address,
+          platform: req.platform,
+        });
+        await this.notificationService.notify(
+          '登录通知',
+          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
+            req.platform
+          }端 登录失败，ip地址 ${ip}`,
+        );
+        await this.getLoginLog();
+        await this.insertDb({
+          type: AuthDataType.loginLog,
+          info: {
+            timestamp,
+            address,
+            ip,
+            platform: req.platform,
+            status: LoginStatus.fail,
+          },
+        });
+        return { code: 400, message: config.authError };
+      }
+    } else {
+      return this.initAuthInfo();
+    }
+  }
+
+  public async logout(platform: string): Promise<any> {
+    const authInfo = this.getAuthInfo();
+    this.updateAuthInfo(authInfo, {
+      token: '',
+      tokens: { ...authInfo.tokens, [platform]: '' },
+    });
+  }
+
+  public async getLoginLog(): Promise<AuthInfo[]> {
+    const docs = await AuthModel.findAll({
+      where: { type: AuthDataType.loginLog },
+    });
+    if (docs && docs.length > 0) {
+      const result = docs.sort((a, b) => b.info.timestamp - a.info.timestamp);
+      if (result.length > 100) {
+        await AuthModel.destroy({
+          where: { id: result[result.length - 1].id },
+        });
+      }
+      return result.map((x) => x.info);
+    }
+    return [];
+  }
+
+  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
+    const doc = await AuthModel.create({ ...payload }, { returning: true });
+    return doc;
+  }
+
+  private initAuthInfo() {
+    const newPassword = createRandomString(16, 22);
+    fs.writeFileSync(
+      config.authConfigFile,
+      JSON.stringify({
+        username: 'admin',
+        password: newPassword,
+      }),
+    );
+    return {
+      code: 100,
+      message: '已初始化密码，请前往auth.json查看并重新登录',
+    };
+  }
+
+  public async updateUsernameAndPassword({
+    username,
+    password,
+  }: {
+    username: string;
+    password: string;
+  }) {
+    if (password === 'admin') {
+      return { code: 400, message: '密码不能设置为admin' };
+    }
+    const authInfo = this.getAuthInfo();
+    this.updateAuthInfo(authInfo, { username, password });
+    return { code: 200, message: '更新成功' };
+  }
+
+  public getUserInfo(): Promise<any> {
+    return new Promise((resolve) => {
+      fs.readFile(config.authConfigFile, 'utf8', (err, data) => {
+        if (err) console.log(err);
+        resolve(JSON.parse(data));
+      });
+    });
+  }
+
+  public initTwoFactor() {
+    const secret = authenticator.generateSecret();
+    const authInfo = this.getAuthInfo();
+    const otpauth = authenticator.keyuri(authInfo.username, 'qinglong', secret);
+    this.updateAuthInfo(authInfo, { twoFactorSecret: secret });
+    return { secret, url: otpauth };
+  }
+
+  public activeTwoFactor(code: string) {
+    const authInfo = this.getAuthInfo();
+    const isValid = authenticator.verify({
+      token: code,
+      secret: authInfo.twoFactorSecret,
+    });
+    if (isValid) {
+      this.updateAuthInfo(authInfo, { twoFactorActivated: true });
+    }
+    return isValid;
+  }
+
+  public async twoFactorLogin(
+    {
+      username,
+      password,
+      code,
+    }: { username: string; password: string; code: string },
+    req: any,
+  ) {
+    const authInfo = this.getAuthInfo();
+    const { isTwoFactorChecking, twoFactorSecret } = authInfo;
+    if (!isTwoFactorChecking) {
+      return { code: 450, message: '未知错误' };
+    }
+    const isValid = authenticator.verify({
+      token: code,
+      secret: twoFactorSecret,
+    });
+    if (isValid) {
+      return this.login({ username, password }, req, false);
+    } else {
+      const { ip, address } = await getNetIp(req);
+      this.updateAuthInfo(authInfo, {
+        lastip: ip,
+        lastaddr: address,
+        platform: req.platform,
+      });
+      return { code: 430, message: '验证失败' };
+    }
+  }
+
+  public deactiveTwoFactor() {
+    const authInfo = this.getAuthInfo();
+    this.updateAuthInfo(authInfo, {
+      twoFactorActivated: false,
+      twoFactorActived: false,
+      twoFactorSecret: '',
+    });
+    return true;
+  }
+
+  private getAuthInfo() {
+    const content = fs.readFileSync(config.authConfigFile, 'utf8');
+    return JSON.parse(content || '{}');
+  }
+
+  private updateAuthInfo(authInfo: any, info: any) {
+    fs.writeFileSync(
+      config.authConfigFile,
+      JSON.stringify({ ...authInfo, ...info }),
+    );
+  }
+
+  public async getNotificationMode(): Promise<NotificationInfo> {
+    const doc = await this.getDb({ type: AuthDataType.notification });
+    return (doc && doc.info) || {};
+  }
+
+  private async updateAuthDb(payload: AuthInfo): Promise<any> {
+    let doc = await AuthModel.findOne({ type: payload.type });
+    if (doc) {
+      const updateResult = await AuthModel.update(payload, {
+        where: { id: doc.id },
+        returning: true,
+      });
+      doc = updateResult[1][0];
+    } else {
+      doc = await AuthModel.create(payload, { returning: true });
+    }
+    return doc;
+  }
+
+  public async getDb(query: any): Promise<any> {
+    const doc: any = await AuthModel.findOne({ where: { ...query } });
+    return doc && (doc.get({ plain: true }) as any);
+  }
+
+  public async updateNotificationMode(notificationInfo: NotificationInfo) {
+    const code = Math.random().toString().slice(-6);
+    const isSuccess = await this.notificationService.testNotify(
+      notificationInfo,
+      '青龙',
+      `【蛟龙】测试通知 https://t.me/jiao_long`,
+    );
+    if (isSuccess) {
+      const result = await this.updateAuthDb({
+        type: AuthDataType.notification,
+        info: { ...notificationInfo },
+      });
+      return { code: 200, data: { ...result, code } };
+    } else {
+      return { code: 400, data: '通知发送失败，请检查参数' };
+    }
+  }
+}

cli/commands/update.ts

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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/Dockerfile

@@ -1,14 +1,21 @@
-FROM node:lts-alpine
-LABEL maintainer="whyour"
-ARG QL_URL=https://github.com/whyour/qinglong.git
+FROM node:alpine
+
+ARG QL_MAINTAINER="whyour"
+LABEL maintainer="${QL_MAINTAINER}"
+ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=master
+
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
     LANG=zh_CN.UTF-8 \
     SHELL=/bin/bash \
     PS1="\u@\h:\w \$ " \
-    QL_DIR=/ql
+    QL_DIR=/ql \
+    QL_BRANCH=${QL_BRANCH}
+
 WORKDIR ${QL_DIR}
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
+
+RUN set -x \
+    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
     && apk update -f \
     && apk upgrade \
     && apk --no-cache add -f bash \
@@ -24,26 +31,28 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
                              python3 \
                              jq \
                              openssh \
+                             py3-pip \
     && rm -rf /var/cache/apk/* \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && echo "Asia/Shanghai" > /etc/timezone \
     && touch ~/.bashrc \
-    && mkdir /run/nginx \
-    && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
     && git config --global user.email "qinglong@@users.noreply.github.com" \
     && git config --global user.name "qinglong" \
-    && git config --global pull.rebase true \
+    && npm install -g pnpm \
+    && pnpm install -g pm2 \
+    && pnpm install -g ts-node typescript tslib \
+    && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
     && cd ${QL_DIR} \
     && cp -f .env.example .env \
     && chmod 777 ${QL_DIR}/shell/*.sh \
     && chmod 777 ${QL_DIR}/docker/*.sh \
-    && npm install -g pnpm \
-    && pnpm install -g pm2 \
-    && pnpm install -g ts-node typescript tslib \
-    && rm -rf /root/.npm \
     && pnpm install --prod \
     && rm -rf /root/.pnpm-store \
-    && git clone -b ${QL_BRANCH} https://github.com/whyour/qinglong-static.git /static \
-    && cp -rf /static/* ${QL_DIR} \
+    && rm -rf /root/.cache \
+    && rm -rf /root/.npm \
+    && git clone -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
+    && mkdir -p ${QL_DIR}/static \
+    && cp -rf /static/* ${QL_DIR}/static \
     && rm -rf /static
+    
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]

docker/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '2'
+services:
+  web:
+    image: whyour/qinglong:latest
+    volumes:
+      - ./data:/ql/data
+    ports:
+      - "0.0.0.0:5700:5700"
+    restart: unless-stopped

docker/docker-entrypoint.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
-set -e
 
 dir_shell=/ql/shell
 . $dir_shell/share.sh
 link_shell
+
 echo -e "======================1. 检测配置文件========================\n"
-fix_config
-cp -fv $dir_root/docker/front.conf /etc/nginx/conf.d/front.conf
-pm2 l >/dev/null 2>&1
+make_dir /etc/nginx/conf.d
+make_dir /run/nginx
+cp -fv $nginx_conf /etc/nginx/nginx.conf
+cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
+pm2 l &>/dev/null
 echo
 
 echo -e "======================2. 安装依赖========================\n"
@@ -18,30 +20,29 @@ echo -e "======================3. 启动nginx========================\n"
 nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
-echo -e "======================4. 启动控制面板========================\n"
-if [[ $(pm2 info panel 2>/dev/null) ]]; then
-  pm2 reload panel --source-map-support --time
-else
-  pm2 start $dir_root/build/app.js -n panel --source-map-support --time
-fi
+echo -e "======================4. 启动面板监控========================\n"
+pm2 delete public &>/dev/null
+pm2 start $dir_static/build/public.js -n public --source-map-support --time
+echo -e "监控服务启动成功...\n"
+
+echo -e "======================5. 启动控制面板========================\n"
+pm2 delete panel &>/dev/null
+pm2 start $dir_static/build/app.js -n panel --source-map-support --time
 echo -e "控制面板启动成功...\n"
 
-echo -e "======================5. 启动定时任务========================\n"
-if [[ $(pm2 info schedule 2>/dev/null) ]]; then
-  pm2 reload schedule --source-map-support --time
-else
-  pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time
-fi
+echo -e "======================6. 启动定时任务========================\n"
+pm2 delete schedule &>/dev/null
+pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time
 echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
-  echo -e "======================6. 启动bot========================\n"
+  echo -e "======================7. 启动bot========================\n"
   nohup ql bot >>$dir_log/start.log 2>&1 &
   echo -e "bot后台启动中...\n"
 fi
 
 if [[ $EnableExtraShell == true ]]; then
-  echo -e "======================7. 执行自定义脚本========================\n"
+  echo -e "======================8. 执行自定义脚本========================\n"
   nohup ql extra >>$dir_log/start.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi

docker/front.conf

@@ -2,12 +2,41 @@ upstream api {
   server 0.0.0.0:5600;
 }
 
+upstream public {
+  server 0.0.0.0:5400;
+}
+
+map $http_upgrade $connection_upgrade { 
+  default keep-alive;
+  'websocket' upgrade;
+}
+
 server {
   listen 5700;
-  root /ql/dist;
+  root /ql/static/dist;
   ssl_session_timeout 5m;
 
+  location /api/public {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://public;
+  }
+
   location /api {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://api;
+
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $connection_upgrade;
+  }
+
+  location /open {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_pass http://api;
   }
 
@@ -24,4 +53,8 @@ server {
     index  index.html index.htm;
     try_files $uri $uri/ /index.html;
   }
+
+  location ~ .*\.(html)$ {
+    add_header Cache-Control no-cache;
+  }
 }

docker/nginx.conf

@@ -0,0 +1,45 @@
+user root;
+worker_processes auto;
+pcre_jit on;
+error_log /var/log/nginx/error.log warn;
+include /etc/nginx/modules/*.conf;
+
+events {
+	worker_connections 1024;
+}
+
+http {
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+
+	server_tokens off;
+
+	client_max_body_size 20m;
+	client_body_buffer_size 20m;
+
+	keepalive_timeout 65;
+
+	sendfile on;
+
+	tcp_nodelay on;
+
+	ssl_prefer_server_ciphers on;
+
+	ssl_session_cache shared:SSL:2m;
+
+	gzip on;
+  gzip_static on;    
+  gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript;
+  gzip_proxied  any;
+  gzip_vary on;
+  gzip_comp_level 6;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.0;
+
+	log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+			'$status $body_bytes_sent "$http_referer" '
+			'"$http_user_agent" "$http_x_forwarded_for"';
+
+	access_log /var/log/nginx/access.log main;
+	include /etc/nginx/conf.d/*.conf;
+}

package.json

@@ -1,14 +1,17 @@
 {
   "private": true,
   "scripts": {
-    "start": "umi dev",
-    "build": "umi build",
-    "build-back": "tsc -p tsconfig.back.json",
-    "start-back": "nodemon",
-    "panel": "npm run build-back && node build/app.js",
-    "schedule": "npm run build-back && node build/schedule.js",
-    "prepare": "umi generate tmp",
+    "start": "concurrently -n w: npm:start:*",
+    "start:front": "umi dev",
+    "start:back": "nodemon",
+    "start:public": "ts-node back/public.ts",
+    "build:front": "umi build",
+    "build:back": "tsc -p tsconfig.back.json",
+    "panel": "npm run build:back && node static/build/app.js",
+    "schedule": "npm run build:back && node static/build/schedule.js",
+    "public": "npm run build:back && node static/build/public.js",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
+    "prepare": "umi generate tmp",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage"
   },
@@ -24,60 +27,89 @@
     ]
   },
   "dependencies": {
-    "body-parser": "^1.19.0",
-    "celebrate": "^13.0.3",
+    "@otplib/preset-default": "^12.0.1",
+    "@sentry/node": "^6.18.1",
+    "@sentry/tracing": "^6.18.1",
+    "body-parser": "^1.19.2",
+    "celebrate": "^15.0.1",
+    "chokidar": "^3.5.3",
     "cors": "^2.8.5",
-    "cron-parser": "^3.5.0",
-    "dotenv": "^8.2.0",
-    "express": "^4.17.1",
-    "express-jwt": "^6.0.0",
+    "cron-parser": "^4.2.1",
+    "dotenv": "^16.0.0",
+    "express": "^4.17.3",
+    "express-jwt": "^6.1.1",
+    "express-urlrewrite": "^1.4.0",
+    "got": "^11.8.2",
+    "hpagent": "^0.1.2",
+    "iconv-lite": "^0.6.3",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "nedb": "^1.8.0",
-    "node-fetch": "^2.6.1",
-    "node-schedule": "^2.0.0",
-    "p-queue": "6.6.2",
+    "node-fetch": "^3.2.1",
+    "node-schedule": "^2.1.0",
+    "nodemailer": "^6.7.2",
+    "p-queue": "7.2.0",
     "reflect-metadata": "^0.1.13",
-    "typedi": "^0.8.0",
-    "winston": "^3.3.3"
+    "sequelize": "^6.17.0",
+    "serve-handler": "^6.1.3",
+    "sockjs": "^0.3.24",
+    "sqlite3": "npm:@louislam/sqlite3@^6.0.1",
+    "toad-scheduler": "^1.6.0",
+    "typedi": "^0.10.0",
+    "uuid": "^8.3.2",
+    "winston": "^3.6.0",
+    "yargs": "^17.3.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^4.6.2",
-    "@ant-design/pro-layout": "^6.5.0",
-    "@monaco-editor/react": "^4.2.1",
-    "@types/cors": "^2.8.10",
-    "@types/express": "^4.17.8",
-    "@types/express-jwt": "^6.0.1",
-    "@types/jsonwebtoken": "^8.5.0",
-    "@types/lodash": "^4.14.170",
-    "@types/nedb": "^1.8.11",
-    "@types/node": "^14.11.2",
-    "@types/node-fetch": "^2.5.8",
-    "@types/qrcode.react": "^1.0.1",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@umijs/plugin-antd": "^0.9.1",
-    "@umijs/test": "^3.3.9",
-    "codemirror": "^5.62.2",
-    "compression-webpack-plugin": "6.1.1",
-    "darkreader": "^4.9.27",
-    "lint-staged": "^10.0.7",
-    "nodemon": "^2.0.4",
-    "prettier": "^2.2.0",
+    "@ant-design/icons": "^4.7.0",
+    "@ant-design/pro-layout": "^6.33.1",
+    "@monaco-editor/react": "^4.3.1",
+    "@sentry/react": "^6.18.1",
+    "@types/cors": "^2.8.12",
+    "@types/express": "^4.17.13",
+    "@types/express-jwt": "^6.0.4",
+    "@types/jsonwebtoken": "^8.5.8",
+    "@types/lodash": "^4.14.179",
+    "@types/nedb": "^1.8.12",
+    "@types/node": "^17.0.21",
+    "@types/node-fetch": "^2.6.1",
+    "@types/node-schedule": "^1.3.2",
+    "@types/nodemailer": "^6.4.4",
+    "@types/qrcode.react": "^1.0.2",
+    "@types/react": "^17.0.39",
+    "@types/react-dom": "^17.0.13",
+    "@types/serve-handler": "^6.1.1",
+    "@types/sockjs": "^0.3.33",
+    "@types/sockjs-client": "^1.5.1",
+    "@types/uuid": "^8.3.4",
+    "@umijs/plugin-antd": "^0.15.0",
+    "@umijs/plugin-esbuild": "^1.4.1",
+    "@umijs/test": "^3.5.21",
+    "ansi-to-react": "^6.1.6",
+    "antd": "^4.18.9",
+    "codemirror": "^5.65.2",
+    "compression-webpack-plugin": "9.2.0",
+    "concurrently": "^7.0.0",
+    "darkreader": "4.9.44",
+    "lint-staged": "^12.3.4",
+    "nodemon": "^2.0.15",
+    "prettier": "^2.5.1",
+    "qiniu": "^7.4.0",
     "qrcode.react": "^1.0.1",
     "react": "17.x",
     "react-codemirror2": "^7.2.1",
     "react-diff-viewer": "^3.1.1",
-    "react-split-pane": "^0.1.92",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
     "react-dom": "17.x",
-    "ts-node": "^9.0.0",
-    "typescript": "^4.1.2",
-    "umi": "^3.3.9",
-    "umi-request": "^1.3.5",
+    "react-split-pane": "^0.1.92",
+    "sockjs-client": "^1.6.0",
+    "ts-node": "^10.6.0",
+    "typescript": "^4.6.2",
+    "umi": "^3.5.21",
+    "umi-request": "^1.4.0",
     "vh-check": "^2.0.5",
-    "webpack": "^5.28.0",
+    "webpack": "^5.70.0",
     "yorkie": "^2.0.0"
   }
 }

sample/auth.sample.json

@@ -1 +1 @@
-{ "username": "admin", "password": "adminadmin" }
+{ "username": "admin", "password": "admin" }

sample/config.sample.sh

@@ -10,11 +10,14 @@ AutoDelCron="true"
 ## 在运行 ql repo 命令时，是否自动增加新的本地定时任务
 AutoAddCron="true"
 
+## 拉取脚本时默认的定时规则，当匹配不到定时规则时使用，例如: 0 9 * * *
+DefaultCronRule=""
+
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
 RepoFileExtensions="js py"
 
-## 由于github仓库拉取较慢，所以会默认添加代理前缀，如不需要请移除
-GithubProxyUrl="https://ghproxy.com/"
+## 代理地址，支持http/https/socks，例如 http://127.0.0.1:7890
+ProxyUrl=""
 
 ## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 CommandTimeoutTime="1h"
@@ -32,6 +35,9 @@ EnableExtraShell="true"
 ## 是否自动启动bot，默认不启动，设置为true时自动启动，目前需要自行克隆bot仓库所需代码，存到ql/repo目录下，文件夹命名为dockerbot
 AutoStartBot=""
 
+## 是否使用第三方bot，默认不使用，使用时填入仓库地址，存到ql/repo目录下，文件夹命名为diybot
+BotRepoUrl=""
+
 ## 安装bot依赖时指定pip源，默认使用清华源，如不需要源，设置此参数为空
 PipMirror="https://pypi.tuna.tsinghua.edu.cn/simple"
 
@@ -44,6 +50,8 @@ export PUSH_KEY=""
 ## 2. BARK
 ## 下方填写app提供的设备码，例如：https://api.day.app/123 那么此处的设备码就是123
 export BARK_PUSH=""
+## 下方填写推送图标设置，自定义推送图标(需iOS15或以上)
+export BARK_ICON="https://qn.whyour.cn/logo.png"
 ## 下方填写推送声音设置，例如choo，具体值请在bark-推送铃声-查看所有铃声
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
@@ -100,7 +108,7 @@ export PUSH_PLUS_TOKEN=""
 ## 1. 需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送
 export PUSH_PLUS_USER=""
 
-## 8. go-cqhttp
+## 9. 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群
@@ -109,4 +117,16 @@ export GOBOT_URL=""
 export GOBOT_TOKEN=""
 export GOBOT_QQ=""
 
+## 10. gotify
+## gotify_url 填写gotify地址,如https://push.example.de:8080
+## gotify_token 填写gotify的消息应用token
+## gotify_priority 填写推送消息优先级,默认为0
+export GOTIFY_URL=""
+export GOTIFY_TOKEN=""
+export GOTIFY_PRIORITY=0
+
+## 11. PushDeer
+## deer_key 填写PushDeer的key
+export DEER_KEY=""
+
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.js

@@ -13,6 +13,13 @@
 const querystring = require('querystring');
 const $ = new Env();
 const timeout = 15000; //超时时间(单位毫秒)
+// =======================================gotify通知设置区域==============================================
+//gotify_url 填写gotify地址,如https://push.example.de:8080
+//gotify_token 填写gotify的消息应用token
+//gotify_priority 填写推送消息优先级,默认为0
+let GOTIFY_URL = '';
+let GOTIFY_TOKEN = '';
+let GOTIFY_PRIORITY = 0;
 // =======================================go-cqhttp通知设置区域===========================================
 //gobot_url 填写请求地址http://127.0.0.1/send_private_msg
 //gobot_token 填写在go-cqhttp文件设置的访问密钥
@@ -27,9 +34,16 @@ let GOBOT_QQ = ''; // 如果GOBOT_URL设置 /send_private_msg 则需要填入 us
 //(环境变量名 PUSH_KEY)
 let SCKEY = '';
 
+// =======================================PushDeer通知设置区域===========================================
+//此处填你申请的PushDeer KEY.
+//(环境变量名 DEER_KEY)
+let PUSHDEER_KEY = '';
+
 // =======================================Bark App通知设置区域===========================================
 //此处填你BarkAPP的信息(IP/设备码，例如：https://api.day.app/XXXXXXXX)
 let BARK_PUSH = '';
+//BARK app推送图标,自定义推送图标(需iOS15或以上)
+let BARK_ICON = 'https://qn.whyour.cn/logo.png';
 //BARK app推送铃声,铃声列表去APP查看复制填写
 let BARK_SOUND = '';
 //BARK app推送消息的分组, 默认为"QingLong"
@@ -84,6 +98,16 @@ let PUSH_PLUS_TOKEN = '';
 let PUSH_PLUS_USER = '';
 
 //==========================云端环境变量的判断与接收=========================
+if (process.env.GOTIFY_URL) {
+  GOTIFY_URL = process.env.GOTIFY_URL;
+}
+if (process.env.GOTIFY_TOKEN) {
+  GOTIFY_TOKEN = process.env.GOTIFY_TOKEN;
+}
+if (process.env.GOTIFY_PRIORITY) {
+  GOTIFY_PRIORITY = process.env.GOTIFY_PRIORITY;
+}
+
 if (process.env.GOBOT_URL) {
   GOBOT_URL = process.env.GOBOT_URL;
 }
@@ -98,6 +122,10 @@ if (process.env.PUSH_KEY) {
   SCKEY = process.env.PUSH_KEY;
 }
 
+if (process.env.DEER_KEY) {
+  PUSHDEER_KEY = process.env.DEER_KEY;
+}
+
 if (process.env.QQ_SKEY) {
   QQ_SKEY = process.env.QQ_SKEY;
 }
@@ -116,6 +144,9 @@ if (process.env.BARK_PUSH) {
   } else {
     BARK_PUSH = `https://api.day.app/${process.env.BARK_PUSH}`;
   }
+  if (process.env.BARK_ICON) {
+    BARK_ICON = process.env.BARK_ICON;
+  }
   if (process.env.BARK_SOUND) {
     BARK_SOUND = process.env.BARK_SOUND;
   }
@@ -199,16 +230,54 @@ async function sendNotify(
     qywxBotNotify(text, desp), //企业微信机器人
     qywxamNotify(text, desp), //企业微信应用消息推送
     iGotNotify(text, desp, params), //iGot
-    gobotNotify(text, desp),//go-cqhttp
+    gobotNotify(text, desp), //go-cqhttp
+    gotifyNotify(text, desp), //gotify
   ]);
 }
 
+function gotifyNotify(text, desp) {
+  return new Promise((resolve) => {
+    if (GOTIFY_URL && GOTIFY_TOKEN) {
+      const options = {
+        url: `${GOTIFY_URL}/message?token=${GOTIFY_TOKEN}`,
+        body: `title=${encodeURIComponent(text)}&message=${encodeURIComponent(
+          desp,
+        )}&priority=${GOTIFY_PRIORITY}`,
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+        },
+      };
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('gotify发送通知调用API失败！！\n');
+            console.log(err);
+          } else {
+            data = JSON.parse(data);
+            if (data.id) {
+              console.log('gotify发送通知消息成功🎉\n');
+            } else {
+              console.log(`${data.message}\n`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve();
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
 function gobotNotify(text, desp, time = 2100) {
   return new Promise((resolve) => {
     if (GOBOT_URL) {
       const options = {
         url: `${GOBOT_URL}?access_token=${GOBOT_TOKEN}&${GOBOT_QQ}`,
-        json: {message:`${text}\n${desp}`},
+        json: { message: `${text}\n${desp}` },
         headers: {
           'Content-Type': 'application/json',
         },
@@ -293,6 +362,52 @@ function serverNotify(text, desp, time = 2100) {
   });
 }
 
+function PushDeerNotify(text, desp, time = 2100) {
+  return new Promise((resolve) => {
+    if (PUSHDEER_KEY) {
+      // PushDeer 建议对消息内容进行 urlencode
+      desp = encodeURI(desp);
+      const options = {
+        url: `https://api2.pushdeer.com/message/push`,
+        body: `pushkey=${PUSHDEER_KEY}&text=${text}&desp=${desp}&type=markdown`,
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        timeout,
+      };
+      setTimeout(() => {
+        $.post(options, (err, resp, data) => {
+          try {
+            if (err) {
+              console.log('发送通知调用API失败！！\n');
+              console.log(err);
+            } else {
+              data = JSON.parse(data);
+              // 通过反悔的result的长度来判断是否成功
+              if (
+                data.content.result.length !== undefined &&
+                data.content.result.length > 0
+              ) {
+                console.log('PushDeer发送通知消息成功🎉\n');
+              } else {
+                console.log(
+                  `PushDeer发送通知消息异常\n${JSON.stringify(data)}`,
+                );
+              }
+            }
+          } catch (e) {
+            $.logErr(e, resp);
+          } finally {
+            resolve(data);
+          }
+        });
+      }, time);
+    } else {
+      resolve();
+    }
+  });
+}
+
 function CoolPush(text, desp) {
   return new Promise((resolve) => {
     if (QQ_SKEY) {
@@ -376,7 +491,9 @@ function BarkNotify(text, desp, params = {}) {
       const options = {
         url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(
           desp,
-        )}?sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(params)}`,
+        )}?icon=${BARK_ICON}?sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(
+          params,
+        )}`,
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
         },

sample/notify.py

@@ -1,277 +1,565 @@
 #!/usr/bin/env python3
 # _*_ coding:utf-8 _*_
-
-import sys
-import os
-cur_path = os.path.abspath(os.path.dirname(__file__))
-root_path = os.path.split(cur_path)[0]
-sys.path.append(root_path)
-import requests
-import json
-import traceback
-import time
-import hmac
-import hashlib
 import base64
-import urllib.parse
-from requests.adapters import HTTPAdapter
-from urllib3.util import Retry
+import hashlib
+import hmac
+import json
+import os
 import re
+import threading
+import time
+import urllib.parse
+
+import requests
+
+# 原先的 print 函数和主线程的锁
+_print = print
+mutex = threading.Lock()
+
+
+# 定义新的 print 函数
+def print(text, *args, **kw):
+    """
+    使输出有序进行，不出现多线程同一时间输出导致错乱的问题。
+    """
+    with mutex:
+        _print(text, *args, **kw)
+
 
 # 通知服务
-BARK = ''                                                                 # bark服务,此参数如果以http或者https开头则判定为自建bark服务; secrets可填;
-SCKEY = ''                                                                # Server酱的SCKEY; secrets可填
-TG_BOT_TOKEN = ''                                                         # tg机器人的TG_BOT_TOKEN; secrets可填
-TG_USER_ID = ''                                                           # tg机器人的TG_USER_ID; secrets可填
-TG_PROXY_IP = ''                                                          # tg机器人的TG_PROXY_IP; secrets可填
-TG_PROXY_PORT = ''                                                        # tg机器人的TG_PROXY_PORT; secrets可填
-DD_BOT_ACCESS_TOKEN = ''                                                  # 钉钉机器人的DD_BOT_ACCESS_TOKEN; secrets可填
-DD_BOT_SECRET = ''                                                        # 钉钉机器人的DD_BOT_SECRET; secrets可填
-QYWX_APP = ''                                                             # 企业微信应用的QYWX_APP; secrets可填 参考http://note.youdao.com/s/HMiudGkb
+# fmt: off
+push_config = {
+    'HITOKOTO': False,                  # 启用一言（随机句子）
 
-notify_mode = []
+    'BARK_PUSH': '',                    # bark IP 或设备码，例：https://api.day.app/DxHcxxxxxRxxxxxxcm/
+    'BARK_ARCHIVE': '',                 # bark 推送是否存档
+    'BARK_GROUP': '',                   # bark 推送分组
+    'BARK_SOUND': '',                   # bark 推送声音
+    'BARK_ICON': '',                    # bark 推送图标
 
-# GitHub action运行需要填写对应的secrets
-if "BARK" in os.environ and os.environ["BARK"]:
-    BARK = os.environ["BARK"]
-if "SCKEY" in os.environ and os.environ["SCKEY"]:
-    SCKEY = os.environ["SCKEY"]
-if "TG_BOT_TOKEN" in os.environ and os.environ["TG_BOT_TOKEN"] and "TG_USER_ID" in os.environ and os.environ["TG_USER_ID"]:
-    TG_BOT_TOKEN = os.environ["TG_BOT_TOKEN"]
-    TG_USER_ID = os.environ["TG_USER_ID"]
-if "DD_BOT_ACCESS_TOKEN" in os.environ and os.environ["DD_BOT_ACCESS_TOKEN"] and "DD_BOT_SECRET" in os.environ and os.environ["DD_BOT_SECRET"]:
-    DD_BOT_ACCESS_TOKEN = os.environ["DD_BOT_ACCESS_TOKEN"]
-    DD_BOT_SECRET = os.environ["DD_BOT_SECRET"]
-if "QYWX_APP" in os.environ and os.environ["QYWX_APP"]:
-    QYWX_APP = os.environ["QYWX_APP"]
+    'CONSOLE': True,                    # 控制台输出
 
-if BARK:
-    notify_mode.append('bark')
-    print("BARK 推送打开")
-if SCKEY:
-    notify_mode.append('sc_key')
-    print("Server酱 推送打开")
-if TG_BOT_TOKEN and TG_USER_ID:
-    notify_mode.append('telegram_bot')
-    print("Telegram 推送打开")
-if DD_BOT_ACCESS_TOKEN and DD_BOT_SECRET:
-    notify_mode.append('dingding_bot')
-    print("钉钉机器人 推送打开")
-if QYWX_APP:
-    notify_mode.append('qywxapp_bot')
-    print("企业微信应用 推送打开")
+    'DD_BOT_SECRET': '',                # 钉钉机器人的 DD_BOT_SECRET
+    'DD_BOT_TOKEN': '',                 # 钉钉机器人的 DD_BOT_TOKEN
 
-def bark(title, content):
-    print("\n")
-    if not BARK:
-        print("bark服务的bark_token未设置!!\n取消推送")
+    'FSKEY': '',                        # 飞书机器人的 FSKEY
+
+    'GOBOT_URL': '',                    # go-cqhttp
+                                        # 推送到个人QQ：http://127.0.0.1/send_private_msg
+                                        # 群：http://127.0.0.1/send_group_msg
+    'GOBOT_QQ': '',                     # go-cqhttp 的推送群或用户
+                                        # GOBOT_URL 设置 /send_private_msg 时填入 user_id=个人QQ
+                                        #               /send_group_msg   时填入 group_id=QQ群
+    'GOBOT_TOKEN': '',                  # go-cqhttp 的 access_token
+
+    'GOTIFY_URL': '',                   # gotify地址,如https://push.example.de:8080
+    'GOTIFY_TOKEN': '',                 # gotify的消息应用token
+    'GOTIFY_PRIORITY': 0,               # 推送消息优先级,默认为0
+
+    'IGOT_PUSH_KEY': '',                # iGot 聚合推送的 IGOT_PUSH_KEY
+
+    'PUSH_KEY': '',                     # server 酱的 PUSH_KEY，兼容旧版与 Turbo 版
+
+    'DEER_KEY': '',                     # PushDeer 的 PUSHDEER_KEY
+    
+    'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
+    'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
+
+    'QMSG_KEY': '',                     # qmsg 酱的 QMSG_KEY
+    'QMSG_TYPE': '',                    # qmsg 酱的 QMSG_TYPE
+
+    'QYWX_AM': '',                      # 企业微信应用
+
+    'QYWX_KEY': '',                     # 企业微信机器人
+
+    'TG_BOT_TOKEN': '',                 # tg 机器人的 TG_BOT_TOKEN，例：1407203283:AAG9rt-6RDaaX0HBLZQq0laNOh898iFYaRQ
+    'TG_USER_ID': '',                   # tg 机器人的 TG_USER_ID，例：1434078534
+    'TG_API_HOST': '',                  # tg 代理 api
+    'TG_PROXY_AUTH': '',                # tg 代理认证参数
+    'TG_PROXY_HOST': '',                # tg 机器人的 TG_PROXY_HOST
+    'TG_PROXY_PORT': '',                # tg 机器人的 TG_PROXY_PORT
+}
+notify_function = []
+# fmt: on
+
+# 首先读取 面板变量 或者 github action 运行变量
+for k in push_config:
+    if os.getenv(k):
+        v = os.getenv(k)
+        push_config[k] = v
+
+
+def bark(title: str, content: str) -> None:
+    """
+    使用 bark 推送消息。
+    """
+    if not push_config.get("BARK_PUSH"):
+        print("bark 服务的 BARK_PUSH 未设置!!\n取消推送")
         return
-    print("bark服务启动")
-    url = None
-    if BARK.startswith('http'):
-      url = f"""{BARK}/{title}/{content}"""
+    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)}'
     else:
-      url = f"""https://api.day.app/{BARK}/{title}/{content}"""
+        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+
+    bark_params = {
+        "BARK_ARCHIVE": "isArchive",
+        "BARK_GROUP": "group",
+        "BARK_SOUND": "sound",
+        "BARK_ICON": "icon",
+    }
+    params = ""
+    for pair in filter(
+        lambda pairs: pairs[0].startswith("BARK_")
+        and pairs[0] != "BARK_PUSH"
+        and pairs[1]
+        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()
-    if response['code'] == 200:
-        print('推送成功！')
-    else:
-        print('推送失败！')
 
-def serverJ(title, content):
-    print("\n")
-    if not SCKEY:
-        print("server酱服务的SCKEY未设置!!\n取消推送")
+    if response["code"] == 200:
+        print("bark 推送成功！")
+    else:
+        print("bark 推送失败！")
+
+
+def console(title: str, content: str) -> None:
+    """
+    使用 控制台 推送消息。
+    """
+    print(f"{title}\n\n{content}")
+
+
+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("serverJ服务启动")
+    print("钉钉机器人 服务启动")
+
+    timestamp = str(round(time.time() * 1000))
+    secret_enc = push_config.get("DD_BOT_SECRET").encode("utf-8")
+    string_to_sign = "{}\n{}".format(timestamp, push_config.get("DD_BOT_SECRET"))
+    string_to_sign_enc = string_to_sign.encode("utf-8")
+    hmac_code = hmac.new(
+        secret_enc, string_to_sign_enc, digestmod=hashlib.sha256
+    ).digest()
+    sign = urllib.parse.quote_plus(base64.b64encode(hmac_code))
+    url = f'https://oapi.dingtalk.com/robot/send?access_token={push_config.get("DD_BOT_TOKEN")}&timestamp={timestamp}&sign={sign}'
+    headers = {"Content-Type": "application/json;charset=utf-8"}
+    data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
+    response = requests.post(
+        url=url, data=json.dumps(data), headers=headers, timeout=15
+    ).json()
+
+    if not response["errcode"]:
+        print("钉钉机器人 推送成功！")
+    else:
+        print("钉钉机器人 推送失败！")
+
+
+def feishu_bot(title: str, content: str) -> None:
+    """
+    使用 飞书机器人 推送消息。
+    """
+    if not push_config.get("FSKEY"):
+        print("飞书 服务的 FSKEY 未设置!!\n取消推送")
+        return
+    print("飞书 服务启动")
+
+    url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{push_config.get("FSKEY")}'
+    data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}}
+    response = requests.post(url, data=json.dumps(data)).json()
+
+    if response.get("StatusCode") == 0:
+        print("飞书 推送成功！")
+    else:
+        print("飞书 推送失败！错误信息如下：\n", response)
+
+
+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 服务启动")
+
+    url = f'{push_config.get("GOBOT_URL")}?access_token={push_config.get("GOBOT_TOKEN")}&{push_config.get("GOBOT_QQ")}&message=标题:{title}\n内容:{content}'
+    response = requests.get(url).json()
+
+    if response["status"] == "ok":
+        print("go-cqhttp 推送成功！")
+    else:
+        print("go-cqhttp 推送失败！")
+
+
+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 服务启动")
+
+    url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}'
+    data = {"title": title,"message": content,"priority": push_config.get("GOTIFY_PRIORITY")}
+    response = requests.post(url,data=data).json()
+
+    if response.get("id"):
+        print("gotify 推送成功！")
+    else:
+        print("gotify 推送失败！")
+
+
+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 服务启动")
+
+    url = f'https://push.hellyw.com/{push_config.get("IGOT_PUSH_KEY")}'
+    data = {"title": title, "content": content}
+    headers = {"Content-Type": "application/x-www-form-urlencoded"}
+    response = requests.post(url, data=data, headers=headers).json()
+
+    if response["ret"] == 0:
+        print("iGot 推送成功！")
+    else:
+        print(f'iGot 推送失败！{response["errMsg"]}')
+
+
+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").index("SCT") != -1:
+        url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
+    else:
+        url = f'https://sc.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:
+        print("serverJ 推送成功！")
+    else:
+        print(f'serverJ 推送失败！错误码：{response["message"]}')
+
+
+def pushdeer(title: str, content: str) -> None:
+    """
+    通过PushDeer 推送消息
+    """
+    if not push_config.get("DEER_KEY"):
+        print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
+        return
+    print("PushDeer 服务启动")
+    data = {"text": title, "desp": urllib.parse.urlencode({"text": content})}
+    url = 'https://api2.pushdeer.com/message/push'
+    response = requests.post(url, data=data).json()
+    
+    if len(response.get("content").get("result")) > 0:
+        print("PushDeer 推送成功！")
+    else:
+        print("PushDeer 推送失败！错误信息：", response)
+    
+
+def pushplus_bot(title: str, content: str) -> None:
+    """
+    通过 push+ 推送消息。
+    """
+    if not push_config.get("PUSH_PLUS_TOKEN"):
+        print("PUSHPLUS 服务的 PUSH_PLUS_TOKEN 未设置!!\n取消推送")
+        return
+    print("PUSHPLUS 服务启动")
+
+    url = "http://www.pushplus.plus/send"
     data = {
-        "text": title,
-        "desp": content.replace("\n", "\n\n")
+        "token": push_config.get("PUSH_PLUS_TOKEN"),
+        "title": title,
+        "content": content,
+        "topic": push_config.get("PUSH_PLUS_USER"),
     }
-    response = requests.post(f"https://sc.ftqq.com/{SCKEY}.send", data=data).json()
-    if response['errno'] == 0:
-        print('推送成功！')
-    else:
-        print('推送失败！')
+    body = json.dumps(data).encode(encoding="utf-8")
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, data=body, headers=headers).json()
 
-def telegram_bot(title, content):
-    print("\n")
-    bot_token = TG_BOT_TOKEN
-    user_id = TG_USER_ID
-    if not bot_token or not user_id:
-        print("tg服务的bot_token或者user_id未设置!!\n取消推送")
+    if response["code"] == 200:
+        print("PUSHPLUS 推送成功！")
+
+    else:
+
+        url_old = "http://pushplus.hxtrip.com/send"
+        headers["Accept"] = "application/json"
+        response = requests.post(url=url_old, data=body, headers=headers).json()
+
+        if response["code"] == 200:
+            print("PUSHPLUS(hxtrip) 推送成功！")
+
+        else:
+            print("PUSHPLUS 推送失败！")
+
+
+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("tg服务启动")
-    url=f"https://api.telegram.org/bot{TG_BOT_TOKEN}/sendMessage"
-    headers = {'Content-Type': 'application/x-www-form-urlencoded'}
-    payload = {'chat_id': str(TG_USER_ID), 'text': f'{title}\n\n{content}', 'disable_web_page_preview': 'true'}
-    proxies = None
-    if TG_PROXY_IP and TG_PROXY_PORT:
-        proxyStr = "http://{}:{}".format(TG_PROXY_IP, TG_PROXY_PORT)
-        proxies = {"http": proxyStr, "https": proxyStr}
-    response = requests.post(url=url, headers=headers, params=payload, proxies=proxies).json()
-    if response['ok']:
-        print('推送成功！')
-    else:
-        print('推送失败！')
+    print("qmsg 服务启动")
 
-def dingding_bot(title, content):
-    timestamp = str(round(time.time() * 1000))  # 时间戳
-    secret_enc = DD_BOT_SECRET.encode('utf-8')
-    string_to_sign = '{}\n{}'.format(timestamp, DD_BOT_SECRET)
-    string_to_sign_enc = string_to_sign.encode('utf-8')
-    hmac_code = hmac.new(secret_enc, string_to_sign_enc, digestmod=hashlib.sha256).digest()
-    sign = urllib.parse.quote_plus(base64.b64encode(hmac_code))  # 签名
-    print('开始使用 钉钉机器人 推送消息...', end='')
-    url = f'https://oapi.dingtalk.com/robot/send?access_token={DD_BOT_ACCESS_TOKEN}&timestamp={timestamp}&sign={sign}'
-    headers = {'Content-Type': 'application/json;charset=utf-8'}
-    data = {
-        'msgtype': 'text',
-        'text': {'content': f'{title}\n\n{content}'}
-    }
-    response = requests.post(url=url, data=json.dumps(data), headers=headers, timeout=15).json()
-    if not response['errcode']:
-        print('推送成功！')
-    else:
-        print('推送失败！')
+    url = f'https://qmsg.zendee.cn/{push_config.get("QMSG_TYPE")}/{push_config.get("QMSG_KEY")}'
+    payload = {"msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
+    response = requests.post(url=url, params=payload).json()
 
-def qywxapp_bot(title, content):
-    print("\n")
-    if not QYWX_APP:
-        print("企业微信应用的QYWX_APP未设置!!\n取消推送")
+    if response["code"] == 0:
+        print("qmsg 推送成功！")
+    else:
+        print(f'qmsg 推送失败！{response["reason"]}')
+
+
+def wecom_app(title: str, content: str) -> None:
+    """
+    通过 企业微信 APP 推送消息。
+    """
+    if not push_config.get("QYWX_AM"):
+        print("QYWX_AM 未设置!!\n取消推送")
         return
-    print("企业微信应用启动")
-    qywx_app_params = QYWX_APP.split(',')
-    url='https://qyapi.weixin.qq.com/cgi-bin/gettoken'
-    headers= {
-        'Content-Type': 'application/json',
-    }
-    payload = {
-        'corpid': qywx_app_params[0],
-        'corpsecret': qywx_app_params[1],
-    }
-    response = requests.post(url=url, headers=headers, data=json.dumps(payload), timeout=15).json()
-    accesstoken = response["access_token"]
-    html = content.replace("\n", "<br/>")
+    QYWX_AM_AY = re.split(",", push_config.get("QYWX_AM"))
+    if 4 < len(QYWX_AM_AY) > 5:
+        print("QYWX_AM 设置错误!!\n取消推送")
+        return
+    print("企业微信 APP 服务启动")
 
-    options = None
-    if not qywx_app_params[4]:
-        options = {
-            'msgtype': 'text',
-            'text': {
-                content: f'{title}\n\n${content}'
-            }
-        }
-    elif qywx_app_params[4] == '0':
-        options = {
-            'msgtype': 'textcard',
-            'textcard': {
-                title: f'{title}',
-                description: f'{content}',
-                btntxt: '更多'
-            }
-        }
-    elif qywx_app_params[4] == '1':
-        options = {
-            'msgtype': 'text',
-            'text': {
-                content: f'{title}\n\n${content}'
-            }
-        }
+    corpid = QYWX_AM_AY[0]
+    corpsecret = QYWX_AM_AY[1]
+    touser = QYWX_AM_AY[2]
+    agentid = QYWX_AM_AY[3]
+    try:
+        media_id = QYWX_AM_AY[4]
+    except IndexError:
+        media_id = ""
+    wx = WeCom(corpid, corpsecret, agentid)
+    # 如果没有配置 media_id 默认就以 text 方式发送
+    if not media_id:
+        message = title + "\n\n" + content
+        response = wx.send_text(message, touser)
     else:
-        options = {
-            'msgtype': 'mpnews',
-            'mpnews': {
-                'articles': [
+        response = wx.send_mpnews(title, content, media_id, touser)
+
+    if response == "ok":
+        print("企业微信推送成功！")
+    else:
+        print("企业微信推送失败！错误信息如下：\n", response)
+
+
+class WeCom:
+    def __init__(self, corpid, corpsecret, agentid):
+        self.CORPID = corpid
+        self.CORPSECRET = corpsecret
+        self.AGENTID = agentid
+
+    def get_access_token(self):
+        url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"
+        values = {
+            "corpid": self.CORPID,
+            "corpsecret": self.CORPSECRET,
+        }
+        req = requests.post(url, params=values)
+        data = json.loads(req.text)
+        return data["access_token"]
+
+    def send_text(self, message, touser="@all"):
+        send_url = (
+            "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="
+            + self.get_access_token()
+        )
+        send_values = {
+            "touser": touser,
+            "msgtype": "text",
+            "agentid": self.AGENTID,
+            "text": {"content": message},
+            "safe": "0",
+        }
+        send_msges = bytes(json.dumps(send_values), "utf-8")
+        respone = requests.post(send_url, send_msges)
+        respone = respone.json()
+        return respone["errmsg"]
+
+    def send_mpnews(self, title, message, media_id, touser="@all"):
+        send_url = (
+            "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="
+            + self.get_access_token()
+        )
+        send_values = {
+            "touser": touser,
+            "msgtype": "mpnews",
+            "agentid": self.AGENTID,
+            "mpnews": {
+                "articles": [
                     {
-                        'title': f'{title}',
-                        'thumb_media_id': f'{qywx_app_params[4]}',
-                        'author': '智能助手',
-                        'content_source_url': '',
-                        'content': f'{html}',
-                        'digest': f'{content}'
+                        "title": title,
+                        "thumb_media_id": media_id,
+                        "author": "Author",
+                        "content_source_url": "",
+                        "content": message.replace("\n", "<br/>"),
+                        "digest": message,
                     }
                 ]
+            },
         }
-        }
+        send_msges = bytes(json.dumps(send_values), "utf-8")
+        respone = requests.post(send_url, send_msges)
+        respone = respone.json()
+        return respone["errmsg"]
 
-    url=f"https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={accesstoken}"
-    data = {
-        'touser': f'{change_user_id(content)}',
-        'agentid': f'{qywx_app_params[3]}',
-        'safe': '0'
-    }
-    data.update(options)
-    headers = {
-        'Content-Type': 'application/json',
-    }
-    response = requests.post(url=url, headers=headers, data=json.dumps(data)).json()
 
-    if response['errcode'] == 0:
-        print('推送成功！')
-    else:
-        print('推送失败！')
-
-def change_user_id(desp):
-    qywx_app_params = QYWX_APP.split(',')
-    if qywx_app_params[2]:
-        userIdTmp = qywx_app_params[2].split("|")
-        userId = ""
-        for i in range(len(userIdTmp)):
-            count1 = f"账号{i + 1}"
-            count2 = f"签到号{i + 1}"
-            if re.search(count1, desp) or re.search(count2, desp):
-                userId = userIdTmp[i]
-        if not userId:
-            userId = qywx_app_params[2]
-        return userId
-    else:
-        return "@all"
-
-def send(title, content):
+def wecom_bot(title: str, content: str) -> None:
     """
-    使用 bark, telegram bot, dingding bot, serverJ 发送手机推送
-    :param title:
-    :param content:
+    通过 企业微信机器人 推送消息。
+    """
+    if not push_config.get("QYWX_KEY"):
+        print("企业微信机器人 服务的 QYWX_KEY 未设置!!\n取消推送")
+        return
+    print("企业微信机器人服务启动")
+
+    url = f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
+    headers = {"Content-Type": "application/json;charset=utf-8"}
+    data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
+    response = requests.post(
+        url=url, data=json.dumps(data), headers=headers, timeout=15
+    ).json()
+
+    if response["errcode"] == 0:
+        print("企业微信机器人推送成功！")
+    else:
+        print("企业微信机器人推送失败！")
+
+
+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 服务启动")
+
+    if push_config.get("TG_API_HOST"):
+        url = f"https://{push_config.get('TG_API_HOST')}/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
+    else:
+        url = (
+            f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
+        )
+    headers = {"Content-Type": "application/x-www-form-urlencoded"}
+    payload = {
+        "chat_id": str(push_config.get("TG_USER_ID")),
+        "text": f"{title}\n\n{content}",
+        "disable_web_page_preview": "true",
+    }
+    proxies = None
+    if push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"):
+        if push_config.get("TG_PROXY_AUTH") is not None and "@" not in push_config.get(
+            "TG_PROXY_HOST"
+        ):
+            push_config["TG_PROXY_HOST"] = (
+                push_config.get("TG_PROXY_AUTH")
+                + "@"
+                + push_config.get("TG_PROXY_HOST")
+            )
+        proxyStr = "http://{}:{}".format(
+            push_config.get("TG_PROXY_HOST"), push_config.get("TG_PROXY_PORT")
+        )
+        proxies = {"http": proxyStr, "https": proxyStr}
+    response = requests.post(
+        url=url, headers=headers, params=payload, proxies=proxies
+    ).json()
+
+    if response["ok"]:
+        print("tg 推送成功！")
+    else:
+        print("tg 推送失败！")
+
+
+def one() -> str:
+    """
+    获取一条一言。
     :return:
     """
-    for i in notify_mode:
-        if i == 'bark':
-            if BARK:
-                bark(title=title, content=content)
-            else:
-                print('未启用 bark')
-            continue
-        if i == 'sc_key':
-            if SCKEY:
-                serverJ(title=title, content=content)
-            else:
-                print('未启用 Server酱')
-            continue
-        elif i == 'dingding_bot':
-            if DD_BOT_ACCESS_TOKEN and DD_BOT_SECRET:
-                dingding_bot(title=title, content=content)
-            else:
-                print('未启用 钉钉机器人')
-            continue
-        elif i == 'telegram_bot':
-            if TG_BOT_TOKEN and TG_USER_ID:
-                telegram_bot(title=title, content=content)
-            else:
-                print('未启用 telegram机器人')
-            continue
-        elif i == 'qywxapp_bot':
-            if QYWX_APP:
-                qywxapp_bot(title=title, content=content)
-            else:
-                print('未启用 企业微信应用推送')
-            continue
-        else:
-            print('此类推送方式不存在')
+    url = "https://v1.hitokoto.cn/"
+    res = requests.get(url).json()
+    return res["hitokoto"] + "    ----" + res["from"]
+
+
+if push_config.get("BARK_PUSH"):
+    notify_function.append(bark)
+if push_config.get("CONSOLE"):
+    notify_function.append(console)
+if push_config.get("DD_BOT_TOKEN") and push_config.get("DD_BOT_SECRET"):
+    notify_function.append(dingding_bot)
+if push_config.get("FSKEY"):
+    notify_function.append(feishu_bot)
+if push_config.get("GOBOT_URL") and push_config.get("GOBOT_QQ"):
+    notify_function.append(go_cqhttp)
+if push_config.get("GOTIFY_URL") and push_config.get("GOTIFY_TOKEN"):
+    notify_function.append(gotify)
+if push_config.get("IGOT_PUSH_KEY"):
+    notify_function.append(iGot)
+if push_config.get("PUSH_KEY"):
+    notify_function.append(serverJ)
+if push_config.get("DEER_KEY"):
+    notify_function.append(pushdeer)
+if push_config.get("PUSH_PLUS_TOKEN"):
+    notify_function.append(pushplus_bot)
+if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"):
+    notify_function.append(qmsg_bot)
+if push_config.get("QYWX_AM"):
+    notify_function.append(wecom_app)
+if push_config.get("QYWX_KEY"):
+    notify_function.append(wecom_bot)
+if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
+    notify_function.append(telegram_bot)
+
+
+def send(title: str, content: str) -> None:
+    if not content:
+        print(f"{title} 推送内容为空！")
+        return
+
+    hitokoto = push_config.get("HITOKOTO")
+
+    text = one() if hitokoto else ""
+    content += "\n\n" + text
+
+    ts = [
+        threading.Thread(target=mode, args=(title, content), name=mode.__name__)
+        for mode in notify_function
+    ]
+    [t.start() for t in ts]
+    [t.join() for t in ts]
+
 
 def main():
-    send('title', 'content')
+    send("title", "content")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

sample/requirements.txt

@@ -1 +0,0 @@
-requests

sample/tool.ts

@@ -0,0 +1,36 @@
+import * as qiniu from 'qiniu';
+import dotenv from 'dotenv';
+const envFound = dotenv.config();
+
+const accessKey = process.env.QINIU_AK;
+const secretKey = process.env.QINIU_SK;
+const mac = new qiniu.auth.digest.Mac(accessKey, secretKey);
+const options = {
+  scope: process.env.QINIU_SCOPE,
+};
+const putPolicy = new qiniu.rs.PutPolicy(options);
+const uploadToken = putPolicy.uploadToken(mac);
+
+const localFile = 'src/version.ts';
+const config = new qiniu.conf.Config({ zone: qiniu.zone.Zone_z1 });
+const formUploader = new qiniu.form_up.FormUploader(config);
+const putExtra = new qiniu.form_up.PutExtra('', '', 'text/plain');
+const key = 'version.ts';
+// 文件上传
+formUploader.putFile(
+  uploadToken,
+  key,
+  localFile,
+  putExtra,
+  function (respErr, respBody, respInfo) {
+    if (respErr) {
+      throw respErr;
+    }
+    if (respInfo.statusCode == 200) {
+      console.log(respBody);
+    } else {
+      console.log(respInfo.statusCode);
+      console.log(respBody);
+    }
+  },
+);

shell/api.sh

@@ -6,7 +6,7 @@ get_token() {
 
 add_cron_api() {
     local currentTimeStamp=$(date +%s)
-    if [ $# -eq 1 ]; then
+    if [[ $# -eq 1 ]]; then
         local schedule=$(echo "$1" | awk -F ":" '{print $1}')
         local command=$(echo "$1" | awk -F ":" '{print $2}')
         local name=$(echo "$1" | awk -F ":" '{print $3}')
@@ -39,7 +39,7 @@ add_cron_api() {
 
 update_cron_api() {
     local currentTimeStamp=$(date +%s)
-    if [ $# -eq 1 ]; then
+    if [[ $# -eq 1 ]]; then
         local schedule=$(echo "$1" | awk -F ":" '{print $1}')
         local command=$(echo "$1" | awk -F ":" '{print $2}')
         local name=$(echo "$1" | awk -F ":" '{print $3}')
@@ -61,7 +61,7 @@ update_cron_api() {
             -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 "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"_id\":\"$id\"}" \
+            --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
             --compressed
     )
     code=$(echo $api | jq -r .code)
@@ -75,7 +75,7 @@ update_cron_api() {
 
 update_cron_command_api() {
     local currentTimeStamp=$(date +%s)
-    if [ $# -eq 1 ]; then
+    if [[ $# -eq 1 ]]; then
         local command=$(echo "$1" | awk -F ":" '{print $1}')
         local id=$(echo "$1" | awk -F ":" '{print $2}')
     else
@@ -93,7 +93,7 @@ update_cron_command_api() {
             -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 "{\"command\":\"$command\",\"_id\":\"$id\"}" \
+            --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
             --compressed
     )
     code=$(echo $api | jq -r .code)
@@ -153,6 +153,8 @@ update_cron() {
     local status="$2"
     local pid="${3:-''}"
     local logPath="$4"
+    local lastExecutingTime="${5:-0}"
+    local runningTime="${6:-0}"
     local currentTimeStamp=$(date +%s)
     local api=$(
         curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons/status?t=$currentTimeStamp" \
@@ -164,7 +166,7 @@ update_cron() {
             -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 "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\"}" \
+            --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
             --compressed
     )
     code=$(echo $api | jq -r .code)
@@ -174,4 +176,30 @@ update_cron() {
     fi
 }
 
+notify_api() {
+    local title=$1
+    local content=$1
+    local currentTimeStamp=$(date +%s)
+    local api=$(
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/system/notify?t=$currentTimeStamp" \
+            -X 'PUT' \
+            -H "Accept: application/json" \
+            -H "Authorization: Bearer $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 "{\"title\":\"$title\",\"content\":\"$content\"}" \
+            --compressed
+    )
+    code=$(echo $api | jq -r .code)
+    message=$(echo $api | jq -r .message)
+    if [[ $code == 200 ]]; then
+        echo -e "成功"
+    else
+        echo -e "失败(${message})"
+    fi
+}
+
 get_token

shell/bot.sh

@@ -1,27 +1,30 @@
 #!/usr/bin/env bash
 
 ## 导入通用变量与函数
-dir_shell=/ql/shell
+dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
-url="${github_proxy_url}https://github.com/SuMaiKaDe/bot.git"
-repo_path="${dir_repo}/dockerbot"
+
+if [[ -z ${BotRepoUrl} ]]; then
+  url="https://github.com/SuMaiKaDe/bot.git"
+  repo_path="${dir_repo}/dockerbot"
+else
+  url=${BotRepoUrl}
+  repo_path="${dir_repo}/diybot"
+fi
 
 echo -e "\n1、安装bot依赖...\n"
 apk --no-cache add -f zlib-dev gcc jpeg-dev python3-dev musl-dev freetype-dev
 echo -e "\nbot依赖安装成功...\n"
 
 echo -e "2、下载bot所需文件...\n"
-if [ -d ${repo_path}/.git ]; then
-    reset_romote_url ${repo_path} "${url}"
-    git_pull_scripts ${repo_path}
-else
+if [[ ! -d ${repo_path}/.git ]]; then
   rm -rf ${repo_path}
   git_clone_scripts ${url} ${repo_path} "main"
 fi
 
-cp -rf "$repo_path/jbot" $dir_root
-if [[ ! -f "$dir_root/config/bot.json" ]]; then
-  cp -f "$repo_path/config/bot.json" "$dir_root/config"
+cp -rf "$repo_path/jbot" $dir_data
+if [[ ! -f "$dir_config/bot.json" ]]; then
+  cp -f "$repo_path/config/bot.json" "$dir_config"
 fi
 echo -e "\nbot文件下载成功...\n"
 
@@ -29,14 +32,21 @@ echo -e "3、安装python3依赖...\n"
 if [[ $PipMirror ]]; then
   pip3 config set global.index-url $PipMirror
 fi
-cp -f "$repo_path/jbot/requirements.txt" "$dir_root"
-cd $dir_root
-pip3 --default-timeout=100 install -r requirements.txt --no-cache-dir
+cp -f "$repo_path/jbot/requirements.txt" "$dir_data"
+
+cd $dir_data
+cat requirements.txt | while read LREAD
+do
+if [[ ! $(pip3 show "${LREAD%%=*}" 2>/dev/null) ]]; then
+  pip3 --default-timeout=100 install ${LREAD}
+fi
+done
+
 echo -e "\npython3依赖安装成功...\n"
 
 echo -e "4、启动bot程序...\n"
 make_dir $dir_log/bot
-cd $dir_root
+cd $dir_data
 ps -ef | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
 nohup python3 -m jbot >$dir_log/bot/nohup.log 2>&1 &
 echo -e "bot启动成功...\n"

shell/check.sh

@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
-dir_shell=/ql/shell
+dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
-get_token
 
 reset_env() {
   echo -e "---> 1. 开始检测配置文件\n"
@@ -18,38 +17,39 @@ reset_env() {
   cp -f $dir_sample/package.json $dir_scripts/package.json
   npm_install_2 $dir_scripts
   echo -e "---> 脚本依赖安装完成\n"
+}
 
-  echo -e "---> 4. 复制通知文件\n"
+copy_dep() {
+  echo -e "---> 1. 复制通知文件\n"
   echo -e "---> 复制一份 $file_notify_py_sample 为 $file_notify_py\n"
   cp -fv $file_notify_py_sample $file_notify_py
   echo
   echo -e "---> 复制一份 $file_notify_js_sample 为 $file_notify_js\n"
   cp -fv $file_notify_js_sample $file_notify_js
   echo -e "---> 通知文件复制完成\n"
+
+  echo -e "---> 2. 复制nginx配置文件\n"
+  cp -fv $nginx_conf /etc/nginx/nginx.conf
+  cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
+  echo -e "---> 配置文件复制完成\n"
 }
 
 reload_pm2() {
-  pm2 l >/dev/null 2>&1
+  pm2 l &>/dev/null
 
-  if [[ $(pm2 info panel 2>/dev/null) ]]; then
-    pm2 reload panel --source-map-support --time >/dev/null 2>&1
-  else
-    pm2 start $dir_root/build/app.js -n panel --source-map-support --time >/dev/null 2>&1
-  fi
+  pm2 delete panel --source-map-support --time &>/dev/null
+  pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
 
-  if [[ $(pm2 info schedule 2>/dev/null) ]]; then
-    pm2 reload schedule --source-map-support --time >/dev/null 2>&1
-  else
-    pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time >/dev/null 2>&1
-  fi
+  pm2 delete schedule --source-map-support --time &>/dev/null
+  pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
 }
 
 pm2_log() {
   echo -e "---> pm2日志"
   local panelOut="/root/.pm2/logs/panel-out.log"
   local panelError="/root/.pm2/logs/panel-error.log"
-  tail -n 20 "$panelOut"
-  tail -n 20 "$panelError"
+  tail -n 100 "$panelOut"
+  tail -n 100 "$panelError"
 }
 
 check_nginx() {
@@ -57,6 +57,7 @@ check_nginx() {
   echo -e "=====> 检测nginx服务\n$nginxPid"
   if [[ $nginxPid ]]; then
     echo -e "\n=====> nginx服务正常\n"
+    nginx -s reload
   else
     echo -e "\n=====> nginx服务异常，重新启动nginx\n"
     nginx -c /etc/nginx/nginx.conf
@@ -95,20 +96,10 @@ check_pm2() {
   fi
 }
 
-init_git() {
-  local dir_current=$(pwd)
-
-  cd $dir_root
-  git config --global user.email "qinglong@@users.noreply.github.com"
-  git config --global user.name "qinglong"
-  git config --global pull.rebase true
-
-  cd $dir_current
-}
-
 main() {
   echo -e "=====> 开始检测"
-  init_git
+  pnpm install -g pm2
+  copy_dep
   check_ql
   check_nginx
   check_pm2

shell/notify.js

@@ -1,5 +0,0 @@
-const notify = require('/ql/scripts/sendNotify.js');
-const title = process.argv[2];
-const content = process.argv[3];
-
-notify.sendNotify(`${title}`, `${content}`);

shell/notify.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-#author:spark thanks to: https://github.com/sparkssssssss/scripts
-
-. /ql/config/config.sh
-title=$(echo $1|sed 's/-/_/g')
-msg=$(echo -e $2)
-
-node /ql/shell/notify.js "$title" "$msg"

shell/rmlog.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ## 导入通用变量与函数
-dir_shell=/ql/shell
+dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 
 days=$1
@@ -27,7 +27,7 @@ remove_js_log() {
 remove_empty_dir() {
     cd $dir_log
     for dir in $(ls); do
-        if [ -d $dir ] && [[ -z $(ls $dir) ]]; then
+        if [[ -d $dir ]] && [[ -z $(ls $dir) ]]; then
             rm -rf $dir
         fi
     done

shell/share.sh

@@ -1,15 +1,18 @@
 #!/usr/bin/env bash
 
 ## 目录
-dir_root=/ql
+dir_root=$QL_DIR
+dir_data=$dir_root/data
 dir_shell=$dir_root/shell
 dir_sample=$dir_root/sample
-dir_config=$dir_root/config
-dir_scripts=$dir_root/scripts
-dir_repo=$dir_root/repo
-dir_raw=$dir_root/raw
-dir_log=$dir_root/log
-dir_db=$dir_root/db
+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_code=$dir_log/code
 dir_update_log=$dir_log/update
@@ -32,6 +35,10 @@ file_notify_py_sample=$dir_sample/notify.py
 file_notify_py=$dir_scripts/notify.py
 file_notify_js=$dir_scripts/sendNotify.js
 task_error_log_path=$dir_log/task_error.log
+nginx_app_conf=$dir_root/docker/front.conf
+nginx_conf=$dir_root/docker/nginx.conf
+dep_notify_py=$dir_dep/notify.py
+dep_notify_js=$dir_dep/sendNotify.js
 
 ## 清单文件
 list_crontab_user=$dir_config/crontab.list
@@ -55,15 +62,35 @@ original_name=(
 
 init_env() {
     export NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules
+    export PYTHONUNBUFFERED=1
 }
 
 import_config() {
-    [ -f $file_config_user ] && . $file_config_user
-    [ -f $file_env ] && . $file_env
+    [[ -f $file_config_user ]] && . $file_config_user
+    [[ -f $file_env ]] && . $file_env
 
     command_timeout_time=${CommandTimeoutTime:-"1h"}
-    github_proxy_url=${GithubProxyUrl:-""}
+    proxy_url=${ProxyUrl:-""}
     file_extensions=${RepoFileExtensions:-"js py"}
+    current_branch=${QL_BRANCH}
+
+    if [[ -n "${DefaultCronRule}" ]]; then
+        default_cron="${DefaultCronRule}"
+    else
+        default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
+    fi
+}
+
+set_proxy() {
+    if [[ $proxy_url ]]; then
+        export http_proxy="${proxy_url}"
+        export https_proxy="${proxy_url}"
+    fi
+}
+
+unset_proxy() {
+    unset http_proxy
+    unset https_proxy
 }
 
 make_dir() {
@@ -93,7 +120,7 @@ gen_random_num() {
 link_shell_sub() {
     local link_path="$1"
     local original_path="$2"
-    if [ ! -L $link_path ] || [[ $(readlink -f $link_path) != $original_path ]]; then
+    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
@@ -102,7 +129,7 @@ link_shell_sub() {
 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
+    elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
         local path="/usr/local/bin/"
     else
         local path=""
@@ -117,16 +144,16 @@ link_shell() {
 
 define_cmd() {
     local cmd_prefix cmd_suffix
-    if type task >/dev/null 2>&1; then
+    if type task &>/dev/null; then
         cmd_suffix=""
-        if [ -x "$dir_shell/task.sh" ]; then
+        if [[ -f "$dir_shell/task.sh" ]]; then
             cmd_prefix=""
         else
             cmd_prefix="bash "
         fi
     else
         cmd_suffix=".sh"
-        if [ -x "$dir_shell/task.sh" ]; then
+        if [[ -f "$dir_shell/task.sh" ]]; then
             cmd_prefix="$dir_shell/"
         else
             cmd_prefix="bash $dir_shell/"
@@ -138,6 +165,8 @@ define_cmd() {
 }
 
 fix_config() {
+    make_dir $dir_static
+    make_dir $dir_data
     make_dir $dir_config
     make_dir $dir_log
     make_dir $dir_db
@@ -146,70 +175,86 @@ fix_config() {
     make_dir $dir_repo
     make_dir $dir_raw
     make_dir $dir_update_log
+    make_dir $dir_dep
 
-    if [ ! -s $file_config_user ]; then
+    if [[ ! -s $file_config_user ]]; then
         echo -e "复制一份 $file_config_sample 为 $file_config_user，随后请按注释编辑你的配置文件：$file_config_user\n"
         cp -fv $file_config_sample $file_config_user
         echo
     fi
 
-    if [ ! -f $file_env ]; then
+    if [[ ! -f $file_env ]]; then
         echo -e "检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...\n"
         touch $file_env
         echo
     fi
 
-    if [ ! -f $file_task_before ]; then
+    if [[ ! -f $file_task_before ]]; then
         echo -e "复制一份 $file_task_sample 为 $file_task_before\n"
         cp -fv $file_task_sample $file_task_before
         echo
     fi
 
-    if [ ! -f $file_task_after ]; then
+    if [[ ! -f $file_task_after ]]; then
         echo -e "复制一份 $file_task_sample 为 $file_task_after\n"
         cp -fv $file_task_sample $file_task_after
         echo
     fi
 
-    if [ ! -f $file_extra_shell ]; then
+    if [[ ! -f $file_extra_shell ]]; then
         echo -e "复制一份 $file_extra_sample 为 $file_extra_shell\n"
         cp -fv $file_extra_sample $file_extra_shell
         echo
     fi
 
-    if [ ! -s $file_auth_user ]; then
+    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
+    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
         echo
     fi
 
-    if [ ! -s $file_notify_js ]; then
+    if [[ ! -s $file_notify_js ]]; then
         echo -e "复制一份 $file_notify_js_sample 为 $file_notify_js\n"
         cp -fv $file_notify_js_sample $file_notify_js
         echo
     fi
 
-    if [ -s /etc/nginx/conf.d/default.conf ]; then
+    if [[ -s /etc/nginx/conf.d/default.conf ]]; then
         echo -e "检测到默认nginx配置文件，清空...\n"
-        echo '' > /etc/nginx/conf.d/default.conf
+        cat /dev/null >/etc/nginx/conf.d/default.conf
         echo
     fi
+
+    if [[ ! -s $dep_notify_js ]]; then
+        echo -e "复制一份 $file_notify_js_sample 为 $dep_notify_js\n"
+        cp -fv $file_notify_js_sample $dep_notify_js
+        echo
+    fi
+
+    if [[ ! -s $dep_notify_py ]]; then
+        echo -e "复制一份 $file_notify_py_sample 为 $dep_notify_py\n"
+        cp -fv $file_notify_py_sample $dep_notify_py
+        echo
+    fi
+
 }
 
 npm_install_sub() {
+    set_proxy
     if [ $is_termux -eq 1 ]; then
-        npm install --production --no-save --no-bin-links --registry=https://registry.npm.taobao.org || npm install --production --no-bin-links --no-save
-    elif ! type pnpm >/dev/null 2>&1; then
-        npm install --production --no-save --registry=https://registry.npm.taobao.org || npm install --production --no-save
+        npm install --production --no-bin-links --registry=https://registry.npm.taobao.org || npm install --production --no-bin-links
+    elif ! type pnpm &>/dev/null; then
+        npm install --production --registry=https://registry.npm.taobao.org || npm install --production
     else
-        pnpm install --prod
+        pnpm install --production --registry=https://registry.npm.taobao.org || pnpm install --production
     fi
+    unset_proxy
 }
 
 npm_install_1() {
@@ -240,7 +285,7 @@ npm_install_2() {
 diff_and_copy() {
     local copy_source=$1
     local copy_to=$2
-    if [ ! -s $copy_to ] || [[ $(diff $copy_source $copy_to) ]]; then
+    if [[ ! -s $copy_to ]] || [[ $(diff $copy_source $copy_to) ]]; then
         cp -f $copy_source $copy_to
     fi
 }
@@ -248,17 +293,11 @@ diff_and_copy() {
 update_depend() {
     local dir_current=$(pwd)
 
-    if [ ! -s $dir_scripts/package.json ] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+    if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
         cp -f $dir_sample/package.json $dir_scripts/package.json
         npm_install_2 $dir_scripts
     fi
 
-    if [ ! -s $dir_scripts/requirements.txt ] || [[ $(diff $dir_sample/requirements.txt $dir_scripts/requirements.txt) ]]; then
-        cp -f $dir_sample/requirements.txt $dir_scripts/requirements.txt
-        cd $dir_scripts
-        pip3 install -r $dir_scripts/requirements.txt
-    fi
-
     cd $dir_current
 }
 
@@ -266,23 +305,29 @@ git_clone_scripts() {
     local url=$1
     local dir=$2
     local branch=$3
-    [[ $branch ]] && local cmd="-b $branch "
+    [[ $branch ]] && local part_cmd="-b $branch "
     echo -e "开始克隆仓库 $url 到 $dir\n"
-    git clone $cmd $url $dir
+
+    set_proxy
+    git clone $part_cmd $url $dir
     exit_status=$?
+    unset_proxy
 }
 
 git_pull_scripts() {
     local dir_current=$(pwd)
     local dir_work="$1"
     local branch="$2"
-    [[ $branch ]] && local cmd="origin/${branch}"
     cd $dir_work
     echo -e "开始更新仓库：$dir_work\n"
+
+    set_proxy
     git fetch --all
     exit_status=$?
-    git reset --hard $cmd
-    git pull
+    git pull &>/dev/null
+    unset_proxy
+    reset_branch "$branch"
+
     cd $dir_current
 }
 
@@ -292,20 +337,37 @@ reset_romote_url() {
     local url=$2
     local branch="$3"
 
-    [[ $branch ]] && local cmd="origin/${branch}"
-
-    if [ -d "$dir_work/.git" ]; then
+    if [[ -d "$dir_work/.git" ]]; then
         cd $dir_work
-        git remote set-url origin $url >/dev/null
-        git reset --hard $cmd >/dev/null
+        [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
+        git remote set-url origin $url &>/dev/null
+
+        local part_cmd=""
+        reset_branch "$branch"
         cd $dir_current
     fi
 }
 
+reset_branch() {
+    local branch="$1"
+    if [[ $branch ]]; then
+        part_cmd="origin/${branch}"
+        git checkout -B "$branch"
+        git branch --set-upstream-to=$part_cmd $branch
+    fi
+    git reset --hard $part_cmd &>/dev/null
+}
+
+random_range() {
+    local beg=$1
+    local end=$2
+    echo $((RANDOM % ($end - $beg) + $beg))
+}
+
 init_env
 detect_termux
 detect_macos
 define_cmd
+fix_config
 
-[ -f $task_error_log_path ] && rm $task_error_log_path
-import_config $1 >> $task_error_log_path 2>&1
+import_config $1 >$task_error_log_path 2>&1

shell/task.sh

@@ -1,20 +1,20 @@
 #!/usr/bin/env bash
 
 ## 导入通用变量与函数
-dir_shell=/ql/shell
+dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
 ## 选择python3还是node
 define_program() {
-    local p1=$1
-    if [[ $p1 == *.js ]]; then
+    local first_param=$1
+    if [[ $first_param == *.js ]]; then
         which_program="node"
-    elif [[ $p1 == *.py ]]; then
+    elif [[ $first_param == *.py ]] || [[ $first_param == *.pyc ]]; then
         which_program="python3"
-    elif [[ $p1 == *.sh ]]; then
+    elif [[ $first_param == *.sh ]]; then
         which_program="bash"
-    elif [[ $p1 == *.ts ]]; then
+    elif [[ $first_param == *.ts ]]; then
         which_program="ts-node-transpile-only"
     else
         which_program=""
@@ -39,7 +39,7 @@ gen_array_scripts() {
     local i="-1"
     cd $dir_scripts
     for file in $(ls); do
-        if [ -f $file ] && [[ $file == *.js && $file != sendNotify.js ]]; then
+        if [[ -f $file ]] && [[ $file == *.js && $file != sendNotify.js ]]; then
             let i++
             array_scripts[i]=$(echo "$file" | perl -pe "s|$dir_scripts/||g")
             array_scripts_name[i]=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1)
@@ -56,7 +56,8 @@ usage() {
     echo -e "task命令运行本程序自动添加进crontab的脚本，需要输入脚本的绝对路径或去掉 “$dir_scripts/” 目录后的相对路径（定时任务中请写作相对路径），用法为："
     echo -e "1.$cmd_task <file_name>                                             # 依次执行，如果设置了随机延迟，将随机延迟一定秒数"
     echo -e "2.$cmd_task <file_name> now                                         # 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日志，同时记录在日志文件中"
-    echo -e "3.$cmd_task <file_name> conc <环境变量名>  # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日志，直接记录在日志文件中"
+    echo -e "3.$cmd_task <file_name> conc <环境变量名称> <账号编号，空格分隔>(可选的)  # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日志，直接记录在日志文件中，且可指定账号执行"
+    echo -e "4.$cmd_task <file_name> desi <环境变量名称> <账号编号，空格分隔>         # 指定账号执行，无论是否设置了随机延迟，均立即运行"
     if [[ ${#array_scripts[*]} -gt 0 ]]; then
         echo -e "\n当前有以下脚本可以运行:"
         for ((i = 0; i < ${#array_scripts[*]}; i++)); do
@@ -75,134 +76,269 @@ run_nohup() {
 
 ## 正常运行单个脚本，$1：传入参数
 run_normal() {
-    local p1=$1
-    cd $dir_scripts
-    define_program "$p1"
-    if [[ $p1 == *.js ]]; then
+    local first_param=$1
+    define_program "$first_param"
+    if [[ $first_param == *.js ]]; then
         if [[ $# -eq 1 ]]; then
             random_delay
         fi
     fi
+
     log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_dir_tmp="${p1##*/}"
+    log_dir_tmp="${first_param##*/}"
+    log_dir_tmp_path="${first_param%%/*}"
+    log_dir_tmp_path="${log_dir_tmp_path##*/}"
+    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
     log_dir="$dir_log/${log_dir_tmp%%.*}"
     log_path="$log_dir/$log_time.log"
+    cmd="&>> $log_path"
+    [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$log_dir"
 
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $p1" | perl -pe "s|.*ID=(.*) $cmd_task $p1\.*|\1|" | head -1 | awk -F " " '{print $1}')
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    echo -e "## 开始执行... $begin_time\n" >> $log_path
-    cat $task_error_log_path >> $log_path
+    local begin_timestamp=$(date "+%s")
+    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
 
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
-    . $file_task_before >> $log_path 2>&1
+    local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
+    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
+    eval . $file_task_before "$@" $cmd
 
-    timeout -k 10s $command_timeout_time $which_program $p1 >> $log_path 2>&1
+    cd $dir_scripts
+    local relative_path="${first_param%/*}"
+    if [[ ! -z ${relative_path} ]] && [[ ${first_param} =~ "/" ]]; then
+        cd ${relative_path}
+        first_param=${first_param/$relative_path\//}
+    fi
+    eval timeout -k 10s $command_timeout_time $which_program $first_param $cmd
 
-    . $file_task_after >> $log_path 2>&1
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
+    eval . $file_task_after "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >> $log_path
+    local end_timestamp=$(date "+%s")
+    local diff_time=$(( $end_timestamp - $begin_timestamp ))
+    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
 }
 
 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
 run_concurrent() {
-    local p1=$1
-    local p3=$3
-    if [[ ! $p3 ]]; then
+    local first_param="$1"
+    local env_param="$2"
+    local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
+    if [[ ! $env_param ]]; then
         echo -e "\n 缺少并发运行的环境变量参数"
         exit 1
     fi
 
-    cd $dir_scripts
-    define_program "$p1"
+    local envs=$(eval echo "\$${env_param}")
+    local array=($(echo $envs | sed 's/&/ /g'))
+    local tempArr=$(echo $num_param | 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=$(echo ${array_run[*]} | sed 's/\ /\&/g')
+    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+
+    define_program "$first_param"
     log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_dir_tmp="${p1##*/}"
+    log_dir_tmp="${first_param##*/}"
+    log_dir_tmp_path="${first_param%%/*}"
+    log_dir_tmp_path="${log_dir_tmp_path##*/}"
+    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
     log_dir="$dir_log/${log_dir_tmp%%.*}"
     log_path="$log_dir/$log_time.log"
+    cmd="&>> $log_path"
+    [[ "$show_log" == "true" ]] && cmd=""
     make_dir $log_dir
 
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $p1" | perl -pe "s|.*ID=(.*) $cmd_task $p1\.*|\1|" | head -1 | awk -F " " '{print $1}')
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    echo -e "## 开始执行... $begin_time\n" >> $log_path
-    cat $task_error_log_path >> $log_path
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
-    . $file_task_before >> $log_path 2>&1
+    local begin_timestamp=$(date "+%s")
 
-    local envs=$(eval echo "\$${p3}")
+    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
+
+    local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
+    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
+    eval . $file_task_before "$@" $cmd
+
+    local envs=$(eval echo "\$${env_param}")
     local array=($(echo $envs | sed 's/&/ /g'))
     single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
+
+    cd $dir_scripts
+    local relative_path="${first_param%/*}"
+    if [[ ! -z ${relative_path} ]] && [[ ${first_param} =~ "/" ]]; then
+        cd ${relative_path}
+        first_param=${first_param/$relative_path\//}
+    fi
     for i in "${!array[@]}"; do
-        export ${p3}=${array[i]}
+        export ${env_param}=${array[i]}
         single_log_path="$log_dir/${single_log_time}_$((i + 1)).log"
-        timeout -k 10s $command_timeout_time $which_program $p1 &>$single_log_path 2>&1 &
+        timeout -k 10s $command_timeout_time $which_program $first_param &>$single_log_path &
     done
 
     wait
     for i in "${!array[@]}"; do
         single_log_path="$log_dir/${single_log_time}_$((i + 1)).log"
-        cat $single_log_path >> $log_path
-        [ -f $single_log_path ] && rm -f $single_log_path
+        eval cat $single_log_path $cmd
+        [[ -f $single_log_path ]] && rm -f $single_log_path
     done
 
-    . $file_task_after >> $log_path 2>&1
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
+    eval . $file_task_after "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >> $log_path
+    local end_timestamp=$(date "+%s")
+    local diff_time=$(( $end_timestamp - $begin_timestamp ))
+    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
+}
+
+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"
+        exit 1
+    fi
+
+    define_program "$file_param"
+    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
+    log_dir_tmp="${file_param##*/}"
+    log_dir_tmp_path="${file_param%%/*}"
+    log_dir_tmp_path="${log_dir_tmp_path##*/}"
+    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
+    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_path="$log_dir/$log_time.log"
+    cmd="&>> $log_path"
+    [[ "$show_log" == "true" ]] && cmd=""
+    make_dir $log_dir
+
+    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
+    local begin_timestamp=$(date "+%s")
+
+    local envs=$(eval echo "\$${env_param}")
+    local array=($(echo $envs | sed 's/&/ /g'))
+    local tempArr=$(echo $num_param | 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=$(echo ${array_run[*]} | sed 's/\ /\&/g')
+    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+
+    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
+
+    local 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}')
+    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
+    eval . $file_task_before "$@" $cmd
+
+    cd $dir_scripts
+    local relative_path="${file_param%/*}"
+    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+        cd ${relative_path}
+        file_param=${file_param/$relative_path\//}
+    fi
+    eval timeout -k 10s $command_timeout_time $which_program $file_param $cmd
+
+    eval . $file_task_after "$@" $cmd
+    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
+    local end_timestamp=$(date "+%s")
+    local diff_time=$(( $end_timestamp - $begin_timestamp ))
+    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
 }
 
 ## 运行其他命令
 run_else() {
-    local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    local log_dir_tmp="${1##*/}"
-    local log_dir="$dir_log/${log_dir_tmp%%.*}"
+    local file_param="$1"
+    define_program "$file_param"
+    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
+    log_dir_tmp="${file_param##*/}"
+    log_dir_tmp_path="${file_param%%/*}"
+    log_dir_tmp_path="${log_dir_tmp_path##*/}"
+    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
+    log_dir="$dir_log/${log_dir_tmp%%.*}"
     log_path="$log_dir/$log_time.log"
-    make_dir "$log_dir"
+    cmd="&>> $log_path"
+    [[ "$show_log" == "true" ]] && cmd=""
+    make_dir $log_dir
 
-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $p1" | perl -pe "s|.*ID=(.*) $cmd_task $p1\.*|\1|" | head -1 | awk -F " " '{print $1}')
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    echo -e "## 开始执行... $begin_time\n" >> $log_path
-    cat $task_error_log_path >> $log_path
+    local begin_timestamp=$(date "+%s")
 
-    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
-    . $file_task_before >> $log_path 2>&1
+    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
+    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
 
-    timeout -k 10s $command_timeout_time "$@" >> $log_path 2>&1
+    local id=$(cat $list_crontab_user | grep -E "$cmd_task $@" | perl -pe "s|.*ID=(.*) $cmd_task $@\.*|\1|" | head -1 | awk -F " " '{print $1}')
+    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
+    eval . $file_task_before "$@" $cmd
 
-    . $file_task_after >> $log_path 2>&1
-    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
+    cd $dir_scripts
+    local relative_path="${file_param%/*}"
+    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+        cd ${relative_path}
+        file_param=${file_param/$relative_path\//}
+    fi
+
+    shift
+    eval timeout -k 10s $command_timeout_time $which_program "$file_param" "$@" $cmd
+
+    eval . $file_task_after "$file_param" "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >> $log_path
+    local end_timestamp=$(date "+%s")
+    local diff_time=$(( $end_timestamp - $begin_timestamp ))
+    [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
 }
 
 ## 命令检测
 main() {
+    show_log="false"
+    while getopts ":l" opt
+    do
+        case $opt in
+            l)
+                show_log="true"
+                ;;
+        esac
+    done
+    [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
+
     if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
         case $# in
         1)
-            run_normal $1
+            run_normal "$1"
             ;;
-        2 | 3)
+        *)
             case $2 in
             now)
-                run_normal $1 $2
+                run_normal "$1" "$2"
                 ;;
             conc)
-                run_concurrent $1 $2 $3
+                run_concurrent "$1" "$3" "$*"
+                ;;
+            desi)
+                run_designated "$1" "$3" "$*"
                 ;;
             *)
                 run_else "$@"
                 ;;
             esac
             ;;
-        *)
-            run_else "$@"
-            ;;
         esac
-        cat $log_path
+        [[ -f $log_path ]] && cat $log_path
     elif [[ $# -eq 0 ]]; then
         echo
         usage

shell/update.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-dir_shell=/ql/shell
+dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
@@ -12,12 +12,12 @@ diff_cron() {
     local list_task="$2"
     local list_add="$3"
     local list_drop="$4"
-    if [ -s $list_task ]; then
+    if [[ -s $list_task ]]; then
         grep -vwf $list_task $list_scripts >$list_add
-    elif [ ! -s $list_task ] && [ -s $list_scripts ]; then
+    elif [[ ! -s $list_task ]] && [[ -s $list_scripts ]]; then
         cp -f $list_scripts $list_add
     fi
-    if [ -s $list_scripts ]; then
+    if [[ -s $list_scripts ]]; then
         grep -vwf $list_scripts $list_task >$list_drop
     else
         cp -f $list_task $list_drop
@@ -28,26 +28,26 @@ diff_cron() {
 detect_config_version() {
     ## 识别出两个文件的版本号
     ver_config_sample=$(grep " Version: " $file_config_sample | perl -pe "s|.+v((\d+\.?){3})|\1|")
-    [ -f $file_config_user ] && ver_config_user=$(grep " Version: " $file_config_user | perl -pe "s|.+v((\d+\.?){3})|\1|")
+    [[ -f $file_config_user ]] && ver_config_user=$(grep " Version: " $file_config_user | perl -pe "s|.+v((\d+\.?){3})|\1|")
 
     ## 删除旧的发送记录文件
-    [ -f $send_mark ] && [[ $(cat $send_mark) != $ver_config_sample ]] && rm -f $send_mark
+    [[ -f $send_mark ]] && [[ $(cat $send_mark) != $ver_config_sample ]] && rm -f $send_mark
 
     ## 识别出更新日期和更新内容
     update_date=$(grep " Date: " $file_config_sample | awk -F ": " '{print $2}')
     update_content=$(grep " Update Content: " $file_config_sample | awk -F ": " '{print $2}')
 
     ## 如果是今天，并且版本号不一致，则发送通知
-    if [ -f $file_config_user ] && [[ $ver_config_user != $ver_config_sample ]] && [[ $update_date == $(date "+%Y-%m-%d") ]]; then
-        if [ ! -f $send_mark ]; then
+    if [[ -f $file_config_user ]] && [[ $ver_config_user != $ver_config_sample ]] && [[ $update_date == $(date "+%Y-%m-%d") ]]; then
+        if [[ ! -f $send_mark ]]; then
             local notify_title="配置文件更新通知"
             local notify_content="更新日期: $update_date\n用户版本: $ver_config_user\n新的版本: $ver_config_sample\n更新内容: $update_content\n更新说明: 如需使用新功能请对照config.sample.sh，将相关新参数手动增加到你自己的config.sh中，否则请无视本消息。本消息只在该新版本配置文件更新当天发送一次。\n"
             echo -e $notify_content
-            notify "$notify_title" "$notify_content"
+            notify_api "$notify_title" "$notify_content"
             [[ $? -eq 0 ]] && echo $ver_config_sample >$send_mark
         fi
     else
-        [ -f $send_mark ] && rm -f $send_mark
+        [[ -f $send_mark ]] && rm -f $send_mark
     fi
 }
 
@@ -55,7 +55,7 @@ detect_config_version() {
 output_list_add_drop() {
     local list=$1
     local type=$2
-    if [ -s $list ]; then
+    if [[ -s $list ]]; then
         echo -e "检测到有$type的定时任务：\n"
         cat $list
         echo
@@ -91,7 +91,7 @@ del_cron() {
     done
     if [[ $ids ]]; then
         result=$(del_cron_api "$ids")
-        notify "$path 删除任务${result}" "$detail"
+        notify_api "$path 删除任务${result}" "$detail"
     fi
 }
 
@@ -104,8 +104,9 @@ add_cron() {
     local detail=""
     cd $dir_scripts
     for file in $(cat $list_add); do
-        local file_name=${file/${path}\_/}
-        if [ -f $file ]; then
+        local file_name=${file/${path}\//}
+        file_name=${file_name/${path}\_/}
+        if [[ -f $file ]]; then
             cron_line=$(
                 perl -ne "{
                         print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$file_name/
@@ -120,7 +121,7 @@ add_cron() {
             [[ -z $cron_name ]] && cron_name="$file_name"
             [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
             [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
-            [[ -z $cron_line ]] && cron_line="0 6 * * *"
+            [[ -z $cron_line ]] && cron_line="$default_cron"
             result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name")
             echo -e "$result"
             if [[ $detail ]]; then
@@ -130,7 +131,7 @@ add_cron() {
             fi
         fi
     done
-    notify "$path 新增任务" "$detail"
+    notify_api "$path 新增任务" "$detail"
 }
 
 ## 更新仓库
@@ -147,32 +148,21 @@ update_repo() {
 
     local repo_path="${dir_repo}/${uniq_path}"
 
+    make_dir "${dir_scripts}/${uniq_path}"
+
     local formatUrl="$url"
-    if [[ $github_proxy_url ]]; then
-        if [[ $url =~ "github.com" ]] || [[ $url =~ "githubusercontent.com" ]]; then
-            [[ ! $url =~ "https://ghproxy.com" ]] && formatUrl="${github_proxy_url}${url}"
-        fi
-    fi
-    if [ -d ${repo_path}/.git ]; then
+    if [[ -d ${repo_path}/.git ]]; then
         reset_romote_url ${repo_path} "${formatUrl}" "${branch}"
         git_pull_scripts ${repo_path} "${branch}"
     else
         git_clone_scripts "${formatUrl}" ${repo_path} "${branch}"
     fi
-    if [[ $exit_status -eq 0 ]]; then
-        echo -e "\n更新${repo_path}成功...\n"
-        diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence"
-    else
-        echo -e "\n更新${repo_path}失败，重新下载全新仓库...\n"
-        rm -rf ${repo_path}
-        git_clone_scripts "${formatUrl}" ${repo_path} "${branch}"
     if [[ $exit_status -eq 0 ]]; then
         echo -e "\n更新${repo_path}成功...\n"
         diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence"
     else
         echo -e "\n更新${repo_path}失败，请检查网络...\n"
     fi
-    fi
 }
 
 ## 更新所有 raw 文件
@@ -180,15 +170,14 @@ update_raw() {
     echo -e "--------------------------------------------------------------\n"
     local url="$1"
     local raw_url="$url"
-    if [[ $github_proxy_url ]]; then
-        if [[ $url =~ "github.com" ]] || [[ $url =~ "githubusercontent.com" ]]; then
-            [[ ! $url =~ "https://ghproxy.com" ]] && raw_url="${github_proxy_url}${url}"
-        fi
-    fi
     local suffix="${raw_url##*.}"
     local raw_file_name="${uniq_path}.${suffix}"
     echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"
+
+    set_proxy
     wget -q --no-check-certificate -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+    unset_proxy
+
     if [[ $? -eq 0 ]]; then
         mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
         echo -e "下载 ${raw_file_name} 成功...\n"
@@ -210,16 +199,16 @@ update_raw() {
         [[ -z $cron_name ]] && cron_name="$raw_file_name"
         [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
         [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
-        [[ -z $cron_line ]] && cron_line="0 6 * * *"
+        [[ -z $cron_line ]] && cron_line="$default_cron"
         if [[ -z $cron_id ]]; then
             result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
             echo -e "$result\n"
-            notify "新增任务通知" "\n$result"
+            notify_api "新增任务通知" "\n$result"
             # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
         fi
     else
         echo -e "下载 ${raw_file_name} 失败，保留之前正常下载的版本...\n"
-        [ -f "$dir_raw/${raw_file_name}.new" ] && rm -f "$dir_raw/${raw_file_name}.new"
+        [[ -f "$dir_raw/${raw_file_name}.new" ]] && rm -f "$dir_raw/${raw_file_name}.new"
     fi
 
 }
@@ -227,7 +216,7 @@ update_raw() {
 ## 调用用户自定义的extra.sh
 run_extra_shell() {
     if [[ ${EnableExtraShell} == true ]]; then
-        if [ -f $file_extra_shell ]; then
+        if [[ -f $file_extra_shell ]]; then
             echo -e "--------------------------------------------------------------\n"
             . $file_extra_shell
         else
@@ -240,12 +229,14 @@ run_extra_shell() {
 usage() {
     echo -e "本脚本用法："
     echo -e "1. $cmd_update update                                                    # 更新并重启青龙"
-    echo -e "1. $cmd_update extra                                                     # 运行自定义脚本"
+    echo -e "2. $cmd_update extra                                                     # 运行自定义脚本"
     echo -e "3. $cmd_update raw <fileurl>                                             # 更新单个脚本文件"
     echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch>   # 更新单个仓库的脚本"
     echo -e "5. $cmd_update rmlog <days>                                              # 删除旧日志"
     echo -e "6. $cmd_update bot                                                       # 启动tg-bot"
     echo -e "7. $cmd_update check                                                     # 检测青龙环境并修复"
+    echo -e "8. $cmd_update resetlet                                                  # 重置登录错误次数"
+    echo -e "9. $cmd_update resettfa                                                  # 禁用两步登录"
 }
 
 ## 更新qinglong
@@ -253,36 +244,41 @@ update_qinglong() {
     patch_version
 
     local no_restart="$1"
-    [ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json)
-    reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git" "master"
-    git_pull_scripts $dir_root "master"
+    local all_branch=$(git branch -a)
+    local primary_branch="master"
+    if [[ "${all_branch}" =~ "${current_branch}" ]]; then
+        primary_branch="${current_branch}"
+    fi
+    [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
+    reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" ${primary_branch}
+    git_pull_scripts $dir_root ${primary_branch}
 
     if [[ $exit_status -eq 0 ]]; then
-        echo -e "\n更新$dir_root成功...\n"
+        echo -e "\n更新青龙源文件成功...\n"
         cp -f $file_config_sample $dir_config/config.sample.sh
         detect_config_version
         update_depend
 
-        [ -f $dir_root/package.json ] && ql_depend_new=$(cat $dir_root/package.json)
+        [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
         [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root
     else
-        echo -e "\n更新$dir_root失败，请检查原因...\n"
+        echo -e "\n更新青龙源文件失败，请检查原因...\n"
     fi
 
-    local url="${github_proxy_url}https://github.com/whyour/qinglong-static.git"
-    if [ -d ${ql_static_repo}/.git ]; then
-        reset_romote_url ${ql_static_repo} ${url} "master"
-        git_pull_scripts ${ql_static_repo} "master"
+    local url="https://github.com/whyour/qinglong-static.git"
+    if [[ -d ${ql_static_repo}/.git ]]; then
+        reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
+        git_pull_scripts ${ql_static_repo} ${primary_branch}
     else
-        git_clone_scripts ${url} ${ql_static_repo}
+        git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
     fi
     if [[ $exit_status -eq 0 ]]; then
-        echo -e "\n更新$ql_static_repo成功...\n"
-        local static_version=$(cat /ql/src/version.ts | perl -pe "s|.*\'(.*)\';\.*|\1|" | head -1)
+        echo -e "\n更新青龙静态资源成功...\n"
+        local static_version=$(cat $dir_root/src/version.ts | perl -pe "s|.*\'(.*)\';\.*|\1|" | head -1)
         echo -e "\n当前版本 $static_version...\n"
-        cd $dir_root
-        rm -rf $dir_root/build && rm -rf $dir_root/dist
-        cp -rf $ql_static_repo/* $dir_root
+        
+        rm -rf $dir_static/*
+        cp -rf $ql_static_repo/* $dir_static
         if [[ $no_restart != "no-restart" ]]; then
             nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
             echo -e "重启面板中..."
@@ -290,38 +286,61 @@ update_qinglong() {
             reload_pm2
         fi
     else
-        echo -e "\n更新$dir_root失败，请检查原因...\n"
+        echo -e "\n更新青龙静态资源失败，请检查原因...\n"
     fi
 
 }
 
 patch_version() {
-    if [[ -f "/ql/db/cookie.db" ]]; then
+    if [[ -f "$dir_root/db/cookie.db" ]]; then
         echo -e "检测到旧的db文件，拷贝为新db...\n"
-        mv /ql/db/cookie.db /ql/db/env.db
-        rm -rf /ql/db/cookie.db
+        mv $dir_root/db/cookie.db $dir_root/db/env.db
+        rm -rf $dir_root/db/cookie.db
         echo
     fi
 
-    if ! type ts-node >/dev/null 2>&1; then
+    if ! type ts-node &>/dev/null; then
         pnpm i -g ts-node typescript tslib
     fi
+
+    git config --global pull.rebase false
+
+    cp -f $dir_root/.env.example $dir_root/.env
+
+    if [[ -d "$dir_root/db" ]]; then
+        echo -e "检测到旧的db目录，拷贝到data目录...\n"
+        cp -rf $dir_root/config $dir_root/data
+        echo
+    fi
+
+    if [[ -d "$dir_root/scripts" ]]; then
+        echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
+        cp -rf $dir_root/scripts $dir_root/data
+        echo
+    fi
+
+    if [[ -d "$dir_root/log" ]]; then
+        echo -e "检测到旧的log目录，拷贝到data目录...\n"
+        cp -rf $dir_root/log $dir_root/data
+        echo
+    fi
+
+    if [[ -d "$dir_root/config" ]]; then
+        echo -e "检测到旧的config目录，拷贝到data目录...\n"
+        cp -rf $dir_root/config $dir_root/data
+        echo
+    fi
+
 }
 
 reload_pm2() {
-    pm2 l >/dev/null 2>&1
+    pm2 l &>/dev/null
 
-    if [[ $(pm2 info panel 2>/dev/null) ]]; then
-        pm2 reload panel --source-map-support --time >/dev/null 2>&1
-    else
-        pm2 start $dir_root/build/app.js -n panel --source-map-support --time >/dev/null 2>&1
-    fi
+    pm2 delete panel --source-map-support --time &>/dev/null
+    pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
 
-    if [[ $(pm2 info schedule 2>/dev/null) ]]; then
-        pm2 reload schedule --source-map-support --time >/dev/null 2>&1
-    else
-        pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time >/dev/null 2>&1
-    fi
+    pm2 delete schedule --source-map-support --time &>/dev/null
+    pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
 }
 
 ## 对比脚本
@@ -335,21 +354,20 @@ diff_scripts() {
 
     gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence"
 
-    local repo="${repo_path##*/}"
-    local list_add="$dir_list_tmp/${repo}_add.list"
-    local list_drop="$dir_list_tmp/${repo}_drop.list"
-    diff_cron "$dir_list_tmp/${repo}_scripts.list" "$dir_list_tmp/${repo}_user.list" $list_add $list_drop
+    local list_add="$dir_list_tmp/${uniq_path}_add.list"
+    local list_drop="$dir_list_tmp/${uniq_path}_drop.list"
+    diff_cron "$dir_list_tmp/${uniq_path}_scripts.list" "$dir_list_tmp/${uniq_path}_user.list" $list_add $list_drop
 
-    if [ -s $list_drop ]; then
+    if [[ -s $list_drop ]]; then
         output_list_add_drop $list_drop "失效"
         if [[ ${AutoDelCron} == true ]]; then
-            del_cron $list_drop $repo
+            del_cron $list_drop $uniq_path
         fi
     fi
-    if [ -s $list_add ]; then
+    if [[ -s $list_add ]]; then
         output_list_add_drop $list_add "新"
         if [[ ${AutoAddCron} == true ]]; then
-            add_cron $list_add $repo
+            add_cron $list_add $uniq_path
         fi
     fi
     cd $dir_current
@@ -364,8 +382,7 @@ gen_list_repo() {
     local blackword="$4"
     local dependence="$5"
 
-    local repo="${repo_path##*/}"
-    rm -f $dir_list_tmp/${repo}*.list >/dev/null 2>&1
+    rm -f $dir_list_tmp/${uniq_path}*.list &>/dev/null
 
     cd ${repo_path}
 
@@ -386,24 +403,34 @@ gen_list_repo() {
     if [[ $blackword ]]; then
         files=$(echo "$files" | egrep -v $blackword)
     fi
+
+    cp -f $file_notify_js "${dir_scripts}/${uniq_path}"
+    cp -f $file_notify_py "${dir_scripts}/${uniq_path}"
+
     if [[ $dependence ]]; then
+        cd ${repo_path}
         results=$(eval $cmd | sed 's/^..//' | egrep $dependence)
         for _file in ${results}; do
             file_path=$(dirname $_file)
-            make_dir "${dir_scripts}/${file_path}"
-            cp -f $_file "${dir_scripts}/${file_path}"
+            make_dir "${dir_scripts}/${uniq_path}/${file_path}"
+            cp -f $_file "${dir_scripts}/${uniq_path}/${file_path}"
         done
     fi
+    
+    if [[ -d $dir_dep ]]; then
+        cp -rf $dir_dep/* "${dir_scripts}/${uniq_path}" &>/dev/null
+    fi
+
     for file in ${files}; do
         filename=$(basename $file)
-        cp -f $file $dir_scripts/${repo}_${filename}
-        echo ${repo}_${filename} >>"$dir_list_tmp/${repo}_scripts.list"
-        cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${author}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${author}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
+        cp -f $file "$dir_scripts/${uniq_path}/${filename}"
+        echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
+        cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
         if [[ $cron_id ]]; then
-            result=$(update_cron_command_api "$cmd_task ${repo}_${filename}:$cron_id")
+            result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
         fi
     done
-    grep -E "$cmd_task $repo" $list_crontab_user | perl -pe "s|.*ID=(.*) $cmd_task ($repo_.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${repo}_user.list"
+    grep -E "${cmd_task} ${uniq_path}" ${list_crontab_user} | perl -pe "s|.*ID=(.*) ${cmd_task} (${uniq_path}.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${uniq_path}_user.list"
     cd $dir_current
 }
 
@@ -423,6 +450,18 @@ get_uniq_path() {
 }
 
 main() {
+    ## for ql update
+    show_log="false"
+    while getopts ":l" opt
+    do
+        case $opt in
+            l)
+                show_log="true"
+                ;;
+        esac
+    done
+    [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
+
     local p1=$1
     local p2=$2
     local p3=$3
@@ -432,25 +471,28 @@ main() {
     local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
     local log_path="$dir_log/update/${log_time}_$p1.log"
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
+
     case $p1 in
     update)
-        echo -e "## 开始执行... $begin_time\n" >> $log_path
-        cat $task_error_log_path >> $log_path
-        update_qinglong "$2" >> $log_path
+        cmd=">> $log_path 2>&1"
+        [[ "$show_log" == "true" ]] && cmd=""
+        eval echo -e "## 开始执行... $begin_time\n" $cmd
+        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
+        eval update_qinglong "$2" $cmd
         ;;
     extra)
-        echo -e "## 开始执行... $begin_time\n" >> $log_path
-        cat $task_error_log_path >> $log_path
-        run_extra_shell >> $log_path
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
+        run_extra_shell >>$log_path
         ;;
     repo)
         get_user_info
         get_uniq_path "$p2" "$p6"
         log_path="$dir_log/update/${log_time}_${uniq_path}.log"
-        echo -e "## 开始执行... $begin_time\n" >> $log_path
-        cat $task_error_log_path >> $log_path
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
         if [[ -n $p2 ]]; then
-            update_repo "$p2" "$p3" "$p4" "$p5" "$p6" >> $log_path
+            update_repo "$p2" "$p3" "$p4" "$p5" "$p6" >>$log_path
         else
             echo -e "命令输入错误...\n"
             usage
@@ -460,29 +502,41 @@ main() {
         get_user_info
         get_uniq_path "$p2"
         log_path="$dir_log/update/${log_time}_${uniq_path}.log"
-        echo -e "## 开始执行... $begin_time\n" >> $log_path
-        cat $task_error_log_path >> $log_path
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
         if [[ -n $p2 ]]; then
-            update_raw "$p2" >> $log_path
+            update_raw "$p2" >>$log_path
         else
             echo -e "命令输入错误...\n"
             usage
         fi
         ;;
     rmlog)
-        echo -e "## 开始执行... $begin_time\n" >> $log_path
-        cat $task_error_log_path >> $log_path
-        . $dir_shell/rmlog.sh "$p2" >> $log_path
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
+        . $dir_shell/rmlog.sh "$p2" >>$log_path
         ;;
     bot)
-        echo -e "## 开始执行... $begin_time\n" >> $log_path
-        cat $task_error_log_path >> $log_path
-        . $dir_shell/bot.sh >> $log_path
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
+        . $dir_shell/bot.sh >>$log_path
         ;;
     check)
-        echo -e "## 开始执行... $begin_time\n" >> $log_path
-        cat $task_error_log_path >> $log_path
-        . $dir_shell/check.sh >> $log_path
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
+        . $dir_shell/check.sh >>$log_path
+        ;;
+    resetlet)
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        auth_value=$(cat $file_auth_user | jq '.retries =0' -c)
+        echo -e "重置登录错误次数成功 \n $auth_value" >>$log_path
+        echo "$auth_value" >$file_auth_user
+        ;;
+    resettfa)
+        echo -e "## 开始执行... $begin_time\n" >>$log_path
+        auth_value=$(cat $file_auth_user | jq '.twoFactorActivated =false' | jq '.twoFactorActived =false' -c)
+        echo -e "禁用两步验证成功 \n $auth_value" >>$log_path
+        echo "$auth_value" >$file_auth_user
         ;;
     *)
         echo -e "命令输入错误...\n"
@@ -491,7 +545,7 @@ main() {
     esac
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
     local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >> $log_path
+    echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >>$log_path
     cat $log_path
 }
 

src/app.tsx

@@ -1,42 +0,0 @@
-import { history } from 'umi';
-import { request } from '@/utils/http';
-import config from '@/utils/config';
-
-const titleMap: any = {
-  '/': '控制面板',
-  '/login': '登录',
-  '/crontab': '定时任务',
-  '/env': '环境变量',
-  '/config': '配置文件',
-  '/script': '脚本管理',
-  '/diff': '对比工具',
-  '/log': '任务日志',
-  '/setting': '系统设置',
-};
-
-export function render(oldRender: any) {
-  request
-    .get(`${config.apiPrefix}user`)
-    .then((data) => {
-      if (data.data && data.data.username) {
-        return oldRender();
-      }
-      localStorage.removeItem(config.authKey);
-      history.push('/login');
-      oldRender();
-    })
-    .catch((e) => {
-      if (e.response && e.response.status === 401) {
-        localStorage.removeItem(config.authKey);
-        history.push('/login');
-        oldRender();
-      }
-    });
-}
-
-export function onRouteChange({ matchedRoutes }: any) {
-  if (matchedRoutes.length) {
-    const path: string = matchedRoutes[matchedRoutes.length - 1].route.path;
-    document.title = `${titleMap[path]} - 控制面板`;
-  }
-}

src/components/index.less

@@ -0,0 +1,77 @@
+.react-terminal-wrapper {
+  width: 100%;
+  background: #252a33;
+  color: #eee;
+  font-size: 18px;
+  font-family: 'Fira Mono', Consolas, Menlo, Monaco, 'Courier New', Courier,
+    monospace;
+  border-radius: 4px;
+  padding: 75px 45px 35px;
+  position: relative;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.react-terminal {
+  overflow: auto;
+  display: flex;
+  flex-direction: column;
+}
+
+.react-terminal-wrapper.react-terminal-light {
+  background: #ddd;
+  color: #1a1e24;
+}
+
+.react-terminal-wrapper:before {
+  content: '';
+  position: absolute;
+  top: 15px;
+  left: 15px;
+  display: inline-block;
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: #d9515d;
+  -webkit-box-shadow: 25px 0 0 #f4c025, 50px 0 0 #3ec930;
+  box-shadow: 25px 0 0 #f4c025, 50px 0 0 #3ec930;
+}
+
+.react-terminal-wrapper:after {
+  content: attr(data-terminal-name);
+  position: absolute;
+  color: #a2a2a2;
+  top: 5px;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+
+.react-terminal-wrapper.react-terminal-light:after {
+  color: #d76d77;
+}
+
+.react-terminal-line {
+  display: block;
+  line-height: 1.5;
+}
+
+.react-terminal-line:before {
+  content: '';
+  display: inline-block;
+  vertical-align: middle;
+  color: #a2a2a2;
+}
+
+.react-terminal-light .react-terminal-line:before {
+  color: #d76d77;
+}
+
+.react-terminal-input:before {
+  margin-right: 0.75em;
+  content: '$';
+}
+
+.react-terminal-input[data-terminal-prompt]:before {
+  content: attr(data-terminal-prompt);
+}

src/components/pageLoading.tsx

@@ -0,0 +1,7 @@
+import { PageLoading } from '@ant-design/pro-layout';
+
+const NewPageLoading = () => {
+  return <PageLoading delay={1}></PageLoading>;
+};
+
+export default NewPageLoading;

src/components/terminal.tsx

@@ -0,0 +1,80 @@
+import React, { useEffect, useRef } from 'react';
+import './index.less';
+
+export enum LineType {
+  Input,
+  Output,
+}
+
+export enum ColorMode {
+  Light,
+  Dark,
+}
+
+export interface Props {
+  name?: string;
+  prompt?: string;
+  colorMode?: ColorMode;
+  lineData: Array<{ type: LineType; value: string | React.ReactNode }>;
+  startingInputValue?: string;
+}
+
+const Terminal = ({
+  name,
+  prompt,
+  colorMode,
+  lineData,
+  startingInputValue = '',
+}: Props) => {
+  const lastLineRef = useRef<null | HTMLElement>(null);
+
+  // An effect that handles scrolling into view the last line of terminal input or output
+  const performScrolldown = useRef(false);
+  useEffect(() => {
+    if (performScrolldown.current) {
+      // skip scrolldown when the component first loads
+      setTimeout(
+        () =>
+          lastLineRef?.current?.scrollIntoView({
+            behavior: 'smooth',
+            block: 'nearest',
+          }),
+        500,
+      );
+    }
+    performScrolldown.current = true;
+  }, [lineData.length]);
+
+  const renderedLineData = lineData.map((ld, i) => {
+    const classes = ['react-terminal-line'];
+    if (ld.type === LineType.Input) {
+      classes.push('react-terminal-input');
+    }
+    // `lastLineRef` is used to ensure the terminal scrolls into view to the last line; make sure to add the ref to the last
+    if (lineData.length === i + 1) {
+      return (
+        <span className={classes.join(' ')} key={i} ref={lastLineRef}>
+          {ld.value}
+        </span>
+      );
+    } else {
+      return (
+        <span className={classes.join(' ')} key={i}>
+          {ld.value}
+        </span>
+      );
+    }
+  });
+
+  const classes = ['react-terminal-wrapper'];
+  if (colorMode === ColorMode.Light) {
+    classes.push('react-terminal-light');
+  }
+  return (
+    <div className={classes.join(' ')} data-terminal-name={name}>
+      <div className="react-terminal">{renderedLineData}</div>
+    </div>
+  );
+};
+
+export default Terminal;

src/layouts/defaultProps.tsx

@@ -7,6 +7,7 @@ import {
   FolderOutlined,
   RadiusSettingOutlined,
   ControlOutlined,
+  ContainerOutlined,
 } from '@ant-design/icons';
 
 export default {
@@ -18,6 +19,18 @@ export default {
         hideInMenu: true,
         component: '@/pages/login/index',
       },
+      {
+        name: '初始化',
+        path: '/initialization',
+        hideInMenu: true,
+        component: '@/pages/initialization/index',
+      },
+      {
+        name: '错误',
+        path: '/error',
+        hideInMenu: true,
+        component: '@/pages/error/index',
+      },
       {
         path: '/crontab',
         name: '定时任务',
@@ -42,6 +55,12 @@ export default {
         icon: <FormOutlined />,
         component: '@/pages/script/index',
       },
+      {
+        path: '/dependence',
+        name: '依赖管理',
+        icon: <ContainerOutlined />,
+        component: '@/pages/dependence/index',
+      },
       {
         path: '/diff',
         name: '对比工具',
@@ -62,12 +81,9 @@ export default {
       },
     ],
   },
-  location: {
-    pathname: '/',
-  },
   navTheme: 'light',
   fixSiderbar: true,
   contentWidth: 'Fixed',
   splitMenus: false,
-  logo: 'https://qinglong.whyour.cn/qinglong.png',
+  siderWidth: 180,
 } as any;

src/layouts/index.less

@@ -1,3 +1,4 @@
+@import '~antd/lib/style/themes/default.less';
 @import '~@/styles/variable.less';
 @import '~codemirror/lib/codemirror.css';
 
@@ -8,13 +9,6 @@
     url('../assets/fonts/SourceCodePro-Regular.ttf') format('truetype');
 }
 
-body {
-  height: 100%;
-  overflow-y: hidden;
-  background-color: rgb(248, 248, 248);
-  width: 100% !important;
-}
-
 .log-modal {
   .ant-modal {
     padding-bottom: 0 !important;
@@ -32,6 +26,7 @@ body {
 .monaco-editor:not(.rename-box) {
   height: calc(100vh - 128px) !important;
   height: calc(100vh - var(--vh-offset, 0px) - 128px) !important;
+
   .view-overlays .current-line {
     border-width: 0;
   }
@@ -39,6 +34,7 @@ body {
 
 .rename-box {
   height: 0;
+
   .rename-input {
     height: 0;
     padding: 0 !important;
@@ -49,10 +45,10 @@ body {
 .ant-pro-grid-content.wide {
   max-width: unset !important;
   overflow: auto;
+
   .ant-pro-page-container-children-content {
     overflow: auto;
-    height: calc(100vh - 96px);
-    height: calc(100vh - var(--vh-offset, 0px) - 96px);
+    height: 100%;
     background-color: #fff;
     padding: 16px;
   }
@@ -64,6 +60,7 @@ body {
 
 .ant-tooltip {
   max-width: 500px !important;
+
   .ant-tooltip-inner {
     word-break: break-all !important;
   }
@@ -77,8 +74,9 @@ body {
 
 .log-wrapper {
   .log-select {
-    width: 300px;
+    width: 250px;
   }
+
   .ant-page-header-heading-left {
     min-width: 100px;
   }
@@ -88,6 +86,7 @@ body {
   .config-select {
     width: 250px;
   }
+
   .ant-page-header-heading-left {
     min-width: 100px;
   }
@@ -121,26 +120,18 @@ body {
   }
 }
 
-input:-webkit-autofill,
-input:-webkit-autofill:hover,
-input:-webkit-autofill:focus,
-input:-webkit-autofill:active {
-  transition-delay: 99999s;
-  transition: color 99999s ease-out, background-color 99999s ease-out;
-  -webkit-transition-delay: 99999s;
-  -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
-}
-
 .ant-pro-page-container.ql-container-wrapper {
   display: flex;
   flex-direction: column;
   height: calc(100vh - 48px);
   height: calc(100vh - var(--vh-offset, 0px) - 48px);
+
   .ant-pro-grid-content.wide {
     flex: 1;
+
     .ant-pro-grid-content-children {
-      height: calc(100% - 48px);
-      height: calc(100% - var(--vh-offset, 0px) - 48px);
+      height: calc(100% - 36px);
+
       > div,
       .log-container,
       .react-codemirror2,
@@ -152,22 +143,11 @@ input:-webkit-autofill:active {
 }
 
 @media (max-width: 768px) {
-  .ant-pro-grid-content.wide {
-    .ant-pro-page-container-children-content {
-      height: calc(100vh - 144px);
-      height: calc(100vh - var(--vh-offset, 0px) - 144px);
-    }
-  }
-
   .ql-container-wrapper {
     &.crontab-wrapper,
     &.log-wrapper,
     &.env-wrapper,
     &.config-wrapper {
-      .ant-pro-grid-content.wide .ant-pro-page-container-children-content {
-        height: calc(100vh - 184px);
-        height: calc(100vh - var(--vh-offset, 0px) - 184px);
-      }
       .CodeMirror {
         width: calc(100vw - 80px);
       }
@@ -181,17 +161,12 @@ input:-webkit-autofill:active {
 
 .ant-layout-content.ant-pro-basicLayout-content.ant-pro-basicLayout-has-header {
   margin-bottom: 0 !important;
-}
-
-@media (min-width: 768px) {
-  .ant-layout-content.ant-pro-basicLayout-content.ant-pro-basicLayout-has-header {
   min-height: calc(100vh - 72px);
   min-height: calc(100vh - var(--vh-offset, 0px) - 72px);
-  }
 }
 
 .Resizer {
-  background: #000;
+  background: #fff;
   opacity: 0.2;
   z-index: 1;
   -moz-box-sizing: border-box;
@@ -200,6 +175,8 @@ input:-webkit-autofill:active {
   -moz-background-clip: padding;
   -webkit-background-clip: padding;
   background-clip: padding-box;
+  border-left: 5px solid rgba(42, 161, 255, 0);
+  border-right: 5px solid rgba(42, 161, 255, 0);
 }
 
 .Resizer:hover {
@@ -210,32 +187,26 @@ input:-webkit-autofill:active {
 .Resizer.horizontal {
   height: 11px;
   margin: -5px 0;
-  border-top: 5px solid rgba(255, 255, 255, 0);
-  border-bottom: 5px solid rgba(255, 255, 255, 0);
   cursor: row-resize;
   width: 100%;
 }
 
-.Resizer.horizontal:hover {
-  border-top: 5px solid rgba(0, 0, 0, 0.5);
-  border-bottom: 5px solid rgba(0, 0, 0, 0.5);
-}
-
 .Resizer.vertical {
   width: 11px;
   margin: 0 -5px;
-  border-left: 5px solid rgba(255, 255, 255, 0);
-  border-right: 5px solid rgba(255, 255, 255, 0);
   cursor: col-resize;
 }
 
+.Resizer.horizontal:hover,
 .Resizer.vertical:hover {
-  border-left: 5px solid rgba(0, 0, 0, 0.5);
-  border-right: 5px solid rgba(0, 0, 0, 0.5);
+  border-left-color: rgba(42, 161, 255, 0.5);
+  border-right-color: rgba(42, 161, 255, 0.5);
 }
+
 .Resizer.disabled {
   cursor: not-allowed;
 }
+
 .Resizer.disabled:hover {
   border-color: transparent;
 }
@@ -246,10 +217,111 @@ input:-webkit-autofill:active {
   }
 }
 
-.ant-message .ant-statistic {
+.inline-countdown.ant-statistic {
   display: inline-block;
+
   .ant-statistic-content {
     font-size: 14px;
     padding: 0 3px;
   }
 }
+
+.ant-form-item-extra {
+  word-break: break-all;
+  font-size: 13px;
+}
+
+[data-dark='true'] {
+  /* Change autocomplete styles in WebKit */
+  input:-webkit-autofill,
+  input:-webkit-autofill:hover,
+  input:-webkit-autofill:focus,
+  textarea:-webkit-autofill,
+  textarea:-webkit-autofill:hover,
+  textarea:-webkit-autofill:focus,
+  select:-webkit-autofill,
+  select:-webkit-autofill:hover,
+  select:-webkit-autofill:focus {
+    border: 1px solid @border-color-base;
+    box-shadow: none;
+    transition: background-color 5000s ease-in-out 0s;
+    -webkit-text-fill-color: @text-color;
+    caret-color: #e8e6f3 !important;
+  }
+
+  ::placeholder {
+    opacity: 0.5 !important;
+  }
+
+  .ant-select-selection-placeholder {
+    opacity: 0.5 !important;
+  }
+}
+
+.ant-pro-page-container-children-content {
+  margin: 18px 18px 18px;
+}
+
+.ant-pro-basicLayout-content {
+  margin: 18px;
+
+  .ant-pro-page-container {
+    margin: -18px -18px -18px;
+  }
+}
+
+.ant-menu-item.ant-pro-sider-collapsed-button {
+  margin: 0;
+}
+
+.side-menu-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: rgba(0, 0, 0, 0.85);
+
+  .side-menu-collapse-button:hover {
+    color: #1890ff;
+  }
+
+  .side-menu-user-wrapper {
+    display: flex;
+    align-items: center;
+  }
+}
+
+.side-menu-user-drop-menu {
+  position: relative;
+  text-align: left;
+  outline: none;
+  padding: 4px 0;
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  border-radius: 4px;
+  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+  overflow: auto;
+  background-color: #fff;
+}
+
+[data-dark='true'] .side-menu-user-drop-menu {
+  background-color: #373739;
+}
+
+.ant-pro-sider-logo {
+  padding: 16px 8px !important;
+
+  h1 {
+    margin-left: 5px !important;
+  }
+
+  img {
+    width: 32px !important;
+    border-radius: 52% !important;
+  }
+}
+
+.ant-pro-global-header-logo {
+  a img {
+    // 移动端logo被拉伸
+    width: auto !important;
+  }
+}

src/layouts/index.tsx

@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from 'react';
-import ProLayout from '@ant-design/pro-layout';
+import React, { useEffect, useState, useRef } from 'react';
+import ProLayout, { PageLoading } from '@ant-design/pro-layout';
 import {
   enable as enableDarkMode,
   disable as disableDarkMode,
@@ -8,60 +8,202 @@ import {
 } from 'darkreader';
 import defaultProps from './defaultProps';
 import { Link, history } from 'umi';
-import { LogoutOutlined } from '@ant-design/icons';
+import {
+  LogoutOutlined,
+  MenuFoldOutlined,
+  MenuUnfoldOutlined,
+  UserOutlined,
+} from '@ant-design/icons';
 import config from '@/utils/config';
 import { request } from '@/utils/http';
 import './index.less';
 import vhCheck from 'vh-check';
-import { version, changeLog } from '../version';
+import { version, changeLogLink, changeLog } from '../version';
+import { useCtx, useTheme } from '@/utils/hooks';
+import { message, Badge, Modal, Avatar, Dropdown, Menu, Image } from 'antd';
+// @ts-ignore
+import SockJS from 'sockjs-client';
+import * as Sentry from '@sentry/react';
+import { init } from '../utils/init';
 
 export default function (props: any) {
+  const ctx = useCtx();
+  const theme = useTheme();
+  const [user, setUser] = useState<any>();
+  const [loading, setLoading] = useState<boolean>(true);
+  const [systemInfo, setSystemInfo] = useState<{ isInitialized: boolean }>();
+  const ws = useRef<any>(null);
+  const [socketMessage, setSocketMessage] = useState<any>();
+  const [collapsed, setCollapsed] = useState(false);
+
   const logout = () => {
-    request.post(`${config.apiPrefix}logout`).then(() => {
+    request.post(`${config.apiPrefix}user/logout`).then(() => {
       localStorage.removeItem(config.authKey);
       history.push('/login');
     });
   };
 
-  useEffect(() => {
-    const isAuth = localStorage.getItem(config.authKey);
-    if (!isAuth) {
-      history.push('/login');
+  const getSystemInfo = () => {
+    request
+      .get(`${config.apiPrefix}system`)
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setSystemInfo(data);
+          if (!data.isInitialized) {
+            history.push('/initialization');
+            setLoading(false);
+          } else {
+            getUser();
           }
-    vhCheck();
+        } else {
+          message.error(data);
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
 
-    // patch custome layout title as react node [object, object]
-    document.title = '控制面板';
-  }, []);
-
-  useEffect(() => {
+  const getUser = (needLoading = true) => {
+    needLoading && setLoading(true);
+    request
+      .get(`${config.apiPrefix}user`)
+      .then(({ code, data }) => {
+        if (code === 200 && data.username) {
+          setUser(data);
           if (props.location.pathname === '/') {
             history.push('/crontab');
           }
+        } else {
+          message.error(data);
+        }
+        needLoading && setLoading(false);
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+
+  const reloadUser = () => {
+    getUser(false);
+  };
+
+  const setTheme = () => {
+    const media = window.matchMedia('(prefers-color-scheme: dark)');
+    const storageTheme = localStorage.getItem('qinglong_dark_theme');
+    const isDark =
+      (media.matches && storageTheme !== 'light') || storageTheme === 'dark';
+    if (isDark) {
+      document.body.setAttribute('data-dark', 'true');
+    } else {
+      document.body.setAttribute('data-dark', 'false');
+    }
+  };
+
+  useEffect(() => {
+    if (systemInfo && systemInfo.isInitialized && !user) {
+      getUser();
+    }
   }, [props.location.pathname]);
 
   useEffect(() => {
-    const theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
+    if (!systemInfo) {
+      getSystemInfo();
+    }
+  }, [systemInfo]);
+
+  useEffect(() => {
+    setTheme();
+  }, [theme.theme]);
+
+  useEffect(() => {
+    vhCheck();
+    init();
+
+    const _theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
     setFetchMethod(window.fetch);
-    if (theme === 'dark') {
-      enableDarkMode({
-        brightness: 100,
-        contrast: 90,
-        sepia: 10,
-      });
-    } else if (theme === 'light') {
+    if (_theme === 'dark') {
+      enableDarkMode({});
+    } else if (_theme === 'light') {
       disableDarkMode();
     } else {
-      followSystemColorScheme({
-        brightness: 100,
-        contrast: 90,
-        sepia: 10,
-      });
+      followSystemColorScheme({});
     }
   }, []);
 
-  if (props.location.pathname === '/login') {
-    return props.children;
+  useEffect(() => {
+    if (!user) return;
+    ws.current = new SockJS(
+      `${location.origin}/api/ws?token=${localStorage.getItem(config.authKey)}`,
+    );
+
+    ws.current.onmessage = (e: any) => {
+      try {
+        const data = JSON.parse(e.data);
+        if (data.type === 'ping') {
+          if (data && data.message === 'hanhh') {
+            console.log('websocket连接成功', e);
+          } else {
+            console.log('websocket连接失败', e);
+          }
+        }
+        setSocketMessage(data);
+      } catch (error) {
+        console.log('websocket连接失败', e);
+      }
+    };
+
+    const wsCurrent = ws.current;
+
+    return () => {
+      wsCurrent.close();
+    };
+  }, [user]);
+
+  useEffect(() => {
+    window.onload = () => {
+      const timing = performance.timing;
+      console.log(`白屏时间: ${timing.responseStart - timing.navigationStart}`);
+      console.log(
+        `请求完毕至DOM加载: ${timing.domInteractive - timing.responseEnd}`,
+      );
+      console.log(
+        `解释dom树耗时: ${timing.domComplete - timing.domInteractive}`,
+      );
+      console.log(
+        `从开始至load总耗时: ${timing.loadEventEnd - timing.navigationStart}`,
+      );
+      Sentry.captureMessage(
+        `白屏时间 ${timing.responseStart - timing.navigationStart}`,
+      );
+    };
+  }, []);
+
+  if (
+    ['/login', '/initialization', '/error'].includes(props.location.pathname)
+  ) {
+    document.title = `${
+      (config.documentTitleMap as any)[props.location.pathname]
+    } - 控制面板`;
+    if (
+      systemInfo?.isInitialized &&
+      props.location.pathname === '/initialization'
+    ) {
+      history.push('/crontab');
+    }
+
+    if (systemInfo || props.location.pathname === '/error') {
+      return React.Children.map(props.children, (child) => {
+        return React.cloneElement(child, {
+          ...ctx,
+          ...theme,
+          user,
+          reloadUser,
+          reloadTheme: setTheme,
+          ws: ws.current,
+        });
+      });
+    }
   }
 
   const isFirefox = navigator.userAgent.includes('Firefox');
@@ -70,13 +212,32 @@ export default function (props: any) {
     !navigator.userAgent.includes('Chrome');
   const isQQBrowser = navigator.userAgent.includes('QQBrowser');
 
-  return (
+  const menu = (
+    <Menu className="side-menu-user-drop-menu">
+      <Menu.Item key="1" icon={<LogoutOutlined />} onClick={logout}>
+        退出登录
+      </Menu.Item>
+    </Menu>
+  );
+  return loading ? (
+    <PageLoading />
+  ) : (
     <ProLayout
       selectedKeys={[props.location.pathname]}
+      loading={loading}
+      ErrorBoundary={Sentry.ErrorBoundary}
+      logo={<Image preview={false} src="https://qn.whyour.cn/logo.png" />}
       title={
         <>
-          控制面板
-          <a href={changeLog} target="_blank" rel="noopener noreferrer">
+          <span style={{ fontSize: 16 }}>控制面板</span>
+          <a
+            href={changeLogLink}
+            target="_blank"
+            rel="noopener noreferrer"
+            onClick={(e) => {
+              e.stopPropagation();
+            }}
+          >
             <span
               style={{
                 fontSize: isFirefox ? 9 : 12,
@@ -86,7 +247,7 @@ export default function (props: any) {
                 letterSpacing: isQQBrowser ? -2 : 0,
               }}
             >
-              {version}
+              v{version}
             </span>
           </a>
         </>
@@ -101,21 +262,60 @@ export default function (props: any) {
         }
         return <Link to={menuItemProps.path}>{defaultDom}</Link>;
       }}
-      postMenuData={(menuData) => {
-        return [
-          ...(menuData || []),
-          {
-            icon: <LogoutOutlined />,
-            name: '退出登录',
-            path: 'logout',
-            onTitleClick: () => logout(),
-          },
-        ];
+      pageTitleRender={(props, pageName, info) => {
+        if (info && typeof info.pageName === 'string') {
+          return `${info.pageName} - 控制面板`;
+        }
+        return '控制面板';
       }}
-      pageTitleRender={() => '控制面板'}
+      onCollapse={setCollapsed}
+      collapsed={collapsed}
+      rightContentRender={() =>
+        ctx.isPhone && (
+          <Dropdown overlay={menu} placement="bottomRight" trigger={['click']}>
+            <span className="side-menu-user-wrapper">
+              <Avatar shape="square" size="small" icon={<UserOutlined />} />
+              <span style={{ marginLeft: 5 }}>admin</span>
+            </span>
+          </Dropdown>
+        )
+      }
+      collapsedButtonRender={(collapsed) => (
+        <span
+          className="side-menu-container"
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+          }}
+        >
+          {!collapsed && !ctx.isPhone && (
+            <Dropdown overlay={menu} placement="topLeft" trigger={['hover']}>
+              <span className="side-menu-user-wrapper">
+                <Avatar shape="square" size="small" icon={<UserOutlined />} />
+                <span style={{ marginLeft: 5 }}>admin</span>
+              </span>
+            </Dropdown>
+          )}
+          <span
+            className="side-menu-collapse-button"
+            onClick={() => setCollapsed(!collapsed)}
+          >
+            {collapsed ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />}
+          </span>
+        </span>
+      )}
       {...defaultProps}
     >
-      {props.children}
+      {React.Children.map(props.children, (child) => {
+        return React.cloneElement(child, {
+          ...ctx,
+          ...theme,
+          user,
+          reloadUser,
+          reloadTheme: setTheme,
+          socketMessage,
+        });
+      })}
     </ProLayout>
   );
 }

src/pages/config/index.tsx

@@ -11,17 +11,15 @@ import { PageContainer } from '@ant-design/pro-layout';
 import { request } from '@/utils/http';
 import Editor from '@monaco-editor/react';
 import { Controlled as CodeMirror } from 'react-codemirror2';
-import { useCtx, useTheme } from '@/utils/hooks';
 
-const Config = () => {
+const Config = ({ headerStyle, isPhone, theme }: any) => {
   const [value, setValue] = useState('');
   const [loading, setLoading] = useState(true);
   const [title, setTitle] = useState('config.sh');
   const [select, setSelect] = useState('config.sh');
   const [data, setData] = useState<any[]>([]);
-  const { headerStyle, isPhone } = useCtx();
-  const { theme } = useTheme();
   const editorRef = useRef<any>(null);
+  const [confirmLoading, setConfirmLoading] = useState(false);
 
   const getConfig = (name: string) => {
     request.get(`${config.apiPrefix}configs/${name}`).then((data: any) => {
@@ -40,6 +38,7 @@ const Config = () => {
   };
 
   const updateConfig = () => {
+    setConfirmLoading(true);
     const content = editorRef.current
       ? editorRef.current.getValue().replace(/\r\n/g, '\n')
       : value;
@@ -50,6 +49,7 @@ const Config = () => {
       })
       .then((data: any) => {
         message.success(data.message);
+        setConfirmLoading(false);
       });
   };
 
@@ -79,7 +79,12 @@ const Config = () => {
           defaultValue="config.sh"
           onSelect={onSelect}
         />,
-        <Button key="1" type="primary" onClick={updateConfig}>
+        <Button
+          key="1"
+          loading={confirmLoading}
+          type="primary"
+          onClick={updateConfig}
+        >
           保存
         </Button>,
       ]}

src/pages/crontab/detail.tsx

@@ -0,0 +1,340 @@
+import React, { useEffect, useRef, useState } from 'react';
+import {
+  Modal,
+  message,
+  Input,
+  Form,
+  Button,
+  Card,
+  Tag,
+  List,
+  Divider,
+  Typography,
+} from 'antd';
+import {
+  ClockCircleOutlined,
+  CloseCircleOutlined,
+  FieldTimeOutlined,
+  Loading3QuartersOutlined,
+  FileOutlined,
+} from '@ant-design/icons';
+import { CrontabStatus } from './index';
+import { diffTime } from '@/utils/date';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+import CronLogModal from './logModal';
+import Editor from '@monaco-editor/react';
+
+const { Text } = Typography;
+
+const tabList = [
+  {
+    key: 'log',
+    tab: '日志',
+  },
+  {
+    key: 'script',
+    tab: '脚本',
+  },
+];
+
+interface LogItem {
+  directory: string;
+  filename: string;
+}
+
+const language = navigator.language || navigator.languages[0];
+
+const CronDetailModal = ({
+  cron = {},
+  handleCancel,
+  visible,
+  theme,
+  isPhone,
+}: {
+  cron?: any;
+  visible: boolean;
+  handleCancel: (needUpdate?: boolean) => void;
+  theme: string;
+  isPhone: boolean;
+}) => {
+  const [activeTabKey, setActiveTabKey] = useState('log');
+  const [loading, setLoading] = useState(true);
+  const [logs, setLogs] = useState<LogItem[]>([]);
+  const [log, setLog] = useState('');
+  const [value, setValue] = useState('');
+  const [isLogModalVisible, setIsLogModalVisible] = useState(false);
+  const editorRef = useRef<any>(null);
+  const [scriptInfo, setScriptInfo] = useState<any>({});
+  const [logUrl, setLogUrl] = useState('');
+  const [validTabs, setValidTabs] = useState(tabList);
+
+  const contentList: any = {
+    log: (
+      <List
+        dataSource={logs}
+        loading={loading}
+        renderItem={(item) => (
+          <List.Item className="log-item" onClick={() => onClickItem(item)}>
+            <FileOutlined style={{ marginRight: 10 }} />
+            {item.directory}/{item.filename}
+          </List.Item>
+        )}
+      />
+    ),
+    script: (
+      <Editor
+        language="shell"
+        theme={theme}
+        value={value}
+        options={{
+          fontSize: 12,
+          lineNumbersMinChars: 3,
+          fontFamily: 'Source Code Pro',
+          folding: false,
+          glyphMargin: false,
+          wordWrap: 'on',
+        }}
+        onMount={(editor) => {
+          editorRef.current = editor;
+        }}
+      />
+    ),
+  };
+
+  const onClickItem = (item: LogItem) => {
+    localStorage.setItem('logCron', cron.id);
+    setLogUrl(`${config.apiPrefix}logs/${item.directory}/${item.filename}`);
+    request
+      .get(`${config.apiPrefix}logs/${item.directory}/${item.filename}`)
+      .then((data) => {
+        setLog(data.data);
+        setIsLogModalVisible(true);
+      });
+  };
+
+  const onTabChange = (key: string) => {
+    setActiveTabKey(key);
+  };
+
+  const getLogs = () => {
+    setLoading(true);
+    request
+      .get(`${config.apiPrefix}crons/${cron.id}/logs`)
+      .then((data: any) => {
+        if (data.code === 200) {
+          setLogs(data.data);
+        }
+      })
+      .finally(() => setLoading(false));
+  };
+
+  const getScript = () => {
+    const cmd = cron.command.split(' ') as string[];
+    if (cmd[0] === 'task') {
+      setValidTabs(validTabs);
+      if (cmd[1].startsWith('/ql/data/scripts')) {
+        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
+      }
+
+      let [p, s] = cmd[1].split('/');
+      if (!s) {
+        s = p;
+        p = '';
+      }
+      setScriptInfo({ parent: p, filename: s });
+      request
+        .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
+        .then((data) => {
+          setValue(data.data);
+        });
+    } else {
+      setValidTabs([validTabs[0]]);
+    }
+  };
+
+  const saveFile = () => {
+    Modal.confirm({
+      title: `确认保存`,
+      content: (
+        <>
+          确认保存文件
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {scriptInfo.filename}
+          </Text>{' '}
+          ，保存后不可恢复
+        </>
+      ),
+      onOk() {
+        const content = editorRef.current
+          ? editorRef.current.getValue().replace(/\r\n/g, '\n')
+          : value;
+        return new Promise((resolve, reject) => {
+          request
+            .put(`${config.apiPrefix}scripts`, {
+              data: {
+                filename: scriptInfo.filename,
+                path: scriptInfo.parent || '',
+                content,
+              },
+            })
+            .then((_data: any) => {
+              if (_data.code === 200) {
+                setValue(content);
+                message.success(`保存成功`);
+              } else {
+                message.error(_data);
+              }
+              resolve(null);
+            })
+            .catch((e) => reject(e));
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  useEffect(() => {
+    if (cron && cron.id) {
+      getLogs();
+      getScript();
+    }
+  }, [cron]);
+
+  return (
+    <Modal
+      title={
+        <>
+          <span>{cron.name}</span>
+          {cron.labels?.length > 0 && cron.labels[0] !== '' && (
+            <Divider type="vertical"></Divider>
+          )}
+          {cron.labels?.length > 0 &&
+            cron.labels[0] !== '' &&
+            cron.labels?.map((label: string, i: number) => (
+              <Tag color="blue" style={{ marginRight: 5 }}>
+                {label}
+              </Tag>
+            ))}
+        </>
+      }
+      centered
+      visible={visible}
+      forceRender
+      footer={false}
+      onCancel={() => handleCancel()}
+      wrapClassName="crontab-detail"
+      width={!isPhone ? '80vw' : ''}
+    >
+      <div className="card-wrapper">
+        <Card>
+          <div className="cron-detail-info-item">
+            <div className="cron-detail-info-title">任务</div>
+            <div className="cron-detail-info-value">{cron.command}</div>
+          </div>
+        </Card>
+        <Card style={{ marginTop: 10 }}>
+          <div className="cron-detail-info-item">
+            <div className="cron-detail-info-title">状态</div>
+            <div className="cron-detail-info-value">
+              {(!cron.isDisabled || cron.status !== CrontabStatus.idle) && (
+                <>
+                  {cron.status === CrontabStatus.idle && (
+                    <Tag icon={<ClockCircleOutlined />} color="default">
+                      空闲中
+                    </Tag>
+                  )}
+                  {cron.status === CrontabStatus.running && (
+                    <Tag
+                      icon={<Loading3QuartersOutlined spin />}
+                      color="processing"
+                    >
+                      运行中
+                    </Tag>
+                  )}
+                  {cron.status === CrontabStatus.queued && (
+                    <Tag icon={<FieldTimeOutlined />} color="default">
+                      队列中
+                    </Tag>
+                  )}
+                </>
+              )}
+              {cron.isDisabled === 1 && cron.status === CrontabStatus.idle && (
+                <Tag icon={<CloseCircleOutlined />} color="error">
+                  已禁用
+                </Tag>
+              )}
+            </div>
+          </div>
+          <div className="cron-detail-info-item">
+            <div className="cron-detail-info-title">定时</div>
+            <div className="cron-detail-info-value">{cron.schedule}</div>
+          </div>
+          <div className="cron-detail-info-item">
+            <div className="cron-detail-info-title">最后运行时间</div>
+            <div className="cron-detail-info-value">
+              {cron.last_execution_time
+                ? new Date(cron.last_execution_time * 1000)
+                    .toLocaleString(language, {
+                      hour12: false,
+                    })
+                    .replace(' 24:', ' 00:')
+                : '-'}
+            </div>
+          </div>
+          <div className="cron-detail-info-item">
+            <div className="cron-detail-info-title">最后运行时长</div>
+            <div className="cron-detail-info-value">
+              {cron.last_running_time ? diffTime(cron.last_running_time) : '-'}
+            </div>
+          </div>
+          <div className="cron-detail-info-item">
+            <div className="cron-detail-info-title">下次运行时间</div>
+            <div className="cron-detail-info-value">
+              {cron.nextRunTime &&
+                cron.nextRunTime
+                  .toLocaleString(language, {
+                    hour12: false,
+                  })
+                  .replace(' 24:', ' 00:')}
+            </div>
+          </div>
+        </Card>
+        <Card
+          style={{ marginTop: 10 }}
+          tabList={validTabs}
+          activeTabKey={activeTabKey}
+          onTabChange={(key) => {
+            onTabChange(key);
+          }}
+          tabBarExtraContent={
+            activeTabKey === 'script' && (
+              <Button
+                type="primary"
+                style={{ marginRight: 8 }}
+                onClick={saveFile}
+              >
+                保存
+              </Button>
+            )
+          }
+        >
+          {contentList[activeTabKey]}
+        </Card>
+      </div>
+      <CronLogModal
+        visible={isLogModalVisible}
+        handleCancel={() => {
+          setIsLogModalVisible(false);
+        }}
+        cron={cron}
+        data={log}
+        logUrl={logUrl}
+      />
+    </Modal>
+  );
+};
+
+export default CronDetailModal;

src/pages/crontab/index.less

@@ -0,0 +1,87 @@
+.ant-table-pagination.ant-pagination {
+  margin-bottom: 0 !important;
+}
+
+.cron {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.crontab-detail {
+  .card-wrapper {
+    height: 80vh;
+    height: calc(80vh - var(--vh-offset, 0px));
+
+    .ant-card:last-child {
+      .ant-card-body {
+        height: calc(80vh - 238px);
+        height: calc(80vh - var(--vh-offset, 0px) - 238px);
+        overflow-y: auto;
+      }
+    }
+  }
+
+  .ant-modal-body {
+    background: #eee;
+    padding: 12px;
+  }
+
+  .ant-card-body {
+    padding: 18px;
+  }
+  .ant-card-head {
+    padding: 0 18px;
+  }
+
+  .ant-card:first-child {
+    max-height: 66px;
+    overflow: auto;
+
+    .ant-card-body {
+      min-width: 600px;
+    }
+
+    .cron-detail-info-item {
+      display: flex;
+
+      .cron-detail-info-title {
+        width: 50px;
+      }
+
+      .cron-detail-info-value {
+        flex: 1;
+        margin-top: 0;
+      }
+    }
+  }
+
+  .ant-card:nth-child(2) {
+    overflow-x: auto;
+
+    .ant-card-body {
+      display: flex;
+      justify-content: space-between;
+      min-width: 600px;
+    }
+  }
+
+  .cron-detail-info-item {
+    flex: auto;
+
+    .cron-detail-info-title {
+      color: #888;
+    }
+
+    .cron-detail-info-value {
+      margin-top: 12px;
+    }
+  }
+}
+
+.log-item {
+  cursor: pointer;
+  &:hover {
+    background: #fafafa;
+  }
+}

src/pages/crontab/index.tsx

@@ -11,6 +11,7 @@ import {
   Menu,
   Typography,
   Input,
+  Popover,
 } from 'antd';
 import {
   ClockCircleOutlined,
@@ -25,31 +26,39 @@ import {
   DeleteOutlined,
   PauseCircleOutlined,
   FieldTimeOutlined,
+  PushpinOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
 import { request } from '@/utils/http';
-import CronModal from './modal';
+import CronModal, { CronLabelModal } from './modal';
 import CronLogModal from './logModal';
-import { useCtx, useTheme } from '@/utils/hooks';
+import CronDetailModal from './detail';
+import cron_parser from 'cron-parser';
+import { diffTime } from '@/utils/date';
+import { getTableScroll } from '@/utils/index';
+import { history } from 'umi';
+import './index.less';
 
-const { Text } = Typography;
+const { Text, Paragraph } = Typography;
 const { Search } = Input;
 
-enum CrontabStatus {
+export enum CrontabStatus {
   'running',
   'idle',
   'disabled',
   'queued',
 }
 
-const CrontabSort: any = { 0: 0, 3: 1, 1: 2, 4: 3 };
+const CrontabSort: any = { 0: 0, 5: 1, 3: 2, 1: 3, 4: 4 };
 
 enum OperationName {
   '启用',
   '禁用',
   '运行',
   '停止',
+  '置顶',
+  '取消置顶',
 }
 
 enum OperationPath {
@@ -57,52 +66,212 @@ enum OperationPath {
   'disable',
   'run',
   'stop',
+  'pin',
+  'unpin',
 }
 
-const Crontab = () => {
-  const columns = [
+const Crontab = ({ headerStyle, isPhone, theme }: any) => {
+  const columns: any = [
     {
       title: '任务名',
       dataIndex: 'name',
       key: 'name',
+      width: 150,
       align: 'center' as const,
       render: (text: string, record: any) => (
-        <span>{record.name || record._id}</span>
+        <>
+          <a
+            onClick={() => {
+              goToScriptManager(record);
+            }}
+          >
+            {record.labels?.length > 0 && record.labels[0] !== '' ? (
+              <Popover
+                placement="right"
+                trigger={isPhone ? 'click' : 'hover'}
+                content={
+                  <div>
+                    {record.labels?.map((label: string) => (
+                      <Tag
+                        color="blue"
+                        style={{ cursor: 'point' }}
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          setSearchValue(`label:${label}`);
+                        }}
+                      >
+                        <a>{label}</a>
+                      </Tag>
+                    ))}
+                  </div>
+                }
+              >
+                {record.name || '-'}
+              </Popover>
+            ) : (
+              record.name || '-'
+            )}
+            {record.isPinned ? (
+              <span>
+                <PushpinOutlined />
+              </span>
+            ) : (
+              ''
+            )}
+          </a>
+        </>
       ),
+      sorter: {
+        compare: (a: any, b: any) => a.name.localeCompare(b.name),
+        multiple: 2,
+      },
     },
     {
       title: '任务',
       dataIndex: 'command',
       key: 'command',
-      width: '40%',
+      width: 250,
       align: 'center' as const,
       render: (text: string, record: any) => {
         return (
-          <span
+          <Paragraph
             style={{
-              textAlign: 'left',
-              width: '100%',
-              display: 'inline-block',
               wordBreak: 'break-all',
+              marginBottom: 0,
+              textAlign: 'left',
             }}
+            ellipsis={{ tooltip: text, rows: 2 }}
           >
             {text}
-          </span>
+          </Paragraph>
         );
       },
+      sorter: {
+        compare: (a: any, b: any) => a.command.localeCompare(b.command),
+        multiple: 3,
+      },
     },
     {
       title: '任务定时',
       dataIndex: 'schedule',
       key: 'schedule',
+      width: 110,
       align: 'center' as const,
+      sorter: {
+        compare: (a: any, b: any) => a.schedule.localeCompare(b.schedule),
+        multiple: 1,
       },
+    },
+    {
+      title: '最后运行时间',
+      align: 'center' as const,
+      width: 150,
+      sorter: {
+        compare: (a: any, b: any) => {
+          return a.last_execution_time - b.last_execution_time;
+        },
+      },
+      render: (text: string, record: any) => {
+        const language = navigator.language || navigator.languages[0];
+        return (
+          <span
+            style={{
+              display: 'block',
+            }}
+          >
+            {record.last_execution_time
+              ? new Date(record.last_execution_time * 1000)
+                  .toLocaleString(language, {
+                    hour12: false,
+                  })
+                  .replace(' 24:', ' 00:')
+              : '-'}
+          </span>
+        );
+      },
+    },
+    {
+      title: '最后运行时长',
+      align: 'center' as const,
+      width: 120,
+      sorter: {
+        compare: (a: any, b: any) => {
+          return a.last_running_time - b.last_running_time;
+        },
+      },
+      render: (text: string, record: any) => {
+        const language = navigator.language || navigator.languages[0];
+        return (
+          <span
+            style={{
+              display: 'block',
+            }}
+          >
+            {record.last_running_time
+              ? diffTime(record.last_running_time)
+              : '-'}
+          </span>
+        );
+      },
+    },
+    {
+      title: '下次运行时间',
+      align: 'center' as const,
+      width: 150,
+      sorter: {
+        compare: (a: any, b: any) => {
+          return a.nextRunTime - b.nextRunTime;
+        },
+      },
+      render: (text: string, record: any) => {
+        const language = navigator.language || navigator.languages[0];
+        return (
+          <span
+            style={{
+              display: 'block',
+            }}
+          >
+            {record.nextRunTime
+              .toLocaleString(language, {
+                hour12: false,
+              })
+              .replace(' 24:', ' 00:')}
+          </span>
+        );
+      },
+    },
+
     {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
       align: 'center' as const,
-      width: 60,
+      width: 85,
+      filters: [
+        {
+          text: '运行中',
+          value: 0,
+        },
+        {
+          text: '空闲中',
+          value: 1,
+        },
+        {
+          text: '已禁用',
+          value: 2,
+        },
+        {
+          text: '队列中',
+          value: 3,
+        },
+      ],
+      onFilter: (value: number, record: any) => {
+        if (record.isDisabled && record.status !== 0) {
+          return value === 2;
+        } else {
+          return record.status === value;
+        }
+      },
       render: (text: string, record: any) => (
         <>
           {(!record.isDisabled || record.status !== CrontabStatus.idle) && (
@@ -139,6 +308,7 @@ const Crontab = () => {
       title: '操作',
       key: 'action',
       align: 'center' as const,
+      width: 100,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
@@ -146,7 +316,8 @@ const Crontab = () => {
             {record.status === CrontabStatus.idle && (
               <Tooltip title={isPc ? '运行' : ''}>
                 <a
-                  onClick={() => {
+                  onClick={(e) => {
+                    e.stopPropagation();
                     runCron(record, index);
                   }}
                 >
@@ -157,7 +328,8 @@ const Crontab = () => {
             {record.status !== CrontabStatus.idle && (
               <Tooltip title={isPc ? '停止' : ''}>
                 <a
-                  onClick={() => {
+                  onClick={(e) => {
+                    e.stopPropagation();
                     stopCron(record, index);
                   }}
                 >
@@ -167,7 +339,8 @@ const Crontab = () => {
             )}
             <Tooltip title={isPc ? '日志' : ''}>
               <a
-                onClick={() => {
+                onClick={(e) => {
+                  e.stopPropagation();
                   setLogCron({ ...record, timestamp: Date.now() });
                 }}
               >
@@ -184,6 +357,7 @@ const Crontab = () => {
   const [value, setValue] = useState<any[]>([]);
   const [loading, setLoading] = useState(true);
   const [isModalVisible, setIsModalVisible] = useState(false);
+  const [isLabelModalVisible, setIsLabelModalVisible] = useState(false);
   const [editedCron, setEditedCron] = useState();
   const [searchText, setSearchText] = useState('');
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
@@ -191,7 +365,28 @@ const Crontab = () => {
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
   const [currentPage, setCurrentPage] = useState(1);
   const [pageSize, setPageSize] = useState(20);
-  const { headerStyle, isPhone } = useCtx();
+  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
+  const [isDetailModalVisible, setIsDetailModalVisible] = useState(false);
+  const [detailCron, setDetailCron] = useState<any>();
+  const [searchValue, setSearchValue] = useState('');
+
+  const goToScriptManager = (record: any) => {
+    const cmd = record.command.split(' ') as string[];
+    if (cmd[0] === 'task') {
+      if (cmd[1].startsWith('/ql/data/scripts')) {
+        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
+      }
+
+      let [p, s] = cmd[1].split('/');
+      if (!s) {
+        s = p;
+        p = '';
+      }
+      history.push(`/script?p=${p}&s=${s}`);
+    } else if (cmd[1] === 'repo') {
+      location.href = cmd[2];
+    }
+  };
 
   const getCrons = () => {
     setLoading(true);
@@ -199,12 +394,33 @@ const Crontab = () => {
       .get(`${config.apiPrefix}crons?searchValue=${searchText}`)
       .then((data: any) => {
         setValue(
-          data.data.sort((a: any, b: any) => {
-            const sortA = a.isDisabled ? 4 : a.status;
-            const sortB = b.isDisabled ? 4 : b.status;
+          data.data
+            .sort((a: any, b: any) => {
+              const sortA =
+                a.isPinned && a.status !== 0
+                  ? 5
+                  : a.isDisabled && a.status !== 0
+                  ? 4
+                  : a.status;
+              const sortB =
+                b.isPinned && b.status !== 0
+                  ? 5
+                  : b.isDisabled && b.status !== 0
+                  ? 4
+                  : b.status;
               return CrontabSort[sortA] - CrontabSort[sortB];
+            })
+            .map((x) => {
+              return {
+                ...x,
+                nextRunTime: cron_parser
+                  .parseExpression(x.schedule)
+                  .next()
+                  .toDate(),
+              };
             }),
         );
+        setCurrentPage(1);
       })
       .finally(() => setLoading(false));
   };
@@ -233,12 +449,13 @@ const Crontab = () => {
       ),
       onOk() {
         request
-          .delete(`${config.apiPrefix}crons`, { data: [record._id] })
+          .delete(`${config.apiPrefix}crons`, { data: [record.id] })
           .then((data: any) => {
             if (data.code === 200) {
               message.success('删除成功');
               const result = [...value];
-              result.splice(index + pageSize * (currentPage - 1), 1);
+              const i = result.findIndex((x) => x.id === record.id);
+              result.splice(i, 1);
               setValue(result);
             } else {
               message.error(data);
@@ -265,11 +482,12 @@ const Crontab = () => {
       ),
       onOk() {
         request
-          .put(`${config.apiPrefix}crons/run`, { data: [record._id] })
+          .put(`${config.apiPrefix}crons/run`, { data: [record.id] })
           .then((data: any) => {
             if (data.code === 200) {
               const result = [...value];
-              result.splice(index + pageSize * (currentPage - 1), 1, {
+              const i = result.findIndex((x) => x.id === record.id);
+              result.splice(i, 1, {
                 ...record,
                 status: CrontabStatus.running,
               });
@@ -299,11 +517,12 @@ const Crontab = () => {
       ),
       onOk() {
         request
-          .put(`${config.apiPrefix}crons/stop`, { data: [record._id] })
+          .put(`${config.apiPrefix}crons/stop`, { data: [record.id] })
           .then((data: any) => {
             if (data.code === 200) {
               const result = [...value];
-              result.splice(index + pageSize * (currentPage - 1), 1, {
+              const i = result.findIndex((x) => x.id === record.id);
+              result.splice(i, 1, {
                 ...record,
                 pid: null,
                 status: CrontabStatus.idle,
@@ -340,14 +559,15 @@ const Crontab = () => {
               record.isDisabled === 1 ? 'enable' : 'disable'
             }`,
             {
-              data: [record._id],
+              data: [record.id],
             },
           )
           .then((data: any) => {
             if (data.code === 200) {
               const newStatus = record.isDisabled === 1 ? 0 : 1;
               const result = [...value];
-              result.splice(index + pageSize * (currentPage - 1), 1, {
+              const i = result.findIndex((x) => x.id === record.id);
+              result.splice(i, 1, {
                 ...record,
                 isDisabled: newStatus,
               });
@@ -363,20 +583,70 @@ const Crontab = () => {
     });
   };
 
+  const pinOrUnPinCron = (record: any, index: number) => {
+    Modal.confirm({
+      title: `确认${record.isPinned === 1 ? '取消置顶' : '置顶'}`,
+      content: (
+        <>
+          确认{record.isPinned === 1 ? '取消置顶' : '置顶'}
+          定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(
+            `${config.apiPrefix}crons/${
+              record.isPinned === 1 ? 'unpin' : 'pin'
+            }`,
+            {
+              data: [record.id],
+            },
+          )
+          .then((data: any) => {
+            if (data.code === 200) {
+              const newStatus = record.isPinned === 1 ? 0 : 1;
+              const result = [...value];
+              const i = result.findIndex((x) => x.id === record.id);
+              result.splice(i, 1, {
+                ...record,
+                isPinned: newStatus,
+              });
+              setValue(result);
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
   const MoreBtn: React.FC<{
     record: any;
     index: number;
   }> = ({ record, index }) => (
     <Dropdown
-      arrow
+      arrow={{ pointAtCenter: true }}
+      placement="bottomRight"
       trigger={['click']}
       overlay={
-        <Menu onClick={({ key }) => action(key, record, index)}>
+        <Menu
+          onClick={({ key, domEvent }) => {
+            domEvent.stopPropagation();
+            action(key, record, index);
+          }}
+        >
           <Menu.Item key="edit" icon={<EditOutlined />}>
             编辑
           </Menu.Item>
           <Menu.Item
-            key="enableordisable"
+            key="enableOrDisable"
             icon={
               record.isDisabled === 1 ? (
                 <CheckCircleOutlined />
@@ -387,15 +657,21 @@ const Crontab = () => {
           >
             {record.isDisabled === 1 ? '启用' : '禁用'}
           </Menu.Item>
-          {record.isSystem !== 1 && (
           <Menu.Item key="delete" icon={<DeleteOutlined />}>
             删除
           </Menu.Item>
-          )}
+          <Menu.Item
+            key="pinOrUnPin"
+            icon={
+              record.isPinned === 1 ? <StopOutlined /> : <PushpinOutlined />
+            }
+          >
+            {record.isPinned === 1 ? '取消置顶' : '置顶'}
+          </Menu.Item>
         </Menu>
       }
     >
-      <a>
+      <a onClick={(e) => e.stopPropagation()}>
         <EllipsisOutlined />
       </a>
     </Dropdown>
@@ -406,12 +682,15 @@ const Crontab = () => {
       case 'edit':
         editCron(record, index);
         break;
-      case 'enableordisable':
+      case 'enableOrDisable':
         enabledOrDisabledCron(record, index);
         break;
       case 'delete':
         delCron(record, index);
         break;
+      case 'pinOrUnPin':
+        pinOrUnPinCron(record, index);
+        break;
       default:
         break;
     }
@@ -425,12 +704,16 @@ const Crontab = () => {
   };
 
   const onSearch = (value: string) => {
-    setSearchText(value);
+    setSearchText(value.trim());
   };
 
   const handleCrons = (cron: any) => {
-    const index = value.findIndex((x) => x._id === cron._id);
+    const index = value.findIndex((x) => x.id === cron.id);
     const result = [...value];
+    cron.nextRunTime = cron_parser
+      .parseExpression(cron.schedule)
+      .next()
+      .toDate();
     if (index === -1) {
       result.unshift(cron);
     } else {
@@ -443,10 +726,14 @@ const Crontab = () => {
 
   const getCronDetail = (cron: any) => {
     request
-      .get(`${config.apiPrefix}crons/${cron._id}`)
+      .get(`${config.apiPrefix}crons/${cron.id}`)
       .then((data: any) => {
-        const index = value.findIndex((x) => x._id === cron._id);
+        const index = value.findIndex((x) => x.id === cron.id);
         const result = [...value];
+        data.data.nextRunTime = cron_parser
+          .parseExpression(data.data.schedule)
+          .next()
+          .toDate();
         result.splice(index, 1, {
           ...cron,
           ...data.data,
@@ -458,6 +745,12 @@ const Crontab = () => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
+
+    setTimeout(() => {
+      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
+        setTableScrollHeight(getTableScroll());
+      }
+    });
   };
 
   const rowSelection = {
@@ -522,9 +815,13 @@ const Crontab = () => {
     localStorage.setItem('pageSize', pageSize + '');
   };
 
+  const getRowClassName = (record: any, index: number) => {
+    return record.isPinned ? 'pinned-cron cron' : 'cron';
+  };
+
   useEffect(() => {
     if (logCron) {
-      localStorage.setItem('logCron', logCron._id);
+      localStorage.setItem('logCron', logCron.id);
       setIsLogModalVisible(true);
     }
   }, [logCron]);
@@ -535,6 +832,9 @@ const Crontab = () => {
 
   useEffect(() => {
     setPageSize(parseInt(localStorage.getItem('pageSize') || '20'));
+    setTimeout(() => {
+      setTableScrollHeight(getTableScroll());
+    });
   }, []);
 
   return (
@@ -546,11 +846,14 @@ const Crontab = () => {
           placeholder="请输入名称或者关键词"
           style={{ width: 'auto' }}
           enterButton
+          allowClear
           loading={loading}
+          value={searchValue}
+          onChange={(e) => setSearchValue(e.target.value)}
           onSearch={onSearch}
         />,
         <Button key="2" type="primary" onClick={() => addCron()}>
-          添加任务
+          新建任务
         </Button>,
       ]}
       header={{
@@ -586,6 +889,27 @@ const Crontab = () => {
           <Button type="primary" onClick={() => operateCrons(3)}>
             批量停止
           </Button>
+          <Button
+            type="primary"
+            onClick={() => operateCrons(4)}
+            style={{ marginLeft: 8, marginRight: 8 }}
+          >
+            批量置顶
+          </Button>
+          <Button
+            type="primary"
+            onClick={() => operateCrons(5)}
+            style={{ marginLeft: 8, marginRight: 8 }}
+          >
+            批量取消置顶
+          </Button>
+          <Button
+            type="primary"
+            onClick={() => setIsLabelModalVisible(true)}
+            style={{ marginLeft: 8, marginRight: 8 }}
+          >
+            批量修改标签
+          </Button>
           <span style={{ marginLeft: 8 }}>
             已选择
             <a>{selectedRowIds?.length}</a>项
@@ -595,21 +919,31 @@ const Crontab = () => {
       <Table
         columns={columns}
         pagination={{
-          hideOnSinglePage: true,
           current: currentPage,
           onChange: onPageChange,
           pageSize: pageSize,
           showSizeChanger: true,
+          simple: isPhone,
           defaultPageSize: 20,
           showTotal: (total: number, range: number[]) =>
             `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
+          pageSizeOptions: [20, 100, 500, 1000] as any,
+        }}
+        onRow={(record) => {
+          return {
+            onClick: (event) => {
+              setDetailCron(record);
+              setIsDetailModalVisible(true);
+            },
+          };
         }}
         dataSource={value}
-        rowKey="_id"
+        rowKey="id"
         size="middle"
-        scroll={{ x: 768 }}
+        scroll={{ x: 1000, y: tableScrollHeight }}
         loading={loading}
         rowSelection={rowSelection}
+        rowClassName={getRowClassName}
       />
       <CronLogModal
         visible={isLogModalVisible}
@@ -624,6 +958,25 @@ const Crontab = () => {
         handleCancel={handleCancel}
         cron={editedCron}
       />
+      <CronLabelModal
+        visible={isLabelModalVisible}
+        handleCancel={(needUpdate?: boolean) => {
+          setIsLabelModalVisible(false);
+          if (needUpdate) {
+            getCrons();
+          }
+        }}
+        ids={selectedRowIds}
+      />
+      <CronDetailModal
+        visible={isDetailModalVisible}
+        handleCancel={() => {
+          setIsDetailModalVisible(false);
+        }}
+        cron={detailCron}
+        theme={theme}
+        isPhone={isPhone}
+      />
     </PageContainer>
   );
 };

src/pages/crontab/logModal.tsx

@@ -1,11 +1,12 @@
 import React, { useEffect, useState } from 'react';
-import { Modal, message, Input, Form, Statistic } from 'antd';
+import { Modal, message, Input, Form, Statistic, Button } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import {
   Loading3QuartersOutlined,
   CheckCircleOutlined,
 } from '@ant-design/icons';
+import { PageLoading } from '@ant-design/pro-layout';
 
 enum CrontabStatus {
   'running',
@@ -19,14 +20,18 @@ const CronLogModal = ({
   cron,
   handleCancel,
   visible,
+  data,
+  logUrl,
 }: {
   cron?: any;
   visible: boolean;
   handleCancel: () => void;
+  data?: string;
+  logUrl?: string;
 }) => {
   const [value, setValue] = useState<string>('启动中...');
   const [loading, setLoading] = useState<any>(true);
-  const [excuting, setExcuting] = useState<any>(true);
+  const [executing, setExecuting] = useState<any>(true);
   const [isPhone, setIsPhone] = useState(false);
   const [theme, setTheme] = useState<string>('');
 
@@ -35,12 +40,12 @@ const CronLogModal = ({
       setLoading(true);
     }
     request
-      .get(`${config.apiPrefix}crons/${cron._id}/log`)
+      .get(logUrl ? logUrl : `${config.apiPrefix}crons/${cron.id}/log`)
       .then((data: any) => {
-        if (localStorage.getItem('logCron') === cron._id) {
+        if (localStorage.getItem('logCron') === String(cron.id)) {
           const log = data.data as string;
           setValue(log || '暂无日志');
-          setExcuting(
+          setExecuting(
             log && !log.includes('执行结束') && !log.includes('重启面板'),
           );
           if (log && !log.includes('执行结束') && !log.includes('重启面板')) {
@@ -57,7 +62,11 @@ const CronLogModal = ({
               content: (
                 <span>
                   系统将在
-                  <Countdown format="ss" value={Date.now() + 1000 * 10} />
+                  <Countdown
+                    className="inline-countdown"
+                    format="ss"
+                    value={Date.now() + 1000 * 30}
+                  />
                   秒后自动刷新
                 </span>
               ),
@@ -65,7 +74,7 @@ const CronLogModal = ({
             });
             setTimeout(() => {
               window.location.reload();
-            }, 10000);
+            }, 30000);
           }
         }
       })
@@ -84,18 +93,24 @@ const CronLogModal = ({
   const titleElement = () => {
     return (
       <>
-        {excuting && <Loading3QuartersOutlined spin />}
-        {!excuting && <CheckCircleOutlined />}
+        {(executing || loading) && <Loading3QuartersOutlined spin />}
+        {!executing && !loading && <CheckCircleOutlined />}
         <span style={{ marginLeft: 5 }}>日志-{cron && cron.name}</span>{' '}
       </>
     );
   };
 
   useEffect(() => {
-    if (cron) {
+    if (cron && cron.id && visible) {
       getCronLog(true);
     }
-  }, [cron]);
+  }, [cron, visible]);
+
+  useEffect(() => {
+    if (data) {
+      setValue(data);
+    }
+  }, [data]);
 
   useEffect(() => {
     setIsPhone(document.body.clientWidth < 768);
@@ -110,12 +125,20 @@ const CronLogModal = ({
       bodyStyle={{
         overflowY: 'auto',
         maxHeight: 'calc(80vh - var(--vh-offset, 0px))',
+        minHeight: '300px',
       }}
       forceRender
       onOk={() => cancel()}
       onCancel={() => cancel()}
+      footer={[
+        <Button type="primary" onClick={() => cancel()}>
+          知道了
+        </Button>,
+      ]}
     >
-      {!loading && value && (
+      {loading ? (
+        <PageLoading />
+      ) : (
         <pre
           style={
             isPhone

src/pages/crontab/modal.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Modal, message, Input, Form } from 'antd';
+import { Modal, message, Input, Form, Button } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import cronParse from 'cron-parser';
@@ -20,19 +20,28 @@ const CronModal = ({
     setLoading(true);
     const method = cron ? 'put' : 'post';
     const payload = { ...values };
-    if (cron) {
-      payload._id = cron._id;
+    if (typeof payload.labels === 'string') {
+      payload.labels = values.labels.split(/,|，/);
+    } else if (!payload.labels) {
+      payload.labels = [];
     }
+    if (cron) {
+      payload.id = cron.id;
+    }
+    try {
       const { code, data } = await request[method](`${config.apiPrefix}crons`, {
         data: payload,
       });
       if (code === 200) {
-      message.success(cron ? '更新Cron成功' : '添加Cron成功');
+        message.success(cron ? '更新Cron成功' : '新建Cron成功');
       } else {
         message.error(data);
       }
       setLoading(false);
       handleCancel(data);
+    } catch (error: any) {
+      setLoading(false);
+    }
   };
 
   useEffect(() => {
@@ -41,7 +50,7 @@ const CronModal = ({
 
   return (
     <Modal
-      title={cron ? '编辑定时' : '新建定时'}
+      title={cron ? '编辑任务' : '新建任务'}
       visible={visible}
       forceRender
       onOk={() => {
@@ -66,8 +75,16 @@ const CronModal = ({
         <Form.Item name="name" label="名称">
           <Input placeholder="请输入任务名称" />
         </Form.Item>
-        <Form.Item name="command" label="命令" rules={[{ required: true }]}>
-          <Input placeholder="请输入要执行的命令" />
+        <Form.Item
+          name="command"
+          label="命令"
+          rules={[{ required: true, whitespace: true }]}
+        >
+          <Input.TextArea
+            rows={4}
+            autoSize={true}
+            placeholder="请输入要执行的命令"
+          />
         </Form.Item>
         <Form.Item
           name="schedule"
@@ -87,9 +104,86 @@ const CronModal = ({
         >
           <Input placeholder="秒(可选) 分 时 天 月 周" />
         </Form.Item>
+        <Form.Item name="labels" label="标签">
+          <Input placeholder="请输入任务标签" />
+        </Form.Item>
       </Form>
     </Modal>
   );
 };
 
-export default CronModal;
+const CronLabelModal = ({
+  ids,
+  handleCancel,
+  visible,
+}: {
+  ids: Array<string>;
+  visible: boolean;
+  handleCancel: (needUpdate?: boolean) => void;
+}) => {
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+
+  const update = async (action: 'delete' | 'post') => {
+    form
+      .validateFields()
+      .then(async (values) => {
+        if (typeof values.labels === 'string') {
+          values.labels = values.labels.split(/,|，/);
+        }
+        setLoading(true);
+        const payload = { ids, labels: values.labels };
+        const { code, data } = await request[action](
+          `${config.apiPrefix}crons/labels`,
+          {
+            data: payload,
+          },
+        );
+        if (code === 200) {
+          message.success(
+            action === 'post' ? '添加Labels成功' : '删除Labels成功',
+          );
+        } else {
+          message.error(data);
+        }
+        setLoading(false);
+        handleCancel(true);
+      })
+      .catch((info) => {
+        console.log('Validate Failed:', info);
+      });
+  };
+
+  useEffect(() => {
+    form.resetFields();
+  }, [ids, visible]);
+
+  const buttons = [
+    <Button onClick={() => handleCancel(false)}>取消</Button>,
+    <Button type="primary" danger onClick={() => update('delete')}>
+      删除
+    </Button>,
+    <Button type="primary" onClick={() => update('post')}>
+      添加
+    </Button>,
+  ];
+
+  return (
+    <Modal
+      title="批量修改标签"
+      visible={visible}
+      footer={buttons}
+      forceRender
+      onCancel={() => handleCancel(false)}
+      confirmLoading={loading}
+    >
+      <Form form={form} layout="vertical" name="form_in_label_modal">
+        <Form.Item name="labels" label="标签">
+          <Input placeholder="请输入任务标签" />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export { CronModal as default, CronLabelModal };

src/pages/dependence/index.tsx

@@ -0,0 +1,471 @@
+import React, { useCallback, useRef, useState, useEffect } from 'react';
+import {
+  Button,
+  message,
+  Modal,
+  Table,
+  Tag,
+  Space,
+  Typography,
+  Tooltip,
+  Input,
+  Tabs,
+} from 'antd';
+import {
+  EditOutlined,
+  DeleteOutlined,
+  SyncOutlined,
+  CheckCircleOutlined,
+  StopOutlined,
+  BugOutlined,
+  FileTextOutlined,
+} from '@ant-design/icons';
+import config from '@/utils/config';
+import { PageContainer } from '@ant-design/pro-layout';
+import { request } from '@/utils/http';
+import DependenceModal from './modal';
+import { DndProvider, useDrag, useDrop } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
+import './index.less';
+import { getTableScroll } from '@/utils/index';
+import DependenceLogModal from './logModal';
+
+const { Text } = Typography;
+const { Search } = Input;
+
+enum Status {
+  '安装中',
+  '已安装',
+  '安装失败',
+  '删除中',
+  '已删除',
+  '删除失败',
+}
+
+enum StatusColor {
+  'processing',
+  'success',
+  'error',
+}
+
+const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
+  const columns: any = [
+    {
+      title: '序号',
+      align: 'center' as const,
+      width: 50,
+      render: (text: string, record: any, index: number) => {
+        return <span style={{ cursor: 'text' }}>{index + 1} </span>;
+      },
+    },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center' as const,
+    },
+    {
+      title: '状态',
+      key: 'status',
+      dataIndex: 'status',
+      align: 'center' as const,
+      render: (text: string, record: any, index: number) => {
+        return (
+          <Space size="middle" style={{ cursor: 'text' }}>
+            <Tag
+              color={StatusColor[record.status % 3]}
+              style={{ marginRight: 0 }}
+            >
+              {Status[record.status]}
+            </Tag>
+          </Space>
+        );
+      },
+    },
+    {
+      title: '备注',
+      dataIndex: 'remark',
+      key: 'remark',
+      align: 'center' as const,
+    },
+    {
+      title: '创建时间',
+      key: 'timestamp',
+      dataIndex: 'timestamp',
+      align: 'center' as const,
+      render: (text: string, record: any) => {
+        const language = navigator.language || navigator.languages[0];
+        const time = record.createdAt || record.timestamp;
+        const date = new Date(time)
+          .toLocaleString(language, {
+            hour12: false,
+          })
+          .replace(' 24:', ' 00:');
+        return (
+          <Tooltip
+            placement="topLeft"
+            title={date}
+            trigger={['hover', 'click']}
+          >
+            <span>{date}</span>
+          </Tooltip>
+        );
+      },
+    },
+    {
+      title: '操作',
+      key: 'action',
+      align: 'center' as const,
+      render: (text: string, record: any, index: number) => {
+        const isPc = !isPhone;
+        return (
+          <Space size="middle">
+            {record.status !== Status.安装中 &&
+              record.status !== Status.删除中 && (
+                <>
+                  <Tooltip title={isPc ? '重新安装' : ''}>
+                    <a onClick={() => reInstallDependence(record, index)}>
+                      <BugOutlined />
+                    </a>
+                  </Tooltip>
+                  <Tooltip title={isPc ? '删除' : ''}>
+                    <a onClick={() => deleteDependence(record, index)}>
+                      <DeleteOutlined />
+                    </a>
+                  </Tooltip>
+                </>
+              )}
+            <Tooltip title={isPc ? '日志' : ''}>
+              <a
+                onClick={() => {
+                  setLogDependence({ ...record, timestamp: Date.now() });
+                }}
+              >
+                <FileTextOutlined />
+              </a>
+            </Tooltip>
+          </Space>
+        );
+      },
+    },
+  ];
+  const [value, setValue] = useState<any[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [isModalVisible, setIsModalVisible] = useState(false);
+  const [editedDependence, setEditedDependence] = useState();
+  const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
+  const [searchText, setSearchText] = useState('');
+  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
+  const [logDependence, setLogDependence] = useState<any>();
+  const [isLogModalVisible, setIsLogModalVisible] = useState(false);
+  const [type, setType] = useState('nodejs');
+
+  const getDependencies = () => {
+    setLoading(true);
+    request
+      .get(
+        `${config.apiPrefix}dependencies?searchValue=${searchText}&type=${type}`,
+      )
+      .then((data: any) => {
+        setValue(data.data);
+      })
+      .finally(() => setLoading(false));
+  };
+
+  const addDependence = () => {
+    setEditedDependence(null as any);
+    setIsModalVisible(true);
+  };
+
+  const editDependence = (record: any, index: number) => {
+    setEditedDependence(record);
+    setIsModalVisible(true);
+  };
+
+  const deleteDependence = (record: any, index: number) => {
+    Modal.confirm({
+      title: '确认删除',
+      content: (
+        <>
+          确认删除依赖{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .delete(`${config.apiPrefix}dependencies`, { data: [record.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              handleDependence(data.data[0]);
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const reInstallDependence = (record: any, index: number) => {
+    Modal.confirm({
+      title: '确认重新安装',
+      content: (
+        <>
+          确认重新安装{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}dependencies/reinstall`, {
+            data: [record.id],
+          })
+          .then((data: any) => {
+            if (data.code === 200) {
+              handleDependence(data.data[0]);
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const handleCancel = (dependence?: any[]) => {
+    setIsModalVisible(false);
+    dependence && handleDependence(dependence);
+  };
+
+  const handleDependence = (dependence: any) => {
+    const result = [...value];
+    if (Array.isArray(dependence)) {
+      result.push(...dependence);
+    } else {
+      const index = value.findIndex((x) => x.id === dependence.id);
+      result.splice(index, 1, {
+        ...dependence,
+      });
+    }
+    setValue(result);
+  };
+
+  const onSelectChange = (selectedIds: any[]) => {
+    setSelectedRowIds(selectedIds);
+
+    setTimeout(() => {
+      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
+        setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
+      }
+    });
+  };
+
+  const rowSelection = {
+    selectedRowIds,
+    onChange: onSelectChange,
+  };
+
+  const delDependencies = () => {
+    Modal.confirm({
+      title: '确认删除',
+      content: <>确认删除选中的依赖吗</>,
+      onOk() {
+        request
+          .delete(`${config.apiPrefix}dependencies`, { data: selectedRowIds })
+          .then((data: any) => {
+            if (data.code === 200) {
+              setSelectedRowIds([]);
+              getDependencies();
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const getDependenceDetail = (dependence: any) => {
+    request
+      .get(`${config.apiPrefix}dependencies/${dependence.id}`)
+      .then((data: any) => {
+        const index = value.findIndex((x) => x.id === dependence.id);
+        const result = [...value];
+        result.splice(index, 1, {
+          ...dependence,
+          ...data.data,
+        });
+        setValue(result);
+      })
+      .finally(() => setLoading(false));
+  };
+
+  const onSearch = (value: string) => {
+    setSearchText(value.trim());
+  };
+
+  useEffect(() => {
+    getDependencies();
+  }, [searchText, type]);
+
+  useEffect(() => {
+    setTimeout(() => {
+      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
+    });
+  }, []);
+
+  useEffect(() => {
+    if (logDependence) {
+      localStorage.setItem('logDependence', logDependence.id);
+      setIsLogModalVisible(true);
+    }
+  }, [logDependence]);
+
+  useEffect(() => {
+    if (!socketMessage) return;
+    const { type, message, references } = socketMessage;
+    if (
+      type === 'installDependence' &&
+      message.includes('结束时间') &&
+      references.length > 0
+    ) {
+      let status;
+      if (message.includes('安装')) {
+        status = message.includes('成功') ? Status.已安装 : Status.安装失败;
+      } else {
+        status = message.includes('成功') ? Status.已删除 : Status.删除失败;
+      }
+      const result = [...value];
+      for (let i = 0; i < references.length; i++) {
+        const index = value.findIndex((x) => x.id === references[i]);
+        result.splice(index, 1, {
+          ...result[index],
+          status,
+        });
+      }
+      setValue(result);
+
+      if (status === Status.已删除) {
+        setTimeout(() => {
+          const _result = [...value];
+          for (let i = 0; i < references.length; i++) {
+            const index = value.findIndex((x) => x.id === references[i]);
+            _result.splice(index, 1);
+          }
+          setValue(_result);
+        }, 5000);
+      }
+    }
+  }, [socketMessage]);
+
+  const panelContent = () => (
+    <>
+      {selectedRowIds.length > 0 && (
+        <div style={{ marginBottom: 16 }}>
+          <Button
+            type="primary"
+            style={{ marginBottom: 5, marginLeft: 8 }}
+            onClick={delDependencies}
+          >
+            批量删除
+          </Button>
+          <span style={{ marginLeft: 8 }}>
+            已选择
+            <a>{selectedRowIds?.length}</a>项
+          </span>
+        </div>
+      )}
+      <DndProvider backend={HTML5Backend}>
+        <Table
+          columns={columns}
+          rowSelection={rowSelection}
+          pagination={false}
+          dataSource={value}
+          rowKey="id"
+          size="middle"
+          scroll={{ x: 768, y: tableScrollHeight }}
+          loading={loading}
+        />
+      </DndProvider>
+    </>
+  );
+
+  const onTabChange = (activeKey: string) => {
+    setType(activeKey);
+  };
+
+  return (
+    <PageContainer
+      className="ql-container-wrapper dependence-wrapper"
+      title="依赖管理"
+      extra={[
+        <Search
+          placeholder="请输入名称"
+          style={{ width: 'auto' }}
+          enterButton
+          loading={loading}
+          onSearch={onSearch}
+        />,
+        <Button key="2" type="primary" onClick={() => addDependence()}>
+          新建依赖
+        </Button>,
+      ]}
+      header={{
+        style: headerStyle,
+      }}
+    >
+      <Tabs
+        defaultActiveKey="nodejs"
+        size="small"
+        tabPosition="top"
+        onChange={onTabChange}
+      >
+        <Tabs.TabPane tab="NodeJs" key="nodejs">
+          {panelContent()}
+        </Tabs.TabPane>
+        <Tabs.TabPane tab="Python3" key="python3">
+          {panelContent()}
+        </Tabs.TabPane>
+        <Tabs.TabPane tab="Linux" key="linux">
+          {panelContent()}
+        </Tabs.TabPane>
+      </Tabs>
+      <DependenceModal
+        visible={isModalVisible}
+        handleCancel={handleCancel}
+        dependence={editedDependence}
+        defaultType={type}
+      />
+      <DependenceLogModal
+        visible={isLogModalVisible}
+        handleCancel={(needRemove?: boolean) => {
+          setIsLogModalVisible(false);
+          if (needRemove) {
+            const index = value.findIndex((x) => x.id === logDependence.id);
+            const result = [...value];
+            result.splice(index, 1);
+            setValue(result);
+          } else if ([...value].map((x) => x.id).includes(logDependence.id)) {
+            getDependenceDetail(logDependence);
+          }
+        }}
+        socketMessage={socketMessage}
+        dependence={logDependence}
+      />
+    </PageContainer>
+  );
+};
+
+export default Dependence;

src/pages/dependence/logModal.tsx

@@ -0,0 +1,150 @@
+import React, { useEffect, useState } from 'react';
+import { Modal, message, Input, Form, Statistic, Button } from 'antd';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+import {
+  Loading3QuartersOutlined,
+  CheckCircleOutlined,
+} from '@ant-design/icons';
+import { PageLoading } from '@ant-design/pro-layout';
+
+const DependenceLogModal = ({
+  dependence,
+  handleCancel,
+  visible,
+  socketMessage,
+}: {
+  dependence?: any;
+  visible: boolean;
+  handleCancel: (needRemove?: boolean) => void;
+  socketMessage: any;
+}) => {
+  const [value, setValue] = useState<string>('');
+  const [executing, setExecuting] = useState<any>(true);
+  const [isPhone, setIsPhone] = useState(false);
+  const [loading, setLoading] = useState<boolean>(true);
+  const [isRemoveFailed, setIsRemoveFailed] = useState(false);
+  const [removeLoading, setRemoveLoading] = useState<boolean>(false);
+
+  const cancel = (needRemove: boolean = false) => {
+    localStorage.removeItem('logDependence');
+    handleCancel(needRemove);
+  };
+
+  const titleElement = () => {
+    return (
+      <>
+        {executing && <Loading3QuartersOutlined spin />}
+        {!executing && <CheckCircleOutlined />}
+        <span style={{ marginLeft: 5 }}>
+          日志 - {dependence && dependence.name}
+        </span>{' '}
+      </>
+    );
+  };
+
+  const getDependenceLog = () => {
+    setLoading(true);
+    request
+      .get(`${config.apiPrefix}dependencies/${dependence.id}`)
+      .then((data: any) => {
+        if (localStorage.getItem('logDependence') === String(dependence.id)) {
+          const log = (data.data.log || []).join('') as string;
+          setValue(log);
+          setExecuting(!log.includes('结束时间'));
+          setIsRemoveFailed(log.includes('删除失败'));
+        }
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  const forceRemoveDependence = () => {
+    setRemoveLoading(true);
+    request
+      .delete(`${config.apiPrefix}dependencies/force`, {
+        data: [dependence.id],
+      })
+      .then((data: any) => {
+        cancel(true);
+      })
+      .finally(() => {
+        setRemoveLoading(false);
+      });
+  };
+
+  const footerClick = () => {
+    if (isRemoveFailed) {
+      forceRemoveDependence();
+    } else {
+      cancel();
+    }
+  };
+
+  useEffect(() => {
+    if (dependence) {
+      getDependenceLog();
+    }
+  }, [dependence]);
+
+  useEffect(() => {
+    if (!socketMessage) return;
+    const { type, message, references } = socketMessage;
+    if (
+      type === 'installDependence' &&
+      message.includes('结束时间') &&
+      references.length > 0
+    ) {
+      setExecuting(false);
+      setIsRemoveFailed(message.includes('删除失败'));
+    }
+    setValue(`${value}${message}`);
+  }, [socketMessage]);
+
+  useEffect(() => {
+    setIsPhone(document.body.clientWidth < 768);
+  }, []);
+
+  return (
+    <Modal
+      title={titleElement()}
+      visible={visible}
+      centered
+      className="log-modal"
+      bodyStyle={{
+        overflowY: 'auto',
+        maxHeight: 'calc(70vh - var(--vh-offset, 0px))',
+        minHeight: '300px',
+      }}
+      forceRender
+      onOk={() => cancel()}
+      onCancel={() => cancel()}
+      footer={[
+        <Button type="primary" onClick={footerClick} loading={removeLoading}>
+          {isRemoveFailed ? '强制删除' : '知道了'}
+        </Button>,
+      ]}
+    >
+      {loading ? (
+        <PageLoading />
+      ) : (
+        <pre
+          style={
+            isPhone
+              ? {
+                  fontFamily: 'Source Code Pro',
+                  width: 375,
+                  zoom: 0.83,
+                }
+              : {}
+          }
+        >
+          {value}
+        </pre>
+      )}
+    </Modal>
+  );
+};
+
+export default DependenceLogModal;

src/pages/dependence/modal.tsx

@@ -0,0 +1,138 @@
+import React, { useEffect, useState } from 'react';
+import { Modal, message, Input, Form, Radio, Select } from 'antd';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+
+const { Option } = Select;
+enum DependenceTypes {
+  'nodejs',
+  'python3',
+  'linux',
+}
+
+const DependenceModal = ({
+  dependence,
+  handleCancel,
+  visible,
+  defaultType,
+}: {
+  dependence?: any;
+  visible: boolean;
+  handleCancel: (cks?: any[]) => void;
+  defaultType: string;
+}) => {
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+
+  const handleOk = async (values: any) => {
+    setLoading(true);
+    const { name, split, type, remark } = values;
+    const method = dependence ? 'put' : 'post';
+    let payload;
+    if (!dependence) {
+      if (split === '1') {
+        const symbol = name.includes('&') ? '&' : '\n';
+        payload = name.split(symbol).map((x: any) => {
+          return {
+            name: x,
+            type,
+            remark,
+          };
+        });
+      } else {
+        payload = [{ name, type, remark }];
+      }
+    } else {
+      payload = { ...values, id: dependence.id };
+    }
+    try {
+      const { code, data } = await request[method](
+        `${config.apiPrefix}dependencies`,
+        {
+          data: payload,
+        },
+      );
+      if (code !== 200) {
+        message.error(data);
+      }
+      setLoading(false);
+      handleCancel(data);
+    } catch (error) {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    form.resetFields();
+  }, [dependence, visible]);
+
+  return (
+    <Modal
+      title={dependence ? '编辑依赖' : '新建依赖'}
+      visible={visible}
+      forceRender
+      onOk={() => {
+        form
+          .validateFields()
+          .then((values) => {
+            handleOk(values);
+          })
+          .catch((info) => {
+            console.log('Validate Failed:', info);
+          });
+      }}
+      onCancel={() => handleCancel()}
+      confirmLoading={loading}
+    >
+      <Form
+        form={form}
+        layout="vertical"
+        name="dependence_modal"
+        initialValues={dependence}
+      >
+        <Form.Item
+          name="type"
+          label="依赖类型"
+          initialValue={DependenceTypes[defaultType as any]}
+        >
+          <Select>
+            {config.dependenceTypes.map((x, i) => (
+              <Option value={i}>{x}</Option>
+            ))}
+          </Select>
+        </Form.Item>
+        {!dependence && (
+          <Form.Item
+            name="split"
+            label="自动拆分"
+            initialValue="0"
+            tooltip="多个依赖是否换行分割"
+          >
+            <Radio.Group>
+              <Radio value="1">是</Radio>
+              <Radio value="0">否</Radio>
+            </Radio.Group>
+          </Form.Item>
+        )}
+        <Form.Item
+          name="name"
+          label="名称"
+          rules={[
+            { required: true, message: '请输入依赖名称', whitespace: true },
+          ]}
+        >
+          <Input.TextArea
+            rows={4}
+            autoSize={true}
+            placeholder="请输入依赖名称"
+          />
+        </Form.Item>
+        <Form.Item name="remark" label="备注">
+          <Input placeholder="请输入备注" />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default DependenceModal;

src/pages/diff/index.less

@@ -11,3 +11,10 @@
 .d2h-code-side-line {
   padding: 0 0.5em;
 }
+
+.diff-switch-file {
+  min-width: 768px;
+  .ant-form-item {
+    margin-bottom: 8px;
+  }
+}

src/pages/diff/index.tsx

@@ -1,55 +1,78 @@
 import React, { PureComponent, useRef, useState, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Select, Form, Row, Col } from 'antd';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
 import { request } from '@/utils/http';
 import './index.less';
 import { DiffEditor } from '@monaco-editor/react';
 import ReactDiffViewer from 'react-diff-viewer';
-import { useCtx, useTheme } from '@/utils/hooks';
 
-const Crontab = () => {
-  const [value, setValue] = useState('');
-  const [sample, setSample] = useState('');
+const { Option } = Select;
+
+const Diff = ({ headerStyle, isPhone, theme }: any) => {
+  const [origin, setOrigin] = useState('config.sample.sh');
+  const [current, setCurrent] = useState('config.sh');
+  const [originValue, setOriginValue] = useState('');
+  const [currentValue, setCurrentValue] = useState('');
   const [loading, setLoading] = useState(true);
-  const { headerStyle, isPhone } = useCtx();
-  const { theme } = useTheme();
+  const [files, setFiles] = useState<any[]>([]);
   const editorRef = useRef<any>(null);
 
   const getConfig = () => {
-    request.get(`${config.apiPrefix}configs/config.sh`).then((data) => {
-      setValue(data.data);
+    request.get(`${config.apiPrefix}configs/${current}`).then((data) => {
+      setCurrentValue(data.data);
     });
   };
 
   const getSample = () => {
-    setLoading(true);
-    request
-      .get(`${config.apiPrefix}configs/config.sample.sh`)
-      .then((data) => {
-        setSample(data.data);
-      })
-      .finally(() => setLoading(false));
+    request.get(`${config.apiPrefix}configs/${origin}`).then((data) => {
+      setOriginValue(data.data);
+    });
   };
 
   const updateConfig = () => {
     const content = editorRef.current
       ? editorRef.current.getModel().modified.getValue().replace(/\r\n/g, '\n')
-      : value;
+      : currentValue;
 
     request
       .post(`${config.apiPrefix}configs/save`, {
-        data: { content, name: 'config.sh' },
+        data: { content, name: current },
       })
       .then((data: any) => {
         message.success(data.message);
       });
   };
 
+  const getFiles = () => {
+    setLoading(true);
+    request
+      .get(`${config.apiPrefix}configs/files`)
+      .then((data: any) => {
+        setFiles(data.data);
+      })
+      .finally(() => setLoading(false));
+  };
+
+  const originFileChange = (value: string) => {
+    setOrigin(value);
+  };
+
+  const currentFileChange = (value: string) => {
+    setCurrent(value);
+  };
+
+  useEffect(() => {
+    getFiles();
+  }, []);
+
+  useEffect(() => {
+    getSample();
+  }, [origin]);
+
   useEffect(() => {
     getConfig();
-    getSample();
-  }, []);
+  }, [current]);
 
   return (
     <PageContainer
@@ -67,6 +90,26 @@ const Crontab = () => {
         ]
       }
     >
+      <Row gutter={24} className="diff-switch-file">
+        <Col span={12}>
+          <Form.Item label="源文件">
+            <Select value={origin} onChange={originFileChange}>
+              {files.map((x) => (
+                <Option value={x.value}>{x.title}</Option>
+              ))}
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={12}>
+          <Form.Item label="当前文件">
+            <Select value={current} onChange={currentFileChange}>
+              {files.map((x) => (
+                <Option value={x.value}>{x.title}</Option>
+              ))}
+            </Select>
+          </Form.Item>
+        </Col>
+      </Row>
       {isPhone ? (
         <ReactDiffViewer
           styles={{
@@ -86,8 +129,8 @@ const Crontab = () => {
               wordBreak: 'break-word',
             },
           }}
-          oldValue={value}
-          newValue={sample}
+          oldValue={originValue}
+          newValue={currentValue}
           splitView={true}
           leftTitle="config.sh"
           rightTitle="config.sample.sh"
@@ -96,8 +139,8 @@ const Crontab = () => {
       ) : (
         <DiffEditor
           language={'shell'}
-          original={sample}
-          modified={value}
+          original={originValue}
+          modified={currentValue}
           options={{
             fontSize: 12,
             lineNumbersMinChars: 3,
@@ -115,4 +158,4 @@ const Crontab = () => {
   );
 };
 
-export default Crontab;
+export default Diff;

src/pages/env/index.tsx

@@ -25,9 +25,9 @@ import EditNameModal from './editNameModal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
-import { useCtx } from '@/utils/hooks';
+import { getTableScroll } from '@/utils/index';
 
-const { Text } = Typography;
+const { Text, Paragraph } = Typography;
 const { Search } = Input;
 
 enum Status {
@@ -60,11 +60,10 @@ const DragableBodyRow = ({
   ...restProps
 }: any) => {
   const ref = useRef();
-  const [{ isOver, dropClassName }, drop] = useDrop(
-    () => ({
+  const [{ isOver, dropClassName }, drop] = useDrop({
     accept: type,
     collect: (monitor) => {
-        const { index: dragIndex } = monitor.getItem() || ({} as any);
+      const { index: dragIndex } = (monitor.getItem() as any) || {};
       if (dragIndex === index) {
         return {};
       }
@@ -77,19 +76,14 @@ const DragableBodyRow = ({
     drop: (item: any) => {
       moveRow(item.index, index);
     },
-    }),
-    [index],
-  );
-  const [, drag, preview] = useDrag(
-    () => ({
+  });
+  const [, drag] = useDrag({
     type,
     item: { index },
     collect: (monitor) => ({
       isDragging: monitor.isDragging(),
     }),
-    }),
-    [index],
-  );
+  });
   drop(drag(ref));
 
   return (
@@ -98,18 +92,16 @@ const DragableBodyRow = ({
       className={`${className}${isOver ? dropClassName : ''}`}
       style={{ cursor: 'move', ...style }}
       {...restProps}
-    >
-      {restProps.children}
-    </tr>
+    />
   );
 };
 
-const Env = () => {
-  const columns = [
+const Env = ({ headerStyle, isPhone, theme }: any) => {
+  const columns: any = [
     {
       title: '序号',
       align: 'center' as const,
-      width: 50,
+      width: 60,
       render: (text: string, record: any, index: number) => {
         return <span style={{ cursor: 'text' }}>{index + 1} </span>;
       },
@@ -119,21 +111,26 @@ const Env = () => {
       dataIndex: 'name',
       key: 'name',
       align: 'center' as const,
+      sorter: (a: any, b: any) => a.name.localeCompare(b.name),
     },
     {
       title: '值',
       dataIndex: 'value',
       key: 'value',
       align: 'center' as const,
-      width: '44%',
-      ellipsis: {
-        showTitle: false,
-      },
+      width: '35%',
       render: (text: string, record: any) => {
         return (
-          <Tooltip placement="topLeft" title={text}>
-            <span>{text}</span>
-          </Tooltip>
+          <Paragraph
+            style={{
+              wordBreak: 'break-all',
+              marginBottom: 0,
+              textAlign: 'left',
+            }}
+            ellipsis={{ tooltip: text, rows: 2 }}
+          >
+            {text}
+          </Paragraph>
         );
       },
     },
@@ -143,12 +140,58 @@ const Env = () => {
       key: 'remarks',
       align: 'center' as const,
     },
+    {
+      title: '更新时间',
+      dataIndex: 'timestamp',
+      key: 'timestamp',
+      align: 'center' as const,
+      width: 165,
+      ellipsis: {
+        showTitle: false,
+      },
+      sorter: {
+        compare: (a: any, b: any) => {
+          const updatedAtA = new Date(a.updatedAt || a.timestamp).getTime();
+          const updatedAtB = new Date(b.updatedAt || b.timestamp).getTime();
+          return updatedAtA - updatedAtB;
+        },
+      },
+      render: (text: string, record: any) => {
+        const language = navigator.language || navigator.languages[0];
+        const time = record.updatedAt || record.timestamp;
+        const date = new Date(time)
+          .toLocaleString(language, {
+            hour12: false,
+          })
+          .replace(' 24:', ' 00:');
+        return (
+          <Tooltip
+            placement="topLeft"
+            title={date}
+            trigger={['hover', 'click']}
+          >
+            <span>{date}</span>
+          </Tooltip>
+        );
+      },
+    },
     {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
       align: 'center' as const,
-      width: 60,
+      width: 70,
+      filters: [
+        {
+          text: '已启用',
+          value: 0,
+        },
+        {
+          text: '已禁用',
+          value: 1,
+        },
+      ],
+      onFilter: (value: number, record: any) => record.status === value,
       render: (text: string, record: any, index: number) => {
         return (
           <Space size="middle" style={{ cursor: 'text' }}>
@@ -162,11 +205,12 @@ const Env = () => {
     {
       title: '操作',
       key: 'action',
+      width: 120,
       align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
-          <Space size="middle" style={{ paddingLeft: 8 }}>
+          <Space size="middle">
             <Tooltip title={isPc ? '编辑' : ''}>
               <a onClick={() => editEnv(record, index)}>
                 <EditOutlined />
@@ -202,7 +246,7 @@ const Env = () => {
   const [editedEnv, setEditedEnv] = useState();
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
   const [searchText, setSearchText] = useState('');
-  const { headerStyle, isPhone } = useCtx();
+  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
 
   const getEnvs = () => {
     setLoading(true);
@@ -234,7 +278,7 @@ const Env = () => {
               record.status === Status.已禁用 ? 'enable' : 'disable'
             }`,
             {
-              data: [record._id],
+              data: [record.id],
             },
           )
           .then((data: any) => {
@@ -278,14 +322,14 @@ const Env = () => {
         <>
           确认删除变量{' '}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {record.value}
+            {record.name}: {record.value}
           </Text>{' '}
           吗
         </>
       ),
       onOk() {
         request
-          .delete(`${config.apiPrefix}envs`, { data: [record._id] })
+          .delete(`${config.apiPrefix}envs`, { data: [record.id] })
           .then((data: any) => {
             if (data.code === 200) {
               message.success('删除成功');
@@ -315,9 +359,10 @@ const Env = () => {
 
   const handleEnv = (env: any) => {
     const result = [...value];
-    const index = value.findIndex((x) => x._id === env._id);
+    const index = value.findIndex((x) => x.id === env.id);
     if (index === -1) {
-      result.push(env);
+      env = Array.isArray(env) ? env : [env];
+      result.push(...env);
     } else {
       result.splice(index, 1, {
         ...env,
@@ -338,16 +383,17 @@ const Env = () => {
         return;
       }
       const dragRow = value[dragIndex];
-      const newData = [...value];
-      newData.splice(dragIndex, 1);
-      newData.splice(hoverIndex, 0, dragRow);
-      setValue([...newData]);
       request
-        .put(`${config.apiPrefix}envs/${dragRow._id}/move`, {
+        .put(`${config.apiPrefix}envs/${dragRow.id}/move`, {
           data: { fromIndex: dragIndex, toIndex: hoverIndex },
         })
         .then((data: any) => {
-          if (data.code !== 200) {
+          if (data.code === 200) {
+            const newData = [...value];
+            newData.splice(dragIndex, 1);
+            newData.splice(hoverIndex, 0, { ...dragRow, ...data.data });
+            setValue([...newData]);
+          } else {
             message.error(data);
           }
         });
@@ -357,6 +403,12 @@ const Env = () => {
 
   const onSelectChange = (selectedIds: any[]) => {
     setSelectedRowIds(selectedIds);
+
+    setTimeout(() => {
+      if (selectedRowIds.length === 0 || selectedIds.length === 0) {
+        setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
+      }
+    });
   };
 
   const rowSelection = {
@@ -415,13 +467,19 @@ const Env = () => {
   };
 
   const onSearch = (value: string) => {
-    setSearchText(value);
+    setSearchText(value.trim());
   };
 
   useEffect(() => {
     getEnvs();
   }, [searchText]);
 
+  useEffect(() => {
+    setTimeout(() => {
+      setTableScrollHeight(getTableScroll({ extraHeight: 87 }));
+    });
+  }, []);
+
   return (
     <PageContainer
       className="ql-container-wrapper env-wrapper"
@@ -435,7 +493,7 @@ const Env = () => {
           onSearch={onSearch}
         />,
         <Button key="2" type="primary" onClick={() => addEnv()}>
-          添加变量
+          新建变量
         </Button>,
       ]}
       header={{
@@ -484,9 +542,9 @@ const Env = () => {
           rowSelection={rowSelection}
           pagination={false}
           dataSource={value}
-          rowKey="_id"
+          rowKey="id"
           size="middle"
-          scroll={{ x: 768 }}
+          scroll={{ x: 1000, y: tableScrollHeight }}
           components={components}
           loading={loading}
           onRow={(record: any, index: number) => {

src/pages/env/modal.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Modal, message, Input, Form } from 'antd';
+import { Modal, message, Input, Form, Radio } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 
@@ -17,18 +17,39 @@ const EnvModal = ({
 
   const handleOk = async (values: any) => {
     setLoading(true);
+    const { value, split, name, remarks } = values;
     const method = env ? 'put' : 'post';
-    const payload = env ? { ...values, _id: env._id } : values;
+    let payload;
+    if (!env) {
+      if (split === '1') {
+        const symbol = value.includes('&') ? '&' : '\n';
+        payload = value.split(symbol).map((x: any) => {
+          return {
+            name: name,
+            value: x,
+            remarks: remarks,
+          };
+        });
+      } else {
+        payload = [{ value, name, remarks }];
+      }
+    } else {
+      payload = { ...values, id: env.id };
+    }
+    try {
       const { code, data } = await request[method](`${config.apiPrefix}envs`, {
         data: payload,
       });
       if (code === 200) {
-      message.success(env ? '更新变量成功' : '添加变量成功');
+        message.success(env ? '更新变量成功' : '新建变量成功');
       } else {
         message.error(data);
       }
       setLoading(false);
       handleCancel(data);
+    } catch (error: any) {
+      setLoading(false);
+    }
   };
 
   useEffect(() => {
@@ -57,14 +78,35 @@ const EnvModal = ({
         <Form.Item
           name="name"
           label="名称"
-          rules={[{ required: true, message: '请输入环境变量名称' }]}
+          rules={[
+            { required: true, message: '请输入环境变量名称', whitespace: true },
+            {
+              pattern: /^[a-zA-Z_][0-9a-zA-Z_]*$/,
+              message: '只能输入字母数字下划线，且不能以数字开头',
+            },
+          ]}
         >
           <Input placeholder="请输入环境变量名称" />
         </Form.Item>
+        {!env && (
+          <Form.Item
+            name="split"
+            label="自动拆分"
+            initialValue="0"
+            tooltip="多个依赖是否换行分割"
+          >
+            <Radio.Group>
+              <Radio value="1">是</Radio>
+              <Radio value="0">否</Radio>
+            </Radio.Group>
+          </Form.Item>
+        )}
         <Form.Item
           name="value"
           label="值"
-          rules={[{ required: true, message: '请输入环境变量值' }]}
+          rules={[
+            { required: true, message: '请输入环境变量值', whitespace: true },
+          ]}
         >
           <Input.TextArea
             rows={4}
@@ -73,7 +115,7 @@ const EnvModal = ({
           />
         </Form.Item>
         <Form.Item name="remarks" label="备注">
-          <Input />
+          <Input placeholder="请输入备注" />
         </Form.Item>
       </Form>
     </Modal>

src/pages/error/index.less

@@ -0,0 +1,12 @@
+.error-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+
+  .react-terminal-wrapper {
+    max-width: 90%;
+    height: calc(100vh - 80px);
+    overflow-y: auto;
+  }
+}

src/pages/error/index.tsx

@@ -0,0 +1,59 @@
+import React, { useState, useEffect } from 'react';
+import config from '@/utils/config';
+import { request } from '@/utils/http';
+import Terminal, { ColorMode, LineType } from '../../components/terminal';
+import { PageLoading } from '@ant-design/pro-layout';
+import { history } from 'umi';
+import Ansi from 'ansi-to-react';
+import './index.less';
+
+const Error = ({ user, theme }: any) => {
+  const [loading, setLoading] = useState(false);
+  const [data, setData] = useState('暂无日志');
+
+  const getLog = () => {
+    setLoading(true);
+    request
+      .get(`${config.apiPrefix}public/panel/log`)
+      .then((data: any) => {
+        setData(data.data);
+      })
+      .finally(() => setLoading(false));
+  };
+
+  useEffect(() => {
+    if (user) {
+      history.push('/crontab');
+    }
+  }, [user]);
+
+  useEffect(() => {
+    getLog();
+  }, []);
+
+  return (
+    <div className="error-wrapper">
+      {loading ? (
+        <PageLoading />
+      ) : (
+        <Terminal
+          name="服务错误"
+          colorMode={theme === 'vs-dark' ? ColorMode.Dark : ColorMode.Light}
+          lineData={[
+            { type: LineType.Input, value: 'pm2 logs panel' },
+            {
+              type: LineType.Output,
+              value: (
+                <pre>
+                  <Ansi>{data}</Ansi>
+                </pre>
+              ),
+            },
+          ]}
+        />
+      )}
+    </div>
+  );
+};
+
+export default Error;