更新版本 v2.13.2

发现有带&的消息都会漏掉&后面的内容，改为JSON发送

.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.yml

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

.github/workflows/build_docker_image.yml

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

.github/workflows/docker.yml

@@ -1,38 +0,0 @@
-name: PublishDockerImage
-on:
-  workflow_dispatch:
-  # workflow_run:
-  #   workflows:
-  #     - BuildStatic
-  #   branches:
-  #     - master
-  #   types:
-  #     - completed
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Docker login
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: |
-          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
-
-      - name: Docker buildx image and push on master branch
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        run: |
-          docker buildx build --build-arg SSH_PRIVATE_KEY="${SSH_PRIVATE_KEY}" --output "type=image,push=true" --platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x --tag whyour/qinglong:latest docker/

.gitignore

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

.npmrc

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

.umirc.ts

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

LICENSE

@@ -1,22 +1,201 @@
-MIT LICENSE
+                              Apache License
+                        Version 2.0, January 2004
+                    http://www.apache.org/licenses/
 
-Copyright (c) 2021-present whyour
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Permission is hereby granted, free of charge, to any person obtaining
+1. Definitions.
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
 
-The above copyright notice and this permission notice shall be
+  "License" shall mean the terms and conditions for use, reproduction,
-included in all copies or substantial portions of the Software.
+  and distribution as defined by Sections 1 through 9 of this document.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  "Licensor" shall mean the copyright owner or entity authorized by
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  the copyright owner that is granting the License.
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  "Legal Entity" shall mean the union of the acting entity and all
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  other entities that control, are controlled by, or are under common
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  control with that entity. For the purposes of this definition,
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+  To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "{}"
+  replaced with your own identifying information. (Don't include
+  the brackets!)  The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a
+  file or class name and description of purpose be included on the
+  same "printed page" as the copyright notice for easier
+  identification within third-party archives.
+
+Copyright 2021 WHYOUR <https://github.com/whyour>.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README-en.md

@@ -0,0 +1,210 @@
+<p align="center">
+  <a href="https://github.com/whyour/qinglong">
+    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
+  </a>
+</p>
+
+<h1 align="center">Green Dragon</h1>
+
+<div align="center">
+
+Timed task management panel with python3, javaScript, shell, typescript support
+
+[![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
+
+[docker-pulls-image]: https://img.shields.io/docker/pulls/whyour/qinglong?style=flat
+[docker-pulls-url]: https://hub.docker.com/r/whyour/qinglong
+[docker-version-image]: https://img.shields.io/docker/v/whyour/qinglong?style=flat
+[docker-version-url]: https://hub.docker.com/r/whyour/qinglong/tags?page=1&ordering=last_updated
+[docker-stars-image]: https://img.shields.io/docker/stars/whyour/qinglong?style=flat
+[docker-stars-url]: https://hub.docker.com/r/whyour/qinglong
+[docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
+[docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
+</div>
+
+[![](https://user-images.githubusercontent.com/22700758/161788855-c4e51cb8-d4e9-44fe-bb17-ee1a56c8549b.png)](https://whyour.cn)
+
+[简体中文](./README.md) | English
+
+## Features
+
+- Support for multiple scripting languages (python3, javaScript, shell, typescript)
+- Support online management of scripts, environment variables, configuration files
+- Support online view task log
+- Support second-level task setting
+- Support system level notification
+- Support dark mode
+- Support cell phone operation
+
+## Deployment
+
+### Local Deployment
+
+```bash
+# To be completed
+```
+
+### Podman Deployment
+
+1. podman installation
+
+```bash
+https://podman.io/getting-started/installation
+```
+
+2. start the container
+
+```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 Deployment
+
+1. docker installation
+
+```bash
+sudo curl -sSL get.docker.com | sh
+```
+
+2. configure domestic mirror sources
+
+```bash
+mkdir -p /etc/docker
+tee /etc/docker/daemon.json <<-'EOF'
+{
+  "registry-mirrors": [
+    "https://0b27f0a81a00f3560fbdc00ddd2f99e0.mirror.swr.myhuaweicloud.com",
+    "https://ypzju6vq.mirror.aliyuncs.com",
+    "https://registry.docker-cn.com",
+    "http://hub-mirror.c.163.com",
+    "https://docker.mirrors.ustc.edu.cn"
+  ]
+}
+EOF
+systemctl daemon-reload
+systemctl restart docker
+```
+
+3. start the container
+
+```bash
+docker run -dit \
+  -v $PWD/ql:/ql/data \
+  -p 5700:5700 \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### Docker-compose Deployment
+
+1. docker-compose installation
+
+```bash
+sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+```
+
+2. start the container
+
+```bash
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# start
+docker-compose up -d
+# stop
+docker-compose down
+```
+
+## Use
+
+1. built-in commands
+
+```bash
+# Update and restart Green Dragon
+ql update                                                    
+# Run custom scripts extra.sh
+ql extra                                                     
+# Adding a single script file
+ql raw <file_url>                                             
+# Add a specific script for a single repository
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+# Delete old logs
+ql rmlog <days>                                              
+# Start bot
+ql bot                                                       
+# Detecting the Green Dragon environment and repairing it
+ql check                                                     
+# Reset the number of login errors
+ql resetlet                                                  
+# Disable two-step login
+ql resettfa                                                  
+
+# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
+task <file_path>                                             
+# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
+# and the foreground will output the day, while recorded in the log file
+task <file_path> now                                         
+# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
+# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
+task <file_path> conc <env_name> <account_number>(Optional) 
+# Specify the account to execute and run immediately regardless of whether a random delay is set 
+task <file_path> desi <env_name> <account_number>         
+```
+
+2. parameter description
+
+* file_url: Script address
+* repo_url: Repository address
+* whitelist: The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled
+* blacklist: Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled
+* dependence: Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist
+* branch: Pull the branch of the repository
+* days: Number of days of logs to be kept
+* file_path: File path for task execution
+* env_name: The name of the environment variable that needs to be concurrent or specified at the time of task execution
+* account_number: Specify the account number of an environment variable to be executed when the task is executed
+
+## Links
+
+- [nevinee](https://gitee.com/evine)
+- [crontab-ui](https://github.com/alseambusher/crontab-ui)
+- [Ant Design](https://ant.design)
+- [Ant Design Pro](https://pro.ant.design/)
+- [Umijs3.0](https://umijs.org)
+- [darkreader](https://github.com/darkreader/darkreader)
+- [admin-server](https://github.com/sunpu007/admin-server)
+
+## Development
+
+```bash
+$ git clone git@github.com:whyour/qinglong.git
+$ cd qinglong
+$ cp .env.example .env
+# Recommended use pnpm https://pnpm.io/zh/installation
+$ npm install -g pnpm
+$ pnpm install
+$ pnpm start
+```
+
+Open your browser and visit http://127.0.0.1:5700
+
+## Communication
+
+[telegram channel](https://t.me/jiao_long)
+
+## Name Origin
+
+The Green Dragon, also known as the Canglong, is one of the four elephants and one of the [four spirits of the heavens](https://zh.wikipedia.org/wiki/%E5%A4%A9%E4%B9%8B%E5%9B%9B%E7%81%B5) in traditional Chinese culture. According to the Five Elements, it is a spirit animal representing the East as a green dragon, the five elements are wood, and the season represented is spring, with the eight trigrams dominating vibration. Like the Ying Long, the Cang Long has feathered wings. According to the Zhang Guo Xing Zong (Zhang Guo Xing Zong), "a true dragon is one that has complementary wings".
+
+In the Book of the Later Han Dynasty (後漢書-律曆志下), it is written: "The sun is in the sky, a cold and a summer, the four seasons are ready, all things are changed, the regency moves, and the green dragon moves to the star, which is called the year. (The Year of the Star)
+
+Among the [twenty-eight Chinese constellations](https://zh.wikipedia.org/wiki/%E4%BA%8C%E5%8D%81%E5%85%AB%E5%AE%BF), the Green Dragon is the generic name for the seven eastern constellations (Horn, Hyper, Diao, Fang, Heart, Tail and Minchi). It is known in Taoism as "Mengzhang" and in different Taoist scriptures as "Dijun", "Shengjian", "Shenjian" and He is also known in different Daoist scriptures as "Dijun", "Shengjun", "Shenjun" and "Ghost Catcher"[1], and is the guardian deity of Daoism, together with the White Tiger Supervisor of Soldiers.

README.md

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

back/api/auth.ts

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

back/api/config.ts

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

back/api/cron.ts

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

back/api/dependence.ts

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

back/api/env.ts

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

back/api/index.ts

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

back/api/log.ts

@@ -3,70 +3,38 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { getFileContentByName } from '../config/util';
+import { getFileContentByName, readDirs } from '../config/util';
+import { join } from 'path';
 const route = Router();
 
 export default (app: Router) => {
-  app.use('/', route);
+  app.use('/logs', route);
-  route.get(
+
-    '/logs',
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
-    async (req: Request, res: Response, next: NextFunction) => {
+    const logger: Logger = Container.get('logger');
-      const logger: Logger = Container.get('logger');
+    try {
-      try {
+      const result = readDirs(config.logPath, config.logPath);
-        const fileList = fs.readdirSync(config.logPath, 'utf-8');
+      res.send({
-        const dirs = [];
+        code: 200,
-        for (let i = 0; i < fileList.length; i++) {
+        data: result,
-          const stat = fs.lstatSync(config.logPath + fileList[i]);
+      });
-          if (stat.isDirectory()) {
+    } catch (e) {
-            const fileListTmp = fs.readdirSync(
+      logger.error('🔥 error: %o', e);
-              `${config.logPath}/${fileList[i]}`,
+      return next(e);
-              'utf-8',
+    }
-            );
+  });
-            dirs.push({
-              name: fileList[i],
-              isDir: true,
-              files: fileListTmp.reverse(),
-            });
-          } else {
-            dirs.push({
-              name: fileList[i],
-              isDir: false,
-              files: [],
-            });
-          }
-        }
-        res.send({ code: 200, dirs });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
 
   route.get(
-    '/logs/:dir/:file',
+    '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        const { dir, file } = req.params;
+        const filePath = join(
-        const content = getFileContentByName(
+          config.logPath,
-          `${config.logPath}/${dir}/${file}`,
+          (req.query.path || '') as string,
+          req.params.file,
         );
-        res.send({ code: 200, data: content });
+        const content = getFileContentByName(filePath);
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
-  route.get(
-    '/logs/:file',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const { file } = req.params;
-        const content = getFileContentByName(`${config.logPath}/${file}`);
         res.send({ code: 200, data: content });
       } catch (e) {
         logger.error('🔥 error: %o', e);

back/api/open.ts

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

back/api/script.ts

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

back/api/subscription.ts

@@ -0,0 +1,294 @@
+import { Router, Request, Response, NextFunction } from 'express';
+import { Container } from 'typedi';
+import { Logger } from 'winston';
+import SubscriptionService from '../services/subscription';
+import { celebrate, Joi } from 'celebrate';
+import cron_parser from 'cron-parser';
+const route = Router();
+
+export default (app: Router) => {
+  app.use('/subscriptions', route);
+
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
+    const logger: Logger = Container.get('logger');
+    try {
+      const subscriptionService = Container.get(SubscriptionService);
+      const data = await subscriptionService.list(
+        req.query.searchValue as string,
+      );
+      return res.send({ code: 200, data });
+    } catch (e) {
+      logger.error('🔥 error: %o', e);
+      return next(e);
+    }
+  });
+
+  route.post(
+    '/',
+    celebrate({
+      body: Joi.object({
+        type: Joi.string().required(),
+        schedule: Joi.string().optional().allow('').allow(null),
+        interval_schedule: Joi.object({
+          type: Joi.string().required(),
+          value: Joi.number().min(1).required(),
+        })
+          .optional()
+          .allow('')
+          .allow(null),
+        name: Joi.string().optional().allow('').allow(null),
+        url: Joi.string().required(),
+        whitelist: Joi.string().optional().allow('').allow(null),
+        blacklist: Joi.string().optional().allow('').allow(null),
+        branch: Joi.string().optional().allow('').allow(null),
+        dependences: Joi.string().optional().allow('').allow(null),
+        pull_type: Joi.string().optional().allow('').allow(null),
+        pull_option: Joi.object().optional().allow('').allow(null),
+        extensions: Joi.string().optional().allow('').allow(null),
+        sub_before: Joi.string().optional().allow('').allow(null),
+        sub_after: Joi.string().optional().allow('').allow(null),
+        schedule_type: Joi.string().required(),
+        alias: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        if (
+          !req.body.schedule ||
+          cron_parser.parseExpression(req.body.schedule).hasNext()
+        ) {
+          const subscriptionService = Container.get(SubscriptionService);
+          const data = await subscriptionService.create(req.body);
+          return res.send({ code: 200, data });
+        } else {
+          return res.send({ code: 400, message: 'param schedule error' });
+        }
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/run',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.run(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/stop',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.stop(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/disable',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.disabled(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/enable',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.enabled(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/:id/log',
+    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 subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.log(req.params.id);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/',
+    celebrate({
+      body: Joi.object({
+        type: Joi.string().required(),
+        schedule: Joi.string().optional().allow('').allow(null),
+        interval_schedule: Joi.object().optional().allow('').allow(null),
+        name: Joi.string().optional().allow('').allow(null),
+        url: Joi.string().required(),
+        whitelist: Joi.string().optional().allow('').allow(null),
+        blacklist: Joi.string().optional().allow('').allow(null),
+        branch: Joi.string().optional().allow('').allow(null),
+        dependences: Joi.string().optional().allow('').allow(null),
+        pull_type: Joi.string().optional().allow('').allow(null),
+        pull_option: Joi.object().optional().allow('').allow(null),
+        schedule_type: Joi.string().optional().allow('').allow(null),
+        extensions: Joi.string().optional().allow('').allow(null),
+        sub_before: Joi.string().optional().allow('').allow(null),
+        sub_after: Joi.string().optional().allow('').allow(null),
+        alias: Joi.string().required(),
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        if (
+          !req.body.schedule ||
+          typeof req.body.schedule === 'object' ||
+          cron_parser.parseExpression(req.body.schedule).hasNext()
+        ) {
+          const subscriptionService = Container.get(SubscriptionService);
+          const data = await subscriptionService.update(req.body);
+          return res.send({ code: 200, data });
+        } else {
+          return res.send({ code: 400, message: 'param schedule error' });
+        }
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.delete(
+    '/',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.remove(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/:id',
+    celebrate({
+      params: Joi.object({
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.getDb({ id: req.params.id });
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/status',
+    celebrate({
+      body: Joi.object({
+        ids: Joi.array().items(Joi.number().required()),
+        status: Joi.string().required(),
+        pid: Joi.string().optional(),
+        log_path: Joi.string().optional(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.status({
+          ...req.body,
+          status: parseInt(req.body.status),
+          pid: parseInt(req.body.pid) || '',
+        });
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  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 subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.logs(req.params.id);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+};

back/api/system.ts

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

back/api/user.ts

@@ -0,0 +1,271 @@
+import { Router, Request, Response, NextFunction } from 'express';
+import { Container } from 'typedi';
+import { Logger } from 'winston';
+import UserService from '../services/user';
+import { celebrate, Joi } from 'celebrate';
+import multer from 'multer';
+import path from 'path';
+import { v4 as uuidV4 } from 'uuid';
+import config from '../config';
+const route = Router();
+
+const storage = multer.diskStorage({
+  destination: function (req, file, cb) {
+    cb(null, config.uploadPath);
+  },
+  filename: function (req, file, cb) {
+    const ext = path.parse(file.originalname).ext;
+    const key = uuidV4();
+    cb(null, key + ext);
+  },
+});
+const upload = multer({ storage: storage });
+
+export default (app: Router) => {
+  app.use('/user', route);
+
+  route.post(
+    '/login',
+    celebrate({
+      body: Joi.object({
+        username: Joi.string().required(),
+        password: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.login({ ...req.body }, req);
+        return res.send(data);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.post(
+    '/logout',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        await userService.logout(req.platform);
+        res.send({ code: 200 });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/',
+    celebrate({
+      body: Joi.object({
+        username: Joi.string().required(),
+        password: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        await userService.updateUsernameAndPassword(req.body);
+        res.send({ code: 200, message: '更新成功' });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
+    const logger: Logger = Container.get('logger');
+    try {
+      const userService = Container.get(UserService);
+      const authInfo = await userService.getUserInfo();
+      res.send({
+        code: 200,
+        data: {
+          username: authInfo.username,
+          avatar: authInfo.avatar,
+          twoFactorActivated: authInfo.twoFactorActivated,
+        },
+      });
+    } catch (e) {
+      logger.error('🔥 error: %o', e);
+      return next(e);
+    }
+  });
+
+  route.get(
+    '/two-factor/init',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.initTwoFactor();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/two-factor/active',
+    celebrate({
+      body: Joi.object({
+        code: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.activeTwoFactor(req.body.code);
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/two-factor/deactive',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.deactiveTwoFactor();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/two-factor/login',
+    celebrate({
+      body: Joi.object({
+        code: Joi.string().required(),
+        username: Joi.string().required(),
+        password: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.twoFactorLogin(req.body, req);
+        res.send(data);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/login-log',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.getLoginLog();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/notification',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const data = await userService.getNotificationMode();
+        res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/notification',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const result = await userService.updateNotificationMode(req.body);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/init',
+    celebrate({
+      body: Joi.object({
+        username: Joi.string().required(),
+        password: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        await userService.updateUsernameAndPassword(req.body);
+        res.send({ code: 200, message: '更新成功' });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/notification/init',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const result = await userService.updateNotificationMode(req.body);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/avatar',
+    upload.single('avatar'),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const result = await userService.updateAvatar(req.file!.filename);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+};

back/app.ts

@@ -9,20 +9,24 @@ import Logger from './loaders/logger';
 async function startServer() {
   const app = express();
 
-  await require('./loaders').default({ expressApp: app });
+  await require('./loaders/initFile').default();
 
-  app
+  await require('./loaders/sentry').default({ expressApp: app });
+
+  await require('./loaders/db').default();
+
+  await require('./loaders/app').default({ expressApp: app });
+
+  const server = app
     .listen(config.port, () => {
-      Logger.info(`
+      Logger.debug(`✌️ Back server launched on port ${config.port}`);
-      ################################################
-      🛡️  Server listening on port: ${config.port} 🛡️
-      ################################################
-    `);
     })
     .on('error', (err) => {
       Logger.error(err);
       process.exit(1);
     });
+
+  await require('./loaders/server').default({ server });
 }
 
 startServer();

back/config/index.ts

@@ -4,38 +4,41 @@ import { createRandomString } from './util';
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
+const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;
+
 const envFound = dotenv.config();
-const rootPath = path.resolve(__dirname, '../../');
+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 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 uploadPath = path.join(dataPath, 'upload/');
+
+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 versionFile = path.join(rootPath, 'src/version.ts');
-const cronDbFile = path.join(rootPath, 'db/crontab.db');
-const envDbFile = path.join(rootPath, 'db/env.db');
-const configFound = dotenv.config({ path: confFile });
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");
 }
 
-if (configFound.error) {
-  throw new Error("⚠️  Couldn't find config.sh file  ⚠️");
-}
-
 export default {
-  port: parseInt(process.env.PORT as string, 10),
+  port: parseInt(process.env.BACK_PORT as string, 10),
   cronPort: parseInt(process.env.CRON_PORT as string, 10),
+  publicPort: parseInt(process.env.PUBLIC_PORT as string, 10),
   secret: process.env.SECRET || createRandomString(16, 32),
   logs: {
     level: process.env.LOG_LEVEL || 'silly',
@@ -43,6 +46,7 @@ export default {
   api: {
     prefix: '/api',
   },
+  rootPath,
   configString,
   loginFaild,
   authError,
@@ -55,8 +59,7 @@ export default {
   confFile,
   envFile,
   dbPath,
-  cronDbFile,
+  uploadPath,
-  envDbFile,
   configPath,
   scriptPath,
   samplePath,
@@ -67,10 +70,17 @@ export default {
     'crontab.list',
     'env.sh',
   ],
-  writePathList: [
+  writePathList: [configPath, scriptPath],
-    '/ql/scripts/',
+  bakPath,
-    '/ql/config/',
+  apiWhiteList: [
-    '/ql/jbot/',
+    '/api/user/login',
-    '/ql/bak/',
+    '/open/auth/token',
+    '/api/user/two-factor/login',
+    '/api/system',
+    '/api/user/init',
+    '/api/user/notification/init',
   ],
+  versionFile,
+  lastVersionFile,
+  sqliteFile,
 };

back/config/util.ts

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

back/data/auth.ts

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

back/data/cron.ts

@@ -1,32 +1,42 @@
+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
+        ? options.status
-      : CrontabStatus.idle;
+        : CrontabStatus.idle;
     this.timestamp = new Date().toString();
     this.isSystem = options.isSystem || 0;
     this.pid = options.pid;
     this.isDisabled = options.isDisabled || 0;
     this.log_path = options.log_path || '';
+    this.isPinned = options.isPinned || 0;
+    this.labels = options.labels || [];
+    this.last_running_time = options.last_running_time || 0;
+    this.last_execution_time = options.last_execution_time || 0;
   }
 }
 
@@ -36,3 +46,30 @@ export enum CrontabStatus {
   'disabled',
   'queued',
 }
+
+interface CronInstance extends Model<Crontab, Crontab>, Crontab {}
+export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
+  name: {
+    unique: 'compositeIndex',
+    type: DataTypes.STRING,
+  },
+  command: {
+    unique: 'compositeIndex',
+    type: DataTypes.STRING,
+  },
+  schedule: {
+    unique: 'compositeIndex',
+    type: DataTypes.STRING,
+  },
+  timestamp: DataTypes.STRING,
+  saved: DataTypes.BOOLEAN,
+  status: DataTypes.NUMBER,
+  isSystem: DataTypes.NUMBER,
+  pid: DataTypes.NUMBER,
+  isDisabled: DataTypes.NUMBER,
+  isPinned: DataTypes.NUMBER,
+  log_path: DataTypes.STRING,
+  labels: DataTypes.JSON,
+  last_running_time: DataTypes.NUMBER,
+  last_execution_time: DataTypes.NUMBER,
+});

back/data/dependence.ts

@@ -0,0 +1,64 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
+export class Dependence {
+  timestamp?: string;
+  id?: number;
+  status?: DependenceStatus;
+  type?: DependenceTypes;
+  name?: number;
+  log?: string[];
+  remark?: string;
+
+  constructor(options: Dependence) {
+    this.id = options.id;
+    this.status = options.status || DependenceStatus.installing;
+    this.type = options.type || DependenceTypes.nodejs;
+    this.timestamp = new Date().toString();
+    this.name = options.name;
+    this.log = options.log || [];
+    this.remark = options.remark || '';
+  }
+}
+
+export enum DependenceStatus {
+  'installing',
+  'installed',
+  'installFailed',
+  'removing',
+  'removed',
+  'removeFailed',
+}
+
+export enum DependenceTypes {
+  'nodejs',
+  'python3',
+  'linux',
+}
+
+export enum InstallDependenceCommandTypes {
+  'pnpm add -g',
+  'pip3 install',
+  'apk add',
+}
+
+export enum unInstallDependenceCommandTypes {
+  'pnpm remove -g',
+  'pip3 uninstall -y',
+  'apk del',
+}
+
+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

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

back/data/open.ts

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

back/data/sock.ts

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

back/data/subscription.ts

@@ -0,0 +1,106 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+import { SimpleIntervalSchedule } from 'toad-scheduler';
+
+type SimpleIntervalScheduleUnit = keyof SimpleIntervalSchedule;
+export class Subscription {
+  id?: number;
+  name?: string;
+  type?: 'public-repo' | 'private-repo' | 'file';
+  schedule_type?: 'crontab' | 'interval';
+  schedule?: string;
+  interval_schedule?: { type: SimpleIntervalScheduleUnit; value: number };
+  url?: string;
+  whitelist?: string;
+  blacklist?: string;
+  dependences?: string;
+  branch?: string;
+  status?: SubscriptionStatus;
+  pull_type?: 'ssh-key' | 'user-pwd';
+  pull_option?:
+    | { private_key: string }
+    | { username: string; password: string };
+  pid?: number;
+  is_disabled?: 1 | 0;
+  log_path?: string;
+  alias: string;
+  command?: string;
+  extensions?: string;
+  sub_before?: string;
+  sub_after?: string;
+
+  constructor(options: Subscription) {
+    this.id = options.id;
+    this.name = options.name || options.alias;
+    this.type = options.type;
+    this.schedule = options.schedule;
+    this.status =
+      options.status && SubscriptionStatus[options.status]
+        ? options.status
+        : SubscriptionStatus.idle;
+    this.url = options.url;
+    this.whitelist = options.whitelist;
+    this.blacklist = options.blacklist;
+    this.dependences = options.dependences;
+    this.branch = options.branch;
+    this.pull_type = options.pull_type;
+    this.pull_option = options.pull_option;
+    this.pid = options.pid;
+    this.is_disabled = options.is_disabled;
+    this.log_path = options.log_path;
+    this.schedule_type = options.schedule_type;
+    this.alias = options.alias;
+    this.interval_schedule = options.interval_schedule;
+    this.extensions = options.extensions;
+    this.sub_before = options.sub_before;
+    this.sub_after = options.sub_after;
+  }
+}
+
+export enum SubscriptionStatus {
+  'running',
+  'idle',
+  'disabled',
+  'queued',
+}
+
+interface SubscriptionInstance
+  extends Model<Subscription, Subscription>,
+    Subscription {}
+export const SubscriptionModel = sequelize.define<SubscriptionInstance>(
+  'Subscription',
+  {
+    name: {
+      unique: 'compositeIndex',
+      type: DataTypes.STRING,
+    },
+    url: {
+      unique: 'compositeIndex',
+      type: DataTypes.STRING,
+    },
+    schedule: {
+      unique: 'compositeIndex',
+      type: DataTypes.STRING,
+    },
+    interval_schedule: {
+      unique: 'compositeIndex',
+      type: DataTypes.JSON,
+    },
+    type: DataTypes.STRING,
+    whitelist: DataTypes.STRING,
+    blacklist: DataTypes.STRING,
+    status: DataTypes.NUMBER,
+    dependences: DataTypes.STRING,
+    extensions: DataTypes.STRING,
+    sub_before: DataTypes.STRING,
+    sub_after: DataTypes.STRING,
+    branch: DataTypes.STRING,
+    pull_type: DataTypes.STRING,
+    pull_option: DataTypes.JSON,
+    pid: DataTypes.NUMBER,
+    is_disabled: DataTypes.NUMBER,
+    log_path: DataTypes.STRING,
+    schedule_type: DataTypes.STRING,
+    alias: { type: DataTypes.STRING, unique: 'alias' },
+  },
+);

back/index.d.ts

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

back/loaders/app.ts

@@ -0,0 +1,24 @@
+import expressLoader from './express';
+import depInjectorLoader from './depInjector';
+import Logger from './logger';
+import initData from './initData';
+import { Application } from 'express';
+import linkDeps from './deps';
+import initTask from './initTask';
+
+export default async ({ expressApp }: { expressApp: Application }) => {
+  await depInjectorLoader();
+  Logger.info('✌️ Dependency Injector loaded');
+
+  await expressLoader({ app: expressApp });
+  Logger.info('✌️ Express loaded');
+
+  await initData();
+  Logger.info('✌️ init data loaded');
+
+  await linkDeps();
+  Logger.info('✌️ link deps loaded');
+
+  initTask();
+  Logger.info('✌️ init task loaded');
+};

back/loaders/db.ts

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

back/loaders/depInjector.ts

@@ -1,12 +1,8 @@
 import { Container } from 'typedi';
 import LoggerInstance from './logger';
 
-export default ({ models }: { models: { name: string; model: any }[] }) => {
+export default () => {
   try {
-    models.forEach((m) => {
-      Container.set(m.name, m.model);
-    });
-
     Container.set('logger', LoggerInstance);
   } catch (e) {
     LoggerInstance.error('🔥 Error on dependency injector loader: %o', e);

back/loaders/deps.ts

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

back/loaders/express.ts

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

back/loaders/index.ts

@@ -1,19 +0,0 @@
-import expressLoader from './express';
-import dependencyInjectorLoader from './dependencyInjector';
-import Logger from './logger';
-import initData from './initData';
-
-export default async ({ expressApp }: { expressApp: any }) => {
-  Logger.info('✌️ DB loaded and connected!');
-
-  await dependencyInjectorLoader({
-    models: [],
-  });
-  Logger.info('✌️ Dependency Injector loaded');
-
-  await expressLoader({ app: expressApp });
-  Logger.info('✌️ Express loaded');
-
-  await initData();
-  Logger.info('✌️ init data loaded');
-};

back/loaders/initData.ts

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

back/loaders/initFile.ts

@@ -0,0 +1,62 @@
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import dotenv from 'dotenv';
+import Logger from './logger';
+import { fileExist } from '../config/util';
+
+const rootPath = process.cwd();
+const dataPath = path.join(rootPath, 'data/');
+const configPath = path.join(dataPath, 'config/');
+const scriptPath = path.join(dataPath, 'scripts/');
+const logPath = path.join(dataPath, 'log/');
+const uploadPath = path.join(dataPath, 'upload/');
+const samplePath = path.join(rootPath, 'sample/');
+const confFile = path.join(configPath, 'config.sh');
+const authConfigFile = path.join(configPath, 'auth.json');
+const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
+const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
+const homedir = os.homedir();
+const sshPath = path.resolve(homedir, '.ssh');
+
+export default async () => {
+  const authFileExist = await fileExist(authConfigFile);
+  const confFileExist = await fileExist(confFile);
+  const scriptDirExist = await fileExist(scriptPath);
+  const logDirExist = await fileExist(logPath);
+  const configDirExist = await fileExist(configPath);
+  const uploadDirExist = await fileExist(uploadPath);
+  const sshDirExist = await fileExist(sshPath);
+
+  if (!configDirExist) {
+    fs.mkdirSync(configPath);
+  }
+
+  if (!authFileExist) {
+    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
+  }
+
+  if (!confFileExist) {
+    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
+  }
+
+  if (!scriptDirExist) {
+    fs.mkdirSync(scriptPath);
+  }
+
+  if (!logDirExist) {
+    fs.mkdirSync(logPath);
+  }
+
+  if (!uploadDirExist) {
+    fs.mkdirSync(uploadPath);
+  }
+
+  if (!sshDirExist) {
+    fs.mkdirSync(sshPath);
+  }
+
+  dotenv.config({ path: confFile });
+
+  Logger.info('✌️ Init file down');
+};

back/loaders/initTask.ts

@@ -0,0 +1,36 @@
+import { Container } from 'typedi';
+import _ from 'lodash';
+import SystemService from '../services/system';
+import ScheduleService from '../services/schedule';
+import SubscriptionService from '../services/subscription';
+
+export default async () => {
+  const systemService = Container.get(SystemService);
+  const scheduleService = Container.get(ScheduleService);
+  const subscriptionService = Container.get(SubscriptionService);
+
+  // 运行删除日志任务
+  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,
+    });
+  }
+
+  // 运行所有订阅
+  const subs = await subscriptionService.list();
+  for (const sub of subs) {
+    await subscriptionService.handleTask(
+      sub,
+      !sub.is_disabled,
+      true,
+      !sub.is_disabled,
+    );
+  }
+};

back/loaders/sentry.ts

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

back/loaders/server.ts

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

back/loaders/sock.ts

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

back/public.ts

@@ -0,0 +1,30 @@
+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, message: (err && err.message) || 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.debug(`✌️ Back server launched on port ${config.publicPort}`);
+  })
+  .on('error', (err) => {
+    Logger.error(err);
+    process.exit(1);
+  });

back/schedule.ts

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

back/services/cron.ts

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

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

back/services/env.ts

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

back/services/notify.ts

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

back/services/open.ts

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

back/services/schedule.ts

@@ -0,0 +1,193 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import nodeSchedule from 'node-schedule';
+import { ChildProcessWithoutNullStreams, exec, spawn } from 'child_process';
+import {
+  ToadScheduler,
+  LongIntervalJob,
+  AsyncTask,
+  SimpleIntervalSchedule,
+} from 'toad-scheduler';
+import dayjs from 'dayjs';
+
+interface ScheduleTaskType {
+  id: number;
+  command: string;
+  name?: string;
+  schedule?: string;
+}
+
+export interface TaskCallbacks {
+  onBefore?: (startTime: dayjs.Dayjs) => Promise<void>;
+  onStart?: (
+    cp: ChildProcessWithoutNullStreams,
+    startTime: dayjs.Dayjs,
+  ) => Promise<void>;
+  onEnd?: (
+    cp: ChildProcessWithoutNullStreams,
+    endTime: dayjs.Dayjs,
+    diff: number,
+  ) => Promise<void>;
+  onLog?: (message: string) => Promise<void>;
+  onError?: (message: string) => Promise<void>;
+}
+
+@Service()
+export default class ScheduleService {
+  private scheduleStacks = new Map<string, nodeSchedule.Job>();
+
+  private intervalSchedule = new ToadScheduler();
+
+  private maxBuffer = 200 * 1024 * 1024;
+
+  constructor(@Inject('logger') private logger: winston.Logger) {}
+
+  async runTask(command: string, callbacks: TaskCallbacks = {}) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const startTime = dayjs();
+        await callbacks.onBefore?.(startTime);
+
+        const cp = spawn(command, { shell: '/bin/bash' });
+
+        // TODO:
+        callbacks.onStart?.(cp, startTime);
+
+        cp.stdout.on('data', async (data) => {
+          await callbacks.onLog?.(data.toString());
+        });
+
+        cp.stderr.on('data', async (data) => {
+          this.logger.error(
+            '执行任务 %s 失败，时间：%s, 错误信息：%j',
+            command,
+            new Date().toLocaleString(),
+            data.toString(),
+          );
+          await callbacks.onError?.(data.toString());
+        });
+
+        cp.on('error', async (err) => {
+          this.logger.error(
+            '创建任务 %s 失败，时间：%s, 错误信息：%j',
+            command,
+            new Date().toLocaleString(),
+            err,
+          );
+          await callbacks.onError?.(JSON.stringify(err));
+        });
+
+        cp.on('exit', async (code, signal) => {
+          this.logger.info(
+            `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
+          );
+        });
+
+        cp.on('close', async (code) => {
+          const endTime = dayjs();
+          this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
+          await callbacks.onEnd?.(
+            cp,
+            endTime,
+            endTime.diff(startTime, 'seconds'),
+          );
+          resolve(null);
+        });
+      } catch (error) {
+        await this.logger.error(
+          '执行任务%s失败，时间：%s, 错误信息：%j',
+          command,
+          new Date().toLocaleString(),
+          error,
+        );
+        await callbacks.onError?.(JSON.stringify(error));
+        resolve(null);
+      }
+    });
+  }
+
+  async createCronTask(
+    { id = 0, command, name, schedule = '' }: ScheduleTaskType,
+    callbacks?: TaskCallbacks,
+    runImmediately = false,
+  ) {
+    const _id = this.formatId(id);
+    this.logger.info(
+      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
+      _id,
+      schedule,
+      name,
+      command,
+    );
+
+    this.scheduleStacks.set(
+      _id,
+      nodeSchedule.scheduleJob(_id, schedule, async () => {
+        await this.runTask(command, callbacks);
+      }),
+    );
+
+    if (runImmediately) {
+      await this.runTask(command, callbacks);
+    }
+  }
+
+  async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
+    const _id = this.formatId(id);
+    this.logger.info('[取消定时任务]，任务名：%s', name);
+    this.scheduleStacks.has(_id) && this.scheduleStacks.get(_id)?.cancel();
+  }
+
+  async createIntervalTask(
+    { id = 0, command, name = '' }: ScheduleTaskType,
+    schedule: SimpleIntervalSchedule,
+    runImmediately = true,
+    callbacks?: TaskCallbacks,
+  ) {
+    const _id = this.formatId(id);
+    this.logger.info(
+      '[创建interval任务]，任务ID: %s，任务名: %s，执行命令: %s',
+      _id,
+      name,
+      command,
+    );
+    const task = new AsyncTask(
+      name,
+      async () => {
+        return new Promise(async (resolve, reject) => {
+          await this.runTask(command, callbacks);
+        });
+      },
+      (err) => {
+        this.logger.error(
+          '执行任务%s失败，时间：%s, 错误信息：%j',
+          command,
+          new Date().toLocaleString(),
+          err,
+        );
+      },
+    );
+
+    const job = new LongIntervalJob(
+      { ...schedule, runImmediately: false },
+      task,
+      _id,
+    );
+
+    this.intervalSchedule.addIntervalJob(job);
+
+    if (runImmediately) {
+      await this.runTask(command, callbacks);
+    }
+  }
+
+  async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {
+    const _id = this.formatId(id);
+    this.logger.info('[取消interval任务]，任务ID: %s，任务名：%s', _id, name);
+    this.intervalSchedule.removeById(_id);
+  }
+
+  private formatId(id: number): string {
+    return String(id);
+  }
+}

back/services/script.ts

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

back/services/sock.ts

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

back/services/sshKey.ts

@@ -0,0 +1,84 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+
+@Service()
+export default class SshKeyService {
+  private homedir = os.homedir();
+  private sshPath = path.resolve(this.homedir, '.ssh');
+  private sshConfigFilePath = path.resolve(this.sshPath, 'config');
+
+  constructor(@Inject('logger') private logger: winston.Logger) {}
+
+  private generatePrivateKeyFile(alias: string, key: string): void {
+    try {
+      fs.writeFileSync(`${this.sshPath}/${alias}`, key, {
+        encoding: 'utf8',
+        mode: '400',
+      });
+    } catch (error) {
+      this.logger.error('生成私钥文件失败', error);
+    }
+  }
+
+  private getConfigRegx(alias: string) {
+    return new RegExp(
+      `Host ${alias}\n.*[^StrictHostKeyChecking]*.*[\n]*.*StrictHostKeyChecking no`,
+      'g',
+    );
+  }
+
+  private removePrivateKeyFile(alias: string): void {
+    try {
+      fs.unlinkSync(`${this.sshPath}/${alias}`);
+    } catch (error) {
+      this.logger.error('删除私钥文件失败', error);
+    }
+  }
+
+  private generateSingleSshConfig(alias: string, host: string): string {
+    return `\nHost ${alias}\n    Hostname ${host}\n    IdentityFile ${this.sshPath}/${alias}\n    StrictHostKeyChecking no`;
+  }
+
+  private generateSshConfig(configs: string[]) {
+    try {
+      for (const config of configs) {
+        fs.appendFileSync(this.sshConfigFilePath, config, {
+          encoding: 'utf8',
+        });
+      }
+    } catch (error) {
+      this.logger.error('写入ssh配置文件失败', error);
+    }
+  }
+
+  private removeSshConfig(alias: string) {
+    try {
+      const configRegx = this.getConfigRegx(alias);
+      const data = fs
+        .readFileSync(this.sshConfigFilePath, { encoding: 'utf8' })
+        .replace(configRegx, '')
+        .replace(/\n[\n]+/g, '\n');
+      fs.writeFileSync(this.sshConfigFilePath, data, {
+        encoding: 'utf8',
+      });
+    } catch (error) {
+      this.logger.error(`删除ssh配置文件${alias}失败`, error);
+    }
+  }
+
+  public addSSHKey(key: string, alias: string, host: string): void {
+    this.generatePrivateKeyFile(alias, key);
+    const config = this.generateSingleSshConfig(alias, host);
+    this.removeSshConfig(alias);
+    this.generateSshConfig([config]);
+  }
+
+  public removeSSHKey(alias: string, host: string): void {
+    this.removePrivateKeyFile(alias);
+    const config = this.generateSingleSshConfig(alias, host);
+    this.removeSshConfig(config);
+  }
+}

back/services/subscription.ts

@@ -0,0 +1,484 @@
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
+import config from '../config';
+import {
+  Subscription,
+  SubscriptionModel,
+  SubscriptionStatus,
+} from '../data/subscription';
+import {
+  ChildProcessWithoutNullStreams,
+  exec,
+  execSync,
+  spawn,
+} from 'child_process';
+import fs from 'fs';
+import cron_parser from 'cron-parser';
+import {
+  getFileContentByName,
+  concurrentRun,
+  fileExist,
+  createFile,
+} from '../config/util';
+import { promises, existsSync } from 'fs';
+import { promisify } from 'util';
+import { Op } from 'sequelize';
+import path from 'path';
+import ScheduleService, { TaskCallbacks } from './schedule';
+import { SimpleIntervalSchedule } from 'toad-scheduler';
+import SockService from './sock';
+import SshKeyService from './sshKey';
+
+@Service()
+export default class SubscriptionService {
+  constructor(
+    @Inject('logger') private logger: winston.Logger,
+    private scheduleService: ScheduleService,
+    private sockService: SockService,
+    private sshKeyService: SshKeyService,
+  ) {}
+
+  public async list(searchText?: string): Promise<Subscription[]> {
+    let query = {};
+    if (searchText) {
+      const textArray = searchText.split(':');
+      switch (textArray[0]) {
+        case 'name':
+        case 'command':
+        case 'schedule':
+        case 'label':
+          const column = textArray[0] === 'label' ? 'labels' : textArray[0];
+          query = {
+            [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,
+              },
+              {
+                command: reg,
+              },
+              {
+                schedule: reg,
+              },
+              {
+                labels: reg,
+              },
+            ],
+          };
+          break;
+      }
+    }
+    try {
+      const result = await SubscriptionModel.findAll({
+        where: query,
+        order: [['createdAt', 'DESC']],
+      });
+      return result as any;
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  private formatCommand(doc: Subscription, url?: string) {
+    let command = 'ql ';
+    let _url = url || this.formatUrl(doc).url;
+    const { type, whitelist, blacklist, dependences, branch, extensions } = doc;
+    if (type === 'file') {
+      command += `raw "${_url}"`;
+    } else {
+      command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
+        dependences || ''
+      }" "${branch || ''}" "${extensions || ''}"`;
+    }
+    return command;
+  }
+
+  private formatUrl(doc: Subscription) {
+    let url = doc.url;
+    let host = '';
+    if (doc.type === 'private-repo') {
+      if (doc.pull_type === 'ssh-key') {
+        host = doc.url!.replace(/.*\@([^\:]+)\:.*/, '$1');
+        url = doc.url!.replace(host, doc.alias);
+      } else {
+        host = doc.url!.replace(/.*\:\/\/([^\/]+)\/.*/, '$1');
+        const { username, password } = doc.pull_option as any;
+        url = doc.url!.replace(host, `${username}:${password}@${host}`);
+      }
+    }
+    return { url, host };
+  }
+
+  public async handleTask(
+    doc: Subscription,
+    needCreate = true,
+    needAddKey = true,
+    runImmediately = false,
+  ) {
+    const { url, host } = this.formatUrl(doc);
+    if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
+      if (needAddKey) {
+        this.sshKeyService.addSSHKey(
+          (doc.pull_option as any).private_key,
+          doc.alias,
+          host,
+        );
+      } else {
+        this.sshKeyService.removeSSHKey(doc.alias, host);
+      }
+    }
+
+    doc.command = this.formatCommand(doc, url as string);
+
+    if (doc.schedule_type === 'crontab') {
+      this.scheduleService.cancelCronTask(doc as any);
+      needCreate &&
+        (await this.scheduleService.createCronTask(
+          doc as any,
+          this.taskCallbacks(doc),
+          runImmediately,
+        ));
+    } else {
+      this.scheduleService.cancelIntervalTask(doc as any);
+      const { type, value } = doc.interval_schedule as any;
+      needCreate &&
+        (await this.scheduleService.createIntervalTask(
+          doc as any,
+          { [type]: value } as SimpleIntervalSchedule,
+          runImmediately,
+          this.taskCallbacks(doc),
+        ));
+    }
+  }
+
+  private async promiseExec(command: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+      exec(
+        command,
+        { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
+        (err, stdout, stderr) => {
+          resolve(stdout || stderr || JSON.stringify(err));
+        },
+      );
+    });
+  }
+
+  private async handleLogPath(
+    logPath: string,
+    data: string = '',
+  ): Promise<string> {
+    const absolutePath = path.resolve(config.logPath, logPath);
+    const logFileExist = await fileExist(absolutePath);
+    if (!logFileExist) {
+      await createFile(absolutePath, data);
+    }
+    return absolutePath;
+  }
+
+  private taskCallbacks(doc: Subscription): TaskCallbacks {
+    return {
+      onBefore: async (startTime) => {
+        const logTime = startTime.format('YYYY-MM-DD-HH-mm-ss');
+        const logPath = `${doc.alias}/${logTime}.log`;
+        await SubscriptionModel.update(
+          {
+            status: SubscriptionStatus.running,
+            log_path: logPath,
+          },
+          { where: { id: doc.id } },
+        );
+        const absolutePath = await this.handleLogPath(
+          logPath as string,
+          `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`,
+        );
+
+        // 执行sub_before
+        let beforeStr = '';
+        try {
+          if (doc.sub_before) {
+            fs.appendFileSync(absolutePath, `\n## 执行before命令...\n\n`);
+            beforeStr = await this.promiseExec(doc.sub_before);
+          }
+        } catch (error: any) {
+          beforeStr =
+            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
+        }
+        if (beforeStr) {
+          fs.appendFileSync(absolutePath, `${beforeStr}\n`);
+        }
+      },
+      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
+        await SubscriptionModel.update(
+          {
+            pid: cp.pid,
+          },
+          { where: { id: doc.id } },
+        );
+      },
+      onEnd: async (cp, endTime, diff) => {
+        const sub = await this.getDb({ id: doc.id });
+        const absolutePath = await this.handleLogPath(sub.log_path as string);
+
+        // 执行 sub_after
+        let afterStr = '';
+        try {
+          if (sub.sub_after) {
+            fs.appendFileSync(absolutePath, `\n\n## 执行after命令...\n\n`);
+            afterStr = await this.promiseExec(sub.sub_after);
+          }
+        } catch (error: any) {
+          afterStr =
+            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
+        }
+        if (afterStr) {
+          fs.appendFileSync(absolutePath, `${afterStr}\n`);
+        }
+
+        fs.appendFileSync(
+          absolutePath,
+          `\n## 执行结束... ${endTime.format(
+            'YYYY-MM-DD HH:mm:ss',
+          )}  耗时 ${diff} 秒`,
+        );
+
+        await SubscriptionModel.update(
+          { status: SubscriptionStatus.idle, pid: undefined },
+          { where: { id: sub.id } },
+        );
+
+        this.sockService.sendMessage({
+          type: 'runSubscriptionEnd',
+          message: '订阅执行完成',
+          references: [doc.id as number],
+        });
+      },
+      onError: async (message: string) => {
+        const sub = await this.getDb({ id: doc.id });
+        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        fs.appendFileSync(absolutePath, `\n${message}`);
+      },
+      onLog: async (message: string) => {
+        const sub = await this.getDb({ id: doc.id });
+        const absolutePath = await this.handleLogPath(sub.log_path as string);
+        fs.appendFileSync(absolutePath, `\n${message}`);
+      },
+    };
+  }
+
+  public async create(payload: Subscription): Promise<Subscription> {
+    const tab = new Subscription(payload);
+    const doc = await this.insert(tab);
+    await this.handleTask(doc);
+    return doc;
+  }
+
+  public async insert(payload: Subscription): Promise<Subscription> {
+    return await SubscriptionModel.create(payload, { returning: true });
+  }
+
+  public async update(payload: Subscription): Promise<Subscription> {
+    const newDoc = await this.updateDb(payload);
+    await this.handleTask(newDoc, !newDoc.is_disabled);
+    return newDoc;
+  }
+
+  public async updateDb(payload: Subscription): Promise<Subscription> {
+    await SubscriptionModel.update(payload, { where: { id: payload.id } });
+    return await this.getDb({ id: payload.id });
+  }
+
+  public async status({
+    ids,
+    status,
+    pid,
+    log_path,
+    last_running_time = 0,
+    last_execution_time = 0,
+  }: {
+    ids: number[];
+    status: SubscriptionStatus;
+    pid: number;
+    log_path: string;
+    last_running_time: number;
+    last_execution_time: number;
+  }) {
+    const options: any = {
+      status,
+      pid,
+      log_path,
+      last_execution_time,
+    };
+    if (last_running_time > 0) {
+      options.last_running_time = last_running_time;
+    }
+
+    return await SubscriptionModel.update(
+      { ...options },
+      { where: { id: ids } },
+    );
+  }
+
+  public async remove(ids: number[]) {
+    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      await this.handleTask(doc, false, false);
+    }
+    await SubscriptionModel.destroy({ where: { id: ids } });
+  }
+
+  public async getDb(query: any): Promise<Subscription> {
+    const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
+    return doc && (doc.get({ plain: true }) as Subscription);
+  }
+
+  public async run(ids: number[]) {
+    await SubscriptionModel.update(
+      { status: SubscriptionStatus.queued },
+      { where: { id: ids } },
+    );
+    concurrentRun(
+      ids.map((id) => async () => await this.runSingle(id)),
+      10,
+    );
+  }
+
+  public async stop(ids: number[]) {
+    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      if (doc.pid) {
+        try {
+          process.kill(-doc.pid);
+        } catch (error) {
+          this.logger.silly(error);
+        }
+      }
+      const command = this.formatCommand(doc);
+      const err = await this.killTask(command);
+      const absolutePath = await this.handleLogPath(doc.log_path as string);
+      const str = err ? `\n${err}` : '';
+      fs.appendFileSync(
+        `${absolutePath}`,
+        `${str}\n## 执行结束...  ${new Date()
+          .toLocaleString('zh', { hour12: false })
+          .replace(' 24:', ' 00:')} `,
+      );
+    }
+
+    await SubscriptionModel.update(
+      { status: SubscriptionStatus.idle, pid: undefined },
+      { where: { id: ids } },
+    );
+  }
+
+  public async killTask(name: string) {
+    let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
+    const execAsync = promisify(exec);
+    try {
+      let pid = (await execAsync(taskCommand)).stdout;
+      if (pid) {
+        pid = (await execAsync(`pstree -p ${pid}`)).stdout;
+      } else {
+        return;
+      }
+      let pids = pid.match(/\(\d+/g);
+      const killLogs = [];
+      if (pids && pids.length > 0) {
+        // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
+        for (const id of pids) {
+          const c = `kill -9 ${id.slice(1)}`;
+          try {
+            const { stdout, stderr } = await execAsync(c);
+            if (stderr) {
+              killLogs.push(stderr);
+            }
+            if (stdout) {
+              killLogs.push(stdout);
+            }
+          } catch (error: any) {
+            killLogs.push(error.message);
+          }
+        }
+      }
+      return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
+    } catch (e) {
+      return JSON.stringify(e);
+    }
+  }
+
+  private async runSingle(subscriptionId: number) {
+    const subscription = await this.getDb({ id: subscriptionId });
+    if (subscription.status !== SubscriptionStatus.queued) {
+      return;
+    }
+
+    const command = this.formatCommand(subscription);
+
+    await this.scheduleService.runTask(
+      command,
+      this.taskCallbacks(subscription),
+    );
+  }
+
+  public async disabled(ids: number[]) {
+    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      await this.handleTask(doc, false);
+    }
+    await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
+  }
+
+  public async enabled(ids: number[]) {
+    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      await this.handleTask(doc);
+    }
+    await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
+  }
+
+  public async log(id: number) {
+    const doc = await this.getDb({ id });
+    if (!doc || !doc.log_path) {
+      return '';
+    }
+
+    const absolutePath = await this.handleLogPath(doc.log_path as string);
+    return getFileContentByName(absolutePath);
+  }
+
+  public async logs(id: number) {
+    const doc = await this.getDb({ id });
+    if (!doc) {
+      return [];
+    }
+
+    if (doc.log_path) {
+      const relativeDir = path.dirname(`${doc.log_path}`);
+      const dir = path.resolve(config.logPath, relativeDir);
+      if (existsSync(dir)) {
+        let files = await promises.readdir(dir);
+        return files
+          .map((x) => ({
+            filename: x,
+            directory: relativeDir.replace(config.logPath, ''),
+            time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
+          }))
+          .sort((a, b) => b.time - a.time);
+      }
+    }
+  }
+}

back/services/system.ts

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

back/services/user.ts

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

cli/commands/update.ts

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

cli/index.ts

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

docker/Dockerfile

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

docker/docker-compose.yml

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

docker/docker-entrypoint.sh

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

docker/front.conf

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

docker/nginx.conf

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

package.json

@@ -1,14 +1,17 @@
 {
   "private": true,
   "scripts": {
-    "start": "umi dev",
+    "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}'",
+    "postinstall": "umi generate tmp 2>/dev/null || true",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage"
   },
@@ -23,61 +26,106 @@
       "prettier --parser=typescript --write"
     ]
   },
+  "pnpm": {
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "react": "17",
+        "react-dom": "17"
+      },
+      "ignoreMissing": [
+        "monaco-editor",
+        "react-router"
+      ]
+    }
+  },
   "dependencies": {
-    "body-parser": "^1.19.0",
+    "@otplib/preset-default": "^12.0.1",
-    "celebrate": "^13.0.3",
+    "@sentry/node": "^7.0.0",
+    "@sentry/tracing": "^7.0.0",
+    "body-parser": "^1.19.2",
+    "celebrate": "^15.0.1",
+    "chokidar": "^3.5.3",
     "cors": "^2.8.5",
-    "cron-parser": "^3.5.0",
+    "cron-parser": "^4.2.1",
-    "dotenv": "^8.2.0",
+    "dayjs": "^1.11.2",
-    "express": "^4.17.1",
+    "dotenv": "^16.0.0",
-    "express-jwt": "^6.0.0",
+    "express": "^4.17.3",
+    "express-jwt": "^6.1.1",
+    "express-urlrewrite": "^1.4.0",
+    "got": "^11.8.2",
+    "hpagent": "^0.1.2",
+    "iconv-lite": "^0.6.3",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
+    "multer": "^1.4.4",
     "nedb": "^1.8.0",
-    "node-fetch": "^2.6.1",
+    "node-schedule": "^2.1.0",
-    "node-schedule": "^2.0.0",
+    "nodemailer": "^6.7.2",
-    "p-queue": "6.6.2",
+    "p-queue": "7.2.0",
     "reflect-metadata": "^0.1.13",
-    "typedi": "^0.8.0",
+    "sequelize": "^6.17.0",
-    "winston": "^3.3.3"
+    "serve-handler": "^6.1.3",
+    "sockjs": "^0.3.24",
+    "sqlite3": "npm:@louislam/sqlite3@^15.0.3",
+    "toad-scheduler": "^1.6.0",
+    "typedi": "^0.10.0",
+    "uuid": "^8.3.2",
+    "winston": "^3.6.0",
+    "yargs": "^17.3.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^4.6.2",
+    "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.5.0",
+    "@ant-design/pro-layout": "^6.33.1",
-    "@monaco-editor/react": "^4.2.1",
+    "@monaco-editor/react": "^4.3.1",
-    "@types/cors": "^2.8.10",
+    "@sentry/react": "^7.0.0",
-    "@types/express": "^4.17.8",
+    "@types/body-parser": "^1.19.2",
-    "@types/express-jwt": "^6.0.1",
+    "@types/cors": "^2.8.12",
-    "@types/jsonwebtoken": "^8.5.0",
+    "@types/express": "^4.17.13",
-    "@types/lodash": "^4.14.170",
+    "@types/express-jwt": "^6.0.4",
-    "@types/nedb": "^1.8.11",
+    "@types/jsonwebtoken": "^8.5.8",
-    "@types/node": "^14.11.2",
+    "@types/lodash": "^4.14.179",
-    "@types/node-fetch": "^2.5.8",
+    "@types/multer": "^1.4.7",
-    "@types/qrcode.react": "^1.0.1",
+    "@types/nedb": "^1.8.12",
-    "@types/react": "^17.0.0",
+    "@types/node": "^17.0.21",
-    "@types/react-dom": "^17.0.0",
+    "@types/node-schedule": "^1.3.2",
-    "@umijs/plugin-antd": "^0.9.1",
+    "@types/nodemailer": "^6.4.4",
-    "@umijs/test": "^3.3.9",
+    "@types/qrcode.react": "^1.0.2",
-    "codemirror": "^5.62.2",
+    "@types/react": "^17.0.39",
-    "compression-webpack-plugin": "6.1.1",
+    "@types/react-dom": "^17.0.13",
-    "darkreader": "^4.9.27",
+    "@types/serve-handler": "^6.1.1",
-    "lint-staged": "^10.0.7",
+    "@types/sockjs": "^0.3.33",
-    "nodemon": "^2.0.4",
+    "@types/sockjs-client": "^1.5.1",
-    "prettier": "^2.2.0",
+    "@types/uuid": "^8.3.4",
+    "@umijs/plugin-antd": "^0.15.0",
+    "@umijs/plugin-esbuild": "^1.4.1",
+    "@umijs/ssr-darkreader": "^4.9.45",
+    "@umijs/test": "^3.5.21",
+    "ansi-to-react": "^6.1.6",
+    "antd": "^4.20.5",
+    "antd-img-crop": "^4.2.3",
+    "codemirror": "^5.65.2",
+    "compression-webpack-plugin": "9.2.0",
+    "concurrently": "^7.0.0",
+    "lint-staged": "^12.3.4",
+    "nodemon": "^2.0.15",
+    "prettier": "^2.5.1",
+    "qiniu": "^7.4.0",
     "qrcode.react": "^1.0.1",
+    "rc-tween-one": "^3.0.6",
     "react": "17.x",
     "react-codemirror2": "^7.2.1",
     "react-diff-viewer": "^3.1.1",
-    "react-split-pane": "^0.1.92",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
     "react-dom": "17.x",
-    "ts-node": "^9.0.0",
+    "react-split-pane": "^0.1.92",
-    "typescript": "^4.1.2",
+    "sockjs-client": "^1.6.0",
-    "umi": "^3.3.9",
+    "ts-node": "^10.6.0",
-    "umi-request": "^1.3.5",
+    "typescript": "^4.6.2",
+    "umi": "^3.5.21",
+    "umi-request": "^1.4.0",
     "vh-check": "^2.0.5",
-    "webpack": "^5.28.0",
+    "webpack": "^5.70.0",
     "yorkie": "^2.0.0"
   }
 }

sample/auth.sample.json

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

sample/config.sample.sh

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

sample/extra.sample.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 ## 添加你需要重启自动执行的任意命令，比如 ql repo
-## 安装node依赖使用 pnpm install -g xxx xxx
+## 安装node依赖使用 pnpm add -g xxx xxx
 ## 安装python依赖使用 pip3 install xxx

sample/notify.js

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

sample/notify.py

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

sample/requirements.txt

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

sample/tool.ts

@@ -0,0 +1,40 @@
+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 key = 'version.ts';
+const options = {
+  scope: `${process.env.QINIU_SCOPE}:${key}`,
+};
+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; charset=utf-8',
+);
+// 文件上传
+formUploader.putFile(
+  uploadToken,
+  key,
+  localFile,
+  putExtra,
+  function (respErr, respBody, respInfo) {
+    if (respErr) {
+      throw respErr;
+    }
+    if (respInfo.statusCode == 200) {
+      console.log(respBody);
+    } else {
+      console.log(respInfo.statusCode);
+      console.log(respBody);
+    }
+  },
+);

shell/api.sh

@@ -6,7 +6,7 @@ get_token() {
 
 add_cron_api() {
     local currentTimeStamp=$(date +%s)
-    if [ $# -eq 1 ]; then
+    if [[ $# -eq 1 ]]; then
         local schedule=$(echo "$1" | awk -F ":" '{print $1}')
         local command=$(echo "$1" | awk -F ":" '{print $2}')
         local name=$(echo "$1" | awk -F ":" '{print $3}')
@@ -39,7 +39,7 @@ add_cron_api() {
 
 update_cron_api() {
     local currentTimeStamp=$(date +%s)
-    if [ $# -eq 1 ]; then
+    if [[ $# -eq 1 ]]; then
         local schedule=$(echo "$1" | awk -F ":" '{print $1}')
         local command=$(echo "$1" | awk -F ":" '{print $2}')
         local name=$(echo "$1" | awk -F ":" '{print $3}')
@@ -61,7 +61,7 @@ update_cron_api() {
             -H "Origin: http://0.0.0.0:5700" \
             -H "Referer: http://0.0.0.0:5700/crontab" \
             -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"_id\":\"$id\"}" \
+            --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
             --compressed
     )
     code=$(echo $api | jq -r .code)
@@ -75,7 +75,7 @@ update_cron_api() {
 
 update_cron_command_api() {
     local currentTimeStamp=$(date +%s)
-    if [ $# -eq 1 ]; then
+    if [[ $# -eq 1 ]]; then
         local command=$(echo "$1" | awk -F ":" '{print $1}')
         local id=$(echo "$1" | awk -F ":" '{print $2}')
     else
@@ -93,7 +93,7 @@ update_cron_command_api() {
             -H "Origin: http://0.0.0.0:5700" \
             -H "Referer: http://0.0.0.0:5700/crontab" \
             -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"command\":\"$command\",\"_id\":\"$id\"}" \
+            --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
             --compressed
     )
     code=$(echo $api | jq -r .code)
@@ -153,6 +153,8 @@ update_cron() {
     local status="$2"
     local pid="${3:-''}"
     local logPath="$4"
+    local lastExecutingTime="${5:-0}"
+    local runningTime="${6:-0}"
     local currentTimeStamp=$(date +%s)
     local api=$(
         curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons/status?t=$currentTimeStamp" \
@@ -164,7 +166,7 @@ update_cron() {
             -H "Origin: http://0.0.0.0:5700" \
             -H "Referer: http://0.0.0.0:5700/crontab" \
             -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-            --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\"}" \
+            --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
             --compressed
     )
     code=$(echo $api | jq -r .code)
@@ -174,4 +176,30 @@ update_cron() {
     fi
 }
 
+notify_api() {
+    local title=$1
+    local content=$2
+    local currentTimeStamp=$(date +%s)
+    local api=$(
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/system/notify?t=$currentTimeStamp" \
+            -X 'PUT' \
+            -H "Accept: application/json" \
+            -H "Authorization: Bearer $token" \
+            -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+            -H "Content-Type: application/json;charset=UTF-8" \
+            -H "Origin: http://0.0.0.0:5700" \
+            -H "Referer: http://0.0.0.0:5700/crontab" \
+            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+            --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
+            --compressed
+    )
+    code=$(echo $api | jq -r .code)
+    message=$(echo $api | jq -r .message)
+    if [[ $code == 200 ]]; then
+        echo -e "通知发送成功"
+    else
+        echo -e "通知失败(${message})"
+    fi
+}
+
 get_token

shell/bot.sh

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

shell/check.sh

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

shell/notify.js

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

shell/notify.sh

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

shell/pub.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+echo -e "开始发布"
+
+echo -e "切换master分支"
+git checkout master
+
+echo -e "合并develop代码"
+git merge origin/develop
+
+echo -e "提交master代码"
+git push
+
+echo -e "更新cdn文件"
+ts-node sample/tool.ts
+
+string=$(cat src/version.ts | grep "version" | egrep "[^\']*" -o | egrep "\d\.*")
+version="v$string"
+echo -e "当前版本$version"
+
+echo -e "删除已经存在的本地tag"
+git tag -d "$version" &>/dev/null
+
+echo -e "删除已经存在的远程tag"
+git push origin :refs/tags/$version &>/dev/null
+
+echo -e "创建新tag"
+git tag -a "$version" -m "release $version"
+
+echo -e "提交tag"
+git push --tags
+
+echo -e "完成发布"

shell/rmlog.sh

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

shell/share.sh

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

shell/task.sh

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

shell/update.sh

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

src/app.tsx

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

src/components/iconfont.tsx

@@ -0,0 +1,7 @@
+import { createFromIconfontCN } from '@ant-design/icons';
+
+const IconFont = createFromIconfontCN({
+  scriptUrl: ['//at.alicdn.com/t/font_3354854_ds8pa06q1qa.js'],
+});
+
+export default IconFont;

src/components/index.less

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

src/components/pageLoading.tsx

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

src/components/tag.tsx

@@ -0,0 +1,110 @@
+import { Tag, Input } from 'antd';
+import { TweenOneGroup } from 'rc-tween-one';
+import { PlusOutlined } from '@ant-design/icons';
+import { useEffect, useRef, useState } from 'react';
+
+const EditableTagGroup = ({
+  value,
+  onChange,
+}: {
+  value?: string[];
+  onChange?: (tags: string[]) => void;
+}) => {
+  const [inputValue, setInputValue] = useState('');
+  const [inputVisible, setInputVisible] = useState(false);
+  const [tags, setTags] = useState<string[]>([]);
+  const saveInputRef = useRef<any>();
+
+  const handleClose = (removedTag: string) => {
+    const _tags = tags.filter((tag) => tag !== removedTag);
+    setTags(_tags);
+    onChange?.(_tags);
+  };
+
+  const showInput = () => {
+    setInputVisible(true);
+  };
+
+  const handleInputChange = (e) => {
+    setInputValue(e.target.value);
+  };
+
+  const handleInputConfirm = () => {
+    if (inputValue && !tags.includes(inputValue)) {
+      setTags([...tags, inputValue]);
+      onChange?.([...tags, inputValue]);
+    }
+    setInputVisible(false);
+    setInputValue('');
+  };
+
+  const tagChild = tags.map((tag) => {
+    const tagElem = (
+      <Tag
+        closable
+        onClose={(e) => {
+          e.preventDefault();
+          handleClose(tag);
+        }}
+      >
+        {tag}
+      </Tag>
+    );
+    return (
+      <span key={tag} style={{ display: 'inline-block', marginBottom: 8 }}>
+        {tagElem}
+      </span>
+    );
+  });
+
+  useEffect(() => {
+    if (inputVisible && saveInputRef) {
+      saveInputRef.current.focus();
+    }
+  }, [inputVisible]);
+
+  useEffect(() => {
+    if (value) {
+      setTags(value);
+    }
+  }, [value]);
+
+  return (
+    <>
+      <TweenOneGroup
+        enter={{
+          scale: 0.8,
+          opacity: 0,
+          type: 'from',
+          duration: 100,
+        }}
+        leave={{ opacity: 0, width: 0, scale: 0, duration: 200 }}
+        appear={false}
+      >
+        {tagChild}
+      </TweenOneGroup>
+      {inputVisible && (
+        <Input
+          ref={saveInputRef}
+          type="text"
+          size="small"
+          style={{ width: 78 }}
+          value={inputValue}
+          onChange={handleInputChange}
+          onBlur={handleInputConfirm}
+          onPressEnter={handleInputConfirm}
+        />
+      )}
+      {!inputVisible && (
+        <Tag
+          onClick={showInput}
+          style={{ borderStyle: 'dashed', cursor: 'pointer' }}
+        >
+          <PlusOutlined /> 新建
+        </Tag>
+      )}
+    </>
+  );
+};
+
+export default EditableTagGroup;

src/components/terminal.tsx

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

src/layouts/defaultProps.tsx

@@ -7,7 +7,9 @@ import {
   FolderOutlined,
   RadiusSettingOutlined,
   ControlOutlined,
+  ContainerOutlined,
 } from '@ant-design/icons';
+import IconFont from '@/components/iconfont';
 
 export default {
   route: {
@@ -18,40 +20,64 @@ export default {
         hideInMenu: true,
         component: '@/pages/login/index',
       },
+      {
+        name: '初始化',
+        path: '/initialization',
+        hideInMenu: true,
+        component: '@/pages/initialization/index',
+      },
+      {
+        name: '错误',
+        path: '/error',
+        hideInMenu: true,
+        component: '@/pages/error/index',
+      },
       {
         path: '/crontab',
         name: '定时任务',
-        icon: <FieldTimeOutlined />,
+        icon: <IconFont type="ql-icon-crontab" />,
         component: '@/pages/crontab/index',
       },
+      {
+        path: '/subscription',
+        name: '订阅管理',
+        icon: <IconFont type="ql-icon-subs" />,
+        component: '@/pages/subscription/index',
+      },
       {
         path: '/env',
         name: '环境变量',
-        icon: <RadiusSettingOutlined />,
+        icon: <IconFont type="ql-icon-env" />,
         component: '@/pages/env/index',
       },
       {
         path: '/config',
         name: '配置文件',
-        icon: <ControlOutlined />,
+        icon: <IconFont type="ql-icon-config" />,
         component: '@/pages/config/index',
       },
       {
         path: '/script',
         name: '脚本管理',
-        icon: <FormOutlined />,
+        icon: <IconFont type="ql-icon-script" />,
         component: '@/pages/script/index',
       },
+      {
+        path: '/dependence',
+        name: '依赖管理',
+        icon: <IconFont type="ql-icon-dependence" />,
+        component: '@/pages/dependence/index',
+      },
       {
         path: '/diff',
         name: '对比工具',
-        icon: <DiffOutlined />,
+        icon: <IconFont type="ql-icon-diff" />,
         component: '@/pages/diff/index',
       },
       {
         path: '/log',
         name: '任务日志',
-        icon: <FolderOutlined />,
+        icon: <IconFont type="ql-icon-log" />,
         component: '@/pages/log/index',
       },
       {
@@ -62,12 +88,9 @@ export default {
       },
     ],
   },
-  location: {
-    pathname: '/',
-  },
   navTheme: 'light',
   fixSiderbar: true,
   contentWidth: 'Fixed',
   splitMenus: false,
-  logo: 'https://qinglong.whyour.cn/qinglong.png',
+  siderWidth: 180,
 } as any;

src/layouts/index.less

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

src/layouts/index.tsx

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

src/pages/config/index.tsx

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

src/pages/crontab/detail.tsx

@@ -0,0 +1,558 @@
+import React, { useEffect, useRef, useState } from 'react';
+import {
+  Modal,
+  message,
+  Input,
+  Form,
+  Button,
+  Card,
+  Tag,
+  List,
+  Divider,
+  Typography,
+  Tooltip,
+} from 'antd';
+import {
+  ClockCircleOutlined,
+  CloseCircleOutlined,
+  FieldTimeOutlined,
+  Loading3QuartersOutlined,
+  FileOutlined,
+  PlayCircleOutlined,
+  PauseCircleOutlined,
+} 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';
+import IconFont from '@/components/iconfont';
+
+const { Text } = Typography;
+
+const tabList = [
+  {
+    key: 'log',
+    tab: '日志',
+  },
+  {
+    key: 'script',
+    tab: '脚本',
+  },
+];
+const LangMap: any = {
+  '.py': 'python',
+  '.js': 'javascript',
+  '.sh': 'shell',
+  '.ts': 'typescript',
+};
+
+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 [currentCron, setCurrentCron] = useState<any>({});
+
+  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: scriptInfo.filename && (
+      <Editor
+        language={LangMap[scriptInfo.filename.slice(-3)] || ''}
+        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', currentCron.id);
+    setLogUrl(
+      `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+    );
+    request
+      .get(
+        `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+      )
+      .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');
+      },
+    });
+  };
+
+  const runCron = () => {
+    Modal.confirm({
+      title: '确认运行',
+      content: (
+        <>
+          确认运行定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {currentCron.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}crons/run`, { data: [currentCron.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              setCurrentCron({ ...currentCron, status: CrontabStatus.running });
+              setTimeout(() => {
+                getLogs();
+              }, 1000);
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const stopCron = () => {
+    Modal.confirm({
+      title: '确认停止',
+      content: (
+        <>
+          确认停止定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {currentCron.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}crons/stop`, { data: [currentCron.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              setCurrentCron({ ...currentCron, status: CrontabStatus.idle });
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const enabledOrDisabledCron = () => {
+    Modal.confirm({
+      title: `确认${currentCron.isDisabled === 1 ? '启用' : '禁用'}`,
+      content: (
+        <>
+          确认{currentCron.isDisabled === 1 ? '启用' : '禁用'}
+          定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {currentCron.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(
+            `${config.apiPrefix}crons/${
+              currentCron.isDisabled === 1 ? 'enable' : 'disable'
+            }`,
+            {
+              data: [currentCron.id],
+            },
+          )
+          .then((data: any) => {
+            if (data.code === 200) {
+              setCurrentCron({
+                ...currentCron,
+                isDisabled: currentCron.isDisabled === 1 ? 0 : 1,
+              });
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const pinOrUnPinCron = () => {
+    Modal.confirm({
+      title: `确认${currentCron.isPinned === 1 ? '取消置顶' : '置顶'}`,
+      content: (
+        <>
+          确认{currentCron.isPinned === 1 ? '取消置顶' : '置顶'}
+          定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {currentCron.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(
+            `${config.apiPrefix}crons/${
+              currentCron.isPinned === 1 ? 'unpin' : 'pin'
+            }`,
+            {
+              data: [currentCron.id],
+            },
+          )
+          .then((data: any) => {
+            if (data.code === 200) {
+              setCurrentCron({
+                ...currentCron,
+                isPinned: currentCron.isPinned === 1 ? 0 : 1,
+              });
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  useEffect(() => {
+    if (cron && cron.id) {
+      setCurrentCron(cron);
+      getLogs();
+      getScript();
+    }
+  }, [cron]);
+
+  return (
+    <Modal
+      title={
+        <div className="crontab-title-wrapper">
+          <div>
+            <span>{currentCron.name}</span>
+            {currentCron.labels?.length > 0 && currentCron.labels[0] !== '' && (
+              <Divider type="vertical"></Divider>
+            )}
+            {currentCron.labels?.length > 0 &&
+              currentCron.labels[0] !== '' &&
+              currentCron.labels?.map((label: string, i: number) => (
+                <Tag color="blue" style={{ marginRight: 5 }}>
+                  {label}
+                </Tag>
+              ))}
+          </div>
+
+          <div className="operations">
+            <Tooltip
+              title={
+                currentCron.status === CrontabStatus.idle ? '运行' : '停止'
+              }
+            >
+              <Button
+                type="link"
+                icon={
+                  currentCron.status === CrontabStatus.idle ? (
+                    <PlayCircleOutlined />
+                  ) : (
+                    <PauseCircleOutlined />
+                  )
+                }
+                size="small"
+                onClick={
+                  currentCron.status === CrontabStatus.idle ? runCron : stopCron
+                }
+              />
+            </Tooltip>
+            <Tooltip title={currentCron.isDisabled === 1 ? '启用' : '禁用'}>
+              <Button
+                type="link"
+                icon={
+                  <IconFont
+                    type={
+                      currentCron.isDisabled === 1
+                        ? 'ql-icon-enable'
+                        : 'ql-icon-disable'
+                    }
+                  />
+                }
+                size="small"
+                onClick={enabledOrDisabledCron}
+              />
+            </Tooltip>
+            <Tooltip title={currentCron.isPinned === 1 ? '取消置顶' : '置顶'}>
+              <Button
+                type="link"
+                icon={
+                  <IconFont
+                    type={
+                      currentCron.isPinned === 1
+                        ? 'ql-icon-untop'
+                        : 'ql-icon-top'
+                    }
+                  />
+                }
+                size="small"
+                onClick={pinOrUnPinCron}
+              />
+            </Tooltip>
+          </div>
+        </div>
+      }
+      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">{currentCron.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">
+              {(!currentCron.isDisabled ||
+                currentCron.status !== CrontabStatus.idle) && (
+                <>
+                  {currentCron.status === CrontabStatus.idle && (
+                    <Tag icon={<ClockCircleOutlined />} color="default">
+                      空闲中
+                    </Tag>
+                  )}
+                  {currentCron.status === CrontabStatus.running && (
+                    <Tag
+                      icon={<Loading3QuartersOutlined spin />}
+                      color="processing"
+                    >
+                      运行中
+                    </Tag>
+                  )}
+                  {currentCron.status === CrontabStatus.queued && (
+                    <Tag icon={<FieldTimeOutlined />} color="default">
+                      队列中
+                    </Tag>
+                  )}
+                </>
+              )}
+              {currentCron.isDisabled === 1 &&
+                currentCron.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">{currentCron.schedule}</div>
+          </div>
+          <div className="cron-detail-info-item">
+            <div className="cron-detail-info-title">最后运行时间</div>
+            <div className="cron-detail-info-value">
+              {currentCron.last_execution_time
+                ? new Date(currentCron.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">
+              {currentCron.last_running_time
+                ? diffTime(currentCron.last_running_time)
+                : '-'}
+            </div>
+          </div>
+          <div className="cron-detail-info-item">
+            <div className="cron-detail-info-title">下次运行时间</div>
+            <div className="cron-detail-info-value">
+              {currentCron.nextRunTime &&
+                currentCron.nextRunTime
+                  .toLocaleString(language, {
+                    hour12: false,
+                  })
+                  .replace(' 24:', ' 00:')}
+            </div>
+          </div>
+        </Card>
+        <Card
+          style={{ marginTop: 10 }}
+          tabList={validTabs}
+          activeTabKey={activeTabKey}
+          onTabChange={(key) => {
+            onTabChange(key);
+          }}
+          tabBarExtraContent={
+            activeTabKey === 'script' && (
+              <Button
+                type="primary"
+                style={{ marginRight: 8 }}
+                onClick={saveFile}
+              >
+                保存
+              </Button>
+            )
+          }
+        >
+          {contentList[activeTabKey]}
+        </Card>
+      </div>
+      <CronLogModal
+        visible={isLogModalVisible}
+        handleCancel={() => {
+          setIsLogModalVisible(false);
+        }}
+        cron={cron}
+        data={log}
+        logUrl={logUrl}
+      />
+    </Modal>
+  );
+};
+
+export default CronDetailModal;

src/pages/crontab/index.less

@@ -0,0 +1,103 @@
+.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;
+    }
+  }
+
+  .crontab-title-wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-right: 32px;
+
+    .operations {
+      display: flex;
+      align-items: center;
+
+      .ant-btn:not(:first-child) {
+        margin-left: 8px;
+      }
+    }
+  }
+}
+
+.log-item {
+  cursor: pointer;
+  &:hover {
+    background: #fafafa;
+  }
+}