更新版本 v2.12.0

* 增加PushDeer推送

.env.example

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

.github/workflows/build_docker_image.yml

@@ -28,17 +28,17 @@ jobs:
       - name: build front and back
         run: |
           yarn install
-          yarn build
+          yarn build:front
-          yarn build-back
+          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 static
+          mkdir -p tmp
-          cd ./static
+          cd ./tmp
-          cp -rf ../dist ./ && cp -rf ../build ./
+          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'
@@ -56,6 +56,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
 
       - name: Set time zone
         uses: szenius/set-timezone@v1.0
@@ -108,7 +111,7 @@ jobs:
           build-args: |
             MAINTAINER=${{ github.repository_owner }}
             QL_BRANCH=${{ github.ref_name }}
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
           context: docker/
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.gitignore

@@ -4,12 +4,13 @@
 /node_modules
 /npm-debug.log*
 /yarn-error.log
+/yarn.lock
 /pnpm-lock.yaml
 /package-lock.json
 
 # production
-/dist
+/static
-/build
+/data
 
 # misc
 .DS_Store

.umirc.ts

@@ -4,15 +4,22 @@ const CompressionPlugin = require('compression-webpack-plugin');
 export default defineConfig({
   hash: true,
   layout: false,
+  outputPath: 'static/dist',
   nodeModulesTransform: {
     type: 'none',
   },
   fastRefresh: {},
+  esbuild: {},
+  webpack5: {},
   dynamicImport: {
     loading: '@/components/pageLoading',
   },
   favicon: '/images/g5.ico',
   proxy: {
+    '/api/public': {
+      target: 'http://127.0.0.1:5400/',
+      changeOrigin: true,
+    },
     '/api': {
       target: 'http://127.0.0.1:5600/',
       changeOrigin: true,
@@ -32,18 +39,9 @@ export default defineConfig({
   externals: {
     react: 'window.React',
     'react-dom': 'window.ReactDOM',
-    darkreader: 'window.DarkReader',
-    codemirror: 'window.CodeMirror',
-    'sockjs-client': 'window.SockJS',
   },
   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.40/darkreader.min.js',
-    'https://cdn.jsdelivr.net/npm/codemirror@5/lib/codemirror.min.js',
-    'https://cdn.jsdelivr.net/npm/codemirror@5/mode/shell/shell.js',
-    'https://cdn.jsdelivr.net/npm/codemirror@5/mode/python/python.js',
-    'https://cdn.jsdelivr.net/npm/codemirror@5/mode/javascript/javascript.js',
-    'https://cdn.jsdelivr.net/npm/sockjs-client@1/dist/sockjs.min.js',
   ],
 });

README.md

@@ -44,6 +44,27 @@
 # 待完善
 ```
 
+### 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 安装
@@ -56,12 +77,7 @@ sudo curl -sSL get.docker.com | sh
 
 ```bash
 docker run -dit \
-  -v $PWD/ql/config:/ql/config \
+  -v $PWD/ql:/ql/data \
-  -v $PWD/ql/log:/ql/log \
-  -v $PWD/ql/db:/ql/db \
-  -v $PWD/ql/repo:/ql/repo \
-  -v $PWD/ql/raw:/ql/raw \
-  -v $PWD/ql/scripts:/ql/scripts \
   -p 5700:5700 \
   --name qinglong \
   --hostname qinglong \
@@ -81,7 +97,7 @@ sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-c
 
 ```bash
 mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker-compose.yml
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
 
 # 启动
 docker-compose up -d
@@ -153,11 +169,10 @@ $ git clone git@github.com:whyour/qinglong.git
 $ cd qinglong
 $ cp .env.example .env
 $ yarn install
-$ yarn start-back
 $ yarn start
 ```
 
-打开你的浏览器，访问 http://127.0.0.1:5601
+打开你的浏览器，访问 http://127.0.0.1:5700
 
 ## 交流
 

back/api/cron.ts

@@ -28,6 +28,7 @@ export default (app: Router) => {
         command: Joi.string().required(),
         schedule: Joi.string().required(),
         name: Joi.string().optional(),
+        labels: Joi.array().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -50,7 +51,7 @@ export default (app: Router) => {
   route.put(
     '/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');
@@ -68,7 +69,7 @@ export default (app: Router) => {
   route.put(
     '/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');
@@ -83,10 +84,55 @@ export default (app: Router) => {
     },
   );
 
+  route.delete(
+    '/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.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.string().required()),
+      body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -104,7 +150,7 @@ export default (app: Router) => {
   route.put(
     '/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');
@@ -123,10 +169,10 @@ export default (app: Router) => {
     '/: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);
@@ -140,13 +186,14 @@ export default (app: Router) => {
   );
 
   route.put(
-    '',
+    '/',
     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) => {
@@ -172,7 +219,7 @@ export default (app: Router) => {
   route.delete(
     '/',
     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');
@@ -190,7 +237,7 @@ export default (app: Router) => {
   route.put(
     '/pin',
     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');
@@ -208,7 +255,7 @@ export default (app: Router) => {
   route.put(
     '/unpin',
     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');
@@ -242,14 +289,14 @@ export default (app: Router) => {
     '/: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);
@@ -262,7 +309,7 @@ export default (app: Router) => {
     '/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(),
@@ -286,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

@@ -27,7 +27,7 @@ export default (app: Router) => {
         Joi.object({
           name: Joi.string().required(),
           type: Joi.number().required(),
-          remark: Joi.number().optional().allow(''),
+          remark: Joi.string().optional().allow(''),
         }),
       ),
     }),
@@ -49,9 +49,9 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         name: Joi.string().required(),
-        _id: Joi.string().required(),
+        id: Joi.number().required(),
         type: Joi.number().required(),
-        remark: Joi.number().optional().allow(''),
+        remark: Joi.string().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -70,7 +70,7 @@ export default (app: Router) => {
   route.delete(
     '/',
     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');
@@ -88,7 +88,7 @@ export default (app: Router) => {
   route.delete(
     '/force',
     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');
@@ -107,14 +107,14 @@ export default (app: Router) => {
     '/: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 dependenceService = Container.get(DependenceService);
-        const data = await dependenceService.get(req.params.id);
+        const data = await dependenceService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
         logger.error('🔥 error: %o', e);
@@ -126,7 +126,7 @@ export default (app: Router) => {
   route.put(
     '/reinstall',
     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');

back/api/env.ts

@@ -50,8 +50,8 @@ export default (app: Router) => {
       body: Joi.object({
         value: Joi.string().required(),
         name: Joi.string().required(),
-        remarks: Joi.string().optional().allow(''),
+        remarks: Joi.string().optional().allow('').allow(null),
-        _id: Joi.string().required(),
+        id: Joi.number().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -70,7 +70,7 @@ export default (app: Router) => {
   route.delete(
     '/',
     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');
@@ -89,14 +89,14 @@ export default (app: Router) => {
     '/: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);
@@ -112,7 +112,7 @@ export default (app: Router) => {
   route.put(
     '/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');
@@ -130,7 +130,7 @@ export default (app: Router) => {
   route.put(
     '/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');
@@ -149,7 +149,7 @@ export default (app: Router) => {
     '/name',
     celebrate({
       body: Joi.object({
-        ids: Joi.array().items(Joi.string().required()),
+        ids: Joi.array().items(Joi.number().required()),
         name: Joi.string().required(),
       }),
     }),
@@ -170,14 +170,14 @@ export default (app: Router) => {
     '/: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/open.ts

@@ -49,7 +49,7 @@ export default (app: Router) => {
       body: Joi.object({
         name: Joi.string().optional().allow(''),
         scopes: Joi.array().items(Joi.string()),
-        _id: Joi.string().required(),
+        id: Joi.number().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -68,7 +68,7 @@ export default (app: Router) => {
   route.delete(
     '/apps',
     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 +87,10 @@ export default (app: Router) => {
     '/apps/:id/reset-secret',
     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 openService = Container.get(OpenService);

back/api/system.ts

@@ -5,8 +5,8 @@ import * as fs from 'fs';
 import config from '../config';
 import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
-import { getFileContentByName } from '../config/util';
 import UserService from '../services/user';
+import { EnvModel } from '../data/env';
 const route = Router();
 
 export default (app: Router) => {
@@ -17,7 +17,7 @@ export default (app: Router) => {
     try {
       const userService = Container.get(UserService);
       const authInfo = await userService.getUserInfo();
-      const envDbContent = getFileContentByName(config.envDbFile);
+      const envCount = await EnvModel.count();
       const versionRegx = /.*export const version = \'(.*)\'\;/;
 
       const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
@@ -28,7 +28,7 @@ export default (app: Router) => {
         Object.keys(authInfo).length === 2 &&
         authInfo.username === 'admin' &&
         authInfo.password === 'admin' &&
-        envDbContent.length === 0
+        envCount === 0
       ) {
         isInitialized = false;
       }
@@ -111,4 +111,25 @@ export default (app: Router) => {
       }
     },
   );
+
+  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/config/index.ts

@@ -4,32 +4,30 @@ import { createRandomString } from './util';
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const lastVersionFile =
+const lastVersionFile = 'https://qn.whyour.cn/version.ts';
-  'https://raw.githubusercontent.com/whyour/qinglong/master/src/version.ts';
 
 const envFound = dotenv.config();
 const rootPath = process.cwd();
-const envFile = path.join(rootPath, 'config/env.sh');
+const dataPath = path.join(rootPath, 'data/');
-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 bakPath = path.join(rootPath, 'bak/');
 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 appDbFile = path.join(rootPath, 'db/app.db');
-const authDbFile = path.join(rootPath, 'db/auth.db');
-const dependenceDbFile = path.join(rootPath, 'db/dependence.db');
 const versionFile = path.join(rootPath, 'src/version.ts');
 
 if (envFound.error) {
@@ -37,8 +35,9 @@ if (envFound.error) {
 }
 
 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',
@@ -59,11 +58,6 @@ export default {
   confFile,
   envFile,
   dbPath,
-  cronDbFile,
-  envDbFile,
-  appDbFile,
-  authDbFile,
-  dependenceDbFile,
   configPath,
   scriptPath,
   samplePath,
@@ -86,4 +80,5 @@ export default {
   ],
   versionFile,
   lastVersionFile,
+  sqliteFile,
 };

back/config/util.ts

@@ -107,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)];
   }
 

back/data/auth.ts

@@ -1,14 +1,17 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
 export class AuthInfo {
   ip?: string;
   type: AuthDataType;
   info?: any;
-  _id?: string;
+  id?: number;
 
   constructor(options: AuthInfo) {
     this.ip = options.ip;
     this.info = options.info;
     this.type = options.type;
-    this._id = options._id;
+    this.id = options.id;
   }
 }
 
@@ -23,3 +26,13 @@ export enum AuthDataType {
   '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,26 +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.id = options.id;
-    this.created = options.created;
+    this.status =
-    this.status = CrontabStatus[options.status]
+      options.status && CrontabStatus[options.status]
         ? options.status
         : CrontabStatus.idle;
     this.timestamp = new Date().toString();
@@ -29,6 +34,9 @@ export class Crontab {
     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;
   }
 }
 
@@ -38,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

@@ -1,7 +1,9 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
 export class Dependence {
   timestamp?: string;
-  created?: number;
+  id?: number;
-  _id?: string;
   status?: DependenceStatus;
   type?: DependenceTypes;
   name?: number;
@@ -9,8 +11,7 @@ export class Dependence {
   remark?: string;
 
   constructor(options: Dependence) {
-    this._id = options._id;
+    this.id = options.id;
-    this.created = options.created || new Date().valueOf();
     this.status = options.status || DependenceStatus.installing;
     this.type = options.type || DependenceTypes.nodejs;
     this.timestamp = new Date().toString();
@@ -46,3 +47,18 @@ export enum unInstallDependenceCommandTypes {
   '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?: number;
-  _id?: string;
   status?: EnvStatus;
   position?: number;
-  name?: number;
+  name?: string;
-  remarks?: number;
+  remarks?: string;
 
   constructor(options: Env) {
     this.value = options.value;
-    this._id = options._id;
+    this.id = options.id;
-    this.created = options.created || new Date().valueOf();
     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

@@ -2,6 +2,7 @@ export enum NotificationMode {
   'gotify' = 'gotify',
   'goCqHttpBot' = 'goCqHttpBot',
   'serverChan' = 'serverChan',
+  'pushDeer' = 'pushDeer',
   'bark' = 'bark',
   'telegramBot' = 'telegramBot',
   'dingtalkBot' = 'dingtalkBot',
@@ -32,8 +33,13 @@ 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';
 }
@@ -79,6 +85,7 @@ export interface NotificationInfo
   extends GoCqHttpBotNotification,
     GotifyNotification,
     ServerChanNotification,
+    PushDeerNotification,
     BarkNotification,
     TelegramBotNotification,
     DingtalkBotNotification,

back/data/open.ts

@@ -1,23 +1,26 @@
+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?: string;
+  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;
+    this.id = options.id;
   }
 }
 
 export interface AppToken {
   value: string;
-  type: 'Bearer';
+  type?: 'Bearer';
   expiration: number;
 }
 
@@ -29,3 +32,12 @@ export enum CrontabStatus {
   '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

@@ -1,7 +1,7 @@
 export class SockMessage {
   message?: string;
   type?: SockMessageType;
-  references?: string[];
+  references?: number[];
 
   constructor(options: SockMessage) {
     this.type = options.type;

back/loaders/db.ts

@@ -1,57 +1,102 @@
-import DataStore from 'nedb';
-import config from '../config';
 import Logger from './logger';
-import fs from 'fs';
+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';
 
-interface Dbs {
-  cronDb: DataStore;
-  dependenceDb: DataStore;
-  envDb: DataStore;
-  appDb: DataStore;
-  authDb: DataStore;
-}
-
-const db: Dbs = {} as any;
-
-async function truncateDb() {
-  return new Promise(async (resolve) => {
-    const files = [
-      config.cronDbFile,
-      config.dependenceDbFile,
-      config.envDbFile,
-      config.appDbFile,
-      config.authDbFile,
-    ];
-
-    for (const file of files) {
-      const _fileExist = await fileExist(file);
-      if (_fileExist && fs.statSync(file).size >= 1024 * 1024 * 500) {
-        fs.truncateSync(file, 1024 * 1024 * 500);
-      }
-    }
-    resolve(null);
-  });
-}
 export default async () => {
   try {
-    await truncateDb();
+    await CrontabModel.sync();
+    await DependenceModel.sync();
+    await AppModel.sync();
+    await AuthModel.sync();
+    await EnvModel.sync();
+    await sequelize.sync();
 
-    db.cronDb = new DataStore({ filename: config.cronDbFile, autoload: true });
+    // try {
-    db.dependenceDb = new DataStore({
+    //   const queryInterface = sequelize.getQueryInterface();
-      filename: config.dependenceDbFile,
+    //   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,
       });
-    db.envDb = new DataStore({ filename: config.envDbFile, autoload: true });
+      cronDb.persistence.compactDatafile();
-    db.appDb = new DataStore({ filename: config.appDbFile, autoload: true });
+      cronDb.find({}).exec(async (err, docs) => {
-    db.authDb = new DataStore({ filename: config.authDbFile, autoload: true });
+        await CrontabModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
 
-    // compaction data file
+    if (dependenceDbExist && dependenceCount === 0) {
-    db.cronDb.persistence.compactDatafile();
+      const dependenceDb = new DataStore({
-    db.envDb.persistence.compactDatafile();
+        filename: dependenceDbFile,
-    db.dependenceDb.persistence.compactDatafile();
+        autoload: true,
-    db.appDb.persistence.compactDatafile();
+      });
-    db.authDb.persistence.compactDatafile();
+      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) {
@@ -59,5 +104,3 @@ export default async () => {
     Logger.info(error);
   }
 };
-
-export const dbs: Dbs = db;

back/loaders/express.ts

@@ -5,13 +5,14 @@ import routes from '../api';
 import config from '../config';
 import jwt from 'express-jwt';
 import fs from 'fs';
-import { getFileContentByName, getPlatform, 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');
@@ -22,7 +23,7 @@ export default ({ app }: { app: Application }) => {
       next();
     } else {
       return handler(req, res, {
-        public: 'dist',
+        public: 'static/dist',
         rewrites: [{ source: '**', destination: '/index.html' }],
       });
     }
@@ -68,18 +69,19 @@ export default ({ app }: { app: Application }) => {
       }
     }
 
+    const originPath = `${req.baseUrl}${req.path === '/' ? '' : req.path}`;
     if (
       !headerToken &&
-      req.path &&
+      originPath &&
-      config.apiWhiteList.includes(req.path) &&
+      config.apiWhiteList.includes(originPath) &&
-      req.path !== '/api/crons/status'
+      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();
     }
@@ -103,14 +105,14 @@ export default ({ app }: { app: Application }) => {
     }
     const userService = Container.get(UserService);
     const authInfo = await userService.getUserInfo();
-    const envDbContent = getFileContentByName(config.envDbFile);
+    const envCount = await EnvModel.count();
 
     let isInitialized = true;
     if (
       Object.keys(authInfo).length === 2 &&
       authInfo.username === 'admin' &&
       authInfo.password === 'admin' &&
-      envDbContent.length === 0
+      envCount === 0
     ) {
       isInitialized = false;
     }

back/loaders/initData.ts

@@ -1,47 +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';
 import _ from 'lodash';
-import { dbs } from '../loaders/db';
+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 dependenceService = Container.get(DependenceService);
-  const cronDb = dbs.cronDb;
+  const systemService = Container.get(SystemService);
-  const dependenceDb = dbs.dependenceDb;
+  const scheduleService = Container.get(ScheduleService);
 
   // 初始化更新所有任务状态为空闲
-  cronDb.update(
+  await CrontabModel.update(
-    { status: { $in: [CrontabStatus.running, CrontabStatus.queued] } },
+    { status: CrontabStatus.idle },
-    { $set: { status: CrontabStatus.idle } },
+    { where: { status: [CrontabStatus.running, CrontabStatus.queued] } },
-    { multi: true },
   );
 
   // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  dependenceDb.find({ status: { $in: [0, 1, 2] } }).exec(async (err, docs) => {
+  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);
+        const depIds = group.map((x) => x.id);
         for (const dep of depIds) {
+          if (dep) {
             await dependenceService.reInstall([dep]);
           }
         }
       }
+    }
   });
 
   // 初始化时执行一次所有的ql repo 任务
-  cronDb
+  CrontabModel.findAll({
-    .find({
+    where: {
-      command: /ql (repo|raw)/,
+      isDisabled: { [Op.ne]: 1 },
-      isDisabled: { $ne: 1 },
+      command: {
-    })
+        [Op.or]: [{ [Op.like]: `%ql repo%` }, { [Op.like]: `%ql raw%` }],
-    .exec((err, docs) => {
+      },
+    },
+  }).then((docs) => {
     for (let i = 0; i < docs.length; i++) {
       const doc = docs[i];
       if (doc) {
@@ -50,28 +57,82 @@ export default async () => {
     }
   });
 
-  // patch 禁用状态字段改变
+  // 更新2.11.3以前的脚本路径
-  cronDb
+  CrontabModel.findAll({
-    .find({
+    where: {
-      status: CrontabStatus.disabled,
+      command: {
-    })
+        [Op.or]: [
-    .exec((err, docs) => {
+          { [Op.like]: `%\/${config.rootPath}\/scripts\/%` },
-      if (docs.length > 0) {
+          { [Op.like]: `%\/${config.rootPath}\/config\/%` },
-        const ids = docs.map((x) => x._id);
+          { [Op.like]: `%\/${config.rootPath}\/log\/%` },
-        cronDb.update(
+          { [Op.like]: `%\/${config.rootPath}\/db\/%` },
-          { _id: { $in: ids } },
+        ],
-          { $set: { status: CrontabStatus.idle, isDisabled: 1 } },
-          { multi: true },
-          (err) => {
-            cronService.autosave_crontab();
       },
+    },
+  }).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) {

back/loaders/initFile.ts

@@ -5,13 +5,15 @@ import Logger from './logger';
 import { fileExist } from '../config/util';
 
 const rootPath = process.cwd();
-const confFile = path.join(rootPath, 'config/config.sh');
+const dataPath = path.join(rootPath, 'data/');
-const sampleConfigFile = path.join(rootPath, 'sample/config.sample.sh');
+const configPath = path.join(dataPath, 'config/');
-const sampleAuthFile = path.join(rootPath, 'sample/auth.sample.json');
+const scriptPath = path.join(dataPath, 'scripts/');
-const authConfigFile = path.join(rootPath, 'config/auth.json');
+const logPath = path.join(dataPath, 'log/');
-const configPath = path.join(rootPath, 'config/');
+const samplePath = path.join(rootPath, 'sample/');
-const scriptPath = path.join(rootPath, 'scripts/');
+const confFile = path.join(configPath, 'config.sh');
-const logPath = path.join(rootPath, 'log/');
+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);

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,24 +2,14 @@ import schedule from 'node-schedule';
 import express from 'express';
 import { exec } from 'child_process';
 import Logger from './loaders/logger';
-import { CrontabStatus } from './data/cron';
+import { CrontabModel, CrontabStatus } from './data/cron';
 import config from './config';
-import { dbs } from './loaders/db';
 
 const app = express();
 
 const run = async () => {
-  const cronDb = dbs.cronDb;
+  CrontabModel.findAll({ where: {} })
-
+    .then((docs) => {
-  cronDb
-    .find({})
-    .sort({ created: 1 })
-    .exec((err, docs) => {
-      if (err) {
-        Logger.error(err);
-        process.exit(1);
-      }
-
       if (docs && docs.length > 0) {
         for (let i = 0; i < docs.length; i++) {
           const task = docs[i];
@@ -40,6 +30,10 @@ const run = async () => {
           }
         }
       }
+    })
+    .catch((err) => {
+      Logger.error(err);
+      process.exit(1);
     });
 };
 

back/services/cron.ts

@@ -1,25 +1,17 @@
 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, concurrentRun } from '../config/util';
+import { getFileContentByName, concurrentRun, fileExist } from '../config/util';
-import PQueue from 'p-queue';
 import { promises, existsSync } from 'fs';
 import { promisify } from 'util';
-import { dbs } from '../loaders/db';
+import { Op } from 'sequelize';
 
 @Service()
 export default class CronService {
-  private cronDb = dbs.cronDb;
-
-  private queue = new PQueue({
-    concurrency: parseInt(process.env.MaxConcurrentNum as string) || 5,
-  });
-
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
   private isSixCron(cron: Crontab) {
@@ -32,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));
@@ -40,42 +31,19 @@ export default class CronService {
   }
 
   public async insert(payload: Crontab): Promise<Crontab> {
-    return new Promise((resolve) => {
+    return await CrontabModel.create(payload, { returning: true });
-      this.cronDb.insert(payload, (err, docs) => {
-        if (err) {
-          this.logger.error(err);
-        } else {
-          resolve(docs);
-        }
-      });
-    });
   }
 
   public async update(payload: Crontab): Promise<Crontab> {
-    const { _id, ...other } = payload;
+    payload.saved = false;
-    const doc = await this.get(_id);
+    const newDoc = await this.updateDb(payload);
-    const tab = new Crontab({ ...doc, ...other });
-    tab.saved = false;
-    const newDoc = await this.updateDb(tab);
     await this.set_crontab(this.isSixCron(newDoc));
     return newDoc;
   }
 
   public async updateDb(payload: Crontab): Promise<Crontab> {
-    return new Promise((resolve) => {
+    await CrontabModel.update(payload, { where: { id: payload.id } });
-      this.cronDb.update(
+    return await this.getDb({ id: payload.id });
-        { _id: payload._id },
-        payload,
-        { returnUpdatedDocs: true },
-        (err, num, docs: any) => {
-          if (err) {
-            this.logger.error(err);
-          } else {
-            resolve(docs);
-          }
-        },
-      );
-    });
   }
 
   public async status({
@@ -86,7 +54,7 @@ export default class CronService {
     last_running_time = 0,
     last_execution_time = 0,
   }: {
-    ids: string[];
+    ids: number[];
     status: CrontabStatus;
     pid: number;
     log_path: string;
@@ -103,67 +71,74 @@ export default class CronService {
       options.last_running_time = last_running_time;
     }
 
-    return new Promise((resolve) => {
+    return await CrontabModel.update({ ...options }, { where: { id: ids } });
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        {
-          $set: options,
-        },
-        { multi: true, returnUpdatedDocs: true },
-        (err) => {
-          resolve(null);
-        },
-      );
-    });
   }
 
-  public async remove(ids: string[]) {
+  public async remove(ids: number[]) {
-    return new Promise((resolve: any) => {
+    await CrontabModel.destroy({ where: { id: ids } });
-      this.cronDb.remove(
-        { _id: { $in: ids } },
-        { multi: true },
-        async (err) => {
     await this.set_crontab(true);
-          resolve();
-        },
-      );
-    });
   }
 
-  public async pin(ids: string[]) {
+  public async pin(ids: number[]) {
-    return new Promise((resolve: any) => {
+    await CrontabModel.update({ isPinned: 1 }, { where: { id: ids } });
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        { $set: { isPinned: 1 } },
-        { multi: true },
-        async (err) => {
-          resolve();
-        },
-      );
-    });
   }
 
-  public async unPin(ids: string[]) {
+  public async unPin(ids: number[]) {
-    return new Promise((resolve: any) => {
+    await CrontabModel.update({ isPinned: 0 }, { where: { id: ids } });
-      this.cronDb.update(
+  }
-        { _id: { $in: ids } },
+
-        { $set: { isPinned: 0 } },
+  public async addLabels(ids: string[], labels: string[]) {
-        { multi: true },
+    const docs = await CrontabModel.findAll({ where: { id: ids } });
-        async (err) => {
+    for (const doc of docs) {
-          resolve();
+      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 encodeText = encodeURIComponent(searchText);
+      const textArray = searchText.split(':');
-      const reg = new RegExp(`${searchText}|${encodeText}`, 'i');
+      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,
               },
@@ -173,44 +148,43 @@ export default class CronService {
               {
                 schedule: reg,
               },
+              {
+                labels: reg,
+              },
             ],
           };
+          break;
       }
-    return new Promise((resolve) => {
+    }
-      this.cronDb
+    try {
-        .find(query)
+      const result = await CrontabModel.findAll({
-        .sort({ created: -1 })
+        where: query,
-        .exec((err, docs) => {
+        order: [['createdAt', 'DESC']],
-          resolve(docs);
-        });
       });
+      return result as any;
+    } catch (error) {
+      throw error;
+    }
   }
 
-  public async get(_id: string): Promise<Crontab> {
+  public async getDb(query: any): Promise<Crontab> {
-    return new Promise((resolve) => {
+    const doc: any = await CrontabModel.findOne({ where: { ...query } });
-      this.cronDb.find({ _id }).exec((err, docs) => {
+    return doc && (doc.get({ plain: true }) as Crontab);
-        resolve(docs[0]);
-      });
-    });
   }
 
-  public async run(ids: string[]) {
+  public async run(ids: number[]) {
-    this.cronDb.update(
+    await CrontabModel.update(
-      { _id: { $in: ids } },
+      { status: CrontabStatus.queued },
-      { $set: { status: CrontabStatus.queued } },
+      { where: { id: ids } },
-      { multi: true },
     );
     concurrentRun(
-      ids.map((id) => () => this.runSingle(id)),
+      ids.map((id) => async () => await this.runSingle(id)),
       10,
     );
   }
 
-  public async stop(ids: string[]) {
+  public async stop(ids: number[]) {
-    return new Promise((resolve: any) => {
+    const docs = await CrontabModel.findAll({ where: { id: ids } });
-      this.cronDb
-        .find({ _id: { $in: ids } })
-        .exec(async (err, docs: Crontab[]) => {
     for (const doc of docs) {
       if (doc.pid) {
         try {
@@ -220,7 +194,8 @@ 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}`,
@@ -230,15 +205,11 @@ export default class CronService {
         );
       }
     }
-          this.cronDb.update(
+
-            { _id: { $in: ids } },
+    await CrontabModel.update(
-            { $set: { status: CrontabStatus.idle }, $unset: { pid: true } },
+      { status: CrontabStatus.idle, pid: undefined },
-            { multi: true },
+      { where: { id: ids } },
     );
-          this.queue.clear();
-          resolve();
-        });
-    });
   }
 
   public async killTask(name: string) {
@@ -255,9 +226,9 @@ export default class CronService {
       const killLogs = [];
       if (pids && pids.length > 0) {
         // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
-        pids = pids.slice(0, 3);
         for (const id of pids) {
           const c = `kill -9 ${id.slice(1)}`;
+          try {
             const { stdout, stderr } = await execAsync(c);
             if (stderr) {
               killLogs.push(stderr);
@@ -265,6 +236,9 @@ export default class CronService {
             if (stdout) {
               killLogs.push(stdout);
             }
+          } catch (error: any) {
+            killLogs.push(error.message);
+          }
         }
       }
       return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
@@ -273,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, log_path } = 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;
@@ -296,9 +270,10 @@ export default class CronService {
       }
 
       const cp = spawn(cmdStr, { shell: '/bin/bash' });
-      this.cronDb.update(
+
-        { _id },
+      await CrontabModel.update(
-        { $set: { status: CrontabStatus.running, pid: cp.pid } },
+        { status: CrontabStatus.running, pid: cp.pid },
+        { where: { id } },
       );
       cp.stderr.on('data', (data) => {
         if (log_path) {
@@ -311,57 +286,39 @@ export default class CronService {
         }
       });
 
-      cp.on('exit', (code, signal) => {
+      cp.on('exit', async (code, signal) => {
         this.logger.info(
           `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
         );
-        this.cronDb.update(
+        await CrontabModel.update(
-          { _id },
+          { status: CrontabStatus.idle, pid: undefined },
-          { $set: { status: CrontabStatus.idle }, $unset: { pid: true } },
+          { where: { id } },
         );
         resolve();
       });
-      cp.on('close', (code) => {
+      cp.on('close', async (code) => {
         this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
-        this.cronDb.update(
+        await CrontabModel.update(
-          { _id },
+          { status: CrontabStatus.idle, pid: undefined },
-          { $set: { status: CrontabStatus.idle }, $unset: { pid: true } },
+          { where: { id } },
         );
         resolve();
       });
     });
   }
 
-  public async disabled(ids: string[]) {
+  public async disabled(ids: number[]) {
-    return new Promise((resolve: any) => {
+    await CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        { $set: { isDisabled: 1 } },
-        { multi: true },
-        async (err) => {
     await this.set_crontab(true);
-          resolve();
-        },
-      );
-    });
   }
 
-  public async enabled(ids: string[]) {
+  public async enabled(ids: number[]) {
-    return new Promise((resolve: any) => {
+    await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
-      this.cronDb.update(
-        { _id: { $in: ids } },
-        { $set: { isDisabled: 0 } },
-        { multi: true },
-        async (err) => {
     await this.set_crontab(true);
-          resolve();
-        },
-      );
-    });
   }
 
-  public async log(_id: string) {
+  public async log(id: number) {
-    const doc = await this.get(_id);
+    const doc = await this.getDb({ id });
     if (!doc) {
       return '';
     }
@@ -390,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;
@@ -401,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;
   }
 
@@ -431,7 +421,7 @@ export default class CronService {
     if (needReloadSchedule) {
       exec(`pm2 reload schedule`);
     }
-    this.cronDb.update({}, { $set: { saved: true } }, { multi: true });
+    await CrontabModel.update({ saved: true }, { where: {} });
   }
 
   public import_crontab() {
@@ -439,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+))/;
@@ -453,18 +443,16 @@ export default class CronService {
         ) {
           var name = namePrefix + '_' + index;
 
-          this.cronDb.findOne({ command, schedule }, (err, doc) => {
+          const _crontab = await CrontabModel.findOne({
-            if (err) {
+            where: { command, schedule },
-              throw err;
-            }
-            if (!doc) {
-              this.create({ name, command, schedule });
-            } else {
-              doc.command = command;
-              doc.schedule = schedule;
-              this.update(doc);
-            }
           });
+          if (!_crontab) {
+            await this.create({ name, command, schedule });
+          } else {
+            _crontab.command = command;
+            _crontab.schedule = schedule;
+            await this.update(_crontab);
+          }
         }
       });
     });

back/services/dependence.ts

@@ -1,23 +1,21 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import DataStore from 'nedb';
 import {
   Dependence,
   InstallDependenceCommandTypes,
   DependenceStatus,
   DependenceTypes,
   unInstallDependenceCommandTypes,
+  DependenceModel,
 } from '../data/dependence';
 import _ from 'lodash';
 import { spawn } from 'child_process';
 import SockService from './sock';
-import { dbs } from '../loaders/db';
+import { Op } from 'sequelize';
 
 @Service()
 export default class DependenceService {
-  private dependenceDb = dbs.dependenceDb;
-
   constructor(
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
@@ -34,22 +32,15 @@ export default class DependenceService {
   }
 
   public async insert(payloads: Dependence[]): Promise<Dependence[]> {
-    return new Promise((resolve) => {
+    const docs = await DependenceModel.bulkCreate(payloads);
-      this.dependenceDb.insert(payloads, (err, docs) => {
+    return docs;
-        if (err) {
-          this.logger.error(err);
-        } else {
-          resolve(docs);
-        }
-      });
-    });
   }
 
   public async update(
-    payload: Dependence & { _id: string },
+    payload: Dependence & { id: string },
   ): Promise<Dependence> {
-    const { _id, ...other } = payload;
+    const { id, ...other } = payload;
-    const doc = await this.get(_id);
+    const doc = await this.getDb({ id });
     const tab = new Dependence({
       ...doc,
       ...other,
@@ -61,46 +52,22 @@ export default class DependenceService {
   }
 
   private async updateDb(payload: Dependence): Promise<Dependence> {
-    return new Promise((resolve) => {
+    await DependenceModel.update(payload, { where: { id: payload.id } });
-      this.dependenceDb.update(
+    return await this.getDb({ id: payload.id });
-        { _id: payload._id },
-        payload,
-        { returnUpdatedDocs: true },
-        (err, num, doc) => {
-          if (err) {
-            this.logger.error(err);
-          } else {
-            resolve(doc as Dependence);
-          }
-        },
-      );
-    });
   }
 
-  public async remove(ids: string[]) {
+  public async remove(ids: number[]) {
-    return new Promise((resolve: any) => {
+    await DependenceModel.update(
-      this.dependenceDb.update(
+      { status: DependenceStatus.removing, log: [] },
-        { _id: { $in: ids } },
+      { where: { id: ids } },
-        { $set: { status: DependenceStatus.removing, log: [] } },
+    );
-        { multi: true, returnUpdatedDocs: true },
+    const docs = await DependenceModel.findAll({ where: { id: ids } });
-        async (err, num, docs: Dependence[]) => {
     this.installOrUninstallDependencies(docs, false);
-          resolve(docs);
+    return docs;
-        },
-      );
-    });
   }
 
-  public async removeDb(ids: string[]) {
+  public async removeDb(ids: number[]) {
-    return new Promise((resolve: any) => {
+    await DependenceModel.destroy({ where: { id: ids } });
-      this.dependenceDb.remove(
-        { _id: { $in: ids } },
-        { multi: true },
-        async (err) => {
-          resolve();
-        },
-      );
-    });
   }
 
   public async dependencies(
@@ -110,75 +77,59 @@ export default class DependenceService {
   ): Promise<Dependence[]> {
     let condition = { ...query, type: DependenceTypes[type as any] };
     if (searchValue) {
-      const reg = new RegExp(searchValue);
+      const encodeText = encodeURIComponent(searchValue);
-      condition = {
+      const reg = {
-        ...condition,
+        [Op.or]: [
-        $or: [
+          { [Op.like]: `%${searchValue}%` },
-          {
+          { [Op.like]: `%${encodeText}%` },
-            name: reg,
-          },
         ],
       };
+
+      condition = {
+        ...condition,
+        name: reg,
+      };
+    }
+    try {
+      const result = await this.find(condition);
+      return result as any;
+    } catch (error) {
+      throw error;
     }
-    const newDocs = await this.find(condition, sort);
-    return newDocs;
   }
 
-  public async reInstall(ids: string[]): Promise<Dependence[]> {
+  public async reInstall(ids: number[]): Promise<Dependence[]> {
-    return new Promise((resolve: any) => {
+    await DependenceModel.update(
-      this.dependenceDb.update(
+      { status: DependenceStatus.installing, log: [] },
-        { _id: { $in: ids } },
+      { where: { id: ids } },
-        { $set: { status: DependenceStatus.installing, log: [] } },
+    );
-        { multi: true, returnUpdatedDocs: true },
+
-        async (err, num, docs: Dependence[]) => {
+    const docs = await DependenceModel.findAll({ where: { id: ids } });
     await this.installOrUninstallDependencies(docs);
-          resolve(docs);
+    return docs;
-        },
-      );
-    });
   }
 
-  private async find(query: any, sort: any): Promise<Dependence[]> {
+  private async find(query: any, sort?: any): Promise<Dependence[]> {
-    return new Promise((resolve) => {
+    const docs = await DependenceModel.findAll({ where: { ...query } });
-      this.dependenceDb
+    return docs;
-        .find(query)
-        .sort({ ...sort })
-        .exec((err, docs) => {
-          resolve(docs);
-        });
-    });
   }
 
-  public async get(_id: string): Promise<Dependence> {
+  public async getDb(query: any): Promise<Dependence> {
-    return new Promise((resolve) => {
+    const doc: any = await DependenceModel.findOne({ where: { ...query } });
-      this.dependenceDb.find({ _id }).exec((err, docs) => {
+    return doc && (doc.get({ plain: true }) as Dependence);
-        resolve(docs[0]);
-      });
-    });
   }
 
-  private async updateLog(ids: string[], log: string): Promise<void> {
+  private async updateLog(ids: number[], log: string): Promise<void> {
-    return new Promise((resolve) => {
+    const doc = await DependenceModel.findOne({ where: { id: ids } });
-      this.dependenceDb.update(
+    const newLog = doc?.log ? [...doc.log, log] : [log];
-        { _id: { $in: ids } },
+    await DependenceModel.update({ log: newLog }, { where: { id: ids } });
-        { $push: { log } },
-        { multi: true },
-        (err, num, doc) => {
-          if (err) {
-            this.logger.error(err);
-          } else {
-            resolve();
-          }
-        },
-      );
-    });
   }
 
   public installOrUninstallDependencies(
     dependencies: Dependence[],
     isInstall: boolean = true,
   ) {
-    return new Promise((resolve) => {
+    return new Promise(async (resolve) => {
       if (dependencies.length === 0) {
         resolve(null);
         return;
@@ -190,7 +141,7 @@ export default class DependenceService {
           : unInstallDependenceCommandTypes
       )[dependencies[0].type as any];
       const actionText = isInstall ? '安装' : '删除';
-      const depIds = dependencies.map((x) => x._id) as string[];
+      const depIds = dependencies.map((x) => x.id) as number[];
       const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
       const startTime = Date.now();
       this.sockService.sendMessage({
@@ -200,41 +151,41 @@ export default class DependenceService {
         ).toLocaleString()}`,
         references: depIds,
       });
-      this.updateLog(
+      await this.updateLog(
         depIds,
         `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
           startTime,
         ).toLocaleString()}\n`,
       );
-      cp.stdout.on('data', (data) => {
+      cp.stdout.on('data', async (data) => {
         this.sockService.sendMessage({
           type: 'installDependence',
           message: data.toString(),
           references: depIds,
         });
-        this.updateLog(depIds, data.toString());
+        await this.updateLog(depIds, data.toString());
       });
 
-      cp.stderr.on('data', (data) => {
+      cp.stderr.on('data', async (data) => {
         this.sockService.sendMessage({
           type: 'installDependence',
           message: data.toString(),
           references: depIds,
         });
-        this.updateLog(depIds, data.toString());
+        await this.updateLog(depIds, data.toString());
       });
 
-      cp.on('error', (err) => {
+      cp.on('error', async (err) => {
         this.sockService.sendMessage({
           type: 'installDependence',
           message: JSON.stringify(err),
           references: depIds,
         });
-        this.updateLog(depIds, JSON.stringify(err));
+        await this.updateLog(depIds, JSON.stringify(err));
         resolve(null);
       });
 
-      cp.on('close', (code) => {
+      cp.on('close', async (code) => {
         const endTime = Date.now();
         const isSucceed = code === 0;
         const resultText = isSucceed ? '成功' : '失败';
@@ -246,7 +197,7 @@ export default class DependenceService {
           ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
           references: depIds,
         });
-        this.updateLog(
+        await this.updateLog(
           depIds,
           `依赖${actionText}${resultText}，结束时间 ${new Date(
             endTime,
@@ -263,14 +214,7 @@ export default class DependenceService {
             ? DependenceStatus.installFailed
             : DependenceStatus.removeFailed;
         }
-        this.dependenceDb.update(
+        await DependenceModel.update({ status }, { where: { id: depIds } });
-          { _id: { $in: depIds } },
-          {
-            $set: { status },
-            $unset: { pid: true },
-          },
-          { multi: true },
-        );
 
         // 如果删除依赖成功，3秒后删除数据库记录
         if (isSucceed && !isInstall) {

back/services/env.ts

@@ -3,15 +3,12 @@ import winston from 'winston';
 import { getFileContentByName } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
-import DataStore from 'nedb';
+import { Env, EnvModel, EnvStatus, initEnvPosition } from '../data/env';
-import { Env, EnvStatus, initEnvPosition } from '../data/env';
 import _ from 'lodash';
-import { dbs } from '../loaders/db';
+import { Op } from 'sequelize';
 
 @Service()
 export default class EnvService {
-  private envDb = dbs.envDb;
-
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
   public async create(payloads: Env[]): Promise<Env[]> {
@@ -31,54 +28,32 @@ export default class EnvService {
   }
 
   public async insert(payloads: Env[]): Promise<Env[]> {
-    return new Promise((resolve) => {
+    const result = [];
-      this.envDb.insert(payloads, (err, docs) => {
+    for (const env of payloads) {
-        if (err) {
+      const doc = await EnvModel.create(env, { returning: true });
-          this.logger.error(err);
+      result.push(doc);
-        } else {
-          resolve(docs);
     }
-      });
+    return result;
-    });
   }
 
   public async update(payload: Env): Promise<Env> {
-    const { _id, ...other } = payload;
+    const newDoc = await this.updateDb(payload);
-    const doc = await this.get(_id);
-    const tab = new Env({ ...doc, ...other });
-    const newDoc = await this.updateDb(tab);
     await this.set_envs();
     return newDoc;
   }
 
   private async updateDb(payload: Env): Promise<Env> {
-    return new Promise((resolve) => {
+    await EnvModel.update({ ...payload }, { where: { id: payload.id } });
-      this.envDb.update(
+    return await this.getDb({ id: payload.id });
-        { _id: payload._id },
-        payload,
-        { returnUpdatedDocs: true },
-        (err, num, doc) => {
-          if (err) {
-            this.logger.error(err);
-          } else {
-            resolve(doc as Env);
-          }
-        },
-      );
-    });
   }
 
   public async remove(ids: string[]) {
-    return new Promise((resolve: any) => {
+    await EnvModel.destroy({ where: { id: ids } });
-      this.envDb.remove({ _id: { $in: ids } }, { multi: true }, async (err) => {
     await this.set_envs();
-        resolve();
-      });
-    });
   }
 
   public async move(
-    _id: string,
+    id: number,
     {
       fromIndex,
       toIndex,
@@ -100,7 +75,7 @@ export default class EnvService {
         : (envs[toIndex].position + envs[toIndex + 1].position) / 2;
     }
     const newDoc = await this.update({
-      _id,
+      id,
       position: targetPosition,
     });
     return newDoc;
@@ -114,104 +89,72 @@ export default class EnvService {
     let condition = { ...query };
     if (searchText) {
       const encodeText = encodeURIComponent(searchText);
-      const reg = new RegExp(`${searchText}|${encodeText}`, 'i');
+      const reg = {
+        [Op.or]: [
+          { [Op.like]: `%${searchText}%` },
+          { [Op.like]: `%${encodeText}%` },
+        ],
+      };
 
       condition = {
-        $or: [
+        ...condition,
-          {
+        [Op.or]: [
-            value: reg,
-          },
           {
             name: reg,
           },
+          {
+            value: reg,
+          },
           {
             remarks: reg,
           },
         ],
       };
     }
-    const newDocs = await this.find(condition, sort);
+    try {
-    return newDocs;
+      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[]> {
+  private async find(query: any, sort: any = []): Promise<Env[]> {
-    return new Promise((resolve) => {
+    const docs = await EnvModel.findAll({
-      this.envDb
+      where: { ...query },
-        .find(query)
+      order: [...sort],
-        .sort({ ...sort })
-        .exec((err, docs) => {
-          resolve(docs);
-        });
     });
+    return docs;
   }
 
-  public async get(_id: string): Promise<Env> {
+  public async getDb(query: any): Promise<Env> {
-    return new Promise((resolve) => {
+    const doc: any = await EnvModel.findOne({ where: { ...query } });
-      this.envDb.find({ _id }).exec((err, docs) => {
+    return doc && (doc.get({ plain: true }) as Env);
-        resolve(docs[0]);
-      });
-    });
-  }
-
-  public async getBySort(sort: any): Promise<Env> {
-    return new Promise((resolve) => {
-      this.envDb
-        .find({})
-        .sort({ ...sort })
-        .limit(1)
-        .exec((err, docs) => {
-          resolve(docs[0]);
-        });
-    });
   }
 
   public async disabled(ids: string[]) {
-    return new Promise((resolve: any) => {
+    await EnvModel.update(
-      this.envDb.update(
+      { status: EnvStatus.disabled },
-        { _id: { $in: ids } },
+      { where: { id: ids } },
-        { $set: { status: EnvStatus.disabled } },
-        { multi: true },
-        async (err) => {
-          await this.set_envs();
-          resolve();
-        },
     );
-    });
+    await this.set_envs();
   }
 
   public async enabled(ids: string[]) {
-    return new Promise((resolve: any) => {
+    await EnvModel.update({ status: EnvStatus.normal }, { where: { id: ids } });
-      this.envDb.update(
-        { _id: { $in: ids } },
-        { $set: { status: EnvStatus.normal } },
-        { multi: true },
-        async (err, num) => {
     await this.set_envs();
-          resolve();
-        },
-      );
-    });
   }
 
   public async updateNames({ ids, name }: { ids: string[]; name: string }) {
-    return new Promise((resolve: any) => {
+    await EnvModel.update({ name }, { where: { id: ids } });
-      this.envDb.update(
-        { _id: { $in: ids } },
-        { $set: { name } },
-        { multi: true },
-        async (err, num) => {
     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 = '';

back/services/notify.ts

@@ -16,6 +16,7 @@ export default class NotificationService {
     ['gotify', this.gotify],
     ['goCqHttpBot', this.goCqHttpBot],
     ['serverChan', this.serverChan],
+    ['pushDeer', this.pushDeer],
     ['bark', this.bark],
     ['telegramBot', this.telegramBot],
     ['dingtalkBot', this.dingtalkBot],
@@ -90,14 +91,12 @@ export default class NotificationService {
   private async goCqHttpBot() {
     const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
     const res: any = await got
-      .post(
+      .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        `${goCqHttpBotUrl}?access_token=${goCqHttpBotToken}&${goCqHttpBotQq}`,
-        {
         timeout: this.timeout,
         retry: 0,
         json: { message: `${this.title}\n${this.content}` },
-        },
+        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
-      )
+      })
       .json();
     return res.retcode === 0;
   }
@@ -118,8 +117,27 @@ export default class NotificationService {
     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, barkSound, barkGroup } = this.params;
+    let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
     if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
@@ -127,7 +145,7 @@ export default class NotificationService {
       this.title,
     )}/${encodeURIComponent(
       this.content,
-    )}?sound=${barkSound}&group=${barkGroup}`;
+    )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
     const res: any = await got
       .get(url, {
         timeout: this.timeout,

back/services/open.ts

@@ -2,90 +2,68 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import { createRandomString } from '../config/util';
 import config from '../config';
-import DataStore from 'nedb';
+import { App, AppModel } from '../data/open';
-import { App } from '../data/open';
 import { v4 as uuidV4 } from 'uuid';
-import { dbs } from '../loaders/db';
+import sequelize, { Op } from 'sequelize';
 
 @Service()
 export default class OpenService {
-  private appDb = dbs.appDb;
-
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  public async findTokenByValue(token: string): Promise<App> {
+  public async findTokenByValue(token: string): Promise<App | null> {
-    return new Promise((resolve) => {
+    const docs = await this.find({});
-      this.appDb.find(
+    const doc = docs.filter((x) => x.tokens?.find((y) => y.value === token));
-        { tokens: { $elemMatch: { value: token } } },
+    return doc[0];
-        (err, docs) => {
-          if (err) {
-            this.logger.error(err);
-          } else {
-            resolve(docs[0]);
-          }
-        },
-      );
-    });
   }
 
   public async create(payload: App): Promise<App> {
-    const tab = new App({ ...payload });
+    const tab = { ...payload };
     tab.client_id = createRandomString(12, 12);
     tab.client_secret = createRandomString(24, 24);
-    const docs = await this.insert([tab]);
+    const doc = await this.insert(tab);
-    return { ...docs[0], tokens: [] };
+    return { ...doc, tokens: [] };
   }
 
-  public async insert(payloads: App[]): Promise<App[]> {
+  public async insert(payload: App): Promise<App> {
-    return new Promise((resolve) => {
+    const doc = await AppModel.create(payload, { returning: true });
-      this.appDb.insert(payloads, (err, docs) => {
+    return doc.get({ plain: true }) as App;
-        if (err) {
-          this.logger.error(err);
-        } else {
-          resolve(docs);
-        }
-      });
-    });
   }
 
   public async update(payload: App): Promise<App> {
-    const { _id, client_id, client_secret, tokens, ...other } = payload;
+    const newDoc = await this.updateDb({
-    const doc = await this.get(_id);
+      name: payload.name,
-    const tab = new App({ ...doc, ...other });
+      scopes: payload.scopes,
-    const newDoc = await this.updateDb(tab);
+      id: payload.id,
+    } as any);
     return { ...newDoc, tokens: [] };
   }
 
   private async updateDb(payload: App): Promise<App> {
-    return new Promise((resolve) => {
+    await AppModel.update(payload, { where: { id: payload.id } });
-      this.appDb.update(
+    return await this.getDb({ id: payload.id });
-        { _id: payload._id },
-        payload,
-        { returnUpdatedDocs: true },
-        (err, num, doc, up) => {
-          if (err) {
-            this.logger.error(err);
-          } else {
-            resolve(doc);
-          }
-        },
-      );
-    });
   }
 
-  public async remove(ids: string[]) {
+  public async getDb(query: any): Promise<App> {
-    return new Promise((resolve: any) => {
+    const doc: any = await AppModel.findOne({ where: query });
-      this.appDb.remove({ _id: { $in: ids } }, { multi: true }, async (err) => {
+    return doc && (doc.get({ plain: true }) as App);
-        resolve();
-      });
-    });
   }
 
-  public async resetSecret(_id: string): Promise<App> {
+  public async remove(ids: number[]) {
-    const doc = await this.get(_id);
+    await AppModel.destroy({ where: { id: ids } });
-    const tab = new App({ ...doc });
+  }
-    tab.client_secret = createRandomString(24, 24);
+
-    tab.tokens = [];
+  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;
   }
@@ -98,43 +76,29 @@ export default class OpenService {
     let condition = { ...query };
     if (searchText) {
       const encodeText = encodeURIComponent(searchText);
-      const reg = new RegExp(`${searchText}|${encodeText}`, 'i');
+      const reg = {
-
+        [Op.or]: [
-      condition = {
+          { [Op.like]: `%${searchText}%` },
-        $or: [
+          { [Op.like]: `%${encodeText}%` },
-          {
-            value: reg,
-          },
-          {
-            name: reg,
-          },
-          {
-            remarks: reg,
-          },
         ],
       };
+
+      condition = {
+        ...condition,
+        name: reg,
+      };
+    }
+    try {
+      const result = await this.find(condition);
+      return result.map((x) => ({ ...x, tokens: [] }));
+    } catch (error) {
+      throw error;
     }
-    const newDocs = await this.find(condition, sort);
-    return newDocs.map((x) => ({ ...x, tokens: [] }));
   }
 
-  private async find(query: any, sort: any): Promise<App[]> {
+  private async find(query: any, sort?: any): Promise<App[]> {
-    return new Promise((resolve) => {
+    const docs = await AppModel.findAll({ where: { ...query } });
-      this.appDb
+    return docs.map((x) => x.get({ plain: true }));
-        .find(query)
-        .sort({ ...sort })
-        .exec((err, docs) => {
-          resolve(docs);
-        });
-    });
-  }
-
-  public async get(_id: string): Promise<App> {
-    return new Promise((resolve) => {
-      this.appDb.find({ _id }).exec((err, docs) => {
-        resolve(docs[0]);
-      });
-    });
   }
 
   public async authToken({
@@ -144,30 +108,38 @@ export default class OpenService {
     client_id: string;
     client_secret: string;
   }): Promise<any> {
-    const token = uuidV4();
+    let token = uuidV4();
     const expiration = Math.round(Date.now() / 1000) + 2592000; // 2592000 30天
-    return new Promise((resolve) => {
+    const doc = await AppModel.findOne({ where: { client_id, client_secret } });
-      this.appDb.find({ client_id, client_secret }).exec((err, docs) => {
+    if (doc) {
-        if (docs && docs[0]) {
+      const timestamp = Math.round(Date.now() / 1000);
-          this.appDb.update(
+      const invalidTokens = (doc.tokens || []).filter(
-            { client_id, client_secret },
+        (x) => x.expiration >= timestamp,
-            { $push: { tokens: { value: token, expiration } } },
+      );
-            {},
+      let tokens = invalidTokens;
-            (err, num, doc) => {
+      if (invalidTokens.length > 5) {
-              resolve({
+        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 {
-          resolve({ code: 400, message: 'client_id或client_seret有误' });
+      return { code: 400, message: 'client_id或client_seret有误' };
     }
-      });
-    });
   }
 }

back/services/schedule.ts

@@ -3,16 +3,25 @@ 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 generateSchedule({ _id = '', command, name, schedule }: Crontab) {
+  async createCronTask({ id = 0, command, name, schedule = '' }: Crontab) {
+    const _id = this.formatId(id);
     this.logger.info(
-      '[创建定时任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
+      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
       _id,
       schedule,
       name,
@@ -21,7 +30,7 @@ export default class ScheduleService {
 
     this.scheduleStacks.set(
       _id,
-      nodeSchedule.scheduleJob(_id, schedule, async () => {
+      nodeSchedule.scheduleJob(id + '', schedule, async () => {
         try {
           exec(command, async (error, stdout, stderr) => {
             if (error) {
@@ -55,8 +64,67 @@ export default class ScheduleService {
     );
   }
 
-  async cancelSchedule({ _id = '', name }: Crontab) {
+  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/system.ts

@@ -3,20 +3,18 @@ import winston from 'winston';
 import config from '../config';
 import * as fs from 'fs';
 import _ from 'lodash';
-import { AuthDataType, AuthInfo, LoginStatus } from '../data/auth';
+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';
-import { dbs } from '../loaders/db';
 
 @Service()
 export default class SystemService {
   @Inject((type) => NotificationService)
   private notificationService!: NotificationService;
-  private authDb = dbs.authDb;
 
   constructor(
     @Inject('logger') private logger: winston.Logger,
@@ -25,34 +23,19 @@ export default class SystemService {
   ) {}
 
   public async getLogRemoveFrequency() {
-    return new Promise((resolve) => {
+    const doc = await this.getDb({ type: AuthDataType.removeLogFrequency });
-      this.authDb
+    return doc || {};
-        .find({ type: AuthDataType.removeLogFrequency })
-        .exec((err, docs) => {
-          if (err || docs.length === 0) {
-            resolve({});
-          } else {
-            resolve(docs[0].info);
-          }
-        });
-    });
   }
 
   private async updateAuthDb(payload: AuthInfo): Promise<any> {
-    return new Promise((resolve) => {
+    await AuthModel.upsert({ ...payload });
-      this.authDb.update(
+    const doc = await this.getDb({ type: payload.type });
-        { type: payload.type },
+    return doc;
-        { ...payload },
-        { upsert: true, returnUpdatedDocs: true },
-        (err, num, doc: any) => {
-          if (err) {
-            resolve({} as NotificationInfo);
-          } else {
-            resolve({ ...doc.info, _id: doc._id });
   }
-        },
+
-      );
+  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) {
@@ -79,14 +62,16 @@ export default class SystemService {
       info: { frequency },
     });
     const cron = {
-      _id: result._id,
+      id: result.id,
       name: '删除日志',
       command: `ql rmlog ${frequency}`,
-      schedule: `5 23 */${frequency} * *`,
     };
-    await this.scheduleService.cancelSchedule(cron);
+    await this.scheduleService.cancelIntervalTask(cron);
     if (frequency > 0) {
-      await this.scheduleService.generateSchedule(cron);
+      await this.scheduleService.createIntervalTask(cron, {
+        days: frequency,
+        runImmediately: true,
+      });
     }
     return { code: 200, data: { ...cron } };
   }
@@ -102,13 +87,10 @@ export default class SystemService {
       let lastVersion = '';
       let lastLog = '';
       try {
-        const result = await Promise.race([
+        const result = await got.get(config.lastVersionFile, {
-          got.get(config.lastVersionFile, { timeout: 1000, retry: 0 }),
+          timeout: 6000,
-          got.get(`https://ghproxy.com/${config.lastVersionFile}`, {
-            timeout: 5000,
           retry: 0,
-          }),
+        });
-        ]);
         const lastVersionFileContent = result.body;
         lastVersion = lastVersionFileContent.match(versionRegx)![1];
         lastLog = lastVersionFileContent.match(logRegx)
@@ -181,4 +163,13 @@ export default class SystemService {
 
     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

@@ -6,8 +6,7 @@ import * as fs from 'fs';
 import _ from 'lodash';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
-import DataStore from 'nedb';
+import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
-import { AuthDataType, AuthInfo, LoginStatus } from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
 import { Request } from 'express';
@@ -15,13 +14,11 @@ import ScheduleService from './schedule';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import got from 'got';
-import { dbs } from '../loaders/db';
 
 @Service()
 export default class UserService {
   @Inject((type) => NotificationService)
   private notificationService!: NotificationService;
-  private authDb = dbs.authDb;
 
   constructor(
     @Inject('logger') private logger: winston.Logger,
@@ -174,33 +171,24 @@ export default class UserService {
   }
 
   public async getLoginLog(): Promise<AuthInfo[]> {
-    return new Promise((resolve) => {
+    const docs = await AuthModel.findAll({
-      this.authDb.find({ type: AuthDataType.loginLog }).exec((err, docs) => {
+      where: { type: AuthDataType.loginLog },
-        if (err || docs.length === 0) {
+    });
-          resolve([]);
+    if (docs && docs.length > 0) {
-        } else {
+      const result = docs.sort((a, b) => b.info.timestamp - a.info.timestamp);
-          const result = docs.sort(
-            (a, b) => b.info.timestamp - a.info.timestamp,
-          );
       if (result.length > 100) {
-            this.authDb.remove({ _id: result[result.length - 1]._id });
+        await AuthModel.destroy({
-          }
+          where: { id: result[result.length - 1].id },
-          resolve(result.map((x) => x.info));
-        }
-      });
         });
       }
+      return result.map((x) => x.info);
+    }
+    return [];
+  }
 
   private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
-    return new Promise((resolve) => {
+    const doc = await AuthModel.create({ ...payload }, { returning: true });
-      this.authDb.insert(payload, (err, doc) => {
+    return doc;
-        if (err) {
-          this.logger.error(err);
-        } else {
-          resolve(doc);
-        }
-      });
-    });
   }
 
   private initAuthInfo() {
@@ -315,48 +303,27 @@ export default class UserService {
   }
 
   public async getNotificationMode(): Promise<NotificationInfo> {
-    return new Promise((resolve) => {
+    const doc = await this.getDb({ type: AuthDataType.notification });
-      this.authDb
+    return (doc && doc.info) || {};
-        .find({ type: AuthDataType.notification })
-        .exec((err, docs) => {
-          if (err || docs.length === 0) {
-            resolve({} as NotificationInfo);
-          } else {
-            resolve(docs[0].info);
-          }
-        });
-    });
-  }
-
-  public async getLogRemoveFrequency() {
-    return new Promise((resolve) => {
-      this.authDb
-        .find({ type: AuthDataType.removeLogFrequency })
-        .exec((err, docs) => {
-          if (err || docs.length === 0) {
-            resolve({});
-          } else {
-            resolve(docs[0].info);
-          }
-        });
-    });
   }
 
   private async updateAuthDb(payload: AuthInfo): Promise<any> {
-    return new Promise((resolve) => {
+    let doc = await AuthModel.findOne({ type: payload.type });
-      this.authDb.update(
+    if (doc) {
-        { type: payload.type },
+      const updateResult = await AuthModel.update(payload, {
-        { ...payload },
+        where: { id: doc.id },
-        { upsert: true, returnUpdatedDocs: true },
+        returning: true,
-        (err, num, doc: any) => {
-          if (err) {
-            resolve({} as NotificationInfo);
-          } else {
-            resolve({ ...doc.info, _id: doc._id });
-          }
-        },
-      );
       });
+      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) {
@@ -376,113 +343,4 @@ export default class UserService {
       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}`,
-      schedule: `5 23 */${frequency} * *`,
-    };
-    await this.scheduleService.cancelSchedule(cron);
-    if (frequency > 0) {
-      await this.scheduleService.generateSchedule(cron);
-    }
-    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 Promise.race([
-          got.get(config.lastVersionFile, { timeout: 1000, retry: 0 }),
-          got.get(`https://ghproxy.com/${config.lastVersionFile}`, {
-            timeout: 5000,
-            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 };
-  }
 }

docker-compose.yml

@@ -1,14 +0,0 @@
-version: '2'
-services:
-  web:
-    image: whyour/qinglong:latest
-    volumes:
-      - ./data/config:/ql/config
-      - ./data/log:/ql/log
-      - ./data/db:/ql/db
-      - ./data/scripts:/ql/scripts
-      - ./data/repo:/ql/repo
-      - ./data/raw:/ql/raw
-    ports:
-      - "0.0.0.0:5700:5700"
-    restart: unless-stopped

docker/Dockerfile

@@ -1,17 +1,21 @@
-FROM node:lts-alpine3.12
+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_BRANCH=${QL_BRANCH}
+
 WORKDIR ${QL_DIR}
+
 RUN set -x \
-    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories \
+    && 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 \
@@ -32,20 +36,23 @@ RUN set -x \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && echo "Asia/Shanghai" > /etc/timezone \
     && touch ~/.bashrc \
-    && 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" \
+    && 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 \
+    && rm -rf /root/.cache \
+    && rm -rf /root/.npm \
     && git clone -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
-    && cp -rf /static/* ${QL_DIR} \
+    && 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

@@ -20,24 +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"
+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_root/build/app.js -n panel --source-map-support --time
+pm2 start $dir_static/build/app.js -n panel --source-map-support --time
 echo -e "控制面板启动成功...\n"
 
-echo -e "======================5. 启动定时任务========================\n"
+echo -e "======================6. 启动定时任务========================\n"
 pm2 delete schedule &>/dev/null
-pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time
+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,6 +2,10 @@ 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;
@@ -9,9 +13,16 @@ map $http_upgrade $connection_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;
@@ -42,4 +53,8 @@ server {
     index  index.html index.htm;
     try_files $uri $uri/ /index.html;
   }
+
+  location ~ .*\.(html)$ {
+    add_header Cache-Control no-cache;
+  }
 }

package.json

@@ -1,14 +1,17 @@
 {
   "private": true,
   "scripts": {
-    "start": "umi dev",
+    "start": "concurrently -n w: npm:start:*",
-    "build": "umi build",
+    "start:front": "umi dev",
-    "build-back": "tsc -p tsconfig.back.json",
+    "start:back": "nodemon",
-    "start-back": "nodemon",
+    "start:public": "ts-node back/public.ts",
-    "panel": "npm run build-back && node build/app.js",
+    "build:front": "umi build",
-    "schedule": "npm run build-back && node build/schedule.js",
+    "build:back": "tsc -p tsconfig.back.json",
-    "prepare": "umi generate tmp",
+    "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"
   },
@@ -25,16 +28,16 @@
   },
   "dependencies": {
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^6.14.0",
+    "@sentry/node": "^6.18.1",
-    "@sentry/tracing": "^6.14.0",
+    "@sentry/tracing": "^6.18.1",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.19.2",
-    "celebrate": "^13.0.3",
+    "celebrate": "^15.0.1",
-    "chokidar": "^3.5.2",
+    "chokidar": "^3.5.3",
     "cors": "^2.8.5",
-    "cron-parser": "^3.5.0",
+    "cron-parser": "^4.2.1",
-    "dotenv": "^8.2.0",
+    "dotenv": "^16.0.0",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
-    "express-jwt": "^6.0.0",
+    "express-jwt": "^6.1.1",
     "express-urlrewrite": "^1.4.0",
     "got": "^11.8.2",
     "hpagent": "^0.1.2",
@@ -42,49 +45,56 @@
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "nedb": "^1.8.0",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^3.2.1",
-    "node-schedule": "^2.0.0",
+    "node-schedule": "^2.1.0",
-    "nodemailer": "^6.7.0",
+    "nodemailer": "^6.7.2",
-    "p-queue": "6.6.2",
+    "p-queue": "7.2.0",
     "reflect-metadata": "^0.1.13",
+    "sequelize": "^6.17.0",
     "serve-handler": "^6.1.3",
-    "sockjs": "^0.3.21",
+    "sockjs": "^0.3.24",
-    "typedi": "^0.8.0",
+    "sqlite3": "npm:@louislam/sqlite3@^6.0.1",
+    "toad-scheduler": "^1.6.0",
+    "typedi": "^0.10.0",
     "uuid": "^8.3.2",
-    "winston": "^3.3.3",
+    "winston": "^3.6.0",
-    "yargs": "^17.2.1"
+    "yargs": "^17.3.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^4.6.2",
+    "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.26.0",
+    "@ant-design/pro-layout": "^6.33.1",
     "@monaco-editor/react": "^4.3.1",
-    "@sentry/react": "^6.14.0",
+    "@sentry/react": "^6.18.1",
-    "@sentry/webpack-plugin": "^1.18.3",
+    "@types/cors": "^2.8.12",
-    "@types/cors": "^2.8.10",
+    "@types/express": "^4.17.13",
-    "@types/express": "^4.17.8",
+    "@types/express-jwt": "^6.0.4",
-    "@types/express-jwt": "^6.0.1",
+    "@types/jsonwebtoken": "^8.5.8",
-    "@types/jsonwebtoken": "^8.5.0",
+    "@types/lodash": "^4.14.179",
-    "@types/lodash": "^4.14.170",
+    "@types/nedb": "^1.8.12",
-    "@types/nedb": "^1.8.11",
+    "@types/node": "^17.0.21",
-    "@types/node": "^14.11.2",
+    "@types/node-fetch": "^2.6.1",
-    "@types/node-fetch": "^2.5.8",
     "@types/node-schedule": "^1.3.2",
     "@types/nodemailer": "^6.4.4",
-    "@types/qrcode.react": "^1.0.1",
+    "@types/qrcode.react": "^1.0.2",
-    "@types/react": "^17.0.0",
+    "@types/react": "^17.0.39",
-    "@types/react-dom": "^17.0.0",
+    "@types/react-dom": "^17.0.13",
     "@types/serve-handler": "^6.1.1",
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
-    "@umijs/plugin-antd": "^0.11.0",
+    "@types/uuid": "^8.3.4",
-    "@umijs/test": "^3.3.9",
+    "@umijs/plugin-antd": "^0.15.0",
-    "antd": "^4.17.0-alpha.6",
+    "@umijs/plugin-esbuild": "^1.4.1",
-    "codemirror": "^5.62.2",
+    "@umijs/test": "^3.5.21",
-    "compression-webpack-plugin": "6.1.1",
+    "ansi-to-react": "^6.1.6",
-    "darkreader": "^4.9.27",
+    "antd": "^4.18.9",
-    "lint-staged": "^10.0.7",
+    "codemirror": "^5.65.2",
-    "nodemon": "^2.0.4",
+    "compression-webpack-plugin": "9.2.0",
-    "prettier": "^2.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",
@@ -93,13 +103,13 @@
     "react-dnd-html5-backend": "^14.0.0",
     "react-dom": "17.x",
     "react-split-pane": "^0.1.92",
-    "sockjs-client": "^1.5.2",
+    "sockjs-client": "^1.6.0",
-    "ts-node": "^9.0.0",
+    "ts-node": "^10.6.0",
-    "typescript": "^4.1.2",
+    "typescript": "^4.6.2",
-    "umi": "^3.5.0",
+    "umi": "^3.5.21",
-    "umi-request": "^1.3.5",
+    "umi-request": "^1.4.0",
     "vh-check": "^2.0.5",
-    "webpack": "^5.28.0",
+    "webpack": "^5.70.0",
     "yorkie": "^2.0.0"
   }
 }

sample/config.sample.sh

@@ -16,8 +16,8 @@ DefaultCronRule=""
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
 RepoFileExtensions="js py"
 
-## 由于github仓库拉取较慢，所以会默认添加代理前缀，如不需要请移除
+## 代理地址，支持http/https/socks，例如 http://127.0.0.1:7890
-GithubProxyUrl="https://ghproxy.com/"
+ProxyUrl=""
 
 ## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 CommandTimeoutTime="1h"
@@ -35,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"
 
@@ -47,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"
@@ -116,8 +121,12 @@ export GOBOT_QQ=""
 ## gotify_url 填写gotify地址,如https://push.example.de:8080
 ## gotify_token 填写gotify的消息应用token
 ## gotify_priority 填写推送消息优先级,默认为0
-export GOTIFY_URL="";
+export GOTIFY_URL=""
-export GOTIFY_TOKEN="";
+export GOTIFY_TOKEN=""
-export GOTIFY_PRIORITY=0;
+export GOTIFY_PRIORITY=0
+
+## 11. PushDeer
+## deer_key 填写PushDeer的key
+export DEER_KEY=""
 
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.js

@@ -34,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"
@@ -115,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;
 }
@@ -133,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;
   }
@@ -226,10 +240,12 @@ function gotifyNotify(text, desp) {
     if (GOTIFY_URL && GOTIFY_TOKEN) {
       const options = {
         url: `${GOTIFY_URL}/message?token=${GOTIFY_TOKEN}`,
-        body: `title=${encodeURIComponent(text)}&message=${encodeURIComponent(desp)}&priority=${GOTIFY_PRIORITY}`,
+        body: `title=${encodeURIComponent(text)}&message=${encodeURIComponent(
+          desp,
+        )}&priority=${GOTIFY_PRIORITY}`,
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
-        }
+        },
       };
       $.post(options, (err, resp, data) => {
         try {
@@ -346,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) {
@@ -429,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

@@ -35,6 +35,7 @@ push_config = {
     'BARK_ARCHIVE': '',                 # bark 推送是否存档
     'BARK_GROUP': '',                   # bark 推送分组
     'BARK_SOUND': '',                   # bark 推送声音
+    'BARK_ICON': '',                    # bark 推送图标
 
     'CONSOLE': True,                    # 控制台输出
 
@@ -59,6 +60,8 @@ push_config = {
 
     'PUSH_KEY': '',                     # server 酱的 PUSH_KEY，兼容旧版与 Turbo 版
 
+    'DEER_KEY': '',                     # PushDeer 的 PUSHDEER_KEY
+    
     'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
     'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
 
@@ -104,6 +107,7 @@ def bark(title: str, content: str) -> None:
         "BARK_ARCHIVE": "isArchive",
         "BARK_GROUP": "group",
         "BARK_SOUND": "sound",
+        "BARK_ICON": "icon",
     }
     params = ""
     for pair in filter(
@@ -259,6 +263,24 @@ def serverJ(title: str, content: str) -> None:
         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+ 推送消息。
@@ -503,6 +525,8 @@ 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"):

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

@@ -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)
@@ -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)
@@ -176,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,10 +1,16 @@
 #!/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"
+
+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
@@ -16,9 +22,9 @@ if [[ ! -d ${repo_path}/.git ]]; then
   git_clone_scripts ${url} ${repo_path} "main"
 fi
 
-cp -rf "$repo_path/jbot" $dir_root
+cp -rf "$repo_path/jbot" $dir_data
-if [[ ! -f "$dir_root/config/bot.json" ]]; then
+if [[ ! -f "$dir_config/bot.json" ]]; then
-  cp -f "$repo_path/config/bot.json" "$dir_root/config"
+  cp -f "$repo_path/config/bot.json" "$dir_config"
 fi
 echo -e "\nbot文件下载成功...\n"
 
@@ -26,9 +32,9 @@ 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"
+cp -f "$repo_path/jbot/requirements.txt" "$dir_data"
 
-cd $dir_root
+cd $dir_data
 cat requirements.txt | while read LREAD
 do
 if [[ ! $(pip3 show "${LREAD%%=*}" 2>/dev/null) ]]; then
@@ -40,7 +46,7 @@ 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,6 +1,6 @@
 #!/usr/bin/env bash
 
-dir_shell=/ql/shell
+dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
@@ -10,13 +10,11 @@ reset_env() {
   echo -e "---> 配置文件检测完成\n"
 
   echo -e "---> 2. 开始安装青龙依赖\n"
-  rm -rf $dir_root/node_modules
   npm_install_2 $dir_root
   echo -e "---> 青龙依赖安装完成\n"
 
   echo -e "---> 3. 开始安装脚本依赖\n"
   cp -f $dir_sample/package.json $dir_scripts/package.json
-  rm -rf $dir_scripts/node_modules
   npm_install_2 $dir_scripts
   echo -e "---> 脚本依赖安装完成\n"
 }
@@ -40,18 +38,18 @@ reload_pm2() {
   pm2 l &>/dev/null
 
   pm2 delete panel --source-map-support --time &>/dev/null
-  pm2 start $dir_root/build/app.js -n panel --source-map-support --time &>/dev/null
+  pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
 
   pm2 delete schedule --source-map-support --time &>/dev/null
-  pm2 start $dir_root/build/schedule.js -n 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 100 "$panelOut"
-  tail -n 20 "$panelError"
+  tail -n 100 "$panelError"
 }
 
 check_nginx() {
@@ -100,6 +98,7 @@ check_pm2() {
 
 main() {
   echo -e "=====> 开始检测"
+  pnpm install -g pm2
   copy_dep
   check_ql
   check_nginx

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

shell/share.sh

@@ -1,16 +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_static=$dir_root/static
-dir_scripts=$dir_root/scripts
+dir_config=$dir_data/config
-dir_repo=$dir_root/repo
+dir_scripts=$dir_data/scripts
-dir_raw=$dir_root/raw
+dir_repo=$dir_data/repo
-dir_log=$dir_root/log
+dir_raw=$dir_data/raw
-dir_db=$dir_root/db
+dir_log=$dir_data/log
-dir_dep=$dir_root/deps
+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
@@ -60,6 +62,7 @@ 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() {
@@ -67,8 +70,9 @@ import_config() {
     [[ -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}"
@@ -77,6 +81,18 @@ import_config() {
     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() {
     local dir=$1
     if [[ ! -d $dir ]]; then
@@ -149,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
@@ -228,6 +246,7 @@ fix_config() {
 }
 
 npm_install_sub() {
+    set_proxy
     if [ $is_termux -eq 1 ]; then
         npm install --production --no-bin-links --registry=https://registry.npm.taobao.org || npm install --production --no-bin-links
     elif ! type pnpm &>/dev/null; then
@@ -235,6 +254,7 @@ npm_install_sub() {
     else
         pnpm install --production --registry=https://registry.npm.taobao.org || pnpm install --production
     fi
+    unset_proxy
 }
 
 npm_install_1() {
@@ -287,21 +307,27 @@ git_clone_scripts() {
     local branch=$3
     [[ $branch ]] && local part_cmd="-b $branch "
     echo -e "开始克隆仓库 $url 到 $dir\n"
+
+    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 part_cmd="origin/${branch}"
     cd $dir_work
     echo -e "开始更新仓库：$dir_work\n"
+
+    set_proxy
     git fetch --all
     exit_status=$?
-    git reset --hard $part_cmd
+    git pull &>/dev/null
-    git pull
+    unset_proxy
+    reset_branch "$branch"
+
     cd $dir_current
 }
 
@@ -311,17 +337,27 @@ reset_romote_url() {
     local url=$2
     local branch="$3"
 
-    [[ $branch ]] && local part_cmd="origin/${branch}"
-
     if [[ -d "$dir_work/.git" ]]; then
         cd $dir_work
         [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
-        git remote set-url origin $url >/dev/null
+        git remote set-url origin $url &>/dev/null
-        git reset --hard $part_cmd >/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

shell/task.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ## 导入通用变量与函数
-dir_shell=/ql/shell
+dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
@@ -10,7 +10,7 @@ define_program() {
     local first_param=$1
     if [[ $first_param == *.js ]]; then
         which_program="node"
-    elif [[ $first_param == *.py ]]; then
+    elif [[ $first_param == *.py ]] || [[ $first_param == *.pyc ]]; then
         which_program="python3"
     elif [[ $first_param == *.sh ]]; then
         which_program="bash"
@@ -96,7 +96,7 @@ run_normal() {
     make_dir "$log_dir"
 
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local begin_timestamp=$(date "+%s" -d "$begin_time")
+    local begin_timestamp=$(date "+%s")
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
     [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
 
@@ -114,7 +114,7 @@ run_normal() {
 
     eval . $file_task_after "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s" -d "$end_time")
+    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
@@ -143,6 +143,7 @@ run_concurrent() {
     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")
@@ -157,7 +158,7 @@ run_concurrent() {
     make_dir $log_dir
 
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local begin_timestamp=$(date "+%s" -d "$begin_time")
+    local begin_timestamp=$(date "+%s")
 
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
     [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
@@ -166,8 +167,6 @@ run_concurrent() {
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
     eval . $file_task_before "$@" $cmd
 
-    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
-
     local envs=$(eval echo "\$${env_param}")
     local array=($(echo $envs | sed 's/&/ /g'))
     single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
@@ -193,7 +192,7 @@ run_concurrent() {
 
     eval . $file_task_after "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s" -d "$end_time")
+    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
@@ -221,7 +220,7 @@ run_designated() {
     make_dir $log_dir
 
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local begin_timestamp=$(date "+%s" -d "$begin_time")
+    local begin_timestamp=$(date "+%s")
 
     local envs=$(eval echo "\$${env_param}")
     local array=($(echo $envs | sed 's/&/ /g'))
@@ -236,6 +235,7 @@ run_designated() {
     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
@@ -244,8 +244,6 @@ run_designated() {
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
     eval . $file_task_before "$@" $cmd
 
-    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
-
     cd $dir_scripts
     local relative_path="${file_param%/*}"
     if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
@@ -256,7 +254,7 @@ run_designated() {
 
     eval . $file_task_after "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s" -d "$end_time")
+    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
@@ -278,7 +276,7 @@ run_else() {
     make_dir $log_dir
 
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local begin_timestamp=$(date "+%s" -d "$begin_time")
+    local begin_timestamp=$(date "+%s")
 
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
     [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
@@ -299,7 +297,7 @@ run_else() {
 
     eval . $file_task_after "$file_param" "$@" $cmd
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local end_timestamp=$(date "+%s" -d "$end_time")
+    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

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
 
@@ -43,7 +43,7 @@ detect_config_version() {
             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
@@ -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
 }
 
@@ -131,7 +131,7 @@ add_cron() {
             fi
         fi
     done
-    notify "$path 新增任务" "$detail"
+    notify_api "$path 新增任务" "$detail"
 }
 
 ## 更新仓库
@@ -151,31 +151,18 @@ update_repo() {
     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
         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 文件
@@ -183,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"
@@ -217,7 +203,7 @@ update_raw() {
         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
@@ -258,12 +244,17 @@ update_qinglong() {
     patch_version
 
     local no_restart="$1"
+    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} "${github_proxy_url}https://github.com/whyour/qinglong.git" "master"
+    reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" ${primary_branch}
-    git_pull_scripts $dir_root "master"
+    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
@@ -271,23 +262,23 @@ update_qinglong() {
         [[ -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"
+    local url="https://github.com/whyour/qinglong-static.git"
     if [[ -d ${ql_static_repo}/.git ]]; then
-        reset_romote_url ${ql_static_repo} ${url} "master"
+        reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
-        git_pull_scripts ${ql_static_repo} "master"
+        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"
+        echo -e "\n更新青龙静态资源成功...\n"
-        local static_version=$(cat /ql/src/version.ts | perl -pe "s|.*\'(.*)\';\.*|\1|" | head -1)
+        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
+        rm -rf $dir_static/*
-        cp -rf $ql_static_repo/* $dir_root
+        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 "重启面板中..."
@@ -295,16 +286,16 @@ 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
+        mv $dir_root/db/cookie.db $dir_root/db/env.db
-        rm -rf /ql/db/cookie.db
+        rm -rf $dir_root/db/cookie.db
         echo
     fi
 
@@ -313,16 +304,43 @@ patch_version() {
     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
 
     pm2 delete panel --source-map-support --time &>/dev/null
-    pm2 start $dir_root/build/app.js -n panel --source-map-support --time &>/dev/null
+    pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
 
     pm2 delete schedule --source-map-support --time &>/dev/null
-    pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time &>/dev/null
+    pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
 }
 
 ## 对比脚本

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/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

@@ -25,6 +25,12 @@ export default {
         hideInMenu: true,
         component: '@/pages/initialization/index',
       },
+      {
+        name: '错误',
+        path: '/error',
+        hideInMenu: true,
+        component: '@/pages/error/index',
+      },
       {
         path: '/crontab',
         name: '定时任务',

src/layouts/index.less

@@ -26,6 +26,7 @@
 .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;
   }
@@ -33,6 +34,7 @@
 
 .rename-box {
   height: 0;
+
   .rename-input {
     height: 0;
     padding: 0 !important;
@@ -43,6 +45,7 @@
 .ant-pro-grid-content.wide {
   max-width: unset !important;
   overflow: auto;
+
   .ant-pro-page-container-children-content {
     overflow: auto;
     height: 100%;
@@ -57,6 +60,7 @@
 
 .ant-tooltip {
   max-width: 500px !important;
+
   .ant-tooltip-inner {
     word-break: break-all !important;
   }
@@ -72,6 +76,7 @@
   .log-select {
     width: 250px;
   }
+
   .ant-page-header-heading-left {
     min-width: 100px;
   }
@@ -81,6 +86,7 @@
   .config-select {
     width: 250px;
   }
+
   .ant-page-header-heading-left {
     min-width: 100px;
   }
@@ -119,10 +125,13 @@
   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% - 36px);
+
       > div,
       .log-container,
       .react-codemirror2,
@@ -197,6 +206,7 @@
 .Resizer.disabled {
   cursor: not-allowed;
 }
+
 .Resizer.disabled:hover {
   border-color: transparent;
 }
@@ -209,6 +219,7 @@
 
 .inline-countdown.ant-statistic {
   display: inline-block;
+
   .ant-statistic-content {
     font-size: 14px;
     padding: 0 3px;
@@ -253,6 +264,7 @@
 
 .ant-pro-basicLayout-content {
   margin: 18px;
+
   .ant-pro-page-container {
     margin: -18px -18px -18px;
   }
@@ -280,25 +292,27 @@
 
 .side-menu-user-drop-menu {
   position: relative;
-  margin: 0;
-  padding: 4px 0;
   text-align: left;
-  background-clip: padding-box;
   outline: none;
-  background-color: #fff;
+  padding: 4px 0;
+  border: 1px solid rgba(255, 255, 255, 0.12);
   border-radius: 4px;
-  box-shadow: 0 6px 16px -8px rgb(0 0 0 / 8%), 0 9px 28px 0 rgb(0 0 0 / 5%),
+  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
-    0 12px 48px 16px rgb(0 0 0 / 3%);
+  overflow: auto;
-  .ant-dropdown-menu-item:hover {
+  background-color: #fff;
-    color: #1890ff;
 }
+
+[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;

src/layouts/index.tsx

@@ -24,14 +24,7 @@ import { message, Badge, Modal, Avatar, Dropdown, Menu, Image } from 'antd';
 // @ts-ignore
 import SockJS from 'sockjs-client';
 import * as Sentry from '@sentry/react';
-import { Integrations } from '@sentry/tracing';
+import { init } from '../utils/init';
-
-Sentry.init({
-  dsn: 'https://3406424fb1dc4813a62d39e844a9d0ac@o1098464.ingest.sentry.io/6122818',
-  integrations: [new Integrations.BrowserTracing()],
-  release: version,
-  tracesSampleRate: 1.0,
-});
 
 export default function (props: any) {
   const ctx = useCtx();
@@ -107,10 +100,6 @@ export default function (props: any) {
     }
   };
 
-  useEffect(() => {
-    vhCheck();
-  }, []);
-
   useEffect(() => {
     if (systemInfo && systemInfo.isInitialized && !user) {
       getUser();
@@ -128,6 +117,9 @@ export default function (props: any) {
   }, [theme.theme]);
 
   useEffect(() => {
+    vhCheck();
+    init();
+
     const _theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
     setFetchMethod(window.fetch);
     if (_theme === 'dark') {
@@ -187,7 +179,9 @@ export default function (props: any) {
     };
   }, []);
 
-  if (['/login', '/initialization'].includes(props.location.pathname)) {
+  if (
+    ['/login', '/initialization', '/error'].includes(props.location.pathname)
+  ) {
     document.title = `${
       (config.documentTitleMap as any)[props.location.pathname]
     } - 控制面板`;
@@ -198,7 +192,7 @@ export default function (props: any) {
       history.push('/crontab');
     }
 
-    if (systemInfo) {
+    if (systemInfo || props.location.pathname === '/error') {
       return React.Children.map(props.children, (child) => {
         return React.cloneElement(child, {
           ...ctx,
@@ -232,12 +226,7 @@ export default function (props: any) {
       selectedKeys={[props.location.pathname]}
       loading={loading}
       ErrorBoundary={Sentry.ErrorBoundary}
-      logo={
+      logo={<Image preview={false} src="https://qn.whyour.cn/logo.png" />}
-        <Image
-          preview={false}
-          src="https://pic.imgdb.cn/item/61acd0dd2ab3f51d912b1986.png"
-        />
-      }
       title={
         <>
           <span style={{ fontSize: 16 }}>控制面板</span>
@@ -283,7 +272,7 @@ export default function (props: any) {
       collapsed={collapsed}
       rightContentRender={() =>
         ctx.isPhone && (
-          <Dropdown overlay={menu} trigger={['click']}>
+          <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>
@@ -300,7 +289,7 @@ export default function (props: any) {
           }}
         >
           {!collapsed && !ctx.isPhone && (
-            <Dropdown overlay={menu} trigger={['hover']}>
+            <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>

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

@@ -1,3 +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,
@@ -30,25 +31,26 @@ import {
 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 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 {
   '启用',
@@ -68,7 +70,7 @@ enum OperationPath {
   'unpin',
 }
 
-const Crontab = ({ headerStyle, isPhone }: any) => {
+const Crontab = ({ headerStyle, isPhone, theme }: any) => {
   const columns: any = [
     {
       title: '任务名',
@@ -77,12 +79,38 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
       width: 150,
       align: 'center' as const,
       render: (text: string, record: any) => (
+        <>
           <a
             onClick={() => {
               goToScriptManager(record);
             }}
           >
-          {record.name || record._id}{' '}
+            {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 />
@@ -91,6 +119,7 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
               ''
             )}
           </a>
+        </>
       ),
       sorter: {
         compare: (a: any, b: any) => a.name.localeCompare(b.name),
@@ -105,16 +134,16 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
       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: {
@@ -287,7 +316,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
             {record.status === CrontabStatus.idle && (
               <Tooltip title={isPc ? '运行' : ''}>
                 <a
-                  onClick={() => {
+                  onClick={(e) => {
+                    e.stopPropagation();
                     runCron(record, index);
                   }}
                 >
@@ -298,7 +328,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
             {record.status !== CrontabStatus.idle && (
               <Tooltip title={isPc ? '停止' : ''}>
                 <a
-                  onClick={() => {
+                  onClick={(e) => {
+                    e.stopPropagation();
                     stopCron(record, index);
                   }}
                 >
@@ -308,7 +339,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
             )}
             <Tooltip title={isPc ? '日志' : ''}>
               <a
-                onClick={() => {
+                onClick={(e) => {
+                  e.stopPropagation();
                   setLogCron({ ...record, timestamp: Date.now() });
                 }}
               >
@@ -325,6 +357,7 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
   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);
@@ -333,12 +366,15 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
   const [currentPage, setCurrentPage] = useState(1);
   const [pageSize, setPageSize] = useState(20);
   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/scripts')) {
+      if (cmd[1].startsWith('/ql/data/scripts')) {
-        cmd[1] = cmd[1].replace('/ql/scripts/', '');
+        cmd[1] = cmd[1].replace('/ql/data/scripts/', '');
       }
 
       let [p, s] = cmd[1].split('/');
@@ -360,14 +396,19 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
         setValue(
           data.data
             .sort((a: any, b: any) => {
-              const sortA = a.isDisabled ? 4 : a.status;
+              const sortA =
-              const sortB = b.isDisabled ? 4 : b.status;
+                a.isPinned && a.status !== 0
-              a.isPinned = a.isPinned ? a.isPinned : 0;
+                  ? 5
-              b.isPinned = b.isPinned ? b.isPinned : 0;
+                  : a.isDisabled && a.status !== 0
-              if (a.isPinned === b.isPinned) {
+                  ? 4
+                  : a.status;
+              const sortB =
+                b.isPinned && b.status !== 0
+                  ? 5
+                  : b.isDisabled && b.status !== 0
+                  ? 4
+                  : b.status;
               return CrontabSort[sortA] - CrontabSort[sortB];
-              }
-              return b.isPinned - a.isPinned;
             })
             .map((x) => {
               return {
@@ -408,12 +449,12 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
       ),
       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];
-              const i = result.findIndex((x) => x._id === record._id);
+              const i = result.findIndex((x) => x.id === record.id);
               result.splice(i, 1);
               setValue(result);
             } else {
@@ -441,11 +482,11 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
       ),
       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];
-              const i = result.findIndex((x) => x._id === record._id);
+              const i = result.findIndex((x) => x.id === record.id);
               result.splice(i, 1, {
                 ...record,
                 status: CrontabStatus.running,
@@ -476,11 +517,11 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
       ),
       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];
-              const i = result.findIndex((x) => x._id === record._id);
+              const i = result.findIndex((x) => x.id === record.id);
               result.splice(i, 1, {
                 ...record,
                 pid: null,
@@ -518,14 +559,14 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
               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];
-              const i = result.findIndex((x) => x._id === record._id);
+              const i = result.findIndex((x) => x.id === record.id);
               result.splice(i, 1, {
                 ...record,
                 isDisabled: newStatus,
@@ -562,14 +603,14 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
               record.isPinned === 1 ? 'unpin' : 'pin'
             }`,
             {
-              data: [record._id],
+              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);
+              const i = result.findIndex((x) => x.id === record.id);
               result.splice(i, 1, {
                 ...record,
                 isPinned: newStatus,
@@ -591,10 +632,16 @@ const Crontab = ({ headerStyle, isPhone }: 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>
@@ -624,7 +671,7 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
         </Menu>
       }
     >
-      <a>
+      <a onClick={(e) => e.stopPropagation()}>
         <EllipsisOutlined />
       </a>
     </Dropdown>
@@ -661,7 +708,7 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
   };
 
   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)
@@ -679,9 +726,9 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
 
   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)
@@ -769,12 +816,12 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
   };
 
   const getRowClassName = (record: any, index: number) => {
-    return record.isPinned ? 'pinned-cron' : '';
+    return record.isPinned ? 'pinned-cron cron' : 'cron';
   };
 
   useEffect(() => {
     if (logCron) {
-      localStorage.setItem('logCron', logCron._id);
+      localStorage.setItem('logCron', logCron.id);
       setIsLogModalVisible(true);
     }
   }, [logCron]);
@@ -799,7 +846,10 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
           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()}>
@@ -853,6 +903,13 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
           >
             批量取消置顶
           </Button>
+          <Button
+            type="primary"
+            onClick={() => setIsLabelModalVisible(true)}
+            style={{ marginLeft: 8, marginRight: 8 }}
+          >
+            批量修改标签
+          </Button>
           <span style={{ marginLeft: 8 }}>
             已选择
             <a>{selectedRowIds?.length}</a>项
@@ -870,10 +927,18 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
           defaultPageSize: 20,
           showTotal: (total: number, range: number[]) =>
             `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
-          pageSizeOptions: [10, 20, 50, 100, 200, 500, 1000],
+          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: 1000, y: tableScrollHeight }}
         loading={loading}
@@ -893,6 +958,25 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
         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

@@ -20,10 +20,14 @@ 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);
@@ -36,9 +40,9 @@ 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 || '暂无日志');
           setExecuting(
@@ -61,7 +65,7 @@ const CronLogModal = ({
                   <Countdown
                     className="inline-countdown"
                     format="ss"
-                    value={Date.now() + 1000 * 10}
+                    value={Date.now() + 1000 * 30}
                   />
                   秒后自动刷新
                 </span>
@@ -70,7 +74,7 @@ const CronLogModal = ({
             });
             setTimeout(() => {
               window.location.reload();
-            }, 10000);
+            }, 30000);
           }
         }
       })
@@ -90,17 +94,23 @@ const CronLogModal = ({
     return (
       <>
         {(executing || loading) && <Loading3QuartersOutlined spin />}
-        {!executing && <CheckCircleOutlined />}
+        {!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);

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,9 +20,15 @@ const CronModal = ({
     setLoading(true);
     const method = cron ? 'put' : 'post';
     const payload = { ...values };
-    if (cron) {
+    if (typeof payload.labels === 'string') {
-      payload._id = cron._id;
+      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,
       });
@@ -33,6 +39,9 @@ const CronModal = ({
       }
       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={() => {
@@ -95,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

@@ -82,13 +82,34 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
         );
       },
     },
+    {
+      title: '备注',
+      dataIndex: 'remark',
+      key: 'remark',
+      align: 'center' as const,
+    },
     {
       title: '创建时间',
-      key: 'created',
+      key: 'timestamp',
-      dataIndex: 'created',
+      dataIndex: 'timestamp',
       align: 'center' as const,
       render: (text: string, record: any) => {
-        return <span>{new Date(record.created).toLocaleString()}</span>;
+        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>
+        );
       },
     },
     {
@@ -175,7 +196,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       ),
       onOk() {
         request
-          .delete(`${config.apiPrefix}dependencies`, { data: [record._id] })
+          .delete(`${config.apiPrefix}dependencies`, { data: [record.id] })
           .then((data: any) => {
             if (data.code === 200) {
               handleDependence(data.data[0]);
@@ -205,7 +226,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       onOk() {
         request
           .put(`${config.apiPrefix}dependencies/reinstall`, {
-            data: [record._id],
+            data: [record.id],
           })
           .then((data: any) => {
             if (data.code === 200) {
@@ -231,7 +252,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
     if (Array.isArray(dependence)) {
       result.push(...dependence);
     } else {
-      const index = value.findIndex((x) => x._id === dependence._id);
+      const index = value.findIndex((x) => x.id === dependence.id);
       result.splice(index, 1, {
         ...dependence,
       });
@@ -278,9 +299,9 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
 
   const getDependenceDetail = (dependence: any) => {
     request
-      .get(`${config.apiPrefix}dependencies/${dependence._id}`)
+      .get(`${config.apiPrefix}dependencies/${dependence.id}`)
       .then((data: any) => {
-        const index = value.findIndex((x) => x._id === dependence._id);
+        const index = value.findIndex((x) => x.id === dependence.id);
         const result = [...value];
         result.splice(index, 1, {
           ...dependence,
@@ -307,7 +328,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
 
   useEffect(() => {
     if (logDependence) {
-      localStorage.setItem('logDependence', logDependence._id);
+      localStorage.setItem('logDependence', logDependence.id);
       setIsLogModalVisible(true);
     }
   }, [logDependence]);
@@ -328,7 +349,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       }
       const result = [...value];
       for (let i = 0; i < references.length; i++) {
-        const index = value.findIndex((x) => x._id === references[i]);
+        const index = value.findIndex((x) => x.id === references[i]);
         result.splice(index, 1, {
           ...result[index],
           status,
@@ -340,7 +361,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
         setTimeout(() => {
           const _result = [...value];
           for (let i = 0; i < references.length; i++) {
-            const index = value.findIndex((x) => x._id === references[i]);
+            const index = value.findIndex((x) => x.id === references[i]);
             _result.splice(index, 1);
           }
           setValue(_result);
@@ -372,7 +393,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
           rowSelection={rowSelection}
           pagination={false}
           dataSource={value}
-          rowKey="_id"
+          rowKey="id"
           size="middle"
           scroll={{ x: 768, y: tableScrollHeight }}
           loading={loading}
@@ -432,11 +453,11 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
         handleCancel={(needRemove?: boolean) => {
           setIsLogModalVisible(false);
           if (needRemove) {
-            const index = value.findIndex((x) => x._id === logDependence._id);
+            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)) {
+          } else if ([...value].map((x) => x.id).includes(logDependence.id)) {
             getDependenceDetail(logDependence);
           }
         }}

src/pages/dependence/logModal.tsx

@@ -46,10 +46,10 @@ const DependenceLogModal = ({
   const getDependenceLog = () => {
     setLoading(true);
     request
-      .get(`${config.apiPrefix}dependencies/${dependence._id}`)
+      .get(`${config.apiPrefix}dependencies/${dependence.id}`)
       .then((data: any) => {
-        if (localStorage.getItem('logDependence') === dependence._id) {
+        if (localStorage.getItem('logDependence') === String(dependence.id)) {
-          const log = (data.data.log || []).join('\n') as string;
+          const log = (data.data.log || []).join('') as string;
           setValue(log);
           setExecuting(!log.includes('结束时间'));
           setIsRemoveFailed(log.includes('删除失败'));
@@ -64,7 +64,7 @@ const DependenceLogModal = ({
     setRemoveLoading(true);
     request
       .delete(`${config.apiPrefix}dependencies/force`, {
-        data: [dependence._id],
+        data: [dependence.id],
       })
       .then((data: any) => {
         cancel(true);
@@ -99,7 +99,7 @@ const DependenceLogModal = ({
       setExecuting(false);
       setIsRemoveFailed(message.includes('删除失败'));
     }
-    setValue(`${value} \n ${message}`);
+    setValue(`${value}${message}`);
   }, [socketMessage]);
 
   useEffect(() => {

src/pages/dependence/modal.tsx

@@ -26,7 +26,7 @@ const DependenceModal = ({
 
   const handleOk = async (values: any) => {
     setLoading(true);
-    const { name, split, type } = values;
+    const { name, split, type, remark } = values;
     const method = dependence ? 'put' : 'post';
     let payload;
     if (!dependence) {
@@ -36,13 +36,14 @@ const DependenceModal = ({
           return {
             name: x,
             type,
+            remark,
           };
         });
       } else {
-        payload = [{ name, type }];
+        payload = [{ name, type, remark }];
       }
     } else {
-      payload = { ...values, _id: dependence._id };
+      payload = { ...values, id: dependence.id };
     }
     try {
       const { code, data } = await request[method](

src/pages/env/index.tsx

@@ -27,7 +27,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
 import { getTableScroll } from '@/utils/index';
 
-const { Text } = Typography;
+const { Text, Paragraph } = Typography;
 const { Search } = Input;
 
 enum Status {
@@ -101,7 +101,7 @@ const Env = ({ headerStyle, isPhone, theme }: 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,18 +119,18 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
       key: 'value',
       align: 'center' as const,
       width: '35%',
-      ellipsis: {
-        showTitle: false,
-      },
       render: (text: string, record: any) => {
         return (
-          <Tooltip
+          <Paragraph
-            placement="topLeft"
+            style={{
-            title={text}
+              wordBreak: 'break-all',
-            trigger={['hover', 'click']}
+              marginBottom: 0,
+              textAlign: 'left',
+            }}
+            ellipsis={{ tooltip: text, rows: 2 }}
           >
-            <span>{text}</span>
+            {text}
-          </Tooltip>
+          </Paragraph>
         );
       },
     },
@@ -149,9 +149,17 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
       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 date = new Date(text)
+        const time = record.updatedAt || record.timestamp;
+        const date = new Date(time)
           .toLocaleString(language, {
             hour12: false,
           })
@@ -197,7 +205,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
     {
       title: '操作',
       key: 'action',
-      width: 100,
+      width: 120,
       align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
@@ -270,7 +278,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
               record.status === Status.已禁用 ? 'enable' : 'disable'
             }`,
             {
-              data: [record._id],
+              data: [record.id],
             },
           )
           .then((data: any) => {
@@ -321,7 +329,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
       ),
       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('删除成功');
@@ -351,7 +359,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
 
   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) {
       env = Array.isArray(env) ? env : [env];
       result.push(...env);
@@ -376,7 +384,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
       }
       const dragRow = value[dragIndex];
       request
-        .put(`${config.apiPrefix}envs/${dragRow._id}/move`, {
+        .put(`${config.apiPrefix}envs/${dragRow.id}/move`, {
           data: { fromIndex: dragIndex, toIndex: hoverIndex },
         })
         .then((data: any) => {
@@ -534,7 +542,7 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
           rowSelection={rowSelection}
           pagination={false}
           dataSource={value}
-          rowKey="_id"
+          rowKey="id"
           size="middle"
           scroll={{ x: 1000, y: tableScrollHeight }}
           components={components}

src/pages/env/modal.tsx

@@ -34,8 +34,9 @@ const EnvModal = ({
         payload = [{ value, name, remarks }];
       }
     } else {
-      payload = { ...values, _id: env._id };
+      payload = { ...values, id: env.id };
     }
+    try {
       const { code, data } = await request[method](`${config.apiPrefix}envs`, {
         data: payload,
       });
@@ -46,6 +47,9 @@ const EnvModal = ({
       }
       setLoading(false);
       handleCancel(data);
+    } catch (error: any) {
+      setLoading(false);
+    }
   };
 
   useEffect(() => {

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;

src/pages/initialization/index.tsx

@@ -233,7 +233,7 @@ const Initialization = () => {
           <img
             alt="logo"
             className={styles.logo}
-            src="https://pic.imgdb.cn/item/61acd0dd2ab3f51d912b1986.png"
+            src="https://qn.whyour.cn/logo.png"
           />
           <span className={styles.title}>初始化配置</span>
         </div>

src/pages/log/index.module.less

@@ -13,7 +13,6 @@
   &-scroller {
     flex: 1;
     overflow: auto;
-    border-right: 1px dashed #f0f0f0;
     padding-top: 6px;
   }
 }
@@ -22,3 +21,10 @@
   display: flex;
   position: relative;
 }
+
+:global {
+  .Pane.vertical.Pane1 {
+    padding-right: 5px;
+    border-right: 1px dashed #f0f0f0;
+  }
+}

src/pages/log/index.tsx

@@ -1,12 +1,11 @@
 import { useState, useEffect, useCallback, Key, useRef } from 'react';
-import { TreeSelect, Tree, Input } from 'antd';
+import { TreeSelect, Tree, Input, Empty } from 'antd';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
 import Editor from '@monaco-editor/react';
 import { request } from '@/utils/http';
 import styles from './index.module.less';
 import { Controlled as CodeMirror } from 'react-codemirror2';
-import { useCtx, useTheme } from '@/utils/hooks';
 import SplitPane from 'react-split-pane';
 
 function getFilterData(keyword: string, data: any) {
@@ -129,7 +128,7 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
             value={select}
             dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
             treeData={data}
-            placeholder="请选择日志文件"
+            placeholder="请选择日志"
             showSearch
             onSelect={onSelect}
           />,
@@ -143,9 +142,13 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
         {!isPhone && (
           <SplitPane split="vertical" size={200} maxSize={-100}>
             <div className={styles['left-tree-container']}>
+              {data.length > 0 ? (
+                <>
                   <Input.Search
                     className={styles['left-tree-search']}
                     onChange={onSearch}
+                    placeholder="请输入日志名"
+                    allowClear
                   ></Input.Search>
                   <div className={styles['left-tree-scroller']} ref={treeDom}>
                     <Tree
@@ -158,6 +161,22 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
                       onSelect={onTreeSelect}
                     ></Tree>
                   </div>
+                </>
+              ) : (
+                <div
+                  style={{
+                    display: 'flex',
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                    height: '100%',
+                  }}
+                >
+                  <Empty
+                    description="暂无日志"
+                    image={Empty.PRESENTED_IMAGE_SIMPLE}
+                  />
+                </div>
+              )}
             </div>
             <Editor
               language="shell"

src/pages/login/index.tsx

@@ -135,7 +135,7 @@ const Login = () => {
           <img
             alt="logo"
             className={styles.logo}
-            src="https://pic.imgdb.cn/item/61acd0dd2ab3f51d912b1986.png"
+            src="https://qn.whyour.cn/logo.png"
           />
           <span className={styles.title}>
             {twoFactor ? '两步验证' : config.siteName}

src/pages/script/editModal.tsx

@@ -87,6 +87,9 @@ const EditModal = ({
   };
 
   const stop = () => {
+    if (!cNode || !cNode.value) {
+      return;
+    }
     request
       .put(`${config.apiPrefix}scripts/stop`, {
         data: {

src/pages/script/index.module.less

@@ -13,7 +13,6 @@
   &-scroller {
     flex: 1;
     overflow: auto;
-    border-right: 1px dashed #f0f0f0;
     padding-top: 6px;
   }
 }
@@ -22,3 +21,10 @@
   display: flex;
   position: relative;
 }
+
+:global {
+  .Pane.vertical.Pane1 {
+    padding-right: 5px;
+    border-right: 1px dashed #f0f0f0;
+  }
+}

src/pages/script/index.tsx

@@ -10,6 +10,7 @@ import {
   Tooltip,
   Dropdown,
   Menu,
+  Empty,
 } from 'antd';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -112,16 +113,17 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
   const initGetScript = () => {
     const { p, s } = history.location.query as any;
     if (s) {
+      const vkey = `${p}/${s}`;
       const obj = {
         node: {
           title: s,
           value: s,
-          key: p ? `${p}/${s}` : s,
+          key: p ? vkey : s,
           parent: p,
         },
       };
       setExpandedKeys([p]);
-      onTreeSelect([`${p}/${s}`], obj);
+      onTreeSelect([vkey], obj);
     }
   };
 
@@ -411,7 +413,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                 value={select}
                 dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
                 treeData={data}
-                placeholder="请选择脚本文件"
+                placeholder="请选择脚本"
                 showSearch
                 onSelect={onSelect}
               />,
@@ -470,9 +472,13 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
         {!isPhone && (
           <SplitPane split="vertical" size={200} maxSize={-100}>
             <div className={styles['left-tree-container']}>
+              {data.length > 0 ? (
+                <>
                   <Input.Search
                     className={styles['left-tree-search']}
                     onChange={onSearch}
+                    placeholder="请输入脚本名"
+                    allowClear
                   ></Input.Search>
                   <div className={styles['left-tree-scroller']} ref={treeDom}>
                     <Tree
@@ -487,6 +493,22 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                       onSelect={onTreeSelect}
                     ></Tree>
                   </div>
+                </>
+              ) : (
+                <div
+                  style={{
+                    display: 'flex',
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                    height: '100%',
+                  }}
+                >
+                  <Empty
+                    description="暂无脚本"
+                    image={Empty.PRESENTED_IMAGE_SIMPLE}
+                  />
+                </div>
+              )}
             </div>
             <Editor
               language={mode}

src/pages/setting/about.tsx

@@ -0,0 +1,49 @@
+import React, { useEffect, useState } from 'react';
+import { Typography, Input, Form, Button, message } from 'antd';
+import styles from './index.less';
+
+const { Link } = Typography;
+
+const About = () => {
+  return (
+    <div className={styles.container}>
+      <img
+        alt="logo"
+        style={{ width: 140, marginRight: 20 }}
+        src="https://qn.whyour.cn/logo.png"
+      />
+      <div className={styles.right}>
+        <span className={styles.title}>青龙</span>
+        <span className={styles.desc}>
+          支持python3、javaScript、shell、typescript 的定时任务管理面板（A timed
+          task management panel that supports typescript, javaScript, python3,
+          and shell.）
+        </span>
+        <div>
+          <Link
+            href="https://github.com/whyour/qinglong"
+            target="_blank"
+            style={{ marginRight: 15 }}
+          >
+            Github
+          </Link>
+          <Link
+            href="https://t.me/jiao_long"
+            target="_blank"
+            style={{ marginRight: 15 }}
+          >
+            Telegram频道
+          </Link>
+          <Link
+            href="https://github.com/whyour/qinglong/issues"
+            target="_blank"
+          >
+            提交BUG
+          </Link>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default About;

src/pages/setting/appModal.tsx

@@ -20,7 +20,7 @@ const AppModal = ({
     const method = app ? 'put' : 'post';
     const payload = { ...values };
     if (app) {
-      payload._id = app._id;
+      payload.id = app.id;
     }
     const { code, data } = await request[method](`${config.apiPrefix}apps`, {
       data: payload,

src/pages/setting/checkUpdate.tsx

@@ -139,7 +139,7 @@ const CheckUpdate = ({ socketMessage }: any) => {
       return;
     }
 
-    const newMessage = `${value}\n${_message}`;
+    const newMessage = `${value}${_message}`;
     modalRef.current.update({
       content: (
         <div style={{ height: '60vh', overflowY: 'auto' }}>
@@ -172,16 +172,16 @@ const CheckUpdate = ({ socketMessage }: any) => {
             <Countdown
               className="inline-countdown"
               format="ss"
-              value={Date.now() + 1000 * 10}
+              value={Date.now() + 1000 * 30}
             />
             秒后自动刷新
           </span>
         ),
-        duration: 10,
+        duration: 30,
       });
       setTimeout(() => {
         window.location.reload();
-      }, 10000);
+      }, 30000);
     }
   }, [socketMessage]);
 

src/pages/setting/index.less

@@ -0,0 +1,22 @@
+.container {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  max-width: 800px;
+  margin: 20px auto;
+
+  .right {
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+
+    .title {
+      font-size: 25px;
+      margin-bottom: 10px;
+    }
+
+    .desc {
+      margin-bottom: 10px;
+    }
+  }
+}

src/pages/setting/index.tsx

@@ -12,6 +12,7 @@ import {
   Modal,
   message,
   Typography,
+  Input,
 } from 'antd';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -32,7 +33,7 @@ import SecuritySettings from './security';
 import LoginLog from './loginLog';
 import NotificationSetting from './notification';
 import CheckUpdate from './checkUpdate';
-import { useForm } from 'antd/lib/form/Form';
+import About from './about';
 
 const { Text } = Typography;
 const optionsWithDisabled = [
@@ -119,12 +120,12 @@ const Setting = ({
   const [theme, setTheme] = useState(defaultDarken);
   const [dataSource, setDataSource] = useState<any[]>([]);
   const [isModalVisible, setIsModalVisible] = useState(false);
-  const [editedApp, setEditedApp] = useState();
+  const [editedApp, setEditedApp] = useState<any>();
   const [tabActiveKey, setTabActiveKey] = useState('security');
   const [loginLogData, setLoginLogData] = useState<any[]>([]);
   const [notificationInfo, setNotificationInfo] = useState<any>();
   const [logRemoveFrequency, setLogRemoveFrequency] = useState<number>();
-  const [form] = useForm();
+  const [form] = Form.useForm();
 
   const themeChange = (e: any) => {
     setTheme(e.target.value);
@@ -142,6 +143,7 @@ const Setting = ({
   };
 
   const addApp = () => {
+    setEditedApp(null);
     setIsModalVisible(true);
   };
 
@@ -164,7 +166,7 @@ const Setting = ({
       ),
       onOk() {
         request
-          .delete(`${config.apiPrefix}apps`, { data: [record._id] })
+          .delete(`${config.apiPrefix}apps`, { data: [record.id] })
           .then((data: any) => {
             if (data.code === 200) {
               message.success('删除成功');
@@ -198,7 +200,7 @@ const Setting = ({
       ),
       onOk() {
         request
-          .put(`${config.apiPrefix}apps/${record._id}/reset-secret`)
+          .put(`${config.apiPrefix}apps/${record.id}/reset-secret`)
           .then((data: any) => {
             if (data.code === 200) {
               message.success('重置成功');
@@ -222,7 +224,7 @@ const Setting = ({
   };
 
   const handleApp = (app: any) => {
-    const index = dataSource.findIndex((x) => x._id === app._id);
+    const index = dataSource.findIndex((x) => x.id === app.id);
     const result = [...dataSource];
     if (index === -1) {
       result.push(app);
@@ -273,8 +275,10 @@ const Setting = ({
     request
       .get(`${config.apiPrefix}system/log/remove`)
       .then((data: any) => {
-        setLogRemoveFrequency(data.data.frequency);
+        if (data.data.info) {
-        form.setFieldsValue({ frequency: data.data.frequency });
+          const { frequency } = data.data.info;
+          setLogRemoveFrequency(frequency);
+        }
       })
       .catch((error: any) => {
         console.log(error);
@@ -339,7 +343,7 @@ const Setting = ({
             columns={columns}
             pagination={false}
             dataSource={dataSource}
-            rowKey="_id"
+            rowKey="id"
             size="middle"
             scroll={{ x: 768 }}
             loading={loading}
@@ -367,20 +371,28 @@ const Setting = ({
               name="frequency"
               tooltip="每x天自动删除x天以前的日志"
             >
+              <Input.Group compact>
                 <InputNumber
                   addonBefore="每"
                   addonAfter="天"
                   style={{ width: 150 }}
                   min={0}
-                onBlur={updateRemoveLogFrequency}
+                  value={logRemoveFrequency}
                   onChange={(value) => setLogRemoveFrequency(value)}
                 />
+                <Button type="primary" onClick={updateRemoveLogFrequency}>
+                  确认
+                </Button>
+              </Input.Group>
             </Form.Item>
             <Form.Item label="检查更新" name="update">
               <CheckUpdate socketMessage={socketMessage} />
             </Form.Item>
           </Form>
         </Tabs.TabPane>
+        <Tabs.TabPane tab="关于" key="about">
+          <About />
+        </Tabs.TabPane>
       </Tabs>
       <AppModal
         visible={isModalVisible}

src/pages/setting/loginLog.tsx

@@ -73,7 +73,7 @@ const LoginLog = ({ data }: any) => {
         columns={columns}
         pagination={false}
         dataSource={data}
-        rowKey="_id"
+        rowKey="id"
         size="middle"
         scroll={{ x: 768 }}
       />

src/utils/config.ts

@@ -70,11 +70,14 @@ export default {
     configs: '配置文件',
     scripts: '脚本管理',
     logs: '任务日志',
+    dependencies: '依赖管理',
+    system: '系统信息',
   },
   notificationModes: [
     { value: 'gotify', label: 'Gotify' },
     { value: 'goCqHttpBot', label: 'GoCqHttpBot' },
     { value: 'serverChan', label: 'Server酱' },
+    { value: 'PushDeer', label: 'PushDeer' },
     { value: 'bark', label: 'Bark' },
     { value: 'telegramBot', label: 'Telegram机器人' },
     { value: 'dingtalkBot', label: '钉钉机器人' },
@@ -111,12 +114,17 @@ export default {
     serverChan: [
       { label: 'serverChanKey', tip: 'Server酱SENDKEY', required: true },
     ],
+    PushDeer: [{ label: 'PushDeerKey', tip: 'PushDeer的Key', required: true }],
     bark: [
       {
         label: 'barkPush',
         tip: 'Bark的信息IP/设备码，例如：https://api.day.app/XXXXXXXX',
         required: true,
       },
+      {
+        label: 'barkIcon',
+        tip: 'BARK推送图标,自定义推送图标 (需iOS15或以上才能显示)',
+      },
       { label: 'barkSound', tip: 'BARK推送铃声,铃声列表去APP查看复制填写' },
       { label: 'barkGroup', tip: 'BARK推送消息的分组, 默认为qinglong' },
     ],
@@ -205,6 +213,7 @@ export default {
     '/diff': '对比工具',
     '/log': '任务日志',
     '/setting': '系统设置',
+    '/error': '错误日志',
   },
   dependenceTypes: ['nodejs', 'python3', 'linux'],
 };

src/utils/http.ts

@@ -14,8 +14,8 @@ const errorHandler = function (error: any) {
       ? error.data.message || error.data
       : error.response.statusText;
     const responseStatus = error.response.status;
-    if (responseStatus === 502) {
+    if ([502, 504].includes(responseStatus)) {
-      message.error('服务异常，请手动执行ql check检查服务状态');
+      history.push('/error');
     } else if (responseStatus === 401) {
       if (history.location.pathname !== '/login') {
         message.error('登录已过期，请重新登录');

src/utils/init.ts

@@ -0,0 +1,26 @@
+import * as Sentry from '@sentry/react';
+import { Integrations } from '@sentry/tracing';
+import { loader } from '@monaco-editor/react';
+import { version } from '../version';
+
+export function init() {
+  // sentry监控 init
+  Sentry.init({
+    dsn: 'https://3406424fb1dc4813a62d39e844a9d0ac@o1098464.ingest.sentry.io/6122818',
+    integrations: [new Integrations.BrowserTracing()],
+    release: version,
+    tracesSampleRate: 1.0,
+  });
+
+  // monaco 编辑器配置cdn和locale
+  loader.config({
+    paths: {
+      vs: 'https://cdn.staticfile.org/monaco-editor/0.32.1/min/vs',
+    },
+    'vs/nls': {
+      availableLanguages: {
+        '*': 'zh-cn',
+      },
+    },
+  });
+}

src/version.ts

@@ -1,9 +1,15 @@
-export const version = '2.10.13';
+export const version = '2.12.0';
-export const changeLogLink = 'https://t.me/jiao_long/233';
+export const changeLogLink = 'https://t.me/jiao_long/288';
-export const changeLog = `2.10.13 版本说明
+export const changeLog = `2.12.0 版本说明
-1. task 命令执行脚本支持任意参数，比如 task xxx.js a b c d
+1. 全新定时任务详情，支持日志查看、脚本编辑
-2. 应用权限增加依赖管理、系统信息
+2. openapi增加发送通知接口，可用于脚本直接调用
-3. 调试脚本增加停止操作，优化交互
+3. 增加pushDeer推送，感谢 https://github.com/NekoMio PR
-4. 定时任务任务名修改展示效果，感谢https://github.com/tinet-jutt
+4. 增加public服务，当服务异常时，查询服务状态及日志，供页面使用。
-5. 其他bug修复
+5. 增加ql check可视化错误提示
+6. 修改openapi获取token逻辑，最多存储5个可用的token。
+7. 调整数据目录，log、db、scripts、config等目录迁移到 /ql/data 目录，docker映射只需映射data目录
+8. 版本文件存储到七牛云，方便检查更新
+9. 修复编辑应用初始值
+10. 修复退出登录和定时任务搜索
+11. 其他bug修复
 `;

tsconfig.back.json

@@ -15,7 +15,7 @@
     "module": "commonjs",
     "pretty": true,
     "sourceMap": true,
-    "outDir": "./build",
+    "outDir": "./static/build",
     "allowJs": true,
     "noEmit": false,
     "esModuleInterop": true

tsconfig.json

@@ -32,7 +32,8 @@
     "node_modules",
     "lib",
     "es",
-    "dist",
+    "static",
+    "data",
     "typings",
     "**/__test__",
     "test",