修复环境变量搜索

* 添加标签功能

.env.example

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,42 +0,0 @@
-name: "\U0001F41E Bug report"
-description: Create a report to help us improve
-body:
-  - type: input
-    id: version
-    attributes:
-      label: Qinglong version
-    validations:
-      required: true
-  - type: textarea
-    id: steps-to-reproduce
-    attributes:
-      label: Steps to reproduce
-      description: |
-        What do we need to do after opening your repro in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner. Note that you can use [Markdown](https://guides.github.com/features/mastering-markdown/) to format lists and code.
-      placeholder: Steps to reproduce
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: What is expected?
-    validations:
-      required: true
-  - type: textarea
-    id: actually-happening
-    attributes:
-      label: What is actually happening?
-    validations:
-      required: true
-  - type: textarea
-    id: system-info
-    attributes:
-      label: System Info
-      description: Output of `npx envinfo --system --binaries --browsers`
-      render: shell
-      placeholder: System, Binaries, Browsers
-  - type: textarea
-    id: additional-comments
-    attributes:
-      label: Any additional comments?
-      description: e.g. some background/context of how you ran into this bug.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Telegram Chat
-    url: https://t.me/jiao_long
-    about: Ask questions and discuss with other Qinglong users in real time.
-  - name: Questions & Discussions
-    url: https://github.com/whyour/qinglong/discussions/new?category=q-a
-    about: Use GitHub discussions for message-board style questions and discussions.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,40 +0,0 @@
-name: "\U0001F680 New feature proposal"
-description: Suggest an idea for this project
-labels: [":sparkles: feature request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for your interest in the project and taking the time to fill out this feature report!
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: Clear and concise description of the problem
-      description: "Explain your use case, context, and rationale behind this feature request. More importantly, what is the **end user experience** you are trying to build that led to the need for this feature?"
-    validations:
-      required: true
-  - type: textarea
-    id: suggested-solution
-    attributes:
-      label: Suggested solution
-      description: "In module [xy] we could provide following implementation..."
-    validations:
-      required: true
-  - type: textarea
-    id: alternative
-    attributes:
-      label: Alternative
-      description: Clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Any other context or screenshots about the feature request here.
-  - type: checkboxes
-    id: checkboxes
-    attributes:
-      label: Validations
-      description: Before submitting the issue, please make sure you do the following
-      options:
-        - label: Check that there isn't already an issue that request the same feature to avoid creating a duplicate.
-          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,31 +0,0 @@
-## PR Type
-What kind of change does this PR introduce?
-
-<!-- Please check the one that applies to this PR using "x". -->
-
-- [ ] Bugfix
-- [ ] Feature
-- [ ] Code style update (formatting, local variables)
-- [ ] Refactoring (no functional changes, no api changes)
-- [ ] Other... Please describe:
-
-
-## What is the current behavior?
-<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
-
-Issue Number: N/A
-
-
-## What is the new behavior?
-
-
-## Does this PR introduce a breaking change?
-
-- [ ] Yes
-- [ ] No
-
-
-<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
-
-
-## Other information

.github/config.yml

@@ -1,7 +0,0 @@
-# Comment to be posted to on PRs from first time contributors in your repository
-newPRWelcomeComment: |
-  💖 Thanks for opening this pull request! 💖
-  Please be patient and we will get back to you as soon as we can.
-# Comment to be posted to on pull requests merged by a first time user
-firstPRMergeComment: >
-  Congrats on merging your first pull request! 🎉🎉🎉

.github/workflows/build_docker_image.yml

@@ -5,85 +5,46 @@ on:
     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/
-    - cron: '00 14 * * *' # GMT 15:00 => 北京时间 23:00
+    # 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:
-  to_gitlab:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: pixta-dev/repository-mirroring-action@v1
-        with:
-          target_repo_url:
-            git@gitlab.com:whyour/qinglong.git
-          ssh_private_key:
-            ${{ secrets.GITLAB_SSH_PK }}
-  
-  to_gitee:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: pixta-dev/repository-mirroring-action@v1
-        with:
-          target_repo_url:
-            git@gitee.com:whyour/qinglong.git
-          ssh_private_key:
-            ${{ secrets.GITLAB_SSH_PK }}
-
   build-static:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v1
         with:
-          version: '8.3.1'
+          node-version: '14'
-
-      - uses: actions/setup-node@v3
-        with:
-          cache: 'pnpm'
 
       - name: build front and back
         run: |
-          pnpm install --frozen-lockfile
+          yarn install
-          pnpm build:front
+          yarn build
-          pnpm build:back
+          yarn build-back
 
       - name: copy to static repo
         env:
           GITHUB_REPO: github.com/${{ github.repository_owner }}/qinglong-static
           GITHUB_BRANCH: ${{ github.ref_name }}
-          REPO_GITEE: git@gitee.com:whyour/qinglong-static.git
-          REPO_GITLAB: git@gitlab.com:whyour/qinglong-static.git
-          PRIVATE_KEY: ${{ secrets.GITLAB_SSH_PK }}
         run: |
-          mkdir -p tmp
+          mkdir -p static
-          cd ./tmp
+          cd ./static
-          cp -rf ../static/* ./
+          cp -rf ../dist ./ && cp -rf ../build ./
           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}
 
-          mkdir -p ~/.ssh
-          echo "${PRIVATE_KEY}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-
-          export GIT_SSH_COMMAND="ssh -v -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -l git"
-          git remote add gitee "${REPO_GITEE}"
-          git remote add gitlab "${REPO_GITLAB}"
-          git push --force --quiet gitee ${GITHUB_BRANCH}:${GITHUB_BRANCH}
-          git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}
-
   build:
     needs: build-static
 
@@ -94,27 +55,26 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v1
         with:
-          version: '8.3.1'
+          node-version: '14'
-      - uses: actions/setup-node@v3
-        with:
-          cache: 'pnpm'
 
-      - name: Setup timezone
+      - name: Set time zone
-        uses: zcong1993/setup-timezone@master
+        uses: szenius/set-timezone@v1.0
         with:
-          timezone: Asia/Shanghai
+          timezoneLinux: "Asia/Shanghai"
+          timezoneMacos: "Asia/Shanghai"
+          timezoneWindows: "China Standard Time"
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -122,48 +82,37 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
         with:
           images: |
             ${{ github.repository }}
             ghcr.io/${{ github.repository }}
           # generate Docker tags based on the following events/attributes
           #   nightly, master, pr-2, 1.2.3, 1.2, 1
-          flavor: |
-            latest=false
           tags: |
             type=schedule,pattern=nightly
             type=edge
+            type=ref,event=branch
             type=ref,event=pr
-            type=ref,event=branch,enable=${{ github.ref != format('refs/heads/{0}', 'master') }}
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
-      
+
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2
         with:
           build-args: |
             MAINTAINER=${{ github.repository_owner }}
             QL_BRANCH=${{ github.ref_name }}
-            SOURCE_COMMIT=${{ github.sha }}
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
-          network: host
+          context: docker/
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
-          context: .
-          file: ./docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=whyour/qinglong:cache
-          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
-      
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/docker.yml

@@ -0,0 +1,31 @@
+name: PublishDockerImage
+on:
+  workflow_dispatch:
+
+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

@@ -4,12 +4,12 @@
 /node_modules
 /npm-debug.log*
 /yarn-error.log
-/yarn.lock
+/pnpm-lock.yaml
 /package-lock.json
 
 # production
-/static
+/dist
-/data
+/build
 
 # misc
 .DS_Store
@@ -28,5 +28,4 @@
 /db
 /manual_log
 /scripts
-/bak
+/bak
-/.tmp

.npmrc

@@ -1,2 +1 @@
-sentrycli_cdnurl=https://npmmirror.com/mirrors/sentry-cli/
+sentrycli_cdnurl=https://cdn.npm.taobao.org/dist/sentry-cli
-strict-peer-dependencies=false

.prettierignore

@@ -6,27 +6,3 @@ package.json
 .umi
 .umi-production
 .umi-test
-.history
-.tmp
-node_modules
-npm-debug.log*
-yarn-error.log
-yarn.lock
-package-lock.json
-static
-data
-DS_Store
-src/.umi
-src/.umi-production
-src/.umi-test
-.env.local
-.env
-history
-version.ts
-config
-log
-db
-manual_log
-scripts
-bak
-.tmp

.umirc.ts

@@ -1,34 +1,25 @@
-import { defineConfig } from '@umijs/max';
+import { defineConfig } from 'umi';
 const CompressionPlugin = require('compression-webpack-plugin');
 
-const baseUrl = process.env.QlBaseUrl || '/';
 export default defineConfig({
   hash: true,
-  jsMinifier: 'terser',
+  layout: false,
-  antd: {},
+  nodeModulesTransform: {
-  locale: {
+    type: 'none',
-    antd: true,
-    title: true,
-    baseNavigator: true,
   },
-  outputPath: 'static/dist',
+  fastRefresh: {},
-  fastRefresh: true,
+  dynamicImport: {
-  favicons: [`https://qn.whyour.cn/favicon.svg`],
+    loading: '@/components/pageLoading',
-  publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
+  },
+  favicon: '/images/g5.ico',
   proxy: {
-    [`${baseUrl}api/public`]: {
+    '/api': {
-      target: 'http://127.0.0.1:5400/',
-      changeOrigin: true,
-      pathRewrite: { [`^${baseUrl}api/public`]: '/api' },
-    },
-    [`${baseUrl}api`]: {
       target: 'http://127.0.0.1:5600/',
       changeOrigin: true,
       ws: true,
-      pathRewrite: { [`^${baseUrl}api`]: '/api' },
     },
   },
-  chainWebpack: ((config: any) => {
+  chainWebpack: (config) => {
     config.plugin('compression-webpack-plugin').use(
       new CompressionPlugin({
         algorithm: 'gzip',
@@ -37,14 +28,22 @@ export default defineConfig({
         minRatio: 0.6,
       }),
     );
-  }) as any,
+  },
   externals: {
     react: 'window.React',
     'react-dom': 'window.ReactDOM',
+    darkreader: 'window.DarkReader',
+    codemirror: 'window.CodeMirror',
+    'sockjs-client': 'window.SockJS',
   },
-  headScripts: [
+  scripts: [
-    `./api/env.js`,
+    'https://gw.alipayobjects.com/os/lib/react/16.13.1/umd/react.production.min.js',
-    'https://gw.alipayobjects.com/os/lib/react/18.2.0/umd/react.production.min.js',
+    'https://gw.alipayobjects.com/os/lib/react-dom/16.13.1/umd/react-dom.production.min.js',
-    'https://gw.alipayobjects.com/os/lib/react-dom/18.2.0/umd/react-dom.production.min.js',
+    'https://cdn.jsdelivr.net/npm/darkreader@4.9.40/darkreader.min.js',
+    'https://cdn.jsdelivr.net/npm/codemirror@5/lib/codemirror.min.js',
+    'https://cdn.jsdelivr.net/npm/codemirror@5/mode/shell/shell.js',
+    'https://cdn.jsdelivr.net/npm/codemirror@5/mode/python/python.js',
+    'https://cdn.jsdelivr.net/npm/codemirror@5/mode/javascript/javascript.js',
+    'https://cdn.jsdelivr.net/npm/sockjs-client@1/dist/sockjs.min.js',
   ],
 });

LICENSE

@@ -1,201 +1,22 @@
-                              Apache License
+MIT LICENSE
-                        Version 2.0, January 2004
-                    http://www.apache.org/licenses/
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) 2021-present whyour
 
-1. Definitions.
+Permission is hereby granted, free of charge, to any person obtaining
+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:
 
-  "License" shall mean the terms and conditions for use, reproduction,
+The above copyright notice and this permission notice shall be
-  and distribution as defined by Sections 1 through 9 of this document.
+included in all copies or substantial portions of the Software.
 
-  "Licensor" shall mean the copyright owner or entity authorized by
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  the copyright owner that is granting the License.
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  "Legal Entity" shall mean the union of the acting entity and all
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  other entities that control, are controlled by, or are under common
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  control with that entity. For the purposes of this definition,
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  "control" means (i) the power, direct or indirect, to cause the
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  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

@@ -1,195 +0,0 @@
-<div align="center">
-<img width="100" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
-
-<h1 align="center">Qinglong</h1>
-
-[简体中文](./README.md) | English
-
-Timed task management platform supporting Python3, JavaScript, Shell, Typescript
-
-[![npm version][npm-version-image]][npm-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]
-
-[npm-version-image]: https://img.shields.io/npm/v/@whyour/qinglong?style=flat
-[npm-version-url]: https://www.npmjs.com/package/@whyour/qinglong?activeTab=readme
-[docker-pulls-image]: https://img.shields.io/docker/pulls/whyour/qinglong?style=flat
-[docker-pulls-url]: https://hub.docker.com/r/whyour/qinglong
-[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
-
-[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
-
-[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
-</div>
-
-![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
-
-## 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
-
-## Version
-### docker
-
-The `latest` image is built on `alpine` and the `debian` image is built on `debian-slim`. If you need to use a dependency that is not supported by `alpine`, it is recommended that you use the `debian` image.
-
-```bash
-docker pull whyour/qinglong:latest
-docker pull whyour/qinglong:debian
-```
-
-### npm
-
-The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
-
-```bash
-npm i @whyour/qinglong
-```
-
-## Deployment
-
-### Docker (Recommended)
-
-```bash
-# curl -sSL get.docker.com | sh
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  -p 5700:5700 \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### Docker-compose (Recommended)
-
-```bash
-# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# start
-docker-compose up -d
-# stop
-docker-compose down
-```
-
-### Podman (Recommended)
-
-```bash
-# https://podman.io/getting-started/installation
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  -p 5700:5700 \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
-```
-
-### Local
-
-It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3 yourself
-
-```bash
-npm install -g @whyour/qinglong
-qinglong
-# Add the environment variables QL_DIR and QL_DATA_DIR when prompted
-export QL_DIR=""
-export QL_DATA_DIR=""
-# Run again
-qinglong
-```
-
-## 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>       
-# Set task timeout   
-task -m <max_time> <file_path>
-# Print task log in real time, no need to carry this parameter when creating timed tasks
-task -l <file_path>  
-```
-
-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
-* max_time: Timeout, suffix "s" for seconds (default), "m" for minutes, "h" for hours, "d" for days
-
-## 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@8.3.1
-$ pnpm install
-$ pnpm start
-```
-
-Open your browser and visit http://127.0.0.1:5700
-
-## 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/)
-- [Umijs](https://umijs.org)
-- [darkreader](https://github.com/darkreader/darkreader)
-- [admin-server](https://github.com/sunpu007/admin-server)
-
-## 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,31 +1,30 @@
-<div align="center">
+<p align="center">
-<img width="100" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
+  <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">青龙</h1>
 
-简体中文 | [English](./README-en.md)
+<div align="center">
 
-支持 Python3、JavaScript、Shell、Typescript 的定时任务管理平台
+支持python3、javaScript、shell、typescript 的定时任务管理面板（A timed task management panel that supports typescript, javaScript, python3, and shell.）
 
-Timed task management platform supporting 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]
 
-[![npm version][npm-version-image]][npm-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]
-
-[npm-version-image]: https://img.shields.io/npm/v/@whyour/qinglong?style=flat
-[npm-version-url]: https://www.npmjs.com/package/@whyour/qinglong?activeTab=readme
 [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
-
-[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
-
-[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>
 
-![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
+[![](https://z3.ax1x.com/2021/11/18/I7KrTg.jpg)](https://whyour.cn)
+
+简体中文 | [English](./README-en.md)
 
 ## 功能
 
@@ -37,47 +36,52 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - 支持暗黑模式
 - 支持手机端操作
 
-## 版本
-### docker
-
-`latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像
-
-```bash
-docker pull whyour/qinglong:latest
-docker pull whyour/qinglong:debian
-```
-
-### npm
-
-npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
-
-```bash
-npm i @whyour/qinglong
-```
-
 ## 部署
 
-### docker (推荐)
+### 本机部署
+
+```bash
+# 待完善
+```
+
+### docker 部署
+
+1. docker 安装
+
+```bash
+sudo curl -sSL get.docker.com | sh
+```
+
+2. 启动容器
 
 ```bash
-# curl -sSL get.docker.com | sh
 docker run -dit \
-  -v $PWD/ql/data:/ql/data \
+  -v $PWD/ql/config:/ql/config \
+  -v $PWD/ql/log:/ql/log \
+  -v $PWD/ql/db:/ql/db \
+  -v $PWD/ql/repo:/ql/repo \
+  -v $PWD/ql/raw:/ql/raw \
+  -v $PWD/ql/scripts:/ql/scripts \
   -p 5700:5700 \
-  # 部署路径非必须，以斜杠开头和结尾，比如 /test/
-  -e QlBaseUrl="/" \
   --name qinglong \
   --hostname qinglong \
   --restart unless-stopped \
   whyour/qinglong:latest
 ```
 
-### docker-compose (推荐)
+### 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
-#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
 mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker-compose.yml
 
 # 启动
 docker-compose up -d
@@ -85,35 +89,6 @@ docker-compose up -d
 docker-compose down
 ```
 
-### podman (推荐)
-
-```bash
-# https://podman.io/getting-started/installation
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  -p 5700:5700 \
-  # 部署路径非必须，以斜杠开头和结尾，比如 /test/
-  -e QlBaseUrl="/" \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
-```
-
-### 本机
-
-建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3
-
-```bash
-npm install -g @whyour/qinglong
-qinglong
-# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
-export QL_DIR=""
-export QL_DATA_DIR=""
-# 再次执行
-qinglong
-```
-
 ## 使用
 
 1. 内置命令
@@ -126,7 +101,7 @@ ql extra
 # 添加单个脚本文件
 ql raw <file_url>                                             
 # 添加单个仓库的指定脚本
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
 # 删除旧日志
 ql rmlog <days>                                              
 # 启动tg-bot
@@ -145,41 +120,21 @@ task <file_path> now
 # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
 task <file_path> conc <env_name> <account_number>(可选的) 
 # 指定账号执行，无论是否设置了随机延迟，均立即运行 
-task <file_path> desi <env_name> <account_number>      
+task <file_path> desi <env_name> <account_number>         
-# 设置任务超时时间   
-task -m <max_time> <file_path>
-# 实时打印任务日志，创建定时任务时，不用携带此参数
-task -l <file_path>
 ```
 
 2. 参数说明
 
 * file_url: 脚本地址
 * repo_url: 仓库地址
-* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
+* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串
-* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
+* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串
-* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
+* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响
-* extensions: 拉取仓库的文件后缀，多个竖线分割
 * branch: 拉取仓库的分支
 * days: 需要保留的日志的天数
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称
 * account_number: 任务执行时指定某个环境变量需要执行的账号序号
-* max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-
-## 开发
-
-```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@8.3.1
-$ pnpm install
-$ pnpm start
-```
-
-打开你的浏览器，访问 http://127.0.0.1:5700
 
 ## 链接
 
@@ -187,10 +142,27 @@ $ pnpm start
 - [crontab-ui](https://github.com/alseambusher/crontab-ui)
 - [Ant Design](https://ant.design)
 - [Ant Design Pro](https://pro.ant.design/)
-- [Umijs](https://umijs.org)
+- [Umijs3.0](https://umijs.org)
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)
 
+## 开发
+
+```bash
+$ git clone git@github.com:whyour/qinglong.git
+$ cd qinglong
+$ cp .env.example .env
+$ yarn install
+$ yarn start-back
+$ yarn start
+```
+
+打开你的浏览器，访问 http://127.0.0.1:5601
+
+## 交流
+
+[telegram频道](https://t.me/jiao_long)
+
 ## 名称来源
 
 青龙，又名苍龙，在中国传统文化中是四象之一、[天之四灵](https://zh.wikipedia.org/wiki/%E5%A4%A9%E4%B9%8B%E5%9B%9B%E7%81%B5)之一，根据五行学说，它是代表东方的灵兽，为青色的龙，五行属木，代表的季节是春季，八卦主震。苍龙与应龙一样，都是身具羽翼。《张果星宗》称“又有辅翼，方为真龙”。

back/api/config.ts

@@ -5,7 +5,6 @@ import { Logger } from 'winston';
 import config from '../config';
 import * as fs from 'fs';
 import { celebrate, Joi } from 'celebrate';
-import { join } from 'path';
 const route = Router();
 
 export default (app: Router) => {
@@ -26,6 +25,7 @@ export default (app: Router) => {
             }),
         });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -42,15 +42,16 @@ export default (app: Router) => {
         }
         if (req.params.file.includes('sample')) {
           content = getFileContentByName(
-            join(config.samplePath, req.params.file),
+            `${config.samplePath}${req.params.file}`,
           );
         } else {
           content = getFileContentByName(
-            join(config.configPath, req.params.file),
+            `${config.configPath}${req.params.file}`,
           );
         }
         res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -71,10 +72,11 @@ export default (app: Router) => {
         if (config.blackFileList.includes(name)) {
           res.send({ code: 403, message: '文件无法访问' });
         }
-        const path = join(config.configPath, name);
+        const path = `${config.configPath}${name}`;
         fs.writeFileSync(path, content);
         res.send({ code: 200, message: '保存成功' });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/cron.ts

@@ -2,7 +2,6 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import CronService from '../services/cron';
-import CronViewService from '../services/cronView';
 import { celebrate, Joi } from 'celebrate';
 import cron_parser from 'cron-parser';
 const route = Router();
@@ -10,141 +9,11 @@ const route = Router();
 export default (app: Router) => {
   app.use('/crons', route);
 
-  route.get(
-    '/views',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.list();
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.post(
-    '/views',
-    celebrate({
-      body: Joi.object({
-        name: Joi.string().required(),
-        sorts: Joi.array().optional().allow(null),
-        filters: Joi.array().optional(),
-        filterRelation: Joi.string().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.create(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/views',
-    celebrate({
-      body: Joi.object({
-        name: Joi.string().required(),
-        id: Joi.number().required(),
-        sorts: Joi.array().optional().allow(null),
-        filters: Joi.array().optional(),
-        filterRelation: Joi.string().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        if (req.body.type === 1) {
-          return res.send({ code: 400, message: '参数错误' });
-        } else {
-          const data = await cronViewService.update(req.body);
-          return res.send({ code: 200, data });
-        }
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.delete(
-    '/views',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.remove(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/views/move',
-    celebrate({
-      body: Joi.object({
-        fromIndex: Joi.number().required(),
-        toIndex: Joi.number().required(),
-        id: Joi.number().required(),
-      }),
-    }),
-    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.move(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/views/disable',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.disabled(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/views/enable',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.enabled(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
       const cronService = Container.get(CronService);
-      const data = await cronService.crontabs(req.query as any);
+      const data = await cronService.crontabs(req.query.searchValue as string);
       return res.send({ code: 200, data });
     } catch (e) {
       logger.error('🔥 error: %o', e);
@@ -152,21 +21,6 @@ export default (app: Router) => {
     }
   });
 
-  route.get(
-    '/detail',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const cronService = Container.get(CronService);
-        const data = await cronService.find(req.query as any);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
   route.post(
     '/',
     celebrate({
@@ -175,7 +29,6 @@ export default (app: Router) => {
         schedule: Joi.string().required(),
         name: Joi.string().optional(),
         labels: Joi.array().optional(),
-        sub_id: Joi.number().optional().allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -189,6 +42,7 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -206,6 +60,7 @@ export default (app: Router) => {
         const data = await cronService.run(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -223,6 +78,7 @@ export default (app: Router) => {
         const data = await cronService.stop(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -246,6 +102,7 @@ export default (app: Router) => {
         );
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -266,6 +123,7 @@ export default (app: Router) => {
         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);
       }
     },
@@ -283,6 +141,7 @@ export default (app: Router) => {
         const data = await cronService.disabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -300,6 +159,7 @@ export default (app: Router) => {
         const data = await cronService.enabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -319,6 +179,7 @@ export default (app: Router) => {
         const data = await cronService.log(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -329,10 +190,9 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         labels: Joi.array().optional().allow(null),
-        command: Joi.string().required(),
+        command: Joi.string().optional(),
-        schedule: Joi.string().required(),
+        schedule: Joi.string().optional(),
-        name: Joi.string().optional().allow(null),
+        name: Joi.string().optional(),
-        sub_id: Joi.number().optional().allow(null),
         id: Joi.number().required(),
       }),
     }),
@@ -350,6 +210,7 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -367,6 +228,7 @@ export default (app: Router) => {
         const data = await cronService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -384,6 +246,7 @@ export default (app: Router) => {
         const data = await cronService.pin(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -401,6 +264,7 @@ export default (app: Router) => {
         const data = await cronService.unPin(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -415,6 +279,7 @@ export default (app: Router) => {
         const data = await cronService.import_crontab();
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -434,6 +299,7 @@ export default (app: Router) => {
         const data = await cronService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -445,10 +311,10 @@ export default (app: Router) => {
       body: Joi.object({
         ids: Joi.array().items(Joi.number().required()),
         status: Joi.string().required(),
-        pid: Joi.string().optional().allow(null),
+        pid: Joi.string().optional(),
-        log_path: Joi.string().optional().allow(null),
+        log_path: Joi.string().optional(),
-        last_running_time: Joi.number().optional().allow(null),
+        last_running_time: Joi.number().optional(),
-        last_execution_time: Joi.number().optional().allow(null),
+        last_execution_time: Joi.number().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -462,25 +328,7 @@ export default (app: Router) => {
         });
         return res.send({ code: 200, data });
       } catch (e) {
-        return next(e);
+        logger.error('🔥 error: %o', 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 cronService = Container.get(CronService);
-        const data = await cronService.logs(req.params.id);
-        return res.send({ code: 200, data });
-      } catch (e) {
         return next(e);
       }
     },

back/api/dependence.ts

@@ -38,6 +38,7 @@ export default (app: Router) => {
         const data = await dependenceService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -60,6 +61,7 @@ export default (app: Router) => {
         const data = await dependenceService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -77,6 +79,7 @@ export default (app: Router) => {
         const data = await dependenceService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -91,9 +94,10 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const dependenceService = Container.get(DependenceService);
-        const data = await dependenceService.remove(req.body, true);
+        const data = await dependenceService.removeDb(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -113,6 +117,7 @@ export default (app: Router) => {
         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);
       }
     },
@@ -130,6 +135,7 @@ export default (app: Router) => {
         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

@@ -3,22 +3,8 @@ import { Container } from 'typedi';
 import EnvService from '../services/env';
 import { Logger } from 'winston';
 import { celebrate, Joi } from 'celebrate';
-import multer from 'multer';
-import config from '../config';
-import fs from 'fs';
-import { safeJSONParse } from '../config/util';
 const route = Router();
 
-const storage = multer.diskStorage({
-  destination: function (req, file, cb) {
-    cb(null, config.scriptPath);
-  },
-  filename: function (req, file, cb) {
-    cb(null, file.originalname);
-  },
-});
-const upload = multer({ storage: storage });
-
 export default (app: Router) => {
   app.use('/envs', route);
 
@@ -40,9 +26,7 @@ export default (app: Router) => {
       body: Joi.array().items(
         Joi.object({
           value: Joi.string().required(),
-          name: Joi.string()
+          name: Joi.string().required(),
-            .required()
-            .pattern(/^[a-zA-Z_][0-9a-zA-Z_]*$/),
           remarks: Joi.string().optional().allow(''),
         }),
       ),
@@ -54,6 +38,7 @@ export default (app: Router) => {
         const data = await envService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -76,6 +61,7 @@ export default (app: Router) => {
         const data = await envService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -93,6 +79,7 @@ export default (app: Router) => {
         const data = await envService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -110,11 +97,13 @@ export default (app: Router) => {
       }),
     }),
     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.move(req.params.id, req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -132,6 +121,7 @@ export default (app: Router) => {
         const data = await envService.disabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -149,6 +139,7 @@ export default (app: Router) => {
         const data = await envService.enabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -169,6 +160,7 @@ export default (app: Router) => {
         const data = await envService.updateNames(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -185,42 +177,10 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
-        const data = await envService.getDb({ id: req.params.id });
+        const data = await envService.getDb(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
-        return next(e);
+        logger.error('🔥 error: %o', e);
-      }
-    },
-  );
-
-  route.post(
-    '/upload',
-    upload.single('env'),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const envService = Container.get(EnvService);
-        const fileContent = await fs.promises.readFile(req!.file!.path, 'utf8');
-        const parseContent = safeJSONParse(fileContent);
-        const data = Array.isArray(parseContent)
-          ? parseContent
-          : [parseContent];
-        if (data.every((x) => x.name && x.value)) {
-          const result = await envService.create(
-            data.map((x) => ({
-              name: x.name,
-              value: x.value,
-              remarks: x.remarks,
-            })),
-          );
-          return res.send({ code: 200, data: result });
-        } else {
-          return res.send({
-            code: 400,
-            message: '文件缺少name或者value字段，参考导出文件格式',
-          });
-        }
-      } catch (e) {
         return next(e);
       }
     },

back/api/index.ts

@@ -8,7 +8,6 @@ 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();
@@ -21,7 +20,6 @@ export default () => {
   open(app);
   dependence(app);
   system(app);
-  subscription(app);
 
   return app;
 };

back/api/log.ts

@@ -3,11 +3,8 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { emptyDir, getFileContentByName, readDirs } from '../config/util';
+import { getFileContentByName } from '../config/util';
-import { join } from 'path';
-import { celebrate, Joi } from 'celebrate';
 const route = Router();
-const blacklist = ['.tmp'];
 
 export default (app: Router) => {
   app.use('/logs', route);
@@ -15,11 +12,29 @@ export default (app: Router) => {
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
-      const result = readDirs(config.logPath, config.logPath, blacklist);
+      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()) {
+          const fileListTmp = fs.readdirSync(
+            `${config.logPath}/${fileList[i]}`,
+            '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);
@@ -27,50 +42,32 @@ export default (app: Router) => {
   });
 
   route.get(
-    '/:file',
+    '/:dir/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        if (blacklist.includes(req.path)) {
+        const { dir, file } = req.params;
-          return res.send({ code: 403, message: '暂无权限' });
+        const content = getFileContentByName(
-        }
+          `${config.logPath}/${dir}/${file}`,
-        const filePath = join(
-          config.logPath,
-          (req.query.path || '') as string,
-          req.params.file,
         );
-        const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
   );
 
-  route.delete(
+  route.get(
-    '/',
+    '/:file',
-    celebrate({
-      body: Joi.object({
-        filename: Joi.string().required(),
-        path: Joi.string().allow(''),
-        type: Joi.string().optional(),
-      }),
-    }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, type } = req.body as {
+        const { file } = req.params;
-          filename: string;
+        const content = getFileContentByName(`${config.logPath}/${file}`);
-          path: string;
+        res.send({ code: 200, data: content });
-          type: string;
-        };
-        const filePath = join(config.logPath, path, filename);
-        if (type === 'directory') {
-          emptyDir(filePath);
-        } else {
-          fs.unlinkSync(filePath);
-        }
-        res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/open.ts

@@ -16,6 +16,7 @@ export default (app: Router) => {
         const data = await openService.list();
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -25,7 +26,7 @@ export default (app: Router) => {
     '/apps',
     celebrate({
       body: Joi.object({
-        name: Joi.string().optional().allow('').disallow('system'),
+        name: Joi.string().optional().allow(''),
         scopes: Joi.array().items(Joi.string().required()),
       }),
     }),
@@ -36,6 +37,7 @@ export default (app: Router) => {
         const data = await openService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -57,6 +59,7 @@ export default (app: Router) => {
         const data = await openService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -74,6 +77,7 @@ export default (app: Router) => {
         const data = await openService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -93,6 +97,7 @@ export default (app: Router) => {
         const data = await openService.resetSecret(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -113,6 +118,7 @@ export default (app: Router) => {
         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,10 +1,7 @@
 import {
   fileExist,
   getFileContentByName,
-  readDirs,
   getLastModifyFilePath,
-  readDir,
-  emptyDir,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
@@ -12,47 +9,75 @@ import { Logger } from 'winston';
 import config from '../config';
 import * as fs from 'fs';
 import { celebrate, Joi } from 'celebrate';
-import path, { join, parse } from 'path';
+import path, { join } from 'path';
 import ScriptService from '../services/script';
-import multer from 'multer';
 const route = Router();
 
-const storage = multer.diskStorage({
-  destination: function (req, file, cb) {
-    cb(null, config.scriptPath);
-  },
-  filename: function (req, file, cb) {
-    cb(null, file.originalname);
-  },
-});
-const upload = multer({ storage: storage });
-
 export default (app: Router) => {
   app.use('/scripts', route);
 
-  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
+  route.get(
-    const logger: Logger = Container.get('logger');
+    '/files',
-    try {
+    async (req: Request, res: Response, next: NextFunction) => {
-      let result = [];
+      const logger: Logger = Container.get('logger');
-      const blacklist = ['node_modules', '.git'];
+      try {
-      if (req.query.path) {
+        const fileList = fs.readdirSync(config.scriptPath, 'utf-8');
-        const targetPath = path.join(
+
-          config.scriptPath,
+        let result = [];
-          req.query.path as string,
+        for (let i = 0; i < fileList.length; i++) {
-        );
+          const fileOrDir = fileList[i];
-        result = readDir(targetPath, config.scriptPath, blacklist);
+          const fPath = path.join(config.scriptPath, fileOrDir);
-      } else {
+          const dirStat = fs.statSync(fPath);
-        result = readDirs(config.scriptPath, config.scriptPath, blacklist);
+          if (['node_modules'].includes(fileOrDir)) {
+            continue;
+          }
+
+          if (dirStat.isDirectory()) {
+            const childFileList = fs.readdirSync(fPath, 'utf-8');
+            let children = [];
+            for (let j = 0; j < childFileList.length; j++) {
+              const childFile = childFileList[j];
+              const sPath = path.join(config.scriptPath, fileOrDir, childFile);
+              const _fileExist = await fileExist(sPath);
+              if (_fileExist && fs.statSync(sPath).isFile()) {
+                const statObj = fs.statSync(sPath);
+                children.push({
+                  title: childFile,
+                  value: childFile,
+                  key: `${fileOrDir}/${childFile}`,
+                  mtime: statObj.mtimeMs,
+                  parent: fileOrDir,
+                });
+              }
+            }
+            result.push({
+              title: fileOrDir,
+              value: fileOrDir,
+              key: fileOrDir,
+              mtime: dirStat.mtimeMs,
+              disabled: true,
+              children: children.sort((a, b) => b.mtime - a.mtime),
+            });
+          } else {
+            result.push({
+              title: fileOrDir,
+              value: fileOrDir,
+              key: fileOrDir,
+              mtime: dirStat.mtimeMs,
+            });
+          }
+        }
+
+        res.send({
+          code: 200,
+          data: result,
+        });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
       }
-      res.send({
+    },
-        code: 200,
+  );
-        data: result,
-      });
-    } catch (e) {
-      logger.error('🔥 error: %o', e);
-      return next(e);
-    }
-  });
 
   route.get(
     '/:file',
@@ -67,6 +92,7 @@ export default (app: Router) => {
         const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -74,19 +100,23 @@ export default (app: Router) => {
 
   route.post(
     '/',
-    upload.single('file'),
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().optional().allow(''),
+        content: Joi.string().allow(''),
+        originFilename: Joi.string().allow(''),
+      }),
+    }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, content, originFilename, directory } =
+        let { filename, path, content, originFilename } = req.body as {
-          req.body as {
+          filename: string;
-            filename: string;
+          path: string;
-            path: string;
+          content: string;
-            content: string;
+          originFilename: string;
-            originFilename: string;
+        };
-            directory: string;
-          };
-
         if (!path) {
           path = config.scriptPath;
         }
@@ -94,37 +124,26 @@ export default (app: Router) => {
           path += '/';
         }
         if (!path.startsWith('/')) {
-          path = join(config.scriptPath, path);
+          path = `${config.scriptPath}${path}`;
         }
         if (config.writePathList.every((x) => !path.startsWith(x))) {
           return res.send({
             code: 430,
-            message: '文件路径禁止访问',
+            data: '文件路径禁止访问',
           });
         }
-
-        if (req.file) {
-          fs.renameSync(req.file.path, join(path, req.file.filename));
-          return res.send({ code: 200 });
-        }
-
-        if (directory) {
-          fs.mkdirSync(join(path, directory), { recursive: true });
-          return res.send({ code: 200 });
-        }
-
         if (!originFilename) {
           originFilename = filename;
         }
-        const originFilePath = join(
+        const originFilePath = `${path}${originFilename.replace(/\//g, '')}`;
-          path,
+        const filePath = `${path}${filename.replace(/\//g, '')}`;
-          `${originFilename.replace(/\//g, '')}`,
-        );
-        const filePath = join(path, `${filename.replace(/\//g, '')}`);
         if (fs.existsSync(originFilePath)) {
+          if (!fs.existsSync(config.bakPath)) {
+            fs.mkdirSync(config.bakPath);
+          }
           fs.copyFileSync(
             originFilePath,
-            join(config.bakPath, originFilename.replace(/\//g, '')),
+            `${config.bakPath}${originFilename.replace(/\//g, '')}`,
           );
           if (filename !== originFilename) {
             fs.unlinkSync(originFilePath);
@@ -133,6 +152,7 @@ export default (app: Router) => {
         fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -144,7 +164,7 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().optional().allow(''),
-        content: Joi.string().required().allow(''),
+        content: Joi.string().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -159,6 +179,7 @@ export default (app: Router) => {
         fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -170,25 +191,20 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().allow(''),
-        type: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, type } = req.body as {
+        let { filename, path } = req.body as {
           filename: string;
           path: string;
-          type: string;
         };
         const filePath = join(config.scriptPath, path, filename);
-        if (type === 'directory') {
+        fs.unlinkSync(filePath);
-          emptyDir(filePath);
-        } else {
-          fs.unlinkSync(filePath);
-        }
         res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -207,7 +223,7 @@ export default (app: Router) => {
         let { filename } = req.body as {
           filename: string;
         };
-        const filePath = join(config.scriptPath, filename);
+        const filePath = `${config.scriptPath}${filename}`;
         // const stats = fs.statSync(filePath);
         // res.set({
         //   'Content-Type': 'application/octet-stream', //告诉浏览器这是一个二进制文件
@@ -219,6 +235,7 @@ export default (app: Router) => {
           return next(err);
         });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -229,22 +246,22 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
-        content: Joi.string().optional().allow(''),
         path: Joi.string().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, content, path } = req.body;
+        let { filename, path } = req.body as {
-        const { name, ext } = parse(filename);
+          filename: string;
-        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
+          path: string;
-        fs.writeFileSync(filePath, content || '', { encoding: 'utf8' });
+        };
-
+        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);
       }
     },
@@ -256,49 +273,21 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().optional().allow(''),
-        pid: Joi.number().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, pid } = req.body;
+        let { filename, path } = req.body as {
-        const { name, ext } = parse(filename);
-        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
-        const logPath = join(config.logPath, path, `${name}.swap`);
-
-        const scriptService = Container.get(ScriptService);
-        const result = await scriptService.stopScript(filePath, pid);
-        emptyDir(logPath);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/rename',
-    celebrate({
-      body: Joi.object({
-        filename: Joi.string().required(),
-        path: Joi.string().allow(''),
-        newFilename: Joi.string().required(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        let { filename, path, type, newFilename } = req.body as {
           filename: string;
           path: string;
-          type: string;
-          newFilename: string;
         };
-        const filePath = join(config.scriptPath, path, filename);
+        const filePath = join(path, filename);
-        const newPath = join(config.scriptPath, path, newFilename);
+        const scriptService = Container.get(ScriptService);
-        fs.renameSync(filePath, newPath);
+        const result = await scriptService.stopScript(filePath);
-        res.send({ code: 200 });
+        res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/subscription.ts

@@ -1,293 +0,0 @@
-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(),
-        proxy: Joi.string().optional().allow('').allow(null),
-        autoAddCron: Joi.boolean().optional().allow('').allow(null),
-        autoDelCron: Joi.boolean().optional().allow('').allow(null),
-      }),
-    }),
-    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) {
-        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) {
-        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) {
-        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) {
-        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) {
-        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) {
-        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(),
-        proxy: Joi.string().optional().allow('').allow(null),
-        autoAddCron: Joi.boolean().optional().allow('').allow(null),
-        autoDelCron: Joi.boolean().optional().allow('').allow(null),
-        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) {
-        return next(e);
-      }
-    },
-  );
-
-  route.delete(
-    '/',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-      query: Joi.object({
-        force: Joi.boolean().optional(),
-        t: Joi.number()
-      })
-    }),
-    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, req.query);
-        return res.send({ code: 200, data });
-      } catch (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) {
-        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) {
-        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) {
-        return next(e);
-      }
-    },
-  );
-};

back/api/system.ts

@@ -5,27 +5,9 @@ import * as fs from 'fs';
 import config from '../config';
 import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
+import { getFileContentByName } from '../config/util';
 import UserService from '../services/user';
-import { EnvModel } from '../data/env';
-import {
-  getUniqPath,
-  handleLogPath,
-  parseVersion,
-  promiseExec,
-} from '../config/util';
-import dayjs from 'dayjs';
-import multer from 'multer';
-
 const route = Router();
-const storage = multer.diskStorage({
-  destination: function (req, file, cb) {
-    cb(null, config.tmpPath);
-  },
-  filename: function (req, file, cb) {
-    cb(null, 'data.tgz');
-  },
-});
-const upload = multer({ storage: storage });
 
 export default (app: Router) => {
   app.use('/system', route);
@@ -35,14 +17,18 @@ export default (app: Router) => {
     try {
       const userService = Container.get(UserService);
       const authInfo = await userService.getUserInfo();
-      const { version, changeLog, changeLogLink, publishTime } =
+      const envDbContent = getFileContentByName(config.envDbFile);
-        await parseVersion(config.versionFile);
+      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'
+        authInfo.password === 'admin' &&
+        envDbContent.length === 0
       ) {
         isInitialized = false;
       }
@@ -51,10 +37,6 @@ export default (app: Router) => {
         data: {
           isInitialized,
           version,
-          publishTime: dayjs(publishTime).unix(),
-          branch: process.env.QL_BRANCH || 'master',
-          changeLog,
-          changeLogLink,
         },
       });
     } catch (e) {
@@ -64,34 +46,37 @@ export default (app: Router) => {
   });
 
   route.get(
-    '/config',
+    '/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.getSystemConfig();
+        const data = await systemService.getLogRemoveFrequency();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
   );
 
   route.put(
-    '/config',
+    '/log/remove',
     celebrate({
       body: Joi.object({
-        logRemoveFrequency: Joi.number().optional().allow(null),
+        frequency: Joi.number().required(),
-        cronConcurrency: Joi.number().optional().allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         const systemService = Container.get(SystemService);
-        const result = await systemService.updateSystemConfig(req.body);
+        const result = await systemService.updateLogRemoveFrequency(
+          req.body.frequency,
+        );
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -106,6 +91,7 @@ export default (app: Router) => {
         const result = await systemService.checkUpdate();
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -120,149 +106,9 @@ export default (app: Router) => {
         const result = await systemService.updateSystem();
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
   );
-
-  route.put(
-    '/reload',
-    celebrate({
-      body: Joi.object({
-        type: 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.reloadSystem(req.body.type);
-        res.send(result);
-      } catch (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) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/command-run',
-    celebrate({
-      body: Joi.object({
-        command: Joi.string().required(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const command = req.body.command
-        const idStr = `cat ${config.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
-        let id = await promiseExec(idStr);
-        const uniqPath = await getUniqPath(command, id);
-        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
-        const logPath = `${uniqPath}/${logTime}.log`;
-        res.setHeader('Content-type', 'application/octet-stream');
-        await systemService.run(
-          { ...req.body, logPath },
-          {
-            onStart: async (cp, startTime) => {
-              res.setHeader('QL-Task-Pid', `${cp.pid}`);
-            },
-            onEnd: async (cp, endTime, diff) => {
-              res.end();
-            },
-            onError: async (message: string) => {
-              res.write(`\n${message}`);
-              const absolutePath = await handleLogPath(logPath);
-              fs.appendFileSync(absolutePath, `\n${message}`);
-            },
-            onLog: async (message: string) => {
-              res.write(`\n${message}`);
-              const absolutePath = await handleLogPath(logPath);
-              fs.appendFileSync(absolutePath, `\n${message}`);
-            },
-          },
-        );
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/command-stop',
-    celebrate({
-      body: Joi.object({
-        command: Joi.string().optional(),
-        pid: Joi.number().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.stop(req.body);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/data/export',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        await systemService.exportData(res);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/data/import',
-    upload.single('data'),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.importData();
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.get(
-    '/log',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        await systemService.getSystemLog(res);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
 };

back/api/user.ts

@@ -1,36 +1,18 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
+import * as fs from 'fs';
+import config from '../config';
 import UserService from '../services/user';
 import { celebrate, Joi } from 'celebrate';
-import multer from 'multer';
+import { getFileContentByName } from '../config/util';
-import path from 'path';
-import { v4 as uuidV4 } from 'uuid';
-import rateLimit from 'express-rate-limit';
-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',
-    rateLimit({
-      windowMs: 15 * 60 * 1000,
-      max: 100,
-    }),
     celebrate({
       body: Joi.object({
         username: Joi.string().required(),
@@ -44,6 +26,7 @@ export default (app: Router) => {
         const data = await userService.login({ ...req.body }, req);
         return res.send(data);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -58,6 +41,7 @@ export default (app: Router) => {
         await userService.logout(req.platform);
         res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -78,6 +62,7 @@ export default (app: Router) => {
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -92,7 +77,6 @@ export default (app: Router) => {
         code: 200,
         data: {
           username: authInfo.username,
-          avatar: authInfo.avatar,
           twoFactorActivated: authInfo.twoFactorActivated,
         },
       });
@@ -111,6 +95,7 @@ export default (app: Router) => {
         const data = await userService.initTwoFactor();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -130,6 +115,7 @@ export default (app: Router) => {
         const data = await userService.activeTwoFactor(req.body.code);
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -144,6 +130,7 @@ export default (app: Router) => {
         const data = await userService.deactiveTwoFactor();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -165,6 +152,7 @@ export default (app: Router) => {
         const data = await userService.twoFactorLogin(req.body, req);
         res.send(data);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -179,6 +167,7 @@ export default (app: Router) => {
         const data = await userService.getLoginLog();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -193,6 +182,7 @@ export default (app: Router) => {
         const data = await userService.getNotificationMode();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -207,6 +197,7 @@ export default (app: Router) => {
         const result = await userService.updateNotificationMode(req.body);
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -227,6 +218,7 @@ export default (app: Router) => {
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -241,21 +233,7 @@ export default (app: Router) => {
         const result = await userService.updateNotificationMode(req.body);
         res.send(result);
       } catch (e) {
-        return next(e);
+        logger.error('🔥 error: %o', 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) {
         return next(e);
       }
     },

back/app.ts

@@ -1,29 +1,32 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
+
 import config from './config';
+
 import express from 'express';
+
 import Logger from './loaders/logger';
-import path from 'path';
 
 async function startServer() {
   const app = express();
 
-  await require('./loaders/db').default();
-
   await require('./loaders/initFile').default();
 
   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.debug(`✌️ 后端服务启动成功！`);
+      Logger.info(`
-      console.debug(`✌️ 后端服务启动成功！`);
+      ################################################
-      process.send?.('ready');
+      🛡️  Server listening on port: ${config.port} 🛡️
+      ################################################
+    `);
     })
     .on('error', (err) => {
       Logger.error(err);
-      console.error(err);
       process.exit(1);
     });
 

back/config/const.ts

@@ -1,7 +0,0 @@
-export const LOG_END_SYMBOL = '　　　　　';
-
-export const TASK_COMMAND = 'task';
-export const QL_COMMAND = 'ql';
-
-export const TASK_PREFIX = `${TASK_COMMAND} `;
-export const QL_PREFIX = `${QL_COMMAND} `;

back/config/index.ts

@@ -1,61 +1,44 @@
 import dotenv from 'dotenv';
 import path from 'path';
-import { createRandomString } from './share';
+import { createRandomString } from './util';
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-if (!process.env.QL_DIR) {
+const lastVersionFile =
-  // 声明QL_DIR环境变量
+  'https://raw.githubusercontent.com/whyour/qinglong/master/src/version.ts';
-  let qlHomePath = path.join(__dirname, '../../');
-  // 生产环境
-  if (qlHomePath.endsWith('/static/')) {
-    qlHomePath = path.join(qlHomePath, '../');
-  }
-  process.env.QL_DIR = qlHomePath.replace(/\/$/g, '');
-}
 
-const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
+const envFound = dotenv.config();
-
+const rootPath = process.cwd();
-const rootPath = process.env.QL_DIR as string;
+const envFile = path.join(rootPath, 'config/env.sh');
-const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
+const confFile = path.join(rootPath, 'config/config.sh');
-
+const sampleFile = path.join(rootPath, 'sample/config.sample.sh');
-const dataPath = path.join(rootPath, 'data/');
+const crontabFile = path.join(rootPath, 'config/crontab.list');
-const shellPath = path.join(rootPath, 'shell/');
+const confBakDir = path.join(rootPath, 'config/bak/');
-const tmpPath = path.join(rootPath, '.tmp/');
+const authConfigFile = path.join(rootPath, 'config/auth.json');
+const extraFile = path.join(rootPath, 'config/extra.sh');
+const configPath = path.join(rootPath, 'config/');
+const scriptPath = path.join(rootPath, 'scripts/');
+const bakPath = path.join(rootPath, 'bak/');
 const samplePath = path.join(rootPath, 'sample/');
-const configPath = path.join(dataPath, 'config/');
+const logPath = path.join(rootPath, 'log/');
-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 sshdPath = path.join(dataPath, 'ssh.d/');
-const systemLogPath = path.join(dataPath, 'syslog/');
-
-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 versionFile = path.join(rootPath, 'version.yaml');
+const dbPath = path.join(rootPath, 'db/');
-const dataTgzFile = path.join(tmpPath, 'data.tgz');
+const cronDbFile = path.join(rootPath, 'db/crontab.db');
-const shareShellFile = path.join(shellPath, 'share.sh');
+const envDbFile = path.join(rootPath, 'db/env.db');
+const appDbFile = path.join(rootPath, 'db/app.db');
+const authDbFile = path.join(rootPath, 'db/auth.db');
+const dependenceDbFile = path.join(rootPath, 'db/dependence.db');
+const versionFile = path.join(rootPath, 'src/version.ts');
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");
 }
 
 export default {
-  port: parseInt(process.env.BACK_PORT as string, 10),
+  port: parseInt(process.env.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',
@@ -64,10 +47,6 @@ export default {
     prefix: '/api',
   },
   rootPath,
-  tmpPath,
-  dataPath,
-  dataTgzFile,
-  shareShellFile,
   configString,
   loginFaild,
   authError,
@@ -80,7 +59,11 @@ export default {
   confFile,
   envFile,
   dbPath,
-  uploadPath,
+  cronDbFile,
+  envDbFile,
+  appDbFile,
+  authDbFile,
+  dependenceDbFile,
   configPath,
   scriptPath,
   samplePath,
@@ -90,7 +73,6 @@ export default {
     'cookie.sh',
     'crontab.list',
     'env.sh',
-    'token.json',
   ],
   writePathList: [configPath, scriptPath],
   bakPath,
@@ -101,15 +83,7 @@ export default {
     '/api/system',
     '/api/user/init',
     '/api/user/notification/init',
-    '/open/user/login',
-    '/open/user/two-factor/login',
-    '/open/system',
-    '/open/user/init',
-    '/open/user/notification/init',
   ],
   versionFile,
   lastVersionFile,
-  sqliteFile,
-  sshdPath,
-  systemLogPath,
 };

back/config/serverEnv.ts

@@ -1,20 +0,0 @@
-import { Request, Response } from 'express';
-import { pick } from 'lodash';
-
-let pickedEnv: Record<string, string>;
-
-function getPickedEnv() {
-  if (pickedEnv) return pickedEnv;
-  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv']);
-  pickedEnv = picked as Record<string, string>;
-  return picked;
-}
-
-export function serveEnv(_req: Request, res: Response) {
-  res.type('.js');
-  res.send(
-    Object.entries(getPickedEnv())
-      .map(([k, v]) => `window.__ENV__${k}=${JSON.stringify(v)};`)
-      .join('\n'),
-  );
-}

back/config/share.ts

@@ -1,84 +0,0 @@
-export function createRandomString(min: number, max: number): string {
-  const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-  const english = [
-    'a',
-    'b',
-    'c',
-    'd',
-    'e',
-    'f',
-    'g',
-    'h',
-    'i',
-    'j',
-    'k',
-    'l',
-    'm',
-    'n',
-    'o',
-    'p',
-    'q',
-    'r',
-    's',
-    't',
-    'u',
-    'v',
-    'w',
-    'x',
-    'y',
-    'z',
-  ];
-  const ENGLISH = [
-    'A',
-    'B',
-    'C',
-    'D',
-    'E',
-    'F',
-    'G',
-    'H',
-    'I',
-    'J',
-    'K',
-    'L',
-    'M',
-    'N',
-    'O',
-    'P',
-    'Q',
-    'R',
-    'S',
-    'T',
-    'U',
-    'V',
-    'W',
-    'X',
-    'Y',
-    'Z',
-  ];
-  const special = ['-', '_'];
-  const config = num.concat(english).concat(ENGLISH).concat(special);
-
-  const arr = [];
-  arr.push(getOne(num));
-  arr.push(getOne(english));
-  arr.push(getOne(ENGLISH));
-  arr.push(getOne(special));
-
-  const len = min + Math.floor(Math.random() * (max - min + 1));
-
-  for (let i = 4; i < len; i++) {
-    arr.push(config[Math.floor(Math.random() * config.length)]);
-  }
-
-  const newArr = [];
-  for (let j = 0; j < len; j++) {
-    newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
-  }
-
-  function getOne(arr: any[]) {
-    return arr[Math.floor(Math.random() * arr.length)];
-  }
-
-  return newArr.join('');
-}

back/config/subscription.ts

@@ -1,44 +0,0 @@
-import { Subscription } from '../data/subscription';
-import isNil from 'lodash/isNil';
-
-export function 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 };
-}
-
-export function formatCommand(doc: Subscription, url?: string) {
-  let command = `SUB_ID=${doc.id} ql `;
-  let _url = url || formatUrl(doc).url;
-  const {
-    type,
-    whitelist,
-    blacklist,
-    dependences,
-    branch,
-    extensions,
-    proxy,
-    autoAddCron,
-    autoDelCron,
-  } = doc;
-  if (type === 'file') {
-    command += `raw "${_url}"`;
-  } else {
-    command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
-      dependences || ''
-    }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}" "${
-      isNil(autoAddCron) ? true : Boolean(autoAddCron)
-    }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
-  }
-  return command;
-}

back/config/util.ts

@@ -2,16 +2,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 import got from 'got';
 import iconv from 'iconv-lite';
-import { exec } from 'child_process';
-import FormData from 'form-data';
-import psTreeFun from 'pstree.remy';
-import { promisify } from 'util';
-import { load } from 'js-yaml';
-import config from './index';
-import { TASK_COMMAND } from './const';
-import Logger from '../loaders/logger';
-
-export * from './share';
 
 export function getFileContentByName(fileName: string) {
   if (fs.existsSync(fileName)) {
@@ -39,6 +29,91 @@ export function getLastModifyFilePath(dir: string) {
   return filePath;
 }
 
+export function createRandomString(min: number, max: number): string {
+  const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+  const english = [
+    'a',
+    'b',
+    'c',
+    'd',
+    'e',
+    'f',
+    'g',
+    'h',
+    'i',
+    'j',
+    'k',
+    'l',
+    'm',
+    'n',
+    'o',
+    'p',
+    'q',
+    'r',
+    's',
+    't',
+    'u',
+    'v',
+    'w',
+    'x',
+    'y',
+    'z',
+  ];
+  const ENGLISH = [
+    'A',
+    'B',
+    'C',
+    'D',
+    'E',
+    'F',
+    'G',
+    'H',
+    'I',
+    'J',
+    'K',
+    'L',
+    'M',
+    'N',
+    'O',
+    'P',
+    'Q',
+    'R',
+    'S',
+    'T',
+    'U',
+    'V',
+    'W',
+    'X',
+    'Y',
+    'Z',
+  ];
+  const special = ['-', '_'];
+  const config = num.concat(english).concat(ENGLISH).concat(special);
+
+  const arr = [];
+  arr.push(getOne(num));
+  arr.push(getOne(english));
+  arr.push(getOne(ENGLISH));
+  arr.push(getOne(special));
+
+  const len = min + Math.floor(Math.random() * (max - min + 1));
+
+  for (let i = 4; i < len; i++) {
+    arr.push(config[Math.floor(Math.random() * config.length)]);
+  }
+
+  const newArr = [];
+  for (let j = 0; j < len; j++) {
+    newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
+  }
+
+  function getOne(arr) {
+    return arr[Math.floor(Math.random() * arr.length)];
+  }
+
+  return newArr.join('');
+}
+
 export function getToken(req: any) {
   const { authorization = '' } = req.headers;
   if (authorization && authorization.split(' ')[0] === 'Bearer') {
@@ -157,26 +232,6 @@ export async function fileExist(file: any) {
   });
 }
 
-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 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;
-}
-
 export async function concurrentRun(
   fnList: Array<() => Promise<any>> = [],
   max = 5,
@@ -213,283 +268,3 @@ export async function concurrentRun(
 
   return replyList;
 }
-
-enum FileType {
-  'directory',
-  'file',
-}
-
-interface IFile {
-  title: string;
-  key: string;
-  type: 'directory' | 'file';
-  parent: string;
-  mtime: number;
-  size?: number;
-  children?: IFile[];
-}
-
-export function dirSort(a: IFile, b: IFile): number {
-  if (a.type !== b.type) {
-    return FileType[a.type] < FileType[b.type] ? -1 : 1
-  } else if (a.mtime !== b.mtime) {
-    return a.mtime > b.mtime ? -1 : 1
-  } else {
-    return 0;
-  }
-}
-
-export function readDirs(
-  dir: string,
-  baseDir: string = '',
-  blacklist: string[] = [],
-): IFile[] {
-  const relativePath = path.relative(baseDir, dir);
-  const files = fs.readdirSync(dir);
-  const result: IFile[] = files
-    .filter((x) => !blacklist.includes(x))
-    .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,
-          key,
-          type: 'directory',
-          parent: relativePath,
-          mtime: stats.mtime.getTime(),
-          children: readDirs(subPath, baseDir).sort(dirSort),
-        };
-      }
-      return {
-        title: file,
-        type: 'file',
-        isLeaf: true,
-        key,
-        parent: relativePath,
-        size: stats.size,
-        mtime: stats.mtime.getTime(),
-      };
-    });
-  return result.sort(dirSort);
-}
-
-export function readDir(
-  dir: string,
-  baseDir: string = '',
-  blacklist: string[] = [],
-) {
-  const relativePath = path.relative(baseDir, dir);
-  const files = fs.readdirSync(dir);
-  const result: any = files
-    .filter((x) => !blacklist.includes(x))
-    .map((file: string) => {
-      const subPath = path.join(dir, file);
-      const stats = fs.statSync(subPath);
-      const key = path.join(relativePath, file);
-      return {
-        title: file,
-        type: stats.isDirectory() ? 'directory' : 'file',
-        key,
-        parent: relativePath,
-      };
-    });
-  return result;
-}
-
-export function emptyDir(path: string) {
-  const files = fs.readdirSync(path);
-  files.forEach((file) => {
-    const filePath = `${path}/${file}`;
-    const stats = fs.statSync(filePath);
-    if (stats.isDirectory()) {
-      emptyDir(filePath);
-    } else {
-      fs.unlinkSync(filePath);
-    }
-  });
-  fs.rmdirSync(path);
-}
-
-export async function promiseExec(command: string): Promise<string> {
-  try {
-    const { stderr, stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
-    return stdout || stderr;
-  } catch (error) {
-    return JSON.stringify(error);
-  }
-}
-
-export async function promiseExecSuccess(command: string): Promise<string> {
-  try {
-    const { stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
-    return stdout || '';
-  } catch (error) {
-    return '';
-  }
-}
-
-export function parseHeaders(headers: string) {
-  if (!headers) return {};
-
-  const parsed: any = {};
-  let key;
-  let val;
-  let i;
-
-  headers &&
-    headers.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim().toLowerCase();
-      val = line.substring(i + 1).trim();
-
-      if (!key) {
-        return;
-      }
-
-      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
-    });
-
-  return parsed;
-}
-
-export function parseBody(
-  body: string,
-  contentType:
-    | 'application/json'
-    | 'multipart/form-data'
-    | 'application/x-www-form-urlencoded',
-) {
-  if (!body) return '';
-
-  const parsed: any = {};
-  let key;
-  let val;
-  let i;
-
-  body &&
-    body.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim().toLowerCase();
-      val = line.substring(i + 1).trim();
-
-      if (!key || parsed[key]) {
-        return;
-      }
-
-      try {
-        const jsonValue = JSON.parse(val);
-        parsed[key] = jsonValue;
-      } catch (error) {
-        parsed[key] = val;
-      }
-    });
-
-  switch (contentType) {
-    case 'multipart/form-data':
-      return Object.keys(parsed).reduce((p, c) => {
-        p.append(c, parsed[c]);
-        return p;
-      }, new FormData());
-    case 'application/x-www-form-urlencoded':
-      return Object.keys(parsed).reduce((p, c) => {
-        return p ? `${p}&${c}=${parsed[c]}` : `${c}=${parsed[c]}`;
-      });
-  }
-
-  return parsed;
-}
-
-export function psTree(pid: number): Promise<number[]> {
-  return new Promise((resolve, reject) => {
-    psTreeFun(pid, (err: any, pids: number[]) => {
-      if (err) {
-        reject(err);
-      }
-      resolve(pids.filter((x) => !isNaN(x)));
-    });
-  });
-}
-
-export async function killTask(pid: number) {
-  const pids = await psTree(pid);
-  // SIGINT 2 程序终止(interrupt)信号，不会打印额外信息
-  if (pids.length) {
-    try {
-      [pid, ...pids].forEach((x) => {
-        process.kill(x, 2);
-      });
-    } catch (error) { }
-  } else {
-    process.kill(pid, 2);
-  }
-}
-
-export async function getPid(name: string) {
-  const taskCommand = `ps -eo pid,command | grep "${name}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
-  const pid = await promiseExec(taskCommand);
-  return pid ? Number(pid) : undefined;
-}
-
-interface IVersion {
-  version: string;
-  changeLogLink: string;
-  changeLog: string;
-  publishTime: string;
-}
-
-export async function parseVersion(path: string): Promise<IVersion> {
-  return load(await promisify(fs.readFile)(path, 'utf8')) as IVersion;
-}
-
-export async function parseContentVersion(content: string): Promise<IVersion> {
-  return load(content) as IVersion;
-}
-
-export async function getUniqPath(command: string, id: string): Promise<string> {
-  if (/^\d+$/.test(id)) {
-    id = `_${id}`;
-  } else {
-    id = '';
-  }
-
-  const items = command.split(/ +/);
-  let str = items[0];
-  if (items[0] === TASK_COMMAND) {
-    str = items[1];
-  }
-
-  const dotIndex = str.lastIndexOf('.');
-
-  if (dotIndex !== -1) {
-    str = str.slice(0, dotIndex);
-  }
-
-  const slashIndex = str.lastIndexOf('/');
-
-  let tempStr = '';
-  if (slashIndex !== -1) {
-    tempStr = str.slice(0, slashIndex);
-    const _slashIndex = tempStr.lastIndexOf('/');
-    if (_slashIndex !== -1) {
-      tempStr = tempStr.slice(_slashIndex + 1);
-    }
-    str = `${tempStr}_${str.slice(slashIndex + 1)}`;
-  }
-
-  return `${str}${id}`;
-}
-
-export function safeJSONParse(value?: string) {
-  if (!value) {
-    return {};
-  }
-
-  try {
-    return JSON.parse(value);
-  } catch (error) {
-    Logger.error('[JSON.parse失败]', error)
-    return {};
-  }
-}

back/data/auth.ts

@@ -1,11 +1,10 @@
 import { sequelize } from '.';
 import { DataTypes, Model, ModelDefined } from 'sequelize';
-import { NotificationInfo } from './notify';
 
 export class AuthInfo {
   ip?: string;
   type: AuthDataType;
-  info?: AuthModelInfo;
+  info?: any;
   id?: number;
 
   constructor(options: AuthInfo) {
@@ -26,27 +25,9 @@ export enum AuthDataType {
   'authToken' = 'authToken',
   'notification' = 'notification',
   'removeLogFrequency' = 'removeLogFrequency',
-  'systemConfig' = 'systemConfig',
 }
 
-export interface SystemConfigInfo {
+interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
-  logRemoveFrequency?: number;
-  cronConcurrency?: number;
-}
-
-export interface LoginLogInfo {
-  timestamp?: number;
-  address?: string;
-  ip?: string;
-  platform?: string;
-  status?: LoginStatus;
-}
-
-export type AuthModelInfo = SystemConfigInfo &
-  Partial<NotificationInfo> &
-  LoginLogInfo;
-
-export interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
 export const AuthModel = sequelize.define<AuthInstance>('Auth', {
   ip: DataTypes.STRING,
   type: DataTypes.STRING,

back/data/cron.ts

@@ -4,7 +4,7 @@ import { DataTypes, Model, ModelDefined } from 'sequelize';
 export class Crontab {
   name?: string;
   command: string;
-  schedule?: string;
+  schedule: string;
   timestamp?: string;
   saved?: boolean;
   id?: number;
@@ -17,16 +17,15 @@ export class Crontab {
   labels?: string[];
   last_running_time?: number;
   last_execution_time?: number;
-  sub_id?: number;
 
   constructor(options: Crontab) {
     this.name = options.name;
-    this.command = options.command.trim();
+    this.command = options.command;
     this.schedule = options.schedule;
     this.saved = options.saved;
     this.id = options.id;
     this.status =
-      typeof options.status === 'number' && CrontabStatus[options.status]
+      options.status && CrontabStatus[options.status]
         ? options.status
         : CrontabStatus.idle;
     this.timestamp = new Date().toString();
@@ -35,34 +34,27 @@ export class Crontab {
     this.isDisabled = options.isDisabled || 0;
     this.log_path = options.log_path || '';
     this.isPinned = options.isPinned || 0;
-    this.labels = options.labels || [];
+    this.labels = options.labels || [''];
     this.last_running_time = options.last_running_time || 0;
     this.last_execution_time = options.last_execution_time || 0;
-    this.sub_id = options.sub_id;
   }
 }
 
 export enum CrontabStatus {
-  'running' = 0,
+  'running',
-  'queued' = 0.5,
+  'idle',
-  'idle' = 1,
   'disabled',
+  'queued',
 }
 
-export interface CronInstance extends Model<Crontab, Crontab>, Crontab {}
+interface CronInstance extends Model<Crontab, Crontab>, Crontab {}
 export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
-  name: {
+  name: DataTypes.STRING,
-    unique: 'compositeIndex',
-    type: DataTypes.STRING,
-  },
   command: {
-    unique: 'compositeIndex',
+    unique: 'command',
-    type: DataTypes.STRING,
-  },
-  schedule: {
-    unique: 'compositeIndex',
     type: DataTypes.STRING,
   },
+  schedule: DataTypes.STRING,
   timestamp: DataTypes.STRING,
   saved: DataTypes.BOOLEAN,
   status: DataTypes.NUMBER,
@@ -74,5 +66,4 @@ export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
   labels: DataTypes.JSON,
   last_running_time: DataTypes.NUMBER,
   last_execution_time: DataTypes.NUMBER,
-  sub_id: { type: DataTypes.NUMBER, allowNull: true },
 });

back/data/cronView.ts

@@ -1,62 +0,0 @@
-import { sequelize } from '.';
-import { DataTypes, Model } from 'sequelize';
-
-export enum CronViewType {
-  '系统' = 1,
-  '个人',
-}
-
-interface SortType {
-  type: 'ASC' | 'DESC';
-  value: string;
-}
-
-interface FilterType {
-  property: string;
-  operation: string;
-  value: string;
-}
-
-export class CrontabView {
-  name?: string;
-  id?: number;
-  position?: number;
-  isDisabled?: 1 | 0;
-  filters?: FilterType[];
-  sorts?: SortType[];
-  filterRelation?: 'and' | 'or';
-  type?: CronViewType;
-
-  constructor(options: CrontabView) {
-    this.name = options.name;
-    this.id = options.id;
-    this.position = options.position;
-    this.isDisabled = options.isDisabled || 0;
-    this.filters = options.filters;
-    this.sorts = options.sorts;
-    this.filterRelation = options.filterRelation;
-    this.type = options.type || CronViewType.个人;
-  }
-}
-
-export interface CronViewInstance
-  extends Model<CrontabView, CrontabView>,
-    CrontabView {}
-export const CrontabViewModel = sequelize.define<CronViewInstance>(
-  'CrontabView',
-  {
-    name: {
-      unique: 'name',
-      type: DataTypes.STRING,
-    },
-    position: DataTypes.NUMBER,
-    isDisabled: DataTypes.NUMBER,
-    filters: DataTypes.JSON,
-    sorts: DataTypes.JSON,
-    filterRelation: {
-      type: DataTypes.STRING,
-      allowNull: true,
-    },
-    type: DataTypes.NUMBER,
-  },
-);

back/data/dependence.ts

@@ -4,21 +4,18 @@ import { DataTypes, Model, ModelDefined } from 'sequelize';
 export class Dependence {
   timestamp?: string;
   id?: number;
-  status: DependenceStatus;
+  status?: DependenceStatus;
-  type: DependenceTypes;
+  type?: DependenceTypes;
-  name: string;
+  name?: number;
   log?: string[];
   remark?: string;
 
   constructor(options: Dependence) {
     this.id = options.id;
-    this.status =
+    this.status = options.status || DependenceStatus.installing;
-      typeof options.status === 'number' && DependenceStatus[options.status]
-        ? options.status
-        : DependenceStatus.queued;
     this.type = options.type || DependenceTypes.nodejs;
     this.timestamp = new Date().toString();
-    this.name = options.name.trim();
+    this.name = options.name;
     this.log = options.log || [];
     this.remark = options.remark || '';
   }
@@ -31,7 +28,6 @@ export enum DependenceStatus {
   'removing',
   'removed',
   'removeFailed',
-  'queued',
 }
 
 export enum DependenceTypes {
@@ -41,30 +37,18 @@ export enum DependenceTypes {
 }
 
 export enum InstallDependenceCommandTypes {
-  'pnpm add -g',
+  'npm i -g --force',
-  'pip3 install --disable-pip-version-check --root-user-action=ignore',
+  'pip3 install',
-  'apk add --no-check-certificate',
+  'apk add --no-cache -f',
-}
-
-export enum GetDependenceCommandTypes {
-  'pnpm ls -g ',
-  'pip3 show --disable-pip-version-check',
-  'apk info -es',
-}
-
-export enum versionDependenceCommandTypes {
-  '@',
-  '==',
-  '=',
 }
 
 export enum unInstallDependenceCommandTypes {
-  'pnpm remove -g',
+  'npm uninstall -g --force',
-  'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
+  'pip3 uninstall -y',
-  'apk del',
+  'apk del -f',
 }
 
-export interface DependenceInstance
+interface DependenceInstance
   extends Model<Dependence, Dependence>,
     Dependence {}
 export const DependenceModel = sequelize.define<DependenceInstance>(

back/data/env.ts

@@ -13,10 +13,7 @@ export class Env {
   constructor(options: Env) {
     this.value = options.value;
     this.id = options.id;
-    this.status =
+    this.status = options.status || EnvStatus.normal;
-      typeof options.status === 'number' && EnvStatus[options.status]
-        ? options.status
-        : EnvStatus.normal;
     this.timestamp = new Date().toString();
     this.position = options.position;
     this.name = options.name;
@@ -29,17 +26,14 @@ export enum EnvStatus {
   'disabled',
 }
 
-export const maxPosition = 9000000000000000;
+export const initEnvPosition = 9999999999;
-export const initPosition = 4500000000000000;
-export const stepPosition = 10000000000;
-export const minPosition = 100;
 
-export interface EnvInstance extends Model<Env, Env>, Env {}
+interface EnvInstance extends Model<Env, Env>, Env {}
 export const EnvModel = sequelize.define<EnvInstance>('Env', {
-  value: { type: DataTypes.STRING, unique: 'compositeIndex' },
+  value: DataTypes.STRING,
   timestamp: DataTypes.STRING,
   status: DataTypes.NUMBER,
   position: DataTypes.NUMBER,
-  name: { type: DataTypes.STRING, unique: 'compositeIndex' },
+  name: DataTypes.STRING,
   remarks: DataTypes.STRING,
 });

back/data/index.ts

@@ -1,23 +1,8 @@
-import { Sequelize, Transaction } from 'sequelize';
+import { Sequelize } from 'sequelize';
 import config from '../config/index';
-import { join } from 'path';
 
 export const sequelize = new Sequelize({
   dialect: 'sqlite',
-  storage: join(config.dbPath, 'database.sqlite'),
+  storage: `${config.dbPath}database.sqlite`,
   logging: false,
-  retry: {
-    max: 10,
-    match: ['SQLITE_BUSY: database is locked'],
-  },
-  pool: {
-    max: 5,
-    min: 2,
-    idle: 30000,
-    acquire: 30000,
-    evict: 10000,
-  },
-  transactionType: Transaction.TYPES.IMMEDIATE,
 });
-
-export type ResponseType<T> = { code: number; data?: T; message?: string };

back/data/notify.ts

@@ -1,23 +1,15 @@
-import { IncomingHttpHeaders } from 'http';
-
 export enum NotificationMode {
   'gotify' = 'gotify',
   'goCqHttpBot' = 'goCqHttpBot',
   'serverChan' = 'serverChan',
-  'pushDeer' = 'pushDeer',
   'bark' = 'bark',
-  'chat' = 'chat',
   'telegramBot' = 'telegramBot',
   'dingtalkBot' = 'dingtalkBot',
   'weWorkBot' = 'weWorkBot',
   'weWorkApp' = 'weWorkApp',
-  'aibotk' = 'aibotk',
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
   'email' = 'email',
-  'pushMe' = 'pushMe',
-  'feishu' = 'feishu',
-  'webhook' = 'webhook',
 }
 
 abstract class NotificationBaseInfo {
@@ -40,19 +32,8 @@ export class ServerChanNotification extends NotificationBaseInfo {
   public serverChanKey = '';
 }
 
-export class PushDeerNotification extends NotificationBaseInfo {
-  public pushDeerKey = '';
-  public pushDeerUrl = '';
-}
-
-export class ChatNotification extends NotificationBaseInfo {
-  public chatUrl = '';
-  public chatToken = '';
-}
-
 export class BarkNotification extends NotificationBaseInfo {
   public barkPush = '';
-  public barkIcon = 'https://qn.whyour.cn/logo.png';
   public barkSound = '';
   public barkGroup = 'qinglong';
 }
@@ -73,18 +54,10 @@ export class DingtalkBotNotification extends NotificationBaseInfo {
 
 export class WeWorkBotNotification extends NotificationBaseInfo {
   public weWorkBotKey = '';
-  public weWorkOrigin = '';
 }
 
 export class WeWorkAppNotification extends NotificationBaseInfo {
   public weWorkAppKey = '';
-  public weWorkOrigin = '';
-}
-
-export class AibotkNotification extends NotificationBaseInfo {
-  public aibotkKey: string = '';
-  public aibotkType: 'room' | 'contact' = 'room';
-  public aibotkName: string = '';
 }
 
 export class IGotNotification extends NotificationBaseInfo {
@@ -102,40 +75,15 @@ export class EmailNotification extends NotificationBaseInfo {
   public emailPass: string = '';
 }
 
-export class PushMeNotification extends NotificationBaseInfo {
-  public pushMeKey: string = '';
-}
-
-export class WebhookNotification extends NotificationBaseInfo {
-  public webhookHeaders: string = '';
-  public webhookBody: string = '';
-  public webhookUrl: string = '';
-  public webhookMethod: 'GET' | 'POST' | 'PUT' = 'GET';
-  public webhookContentType:
-    | 'application/json'
-    | 'multipart/form-data'
-    | 'application/x-www-form-urlencoded' = 'application/json';
-}
-
-export class LarkNotification extends NotificationBaseInfo {
-  public larkKey = '';
-}
-
 export interface NotificationInfo
   extends GoCqHttpBotNotification,
     GotifyNotification,
     ServerChanNotification,
-    PushDeerNotification,
-    ChatNotification,
     BarkNotification,
     TelegramBotNotification,
     DingtalkBotNotification,
     WeWorkBotNotification,
     WeWorkAppNotification,
-    AibotkNotification,
     IGotNotification,
     PushPlusNotification,
-    EmailNotification,
+    EmailNotification {}
-    PushMeNotification,
-    WebhookNotification,
-    LarkNotification {}

back/data/open.ts

@@ -26,9 +26,16 @@ export interface AppToken {
 
 export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs';
 
-export interface AppInstance extends Model<App, App>, App {}
+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' },
+  name: DataTypes.STRING,
   scopes: DataTypes.JSON,
   client_id: DataTypes.STRING,
   client_secret: DataTypes.STRING,

back/data/sock.ts

@@ -13,8 +13,5 @@ export class SockMessage {
 export type SockMessageType =
   | 'ping'
   | 'installDependence'
-  | 'uninstallDependence'
   | 'updateSystemVersion'
-  | 'manuallyRunScript'
+  | 'manuallyRunScript';
-  | 'runSubscriptionEnd'
-  | 'reloadSystem';

back/data/subscription.ts

@@ -1,115 +0,0 @@
-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;
-  proxy?: string;
-  autoAddCron?: 1 | 0;
-  autoDelCron?: 1 | 0;
-
-  constructor(options: Subscription) {
-    this.id = options.id;
-    this.name = options.name || options.alias;
-    this.type = options.type;
-    this.schedule = options.schedule;
-    this.status = this.status =
-      typeof options.status === 'number' && 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;
-    this.proxy = options.proxy;
-    this.autoAddCron = options.autoAddCron ? 1 : 0;
-    this.autoDelCron = options.autoDelCron ? 1 : 0;
-  }
-}
-
-export enum SubscriptionStatus {
-  'running',
-  'idle',
-  'disabled',
-  'queued',
-}
-
-export 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' },
-    proxy: { type: DataTypes.STRING, allowNull: true },
-    autoAddCron: { type: DataTypes.NUMBER, allowNull: true },
-    autoDelCron: { type: DataTypes.NUMBER, allowNull: true },
-  },
-);

back/loaders/app.ts

@@ -1,34 +1,22 @@
 import expressLoader from './express';
-import depInjectorLoader from './depInjector';
+import dependencyInjectorLoader from './dependencyInjector';
 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 }) => {
-  try {
+  await dependencyInjectorLoader({
-    depInjectorLoader();
+    models: [],
-    Logger.info('✌️ Dependency Injector loaded');
+  });
-    console.log('✌️ Dependency Injector loaded');
+  Logger.info('✌️ Dependency Injector loaded');
-  
+
-    expressLoader({ app: expressApp });
+  await expressLoader({ app: expressApp });
-    Logger.info('✌️ Express loaded');
+  Logger.info('✌️ Express loaded');
-    console.log('✌️ Express loaded');
+
-  
+  await initData();
-    await initData();
+  Logger.info('✌️ init data loaded');
-    Logger.info('✌️ init data loaded');
+
-    console.log('✌️ init data loaded');
+  await linkDeps();
-  
+  Logger.info('✌️ link deps');
-    await linkDeps();
-    Logger.info('✌️ link deps loaded');
-    console.log('✌️ link deps loaded');
-  
-    initTask();
-    Logger.info('✌️ init task loaded');
-    console.log('✌️ init task loaded');
-  } catch (error) {
-    Logger.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`);
-    console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`);
-  }
 };

back/loaders/db.ts

@@ -1,131 +1,106 @@
-import Logger from './logger';
-import path from 'path';
 import DataStore from 'nedb';
+import config from '../config';
+import Logger from './logger';
+import fs from 'fs';
+import { fileExist } from '../config/util';
 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 { fileExist } from '../config/util';
-import { SubscriptionModel } from '../data/subscription';
-import { CrontabViewModel } from '../data/cronView';
-import config from '../config';
 import { sequelize } from '../data';
 
+interface Dbs {
+  cronDb: DataStore;
+  dependenceDb: DataStore;
+  envDb: DataStore;
+  appDb: DataStore;
+  authDb: DataStore;
+}
+
+const db: Dbs = {} as any;
+
+async function truncateDb() {
+  return new Promise(async (resolve) => {
+    const files = [
+      config.cronDbFile,
+      config.dependenceDbFile,
+      config.envDbFile,
+      config.appDbFile,
+      config.authDbFile,
+    ];
+
+    for (const file of files) {
+      const _fileExist = await fileExist(file);
+      if (_fileExist && fs.statSync(file).size >= 1024 * 1024 * 500) {
+        fs.truncateSync(file, 1024 * 1024 * 500);
+      }
+    }
+    resolve(null);
+  });
+}
 export default async () => {
   try {
-    await CrontabModel.sync();
+    await truncateDb();
-    await DependenceModel.sync();
-    await AppModel.sync();
-    await AuthModel.sync();
-    await EnvModel.sync();
-    await SubscriptionModel.sync();
-    await CrontabViewModel.sync();
 
-    // 初始化新增字段
+    db.cronDb = new DataStore({ filename: config.cronDbFile, autoload: true });
-    try {
+    db.dependenceDb = new DataStore({
-      await sequelize.query(
+      filename: config.dependenceDbFile,
-        'alter table CrontabViews add column filterRelation VARCHAR(255)',
+      autoload: true,
-      );
+    });
-    } catch (error) {}
+    db.envDb = new DataStore({ filename: config.envDbFile, autoload: true });
-    try {
+    db.appDb = new DataStore({ filename: config.appDbFile, autoload: true });
-      await sequelize.query(
+    db.authDb = new DataStore({ filename: config.authDbFile, autoload: true });
-        'alter table Subscriptions add column proxy VARCHAR(255)',
-      );
-    } catch (error) {}
-    try {
-      await sequelize.query('alter table CrontabViews add column type NUMBER');
-    } catch (error) {}
-    try {
-      await sequelize.query(
-        'alter table Subscriptions add column autoAddCron NUMBER',
-      );
-    } catch (error) {}
-    try {
-      await sequelize.query(
-        'alter table Subscriptions add column autoDelCron NUMBER',
-      );
-    } catch (error) {}
-    try {
-      await sequelize.query('alter table Crontabs add column sub_id NUMBER');
-    } catch (error) {}
 
-    // 2.10-2.11 升级
+    // compaction data file
-    const cronDbFile = path.join(config.rootPath, 'db/crontab.db');
+    db.cronDb.persistence.compactDatafile();
-    const envDbFile = path.join(config.rootPath, 'db/env.db');
+    db.envDb.persistence.compactDatafile();
-    const appDbFile = path.join(config.rootPath, 'db/app.db');
+    db.dependenceDb.persistence.compactDatafile();
-    const authDbFile = path.join(config.rootPath, 'db/auth.db');
+    db.appDb.persistence.compactDatafile();
-    const dependenceDbFile = path.join(config.rootPath, 'db/dependence.db');
+    db.authDb.persistence.compactDatafile();
-    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();
+    try {
-    const dependenceCount = await DependenceModel.count();
+      await sequelize.sync({ alter: true });
-    const envCount = await EnvModel.count();
+    } catch (error) {
-    const appCount = await AppModel.count();
+      console.log(error);
-    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) {
+    // migrate db to sqlite
-      const dependenceDb = new DataStore({
+    setTimeout(async () => {
-        filename: dependenceDbFile,
+      try {
-        autoload: true,
+        const count = await CrontabModel.count();
-      });
+        if (count !== 0) {
-      dependenceDb.persistence.compactDatafile();
+          return;
-      dependenceDb.find({}).exec(async (err, docs) => {
+        }
-        await DependenceModel.bulkCreate(docs, { ignoreDuplicates: true });
+        db.cronDb.find({}).exec(async (err, docs) => {
-      });
+          await CrontabModel.bulkCreate(docs);
-    }
+        });
 
-    if (envDbExist && envCount === 0) {
+        db.dependenceDb.find({}).exec(async (err, docs) => {
-      const envDb = new DataStore({
+          await DependenceModel.bulkCreate(docs);
-        filename: envDbFile,
+        });
-        autoload: true,
-      });
-      envDb.persistence.compactDatafile();
-      envDb.find({}).exec(async (err, docs) => {
-        await EnvModel.bulkCreate(docs, { ignoreDuplicates: true });
-      });
-    }
 
-    if (appDbExist && appCount === 0) {
+        db.envDb.find({}).exec(async (err, docs) => {
-      const appDb = new DataStore({
+          await EnvModel.bulkCreate(docs);
-        filename: appDbFile,
+        });
-        autoload: true,
-      });
-      appDb.persistence.compactDatafile();
-      appDb.find({}).exec(async (err, docs) => {
-        await AppModel.bulkCreate(docs, { ignoreDuplicates: true });
-      });
-    }
 
-    if (authDbExist && authCount === 0) {
+        db.appDb.find({}).exec(async (err, docs) => {
-      const authDb = new DataStore({
+          await AppModel.bulkCreate(docs);
-        filename: authDbFile,
+        });
-        autoload: true,
+
-      });
+        db.authDb.find({}).exec(async (err, docs) => {
-      authDb.persistence.compactDatafile();
+          await AuthModel.bulkCreate(docs);
-      authDb.find({}).exec(async (err, docs) => {
+        });
-        await AuthModel.bulkCreate(docs, { ignoreDuplicates: true });
+      } catch (error) {
-      });
+        console.log(error);
-    }
+      }
+    }, 5000);
 
-    console.log('✌️ DB loaded');
     Logger.info('✌️ DB loaded');
   } catch (error) {
-    console.error('✌️ DB load failed');
+    Logger.info('✌️ DB load failed');
-    Logger.error(error);
+    Logger.info(error);
   }
 };
+
+export const dbs: Dbs = db;

back/loaders/dependencyInjector.ts

@@ -1,8 +1,12 @@
 import { Container } from 'typedi';
 import LoggerInstance from './logger';
 
-export default () => {
+export default ({ models }: { models: { name: string; model: any }[] }) => {
   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

@@ -2,7 +2,6 @@ import path from 'path';
 import fs from 'fs';
 import chokidar from 'chokidar';
 import config from '../config/index';
-import { promiseExec } from '../config/util';
 
 function linkToNodeModule(src: string, dst?: string) {
   const target = path.join(config.rootPath, 'node_modules', dst || src);
@@ -17,32 +16,7 @@ function linkToNodeModule(src: string, dst?: string) {
   });
 }
 
-async function linkCommand() {
-  const commandPath = await promiseExec('which node');
-  const commandDir = path.dirname(commandPath);
-  const linkShell = [
-    {
-      src: 'update.sh',
-      dest: 'ql',
-    },
-    {
-      src: 'task.sh',
-      dest: 'task',
-    },
-  ];
-
-  for (const link of linkShell) {
-    const source = path.join(config.rootPath, 'shell', link.src);
-    const target = path.join(commandDir, link.dest);
-    if (fs.existsSync(target)) {
-      fs.unlinkSync(target);
-    }
-    fs.symlink(source, target, (err) => { });
-  }
-}
-
 export default async (src: string = 'deps') => {
-  await linkCommand();
   linkToNodeModule(src);
 
   const source = path.join(config.rootPath, src);

back/loaders/express.ts

@@ -1,44 +1,38 @@
-import express, { Request, Response, NextFunction, Application } from 'express';
+import { 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, { UnauthorizedError } from 'express-jwt';
+import jwt from 'express-jwt';
 import fs from 'fs';
-import { getPlatform, getToken, safeJSONParse } from '../config/util';
+import { getFileContentByName, 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';
-import { createProxyMiddleware } from 'http-proxy-middleware';
-import { serveEnv } from '../config/serverEnv';
-import Logger from './logger';
 
 export default ({ app }: { app: Application }) => {
   app.enable('trust proxy');
   app.use(cors());
-  app.get(`${config.api.prefix}/env.js`, serveEnv);
-  app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));
-
-  app.use(
-    '/api/public',
-    createProxyMiddleware({
-      target: `http://0.0.0.0:${config.publicPort}/api`,
-      changeOrigin: true,
-      pathRewrite: { '/api/public': '' },
-      logProvider: () => Logger
-    }),
-  );
 
+  app.use((req, res, next) => {
+    if (req.path.startsWith('/api') || req.path.startsWith('/open')) {
+      next();
+    } else {
+      return handler(req, res, {
+        public: '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,
+      secret: config.secret as string,
       algorithms: ['HS384'],
     }).unless({
       path: [...config.apiWhiteList, /^\/open\//],
@@ -74,28 +68,32 @@ export default ({ app }: { app: Application }) => {
       }
     }
 
-    const originPath = `${req.baseUrl}${req.path === '/' ? '' : req.path}`;
     if (
       !headerToken &&
-      originPath &&
+      req.path &&
-      config.apiWhiteList.includes(originPath)
+      config.apiWhiteList.includes(req.path) &&
+      req.path !== '/api/crons/status'
+    ) {
+      return next();
+    }
+    const remoteAddress = req.socket.remoteAddress;
+    if (
+      remoteAddress === '::ffff:127.0.0.1' &&
+      req.path === '/api/crons/status'
     ) {
       return next();
     }
 
     const data = fs.readFileSync(config.authConfigFile, 'utf8');
-    if (data && headerToken) {
+    if (data) {
-      const { token = '', tokens = {} } = safeJSONParse(data);
+      const { token = '', tokens = {} } = JSON.parse(data);
       if (headerToken === token || tokens[req.platform] === headerToken) {
         return next();
       }
     }
 
-    const errorCode = headerToken ? 'invalid_token' : 'credentials_required';
+    const err: any = new Error('UnauthorizedError');
-    const errorMessage = headerToken
+    err.status = 401;
-      ? 'jwt malformed'
-      : 'No authorization token was found';
-    const err = new UnauthorizedError(errorCode, { message: errorMessage });
     next(err);
   });
 
@@ -105,13 +103,14 @@ export default ({ app }: { app: Application }) => {
     }
     const userService = Container.get(UserService);
     const authInfo = await userService.getUserInfo();
-    const envCount = await EnvModel.count();
+    const envDbContent = getFileContentByName(config.envDbFile);
 
     let isInitialized = true;
     if (
       Object.keys(authInfo).length === 2 &&
       authInfo.username === 'admin' &&
-      authInfo.password === 'admin'
+      authInfo.password === 'admin' &&
+      envDbContent.length === 0
     ) {
       isInitialized = false;
     }
@@ -132,7 +131,7 @@ export default ({ app }: { app: Application }) => {
     next(err);
   });
 
-  app.use(errors());
+  app.use(Sentry.Handlers.errorHandler());
 
   app.use(
     (
@@ -151,27 +150,6 @@ export default ({ app }: { app: Application }) => {
     },
   );
 
-  app.use(
-    (
-      err: Error & { errors: any[] },
-      req: Request,
-      res: Response,
-      next: NextFunction,
-    ) => {
-      if (err.name.includes('Sequelize')) {
-        return res
-          .status(500)
-          .send({
-            code: 400,
-            message: `${err.name} ${err.message}`,
-            validation: err.errors,
-          })
-          .end();
-      }
-      return next(err);
-    },
-  );
-
   app.use(
     (
       err: Error & { status: number },

back/loaders/initData.ts

@@ -4,56 +4,41 @@ import { Container } from 'typedi';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import CronService from '../services/cron';
 import EnvService from '../services/env';
-import { DependenceModel, DependenceStatus } from '../data/dependence';
+import _ from 'lodash';
+import { DependenceModel } from '../data/dependence';
 import { Op } from 'sequelize';
-import config from '../config';
-import { CrontabViewModel, CronViewType } from '../data/cronView';
-import { initPosition } from '../data/env';
 
 export default async () => {
   const cronService = Container.get(CronService);
   const envService = Container.get(EnvService);
   const dependenceService = Container.get(DependenceService);
 
-  // 初始化新增默认全部任务视图
+  // 初始化更新所有任务状态为空闲
-  CrontabViewModel.findAll({
+  await CrontabModel.update(
-    where: { type: CronViewType.系统, name: '全部任务' },
+    { status: CrontabStatus.idle },
-    raw: true,
+    { where: { status: [CrontabStatus.running, CrontabStatus.queued] } },
-  }).then((docs) => {
+  );
-    if (docs.length === 0) {
+
-      CrontabViewModel.create({
+  // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-        name: '全部任务',
+  DependenceModel.findAll({ where: {} }).then(async (docs) => {
-        type: CronViewType.系统,
+    const groups = _.groupBy(docs, 'type');
-        position: initPosition / 2,
+    for (const key in groups) {
-      });
+      if (Object.prototype.hasOwnProperty.call(groups, key)) {
+        const group = groups[key];
+        const depIds = group.map((x) => x.id);
+        for (const dep of depIds) {
+          await dependenceService.reInstall([dep]);
+        }
+      }
     }
   });
 
-  // 初始化更新所有任务状态为空闲
+  // 初始化时执行一次所有的ql repo 任务
-  await CrontabModel.update({ status: CrontabStatus.idle }, { where: {} });
-
-  // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  DependenceModel.findAll({
-    where: {},
-    order: [
-      ['type', 'DESC'],
-      ['createdAt', 'DESC'],
-    ],
-    raw: true,
-  }).then(async (docs) => {
-    await DependenceModel.update(
-      { status: DependenceStatus.queued, log: [] },
-      { where: { id: docs.map((x) => x.id!) } },
-    );
-    dependenceService.installDependenceOneByOne(docs);
-  });
-
-  // 初始化时执行一次所有的 ql repo 任务
   CrontabModel.findAll({
     where: {
       isDisabled: { [Op.ne]: 1 },
       command: {
-        [Op.or]: [{ [Op.like]: `%ql repo%` }, { [Op.like]: `%ql raw%` }],
+        [Op.or]: [{ [Op.like]: `%ql repo%` }, { [Op.like]: `%$ql raw%` }],
       },
     },
   }).then((docs) => {
@@ -65,66 +50,23 @@ export default async () => {
     }
   });
 
-  // 更新2.11.3以前的脚本路径
-  CrontabModel.findAll({
-    where: {
-      command: {
-        [Op.or]: [
-          { [Op.like]: `%\/${config.rootPath}\/scripts\/%` },
-          { [Op.like]: `%\/${config.rootPath}\/config\/%` },
-          { [Op.like]: `%\/${config.rootPath}\/log\/%` },
-          { [Op.like]: `%\/${config.rootPath}\/db\/%` },
-        ],
-      },
-    },
-  }).then(async (docs) => {
-    for (let i = 0; i < docs.length; i++) {
-      const doc = docs[i];
-      if (doc) {
-        if (doc.command.includes(`${config.rootPath}/scripts/`)) {
-          await CrontabModel.update(
-            { command: doc.command.replace(`${config.rootPath}/scripts/`, '') },
-            { where: { id: doc.id } },
-          );
-        }
-        if (doc.command.includes(`${config.rootPath}/log/`)) {
-          await CrontabModel.update(
-            {
-              command: `${config.rootPath}/data/log/${doc.command.replace(
-                `${config.rootPath}/log/`,
-                '',
-              )}`,
-            },
-            { where: { id: doc.id } },
-          );
-        }
-        if (doc.command.includes(`${config.rootPath}/config/`)) {
-          await CrontabModel.update(
-            {
-              command: `${config.rootPath}/data/config/${doc.command.replace(
-                `${config.rootPath}/config/`,
-                '',
-              )}`,
-            },
-            { where: { id: doc.id } },
-          );
-        }
-        if (doc.command.includes(`${config.rootPath}/db/`)) {
-          await CrontabModel.update(
-            {
-              command: `${config.rootPath}/data/db/${doc.command.replace(
-                `${config.rootPath}/db/`,
-                '',
-              )}`,
-            },
-            { where: { id: doc.id } },
-          );
-        }
-      }
-    }
-  });
-
   // 初始化保存一次ck和定时任务数据
   await cronService.autosave_crontab();
   await envService.set_envs();
 };
+
+function randomSchedule(from: number, to: number) {
+  const result: any[] = [];
+  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

@@ -1,34 +1,17 @@
 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.env.QL_DIR as string;
+const rootPath = process.cwd();
-const dataPath = path.join(rootPath, 'data/');
+const confFile = path.join(rootPath, 'config/config.sh');
-const configPath = path.join(dataPath, 'config/');
+const sampleConfigFile = path.join(rootPath, 'sample/config.sample.sh');
-const scriptPath = path.join(dataPath, 'scripts/');
+const sampleAuthFile = path.join(rootPath, 'sample/auth.sample.json');
-const logPath = path.join(dataPath, 'log/');
+const authConfigFile = path.join(rootPath, 'config/auth.json');
-const uploadPath = path.join(dataPath, 'upload/');
+const configPath = path.join(rootPath, 'config/');
-const bakPath = path.join(dataPath, 'bak/');
+const scriptPath = path.join(rootPath, 'scripts/');
-const samplePath = path.join(rootPath, 'sample/');
+const logPath = path.join(rootPath, 'log/');
-const tmpPath = path.join(logPath, '.tmp/');
-const confFile = path.join(configPath, 'config.sh');
-const authConfigFile = path.join(configPath, 'auth.json');
-const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
-const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
-const sampleTaskShellFile = path.join(samplePath, 'task.sample.sh');
-const sampleNotifyJsFile = path.join(samplePath, 'notify.js');
-const sampleNotifyPyFile = path.join(samplePath, 'notify.py');
-const scriptNotifyJsFile = path.join(scriptPath, 'sendNotify.js');
-const scriptNotifyPyFile = path.join(scriptPath, 'notify.py');
-const TaskBeforeFile = path.join(configPath, 'task_before.sh');
-const TaskAfterFile = path.join(configPath, 'task_after.sh');
-const homedir = os.homedir();
-const sshPath = path.resolve(homedir, '.ssh');
-const sshdPath = path.join(dataPath, 'ssh.d');
-const systemLogPath = path.join(dataPath, 'syslog');
 
 export default async () => {
   const authFileExist = await fileExist(authConfigFile);
@@ -36,21 +19,19 @@ export default async () => {
   const scriptDirExist = await fileExist(scriptPath);
   const logDirExist = await fileExist(logPath);
   const configDirExist = await fileExist(configPath);
-  const uploadDirExist = await fileExist(uploadPath);
-  const sshDirExist = await fileExist(sshPath);
-  const bakDirExist = await fileExist(bakPath);
-  const sshdDirExist = await fileExist(sshdPath);
-  const systemLogDirExist = await fileExist(systemLogPath);
-  const tmpDirExist = await fileExist(tmpPath);
-  const scriptNotifyJsFileExist = await fileExist(scriptNotifyJsFile);
-  const scriptNotifyPyFileExist = await fileExist(scriptNotifyPyFile);
-  const TaskBeforeFileExist = await fileExist(TaskBeforeFile);
-  const TaskAfterFileExist = await fileExist(TaskAfterFile);
 
   if (!configDirExist) {
     fs.mkdirSync(configPath);
   }
 
+  if (!authFileExist) {
+    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
+  }
+
+  if (!confFileExist) {
+    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
+  }
+
   if (!scriptDirExist) {
     fs.mkdirSync(scriptPath);
   }
@@ -59,57 +40,7 @@ export default async () => {
     fs.mkdirSync(logPath);
   }
 
-  if (!tmpDirExist) {
-    fs.mkdirSync(tmpPath);
-  }
-
-  if (!uploadDirExist) {
-    fs.mkdirSync(uploadPath);
-  }
-
-  if (!sshDirExist) {
-    fs.mkdirSync(sshPath);
-  }
-
-  if (!bakDirExist) {
-    fs.mkdirSync(bakPath);
-  }
-
-  if (!sshdDirExist) {
-    fs.mkdirSync(sshdPath);
-  }
-
-  if (!systemLogDirExist) {
-    fs.mkdirSync(systemLogPath);
-  }
-
-  // 初始化文件
-  if (!authFileExist) {
-    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
-  }
-
-  if (!confFileExist) {
-    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
-  }
-
-  if (!scriptNotifyJsFileExist) {
-    fs.writeFileSync(scriptNotifyJsFile, fs.readFileSync(sampleNotifyJsFile));
-  }
-
-  if (!scriptNotifyPyFileExist) {
-    fs.writeFileSync(scriptNotifyPyFile, fs.readFileSync(sampleNotifyPyFile));
-  }
-
-  if (!TaskBeforeFileExist) {
-    fs.writeFileSync(TaskBeforeFile, fs.readFileSync(sampleTaskShellFile));
-  }
-
-  if (!TaskAfterFileExist) {
-    fs.writeFileSync(TaskAfterFile, fs.readFileSync(sampleTaskShellFile));
-  }
-
   dotenv.config({ path: confFile });
 
   Logger.info('✌️ Init file down');
-  console.log('✌️ Init file down');
 };

back/loaders/initTask.ts

@@ -1,51 +0,0 @@
-import { Container } from 'typedi';
-import SystemService from '../services/system';
-import ScheduleService from '../services/schedule';
-import SubscriptionService from '../services/subscription';
-import config from '../config';
-import { fileExist } from '../config/util';
-import { join } from 'path';
-
-export default async () => {
-  const systemService = Container.get(SystemService);
-  const scheduleService = Container.get(ScheduleService);
-  const subscriptionService = Container.get(SubscriptionService);
-
-  // 生成内置token
-  let tokenCommand = `tsx ${join(config.rootPath, 'back/token.ts')}`;
-  const tokenFile = join(config.rootPath, 'static/build/token.js');
-
-  if (await fileExist(tokenFile)) {
-    tokenCommand = `node ${tokenFile}`;
-  }
-  const cron = {
-    id: NaN,
-    name: '生成token',
-    command: tokenCommand,
-  };
-  await scheduleService.cancelIntervalTask(cron);
-  scheduleService.createIntervalTask(cron, {
-    days: 28,
-  });
-
-  // 运行删除日志任务
-  const data = await systemService.getSystemConfig();
-  if (data && data.info && data.info.logRemoveFrequency) {
-    const rmlogCron = {
-      id: data.id as number,
-      name: '删除日志',
-      command: `ql rmlog ${data.info.logRemoveFrequency}`,
-    };
-    await scheduleService.cancelIntervalTask(rmlogCron);
-    scheduleService.createIntervalTask(rmlogCron, {
-      days: data.info.logRemoveFrequency,
-    });
-  }
-
-  // 运行所有订阅
-  await subscriptionService.setSshConfig();
-  const subs = await subscriptionService.list();
-  for (const sub of subs) {
-    subscriptionService.handleTask(sub, !sub.is_disabled, !sub.is_disabled);
-  }
-};

back/loaders/logger.ts

@@ -1,38 +1,32 @@
 import winston from 'winston';
-import 'winston-daily-rotate-file';
 import config from '../config';
-import path from 'path';
 
-const levelMap: Record<string, string> = {
+const transports = [];
-  info: '🔵',
+if (process.env.NODE_ENV !== 'development') {
-  warn: '🟡',
+  transports.push(new winston.transports.Console());
-  error: '🔴',
+} else {
-  debug: '🔶'
+  transports.push(
+    new winston.transports.Console({
+      format: winston.format.combine(
+        winston.format.cli(),
+        winston.format.splat(),
+      ),
+    }),
+  );
 }
 
-const customFormat = winston.format.combine(
-  winston.format.splat(),
-  winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
-  winston.format.align(),
-  winston.format.printf((i) => `[${levelMap[i.level]}${i.level}] [${[i.timestamp]}]: ${i.message}`),
-);
-
-const defaultOptions = {
-  format: customFormat,
-  datePattern: "YYYY-MM-DD",
-  maxSize: "20m",
-  maxFiles: "7d",
-};
-
 const LoggerInstance = winston.createLogger({
   level: config.logs.level,
   levels: winston.config.npm.levels,
-  transports: [
+  format: winston.format.combine(
-    new winston.transports.DailyRotateFile({
+    winston.format.timestamp({
-      filename: path.join(config.systemLogPath, '%DATE%.log'),
+      format: 'YYYY-MM-DD HH:mm:ss',
-      ...defaultOptions,
+    }),
-    })
+    winston.format.errors({ stack: true }),
-  ],
+    winston.format.splat(),
+    winston.format.json(),
+  ),
+  transports,
 });
 
 export default LoggerInstance;

back/loaders/sentry.ts

@@ -2,32 +2,20 @@ import { Application } from 'express';
 import * as Sentry from '@sentry/node';
 import * as Tracing from '@sentry/tracing';
 import Logger from './logger';
-import config from '../config';
-import fs from 'fs';
-import { parseVersion } from '../config/util';
-
-export default async ({ expressApp }: { expressApp: Application }) => {
-  const { version } = await parseVersion(config.versionFile);
 
+export default ({ expressApp }: { expressApp: Application }) => {
   Sentry.init({
-    ignoreErrors: [
-      /SequelizeUniqueConstraintError/i,
-      /Validation error/i,
-      /UnauthorizedError/i,
-      /celebrate request validation failed/i,
-    ],
     dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
     integrations: [
       new Sentry.Integrations.Http({ tracing: true }),
       new Tracing.Integrations.Express({ app: expressApp }),
     ],
-    tracesSampleRate: 0.8,
+
-    release: version,
+    tracesSampleRate: 1.0,
   });
 
   expressApp.use(Sentry.Handlers.requestHandler());
   expressApp.use(Sentry.Handlers.tracingHandler());
 
   Logger.info('✌️ Sentry loaded');
-  console.log('✌️ Sentry loaded');
 };

back/loaders/server.ts

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

back/loaders/sock.ts

@@ -5,7 +5,7 @@ import { Container } from 'typedi';
 import SockService from '../services/sock';
 import config from '../config/index';
 import fs from 'fs';
-import { getPlatform, safeJSONParse } from '../config/util';
+import { getPlatform } from '../config/util';
 
 export default async ({ server }: { server: Server }) => {
   const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
@@ -20,7 +20,7 @@ export default async ({ server }: { server: Server }) => {
     const platform = getPlatform(conn.headers['user-agent'] || '') || 'desktop';
     const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
     if (data) {
-      const { token = '', tokens = {} } = safeJSONParse(data);
+      const { token = '', tokens = {} } = JSON.parse(data);
       if (headerToken === token || tokens[platform] === headerToken) {
         conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
         sockService.addClient(conn);

back/protos/cron.proto

@@ -1,22 +0,0 @@
-syntax = "proto3";
-
-package com.ql.cron;
-
-service Cron {
-  rpc addCron(AddCronRequest) returns (AddCronResponse);
-  rpc delCron(DeleteCronRequest) returns (DeleteCronResponse);
-}
-
-message ICron {
-  string id = 1;
-  string schedule = 2;
-  string command = 3;
-}
-
-message AddCronRequest { repeated ICron crons = 1; }
-
-message AddCronResponse {}
-
-message DeleteCronRequest { repeated string ids = 1; }
-
-message DeleteCronResponse {}

back/protos/cron.ts

@@ -1,482 +0,0 @@
-/* eslint-disable */
-import {
-  CallOptions,
-  ChannelCredentials,
-  Client,
-  ClientOptions,
-  ClientUnaryCall,
-  handleUnaryCall,
-  makeGenericClientConstructor,
-  Metadata,
-  ServiceError,
-  UntypedServiceImplementation,
-} from '@grpc/grpc-js';
-import _m0 from 'protobufjs/minimal';
-
-export const protobufPackage = 'com.ql.cron';
-
-export interface ICron {
-  id: string;
-  schedule: string;
-  command: string;
-}
-
-export interface AddCronRequest {
-  crons: ICron[];
-}
-
-export interface AddCronResponse {}
-
-export interface DeleteCronRequest {
-  ids: string[];
-}
-
-export interface DeleteCronResponse {}
-
-function createBaseICron(): ICron {
-  return { id: '', schedule: '', command: '' };
-}
-
-export const ICron = {
-  encode(message: ICron, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.id !== '') {
-      writer.uint32(10).string(message.id);
-    }
-    if (message.schedule !== '') {
-      writer.uint32(18).string(message.schedule);
-    }
-    if (message.command !== '') {
-      writer.uint32(26).string(message.command);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): ICron {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseICron();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          if (tag != 10) {
-            break;
-          }
-
-          message.id = reader.string();
-          continue;
-        case 2:
-          if (tag != 18) {
-            break;
-          }
-
-          message.schedule = reader.string();
-          continue;
-        case 3:
-          if (tag != 26) {
-            break;
-          }
-
-          message.command = reader.string();
-          continue;
-      }
-      if ((tag & 7) == 4 || tag == 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): ICron {
-    return {
-      id: isSet(object.id) ? String(object.id) : '',
-      schedule: isSet(object.schedule) ? String(object.schedule) : '',
-      command: isSet(object.command) ? String(object.command) : '',
-    };
-  },
-
-  toJSON(message: ICron): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = message.id);
-    message.schedule !== undefined && (obj.schedule = message.schedule);
-    message.command !== undefined && (obj.command = message.command);
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<ICron>, I>>(base?: I): ICron {
-    return ICron.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ICron>, I>>(object: I): ICron {
-    const message = createBaseICron();
-    message.id = object.id ?? '';
-    message.schedule = object.schedule ?? '';
-    message.command = object.command ?? '';
-    return message;
-  },
-};
-
-function createBaseAddCronRequest(): AddCronRequest {
-  return { crons: [] };
-}
-
-export const AddCronRequest = {
-  encode(
-    message: AddCronRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
-    for (const v of message.crons) {
-      ICron.encode(v!, writer.uint32(10).fork()).ldelim();
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseAddCronRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          if (tag != 10) {
-            break;
-          }
-
-          message.crons.push(ICron.decode(reader, reader.uint32()));
-          continue;
-      }
-      if ((tag & 7) == 4 || tag == 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): AddCronRequest {
-    return {
-      crons: Array.isArray(object?.crons)
-        ? object.crons.map((e: any) => ICron.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: AddCronRequest): unknown {
-    const obj: any = {};
-    if (message.crons) {
-      obj.crons = message.crons.map((e) => (e ? ICron.toJSON(e) : undefined));
-    } else {
-      obj.crons = [];
-    }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<AddCronRequest>, I>>(
-    base?: I,
-  ): AddCronRequest {
-    return AddCronRequest.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(
-    object: I,
-  ): AddCronRequest {
-    const message = createBaseAddCronRequest();
-    message.crons = object.crons?.map((e) => ICron.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseAddCronResponse(): AddCronResponse {
-  return {};
-}
-
-export const AddCronResponse = {
-  encode(
-    _: AddCronResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseAddCronResponse();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-      }
-      if ((tag & 7) == 4 || tag == 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(_: any): AddCronResponse {
-    return {};
-  },
-
-  toJSON(_: AddCronResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(
-    base?: I,
-  ): AddCronResponse {
-    return AddCronResponse.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(
-    _: I,
-  ): AddCronResponse {
-    const message = createBaseAddCronResponse();
-    return message;
-  },
-};
-
-function createBaseDeleteCronRequest(): DeleteCronRequest {
-  return { ids: [] };
-}
-
-export const DeleteCronRequest = {
-  encode(
-    message: DeleteCronRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
-    for (const v of message.ids) {
-      writer.uint32(10).string(v!);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseDeleteCronRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          if (tag != 10) {
-            break;
-          }
-
-          message.ids.push(reader.string());
-          continue;
-      }
-      if ((tag & 7) == 4 || tag == 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): DeleteCronRequest {
-    return {
-      ids: Array.isArray(object?.ids)
-        ? object.ids.map((e: any) => String(e))
-        : [],
-    };
-  },
-
-  toJSON(message: DeleteCronRequest): unknown {
-    const obj: any = {};
-    if (message.ids) {
-      obj.ids = message.ids.map((e) => e);
-    } else {
-      obj.ids = [];
-    }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
-    base?: I,
-  ): DeleteCronRequest {
-    return DeleteCronRequest.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(
-    object: I,
-  ): DeleteCronRequest {
-    const message = createBaseDeleteCronRequest();
-    message.ids = object.ids?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseDeleteCronResponse(): DeleteCronResponse {
-  return {};
-}
-
-export const DeleteCronResponse = {
-  encode(
-    _: DeleteCronResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseDeleteCronResponse();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-      }
-      if ((tag & 7) == 4 || tag == 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(_: any): DeleteCronResponse {
-    return {};
-  },
-
-  toJSON(_: DeleteCronResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
-    base?: I,
-  ): DeleteCronResponse {
-    return DeleteCronResponse.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(
-    _: I,
-  ): DeleteCronResponse {
-    const message = createBaseDeleteCronResponse();
-    return message;
-  },
-};
-
-export type CronService = typeof CronService;
-export const CronService = {
-  addCron: {
-    path: '/com.ql.cron.Cron/addCron',
-    requestStream: false,
-    responseStream: false,
-    requestSerialize: (value: AddCronRequest) =>
-      Buffer.from(AddCronRequest.encode(value).finish()),
-    requestDeserialize: (value: Buffer) => AddCronRequest.decode(value),
-    responseSerialize: (value: AddCronResponse) =>
-      Buffer.from(AddCronResponse.encode(value).finish()),
-    responseDeserialize: (value: Buffer) => AddCronResponse.decode(value),
-  },
-  delCron: {
-    path: '/com.ql.cron.Cron/delCron',
-    requestStream: false,
-    responseStream: false,
-    requestSerialize: (value: DeleteCronRequest) =>
-      Buffer.from(DeleteCronRequest.encode(value).finish()),
-    requestDeserialize: (value: Buffer) => DeleteCronRequest.decode(value),
-    responseSerialize: (value: DeleteCronResponse) =>
-      Buffer.from(DeleteCronResponse.encode(value).finish()),
-    responseDeserialize: (value: Buffer) => DeleteCronResponse.decode(value),
-  },
-} as const;
-
-export interface CronServer extends UntypedServiceImplementation {
-  addCron: handleUnaryCall<AddCronRequest, AddCronResponse>;
-  delCron: handleUnaryCall<DeleteCronRequest, DeleteCronResponse>;
-}
-
-export interface CronClient extends Client {
-  addCron(
-    request: AddCronRequest,
-    callback: (error: ServiceError | null, response: AddCronResponse) => void,
-  ): ClientUnaryCall;
-  addCron(
-    request: AddCronRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: AddCronResponse) => void,
-  ): ClientUnaryCall;
-  addCron(
-    request: AddCronRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: AddCronResponse) => void,
-  ): ClientUnaryCall;
-  delCron(
-    request: DeleteCronRequest,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
-  ): ClientUnaryCall;
-  delCron(
-    request: DeleteCronRequest,
-    metadata: Metadata,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
-  ): ClientUnaryCall;
-  delCron(
-    request: DeleteCronRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (
-      error: ServiceError | null,
-      response: DeleteCronResponse,
-    ) => void,
-  ): ClientUnaryCall;
-}
-
-export const CronClient = makeGenericClientConstructor(
-  CronService,
-  'com.ql.cron.Cron',
-) as unknown as {
-  new (
-    address: string,
-    credentials: ChannelCredentials,
-    options?: Partial<ClientOptions>,
-  ): CronClient;
-  service: typeof CronService;
-};
-
-type Builtin =
-  | Date
-  | Function
-  | Uint8Array
-  | string
-  | number
-  | boolean
-  | undefined;
-
-export type DeepPartial<T> = T extends Builtin
-  ? T
-  : T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U>
-  ? ReadonlyArray<DeepPartial<U>>
-  : T extends {}
-  ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin
-  ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
-      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
-    };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}

back/protos/health.proto

@@ -1,22 +0,0 @@
-syntax = "proto3";
-
-package com.ql.health;
-
-message HealthCheckRequest {
-  string service = 1;
-}
-
-message HealthCheckResponse {
-  enum ServingStatus {
-    UNKNOWN = 0;
-    SERVING = 1;
-    NOT_SERVING = 2;
-    SERVICE_UNKNOWN = 3;
-  }
-  ServingStatus status = 1;
-}
-
-service Health {
-  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
-  rpc Watch(HealthCheckRequest) returns (stream HealthCheckResponse);
-}

back/protos/health.ts

@@ -1,317 +0,0 @@
-/* eslint-disable */
-import {
-  CallOptions,
-  ChannelCredentials,
-  Client,
-  ClientOptions,
-  ClientReadableStream,
-  ClientUnaryCall,
-  handleServerStreamingCall,
-  handleUnaryCall,
-  makeGenericClientConstructor,
-  Metadata,
-  ServiceError,
-  UntypedServiceImplementation,
-} from '@grpc/grpc-js';
-import _m0 from 'protobufjs/minimal';
-
-export const protobufPackage = 'com.ql.health';
-
-export interface HealthCheckRequest {
-  service: string;
-}
-
-export interface HealthCheckResponse {
-  status: HealthCheckResponse_ServingStatus;
-}
-
-export enum HealthCheckResponse_ServingStatus {
-  UNKNOWN = 0,
-  SERVING = 1,
-  NOT_SERVING = 2,
-  SERVICE_UNKNOWN = 3,
-  UNRECOGNIZED = -1,
-}
-
-export function healthCheckResponse_ServingStatusFromJSON(
-  object: any,
-): HealthCheckResponse_ServingStatus {
-  switch (object) {
-    case 0:
-    case 'UNKNOWN':
-      return HealthCheckResponse_ServingStatus.UNKNOWN;
-    case 1:
-    case 'SERVING':
-      return HealthCheckResponse_ServingStatus.SERVING;
-    case 2:
-    case 'NOT_SERVING':
-      return HealthCheckResponse_ServingStatus.NOT_SERVING;
-    case 3:
-    case 'SERVICE_UNKNOWN':
-      return HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN;
-    case -1:
-    case 'UNRECOGNIZED':
-    default:
-      return HealthCheckResponse_ServingStatus.UNRECOGNIZED;
-  }
-}
-
-export function healthCheckResponse_ServingStatusToJSON(
-  object: HealthCheckResponse_ServingStatus,
-): string {
-  switch (object) {
-    case HealthCheckResponse_ServingStatus.UNKNOWN:
-      return 'UNKNOWN';
-    case HealthCheckResponse_ServingStatus.SERVING:
-      return 'SERVING';
-    case HealthCheckResponse_ServingStatus.NOT_SERVING:
-      return 'NOT_SERVING';
-    case HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN:
-      return 'SERVICE_UNKNOWN';
-    case HealthCheckResponse_ServingStatus.UNRECOGNIZED:
-    default:
-      return 'UNRECOGNIZED';
-  }
-}
-
-function createBaseHealthCheckRequest(): HealthCheckRequest {
-  return { service: '' };
-}
-
-export const HealthCheckRequest = {
-  encode(
-    message: HealthCheckRequest,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
-    if (message.service !== '') {
-      writer.uint32(10).string(message.service);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckRequest {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseHealthCheckRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          if (tag != 10) {
-            break;
-          }
-
-          message.service = reader.string();
-          continue;
-      }
-      if ((tag & 7) == 4 || tag == 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): HealthCheckRequest {
-    return { service: isSet(object.service) ? String(object.service) : '' };
-  },
-
-  toJSON(message: HealthCheckRequest): unknown {
-    const obj: any = {};
-    message.service !== undefined && (obj.service = message.service);
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(
-    base?: I,
-  ): HealthCheckRequest {
-    return HealthCheckRequest.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(
-    object: I,
-  ): HealthCheckRequest {
-    const message = createBaseHealthCheckRequest();
-    message.service = object.service ?? '';
-    return message;
-  },
-};
-
-function createBaseHealthCheckResponse(): HealthCheckResponse {
-  return { status: 0 };
-}
-
-export const HealthCheckResponse = {
-  encode(
-    message: HealthCheckResponse,
-    writer: _m0.Writer = _m0.Writer.create(),
-  ): _m0.Writer {
-    if (message.status !== 0) {
-      writer.uint32(8).int32(message.status);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckResponse {
-    const reader =
-      input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseHealthCheckResponse();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          if (tag != 8) {
-            break;
-          }
-
-          message.status = reader.int32() as any;
-          continue;
-      }
-      if ((tag & 7) == 4 || tag == 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): HealthCheckResponse {
-    return {
-      status: isSet(object.status)
-        ? healthCheckResponse_ServingStatusFromJSON(object.status)
-        : 0,
-    };
-  },
-
-  toJSON(message: HealthCheckResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined &&
-      (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(
-    base?: I,
-  ): HealthCheckResponse {
-    return HealthCheckResponse.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(
-    object: I,
-  ): HealthCheckResponse {
-    const message = createBaseHealthCheckResponse();
-    message.status = object.status ?? 0;
-    return message;
-  },
-};
-
-export type HealthService = typeof HealthService;
-export const HealthService = {
-  check: {
-    path: '/com.ql.health.Health/Check',
-    requestStream: false,
-    responseStream: false,
-    requestSerialize: (value: HealthCheckRequest) =>
-      Buffer.from(HealthCheckRequest.encode(value).finish()),
-    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
-    responseSerialize: (value: HealthCheckResponse) =>
-      Buffer.from(HealthCheckResponse.encode(value).finish()),
-    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
-  },
-  watch: {
-    path: '/com.ql.health.Health/Watch',
-    requestStream: false,
-    responseStream: true,
-    requestSerialize: (value: HealthCheckRequest) =>
-      Buffer.from(HealthCheckRequest.encode(value).finish()),
-    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
-    responseSerialize: (value: HealthCheckResponse) =>
-      Buffer.from(HealthCheckResponse.encode(value).finish()),
-    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
-  },
-} as const;
-
-export interface HealthServer extends UntypedServiceImplementation {
-  check: handleUnaryCall<HealthCheckRequest, HealthCheckResponse>;
-  watch: handleServerStreamingCall<HealthCheckRequest, HealthCheckResponse>;
-}
-
-export interface HealthClient extends Client {
-  check(
-    request: HealthCheckRequest,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
-  ): ClientUnaryCall;
-  check(
-    request: HealthCheckRequest,
-    metadata: Metadata,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
-  ): ClientUnaryCall;
-  check(
-    request: HealthCheckRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (
-      error: ServiceError | null,
-      response: HealthCheckResponse,
-    ) => void,
-  ): ClientUnaryCall;
-  watch(
-    request: HealthCheckRequest,
-    options?: Partial<CallOptions>,
-  ): ClientReadableStream<HealthCheckResponse>;
-  watch(
-    request: HealthCheckRequest,
-    metadata?: Metadata,
-    options?: Partial<CallOptions>,
-  ): ClientReadableStream<HealthCheckResponse>;
-}
-
-export const HealthClient = makeGenericClientConstructor(
-  HealthService,
-  'com.ql.health.Health',
-) as unknown as {
-  new (
-    address: string,
-    credentials: ChannelCredentials,
-    options?: Partial<ClientOptions>,
-  ): HealthClient;
-  service: typeof HealthService;
-};
-
-type Builtin =
-  | Date
-  | Function
-  | Uint8Array
-  | string
-  | number
-  | boolean
-  | undefined;
-
-export type DeepPartial<T> = T extends Builtin
-  ? T
-  : T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U>
-  ? ReadonlyArray<DeepPartial<U>>
-  : T extends {}
-  ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin
-  ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
-      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
-    };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}

back/public.ts

@@ -1,35 +0,0 @@
-import express from 'express';
-import Logger from './loaders/logger';
-import config from './config';
-import { HealthClient } from './protos/health';
-import { credentials } from '@grpc/grpc-js';
-
-const app = express();
-const client = new HealthClient(
-  `0.0.0.0:${config.cronPort}`,
-  credentials.createInsecure(),
-);
-
-app.get('/api/health', (req, res) => {
-  client.check({ service: 'cron' }, (err, response) => {
-    if (err) {
-      return res.status(200).send({ code: 500, error: err });
-    }
-    return res.status(200).send({ code: 200, data: response });
-  });
-});
-
-app
-  .listen(config.publicPort, async () => {
-    await require('./loaders/sentry').default({ expressApp: app });
-    await require('./loaders/db').default();
-
-    Logger.debug(`✌️ 公共服务启动成功！`);
-    console.debug(`✌️ 公共服务启动成功！`);
-    process.send?.('ready');
-  })
-  .on('error', (err) => {
-    Logger.error(err);
-    console.error(err);
-    process.exit(1);
-  });

back/schedule.ts

@@ -0,0 +1,55 @@
+import schedule from 'node-schedule';
+import express from 'express';
+import { exec } from 'child_process';
+import Logger from './loaders/logger';
+import { CrontabModel, CrontabStatus } from './data/cron';
+import config from './config';
+
+const app = express();
+
+const run = async () => {
+  CrontabModel.findAll({ where: {} })
+    .then((docs) => {
+      if (docs && docs.length > 0) {
+        for (let i = 0; i < docs.length; i++) {
+          const task = docs[i];
+          const _schedule = task.schedule && task.schedule.split(/ +/);
+          if (
+            _schedule &&
+            _schedule.length > 5 &&
+            task.status !== CrontabStatus.disabled &&
+            !task.isDisabled
+          ) {
+            schedule.scheduleJob(task.schedule, function () {
+              let command = task.command as string;
+              if (!command.includes('task ') && !command.includes('ql ')) {
+                command = `task ${command}`;
+              }
+              exec(command);
+            });
+          }
+        }
+      }
+    })
+    .catch((err) => {
+      Logger.error(err);
+      process.exit(1);
+    });
+};
+
+app
+  .listen(config.cronPort, async () => {
+    await require('./loaders/sentry').default({ expressApp: app });
+    await require('./loaders/db').default();
+
+    await run();
+    Logger.info(`
+      ################################################
+      🛡️  Schedule listening on port: ${config.cronPort} 🛡️
+      ################################################
+    `);
+  })
+  .on('error', (err) => {
+    Logger.error(err);
+    process.exit(1);
+  });

back/schedule/addCron.ts

@@ -1,46 +0,0 @@
-import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
-import { AddCronRequest, AddCronResponse } from '../protos/cron';
-import nodeSchedule from 'node-schedule';
-import { scheduleStacks } from './data';
-import { runCron } from '../shared/runCron';
-import { QL_PREFIX, TASK_PREFIX } from '../config/const';
-import Logger from '../loaders/logger';
-import dayjs from 'dayjs';
-
-const addCron = (
-  call: ServerUnaryCall<AddCronRequest, AddCronResponse>,
-  callback: sendUnaryData<AddCronResponse>,
-) => {
-  for (const item of call.request.crons) {
-    const { id, schedule, command } = item;
-    if (scheduleStacks.has(id)) {
-      scheduleStacks.get(id)?.cancel();
-    }
-
-    let cmdStr = command.trim();
-    if (!cmdStr.startsWith(TASK_PREFIX) && !cmdStr.startsWith(QL_PREFIX)) {
-      cmdStr = `${TASK_PREFIX}${cmdStr}`;
-    }
-
-    Logger.info(
-      '[schedule][创建定时任务], 任务ID: %s, cron: %s, 执行命令: %s',
-      id,
-      schedule,
-      command,
-    );
-
-    scheduleStacks.set(
-      id,
-      nodeSchedule.scheduleJob(id, schedule, async () => {
-        Logger.info(
-          `[schedule][准备运行任务] 命令: ${cmdStr}`,
-        );
-        runCron(`ID=${id} ${cmdStr}`);
-      }),
-    );
-  }
-
-  callback(null, null);
-};
-
-export { addCron };

back/schedule/client.ts

@@ -1,40 +0,0 @@
-import { credentials } from '@grpc/grpc-js';
-import {
-  AddCronRequest,
-  AddCronResponse,
-  CronClient,
-  DeleteCronRequest,
-  DeleteCronResponse,
-} from '../protos/cron';
-import config from '../config';
-
-class Client {
-  private client = new CronClient(
-    `0.0.0.0:${config.cronPort}`,
-    credentials.createInsecure(),
-  );
-
-  addCron(request: AddCronRequest['crons']): Promise<AddCronResponse> {
-    return new Promise((resolve, reject) => {
-      this.client.addCron({ crons: request }, (err, res) => {
-        if (err) {
-          reject(err);
-        }
-        resolve(res);
-      });
-    });
-  }
-
-  delCron(request: DeleteCronRequest['ids']): Promise<DeleteCronResponse> {
-    return new Promise((resolve, reject) => {
-      this.client.delCron({ ids: request }, (err, res) => {
-        if (err) {
-          reject(err);
-        }
-        resolve(res);
-      });
-    });
-  }
-}
-
-export default new Client();

back/schedule/data.ts

@@ -1,6 +0,0 @@
-import nodeSchedule from 'node-schedule';
-import { ToadScheduler } from 'toad-scheduler';
-
-export const scheduleStacks = new Map<string, nodeSchedule.Job>();
-
-export const intervalSchedule = new ToadScheduler();

back/schedule/delCron.ts

@@ -1,24 +0,0 @@
-import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
-import { DeleteCronRequest, DeleteCronResponse } from '../protos/cron';
-import { scheduleStacks } from './data';
-import Logger from '../loaders/logger';
-
-const delCron = (
-  call: ServerUnaryCall<DeleteCronRequest, DeleteCronResponse>,
-  callback: sendUnaryData<DeleteCronResponse>,
-) => {
-  for (const id of call.request.ids) {
-    if (scheduleStacks.has(id)) {
-      Logger.info(
-        '[schedule][取消定时任务], 任务ID: %s',
-        id,
-      );
-      scheduleStacks.get(id)?.cancel();
-      scheduleStacks.delete(id);
-    }
-  }
-
-  callback(null, null);
-};
-
-export { delCron };

back/schedule/health.ts

@@ -1,35 +0,0 @@
-import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
-import { HealthCheckRequest, HealthCheckResponse } from '../protos/health';
-import config from '../config';
-import { promiseExec } from '../config/util';
-
-const check = async (
-  call: ServerUnaryCall<HealthCheckRequest, HealthCheckResponse>,
-  callback: sendUnaryData<HealthCheckResponse>,
-) => {
-  switch (call.request.service) {
-    case 'cron':
-      const res = await promiseExec(
-        `curl -s http://0.0.0.0:${config.port}/api/system`,
-      );
-
-      if (res.includes('200')) {
-        return callback(null, { status: 1 });
-      }
-
-      const panelErrLog = await promiseExec(
-        `tail -n 300 ~/.pm2/logs/panel-error.log`,
-      );
-      const scheduleErrLog = await promiseExec(
-        `tail -n 300 ~/.pm2/logs/schedule-error.log`,
-      );
-      return callback(
-        new Error(`${scheduleErrLog || ''}\n${panelErrLog || ''}\n${res}`.trim()),
-      );
-
-    default:
-      return callback(null, { status: 1 });
-  }
-};
-
-export { check };

back/schedule/index.ts

@@ -1,25 +0,0 @@
-import { Server, ServerCredentials } from '@grpc/grpc-js';
-import { CronService } from '../protos/cron';
-import { addCron } from './addCron';
-import { delCron } from './delCron';
-import { HealthService } from '../protos/health';
-import { check } from './health';
-import config from '../config';
-import Logger from '../loaders/logger';
-
-const server = new Server();
-server.addService(HealthService, { check });
-server.addService(CronService, { addCron, delCron });
-server.bindAsync(
-  `0.0.0.0:${config.cronPort}`,
-  ServerCredentials.createInsecure(),
-  (err, port) => {
-    if (err) {
-      throw err;
-    }
-    server.start();
-    Logger.debug(`✌️ 定时服务启动成功！`);
-    console.debug(`✌️ 定时服务启动成功！`);
-    process.send?.('ready');
-  },
-);

back/services/cron.ts

@@ -2,26 +2,21 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
-import { exec, execSync } from 'child_process';
+import { exec, execSync, spawn } from 'child_process';
 import fs from 'fs';
 import cron_parser from 'cron-parser';
-import { getFileContentByName, fileExist, killTask, getUniqPath, safeJSONParse } from '../config/util';
+import { getFileContentByName, concurrentRun } from '../config/util';
 import { promises, existsSync } from 'fs';
-import { Op, where, col as colFn, FindOptions, fn } from 'sequelize';
+import { promisify } from 'util';
-import path from 'path';
+import { Op } from 'sequelize';
-import { TASK_PREFIX, QL_PREFIX } from '../config/const';
-import cronClient from '../schedule/client';
-import taskLimit from '../shared/pLimit';
-import { spawn } from 'cross-spawn';
-import dayjs from 'dayjs';
 
 @Service()
 export default class CronService {
-  constructor(@Inject('logger') private logger: winston.Logger) { }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   private isSixCron(cron: Crontab) {
     const { schedule } = cron;
-    if (Number(schedule?.split(/ +/).length) > 5) {
+    if (schedule.split(/ +/).length === 6) {
       return true;
     }
     return false;
@@ -31,40 +26,24 @@ export default class CronService {
     const tab = new Crontab(payload);
     tab.saved = false;
     const doc = await this.insert(tab);
-    if (this.isSixCron(doc)) {
+    await this.set_crontab(this.isSixCron(doc));
-      await cronClient.addCron([
-        { id: String(doc.id), schedule: doc.schedule!, command: doc.command },
-      ]);
-    }
-    await this.set_crontab();
     return doc;
   }
 
   public async insert(payload: Crontab): Promise<Crontab> {
+    const cron = await CrontabModel.findOne({
+      where: { command: payload.command },
+    });
+    if (cron) {
+      return cron;
+    }
     return await CrontabModel.create(payload, { returning: true });
   }
 
   public async update(payload: Crontab): Promise<Crontab> {
-    const doc = await this.getDb({ id: payload.id });
+    payload.saved = false;
-    const tab = new Crontab({ ...doc, ...payload });
+    const newDoc = await this.updateDb(payload);
-    tab.saved = false;
+    await this.set_crontab(this.isSixCron(newDoc));
-    const newDoc = await this.updateDb(tab);
-    if (doc.isDisabled === 1) {
-      return newDoc;
-    }
-    if (this.isSixCron(doc)) {
-      await cronClient.delCron([String(newDoc.id)]);
-    }
-    if (this.isSixCron(newDoc)) {
-      await cronClient.addCron([
-        {
-          id: String(newDoc.id),
-          schedule: newDoc.schedule!,
-          command: newDoc.command,
-        },
-      ]);
-    }
-    await this.set_crontab();
     return newDoc;
   }
 
@@ -103,8 +82,7 @@ export default class CronService {
 
   public async remove(ids: number[]) {
     await CrontabModel.destroy({ where: { id: ids } });
-    await cronClient.delCron(ids.map(String));
+    await this.set_crontab(true);
-    await this.set_crontab();
   }
 
   public async pin(ids: number[]) {
@@ -139,80 +117,9 @@ export default class CronService {
     }
   }
 
-  private formatViewQuery(query: any, viewQuery: any) {
+  public async crontabs(searchText?: string): Promise<Crontab[]> {
-    if (viewQuery.filters && viewQuery.filters.length > 0) {
+    let query = {};
-      const primaryOperate = viewQuery.filterRelation === 'or' ? Op.or : Op.and;
-      if (!query[primaryOperate]) {
-        query[primaryOperate] = [];
-      }
-      for (const col of viewQuery.filters) {
-        const { property, value, operation } = col;
-        let q: any = {};
-        let operate2 = null;
-        let operate = null;
-        switch (operation) {
-          case 'Reg':
-            operate = Op.like;
-            operate2 = Op.or;
-            break;
-          case 'NotReg':
-            operate = Op.notLike;
-            operate2 = Op.and;
-            break;
-          case 'In':
-            q[Op.or] = [
-              {
-                [property]: Array.isArray(value) ? value : [value],
-              },
-              property === 'status' && value.includes(2)
-                ? { isDisabled: 1 }
-                : {},
-            ];
-            break;
-          case 'Nin':
-            q[Op.and] = [
-              {
-                [property]: {
-                  [Op.notIn]: Array.isArray(value) ? value : [value],
-                },
-              },
-              property === 'status' && value.includes(2)
-                ? { isDisabled: { [Op.ne]: 1 } }
-                : {},
-            ];
-            break;
-          default:
-            break;
-        }
-        if (operate && operate2) {
-          q[property] = {
-            [Op.or]: [
-              {
-                [operate2]: [
-                  { [operate]: `%${value}%` },
-                  { [operate]: `%${encodeURI(value)}%` },
-                ],
-              },
-              {
-                [operate2]: [
-                  where(colFn(property), operate, `%${value}%`),
-                  where(colFn(property), operate, `%${encodeURI(value)}%`),
-                ],
-              },
-            ],
-          };
-        }
-        query[primaryOperate].push(q);
-      }
-    }
-  }
-
-  private formatSearchText(query: any, searchText: string | undefined) {
     if (searchText) {
-      if (!query[Op.and]) {
-        query[Op.and] = [];
-      }
-      let q: any = {};
       const textArray = searchText.split(':');
       switch (textArray[0]) {
         case 'name':
@@ -220,136 +127,50 @@ export default class CronService {
         case 'schedule':
         case 'label':
           const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-          q[column] = {
+          query = {
-            [Op.or]: [
+            [column]: {
-              { [Op.like]: `%${textArray[1]}%` },
+              [Op.or]: [
-              { [Op.like]: `%${encodeURI(textArray[1])}%` },
+                { [Op.like]: `%${textArray[1]}%` },
-            ],
+                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
+              ],
+            },
           };
           break;
         default:
           const reg = {
             [Op.or]: [
               { [Op.like]: `%${searchText}%` },
-              { [Op.like]: `%${encodeURI(searchText)}%` },
+              { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+            ],
+          };
+          query = {
+            [Op.or]: [
+              {
+                name: reg,
+              },
+              {
+                command: reg,
+              },
+              {
+                schedule: reg,
+              },
+              {
+                labels: reg,
+              },
             ],
           };
-          q[Op.or] = [
-            {
-              name: reg,
-            },
-            {
-              command: reg,
-            },
-            {
-              schedule: reg,
-            },
-            {
-              labels: reg,
-            },
-          ];
           break;
       }
-      query[Op.and].push(q);
     }
-  }
-
-  private formatFilterQuery(query: any, filterQuery: any) {
-    if (filterQuery) {
-      if (!query[Op.and]) {
-        query[Op.and] = [];
-      }
-      const filterKeys: any = Object.keys(filterQuery);
-      for (const key of filterKeys) {
-        let q: any = {};
-        if (!filterQuery[key]) continue;
-        if (key === 'status') {
-          if (filterQuery[key].includes(CrontabStatus.disabled)) {
-            q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] };
-          } else {
-            q = { [Op.and]: [{ [key]: filterQuery[key] }, { isDisabled: 0 }] };
-          }
-        } else {
-          q[key] = filterQuery[key];
-        }
-        query[Op.and].push(q);
-      }
-    }
-  }
-
-  private formatViewSort(order: string[][], viewQuery: any) {
-    if (viewQuery.sorts && viewQuery.sorts.length > 0) {
-      for (const { property, type } of viewQuery.sorts) {
-        order.unshift([property, type]);
-      }
-    }
-  }
-
-  public async find({
-    log_path,
-  }: {
-    log_path: string;
-  }): Promise<Crontab | null> {
     try {
-      const result = await CrontabModel.findOne({ where: { log_path } });
+      const result = await CrontabModel.findAll({ where: query });
-      return result;
+      return result as any;
     } catch (error) {
       throw error;
     }
   }
 
-  public async crontabs(params?: {
+  public async getDb(query: any): Promise<Crontab> {
-    searchValue: string;
-    page: string;
-    size: string;
-    sorter: string;
-    filters: string;
-    queryString: string;
-  }): Promise<{ data: Crontab[]; total: number }> {
-    const searchText = params?.searchValue;
-    const page = Number(params?.page || '0');
-    const size = Number(params?.size || '0');
-    const viewQuery = safeJSONParse(params?.queryString);
-    const filterQuery = safeJSONParse(params?.filters);
-    const sorterQuery = safeJSONParse(params?.sorter);
-
-    let query: any = {};
-    let order = [
-      ['isPinned', 'DESC'],
-      ['isDisabled', 'ASC'],
-      ['status', 'ASC'],
-      ['createdAt', 'DESC'],
-    ];
-
-    this.formatViewQuery(query, viewQuery);
-    this.formatSearchText(query, searchText);
-    this.formatFilterQuery(query, filterQuery);
-    this.formatViewSort(order, viewQuery);
-
-    if (sorterQuery) {
-      const { field, type } = sorterQuery;
-      if (field && type) {
-        order.unshift([field, type]);
-      }
-    }
-    let condition: any = {
-      where: query,
-      order: order,
-    };
-    if (page && size) {
-      condition.offset = (page - 1) * size;
-      condition.limit = size;
-    }
-    try {
-      const result = await CrontabModel.findAll(condition);
-      const count = await CrontabModel.count({ where: query });
-      return { data: result, total: count };
-    } catch (error) {
-      throw error;
-    }
-  }
-
-  public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Crontab);
   }
@@ -359,9 +180,10 @@ export default class CronService {
       { status: CrontabStatus.queued },
       { where: { id: ids } },
     );
-    ids.forEach((id) => {
+    concurrentRun(
-      this.runSingle(id);
+      ids.map((id) => async () => await this.runSingle(id)),
-    });
+      10,
+    );
   }
 
   public async stop(ids: number[]) {
@@ -369,103 +191,129 @@ export default class CronService {
     for (const doc of docs) {
       if (doc.pid) {
         try {
-          await killTask(doc.pid);
+          process.kill(-doc.pid);
         } catch (error) {
-          this.logger.error(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('zh', { hour12: false })
+            .replace(' 24:', ' 00:')} `,
+        );
+      }
     }
 
     await CrontabModel.update(
-      { status: CrontabStatus.idle, pid: undefined },
+      { status: CrontabStatus.queued, 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中不存在，所以截取前三个
+        pids = pids.slice(0, 3);
+        for (const id of pids) {
+          const c = `kill -9 ${id.slice(1)}`;
+          const { stdout, stderr } = await execAsync(c);
+          if (stderr) {
+            killLogs.push(stderr);
+          }
+          if (stdout) {
+            killLogs.push(stdout);
+          }
+        }
+      }
+      return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
+    } catch (e) {
+      return JSON.stringify(e);
+    }
+  }
+
   private async runSingle(cronId: number): Promise<number> {
-    return taskLimit.runWithCpuLimit(() => {
+    return new Promise(async (resolve: any) => {
-      return new Promise(async (resolve: any) => {
+      const cron = await this.getDb({ id: cronId });
-        const cron = await this.getDb({ id: cronId });
+      if (cron.status !== CrontabStatus.queued) {
-        if (cron.status !== CrontabStatus.queued) {
+        resolve();
-          resolve();
+        return;
-          return;
+      }
+
+      let { id, command, log_path } = cron;
+
+      this.logger.silly('Running job');
+      this.logger.silly('ID: ' + id);
+      this.logger.silly('Original command: ' + command);
+
+      let cmdStr = command;
+      if (!cmdStr.includes('task ') && !cmdStr.includes('ql ')) {
+        cmdStr = `task ${cmdStr}`;
+      }
+      if (cmdStr.endsWith('.js')) {
+        cmdStr = `${cmdStr} now`;
+      }
+
+      const cp = spawn(cmdStr, { shell: '/bin/bash' });
+
+      await CrontabModel.update(
+        { status: CrontabStatus.running, pid: cp.pid },
+        { where: { id } },
+      );
+      cp.stderr.on('data', (data) => {
+        if (log_path) {
+          fs.appendFileSync(`${log_path}`, `${data}`);
         }
-
+      });
-        let { id, command, log_path } = cron;
+      cp.on('error', (err) => {
-        const uniqPath = await getUniqPath(command, `${id}`);
+        if (log_path) {
-        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
+          fs.appendFileSync(`${log_path}`, `${JSON.stringify(err)}`);
-        const logDirPath = path.resolve(config.logPath, `${uniqPath}`);
-        if (log_path?.split('/')?.every(x => x !== uniqPath)) {
-          fs.mkdirSync(logDirPath, { recursive: true });
         }
-        const logPath = `${uniqPath}/${logTime}.log`;
+      });
-        const absolutePath = path.resolve(config.logPath, `${logPath}`);
-
-        this.logger.silly('Running job');
-        this.logger.silly('ID: ' + id);
-        this.logger.silly('Original command: ' + command);
-
-        let cmdStr = command;
-        if (!cmdStr.startsWith(TASK_PREFIX) && !cmdStr.startsWith(QL_PREFIX)) {
-          cmdStr = `${TASK_PREFIX}${cmdStr}`;
-        }
-        if (
-          cmdStr.endsWith('.js') ||
-          cmdStr.endsWith('.py') ||
-          cmdStr.endsWith('.pyc') ||
-          cmdStr.endsWith('.sh') ||
-          cmdStr.endsWith('.ts')
-        ) {
-          cmdStr = `${cmdStr} now`;
-        }
-
-        const cp = spawn(`real_log_path=${logPath} ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
 
+      cp.on('exit', async (code, signal) => {
+        this.logger.info(
+          `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
+        );
         await CrontabModel.update(
-          { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
+          { status: CrontabStatus.idle, pid: undefined },
           { where: { id } },
         );
-        cp.stderr.on('data', (data) => {
+        resolve();
-          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
+      });
-        });
+      cp.on('close', async (code) => {
-        cp.on('error', (err) => {
+        this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
-          fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
+        await CrontabModel.update(
-        });
+          { status: CrontabStatus.idle, pid: undefined },
-
+          { where: { id } },
-        cp.on('exit', async (code, signal) => {
+        );
-          this.logger.info(
+        resolve();
-            `[panel][任务退出] 任务 ${command} 进程id: ${cp.pid}, 退出码 ${code}`,
-          );
-        });
-        cp.on('close', async (code) => {
-          await CrontabModel.update(
-            { status: CrontabStatus.idle, pid: undefined },
-            { where: { id } },
-          );
-          resolve();
-        });
       });
     });
   }
 
   public async disabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
-    await cronClient.delCron(ids.map(String));
+    await this.set_crontab(true);
-    await this.set_crontab();
   }
 
   public async enabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
-    const docs = await CrontabModel.findAll({ where: { id: ids } });
+    await this.set_crontab(true);
-    const sixCron = docs
-      .filter((x) => this.isSixCron(x))
-      .map((doc) => ({
-        id: String(doc.id),
-        schedule: doc.schedule!,
-        command: doc.command,
-      }));
-    await cronClient.addCron(sixCron);
-    await this.set_crontab();
   }
 
   public async log(id: number) {
@@ -474,52 +322,51 @@ export default class CronService {
       return '';
     }
 
-    const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
+    if (doc.log_path) {
-    const logFileExist = doc.log_path && (await fileExist(absolutePath));
+      return getFileContentByName(`${doc.log_path}`);
-    if (logFileExist) {
+    }
-      return getFileContentByName(`${absolutePath}`);
+    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 getFileContentByName(`${logDir}/${files[files.length - 1]}`);
     } else {
-      return '任务未运行';
+      return '';
     }
   }
 
-  public async logs(id: number) {
+  private getKey(command: string) {
-    const doc = await this.getDb({ id });
+    const start =
-    if (!doc || !doc.log_path) {
+      command.lastIndexOf('/') !== -1 ? command.lastIndexOf('/') + 1 : 0;
-      return [];
+    const end =
-    }
+      command.lastIndexOf('.') !== -1
-
+        ? command.lastIndexOf('.')
-    const relativeDir = path.dirname(`${doc.log_path}`);
+        : command.length;
-    const dir = path.resolve(config.logPath, relativeDir);
+    return command.substring(start, end);
-    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);
-    } else {
-      return [];
-    }
   }
 
   private make_command(tab: Crontab) {
-    let command = tab.command.trim();
+    const crontab_job_string = `ID=${tab.id} ${tab.command}`;
-    if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
-      command = `${TASK_PREFIX}${tab.command}`;
-    }
-    const crontab_job_string = `ID=${tab.id} ${command}`;
     return crontab_job_string;
   }
 
-  private async set_crontab(data?: { data: Crontab[]; total: number }) {
+  private async set_crontab(needReloadSchedule: boolean = false) {
-    const tabs = data ?? (await this.crontabs());
+    const tabs = await this.crontabs();
     var crontab_string = '';
-    tabs.data.forEach((tab) => {
+    tabs.forEach((tab) => {
       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 += ' ';
@@ -533,30 +380,34 @@ export default class CronService {
       }
     });
 
+    this.logger.silly(crontab_string);
     fs.writeFileSync(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);
+    if (needReloadSchedule) {
+      exec(`pm2 reload schedule`);
+    }
     await CrontabModel.update({ saved: true }, { where: {} });
   }
 
   public import_crontab() {
     exec('crontab -l', (error, stdout, stderr) => {
-      const lines = stdout.split('\n');
+      var lines = stdout.split('\n');
-      const namePrefix = new Date().getTime();
+      var namePrefix = new Date().getTime();
 
       lines.reverse().forEach(async (line, index) => {
         line = line.replace(/\t+/g, ' ');
-        const regex =
+        var regex =
           /^((\@[a-zA-Z]+\s+)|(([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+))/;
-        const command = line.replace(regex, '').trim();
+        var command = line.replace(regex, '').trim();
-        const schedule = line.replace(command, '').trim();
+        var schedule = line.replace(command, '').trim();
 
         if (
           command &&
           schedule &&
           cron_parser.parseExpression(schedule).hasNext()
         ) {
-          const name = namePrefix + '_' + index;
+          var name = namePrefix + '_' + index;
 
           const _crontab = await CrontabModel.findOne({
             where: { command, schedule },
@@ -573,17 +424,7 @@ export default class CronService {
     });
   }
 
-  public async autosave_crontab() {
+  public autosave_crontab() {
-    const tabs = await this.crontabs();
+    return this.set_crontab();
-    this.set_crontab(tabs);
-
-    const sixCron = tabs.data
-      .filter((x) => this.isSixCron(x) && x.isDisabled !== 1)
-      .map((doc) => ({
-        id: String(doc.id),
-        schedule: doc.schedule!,
-        command: doc.command,
-      }));
-    await cronClient.addCron(sixCron);
   }
 }

back/services/cronView.ts

@@ -1,122 +0,0 @@
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import { CrontabView, CrontabViewModel } from '../data/cronView';
-import {
-  initPosition,
-  maxPosition,
-  minPosition,
-  stepPosition,
-} from '../data/env';
-import { FindOptions } from 'sequelize';
-
-@Service()
-export default class CronViewService {
-  constructor(@Inject('logger') private logger: winston.Logger) {}
-
-  public async create(payload: CrontabView): Promise<CrontabView> {
-    let position = initPosition;
-    const views = await this.list();
-    if (views && views.length > 0 && views[views.length - 1].position) {
-      position = views[views.length - 1].position as number;
-    }
-    position = position / 2;
-    const tab = new CrontabView({ ...payload, position });
-    const doc = await this.insert(tab);
-
-    await this.checkPosition(tab.position!);
-    return doc;
-  }
-
-  public async insert(payload: CrontabView): Promise<CrontabView> {
-    return await CrontabViewModel.create(payload, { returning: true });
-  }
-
-  public async update(payload: CrontabView): Promise<CrontabView> {
-    const doc = await this.getDb({ id: payload.id });
-    const tab = new CrontabView({ ...doc, ...payload });
-    const newDoc = await this.updateDb(tab);
-    return newDoc;
-  }
-
-  public async updateDb(payload: CrontabView): Promise<CrontabView> {
-    await CrontabViewModel.update(payload, { where: { id: payload.id } });
-    return await this.getDb({ id: payload.id });
-  }
-
-  public async remove(ids: number[]) {
-    await CrontabViewModel.destroy({ where: { id: ids } });
-  }
-
-  public async list(): Promise<CrontabView[]> {
-    try {
-      const result = await CrontabViewModel.findAll({
-        where: {},
-        order: [['position', 'DESC']],
-      });
-      return result;
-    } catch (error) {
-      throw error;
-    }
-  }
-
-  public async getDb(
-    query: FindOptions<CrontabView>['where'],
-  ): Promise<CrontabView> {
-    const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as CrontabView);
-  }
-
-  public async disabled(ids: number[]) {
-    await CrontabViewModel.update({ isDisabled: 1 }, { where: { id: ids } });
-  }
-
-  public async enabled(ids: number[]) {
-    await CrontabViewModel.update({ isDisabled: 0 }, { where: { id: ids } });
-  }
-
-  private async checkPosition(position: number) {
-    const precisionPosition = parseFloat(position.toPrecision(16));
-    if (precisionPosition < minPosition || precisionPosition > maxPosition) {
-      const envs = await this.list();
-      let position = initPosition;
-      for (const env of envs) {
-        position = position - stepPosition;
-        await this.updateDb({ id: env.id, position });
-      }
-    }
-  }
-
-  private getPrecisionPosition(position: number): number {
-    return parseFloat(position.toPrecision(16));
-  }
-
-  public async move({
-    id,
-    fromIndex,
-    toIndex,
-  }: {
-    fromIndex: number;
-    toIndex: number;
-    id: number;
-  }): Promise<CrontabView> {
-    let targetPosition: number;
-    const isUpward = fromIndex > toIndex;
-    const views = await this.list();
-    if (toIndex === 0 || toIndex === views.length - 1) {
-      targetPosition = isUpward
-        ? views[0].position! * 2
-        : views[toIndex].position! / 2;
-    } else {
-      targetPosition = isUpward
-        ? (views[toIndex].position! + views[toIndex - 1].position!) / 2
-        : (views[toIndex].position! + views[toIndex + 1].position!) / 2;
-    }
-    const newDoc = await this.update({
-      id,
-      position: this.getPrecisionPosition(targetPosition),
-    });
-
-    await this.checkPosition(targetPosition);
-    return newDoc;
-  }
-}

back/services/dependence.ts

@@ -1,6 +1,7 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
+import DataStore from 'nedb';
 import {
   Dependence,
   InstallDependenceCommandTypes,
@@ -8,15 +9,11 @@ import {
   DependenceTypes,
   unInstallDependenceCommandTypes,
   DependenceModel,
-  GetDependenceCommandTypes,
-  versionDependenceCommandTypes,
 } from '../data/dependence';
-import { spawn } from 'cross-spawn';
+import _ from 'lodash';
+import { spawn } from 'child_process';
 import SockService from './sock';
-import { FindOptions, Op } from 'sequelize';
+import { Op } from 'sequelize';
-import { promiseExecSuccess } from '../config/util';
-import dayjs from 'dayjs';
-import taskLimit from '../shared/pLimit';
 
 @Service()
 export default class DependenceService {
@@ -27,11 +24,11 @@ export default class DependenceService {
 
   public async create(payloads: Dependence[]): Promise<Dependence[]> {
     const tabs = payloads.map((x) => {
-      const tab = new Dependence({ ...x, status: DependenceStatus.queued });
+      const tab = new Dependence({ ...x, status: DependenceStatus.installing });
       return tab;
     });
     const docs = await this.insert(tabs);
-    this.installDependenceOneByOne(docs);
+    this.installOrUninstallDependencies(docs);
     return docs;
   }
 
@@ -48,10 +45,10 @@ export default class DependenceService {
     const tab = new Dependence({
       ...doc,
       ...other,
-      status: DependenceStatus.queued,
+      status: DependenceStatus.installing,
     });
     const newDoc = await this.updateDb(tab);
-    this.installDependenceOneByOne([newDoc]);
+    this.installOrUninstallDependencies([newDoc]);
     return newDoc;
   }
 
@@ -60,14 +57,13 @@ export default class DependenceService {
     return await this.getDb({ id: payload.id });
   }
 
-  public async remove(ids: number[], force = false): Promise<Dependence[]> {
+  public async remove(ids: number[]) {
     await DependenceModel.update(
-      { status: DependenceStatus.queued, log: [] },
+      { status: DependenceStatus.removing, log: [] },
       { where: { id: ids } },
     );
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installDependenceOneByOne(docs, false, force);
+    this.installOrUninstallDependencies(docs, false);
-    return docs;
   }
 
   public async removeDb(ids: number[]) {
@@ -81,10 +77,10 @@ export default class DependenceService {
   ): Promise<Dependence[]> {
     let condition = { ...query, type: DependenceTypes[type as any] };
     if (searchValue) {
-      const encodeText = encodeURI(searchValue);
+      const encodeText = encodeURIComponent(searchValue);
       const reg = {
         [Op.or]: [
-          { [Op.like]: `%${searchValue}%` },
+          { [Op.like]: `%${searchValue}&` },
           { [Op.like]: `%${encodeText}%` },
         ],
       };
@@ -102,211 +98,132 @@ export default class DependenceService {
     }
   }
 
-  public installDependenceOneByOne(
-    docs: Dependence[],
-    isInstall: boolean = true,
-    force: boolean = false,
-  ) {
-    docs.forEach((dep) => {
-      this.installOrUninstallDependency(dep, isInstall, force);
-    });
-  }
-
   public async reInstall(ids: number[]): Promise<Dependence[]> {
     await DependenceModel.update(
-      { status: DependenceStatus.queued, log: [] },
+      { status: DependenceStatus.installing, log: [] },
       { where: { id: ids } },
     );
 
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installDependenceOneByOne(docs);
+    await this.installOrUninstallDependencies(docs);
     return docs;
   }
 
-  private async find(query: any, sort: any = []): Promise<Dependence[]> {
+  private async find(query: any, sort?: any): Promise<Dependence[]> {
-    const docs = await DependenceModel.findAll({
+    const docs = await DependenceModel.findAll({ where: { ...query } });
-      where: { ...query },
-      order: [...sort, ['createdAt', 'DESC']],
-    });
     return docs;
   }
 
-  public async getDb(
+  public async getDb(query: any): Promise<Dependence> {
-    query: FindOptions<Dependence>['where'],
-  ): 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> {
-    taskLimit.updateDepLog(async () => {
+    const doc = await DependenceModel.findOne({ where: { id: ids } });
-      const docs = await DependenceModel.findAll({ where: { id: ids } });
+    const newLog = doc?.log ? [...doc.log, log] : [log];
-      for (const doc of docs) {
+    await DependenceModel.update({ log: newLog }, { where: { id: ids } });
-        const newLog = doc?.log ? [...doc.log, log] : [log];
-        await DependenceModel.update(
-          { log: newLog },
-          { where: { id: doc.id } },
-        );
-      }
-      return null;
-    });
   }
 
-  public installOrUninstallDependency(
+  public installOrUninstallDependencies(
-    dependency: Dependence,
+    dependencies: Dependence[],
     isInstall: boolean = true,
-    force: boolean = false,
   ) {
-    return taskLimit.runOneByOne(() => {
+    return new Promise(async (resolve) => {
-      return new Promise(async (resolve) => {
+      if (dependencies.length === 0) {
-        const depIds = [dependency.id!];
+        resolve(null);
-        const status = isInstall
+        return;
-          ? DependenceStatus.installing
+      }
-          : DependenceStatus.removing;
+      const depNames = dependencies.map((x) => x.name).join(' ');
-        await DependenceModel.update({ status }, { where: { id: depIds } });
+      const depRunCommand = (
-
+        isInstall
-        const socketMessageType = isInstall
+          ? InstallDependenceCommandTypes
-          ? 'installDependence'
+          : unInstallDependenceCommandTypes
-          : 'uninstallDependence';
+      )[dependencies[0].type as any];
-        let depName = dependency.name.trim();
+      const actionText = isInstall ? '安装' : '删除';
-        const depRunCommand = (
+      const depIds = dependencies.map((x) => x.id) as number[];
-          isInstall
+      const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
-            ? InstallDependenceCommandTypes
+      const startTime = Date.now();
-            : unInstallDependenceCommandTypes
+      this.sockService.sendMessage({
-        )[dependency.type];
+        type: 'installDependence',
-        const actionText = isInstall ? '安装' : '删除';
+        message: `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
-        const startTime = dayjs();
+          startTime,
-
+        ).toLocaleString()}`,
-        const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format(
+        references: depIds,
-          'YYYY-MM-DD HH:mm:ss',
+      });
-        )}\n\n`;
+      await this.updateLog(
+        depIds,
+        `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
+          startTime,
+        ).toLocaleString()}\n`,
+      );
+      cp.stdout.on('data', async (data) => {
         this.sockService.sendMessage({
-          type: socketMessageType,
+          type: 'installDependence',
-          message,
+          message: data.toString(),
           references: depIds,
         });
-        this.updateLog(depIds, message);
+        await this.updateLog(depIds, data.toString());
+      });
 
-        // 判断是否已经安装过依赖
+      cp.stderr.on('data', async (data) => {
-        if (isInstall) {
+        this.sockService.sendMessage({
-          const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
+          type: 'installDependence',
-          const depVersionStr = versionDependenceCommandTypes[dependency.type];
+          message: data.toString(),
-          let depVersion = '';
+          references: depIds,
-          if (depName.includes(depVersionStr)) {
+        });
-            const symbolRegx = new RegExp(
+        await this.updateLog(depIds, data.toString());
-              `(.*)${depVersionStr}([0-9\\.\\-\\+a-zA-Z]*)`,
+      });
-            );
-            const [, _depName, _depVersion] = depName.match(symbolRegx) || [];
-            if (_depVersion && _depName) {
-              depName = _depName;
-              depVersion = _depVersion;
-            }
-          }
-          const isNodeDependence = dependency.type === DependenceTypes.nodejs;
-          const isLinuxDependence = dependency.type === DependenceTypes.linux;
-          const isPythonDependence =
-            dependency.type === DependenceTypes.python3;
-          const depInfo = (
-            await promiseExecSuccess(
-              isNodeDependence
-                ? `${getCommandPrefix} | grep "${depName}" | head -1`
-                : `${getCommandPrefix} ${depName}`,
-            )
-          )
-            .replace(/\s{2,}/, ' ')
-            .replace(/\s+$/, '');
 
-          if (
+      cp.on('error', async (err) => {
-            depInfo &&
+        this.sockService.sendMessage({
-            ((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
+          type: 'installDependence',
-              (isLinuxDependence &&
+          message: JSON.stringify(err),
-                depInfo.toLocaleLowerCase().includes('installed')) ||
+          references: depIds,
-              isPythonDependence) &&
+        });
-            (!depVersion || depInfo.includes(depVersion))
+        await this.updateLog(depIds, JSON.stringify(err));
-          ) {
+        resolve(null);
-            const endTime = dayjs();
+      });
-            const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
+
-              'YYYY-MM-DD HH:mm:ss',
+      cp.on('close', async (code) => {
-            )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+        const endTime = Date.now();
-            this.sockService.sendMessage({
+        const isSucceed = code === 0;
-              type: socketMessageType,
+        const resultText = isSucceed ? '成功' : '失败';
-              message: _message,
+
-              references: depIds,
+        this.sockService.sendMessage({
-            });
+          type: 'installDependence',
-            this.updateLog(depIds, _message);
+          message: `依赖${actionText}${resultText}，结束时间 ${new Date(
-            await DependenceModel.update(
+            endTime,
-              { status: DependenceStatus.installed },
+          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
-              { where: { id: depIds } },
+          references: depIds,
-            );
+        });
-            return resolve(null);
+        await this.updateLog(
-          }
+          depIds,
+          `依赖${actionText}${resultText}，结束时间 ${new Date(
+            endTime,
+          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
+        );
+
+        let status = null;
+        if (isSucceed) {
+          status = isInstall
+            ? DependenceStatus.installed
+            : DependenceStatus.removed;
+        } else {
+          status = isInstall
+            ? DependenceStatus.installFailed
+            : DependenceStatus.removeFailed;
+        }
+        await DependenceModel.update({ status }, { where: { id: depIds } });
+
+        // 如果删除依赖成功，3秒后删除数据库记录
+        if (isSucceed && !isInstall) {
+          setTimeout(() => {
+            this.removeDb(depIds);
+          }, 5000);
         }
 
-        const cp = spawn(`${depRunCommand} ${dependency.name.trim()}`, {
+        resolve(null);
-          shell: '/bin/bash',
-        });
-
-        cp.stdout.on('data', async (data) => {
-          this.sockService.sendMessage({
-            type: socketMessageType,
-            message: data.toString(),
-            references: depIds,
-          });
-          this.updateLog(depIds, data.toString());
-        });
-
-        cp.stderr.on('data', async (data) => {
-          this.sockService.sendMessage({
-            type: socketMessageType,
-            message: data.toString(),
-            references: depIds,
-          });
-          this.updateLog(depIds, data.toString());
-        });
-
-        cp.on('error', async (err) => {
-          this.sockService.sendMessage({
-            type: socketMessageType,
-            message: JSON.stringify(err),
-            references: depIds,
-          });
-          this.updateLog(depIds, JSON.stringify(err));
-        });
-
-        cp.on('close', async (code) => {
-          const endTime = dayjs();
-          const isSucceed = code === 0;
-          const resultText = isSucceed ? '成功' : '失败';
-
-          const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
-          this.sockService.sendMessage({
-            type: socketMessageType,
-            message,
-            references: depIds,
-          });
-          this.updateLog(depIds, message);
-
-          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

@@ -1,18 +1,12 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
+import { getFileContentByName } from '../config/util';
 import config from '../config';
 import * as fs from 'fs';
-import {
+import DataStore from 'nedb';
-  Env,
+import { Env, EnvModel, EnvStatus, initEnvPosition } from '../data/env';
-  EnvModel,
+import _ from 'lodash';
-  EnvStatus,
+import { Op } from 'sequelize';
-  initPosition,
-  maxPosition,
-  minPosition,
-  stepPosition,
-} from '../data/env';
-import groupBy from 'lodash/groupBy';
-import { FindOptions, Op } from 'sequelize';
 
 @Service()
 export default class EnvService {
@@ -20,38 +14,27 @@ export default class EnvService {
 
   public async create(payloads: Env[]): Promise<Env[]> {
     const envs = await this.envs();
-    let position = initPosition;
+    let position = initEnvPosition;
-    if (
+    if (envs && envs.length > 0 && envs[envs.length - 1].position) {
-      envs &&
+      position = envs[envs.length - 1].position as number;
-      envs.length > 0 &&
-      typeof envs[envs.length - 1].position === 'number'
-    ) {
-      position = envs[envs.length - 1].position!;
     }
     const tabs = payloads.map((x) => {
-      position = position - stepPosition;
+      position = position / 2;
       const tab = new Env({ ...x, position });
       return tab;
     });
     const docs = await this.insert(tabs);
     await this.set_envs();
-    await this.checkPosition(tabs[tabs.length - 1].position!);
     return docs;
   }
 
   public async insert(payloads: Env[]): Promise<Env[]> {
-    const result = [];
+    const docs = await EnvModel.bulkCreate(payloads);
-    for (const env of payloads) {
+    return docs;
-      const doc = await EnvModel.create(env, { returning: true });
-      result.push(doc);
-    }
-    return result;
   }
 
   public async update(payload: Env): Promise<Env> {
-    const doc = await this.getDb({ id: payload.id });
+    const newDoc = await this.updateDb(payload);
-    const tab = new Env({ ...doc, ...payload });
-    const newDoc = await this.updateDb(tab);
     await this.set_envs();
     return newDoc;
   }
@@ -63,7 +46,6 @@ export default class EnvService {
 
   public async remove(ids: string[]) {
     await EnvModel.destroy({ where: { id: ids } });
-    await this.set_envs();
   }
 
   public async move(
@@ -81,47 +63,28 @@ export default class EnvService {
     const envs = await this.envs();
     if (toIndex === 0 || toIndex === envs.length - 1) {
       targetPosition = isUpward
-        ? envs[0].position! + stepPosition
+        ? envs[0].position * 2
-        : envs[toIndex].position! - stepPosition;
+        : envs[toIndex].position / 2;
     } else {
       targetPosition = isUpward
-        ? (envs[toIndex].position! + envs[toIndex - 1].position!) / 2
+        ? (envs[toIndex].position + envs[toIndex - 1].position) / 2
-        : (envs[toIndex].position! + envs[toIndex + 1].position!) / 2;
+        : (envs[toIndex].position + envs[toIndex + 1].position) / 2;
     }
-
     const newDoc = await this.update({
       id,
-      position: this.getPrecisionPosition(targetPosition),
+      position: targetPosition,
     });
-
-    await this.checkPosition(targetPosition, envs[toIndex].position!);
     return newDoc;
   }
 
-  private async checkPosition(position: number, edge: number = 0) {
+  public async envs(
-    const precisionPosition = parseFloat(position.toPrecision(16));
+    searchText: string = '',
-    if (
+    sort: any = { position: -1 },
-      precisionPosition < minPosition ||
+    query: any = {},
-      precisionPosition > maxPosition ||
+  ): Promise<Env[]> {
-      Math.abs(precisionPosition - edge) < minPosition
-    ) {
-      const envs = await this.envs();
-      let position = initPosition;
-      for (const env of envs) {
-        position = position - stepPosition;
-        await this.updateDb({ id: env.id, position });
-      }
-    }
-  }
-
-  private getPrecisionPosition(position: number): number {
-    return parseFloat(position.toPrecision(16));
-  }
-
-  public async envs(searchText: string = '', query: any = {}): Promise<Env[]> {
     let condition = { ...query };
     if (searchText) {
-      const encodeText = encodeURI(searchText);
+      const encodeText = encodeURIComponent(searchText);
       const reg = {
         [Op.or]: [
           { [Op.like]: `%${searchText}%` },
@@ -145,10 +108,7 @@ export default class EnvService {
       };
     }
     try {
-      const result = await this.find(condition, [
+      const result = await this.find(condition, [['position', 'DESC']]);
-        ['position', 'DESC'],
-        ['createdAt', 'ASC'],
-      ]);
       return result as any;
     } catch (error) {
       throw error;
@@ -163,7 +123,7 @@ export default class EnvService {
     return docs;
   }
 
-  public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
+  public async getDb(query: any): Promise<Env> {
     const doc: any = await EnvModel.findOne({ where: { ...query } });
     return doc && (doc.get({ plain: true }) as Env);
   }
@@ -187,24 +147,30 @@ export default class EnvService {
   }
 
   public async set_envs() {
-    const envs = await this.envs('', {
+    const envs = await this.envs(
-      name: { [Op.not]: null },
+      '',
-      status: EnvStatus.normal,
+      { position: -1 },
-    });
+      { name: { [Op.not]: null } },
-    const groups = groupBy(envs, 'name');
+    );
+    const groups = _.groupBy(envs, 'name');
     let env_string = '';
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
         const group = groups[key];
 
         // 忽略不符合bash要求的环境变量名称
-        if (/^[a-zA-Z_][0-9a-zA-Z_]*$/.test(key)) {
+        if (/^[a-zA-Z_][0-9a-zA-Z_]+$/.test(key)) {
-          let value = group
+          let value = _(group)
-            .map((x) => x.value)
+            .filter((x) => x.status !== EnvStatus.disabled)
+            .map('value')
             .join('&')
-            .replace(/'/g, "'\\''")
+            .replace(/ /g, '');
-            .trim();
+          if (/"/.test(value)) {
-          env_string += `export ${key}='${value}'\n`;
+            value = `'${value}'`;
+          } else {
+            value = `"${value}"`;
+          }
+          env_string += `export ${key}=${value}\n`;
         }
       }
     }

back/services/notify.ts

@@ -6,7 +6,6 @@ import got from 'got';
 import nodemailer from 'nodemailer';
 import crypto from 'crypto';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
-import { parseBody, parseHeaders } from '../config/util';
 
 @Service()
 export default class NotificationService {
@@ -17,29 +16,20 @@ export default class NotificationService {
     ['gotify', this.gotify],
     ['goCqHttpBot', this.goCqHttpBot],
     ['serverChan', this.serverChan],
-    ['pushDeer', this.pushDeer],
-    ['chat', this.chat],
     ['bark', this.bark],
     ['telegramBot', this.telegramBot],
     ['dingtalkBot', this.dingtalkBot],
     ['weWorkBot', this.weWorkBot],
     ['weWorkApp', this.weWorkApp],
-    ['aibotk', this.aibotk],
     ['iGot', this.iGot],
     ['pushPlus', this.pushPlus],
     ['email', this.email],
-    ['pushMe', this.pushMe],
-    ['webhook', this.webhook],
-    ['lark', this.lark],
   ]);
 
+  private timeout = 10000;
   private title = '';
   private content = '';
   private params!: Omit<NotificationInfo, 'type'>;
-  private gotOption = {
-    timeout: 10000,
-    retry: 1,
-  };
 
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
@@ -79,49 +69,37 @@ export default class NotificationService {
   }
 
   private async gotify() {
-    const { gotifyUrl, gotifyToken, gotifyPriority = 1 } = this.params;
+    const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
-    try {
+    const res: any = await got
-      const res: any = await got
+      .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
+        timeout: this.timeout,
-          ...this.gotOption,
+        retry: 0,
-          body: `title=${encodeURIComponent(
+        body: `title=${encodeURIComponent(
-            this.title,
+          this.title,
-          )}&message=${encodeURIComponent(
+        )}&message=${encodeURIComponent(
-            this.content,
+          this.content,
-          )}&priority=${gotifyPriority}`,
+        )}&priority=${gotifyPriority}`,
-          headers: {
+        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Type': 'application/x-www-form-urlencoded',
-          },
+        },
-        })
+      })
-        .json();
+      .json();
-      if (typeof res.id === 'number') {
+    return typeof res.id === 'number';
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async goCqHttpBot() {
     const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
-    try {
+    const res: any = await got
-      const res: any = await got
+      .post(
-        .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
+        `${goCqHttpBotUrl}?access_token=${goCqHttpBotToken}&${goCqHttpBotQq}`,
-          ...this.gotOption,
+        {
+          timeout: this.timeout,
+          retry: 0,
           json: { message: `${this.title}\n${this.content}` },
-          headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+        },
-        })
+      )
-        .json();
+      .json();
-      if (res.retcode === 0) {
+    return res.retcode === 0;
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async serverChan() {
@@ -129,97 +107,35 @@ export default class NotificationService {
     const url = serverChanKey.startsWith('SCT')
       ? `https://sctapi.ftqq.com/${serverChanKey}.send`
       : `https://sc.ftqq.com/${serverChanKey}.send`;
-    try {
+    const res: any = await got
-      const res: any = await got
+      .post(url, {
-        .post(url, {
+        timeout: this.timeout,
-          ...this.gotOption,
+        retry: 0,
-          body: `title=${this.title}&desp=${this.content}`,
+        body: `title=${this.title}&desp=${this.content}`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        })
+      })
-        .json();
+      .json();
-      if (res.errno === 0 || res.data.errno === 0) {
+    return res.errno === 0 || res.data.errno === 0;
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async pushDeer() {
-    const { pushDeerKey, pushDeerUrl } = this.params;
-    const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
-            this.title,
-          )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        })
-        .json();
-      if (
-        res.content.result.length !== undefined &&
-        res.content.result.length > 0
-      ) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async chat() {
-    const { chatUrl, chatToken } = this.params;
-    const url = `${chatUrl}${chatToken}`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          body: `payload={"text":"${this.title}\n${this.content}"}`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        })
-        .json();
-      if (res.success) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async bark() {
-    let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
+    let { barkPush, barkSound, barkGroup } = this.params;
-    if (!barkPush.startsWith('http')) {
+    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}`;
+    )}?sound=${barkSound}&group=${barkGroup}`;
-
+    const res: any = await got
-    try {
+      .get(url, {
-      const res: any = await got
+        timeout: this.timeout,
-        .get(url, {
+        retry: 0,
-          ...this.gotOption,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
-        })
+      .json();
-        .json();
+    return res.code === 200;
-      if (res.code === 200) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async telegramBot() {
@@ -251,23 +167,16 @@ export default class NotificationService {
         https: httpsAgent,
       };
     }
-    try {
+    const res: any = await got
-      const res: any = await got
+      .post(url, {
-        .post(url, {
+        timeout: this.timeout,
-          ...this.gotOption,
+        retry: 0,
-          body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
+        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-          agent,
+        agent,
-        })
+      })
-        .json();
+      .json();
-      if (res.ok) {
+    return !!res.ok;
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async dingtalkBot() {
@@ -281,63 +190,48 @@ export default class NotificationService {
       secretParam = `&timestamp=${dateNow}&sign=${result}`;
     }
     const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
-    try {
+    const res: any = await got
-      const res: any = await got
+      .post(url, {
-        .post(url, {
+        timeout: this.timeout,
-          ...this.gotOption,
+        retry: 0,
-          json: {
+        json: {
-            msgtype: 'text',
+          msgtype: 'text',
-            text: {
+          text: {
-              content: ` ${this.title}\n\n${this.content}`,
+            content: ` ${this.title}\n\n${this.content}`,
-            },
           },
-        })
+        },
-        .json();
+      })
-      if (res.errcode === 0) {
+      .json();
-        return true;
+    return res.errcode === 0;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async weWorkBot() {
-    const { weWorkBotKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } =
+    const { weWorkBotKey } = this.params;
-      this.params;
+    const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
-    const url = `${weWorkOrigin}/cgi-bin/webhook/send?key=${weWorkBotKey}`;
+    const res: any = await got
-    try {
+      .post(url, {
-      const res: any = await got
+        timeout: this.timeout,
-        .post(url, {
+        retry: 0,
-          ...this.gotOption,
+        json: {
-          json: {
+          msgtype: 'text',
-            msgtype: 'text',
+          text: {
-            text: {
+            content: ` ${this.title}\n\n${this.content}`,
-              content: ` ${this.title}\n\n${this.content}`,
-            },
           },
-        })
+        },
-        .json();
+      })
-      if (res.errcode === 0) {
+      .json();
-        return true;
+    return res.errcode === 0;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async weWorkApp() {
-    const { weWorkAppKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } =
+    const { weWorkAppKey } = this.params;
-      this.params;
     const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] =
       weWorkAppKey.split(',');
-    const url = `${weWorkOrigin}/cgi-bin/gettoken`;
+    const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
-    const tokenRes: any = await got
+    const { access_token } = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         json: {
           corpid,
           corpsecret,
@@ -383,274 +277,78 @@ export default class NotificationService {
         break;
     }
 
-    try {
+    const res: any = await got
-      const res: any = await got
+      .post(
-        .post(
+        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
-          `${weWorkOrigin}/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
+        {
-          {
+          timeout: this.timeout,
-            ...this.gotOption,
+          retry: 0,
-            json: {
-              touser,
-              agentid,
-              safe: '0',
-              ...options,
-            },
-          },
-        )
-        .json();
-
-      if (res.errcode === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async aibotk() {
-    const { aibotkKey, aibotkType, aibotkName } = this.params;
-    let url = '';
-    let json = {};
-    switch (aibotkType) {
-      case 'room':
-        url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
-        json = {
-          apiKey: `${aibotkKey}`,
-          roomName: `${aibotkName}`,
-          message: {
-            type: 1,
-            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
-          },
-        };
-        break;
-      case 'contact':
-        url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
-        json = {
-          apiKey: `${aibotkKey}`,
-          name: `${aibotkName}`,
-          message: {
-            type: 1,
-            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
-          },
-        };
-        break;
-    }
-
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
           json: {
-            ...json,
+            touser,
+            agentid,
+            safe: '0',
+            ...options,
           },
-        })
+        },
-        .json();
+      )
-      if (res.code === 0) {
+      .json();
-        return true;
+
-      } else {
+    return res.errcode === 0;
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async iGot() {
     const { iGotPushKey } = this.params;
     const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
-    try {
+    const res: any = await got
-      const res: any = await got
+      .post(url, {
-        .post(url, {
+        timeout: this.timeout,
-          ...this.gotOption,
+        retry: 0,
-          body: `title=${this.title}&content=${this.content}`,
+        body: `title=${this.title}&content=${this.content}`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        })
+      })
-        .json();
+      .json();
 
-      if (res.ret === 0) {
+    return res.ret === 0;
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async pushPlus() {
     const { pushPlusToken, pushPlusUser } = this.params;
     const url = `https://www.pushplus.plus/send`;
-    try {
+    const res: any = await got
-      const res: any = await got
+      .post(url, {
-        .post(url, {
+        timeout: this.timeout,
-          ...this.gotOption,
+        retry: 0,
-          json: {
+        json: {
-            token: `${pushPlusToken}`,
+          token: `${pushPlusToken}`,
-            title: `${this.title}`,
+          title: `${this.title}`,
-            content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
+          content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
-            topic: `${pushPlusUser || ''}`,
+          topic: `${pushPlusUser || ''}`,
-          },
+        },
-        })
+      })
-        .json();
+      .json();
 
-      if (res.code === 200) {
+    return res.code === 200;
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async lark() {
-    let { larkKey } = this.params;
-
-    if (!larkKey.startsWith('http')) {
-      larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
-    }
-
-    try {
-      const res: any = await got
-        .post(larkKey, {
-          ...this.gotOption,
-          json: {
-            msg_type: 'text',
-            content: { text: `${this.title}\n\n${this.content}` },
-          },
-          headers: { 'Content-Type': 'application/json' },
-        })
-        .json();
-      if (res.StatusCode === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
   }
 
   private async email() {
     const { emailPass, emailService, emailUser } = this.params;
+    const transporter = nodemailer.createTransport({
+      service: emailService,
+      auth: {
+        user: emailUser,
+        pass: emailPass,
+      },
+    });
 
-    try {
+    const info = await transporter.sendMail({
-      const transporter = nodemailer.createTransport({
+      from: `"青龙快讯" <${emailUser}>`,
-        service: emailService,
+      to: `${emailUser}`,
-        auth: {
+      subject: `${this.title}`,
-          user: emailUser,
+      html: `${this.content.replace(/\n/g, '<br/>')}`,
-          pass: emailPass,
+    });
-        },
-      });
 
-      const info = await transporter.sendMail({
+    transporter.close();
-        from: `"青龙快讯" <${emailUser}>`,
-        to: `${emailUser}`,
-        subject: `${this.title}`,
-        html: `${this.content.replace(/\n/g, '<br/>')}`,
-      });
 
-      transporter.close();
+    return !!info.messageId;
-
-      if (info.messageId) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(info));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async pushMe() {
-    const { pushMeKey } = this.params;
-    try {
-      const res: any = await got.post(
-        `https://push.i-i.me/?push_key=${pushMeKey}`,
-        {
-          ...this.gotOption,
-          json: {
-            title: this.title,
-            content: this.content,
-          },
-          headers: { 'Content-Type': 'application/json' },
-        },
-      );
-      if (res.body === 'success') {
-        return true;
-      } else {
-        throw new Error(res.body);
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async webhook() {
-    const {
-      webhookUrl,
-      webhookBody,
-      webhookHeaders,
-      webhookMethod,
-      webhookContentType,
-    } = this.params;
-
-    const { formatBody, formatUrl } = this.formatNotifyContent(
-      webhookUrl,
-      webhookBody,
-    );
-    if (!formatUrl && !formatBody) {
-      return false;
-    }
-    const headers = parseHeaders(webhookHeaders);
-    const body = parseBody(formatBody, webhookContentType);
-    const bodyParam = this.formatBody(webhookContentType, body);
-    const options = {
-      method: webhookMethod,
-      headers,
-      ...this.gotOption,
-      allowGetBody: true,
-      ...bodyParam,
-    };
-    try {
-      const res = await got(formatUrl, options);
-      if (String(res.statusCode).startsWith('20')) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private formatBody(contentType: string, body: any): object {
-    if (!body) return {};
-    switch (contentType) {
-      case 'application/json':
-        return { json: body };
-      case 'multipart/form-data':
-        return { form: body };
-      case 'application/x-www-form-urlencoded':
-        return { body };
-    }
-    return {};
-  }
-
-  private formatNotifyContent(url: string, body: string) {
-    if (!url.includes('$title') && !body.includes('$title')) {
-      return {};
-    }
-
-    return {
-      formatUrl: url
-        ?.replaceAll('$title', encodeURIComponent(this.title))
-        ?.replaceAll('$content', encodeURIComponent(this.content)),
-      formatBody: body
-        ?.replaceAll('$title', this.title)
-        ?.replaceAll('$content', this.content),
-    };
   }
 }

back/services/open.ts

@@ -2,6 +2,7 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import { createRandomString } from '../config/util';
 import config from '../config';
+import DataStore from 'nedb';
 import { App, AppModel } from '../data/open';
 import { v4 as uuidV4 } from 'uuid';
 import sequelize, { Op } from 'sequelize';
@@ -24,8 +25,8 @@ export default class OpenService {
     return { ...doc, tokens: [] };
   }
 
-  public async insert(payload: App): Promise<App> {
+  public async insert(payloads: App): Promise<App> {
-    const doc = await AppModel.create(payload, { returning: true });
+    const doc = await AppModel.create(payloads, { returning: true });
     return doc.get({ plain: true }) as App;
   }
 
@@ -53,17 +54,7 @@ export default class OpenService {
   }
 
   public async resetSecret(id: number): Promise<App> {
-    const tab: any = {
+    const tab: any = { client_secret: createRandomString(24, 24), tokens: [] };
-      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;
   }
@@ -75,7 +66,7 @@ export default class OpenService {
   ): Promise<App[]> {
     let condition = { ...query };
     if (searchText) {
-      const encodeText = encodeURI(searchText);
+      const encodeText = encodeURIComponent(searchText);
       const reg = {
         [Op.or]: [
           { [Op.like]: `%${searchText}%` },
@@ -90,9 +81,7 @@ export default class OpenService {
     }
     try {
       const result = await this.find(condition);
-      return result
+      return result.map((x) => ({ ...x, tokens: [] }));
-        .filter((x) => x.name !== 'system')
-        .map((x) => ({ ...x, tokens: [] }));
     } catch (error) {
       throw error;
     }
@@ -110,26 +99,12 @@ export default class OpenService {
     client_id: string;
     client_secret: string;
   }): Promise<any> {
-    let token = uuidV4();
+    const 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 },
+        { tokens: [...(doc.tokens || []), { value: token, expiration }] },
         { where: { client_id, client_secret } },
       );
       return {
@@ -144,27 +119,4 @@ export default class OpenService {
       return { code: 400, message: 'client_id或client_seret有误' };
     }
   }
-
-  public async generateSystemToken(): Promise<{
-    value: string;
-    expiration: number;
-  }> {
-    let systemApp = (await AppModel.findOne({
-      where: { name: 'system' },
-    })) as App;
-    if (!systemApp) {
-      systemApp = await this.create({
-        name: 'system',
-        scopes: ['crons', 'system'],
-      } as App);
-    }
-    const { data } = await this.authToken({
-      client_id: systemApp.client_id,
-      client_secret: systemApp.client_secret,
-    });
-    return {
-      ...data,
-      value: data.token,
-    };
-  }
 }

back/services/schedule.ts

@@ -1,196 +1,62 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import nodeSchedule from 'node-schedule';
-import { ChildProcessWithoutNullStreams } from 'child_process';
+import { Crontab } from '../data/cron';
-import {
+import { exec } from 'child_process';
-  ToadScheduler,
-  LongIntervalJob,
-  SimpleIntervalSchedule,
-  Task,
-} from 'toad-scheduler';
-import dayjs from 'dayjs';
-import taskLimit from '../shared/pLimit';
-import { spawn } from 'cross-spawn';
-
-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 scheduleStacks = new Map<number, nodeSchedule.Job>();
-
-  private intervalSchedule = new ToadScheduler();
-
-  private maxBuffer = 200 * 1024 * 1024;
 
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  async runTask(
+  async generateSchedule({ id = 0, command, name, schedule }: Crontab) {
-    command: string,
-    callbacks: TaskCallbacks = {},
-    completionTime: 'start' | 'end' = 'end',
-  ) {
-    return taskLimit.runWithCpuLimit(() => {
-      return new Promise(async (resolve, reject) => {
-        try {
-          const startTime = dayjs();
-          await callbacks.onBefore?.(startTime);
-
-          const cp = spawn(command, { shell: '/bin/bash' });
-
-          callbacks.onStart?.(cp, startTime);
-          completionTime === 'start' && resolve(cp.pid);
-
-          cp.stdout.on('data', async (data) => {
-            await callbacks.onLog?.(data.toString());
-          });
-
-          cp.stderr.on('data', async (data) => {
-            this.logger.info(
-              '[panel][执行任务失败] 命令: %s, 错误信息: %j',
-              command,
-              data.toString(),
-            );
-            await callbacks.onError?.(data.toString());
-          });
-
-          cp.on('error', async (err) => {
-            this.logger.error(
-              '[panel][创建任务失败] 命令: %s, 错误信息: %j',
-              command,
-              err,
-            );
-            await callbacks.onError?.(JSON.stringify(err));
-          });
-
-          cp.on('exit', async (code, signal) => {
-            this.logger.info(
-              `[panel][任务退出] ${command} 进程id: ${cp.pid}, 退出码 ${code}`,
-            );
-          });
-
-          cp.on('close', async (code) => {
-            const endTime = dayjs();
-            await callbacks.onEnd?.(
-              cp,
-              endTime,
-              endTime.diff(startTime, 'seconds'),
-            );
-            resolve(null);
-          });
-        } catch (error) {
-          this.logger.error(
-            '[panel][执行任务失败] 命令: %s, 错误信息: %j',
-            command,
-            error,
-          );
-          await callbacks.onError?.(JSON.stringify(error));
-        }
-      });
-    });
-  }
-
-  async createCronTask(
-    { id = 0, command, name, schedule = '' }: ScheduleTaskType,
-    callbacks?: TaskCallbacks,
-    runImmediately = false,
-  ) {
-    const _id = this.formatId(id);
     this.logger.info(
-      '[panel][创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s',
+      '[创建定时任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
-      _id,
+      id,
       schedule,
       name,
       command,
     );
 
     this.scheduleStacks.set(
-      _id,
+      id,
-      nodeSchedule.scheduleJob(_id, schedule, async () => {
+      nodeSchedule.scheduleJob(id + '', schedule, async () => {
-        this.runTask(command, callbacks);
+        try {
+          exec(command, async (error, stdout, stderr) => {
+            if (error) {
+              await this.logger.info(
+                '执行任务%s失败，时间：%s, 错误信息：%j',
+                command,
+                new Date().toLocaleString(),
+                error,
+              );
+            }
+
+            if (stderr) {
+              await this.logger.info(
+                '执行任务%s失败，时间：%s, 错误信息：%j',
+                command,
+                new Date().toLocaleString(),
+                stderr,
+              );
+            }
+          });
+        } catch (error) {
+          await this.logger.info(
+            '执行任务%s失败，时间：%s, 错误信息：%j',
+            command,
+            new Date().toLocaleString(),
+            error,
+          );
+        } finally {
+        }
       }),
     );
-
-    if (runImmediately) {
-      this.runTask(command, callbacks);
-    }
   }
 
-  async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
+  async cancelSchedule({ id = 0, name }: Crontab) {
-    const _id = this.formatId(id);
+    this.logger.info('[取消定时任务]，任务名：%s', name);
-    this.logger.info('[panel][取消定时任务], 任务名: %s', name);
+    this.scheduleStacks.has(id) && this.scheduleStacks.get(id)?.cancel();
-    if (this.scheduleStacks.has(_id)) {
-      this.scheduleStacks.get(_id)?.cancel();
-      this.scheduleStacks.delete(_id);
-    }
-  }
-
-  async createIntervalTask(
-    { id = 0, command, name = '' }: ScheduleTaskType,
-    schedule: SimpleIntervalSchedule,
-    runImmediately = true,
-    callbacks?: TaskCallbacks,
-  ) {
-    const _id = this.formatId(id);
-    this.logger.info(
-      '[panel][创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s',
-      _id,
-      name,
-      command,
-    );
-    const task = new Task(
-      name,
-      () => {
-        this.runTask(command, callbacks);
-      },
-      (err) => {
-        this.logger.error(
-          '[执行任务失败] 命令: %s, 错误信息: %j',
-          command,
-          err,
-        );
-      },
-    );
-
-    const job = new LongIntervalJob(
-      { runImmediately: false, ...schedule },
-      task,
-      _id,
-    );
-
-    this.intervalSchedule.addIntervalJob(job);
-
-    if (runImmediately) {
-      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

@@ -1,13 +1,8 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import fs from 'fs';
+import { spawn } from 'child_process';
-import path from 'path';
 import SockService from './sock';
 import CronService from './cron';
-import ScheduleService, { TaskCallbacks } from './schedule';
-import config from '../config';
-import { TASK_COMMAND } from '../config/const';
-import { getPid, killTask } from '../config/util';
 
 @Service()
 export default class ScriptService {
@@ -15,51 +10,51 @@ export default class ScriptService {
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
     private cronService: CronService,
-    private scheduleService: ScheduleService,
   ) {}
 
-  private taskCallbacks(filePath: string): TaskCallbacks {
+  public async runScript(path: string) {
-    return {
+    const cp = spawn(`task -l ${path} now`, { shell: '/bin/bash' });
-      onEnd: async (cp, endTime, diff) => {
+
-        try {
+    cp.stdout.on('data', (data) => {
-          fs.unlinkSync(filePath);
+      this.sockService.sendMessage({
-        } catch (error) {}
+        type: 'manuallyRunScript',
-      },
+        message: data.toString(),
-      onError: async (message: string) => {
+      });
-        this.sockService.sendMessage({
+    });
-          type: 'manuallyRunScript',
+
-          message,
+    cp.stderr.on('data', (data) => {
-        });
+      this.sockService.sendMessage({
-      },
+        type: 'manuallyRunScript',
-      onLog: async (message: string) => {
+        message: data.toString(),
-        this.sockService.sendMessage({
+      });
-          type: 'manuallyRunScript',
+    });
-          message,
+
-        });
+    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 runScript(filePath: string) {
+  public async stopScript(path: string) {
-    const relativePath = path.relative(config.scriptPath, filePath);
+    const err = await this.cronService.killTask(`task -l ${path} now`);
-    const command = `${TASK_COMMAND} -l ${relativePath} now`;
+    const str = err ? `\n${err}` : '';
-    const pid = await this.scheduleService.runTask(
+    this.sockService.sendMessage({
-      command,
+      type: 'manuallyRunScript',
-      this.taskCallbacks(filePath),
+      message: `${str}\n## 执行结束...  ${new Date()
-      'start',
+        .toLocaleString('zh', { hour12: false })
-    );
+        .replace(' 24:', ' 00:')} `,
-
+    });
-    return { code: 200, data: pid };
-  }
-
-  public async stopScript(filePath: string, pid: number) {
-    if (!pid) {
-      const relativePath = path.relative(config.scriptPath, filePath);
-      pid = await getPid(`${TASK_COMMAND} -l ${relativePath} now`) as number;
-    }
-    try {
-      await killTask(pid);
-    } catch (error) {}
 
     return { code: 200 };
   }

back/services/sshKey.ts

@@ -1,116 +0,0 @@
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import fs, { existsSync } from 'fs';
-import os from 'os';
-import path from 'path';
-import { Subscription } from '../data/subscription';
-import { formatUrl } from '../config/subscription';
-import config from '../config';
-
-@Service()
-export default class SshKeyService {
-  private homedir = os.homedir();
-  private sshPath = config.sshdPath;
-  private sshConfigFilePath = path.resolve(this.homedir, '.ssh', 'config');
-  private sshConfigHeader = `Include ${path.join(this.sshPath, '*.config')}`;
-
-  constructor(@Inject('logger') private logger: winston.Logger) {
-    this.initSshConfigFile();
-  }
-
-  private initSshConfigFile() {
-    let config = '';
-    if (existsSync(this.sshConfigFilePath)) {
-      config = fs.readFileSync(this.sshConfigFilePath, { encoding: 'utf-8' });
-    } else {
-      fs.writeFileSync(this.sshConfigFilePath, '');
-    }
-    if (!config.includes(this.sshConfigHeader)) {
-      fs.writeFileSync(
-        this.sshConfigFilePath,
-        `${this.sshConfigHeader}\n\n${config}`,
-        { encoding: 'utf-8' },
-      );
-    }
-  }
-
-  private generatePrivateKeyFile(alias: string, key: string): void {
-    try {
-      fs.writeFileSync(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
-        encoding: 'utf8',
-        mode: '400',
-      });
-    } catch (error) {
-      this.logger.error('生成私钥文件失败', error);
-    }
-  }
-
-  private removePrivateKeyFile(alias: string): void {
-    try {
-      const filePath = path.join(this.sshPath, alias);
-      if (existsSync(filePath)) {
-        fs.unlinkSync(filePath);
-      }
-    } catch (error) {
-      this.logger.error('删除私钥文件失败', error);
-    }
-  }
-
-  private generateSingleSshConfig(alias: string, host: string, proxy?: string) {
-    if (host === 'github.com') {
-      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa`;
-    }
-    const proxyStr = proxy
-      ? `    ProxyCommand nc -v -x ${proxy} %h %p 2>/dev/null\n`
-      : '';
-    const config = `Host ${alias}\n    Hostname ${host}\n    IdentityFile ${path.join(
-      this.sshPath,
-      alias,
-    )}\n    StrictHostKeyChecking no\n${proxyStr}`;
-    fs.writeFileSync(`${path.join(this.sshPath, `${alias}.config`)}`, config, {
-      encoding: 'utf8',
-    });
-  }
-
-  private removeSshConfig(alias: string) {
-    try {
-      const filePath = path.join(this.sshPath, `${alias}.config`);
-      if (existsSync(filePath)) {
-        fs.unlinkSync(filePath);
-      }
-    } catch (error) {
-      this.logger.error(`删除ssh配置文件${alias}失败`, error);
-    }
-  }
-
-  public addSSHKey(
-    key: string,
-    alias: string,
-    host: string,
-    proxy?: string,
-  ): void {
-    this.generatePrivateKeyFile(alias, key);
-    this.generateSingleSshConfig(alias, host, proxy);
-  }
-
-  public removeSSHKey(alias: string, host: string, proxy?: string): void {
-    this.removePrivateKeyFile(alias);
-    this.removeSshConfig(alias);
-  }
-
-  public setSshConfig(docs: Subscription[]) {
-    for (const doc of docs) {
-      if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
-        const { alias, proxy } = doc;
-        const { host } = formatUrl(doc);
-        this.removePrivateKeyFile(alias);
-        this.removeSshConfig(alias);
-        this.generatePrivateKeyFile(
-          alias,
-          (doc.pull_option as any).private_key,
-        );
-        this.generateSingleSshConfig(alias, host, proxy);
-      }
-    }
-  }
-}

back/services/subscription.ts

@@ -1,375 +0,0 @@
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import config from '../config';
-import {
-  Subscription,
-  SubscriptionModel,
-  SubscriptionStatus,
-} from '../data/subscription';
-import { ChildProcessWithoutNullStreams } from 'child_process';
-import fs from 'fs';
-import {
-  getFileContentByName,
-  concurrentRun,
-  fileExist,
-  createFile,
-  killTask,
-  handleLogPath,
-  promiseExec,
-  emptyDir,
-} from '../config/util';
-import { promises, existsSync } from 'fs';
-import { FindOptions, Op } from 'sequelize';
-import path, { join } from 'path';
-import ScheduleService, { TaskCallbacks } from './schedule';
-import { SimpleIntervalSchedule } from 'toad-scheduler';
-import SockService from './sock';
-import SshKeyService from './sshKey';
-import dayjs from 'dayjs';
-import { LOG_END_SYMBOL } from '../config/const';
-import { formatCommand, formatUrl } from '../config/subscription';
-import { CrontabModel } from '../data/cron';
-import CrontabService from './cron';
-
-@Service()
-export default class SubscriptionService {
-  constructor(
-    @Inject('logger') private logger: winston.Logger,
-    private scheduleService: ScheduleService,
-    private sockService: SockService,
-    private sshKeyService: SshKeyService,
-    private crontabService: CrontabService,
-  ) { }
-
-  public async list(searchText?: string): Promise<Subscription[]> {
-    let query = {};
-    if (searchText) {
-      const reg = {
-        [Op.or]: [
-          { [Op.like]: `%${searchText}%` },
-          { [Op.like]: `%${encodeURI(searchText)}%` },
-        ],
-      };
-      query = {
-        [Op.or]: [
-          {
-            name: reg,
-          },
-          {
-            url: reg,
-          },
-        ],
-      };
-    }
-    try {
-      const result = await SubscriptionModel.findAll({
-        where: query,
-        order: [
-          ['is_disabled', 'ASC'],
-          ['createdAt', 'DESC'],
-        ],
-      });
-      return result;
-    } catch (error) {
-      throw error;
-    }
-  }
-
-  public async handleTask(
-    doc: Subscription,
-    needCreate = true,
-    runImmediately = false,
-  ) {
-    const { url } = formatUrl(doc);
-
-    doc.command = 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),
-        ));
-    }
-  }
-
-  public async setSshConfig() {
-    const docs = await SubscriptionModel.findAll();
-    this.sshKeyService.setSshConfig(docs);
-  }
-
-  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 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 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 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 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} 秒${LOG_END_SYMBOL}`,
-        );
-
-        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 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 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);
-    await this.setSshConfig();
-    return doc;
-  }
-
-  public async insert(payload: Subscription): Promise<Subscription> {
-    return await SubscriptionModel.create(payload, { returning: true });
-  }
-
-  public async update(payload: Subscription): Promise<Subscription> {
-    const doc = await this.getDb({ id: payload.id });
-    const tab = new Subscription({ ...doc, ...payload });
-    const newDoc = await this.updateDb(tab);
-    await this.handleTask(newDoc, !newDoc.is_disabled);
-    await this.setSshConfig();
-    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[], query: any) {
-    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
-    for (const doc of docs) {
-      await this.handleTask(doc, false);
-    }
-    await SubscriptionModel.destroy({ where: { id: ids } });
-    await this.setSshConfig();
-
-    if (query?.force === true) {
-      const crons = await CrontabModel.findAll({ where: { sub_id: ids } });
-      if (crons?.length) {
-        await this.crontabService.remove(crons.map(x => x.id!))
-      }
-      for (const doc of docs) {
-        const filePath = join(config.scriptPath, doc.alias);
-        emptyDir(filePath);
-      }
-    }
-  }
-
-  public async getDb(
-    query: FindOptions<Subscription>['where'],
-  ): Promise<Subscription> {
-    const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Subscription);
-  }
-
-  public async run(ids: number[]) {
-    await SubscriptionModel.update(
-      { status: SubscriptionStatus.queued },
-      { where: { id: ids } },
-    );
-    ids.forEach((id) => {
-      this.runSingle(id);
-    });
-  }
-
-  public async stop(ids: number[]) {
-    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
-    for (const doc of docs) {
-      if (doc.pid) {
-        try {
-          await killTask(doc.pid);
-        } catch (error) {
-          this.logger.error(error);
-        }
-      }
-    }
-
-    await SubscriptionModel.update(
-      { status: SubscriptionStatus.idle, pid: undefined },
-      { where: { id: ids } },
-    );
-  }
-
-  private async runSingle(subscriptionId: number) {
-    const subscription = await this.getDb({ id: subscriptionId });
-    if (subscription.status !== SubscriptionStatus.queued) {
-      return;
-    }
-
-    const command = formatCommand(subscription);
-
-    this.scheduleService.runTask(command, this.taskCallbacks(subscription));
-  }
-
-  public async disabled(ids: number[]) {
-    await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
-    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
-    await this.setSshConfig();
-    for (const doc of docs) {
-      await this.handleTask(doc, false);
-    }
-  }
-
-  public async enabled(ids: number[]) {
-    await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
-    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
-    await this.setSshConfig();
-    for (const doc of docs) {
-      await this.handleTask(doc);
-    }
-  }
-
-  public async log(id: number) {
-    const doc = await this.getDb({ id });
-    if (!doc || !doc.log_path) {
-      return '';
-    }
-
-    const absolutePath = await 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

@@ -1,34 +1,16 @@
-import { Response } from 'express';
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import {
+import * as fs from 'fs';
-  AuthDataType,
+import _ from 'lodash';
-  AuthInfo,
+import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
-  AuthInstance,
-  AuthModel,
-  AuthModelInfo,
-} from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
-import ScheduleService, { TaskCallbacks } from './schedule';
+import ScheduleService from './schedule';
-import { spawn } from 'cross-spawn';
+import { spawn } from 'child_process';
 import SockService from './sock';
 import got from 'got';
-import {
+import { dbs } from '../loaders/db';
-  getPid,
-  killTask,
-  parseContentVersion,
-  parseVersion,
-  promiseExec,
-  readDirs,
-} from '../config/util';
-import { TASK_COMMAND } from '../config/const';
-import taskLimit from '../shared/pLimit';
-import tar from 'tar';
-import path from 'path';
-import fs from 'fs';
-import { sum } from 'lodash';
 
 @Service()
 export default class SystemService {
@@ -41,20 +23,20 @@ export default class SystemService {
     private sockService: SockService,
   ) {}
 
-  public async getSystemConfig() {
+  public async getLogRemoveFrequency() {
-    const doc = await this.getDb({ type: AuthDataType.systemConfig });
+    const doc = await this.getDb({ type: AuthDataType.removeLogFrequency });
-    return doc || ({} as AuthInstance);
+    return (doc && doc.info) || {};
   }
 
-  private async updateAuthDb(payload: AuthInfo): Promise<AuthInstance> {
+  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<AuthInstance> {
+  public async getDb(query: any): Promise<any> {
     const doc: any = await AuthModel.findOne({ where: { ...query } });
-    return doc && doc.get({ plain: true });
+    return doc && (doc.get({ plain: true }) as any);
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -71,71 +53,65 @@ export default class SystemService {
       });
       return { code: 200, data: { ...result, code } };
     } else {
-      return { code: 400, message: '通知发送失败，请检查参数' };
+      return { code: 400, data: '通知发送失败，请检查参数' };
     }
   }
 
-  public async updateSystemConfig(info: AuthModelInfo) {
+  public async updateLogRemoveFrequency(frequency: number) {
-    const oDoc = await this.getSystemConfig();
     const result = await this.updateAuthDb({
-      ...oDoc,
+      type: AuthDataType.removeLogFrequency,
-      type: AuthDataType.systemConfig,
+      info: { frequency },
-      info,
     });
-    if (info.logRemoveFrequency) {
+    const cron = {
-      const cron = {
+      id: result.id,
-        id: result.id,
+      name: '删除日志',
-        name: '删除日志',
+      command: `ql rmlog ${frequency}`,
-        command: `ql rmlog ${info.logRemoveFrequency}`,
+      schedule: `5 23 */${frequency} * *`,
-      };
+    };
-      await this.scheduleService.cancelIntervalTask(cron);
+    await this.scheduleService.cancelSchedule(cron);
-      if (info.logRemoveFrequency > 0) {
+    if (frequency > 0) {
-        this.scheduleService.createIntervalTask(cron, {
+      await this.scheduleService.generateSchedule(cron);
-          days: info.logRemoveFrequency,
-        });
-      }
     }
-    if (info.cronConcurrency) {
+    return { code: 200, data: { ...cron } };
-      await taskLimit.setCustomLimit(info.cronConcurrency);
-    }
-    return { code: 200, data: info };
   }
 
   public async checkUpdate() {
     try {
-      const currentVersionContent = await parseVersion(config.versionFile);
+      const versionRegx = /.*export const version = \'(.*)\'\;/;
+      const logRegx = /.*export const changeLog = \`((.*\n.*)+)\`;/;
 
-      let lastVersionContent;
+      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
+      const currentVersion = currentVersionFile.match(versionRegx)![1];
+
+      let lastVersion = '';
+      let lastLog = '';
       try {
-        const result = await got.get(
+        const result = await Promise.race([
-          `${config.lastVersionFile}?t=${Date.now()}`,
+          got.get(config.lastVersionFile, { timeout: 1000, retry: 0 }),
-          {
+          got.get(`https://ghproxy.com/${config.lastVersionFile}`, {
-            timeout: 30000,
+            timeout: 5000,
-          },
+            retry: 0,
-        );
+          }),
-        lastVersionContent = await parseContentVersion(result.body);
+        ]);
+        const lastVersionFileContent = result.body;
+        lastVersion = lastVersionFileContent.match(versionRegx)![1];
+        lastLog = lastVersionFileContent.match(logRegx)
+          ? lastVersionFileContent.match(logRegx)![1]
+          : '';
       } catch (error) {}
 
-      if (!lastVersionContent) {
-        lastVersionContent = currentVersionContent;
-      }
-
       return {
         code: 200,
         data: {
-          hasNewVersion: this.checkHasNewVersion(
+          hasNewVersion: this.checkHasNewVersion(currentVersion, lastVersion),
-            currentVersionContent.version,
+          lastVersion,
-            lastVersionContent.version,
+          lastLog,
-          ),
-          lastVersion: lastVersionContent.version,
-          lastLog: lastVersionContent.changeLog,
-          lastLogLink: lastVersionContent.changeLogLink,
         },
       };
     } catch (error: any) {
       return {
         code: 400,
-        message: error.message,
+        data: error.message,
       };
     }
   }
@@ -160,8 +136,12 @@ export default class SystemService {
   }
 
   public async updateSystem() {
-    const cp = spawn('ql -l update false', { shell: '/bin/bash' });
+    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',
@@ -185,122 +165,4 @@ export default class SystemService {
 
     return { code: 200 };
   }
-
-  public async reloadSystem(target: 'system' | 'data') {
-    const cp = spawn(`ql -l reload ${target || ''}`, { shell: '/bin/bash' });
-
-    cp.stdout.on('data', (data) => {
-      this.sockService.sendMessage({
-        type: 'reloadSystem',
-        message: data.toString(),
-      });
-    });
-
-    cp.stderr.on('data', (data) => {
-      this.sockService.sendMessage({
-        type: 'reloadSystem',
-        message: data.toString(),
-      });
-    });
-
-    cp.on('error', (err) => {
-      this.sockService.sendMessage({
-        type: 'reloadSystem',
-        message: JSON.stringify(err),
-      });
-    });
-
-    return { code: 200 };
-  }
-
-  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: '通知发送失败，请检查系统设置/通知配置' };
-    }
-  }
-
-  public async run(
-    { command, logPath }: { command: string; logPath: string },
-    callback: TaskCallbacks,
-  ) {
-    if (!command.startsWith(TASK_COMMAND)) {
-      command = `${TASK_COMMAND} ${command}`;
-    }
-    this.scheduleService.runTask(
-      `real_log_path=${logPath} real_time=true ${command}`,
-      callback,
-    );
-  }
-
-  public async stop({ command, pid }: { command: string; pid: number }) {
-    if (!pid && !command) {
-      return { code: 400, message: '参数错误' };
-    }
-
-    if (pid) {
-      await killTask(pid);
-      return { code: 200 };
-    }
-
-    if (!command.startsWith(TASK_COMMAND)) {
-      command = `${TASK_COMMAND} ${command}`;
-    }
-    const _pid = await getPid(command);
-    if (_pid) {
-      await killTask(_pid);
-      return { code: 200 };
-    } else {
-      return { code: 400, message: '任务未找到' };
-    }
-  }
-
-  public async exportData(res: Response) {
-    try {
-      await tar.create(
-        { gzip: true, file: config.dataTgzFile, cwd: config.rootPath },
-        ['data'],
-      );
-      res.download(config.dataTgzFile);
-    } catch (error: any) {
-      return res.send({ code: 400, message: error.message });
-    }
-  }
-
-  public async importData() {
-    try {
-      await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
-      await tar.x({ file: config.dataTgzFile, cwd: config.tmpPath });
-      return { code: 200 };
-    } catch (error: any) {
-      return { code: 400, message: error.message };
-    }
-  }
-
-  public async getSystemLog(res: Response) {
-    const result = readDirs(config.systemLogPath, config.systemLogPath);
-    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
-    res.set({
-      'Content-Length': sum(logs.map((x) => x.size)),
-    });
-    (function sendFiles(res, fileNames) {
-      if (fileNames.length === 0) {
-        res.end();
-        return;
-      }
-
-      const currentLog = fileNames.shift();
-      if (currentLog) {
-        const currentFileStream = fs.createReadStream(
-          path.join(config.systemLogPath, currentLog.title),
-        );
-        currentFileStream.on('end', () => {
-          sendFiles(res, fileNames);
-        });
-        currentFileStream.pipe(res, { end: false });
-      }
-    })(res, logs);
-  }
 }

back/services/user.ts

@@ -1,29 +1,19 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import {
+import { createRandomString, getNetIp, getPlatform } from '../config/util';
-  createRandomString,
-  fileExist,
-  getNetIp,
-  getPlatform,
-  safeJSONParse,
-} 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 {
+import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
-  AuthDataType,
-  AuthInfo,
-  AuthModel,
-  AuthModelInfo,
-  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 dayjs from 'dayjs';
+import got from 'got';
 
 @Service()
 export default class UserService {
@@ -75,37 +65,32 @@ export default class UserService {
         return this.initAuthInfo();
       }
 
-      const retriesTime = Math.pow(3, retries) * 1000;
+      if (retries > 2 && Date.now() - lastlogon < Math.pow(3, retries) * 1000) {
-      if (retries > 2 && timestamp - lastlogon < retriesTime) {
-        const waitTime = Math.ceil(
-          (retriesTime - (timestamp - lastlogon)) / 1000,
-        );
         return {
           code: 410,
-          message: `失败次数过多，请${waitTime}秒后重试`,
+          message: `失败次数过多，请${Math.round(
-          data: waitTime,
+            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
-        };
+          )}秒后重试`,
-      }
+          data: Math.round(
-
+            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
-      if (
+          ),
-        username === cUsername &&
-        password === cPassword &&
-        twoFactorActivated &&
-        needTwoFactor
-      ) {
-        this.updateAuthInfo(content, {
-          isTwoFactorChecking: true,
-        });
-        return {
-          code: 420,
-          message: '',
         };
       }
 
       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 ? 60 : 20;
+        const expiration = twoFactorActivated ? 30 : 3;
         let token = jwt.sign({ data }, config.secret as any, {
           expiresIn: 60 * 60 * 24 * expiration,
           algorithm: 'HS384',
@@ -126,7 +111,7 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
             req.platform
           }端 登录成功，ip地址 ${ip}`,
         );
@@ -155,7 +140,7 @@ export default class UserService {
         });
         await this.notificationService.notify(
           '登录通知',
-          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
             req.platform
           }端 登录失败，ip地址 ${ip}`,
         );
@@ -170,16 +155,7 @@ export default class UserService {
             status: LoginStatus.fail,
           },
         });
-        if (retries > 2) {
+        return { code: 400, message: config.authError };
-          const waitTime = Math.round(Math.pow(3, retries + 1));
-          return {
-            code: 410,
-            message: `失败次数过多，请${waitTime}秒后重试`,
-            data: waitTime,
-          };
-        } else {
-          return { code: 400, message: config.authError };
-        }
       }
     } else {
       return this.initAuthInfo();
@@ -194,14 +170,12 @@ export default class UserService {
     });
   }
 
-  public async getLoginLog(): Promise<Array<AuthModelInfo | undefined>> {
+  public async getLoginLog(): Promise<AuthInfo[]> {
     const docs = await AuthModel.findAll({
       where: { type: AuthDataType.loginLog },
     });
     if (docs && docs.length > 0) {
-      const result = docs.sort(
+      const result = docs.sort((a, b) => b.info.timestamp - a.info.timestamp);
-        (a, b) => b.info!.timestamp! - a.info!.timestamp!,
-      );
       if (result.length > 100) {
         await AuthModel.destroy({
           where: { id: result[result.length - 1].id },
@@ -218,16 +192,17 @@ export default class UserService {
   }
 
   private initAuthInfo() {
+    const newPassword = createRandomString(16, 22);
     fs.writeFileSync(
       config.authConfigFile,
       JSON.stringify({
         username: 'admin',
-        password: 'admin',
+        password: newPassword,
       }),
     );
     return {
       code: 100,
-      message: '未找到认证文件，重新初始化',
+      message: '已初始化密码，请前往auth.json查看并重新登录',
     };
   }
 
@@ -246,24 +221,13 @@ export default class UserService {
     return { code: 200, message: '更新成功' };
   }
 
-  public async updateAvatar(avatar: string) {
+  public getUserInfo(): Promise<any> {
-    const authInfo = this.getAuthInfo();
+    return new Promise((resolve) => {
-    this.updateAuthInfo(authInfo, { avatar });
+      fs.readFile(config.authConfigFile, 'utf8', (err, data) => {
-    return { code: 200, data: avatar, message: '更新成功' };
+        if (err) console.log(err);
-  }
+        resolve(JSON.parse(data));
-
+      });
-  public async getUserInfo(): Promise<any> {
+    });
-    const authFileExist = await fileExist(config.authConfigFile);
-    if (!authFileExist) {
-      fs.writeFileSync(
-        config.authConfigFile,
-        JSON.stringify({
-          username: 'admin',
-          password: 'admin',
-        }),
-      );
-    }
-    return this.getAuthInfo();
   }
 
   public initTwoFactor() {
@@ -328,7 +292,7 @@ export default class UserService {
 
   private getAuthInfo() {
     const content = fs.readFileSync(config.authConfigFile, 'utf8');
-    return safeJSONParse(content);
+    return JSON.parse(content || '{}');
   }
 
   private updateAuthInfo(authInfo: any, info: any) {
@@ -343,17 +307,14 @@ export default class UserService {
     return (doc && doc.info) || {};
   }
 
+  public async getLogRemoveFrequency() {
+    const doc = await this.getDb({ type: AuthDataType.removeLogFrequency });
+    return (doc && doc.info) || {};
+  }
+
   private async updateAuthDb(payload: AuthInfo): Promise<any> {
-    let doc = await AuthModel.findOne({ type: payload.type });
+    await AuthModel.upsert({ ...payload });
-    if (doc) {
+    const doc = await this.getDb({ type: payload.type });
-      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;
   }
 
@@ -376,7 +337,116 @@ export default class UserService {
       });
       return { code: 200, data: { ...result, code } };
     } else {
-      return { code: 400, message: '通知发送失败，请检查参数' };
+      return { code: 400, data: '通知发送失败，请检查参数' };
     }
   }
+
+  public async updateLogRemoveFrequency(frequency: number) {
+    const result = await this.updateAuthDb({
+      type: AuthDataType.removeLogFrequency,
+      info: { frequency },
+    });
+    const cron = {
+      id: result.id,
+      name: '删除日志',
+      command: `ql rmlog ${frequency}`,
+      schedule: `5 23 */${frequency} * *`,
+    };
+    await this.scheduleService.cancelSchedule(cron);
+    if (frequency > 0) {
+      await this.scheduleService.generateSchedule(cron);
+    }
+    return { code: 200, data: { ...cron } };
+  }
+
+  public async checkUpdate() {
+    try {
+      const versionRegx = /.*export const version = \'(.*)\'\;/;
+      const logRegx = /.*export const changeLog = \`((.*\n.*)+)\`;/;
+
+      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
+      const currentVersion = currentVersionFile.match(versionRegx)![1];
+
+      let lastVersion = '';
+      let lastLog = '';
+      try {
+        const result = await Promise.race([
+          got.get(config.lastVersionFile, { timeout: 1000, retry: 0 }),
+          got.get(`https://ghproxy.com/${config.lastVersionFile}`, {
+            timeout: 5000,
+            retry: 0,
+          }),
+        ]);
+        const lastVersionFileContent = result.body;
+        lastVersion = lastVersionFileContent.match(versionRegx)![1];
+        lastLog = lastVersionFileContent.match(logRegx)
+          ? lastVersionFileContent.match(logRegx)![1]
+          : '';
+      } catch (error) {}
+
+      return {
+        code: 200,
+        data: {
+          hasNewVersion: this.checkHasNewVersion(currentVersion, lastVersion),
+          lastVersion,
+          lastLog,
+        },
+      };
+    } catch (error: any) {
+      return {
+        code: 400,
+        data: error.message,
+      };
+    }
+  }
+
+  private checkHasNewVersion(curVersion: string, lastVersion: string) {
+    const curArr = curVersion.split('.').map((x) => parseInt(x, 10));
+    const lastArr = lastVersion.split('.').map((x) => parseInt(x, 10));
+    if (curArr[0] < lastArr[0]) {
+      return true;
+    }
+    if (curArr[0] === lastArr[0] && curArr[1] < lastArr[1]) {
+      return true;
+    }
+    if (
+      curArr[0] === lastArr[0] &&
+      curArr[1] === lastArr[1] &&
+      curArr[2] < lastArr[2]
+    ) {
+      return true;
+    }
+    return false;
+  }
+
+  public async updateSystem() {
+    const cp = spawn('ql -l update', { shell: '/bin/bash' });
+
+    this.sockService.sendMessage({
+      type: 'updateSystemVersion',
+      message: `开始更新系统`,
+    });
+    cp.stdout.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'updateSystemVersion',
+        message: data.toString(),
+      });
+    });
+
+    cp.stderr.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'updateSystemVersion',
+        message: data.toString(),
+      });
+    });
+
+    cp.on('error', (err) => {
+      this.sockService.sendMessage({
+        type: 'updateSystemVersion',
+        message: JSON.stringify(err),
+      });
+    });
+
+    return { code: 200 };
+  }
 }

back/shared/pLimit.ts

@@ -1,54 +0,0 @@
-import pLimit from 'p-limit';
-import os from 'os';
-import { AuthDataType, AuthModel } from '../data/auth';
-import Logger from '../loaders/logger';
-import dayjs from 'dayjs';
-
-class TaskLimit {
-  private oneLimit = pLimit(1);
-  private updateLogLimit = pLimit(1);
-  private cpuLimit = pLimit(Math.max(os.cpus().length, 4));
-
-  get cpuLimitActiveCount() {
-    return this.cpuLimit.activeCount;
-  }
-
-  get cpuLimitPendingCount() {
-    return this.cpuLimit.pendingCount;
-  }
-
-  constructor() {
-    this.setCustomLimit();
-  }
-
-  public async setCustomLimit(limit?: number) {
-    if (limit) {
-      this.cpuLimit = pLimit(limit);
-      return;
-    }
-    await AuthModel.sync();
-    const doc = await AuthModel.findOne({
-      where: { type: AuthDataType.systemConfig },
-    });
-    if (doc?.info?.cronConcurrency) {
-      this.cpuLimit = pLimit(doc?.info?.cronConcurrency);
-    }
-  }
-
-  public runWithCpuLimit<T>(fn: () => Promise<T>): Promise<T> {
-    Logger.info(
-      `[schedule][任务加入队列] 运行中任务数: ${this.cpuLimitActiveCount}, 等待中任务数: ${this.cpuLimitPendingCount}`,
-    );
-    return this.cpuLimit(fn);
-  }
-
-  public runOneByOne<T>(fn: () => Promise<T>): Promise<T> {
-    return this.oneLimit(fn);
-  }
-
-  public updateDepLog<T>(fn: () => Promise<T>): Promise<T> {
-    return this.updateLogLimit(fn);
-  }
-}
-
-export default new TaskLimit();

back/shared/runCron.ts

@@ -1,33 +0,0 @@
-import { spawn } from 'cross-spawn';
-import taskLimit from './pLimit';
-import Logger from '../loaders/logger';
-
-export function runCron(cmd: string): Promise<number> {
-  return taskLimit.runWithCpuLimit(() => {
-    return new Promise(async (resolve: any) => {
-      Logger.info(`[schedule][开始执行任务] 运行命令: ${cmd}`);
-
-      const cp = spawn(cmd, { shell: '/bin/bash' });
-
-      cp.stderr.on('data', (data) => {
-        Logger.info(
-          '[schedule][执行任务失败] 命令: %s, 错误信息: %j',
-          cmd,
-          data.toString(),
-        );
-      });
-      cp.on('error', (err) => {
-        Logger.error(
-          '[schedule][创建任务失败] 命令: %s, 错误信息: %j',
-          cmd,
-          err,
-        );
-      });
-
-      cp.on('close', async (code) => {
-        Logger.info(`[schedule][任务退出] ${cmd} 进程id: ${cp.pid} 退出, 退出码 ${code}`);
-        resolve();
-      });
-    });
-  });
-}

back/token.ts

@@ -1,40 +0,0 @@
-import 'reflect-metadata';
-import OpenService from './services/open';
-import { Container } from 'typedi';
-import LoggerInstance from './loaders/logger';
-import fs from 'fs';
-import config from './config';
-import path from 'path';
-import os from 'os';
-
-const tokenFile = path.join(config.configPath, 'token.json');
-
-async function getToken() {
-  try {
-    Container.set('logger', LoggerInstance);
-    const openService = Container.get(OpenService);
-    const appToken = await openService.generateSystemToken();
-    console.log(appToken.value);
-    await writeFile({
-      value: appToken.value,
-      expiration: appToken.expiration,
-    });
-  } catch (error) {
-    console.log(error);
-  }
-}
-
-async function writeFile(data: any) {
-  return new Promise<void>((resolve, reject) => {
-    fs.writeFile(
-      tokenFile,
-      `${JSON.stringify(data)}${os.EOL}`,
-      { encoding: 'utf8' },
-      () => {
-        resolve();
-      },
-    );
-  });
-}
-
-getToken();

docker-compose.yml

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

docker/Dockerfile

@@ -1,78 +1,54 @@
-FROM python:3.10-alpine as builder
+FROM node:lts-alpine3.12
-COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
-RUN set -x \
-  && apk update \
-  && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 \
-  && cd /tmp/build \
-  && pnpm --registry https://registry.npmmirror.com install --prod
-
-FROM python:3.10-alpine
-
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
-ARG QL_BRANCH=develop
+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 \
+    LANG=zh_CN.UTF-8 \
-  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 \
+    SHELL=/bin/bash \
-  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 \
+    PS1="\u@\h:\w \$ " \
-  LANG=C.UTF-8 \
+    QL_DIR=/ql \
-  SHELL=/bin/bash \
+    QL_BRANCH=${QL_BRANCH}
-  PS1="\u@\h:\w \$ " \
-  QL_DIR=/ql \
-  QL_BRANCH=${QL_BRANCH}
-
-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 \
-  coreutils \
-  git \
-  curl \
-  wget \
-  tzdata \
-  perl \
-  openssl \
-  nginx \
-  nodejs \
-  jq \
-  openssh \
-  procps \
-  netcat-openbsd \
-  npm \
-  && rm -rf /var/cache/apk/* \
-  && apk update \
-  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-  && echo "Asia/Shanghai" > /etc/timezone \
-  && git config --global user.email "qinglong@@users.noreply.github.com" \
-  && git config --global user.name "qinglong" \
-  && git config --global http.postBuffer 524288000 \
-  && npm install -g pnpm@8.3.1 \
-  && cd && pnpm config set registry https://registry.npmmirror.com \
-  && pnpm add -g pm2 tsx \
-  && rm -rf /root/.pnpm-store \
-  && rm -rf /root/.local/share/pnpm/store \
-  && rm -rf /root/.cache \
-  && rm -rf /root/.npm
-
-ARG SOURCE_COMMIT
-RUN git clone --depth=1 -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 \
-  && git clone --depth=1 -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
-
-COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
-
 WORKDIR ${QL_DIR}
-
+RUN set -x \
-HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
+    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories \
-  CMD curl -sf http://127.0.0.1:5400/api/health || exit 1
+    && apk update -f \
-
+    && apk upgrade \
+    && apk --no-cache add -f bash \
+                             coreutils \
+                             moreutils \
+                             git \
+                             curl \
+                             wget \
+                             tzdata \
+                             perl \
+                             openssl \
+                             nginx \
+                             python3 \
+                             jq \
+                             openssh \
+                             py3-pip \
+                             python2 \
+                             g++ \
+                             make \
+    && rm -rf /var/cache/apk/* \
+    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && touch ~/.bashrc \
+    && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
+    && git config --global user.email "qinglong@@users.noreply.github.com" \
+    && git config --global user.name "qinglong" \
+    && 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/${QL_MAINTAINER}/qinglong-static.git /static \
+    && cp -rf /static/* ${QL_DIR} \
+    && rm -rf /static
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]

docker/docker-compose.yml

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

docker/docker-entrypoint.sh

@@ -7,49 +7,44 @@ link_shell
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
-init_nginx
+cp -fv $nginx_conf /etc/nginx/nginx.conf
-fix_config
+cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
-
 pm2 l &>/dev/null
+echo
 
 echo -e "======================2. 安装依赖========================\n"
-patch_version
+update_depend
-if [[ $PipMirror ]]; then
-  pip3 config set global.index-url $PipMirror
-fi
-current_npm_registry=$(cd && pnpm config get registry)
-is_equal_registry=$(echo $current_npm_registry | grep "${NpmMirror}")
-if [[ "$is_equal_registry" == "" ]]; then
-  cd && pnpm config set registry $NpmMirror
-  pnpm install -g
-fi
-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
 echo
 
 echo -e "======================3. 启动nginx========================\n"
 nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
-echo -e "======================4. 启动pm2服务========================\n"
+echo -e "======================4. 启动控制面板========================\n"
-reload_pm2
+pm2 delete panel &>/dev/null
+pm2 start $dir_root/build/app.js -n panel --source-map-support --time
+echo -e "控制面板启动成功...\n"
+
+echo -e "======================5. 启动定时任务========================\n"
+pm2 delete schedule &>/dev/null
+pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time
+echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
-  echo -e "======================5. 启动bot========================\n"
+  echo -e "======================6. 启动bot========================\n"
-  nohup ql -l bot >$dir_log/bot.log 2>&1 &
+  nohup ql bot >>$dir_log/start.log 2>&1 &
   echo -e "bot后台启动中...\n"
 fi
 
 if [[ $EnableExtraShell == true ]]; then
-  echo -e "====================6. 执行自定义脚本========================\n"
+  echo -e "======================7. 执行自定义脚本========================\n"
-  nohup ql -l extra >$dir_log/extra.log 2>&1 &
+  nohup ql extra >>$dir_log/start.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi
 
 echo -e "############################################################\n"
 echo -e "容器启动成功..."
+echo -e "\n请先访问5700端口，登录成功面板之后再执行添加定时任务..."
 echo -e "############################################################\n"
 
 crond -f >/dev/null

docker/front.conf

@@ -1,62 +1,46 @@
-upstream baseApi {
+upstream api {
   server 0.0.0.0:5600;
 }
 
-upstream publicApi {
+map $http_upgrade $connection_upgrade { 
-  server 0.0.0.0:5400;
-}
-
-map $http_upgrade $connection_upgrade {
   default keep-alive;
   'websocket' upgrade;
 }
 
 server {
   listen 5700;
-  IPV6_CONFIG
+  root /ql/dist;
   ssl_session_timeout 5m;
 
-  location QL_BASE_URLapi/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://publicApi/api/;
+    proxy_pass http://api;
-    proxy_buffering off;
-  }
-
-  location QL_BASE_URLapi/ {
-    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://baseApi/api/;
-    proxy_buffering off;
 
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
   }
 
-  location QL_BASE_URLopen/ {
+  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://baseApi/open/;
+    proxy_pass http://api;
-    proxy_buffering off;
   }
 
   gzip on;
-  gzip_static 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_proxied  any;
   gzip_vary on;
   gzip_comp_level 6;
   gzip_buffers 16 8k;
-  gzip_http_version 1.0;
+  gzip_http_version 1.0;  
-  QL_ROOT_CONFIG
 
-  location QL_BASE_URL_LOCATION {
+  location / {
-    QL_ALIAS_CONFIG
+    index  index.html index.htm;
-    index index.html index.htm;
+    try_files $uri $uri/ /index.html;
-    try_files $uri QL_BASE_URLindex.html;
   }
 
   location ~ .*\.(html)$ {

docker/nginx.conf

@@ -5,41 +5,41 @@ error_log /var/log/nginx/error.log warn;
 include /etc/nginx/modules/*.conf;
 
 events {
-  worker_connections 1024;
+	worker_connections 1024;
 }
 
 http {
-  include /etc/nginx/mime.types;
+	include /etc/nginx/mime.types;
-  default_type application/octet-stream;
+	default_type application/octet-stream;
 
-  server_tokens off;
+	server_tokens off;
 
-  client_max_body_size 4096m;
+	client_max_body_size 20m;
-  client_body_buffer_size 20m;
+	client_body_buffer_size 20m;
 
-  keepalive_timeout 65;
+	keepalive_timeout 65;
 
-  sendfile on;
+	sendfile on;
 
-  tcp_nodelay on;
+	tcp_nodelay on;
 
-  ssl_prefer_server_ciphers on;
+	ssl_prefer_server_ciphers on;
 
-  ssl_session_cache shared:SSL:2m;
+	ssl_session_cache shared:SSL:2m;
 
-  gzip on;
+	gzip on;
-  gzip_static 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_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" '
+	log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-  '$status $body_bytes_sent "$http_referer" '
+			'$status $body_bytes_sent "$http_referer" '
-  '"$http_user_agent" "$http_x_forwarded_for"';
+			'"$http_user_agent" "$http_x_forwarded_for"';
 
-  access_log /var/log/nginx/access.log main;
+	access_log /var/log/nginx/access.log main;
-  include /etc/nginx/conf.d/*.conf;
+	include /etc/nginx/conf.d/*.conf;
 }

ecosystem.config.js

@@ -1,34 +0,0 @@
-module.exports = {
-  apps: [
-    {
-      name: 'schedule',
-      max_restarts: 10,
-      kill_timeout: 15000,
-      wait_ready: true,
-      listen_timeout: 10000,
-      source_map_support: true,
-      time: true,
-      script: 'static/build/schedule/index.js',
-    },
-    {
-      name: 'public',
-      max_restarts: 10,
-      kill_timeout: 15000,
-      wait_ready: true,
-      listen_timeout: 10000,
-      source_map_support: true,
-      time: true,
-      script: 'static/build/public.js',
-    },
-    {
-      name: 'panel',
-      max_restarts: 10,
-      kill_timeout: 15000,
-      wait_ready: true,
-      listen_timeout: 10000,
-      source_map_support: true,
-      time: true,
-      script: 'static/build/app.js',
-    },
-  ],
-};

package.json

@@ -1,19 +1,14 @@
 {
   "private": true,
   "scripts": {
-    "start": "concurrently -n w: npm:start:*",
+    "start": "umi dev",
-    "start:front": "max dev",
+    "build": "umi build",
-    "start:back": "nodemon",
+    "build-back": "tsc -p tsconfig.back.json",
-    "start:public": "ts-node --transpile-only ./back/public.ts",
+    "start-back": "nodemon",
-    "start:rpc": "ts-node --transpile-only ./back/schedule/index.ts",
+    "panel": "npm run build-back && node build/app.js",
-    "build:front": "max 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/index.js",
-    "public": "npm run build:back && node static/build/public.js",
-    "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "postinstall": "max setup 2>/dev/null || true",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage"
   },
@@ -28,144 +23,87 @@
       "prettier --parser=typescript --write"
     ]
   },
-  "pnpm": {
-    "peerDependencyRules": {
-      "ignoreMissing": [
-        "react",
-        "react-dom",
-        "antd",
-        "dva",
-        "postcss",
-        "webpack",
-        "eslint",
-        "stylelint",
-        "redux",
-        "@babel/core",
-        "monaco-editor",
-        "rc-field-form",
-        "@types/lodash.merge",
-        "rollup",
-        "styled-components"
-      ],
-      "allowedVersions": {
-        "react": "18",
-        "react-dom": "18",
-        "dva-core": "2"
-      }
-    }
-  },
   "dependencies": {
-    "@grpc/grpc-js": "^1.8.13",
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^7.12.1",
+    "@sentry/node": "^6.16.1",
-    "@sentry/tracing": "^7.12.1",
+    "@sentry/tracing": "^6.16.1",
-    "body-parser": "^1.19.2",
+    "body-parser": "^1.19.0",
-    "celebrate": "^15.0.1",
+    "celebrate": "^13.0.3",
-    "chokidar": "^3.5.3",
+    "chokidar": "^3.5.2",
     "cors": "^2.8.5",
-    "cron-parser": "^4.2.1",
+    "cron-parser": "^3.5.0",
-    "cross-spawn": "^7.0.3",
+    "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-rate-limit": "^6.7.0",
     "express-urlrewrite": "^1.4.0",
-    "form-data": "^4.0.0",
     "got": "^11.8.2",
     "hpagent": "^0.1.2",
-    "http-proxy-middleware": "^2.0.6",
     "iconv-lite": "^0.6.3",
-    "js-yaml": "^4.1.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
-    "multer": "^1.4.4",
     "nedb": "^1.8.0",
-    "node-schedule": "^2.1.0",
+    "node-fetch": "^2.6.1",
-    "nodemailer": "^6.7.2",
+    "node-schedule": "^2.0.0",
-    "p-limit": "3.1.0",
+    "nodemailer": "^6.7.0",
-    "protobufjs": "^7.2.3",
+    "p-queue": "6.6.2",
-    "pstree.remy": "^1.1.8",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.25.5",
+    "sequelize": "^7.0.0-alpha.3",
     "serve-handler": "^6.1.3",
-    "sockjs": "^0.3.24",
+    "sockjs": "^0.3.21",
-    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
+    "sqlite3": "^5.0.2",
-    "tar": "^6.1.15",
+    "typedi": "^0.8.0",
-    "toad-scheduler": "^1.6.0",
-    "typedi": "^0.10.0",
     "uuid": "^8.3.2",
-    "winston": "^3.6.0",
+    "winston": "^3.3.3",
-    "winston-daily-rotate-file": "^4.7.1",
+    "yargs": "^17.2.1"
-    "yargs": "^17.3.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^4.7.0",
+    "@ant-design/icons": "^4.6.2",
-    "@ant-design/pro-layout": "6.38.22",
+    "@ant-design/pro-layout": "^6.26.0",
-    "@monaco-editor/react": "4.2.1",
+    "@monaco-editor/react": "^4.3.1",
-    "@react-hook/resize-observer": "^1.2.6",
+    "@sentry/react": "^6.16.1",
-    "@sentry/react": "^7.12.1",
+    "@sentry/webpack-plugin": "^1.18.3",
-    "@types/body-parser": "^1.19.2",
+    "@types/cors": "^2.8.10",
-    "@types/cors": "^2.8.12",
+    "@types/express": "^4.17.8",
-    "@types/cross-spawn": "^6.0.2",
+    "@types/express-jwt": "^6.0.1",
-    "@types/express": "^4.17.13",
+    "@types/jsonwebtoken": "^8.5.0",
-    "@types/express-jwt": "^6.0.4",
+    "@types/lodash": "^4.14.170",
-    "@types/file-saver": "^2.0.5",
+    "@types/nedb": "^1.8.11",
-    "@types/js-yaml": "^4.0.5",
+    "@types/node": "^14.11.2",
-    "@types/jsonwebtoken": "^8.5.8",
+    "@types/node-fetch": "^2.5.8",
-    "@types/lodash": "^4.14.185",
-    "@types/multer": "^1.4.7",
-    "@types/nedb": "^1.8.12",
-    "@types/node": "^17.0.21",
     "@types/node-schedule": "^1.3.2",
     "@types/nodemailer": "^6.4.4",
-    "@types/qrcode.react": "^1.0.2",
+    "@types/qrcode.react": "^1.0.1",
-    "@types/react": "^18.0.20",
+    "@types/react": "^17.0.0",
-    "@types/react-copy-to-clipboard": "^5.0.4",
+    "@types/react-dom": "^17.0.0",
-    "@types/react-dom": "^18.0.6",
     "@types/serve-handler": "^6.1.1",
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
-    "@types/tar": "^6.1.5",
+    "@types/uuid": "^8.3.3",
-    "@types/uuid": "^8.3.4",
+    "@umijs/plugin-antd": "^0.11.0",
-    "@uiw/codemirror-extensions-langs": "^4.21.9",
+    "@umijs/test": "^3.3.9",
-    "@uiw/react-codemirror": "^4.21.9",
+    "antd": "^4.17.0-alpha.6",
-    "@umijs/max": "^4.0.72",
+    "codemirror": "^5.62.2",
-    "@umijs/ssr-darkreader": "^4.9.45",
+    "compression-webpack-plugin": "6.1.1",
-    "ahooks": "^3.7.8",
+    "darkreader": "^4.9.27",
-    "ansi-to-react": "^6.1.6",
+    "lint-staged": "^10.0.7",
-    "antd": "^4.24.8",
+    "@mapbox/node-pre-gyp": "1.0.8",
-    "antd-img-crop": "^4.2.3",
+    "nodemon": "^2.0.4",
-    "axios": "^1.4.0",
+    "prettier": "^2.2.0",
-    "compression-webpack-plugin": "9.2.0",
-    "concurrently": "^7.0.0",
-    "file-saver": "^2.0.5",
-    "lint-staged": "^13.0.3",
-    "monaco-editor": "0.33.0",
-    "nodemon": "^2.0.15",
-    "prettier": "^2.5.1",
-    "qiniu": "^7.4.0",
     "qrcode.react": "^1.0.1",
-    "query-string": "^7.1.1",
+    "react": "17.x",
-    "rc-tween-one": "^3.0.6",
+    "react-codemirror2": "^7.2.1",
-    "rc-virtual-list": "3.5.3",
-    "react": "18.2.0",
-    "react-copy-to-clipboard": "^5.1.0",
     "react-diff-viewer": "^3.1.1",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
-    "react-dom": "18.2.0",
+    "react-dom": "17.x",
-    "react-intl-universal": "^2.6.21",
     "react-split-pane": "^0.1.92",
-    "sockjs-client": "^1.6.0",
+    "sockjs-client": "^1.5.2",
-    "ts-node": "^10.6.0",
+    "ts-node": "^9.0.0",
-    "ts-proto": "^1.146.0",
+    "typescript": "^4.1.2",
-    "tslib": "^2.4.0",
+    "umi": "^3.5.0",
-    "tsx": "^3.12.3",
+    "umi-request": "^1.3.5",
-    "typescript": "4.8.4",
     "vh-check": "^2.0.5",
-    "virtualizedtableforantd4": "1.3.0",
+    "webpack": "^5.28.0",
-    "webpack": "^5.70.0",
     "yorkie": "^2.0.0"
   }
 }

sample/config.sample.sh

@@ -1,3 +1,9 @@
+## Version: v2.8.0
+## Date: 2021-06-20
+## Update Content: 可持续发展纲要\n1. session管理破坏性修改\n2. 配置管理可编辑config下文件\n3. 自定义脚本改为查看脚本\n4. 移除互助相关
+
+## 上面版本号中，如果第2位数字有变化，那么代表增加了新的参数，如果只有第3位数字有变化，仅代表更新了注释，没有增加新的参数，可更新可不更新
+
 ## 在运行 ql repo 命令时，是否自动删除失效的脚本与定时任务
 AutoDelCron="true"
 
@@ -10,29 +16,19 @@ DefaultCronRule=""
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
 RepoFileExtensions="js py"
 
-## 代理地址，支持HTTP/SOCK5，例如 http://127.0.0.1:7890
+## 由于github仓库拉取较慢，所以会默认添加代理前缀，如不需要请移除
-ProxyUrl=""
+GithubProxyUrl="https://ghproxy.com/"
 
-## 资源告警阙值，默认CPU 80%、内存80%、磁盘90%
+## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-CpuWarn=80
+CommandTimeoutTime="1h"
-MemoryWarn=80
-DiskWarn=90
 
-## 设置定时任务执行的超时时间，例如1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
+## 设置批量执行任务时的并发数，默认同时执行5个任务
-CommandTimeoutTime=""
+MaxConcurrentNum="5"
 
 ## 在运行 task 命令时，随机延迟启动任务的最大延迟时间
 ## 默认给javascript任务加随机延迟，如 RandomDelay="300" ，表示任务将在 1-300 秒内随机延迟一个秒数，然后再运行，取消延迟赋值为空
 RandomDelay="300"
 
-## 需要随机延迟运行任务的文件后缀，直接写后缀名即可，多个后缀用空格分开，例如: js py ts
-## 默认仅给javascript任务加随机延迟，其它任务按定时规则准点运行。全部任务随机延迟赋值为空
-RandomDelayFileExtensions="js"
-
-## 每小时的第几分钟准点运行任务，当在这些时间运行任务时将忽略 RandomDelay 配置，不会被随机延迟
-## 默认是第0分钟和第30分钟，例如21:00或21:30分的任务将会准点运行。不需要准点运行赋值为空
-RandomDelayIgnoredMinutes="0 30"
-
 ## 如果你自己会写shell脚本，并且希望在每次运行 ql update 命令时，额外运行你的 shell 脚本，请赋值为 "true"，默认为true
 EnableExtraShell="true"
 
@@ -42,11 +38,8 @@ AutoStartBot=""
 ## 是否使用第三方bot，默认不使用，使用时填入仓库地址，存到ql/repo目录下，文件夹命名为diybot
 BotRepoUrl=""
 
-## 安装python依赖时指定pip源
+## 安装bot依赖时指定pip源，默认使用清华源，如不需要源，设置此参数为空
-PipMirror="https://pypi.doubanio.com/simple/"
+PipMirror="https://pypi.tuna.tsinghua.edu.cn/simple"
-
-## 安装node依赖时指定npm源
-NpmMirror="https://registry.npmmirror.com"
 
 ## 通知环境变量
 ## 1. Server酱
@@ -57,8 +50,6 @@ export PUSH_KEY=""
 ## 2. BARK
 ## 下方填写app提供的设备码，例如：https://api.day.app/123 那么此处的设备码就是123
 export BARK_PUSH=""
-## 下方填写推送图标设置，自定义推送图标(需iOS15或以上)
-export BARK_ICON="https://qn.whyour.cn/logo.png"
 ## 下方填写推送声音设置，例如choo，具体值请在bark-推送铃声-查看所有铃声
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
@@ -91,10 +82,6 @@ export TG_API_HOST=""
 export DD_BOT_TOKEN=""
 export DD_BOT_SECRET=""
 
-## 企业微信反向代理地址
-## (环境变量名 QYWX_ORIGIN)
-export QYWX_ORIGIN=""
-
 ## 5. 企业微信机器人
 ## 官方说明文档：https://work.weixin.qq.com/api/doc/90000/90136/91770
 ## 下方填写密钥，企业微信推送 webhook 后面的 key
@@ -136,41 +123,4 @@ export GOTIFY_URL=""
 export GOTIFY_TOKEN=""
 export GOTIFY_PRIORITY=0
 
-## 11. PushDeer
-## deer_key 填写PushDeer的key
-export DEER_KEY=""
-
-## 12. Chat
-## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
-## chat_token 填写后面的token
-export CHAT_URL=""
-export CHAT_TOKEN=""
-
-## 13. aibotk
-## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
-## aibotk_key (必填)填写智能微秘书个人中心的apikey
-export AIBOTK_KEY=""
-## aibotk_type (必填)填写发送的目标 room 或 contact, 填其他的不生效
-export AIBOTK_TYPE=""
-## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
-export AIBOTK_NAME=""
-
-## 14. SMTP
-## 暂时只支持在 Python 中调用 notify.py 以发送 SMTP 邮件通知
-## smtp_server 填写 SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
-export SMTP_SERVER=""
-## smtp_ssl 填写 SMTP 发送邮件服务器是否使用 SSL，内容应为 true 或 false
-export SMTP_SSL="false"
-## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
-export SMTP_EMAIL=""
-## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
-export SMTP_PASSWORD=""
-## smtp_name 填写 SMTP 收发件人姓名，可随意填写
-export SMTP_NAME=""
-
-## 15. PushMe
-## 官方说明文档：https://push.i-i.me/
-## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
-export PUSHME_KEY=""
-
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/extra.sample.sh

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

sample/notify.py

@@ -9,10 +9,6 @@ import re
 import threading
 import time
 import urllib.parse
-import smtplib
-from email.mime.text import MIMEText
-from email.header import Header
-from email.utils import formataddr
 
 import requests
 
@@ -39,7 +35,6 @@ push_config = {
     'BARK_ARCHIVE': '',                 # bark 推送是否存档
     'BARK_GROUP': '',                   # bark 推送分组
     'BARK_SOUND': '',                   # bark 推送声音
-    'BARK_ICON': '',                    # bark 推送图标
 
     'CONSOLE': True,                    # 控制台输出
 
@@ -64,20 +59,12 @@ push_config = {
 
     'PUSH_KEY': '',                     # server 酱的 PUSH_KEY，兼容旧版与 Turbo 版
 
-    'DEER_KEY': '',                     # PushDeer 的 PUSHDEER_KEY
-    'DEER_URL': '',                     # PushDeer 的 PUSHDEER_URL
-
-    'CHAT_URL': '',                     # synology chat url
-    'CHAT_TOKEN': '',                   # synology chat token
-
     'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
     'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
 
     'QMSG_KEY': '',                     # qmsg 酱的 QMSG_KEY
     'QMSG_TYPE': '',                    # qmsg 酱的 QMSG_TYPE
 
-    'QYWX_ORIGIN': '',                  # 企业微信代理地址
-    
     'QYWX_AM': '',                      # 企业微信应用
 
     'QYWX_KEY': '',                     # 企业微信机器人
@@ -88,18 +75,6 @@ push_config = {
     'TG_PROXY_AUTH': '',                # tg 代理认证参数
     'TG_PROXY_HOST': '',                # tg 机器人的 TG_PROXY_HOST
     'TG_PROXY_PORT': '',                # tg 机器人的 TG_PROXY_PORT
-
-    'AIBOTK_KEY': '',                   # 智能微秘书 个人中心的apikey 文档地址：http://wechat.aibotk.com/docs/about
-    'AIBOTK_TYPE': '',                  # 智能微秘书 发送目标 room 或 contact
-    'AIBOTK_NAME': '',                  # 智能微秘书  发送群名 或者好友昵称和type要对应好
-
-    'SMTP_SERVER': '',                  # SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
-    'SMTP_SSL': 'false',                # SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false
-    'SMTP_EMAIL': '',                   # SMTP 收发件邮箱，通知将会由自己发给自己
-    'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
-    'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
-
-    'PUSHME_KEY': '',                     # PushMe 酱的 PUSHME_KEY
 }
 notify_function = []
 # fmt: on
@@ -129,7 +104,6 @@ def bark(title: str, content: str) -> None:
         "BARK_ARCHIVE": "isArchive",
         "BARK_GROUP": "group",
         "BARK_SOUND": "sound",
-        "BARK_ICON": "icon",
     }
     params = ""
     for pair in filter(
@@ -224,7 +198,7 @@ def go_cqhttp(title: str, content: str) -> None:
         print("go-cqhttp 推送失败！")
 
 
-def gotify(title: str, content: str) -> None:
+def gotify(title:str,content:str)  -> None:
     """
     使用 gotify 推送消息。
     """
@@ -234,12 +208,8 @@ def gotify(title: str, content: str) -> None:
     print("gotify 服务启动")
 
     url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}'
-    data = {
+    data = {"title": title,"message": content,"priority": push_config.get("GOTIFY_PRIORITY")}
-        "title": title,
+    response = requests.post(url,data=data).json()
-        "message": content,
-        "priority": push_config.get("GOTIFY_PRIORITY"),
-    }
-    response = requests.post(url, data=data).json()
 
     if response.get("id"):
         print("gotify 推送成功！")
@@ -277,10 +247,10 @@ def serverJ(title: str, content: str) -> None:
     print("serverJ 服务启动")
 
     data = {"text": title, "desp": content.replace("\n", "\n\n")}
-    if push_config.get("PUSH_KEY").find("SCT") != -1:
+    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'
+        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:
@@ -289,50 +259,6 @@ def serverJ(title: str, content: str) -> None:
         print(f'serverJ 推送失败！错误码：{response["message"]}')
 
 
-def pushdeer(title: str, content: str) -> None:
-    """
-    通过PushDeer 推送消息
-    """
-    if not push_config.get("DEER_KEY"):
-        print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
-        return
-    print("PushDeer 服务启动")
-    data = {
-        "text": title,
-        "desp": content,
-        "type": "markdown",
-        "pushkey": push_config.get("DEER_KEY"),
-    }
-    url = "https://api2.pushdeer.com/message/push"
-    if push_config.get("DEER_URL"):
-        url = push_config.get("DEER_URL")
-
-    response = requests.post(url, data=data).json()
-
-    if len(response.get("content").get("result")) > 0:
-        print("PushDeer 推送成功！")
-    else:
-        print("PushDeer 推送失败！错误信息：", response)
-
-
-def chat(title: str, content: str) -> None:
-    """
-    通过Chat 推送消息
-    """
-    if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
-        print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
-        return
-    print("chat 服务启动")
-    data = "payload=" + json.dumps({"text": title + "\n" + content})
-    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
-    response = requests.post(url, data=data)
-
-    if response.status_code == 200:
-        print("Chat 推送成功！")
-    else:
-        print("Chat 推送失败！错误信息：", response)
-
-
 def pushplus_bot(title: str, content: str) -> None:
     """
     通过 push+ 推送消息。
@@ -357,6 +283,7 @@ def pushplus_bot(title: str, content: str) -> None:
         print("PUSHPLUS 推送成功！")
 
     else:
+
         url_old = "http://pushplus.hxtrip.com/send"
         headers["Accept"] = "application/json"
         response = requests.post(url=url_old, data=body, headers=headers).json()
@@ -427,12 +354,9 @@ class WeCom:
         self.CORPID = corpid
         self.CORPSECRET = corpsecret
         self.AGENTID = agentid
-        self.ORIGIN = "https://qyapi.weixin.qq.com"
-        if push_config.get("QYWX_ORIGIN"):
-            self.ORIGIN = push_config.get("QYWX_ORIGIN")
 
     def get_access_token(self):
-        url = f"{self.ORIGIN}/cgi-bin/gettoken"
+        url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"
         values = {
             "corpid": self.CORPID,
             "corpsecret": self.CORPSECRET,
@@ -442,7 +366,10 @@ class WeCom:
         return data["access_token"]
 
     def send_text(self, message, touser="@all"):
-        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = (
+            "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="
+            + self.get_access_token()
+        )
         send_values = {
             "touser": touser,
             "msgtype": "text",
@@ -456,7 +383,10 @@ class WeCom:
         return respone["errmsg"]
 
     def send_mpnews(self, title, message, media_id, touser="@all"):
-        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = (
+            "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="
+            + self.get_access_token()
+        )
         send_values = {
             "touser": touser,
             "msgtype": "mpnews",
@@ -489,11 +419,7 @@ def wecom_bot(title: str, content: str) -> None:
         return
     print("企业微信机器人服务启动")
 
-    origin = "https://qyapi.weixin.qq.com"
+    url = f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
-    if push_config.get("QYWX_ORIGIN"):
-        origin = push_config.get("QYWX_ORIGIN")
-
-    url = f"{origin}/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(
@@ -551,116 +477,6 @@ def telegram_bot(title: str, content: str) -> None:
         print("tg 推送失败！")
 
 
-def aibotk(title: str, content: str) -> None:
-    """
-    使用 智能微秘书 推送消息。
-    """
-    if (
-        not push_config.get("AIBOTK_KEY")
-        or not push_config.get("AIBOTK_TYPE")
-        or not push_config.get("AIBOTK_NAME")
-    ):
-        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
-        return
-    print("智能微秘书 服务启动")
-
-    if push_config.get("AIBOTK_TYPE") == "room":
-        url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
-        data = {
-            "apiKey": push_config.get("AIBOTK_KEY"),
-            "roomName": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
-        }
-    else:
-        url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
-        data = {
-            "apiKey": push_config.get("AIBOTK_KEY"),
-            "name": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
-        }
-    body = json.dumps(data).encode(encoding="utf-8")
-    headers = {"Content-Type": "application/json"}
-    response = requests.post(url=url, data=body, headers=headers).json()
-    print(response)
-    if response["code"] == 0:
-        print("智能微秘书 推送成功！")
-    else:
-        print(f'智能微秘书 推送失败！{response["error"]}')
-
-
-def smtp(title: str, content: str) -> None:
-    """
-    使用 SMTP 邮件 推送消息。
-    """
-    if (
-        not push_config.get("SMTP_SERVER")
-        or not push_config.get("SMTP_SSL")
-        or not push_config.get("SMTP_EMAIL")
-        or not push_config.get("SMTP_PASSWORD")
-        or not push_config.get("SMTP_NAME")
-    ):
-        print(
-            "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送"
-        )
-        return
-    print("SMTP 邮件 服务启动")
-
-    message = MIMEText(content, "plain", "utf-8")
-    message["From"] = formataddr(
-        (
-            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
-            push_config.get("SMTP_EMAIL"),
-        )
-    )
-    message["To"] = formataddr(
-        (
-            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
-            push_config.get("SMTP_EMAIL"),
-        )
-    )
-    message["Subject"] = Header(title, "utf-8")
-
-    try:
-        smtp_server = (
-            smtplib.SMTP_SSL(push_config.get("SMTP_SERVER"))
-            if push_config.get("SMTP_SSL") == "true"
-            else smtplib.SMTP(push_config.get("SMTP_SERVER"))
-        )
-        smtp_server.login(
-            push_config.get("SMTP_EMAIL"), push_config.get("SMTP_PASSWORD")
-        )
-        smtp_server.sendmail(
-            push_config.get("SMTP_EMAIL"),
-            push_config.get("SMTP_EMAIL"),
-            message.as_bytes(),
-        )
-        smtp_server.close()
-        print("SMTP 邮件 推送成功！")
-    except Exception as e:
-        print(f"SMTP 邮件 推送失败！{e}")
-
-def pushme(title: str, content: str) -> None:
-    """
-    使用 PushMe 推送消息。
-    """
-    if not push_config.get("PUSHME_KEY"):
-        print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送")
-        return
-    print("PushMe 服务启动")
-
-    url = f'https://push.i-i.me/?push_key={push_config.get("PUSHME_KEY")}'
-    data = {
-        "title": title,
-        "content": content,
-    }
-    response = requests.post(url, data=data)
-
-    if response.status_code == 200 and response.text == "success":
-        print("PushMe 推送成功！")
-    else:
-        print(f"PushMe 推送失败！{response.status_code} {response.text}")
-
-
 def one() -> str:
     """
     获取一条一言。
@@ -687,10 +503,6 @@ if push_config.get("IGOT_PUSH_KEY"):
     notify_function.append(iGot)
 if push_config.get("PUSH_KEY"):
     notify_function.append(serverJ)
-if push_config.get("DEER_KEY"):
-    notify_function.append(pushdeer)
-if push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"):
-    notify_function.append(chat)
 if push_config.get("PUSH_PLUS_TOKEN"):
     notify_function.append(pushplus_bot)
 if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"):
@@ -701,22 +513,6 @@ if push_config.get("QYWX_KEY"):
     notify_function.append(wecom_bot)
 if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
     notify_function.append(telegram_bot)
-if (
-    push_config.get("AIBOTK_KEY")
-    and push_config.get("AIBOTK_TYPE")
-    and push_config.get("AIBOTK_NAME")
-):
-    notify_function.append(aibotk)
-if (
-    push_config.get("SMTP_SERVER")
-    and push_config.get("SMTP_SSL")
-    and push_config.get("SMTP_EMAIL")
-    and push_config.get("SMTP_PASSWORD")
-    and push_config.get("SMTP_NAME")
-):
-    notify_function.append(smtp)
-if push_config.get("PUSHME_KEY"):
-    notify_function.append(pushme)
 
 
 def send(title: str, content: str) -> None:
@@ -724,13 +520,6 @@ def send(title: str, content: str) -> None:
         print(f"{title} 推送内容为空！")
         return
 
-    # 根据标题跳过一些消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔
-    skipTitle = os.getenv("SKIP_PUSH_TITLE")
-    if skipTitle:
-        if title in re.split("\n", skipTitle):
-            print(f"{title} 在SKIP_PUSH_TITLE环境变量内，跳过推送！")
-            return
-
     hitokoto = push_config.get("HITOKOTO")
 
     text = one() if hitokoto else ""

sample/package.json

@@ -3,10 +3,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "crypto-js": "^4.0.0",
+    "download": "^8.0.0",
+    "http-server": "^0.12.3",
     "got": "^11.5.1",
-    "nodemailer": "^6.8.0",
+    "qrcode-terminal": "^0.12.0",
+    "request": "^2.88.2",
     "tough-cookie": "^4.0.0",
     "tunnel": "0.0.6",
     "ws": "^7.4.3"
   }
-}
+}

sample/tool.ts

@@ -1,40 +0,0 @@
-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.yaml';
-const options = {
-  scope: `${process.env.QINIU_SCOPE}:${key}`,
-};
-const putPolicy = new qiniu.rs.PutPolicy(options);
-const uploadToken = putPolicy.uploadToken(mac);
-
-const localFile = 'version.yaml';
-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

@@ -1,234 +1,179 @@
 #!/usr/bin/env bash
 
-create_token() {
-  local token_command="tsx ${dir_root}/back/token.ts"
-  local token_file="${dir_root}/static/build/token.js"
-  if [[ -f $token_file ]]; then
-    token_command="node ${token_file}"
-  fi
-  token=$(eval "$token_command")
-}
-
 get_token() {
-  if [[ -f $file_auth_token ]]; then
+    token=$(cat $file_auth_user | jq -r .token)
-    token=$(cat $file_auth_token | jq -r .value)
-    local expiration=$(cat $file_auth_token | jq -r .expiration)
-    local currentTimeStamp=$(date +%s)
-    if [[ $currentTimeStamp -ge $expiration ]]; then
-      create_token
-    fi
-  else
-    create_token
-  fi
 }
 
 add_cron_api() {
-  local currentTimeStamp=$(date +%s)
+    local currentTimeStamp=$(date +%s)
-  if [[ $# -eq 1 ]]; then
+    if [[ $# -eq 1 ]]; then
-    local schedule=$(echo "$1" | awk -F ":" '{print $1}')
+        local schedule=$(echo "$1" | awk -F ":" '{print $1}')
-    local command=$(echo "$1" | awk -F ":" '{print $2}')
+        local command=$(echo "$1" | awk -F ":" '{print $2}')
-    local name=$(echo "$1" | awk -F ":" '{print $3}')
+        local name=$(echo "$1" | awk -F ":" '{print $3}')
-    local sub_id=$(echo "$1" | awk -F ":" '{print $4}')
+    else
-  else
+        local schedule=$1
-    local schedule="$1"
+        local command=$2
-    local command="$2"
+        local name=$3
-    local name="$3"
+    fi
-    local sub_id="$4"
-  fi
 
-  if [[ ! $sub_id ]]; then
+    local api=$(
-    sub_id="null"
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
-  fi
+            -H "Accept: application/json" \
-
+            -H "Authorization: Bearer $token" \
-  local api=$(
+            -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" \
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+            -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Accept: application/json" \
+            -H "Origin: http://0.0.0.0:5700" \
-      -H "Authorization: Bearer $token" \
+            -H "Referer: http://0.0.0.0:5700/crontab" \
-      -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 "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      -H "Content-Type: application/json;charset=UTF-8" \
+            --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\"}" \
-      -H "Origin: http://0.0.0.0:5700" \
+            --compressed
-      -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" \
+    code=$(echo $api | jq -r .code)
-      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
+    message=$(echo $api | jq -r .message)
-      --compressed
+    if [[ $code == 200 ]]; then
-  )
+        echo -e "$name -> 添加成功"
-  code=$(echo "$api" | jq -r .code)
+    else
-  message=$(echo "$api" | jq -r .message)
+        echo -e "$name -> 添加失败(${message})"
-  if [[ $code == 200 ]]; then
+    fi
-    echo -e "$name -> 添加成功"
-  else
-    echo -e "$name -> 添加失败(${message})"
-  fi
 }
 
 update_cron_api() {
-  local currentTimeStamp=$(date +%s)
+    local currentTimeStamp=$(date +%s)
-  if [[ $# -eq 1 ]]; then
+    if [[ $# -eq 1 ]]; then
-    local schedule=$(echo "$1" | awk -F ":" '{print $1}')
+        local schedule=$(echo "$1" | awk -F ":" '{print $1}')
-    local command=$(echo "$1" | awk -F ":" '{print $2}')
+        local command=$(echo "$1" | awk -F ":" '{print $2}')
-    local name=$(echo "$1" | awk -F ":" '{print $3}')
+        local name=$(echo "$1" | awk -F ":" '{print $3}')
-    local id=$(echo "$1" | awk -F ":" '{print $4}')
+        local id=$(echo "$1" | awk -F ":" '{print $4}')
-  else
+    else
-    local schedule="$1"
+        local schedule=$1
-    local command="$2"
+        local command=$2
-    local name="$3"
+        local name=$3
-    local id="$4"
+        local id=$4
-  fi
+    fi
 
-  local api=$(
+    local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
-      -X 'PUT' \
+            -X 'PUT' \
-      -H "Accept: application/json" \
+            -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+            -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 "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 "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
+            -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
+            -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" \
+            -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
+            --compressed
-  )
+    )
-  code=$(echo "$api" | jq -r .code)
+    code=$(echo $api | jq -r .code)
-  message=$(echo "$api" | jq -r .message)
+    message=$(echo $api | jq -r .message)
-  if [[ $code == 200 ]]; then
+    if [[ $code == 200 ]]; then
-    echo -e "$name -> 更新成功"
+        echo -e "$name -> 更新成功"
-  else
+    else
-    echo -e "$name -> 更新失败(${message})"
+        echo -e "$name -> 更新失败(${message})"
-  fi
+    fi
 }
 
 update_cron_command_api() {
-  local currentTimeStamp=$(date +%s)
+    local currentTimeStamp=$(date +%s)
-  if [[ $# -eq 1 ]]; then
+    if [[ $# -eq 1 ]]; then
-    local command=$(echo "$1" | awk -F ":" '{print $1}')
+        local command=$(echo "$1" | awk -F ":" '{print $1}')
-    local id=$(echo "$1" | awk -F ":" '{print $2}')
+        local id=$(echo "$1" | awk -F ":" '{print $2}')
-  else
+    else
-    local command="$1"
+        local command=$1
-    local id="$2"
+        local id=$2
-  fi
+    fi
 
-  local api=$(
+    local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
-      -X 'PUT' \
+            -X 'PUT' \
-      -H "Accept: application/json" \
+            -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+            -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 "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 "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
+            -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
+            -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" \
+            -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
+            --compressed
-  )
+    )
-  code=$(echo "$api" | jq -r .code)
+    code=$(echo $api | jq -r .code)
-  message=$(echo "$api" | jq -r .message)
+    message=$(echo $api | jq -r .message)
-  if [[ $code == 200 ]]; then
+    if [[ $code == 200 ]]; then
-    echo -e "$command -> 更新成功"
+        echo -e "$command -> 更新成功"
-  else
+    else
-    echo -e "$command -> 更新失败(${message})"
+        echo -e "$command -> 更新失败(${message})"
-  fi
+    fi
 }
 
 del_cron_api() {
-  local ids="$1"
+    local ids=$1
-  local currentTimeStamp=$(date +%s)
+    local currentTimeStamp=$(date +%s)
-  local api=$(
+    local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons?t=$currentTimeStamp" \
-      -X 'DELETE' \
+            -X 'DELETE' \
-      -H "Accept: application/json" \
+            -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+            -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 "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 "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
+            -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
+            -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" \
+            -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "[$ids]" \
+            --data-raw "[$ids]" \
-      --compressed
+            --compressed
-  )
+    )
-  code=$(echo "$api" | jq -r .code)
+    code=$(echo $api | jq -r .code)
-  message=$(echo "$api" | jq -r .message)
+    message=$(echo $api | jq -r .message)
-  if [[ $code == 200 ]]; then
+    if [[ $code == 200 ]]; then
-    echo -e "成功"
+        echo -e "成功"
-  else
+    else
-    echo -e "失败(${message})"
+        echo -e "失败(${message})"
-  fi
+    fi
+}
+
+get_user_info() {
+    local currentTimeStamp=$(date +%s)
+    local api=$(
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/user?t=$currentTimeStamp" \
+            -H 'Accept: */*' \
+            -H "Authorization: Bearer $token" \
+            -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36' \
+            -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' \
+            --compressed
+    )
+    code=$(echo $api | jq -r .code)
+    if [[ $code != 200 ]]; then
+        echo -e "请先登录！"
+        exit 0
+    fi
 }
 
 update_cron() {
-  local ids="$1"
+    local ids="$1"
-  local status="$2"
+    local status="$2"
-  local pid="${3:-''}"
+    local pid="${3:-''}"
-  local logPath="$4"
+    local logPath="$4"
-  local lastExecutingTime="${5:-0}"
+    local lastExecutingTime="${5:-0}"
-  local runningTime="${6:-0}"
+    local runningTime="${6:-0}"
-  local currentTimeStamp=$(date +%s)
+    local currentTimeStamp=$(date +%s)
-  local api=$(
+    local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
+        curl -s --noproxy "*" "http://0.0.0.0:5600/api/crons/status?t=$currentTimeStamp" \
-      -X 'PUT' \
+            -X 'PUT' \
-      -H "Accept: application/json" \
+            -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+            -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 "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 "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
+            -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
+            -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" \
+            -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\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
+            --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
-      --compressed
+            --compressed
-  )
+    )
-  code=$(echo "$api" | jq -r .code)
+    code=$(echo $api | jq -r .code)
-  message=$(echo "$api" | jq -r .message)
+    message=$(echo $api | jq -r .message)
-  if [[ $code != 200 ]]; then
+    if [[ $code != 200 ]]; then
-    echo -e "\n## 更新任务状态失败(${message})\n"
+        echo -e "\n## 更新任务状态失败(${message})\n" >> $log_path
-  fi
+    fi
-}
-
-notify_api() {
-  local title="$1"
-  local content="$2"
-  local currentTimeStamp=$(date +%s)
-  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
-      -X 'PUT' \
-      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
-      -H "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
-}
-
-find_cron_api() {
-  local params="$1"
-  local currentTimeStamp=$(date +%s)
-  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
-      -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
-      -H "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" \
-      --compressed
-  )
-  data=$(echo "$api" | jq -r .data)
-  if [[ $data == 'null' ]]; then
-    echo -e ""
-  else
-    name=$(echo "$api" | jq -r .data.name)
-    echo -e "$name"
-  fi
 }
 
 get_token

shell/bot.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
+## 导入通用变量与函数
+dir_shell=/ql/shell
+. $dir_shell/share.sh
+
 if [[ -z ${BotRepoUrl} ]]; then
-  url="https://github.com/SuMaiKaDe/bot.git"
+  url="${github_proxy_url}https://github.com/SuMaiKaDe/bot.git"
   repo_path="${dir_repo}/dockerbot"
 else
   url=${BotRepoUrl}
@@ -18,9 +22,9 @@ if [[ ! -d ${repo_path}/.git ]]; then
   git_clone_scripts ${url} ${repo_path} "main"
 fi
 
-cp -rf "$repo_path/jbot" $dir_data
+cp -rf "$repo_path/jbot" $dir_root
-if [[ ! -f "$dir_config/bot.json" ]]; then
+if [[ ! -f "$dir_root/config/bot.json" ]]; then
-  cp -f "$repo_path/config/bot.json" "$dir_config"
+  cp -f "$repo_path/config/bot.json" "$dir_root/config"
 fi
 echo -e "\nbot文件下载成功...\n"
 
@@ -28,20 +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_data"
+cp -f "$repo_path/jbot/requirements.txt" "$dir_root"
 
-cd $dir_data
+cd $dir_root
-cat requirements.txt | while read LREAD; do
+cat requirements.txt | while read LREAD
-  if [[ ! $(pip3 show "${LREAD%%=*}" 2>/dev/null) ]]; then
+do
-    pip3 --default-timeout=100 install ${LREAD}
+if [[ ! $(pip3 show "${LREAD%%=*}" 2>/dev/null) ]]; then
-  fi
+  pip3 --default-timeout=100 install ${LREAD}
+fi
 done
 
 echo -e "\npython3依赖安装成功...\n"
 
 echo -e "4、启动bot程序...\n"
 make_dir $dir_log/bot
-cd $dir_data
+cd $dir_root
-ps -eo pid,command | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
+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"