更新版本 v2.13.1

修复pnpm版本兼容
修复前端列表查询
2026-08-12 03:10:48 +08:00 · 2022-05-29 01:50:46 +08:00 · 2022-05-29 01:50:05 +08:00 · 2022-05-28 21:49:34 +08:00 · 2022-05-28 21:10:24 +08:00 · 2022-05-28 20:51:25 +08:00
90 changed files with 4071 additions and 835 deletions
@@ -20,16 +20,15 @@ jobs:
  build-static:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '14'
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3

      - name: build front and back
        run: |
-          yarn install
-          yarn build:front
-          yarn build:back
+          npm i -g pnpm
+          pnpm install
+          pnpm build:front
+          pnpm build:back

      - name: copy to static repo
        env:
@@ -55,10 +54,8 @@ jobs:
      contents: read

    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '14'
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3

      - name: Set time zone
        uses: szenius/set-timezone@v1.0
@@ -68,13 +65,13 @@ jobs:
          timezoneWindows: "China Standard Time"

      - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

      - name: Login to GHCR
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -82,7 +79,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
        with:
          images: |
            ${{ github.repository }}
@@ -99,18 +96,19 @@ jobs:
            type=semver,pattern={{major}}

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          build-args: |
            MAINTAINER=${{ github.repository_owner }}
            QL_BRANCH=${{ github.ref_name }}
+          network: host
          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
          context: docker/
          push: true
@@ -1,31 +0,0 @@
-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/
@@ -9,6 +9,10 @@ export default defineConfig({
    type: 'none',
  },
  fastRefresh: {},
+  // antd: {
+  //   dark: true,
+  // },
+  mfsu: {},
  esbuild: {},
  webpack5: {},
  dynamicImport: {
@@ -1,22 +1,201 @@
-MIT LICENSE
+                              Apache License
+                        Version 2.0, January 2004
+                    http://www.apache.org/licenses/

-Copyright (c) 2021-present whyour
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-Permission is hereby granted, free of charge, to any person obtaining
-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:
+1. Definitions.

-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+  To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "{}"
+  replaced with your own identifying information. (Don't include
+  the brackets!)  The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a
+  file or class name and description of purpose be included on the
+  same "printed page" as the copyright notice for easier
+  identification within third-party archives.
+
+Copyright 2021 WHYOUR <https://github.com/whyour>.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
@@ -0,0 +1,210 @@
+<p align="center">
+  <a href="https://github.com/whyour/qinglong">
+    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
+  </a>
+</p>
+
+<h1 align="center">Green Dragon</h1>
+
+<div align="center">
+
+Timed task management panel with python3, javaScript, shell, typescript support
+
+[![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
+
+[docker-pulls-image]: https://img.shields.io/docker/pulls/whyour/qinglong?style=flat
+[docker-pulls-url]: https://hub.docker.com/r/whyour/qinglong
+[docker-version-image]: https://img.shields.io/docker/v/whyour/qinglong?style=flat
+[docker-version-url]: https://hub.docker.com/r/whyour/qinglong/tags?page=1&ordering=last_updated
+[docker-stars-image]: https://img.shields.io/docker/stars/whyour/qinglong?style=flat
+[docker-stars-url]: https://hub.docker.com/r/whyour/qinglong
+[docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
+[docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
+</div>
+
+[![](https://user-images.githubusercontent.com/22700758/161788855-c4e51cb8-d4e9-44fe-bb17-ee1a56c8549b.png)](https://whyour.cn)
+
+[简体中文](./README.md) | English
+
+## Features
+
+- Support for multiple scripting languages (python3, javaScript, shell, typescript)
+- Support online management of scripts, environment variables, configuration files
+- Support online view task log
+- Support second-level task setting
+- Support system level notification
+- Support dark mode
+- Support cell phone operation
+
+## Deployment
+
+### Local Deployment
+
+```bash
+# To be completed
+```
+
+### Podman Deployment
+
+1. podman installation
+
+```bash
+https://podman.io/getting-started/installation
+```
+
+2. start the container
+
+```bash
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql:/ql/data \
+  -p 5700:5700 \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  docker.io/whyour/qinglong:latest
+```
+
+### Docker Deployment
+
+1. docker installation
+
+```bash
+sudo curl -sSL get.docker.com | sh
+```
+
+2. configure domestic mirror sources
+
+```bash
+mkdir -p /etc/docker
+tee /etc/docker/daemon.json <<-'EOF'
+{
+  "registry-mirrors": [
+    "https://0b27f0a81a00f3560fbdc00ddd2f99e0.mirror.swr.myhuaweicloud.com",
+    "https://ypzju6vq.mirror.aliyuncs.com",
+    "https://registry.docker-cn.com",
+    "http://hub-mirror.c.163.com",
+    "https://docker.mirrors.ustc.edu.cn"
+  ]
+}
+EOF
+systemctl daemon-reload
+systemctl restart docker
+```
+
+3. start the container
+
+```bash
+docker run -dit \
+  -v $PWD/ql:/ql/data \
+  -p 5700:5700 \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### Docker-compose Deployment
+
+1. docker-compose installation
+
+```bash
+sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+```
+
+2. start the container
+
+```bash
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# start
+docker-compose up -d
+# stop
+docker-compose down
+```
+
+## Use
+
+1. built-in commands
+
+```bash
+# Update and restart Green Dragon
+ql update                                                    
+# Run custom scripts extra.sh
+ql extra                                                     
+# Adding a single script file
+ql raw <file_url>                                             
+# Add a specific script for a single repository
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+# Delete old logs
+ql rmlog <days>                                              
+# Start bot
+ql bot                                                       
+# Detecting the Green Dragon environment and repairing it
+ql check                                                     
+# Reset the number of login errors
+ql resetlet                                                  
+# Disable two-step login
+ql resettfa                                                  
+
+# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
+task <file_path>                                             
+# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
+# and the foreground will output the day, while recorded in the log file
+task <file_path> now                                         
+# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
+# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
+task <file_path> conc <env_name> <account_number>(Optional) 
+# Specify the account to execute and run immediately regardless of whether a random delay is set 
+task <file_path> desi <env_name> <account_number>         
+```
+
+2. parameter description
+
+* file_url: Script address
+* repo_url: Repository address
+* whitelist: The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled
+* blacklist: Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled
+* dependence: Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist
+* branch: Pull the branch of the repository
+* days: Number of days of logs to be kept
+* file_path: File path for task execution
+* env_name: The name of the environment variable that needs to be concurrent or specified at the time of task execution
+* account_number: Specify the account number of an environment variable to be executed when the task is executed
+
+## Links
+
+- [nevinee](https://gitee.com/evine)
+- [crontab-ui](https://github.com/alseambusher/crontab-ui)
+- [Ant Design](https://ant.design)
+- [Ant Design Pro](https://pro.ant.design/)
+- [Umijs3.0](https://umijs.org)
+- [darkreader](https://github.com/darkreader/darkreader)
+- [admin-server](https://github.com/sunpu007/admin-server)
+
+## Development
+
+```bash
+$ git clone git@github.com:whyour/qinglong.git
+$ cd qinglong
+$ cp .env.example .env
+# Recommended use pnpm https://pnpm.io/zh/installation
+$ npm install -g pnpm
+$ pnpm install
+$ pnpm start
+```
+
+Open your browser and visit http://127.0.0.1:5700
+
+## Communication
+
+[telegram channel](https://t.me/jiao_long)
+
+## Name Origin
+
+The Green Dragon, also known as the Canglong, is one of the four elephants and one of the [four spirits of the heavens](https://zh.wikipedia.org/wiki/%E5%A4%A9%E4%B9%8B%E5%9B%9B%E7%81%B5) in traditional Chinese culture. According to the Five Elements, it is a spirit animal representing the East as a green dragon, the five elements are wood, and the season represented is spring, with the eight trigrams dominating vibration. Like the Ying Long, the Cang Long has feathered wings. According to the Zhang Guo Xing Zong (Zhang Guo Xing Zong), "a true dragon is one that has complementary wings".
+
+In the Book of the Later Han Dynasty (後漢書-律曆志下), it is written: "The sun is in the sky, a cold and a summer, the four seasons are ready, all things are changed, the regency moves, and the green dragon moves to the star, which is called the year. (The Year of the Star)
+
+Among the [twenty-eight Chinese constellations](https://zh.wikipedia.org/wiki/%E4%BA%8C%E5%8D%81%E5%85%AB%E5%AE%BF), the Green Dragon is the generic name for the seven eastern constellations (Horn, Hyper, Diao, Fang, Heart, Tail and Minchi). It is known in Taoism as "Mengzhang" and in different Taoist scriptures as "Dijun", "Shengjian", "Shenjian" and He is also known in different Daoist scriptures as "Dijun", "Shengjun", "Shenjun" and "Ghost Catcher"[1], and is the guardian deity of Daoism, together with the White Tiger Supervisor of Soldiers.
@@ -8,7 +8,7 @@

 <div align="center">

-支持python3、javaScript、shell、typescript 的定时任务管理面板（A timed task management panel that supports typescript, javaScript, python3, and shell.）
+支持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]

@@ -22,7 +22,7 @@
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 </div>

-[![](https://z3.ax1x.com/2021/11/18/I7KrTg.jpg)](https://whyour.cn)
+[![](https://user-images.githubusercontent.com/22700758/161788855-c4e51cb8-d4e9-44fe-bb17-ee1a56c8549b.png)](https://whyour.cn)

 简体中文 | [English](./README-en.md)

@@ -73,7 +73,27 @@ podman run -dit \
 sudo curl -sSL get.docker.com | sh
 ```

-2. 启动容器
+2. 配置国内镜像源
+Configure domestic mirror sources
+
+```bash
+mkdir -p /etc/docker
+tee /etc/docker/daemon.json <<-'EOF'
+{
+  "registry-mirrors": [
+    "https://0b27f0a81a00f3560fbdc00ddd2f99e0.mirror.swr.myhuaweicloud.com",
+    "https://ypzju6vq.mirror.aliyuncs.com",
+    "https://registry.docker-cn.com",
+    "http://hub-mirror.c.163.com",
+    "https://docker.mirrors.ustc.edu.cn"
+  ]
+}
+EOF
+systemctl daemon-reload
+systemctl restart docker
+```
+
+3. 启动容器

 ```bash
 docker run -dit \
@@ -117,7 +137,7 @@ ql extra
 # 添加单个脚本文件
 ql raw <file_url>                                             
 # 添加单个仓库的指定脚本
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
 # 删除旧日志
 ql rmlog <days>                                              
 # 启动tg-bot
@@ -147,6 +167,7 @@ task <file_path> desi <env_name> <account_number>
 * blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串
 * dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响
 * branch: 拉取仓库的分支
+* extensions: 拉取仓库的文件后缀
 * days: 需要保留的日志的天数
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称
@@ -168,8 +189,10 @@ task <file_path> desi <env_name> <account_number>
 $ git clone git@github.com:whyour/qinglong.git
 $ cd qinglong
 $ cp .env.example .env
-$ yarn install
-$ yarn start
+# 推荐使用 pnpm https://pnpm.io/zh/installation
+$ npm install -g pnpm
+$ pnpm install
+$ pnpm start
 ```

 打开你的浏览器，访问 http://127.0.0.1:5700
@@ -94,7 +94,7 @@ export default (app: Router) => {
      const logger: Logger = Container.get('logger');
      try {
        const dependenceService = Container.get(DependenceService);
-        const data = await dependenceService.removeDb(req.body);
+        const data = await dependenceService.remove(req.body, true);
        return res.send({ code: 200, data });
      } catch (e) {
        logger.error('🔥 error: %o', e);
@@ -8,6 +8,7 @@ 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();
@@ -20,6 +21,7 @@ export default () => {
  open(app);
  dependence(app);
  system(app);
+  subscription(app);

  return app;
 };
@@ -3,7 +3,8 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { getFileContentByName } from '../config/util';
+import { getFileContentByName, readDirs } from '../config/util';
+import { join } from 'path';
 const route = Router();

 export default (app: Router) => {
@@ -12,59 +13,28 @@ export default (app: Router) => {
  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
    const logger: Logger = Container.get('logger');
    try {
-      const fileList = fs.readdirSync(config.logPath, 'utf-8');
-      const dirs = [];
-      for (let i = 0; i < fileList.length; i++) {
-        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 });
+      const result = readDirs(config.logPath, config.logPath);
+      res.send({
+        code: 200,
+        data: result,
+      });
    } catch (e) {
      logger.error('🔥 error: %o', e);
      return next(e);
    }
  });

-  route.get(
-    '/:dir/:file',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const { dir, file } = req.params;
-        const content = getFileContentByName(
-          `${config.logPath}/${dir}/${file}`,
-        );
-        res.send({ code: 200, data: content });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
  route.get(
    '/:file',
    async (req: Request, res: Response, next: NextFunction) => {
      const logger: Logger = Container.get('logger');
      try {
-        const { file } = req.params;
-        const content = getFileContentByName(`${config.logPath}/${file}`);
+        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);
@@ -1,6 +1,7 @@
 import {
  fileExist,
  getFileContentByName,
+  readDirs,
  getLastModifyFilePath,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
@@ -16,68 +17,19 @@ const route = Router();
 export default (app: Router) => {
  app.use('/scripts', route);

-  route.get(
-    '/files',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const fileList = fs.readdirSync(config.scriptPath, 'utf-8');
-
-        let result = [];
-        for (let i = 0; i < fileList.length; i++) {
-          const fileOrDir = fileList[i];
-          const fPath = path.join(config.scriptPath, fileOrDir);
-          const dirStat = fs.statSync(fPath);
-          if (['node_modules'].includes(fileOrDir)) {
-            continue;
-          }
-
-          if (dirStat.isDirectory()) {
-            const childFileList = fs.readdirSync(fPath, 'utf-8');
-            let children = [];
-            for (let j = 0; j < childFileList.length; j++) {
-              const childFile = childFileList[j];
-              const sPath = path.join(config.scriptPath, fileOrDir, childFile);
-              const _fileExist = await fileExist(sPath);
-              if (_fileExist && fs.statSync(sPath).isFile()) {
-                const statObj = fs.statSync(sPath);
-                children.push({
-                  title: childFile,
-                  value: childFile,
-                  key: `${fileOrDir}/${childFile}`,
-                  mtime: statObj.mtimeMs,
-                  parent: fileOrDir,
-                });
-              }
-            }
-            result.push({
-              title: fileOrDir,
-              value: fileOrDir,
-              key: fileOrDir,
-              mtime: dirStat.mtimeMs,
-              disabled: true,
-              children: children.sort((a, b) => b.mtime - a.mtime),
-            });
-          } else {
-            result.push({
-              title: fileOrDir,
-              value: fileOrDir,
-              key: fileOrDir,
-              mtime: dirStat.mtimeMs,
-            });
-          }
-        }
-
-        res.send({
-          code: 200,
-          data: result,
-        });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
+    const logger: Logger = Container.get('logger');
+    try {
+      const result = readDirs(config.scriptPath, config.scriptPath);
+      res.send({
+        code: 200,
+        data: result,
+      });
+    } catch (e) {
+      logger.error('🔥 error: %o', e);
+      return next(e);
+    }
+  });

  route.get(
    '/:file',
@@ -129,7 +81,7 @@ export default (app: Router) => {
        if (config.writePathList.every((x) => !path.startsWith(x))) {
          return res.send({
            code: 430,
-            data: '文件路径禁止访问',
+            message: '文件路径禁止访问',
          });
        }
        if (!originFilename) {
@@ -0,0 +1,288 @@
+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().optional().allow('').allow(null),
+        name: Joi.string().optional().allow('').allow(null),
+        url: Joi.string().required(),
+        whitelist: Joi.string().optional().allow('').allow(null),
+        blacklist: Joi.string().optional().allow('').allow(null),
+        branch: Joi.string().optional().allow('').allow(null),
+        dependences: Joi.string().optional().allow('').allow(null),
+        pull_type: Joi.string().optional().allow('').allow(null),
+        pull_option: Joi.object().optional().allow('').allow(null),
+        extensions: Joi.string().optional().allow('').allow(null),
+        sub_before: Joi.string().optional().allow('').allow(null),
+        sub_after: Joi.string().optional().allow('').allow(null),
+        schedule_type: Joi.string().required(),
+        alias: Joi.string().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        if (
+          !req.body.schedule ||
+          cron_parser.parseExpression(req.body.schedule).hasNext()
+        ) {
+          const subscriptionService = Container.get(SubscriptionService);
+          const data = await subscriptionService.create(req.body);
+          return res.send({ code: 200, data });
+        } else {
+          return res.send({ code: 400, message: 'param schedule error' });
+        }
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/run',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.run(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/stop',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.stop(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/disable',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.disabled(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/enable',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.enabled(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/:id/log',
+    celebrate({
+      params: Joi.object({
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.log(req.params.id);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/',
+    celebrate({
+      body: Joi.object({
+        type: Joi.string().required(),
+        schedule: Joi.string().optional().allow('').allow(null),
+        interval_schedule: Joi.object().optional().allow('').allow(null),
+        name: Joi.string().optional().allow('').allow(null),
+        url: Joi.string().required(),
+        whitelist: Joi.string().optional().allow('').allow(null),
+        blacklist: Joi.string().optional().allow('').allow(null),
+        branch: Joi.string().optional().allow('').allow(null),
+        dependences: Joi.string().optional().allow('').allow(null),
+        pull_type: Joi.string().optional().allow('').allow(null),
+        pull_option: Joi.object().optional().allow('').allow(null),
+        schedule_type: Joi.string().optional().allow('').allow(null),
+        extensions: Joi.string().optional().allow('').allow(null),
+        sub_before: Joi.string().optional().allow('').allow(null),
+        sub_after: Joi.string().optional().allow('').allow(null),
+        alias: Joi.string().required(),
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        if (
+          !req.body.schedule ||
+          typeof req.body.schedule === 'object' ||
+          cron_parser.parseExpression(req.body.schedule).hasNext()
+        ) {
+          const subscriptionService = Container.get(SubscriptionService);
+          const data = await subscriptionService.update(req.body);
+          return res.send({ code: 200, data });
+        } else {
+          return res.send({ code: 400, message: 'param schedule error' });
+        }
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.delete(
+    '/',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.remove(req.body);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/:id',
+    celebrate({
+      params: Joi.object({
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.getDb({ id: req.params.id });
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/status',
+    celebrate({
+      body: Joi.object({
+        ids: Joi.array().items(Joi.number().required()),
+        status: Joi.string().required(),
+        pid: Joi.string().optional(),
+        log_path: Joi.string().optional(),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.status({
+          ...req.body,
+          status: parseInt(req.body.status),
+          pid: parseInt(req.body.pid) || '',
+        });
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  route.get(
+    '/:id/logs',
+    celebrate({
+      params: Joi.object({
+        id: Joi.number().required(),
+      }),
+    }),
+    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const subscriptionService = Container.get(SubscriptionService);
+        const data = await subscriptionService.logs(req.params.id);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+};
@@ -1,13 +1,26 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
-import * as fs from 'fs';
-import config from '../config';
 import UserService from '../services/user';
 import { celebrate, Joi } from 'celebrate';
-import { getFileContentByName } from '../config/util';
+import multer from 'multer';
+import path from 'path';
+import { v4 as uuidV4 } from 'uuid';
+import config from '../config';
 const route = Router();

+const storage = multer.diskStorage({
+  destination: function (req, file, cb) {
+    cb(null, config.uploadPath);
+  },
+  filename: function (req, file, cb) {
+    const ext = path.parse(file.originalname).ext;
+    const key = uuidV4();
+    cb(null, key + ext);
+  },
+});
+const upload = multer({ storage: storage });
+
 export default (app: Router) => {
  app.use('/user', route);

@@ -77,6 +90,7 @@ export default (app: Router) => {
        code: 200,
        data: {
          username: authInfo.username,
+          avatar: authInfo.avatar,
          twoFactorActivated: authInfo.twoFactorActivated,
        },
      });
@@ -238,4 +252,20 @@ export default (app: Router) => {
      }
    },
  );
+
+  route.put(
+    '/avatar',
+    upload.single('avatar'),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const userService = Container.get(UserService);
+        const result = await userService.updateAvatar(req.file!.filename);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
 };
@@ -19,11 +19,7 @@ async function startServer() {

  const server = app
    .listen(config.port, () => {
-      Logger.info(`
-      ################################################
-      🛡️  Server listening on port: ${config.port} 🛡️
-      ################################################
-    `);
+      Logger.debug(`✌️ Back server launched on port ${config.port}`);
    })
    .on('error', (err) => {
      Logger.error(err);
@@ -4,7 +4,7 @@ import { createRandomString } from './util';

 process.env.NODE_ENV = process.env.NODE_ENV || 'development';

-const lastVersionFile = 'https://qn.whyour.cn/version.ts';
+const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;

 const envFound = dotenv.config();
 const rootPath = process.cwd();
@@ -15,6 +15,7 @@ const scriptPath = path.join(dataPath, 'scripts/');
 const bakPath = path.join(dataPath, 'bak/');
 const logPath = path.join(dataPath, 'log/');
 const dbPath = path.join(dataPath, 'db/');
+const uploadPath = path.join(dataPath, 'upload/');

 const envFile = path.join(configPath, 'env.sh');
 const confFile = path.join(configPath, 'config.sh');
@@ -58,6 +59,7 @@ export default {
  confFile,
  envFile,
  dbPath,
+  uploadPath,
  configPath,
  scriptPath,
  samplePath,
@@ -232,6 +232,14 @@ 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 concurrentRun(
  fnList: Array<() => Promise<any>> = [],
  max = 5,
@@ -268,3 +276,32 @@ export async function concurrentRun(

  return replyList;
 }
+
+export function readDirs(dir: string, baseDir: string = '') {
+  const relativePath = path.relative(baseDir, dir);
+  const files = fs.readdirSync(dir);
+  const result: any = files.map((file: string) => {
+    const subPath = path.join(dir, file);
+    const stats = fs.statSync(subPath);
+    const key = path.join(relativePath, file);
+    if (stats.isDirectory()) {
+      return {
+        title: file,
+        value: file,
+        key,
+        type: 'directory',
+        disabled: true,
+        parent: relativePath,
+        children: readDirs(subPath, baseDir),
+      };
+    }
+    return {
+      title: file,
+      value: file,
+      type: 'file',
+      key,
+      parent: relativePath,
+    };
+  });
+  return result;
+}
@@ -34,7 +34,7 @@ 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;
  }
@@ -37,15 +37,15 @@ export enum DependenceTypes {
 }

 export enum InstallDependenceCommandTypes {
-  'npm i -g --force',
+  'pnpm add -g',
  'pip3 install',
-  'apk add --no-cache -f',
+  'apk add',
 }

 export enum unInstallDependenceCommandTypes {
-  'npm uninstall -g --force',
+  'pnpm remove -g',
  'pip3 uninstall -y',
-  'apk del -f',
+  'apk del',
 }

 interface DependenceInstance
@@ -39,7 +39,7 @@ export class PushDeerNotification extends NotificationBaseInfo {

 export class BarkNotification extends NotificationBaseInfo {
  public barkPush = '';
-  public barkIcon = 'https://qn.whyour.cn/logo.png';
+  public barkIcon = 'http://qn.whyour.cn/logo.png';
  public barkSound = '';
  public barkGroup = 'qinglong';
 }
@@ -13,5 +13,7 @@ export class SockMessage {
 export type SockMessageType =
  | 'ping'
  | 'installDependence'
+  | 'uninstallDependence'
  | 'updateSystemVersion'
-  | 'manuallyRunScript';
+  | 'manuallyRunScript'
+  | 'runSubscriptionEnd';
@@ -0,0 +1,106 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+import { SimpleIntervalSchedule } from 'toad-scheduler';
+
+type SimpleIntervalScheduleUnit = keyof SimpleIntervalSchedule;
+export class Subscription {
+  id?: number;
+  name?: string;
+  type?: 'public-repo' | 'private-repo' | 'file';
+  schedule_type?: 'crontab' | 'interval';
+  schedule?: string;
+  interval_schedule?: { type: SimpleIntervalScheduleUnit; value: number };
+  url?: string;
+  whitelist?: string;
+  blacklist?: string;
+  dependences?: string;
+  branch?: string;
+  status?: SubscriptionStatus;
+  pull_type?: 'ssh-key' | 'user-pwd';
+  pull_option?:
+    | { private_key: string }
+    | { username: string; password: string };
+  pid?: number;
+  is_disabled?: 1 | 0;
+  log_path?: string;
+  alias: string;
+  command?: string;
+  extensions?: string;
+  sub_before?: string;
+  sub_after?: string;
+
+  constructor(options: Subscription) {
+    this.id = options.id;
+    this.name = options.name || options.alias;
+    this.type = options.type;
+    this.schedule = options.schedule;
+    this.status =
+      options.status && SubscriptionStatus[options.status]
+        ? options.status
+        : SubscriptionStatus.idle;
+    this.url = options.url;
+    this.whitelist = options.whitelist;
+    this.blacklist = options.blacklist;
+    this.dependences = options.dependences;
+    this.branch = options.branch;
+    this.pull_type = options.pull_type;
+    this.pull_option = options.pull_option;
+    this.pid = options.pid;
+    this.is_disabled = options.is_disabled;
+    this.log_path = options.log_path;
+    this.schedule_type = options.schedule_type;
+    this.alias = options.alias;
+    this.interval_schedule = options.interval_schedule;
+    this.extensions = options.extensions;
+    this.sub_before = options.sub_before;
+    this.sub_after = options.sub_after;
+  }
+}
+
+export enum SubscriptionStatus {
+  'running',
+  'idle',
+  'disabled',
+  'queued',
+}
+
+interface SubscriptionInstance
+  extends Model<Subscription, Subscription>,
+    Subscription {}
+export const SubscriptionModel = sequelize.define<SubscriptionInstance>(
+  'Subscription',
+  {
+    name: {
+      unique: 'compositeIndex',
+      type: DataTypes.STRING,
+    },
+    url: {
+      unique: 'compositeIndex',
+      type: DataTypes.STRING,
+    },
+    schedule: {
+      unique: 'compositeIndex',
+      type: DataTypes.STRING,
+    },
+    interval_schedule: {
+      unique: 'compositeIndex',
+      type: DataTypes.JSON,
+    },
+    type: DataTypes.STRING,
+    whitelist: DataTypes.STRING,
+    blacklist: DataTypes.STRING,
+    status: DataTypes.NUMBER,
+    dependences: DataTypes.STRING,
+    extensions: DataTypes.STRING,
+    sub_before: DataTypes.STRING,
+    sub_after: DataTypes.STRING,
+    branch: DataTypes.STRING,
+    pull_type: DataTypes.STRING,
+    pull_option: DataTypes.JSON,
+    pid: DataTypes.NUMBER,
+    is_disabled: DataTypes.NUMBER,
+    log_path: DataTypes.STRING,
+    schedule_type: DataTypes.STRING,
+    alias: { type: DataTypes.STRING, unique: 'alias' },
+  },
+);
@@ -1,14 +1,13 @@
 import expressLoader from './express';
-import dependencyInjectorLoader from './dependencyInjector';
+import depInjectorLoader from './depInjector';
 import Logger from './logger';
 import initData from './initData';
 import { Application } from 'express';
 import linkDeps from './deps';
+import initTask from './initTask';

 export default async ({ expressApp }: { expressApp: Application }) => {
-  await dependencyInjectorLoader({
-    models: [],
-  });
+  await depInjectorLoader();
  Logger.info('✌️ Dependency Injector loaded');

  await expressLoader({ app: expressApp });
@@ -18,5 +17,8 @@ export default async ({ expressApp }: { expressApp: Application }) => {
  Logger.info('✌️ init data loaded');

  await linkDeps();
-  Logger.info('✌️ link deps');
+  Logger.info('✌️ link deps loaded');
+
+  initTask();
+  Logger.info('✌️ init task loaded');
 };
@@ -8,6 +8,7 @@ import { AppModel } from '../data/open';
 import { AuthModel } from '../data/auth';
 import { sequelize } from '../data';
 import { fileExist } from '../config/util';
+import { SubscriptionModel } from '../data/subscription';
 import config from '../config';

 export default async () => {
@@ -17,6 +18,8 @@ export default async () => {
    await AppModel.sync();
    await AuthModel.sync();
    await EnvModel.sync();
+    await SubscriptionModel.sync({ alter: true });
+
    await sequelize.sync();

    // try {
@@ -1,12 +1,8 @@
 import { Container } from 'typedi';
 import LoggerInstance from './logger';

-export default ({ models }: { models: { name: string; model: any }[] }) => {
+export default () => {
  try {
-    models.forEach((m) => {
-      Container.set(m.name, m.model);
-    });
-
    Container.set('logger', LoggerInstance);
  } catch (e) {
    LoggerInstance.error('🔥 Error on dependency injector loader: %o', e);
@@ -1,4 +1,4 @@
-import { Request, Response, NextFunction, Application } from 'express';
+import express, { Request, Response, NextFunction, Application } from 'express';
 import bodyParser from 'body-parser';
 import cors from 'cors';
 import routes from '../api';
@@ -13,10 +13,12 @@ import UserService from '../services/user';
 import handler from 'serve-handler';
 import * as Sentry from '@sentry/node';
 import { EnvModel } from '../data/env';
+import { errors } from 'celebrate';

 export default ({ app }: { app: Application }) => {
  app.enable('trust proxy');
  app.use(cors());
+  app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));

  app.use((req, res, next) => {
    if (req.path.startsWith('/api') || req.path.startsWith('/open')) {
@@ -133,6 +135,7 @@ export default ({ app }: { app: Application }) => {
    next(err);
  });

+  app.use(errors());
  app.use(Sentry.Handlers.errorHandler());

  app.use(
@@ -7,16 +7,12 @@ import EnvService from '../services/env';
 import _ from 'lodash';
 import { DependenceModel } from '../data/dependence';
 import { Op } from 'sequelize';
-import SystemService from '../services/system';
-import ScheduleService from '../services/schedule';
 import config from '../config';

 export default async () => {
  const cronService = Container.get(CronService);
  const envService = Container.get(EnvService);
  const dependenceService = Container.get(DependenceService);
-  const systemService = Container.get(SystemService);
-  const scheduleService = Container.get(ScheduleService);

  // 初始化更新所有任务状态为空闲
  await CrontabModel.update(
@@ -25,17 +21,13 @@ export default async () => {
  );

  // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  DependenceModel.findAll({ where: {} }).then(async (docs) => {
+  DependenceModel.findAll({ where: {}, raw: true }).then(async (docs) => {
    const groups = _.groupBy(docs, 'type');
    for (const key in groups) {
      if (Object.prototype.hasOwnProperty.call(groups, key)) {
        const group = groups[key];
        const depIds = group.map((x) => x.id);
-        for (const dep of depIds) {
-          if (dep) {
-            await dependenceService.reInstall([dep]);
-          }
-        }
+        await dependenceService.reInstall(depIds as number[]);
      }
    }
  });
@@ -119,34 +111,4 @@ export default async () => {
  // 初始化保存一次ck和定时任务数据
  await cronService.autosave_crontab();
  await envService.set_envs();
-
-  // 运行删除日志任务
-  const data = await systemService.getLogRemoveFrequency();
-  if (data && data.info && data.info.frequency) {
-    const cron = {
-      id: data.id,
-      name: '删除日志',
-      command: `ql rmlog ${data.info.frequency}`,
-    };
-    await scheduleService.createIntervalTask(cron, {
-      days: data.info.frequency,
-      runImmediately: true,
-    });
-  }
 };
-
-function randomSchedule(from: number, to: number) {
-  const result: 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;
-}
@@ -1,5 +1,6 @@
 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';
@@ -9,11 +10,14 @@ const dataPath = path.join(rootPath, 'data/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');
+const uploadPath = path.join(dataPath, 'upload/');
 const samplePath = path.join(rootPath, 'sample/');
 const confFile = path.join(configPath, 'config.sh');
 const authConfigFile = path.join(configPath, 'auth.json');
 const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
 const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
+const homedir = os.homedir();
+const sshPath = path.resolve(homedir, '.ssh');

 export default async () => {
  const authFileExist = await fileExist(authConfigFile);
@@ -21,6 +25,8 @@ 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);

  if (!configDirExist) {
    fs.mkdirSync(configPath);
@@ -42,6 +48,14 @@ export default async () => {
    fs.mkdirSync(logPath);
  }

+  if (!uploadDirExist) {
+    fs.mkdirSync(uploadPath);
+  }
+
+  if (!sshDirExist) {
+    fs.mkdirSync(sshPath);
+  }
+
  dotenv.config({ path: confFile });

  Logger.info('✌️ Init file down');
@@ -0,0 +1,31 @@
+import { Container } from 'typedi';
+import _ from 'lodash';
+import SystemService from '../services/system';
+import ScheduleService from '../services/schedule';
+import SubscriptionService from '../services/subscription';
+
+export default async () => {
+  const systemService = Container.get(SystemService);
+  const scheduleService = Container.get(ScheduleService);
+  const subscriptionService = Container.get(SubscriptionService);
+
+  // 运行删除日志任务
+  const data = await systemService.getLogRemoveFrequency();
+  if (data && data.info && data.info.frequency) {
+    const cron = {
+      id: data.id,
+      name: '删除日志',
+      command: `ql rmlog ${data.info.frequency}`,
+    };
+    await scheduleService.createIntervalTask(cron, {
+      days: data.info.frequency,
+      runImmediately: true,
+    });
+  }
+
+  // 运行所有订阅
+  const subs = await subscriptionService.list();
+  for (const sub of subs) {
+    await subscriptionService.handleTask(sub, true, true, true);
+  }
+};
@@ -10,7 +10,7 @@ app.get('/api/public/panel/log', (req, res) => {
    'pm2 logs panel --lines 500 --nostream --timestamp',
    (err, stdout, stderr) => {
      if (err || stderr) {
-        return res.send({ code: 400, data: err || stderr });
+        return res.send({ code: 400, message: (err && err.message) || stderr });
      }
      return res.send({ code: 200, data: stdout });
    },
@@ -22,11 +22,7 @@ app
    await require('./loaders/sentry').default({ expressApp: app });
    await require('./loaders/db').default();

-    Logger.info(`
-      ################################################
-      🛡️  Public listening on port: ${config.publicPort} 🛡️
-      ################################################
-    `);
+    Logger.debug(`✌️ Back server launched on port ${config.publicPort}`);
  })
  .on('error', (err) => {
    Logger.error(err);
@@ -9,6 +9,7 @@ import { getFileContentByName, concurrentRun, fileExist } from '../config/util';
 import { promises, existsSync } from 'fs';
 import { promisify } from 'util';
 import { Op } from 'sequelize';
+import path from 'path';

@Service()
 export default class CronService {
@@ -16,7 +17,7 @@ export default class CronService {

  private isSixCron(cron: Crontab) {
    const { schedule } = cron;
-    if (schedule.split(/ +/).length === 6) {
+    if (schedule?.split(/ +/).length === 6) {
      return true;
    }
    return false;
@@ -194,11 +195,12 @@ export default class CronService {
        }
      }
      const err = await this.killTask(doc.command);
-      const logFileExist = await fileExist(doc.log_path);
-      if (doc.log_path && logFileExist) {
+      const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
+      const logFileExist = doc.log_path && (await fileExist(absolutePath));
+      if (logFileExist) {
        const str = err ? `\n${err}` : '';
        fs.appendFileSync(
-          `${doc.log_path}`,
+          `${absolutePath}`,
          `${str}\n## 执行结束...  ${new Date()
            .toLocaleString('zh', { hour12: false })
            .replace(' 24:', ' 00:')} `,
@@ -256,6 +258,8 @@ export default class CronService {
      }

      let { id, command, log_path } = cron;
+      const absolutePath = path.resolve(config.logPath, `${log_path}`);
+      const logFileExist = log_path && (await fileExist(absolutePath));

      this.logger.silly('Running job');
      this.logger.silly('ID: ' + id);
@@ -276,13 +280,13 @@ export default class CronService {
        { where: { id } },
      );
      cp.stderr.on('data', (data) => {
-        if (log_path) {
-          fs.appendFileSync(`${log_path}`, `${data}`);
+        if (logFileExist) {
+          fs.appendFileSync(`${absolutePath}`, `${data}`);
        }
      });
      cp.on('error', (err) => {
-        if (log_path) {
-          fs.appendFileSync(`${log_path}`, `${JSON.stringify(err)}`);
+        if (logFileExist) {
+          fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
        }
      });

@@ -323,8 +327,10 @@ export default class CronService {
      return '';
    }

-    if (doc.log_path) {
-      return getFileContentByName(`${doc.log_path}`);
+    const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
+    const logFileExist = doc.log_path && (await fileExist(absolutePath));
+    if (logFileExist) {
+      return getFileContentByName(`${absolutePath}`);
    }
    const [, commandStr, url] = doc.command.split(/ +/);
    let logPath = this.getKey(commandStr);
@@ -353,6 +359,21 @@ export default class CronService {
      return [];
    }

+    if (doc.log_path) {
+      const relativeDir = path.dirname(`${doc.log_path}`);
+      const dir = path.resolve(config.logPath, relativeDir);
+      if (existsSync(dir)) {
+        let files = await promises.readdir(dir);
+        return files
+          .map((x) => ({
+            filename: x,
+            directory: relativeDir.replace(config.logPath, ''),
+            time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
+          }))
+          .sort((a, b) => b.time - a.time);
+      }
+    }
+
    const [, commandStr, url] = doc.command.split(/ +/);
    let logPath = this.getKey(commandStr);
    const isQlCommand = doc.command.startsWith('ql ');
@@ -380,14 +401,26 @@ export default class CronService {
    }
  }

-  private getKey(command: string) {
+  private getKey(command: string): string {
    const start =
      command.lastIndexOf('/') !== -1 ? command.lastIndexOf('/') + 1 : 0;
    const end =
      command.lastIndexOf('.') !== -1
        ? command.lastIndexOf('.')
        : command.length;
-    return command.substring(start, end);
+
+    const tmpStr = command.substring(0, start - 1);
+    let index = 0;
+    if (tmpStr.lastIndexOf('/') !== -1 && tmpStr.startsWith('http')) {
+      index = tmpStr.lastIndexOf('/');
+    } else if (tmpStr.lastIndexOf(':') !== -1 && tmpStr.startsWith('git@')) {
+      index = tmpStr.lastIndexOf(':');
+    }
+    if (index) {
+      return `${tmpStr.substring(index + 1)}_${command.substring(start, end)}`;
+    } else {
+      return command.substring(start, end);
+    }
  }

  private make_command(tab: Crontab) {
@@ -400,7 +433,7 @@ export default class CronService {
    var crontab_string = '';
    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 += ' ';
@@ -426,22 +459,22 @@ export default class CronService {

  public import_crontab() {
    exec('crontab -l', (error, stdout, stderr) => {
-      var lines = stdout.split('\n');
-      var namePrefix = new Date().getTime();
+      const lines = stdout.split('\n');
+      const namePrefix = new Date().getTime();

      lines.reverse().forEach(async (line, index) => {
        line = line.replace(/\t+/g, ' ');
-        var regex =
+        const regex =
          /^((\@[a-zA-Z]+\s+)|(([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+))/;
-        var command = line.replace(regex, '').trim();
-        var schedule = line.replace(command, '').trim();
+        const command = line.replace(regex, '').trim();
+        const schedule = line.replace(command, '').trim();

        if (
          command &&
          schedule &&
          cron_parser.parseExpression(schedule).hasNext()
        ) {
-          var name = namePrefix + '_' + index;
+          const name = namePrefix + '_' + index;

          const _crontab = await CrontabModel.findOne({
            where: { command, schedule },
@@ -13,6 +13,7 @@ import _ from 'lodash';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import { Op } from 'sequelize';
+import { concurrentRun } from '../config/util';

@Service()
 export default class DependenceService {
@@ -27,7 +28,7 @@ export default class DependenceService {
      return tab;
    });
    const docs = await this.insert(tabs);
-    this.installOrUninstallDependencies(docs);
+    this.installDependenceOneByOne(docs);
    return docs;
  }

@@ -47,7 +48,7 @@ export default class DependenceService {
      status: DependenceStatus.installing,
    });
    const newDoc = await this.updateDb(tab);
-    this.installOrUninstallDependencies([newDoc]);
+    this.installDependenceOneByOne([newDoc]);
    return newDoc;
  }

@@ -56,13 +57,13 @@ export default class DependenceService {
    return await this.getDb({ id: payload.id });
  }

-  public async remove(ids: number[]) {
+  public async remove(ids: number[], force = false): Promise<Dependence[]> {
    await DependenceModel.update(
      { status: DependenceStatus.removing, log: [] },
      { where: { id: ids } },
    );
    const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installOrUninstallDependencies(docs, false);
+    this.installDependenceOneByOne(docs, false, force);
    return docs;
  }

@@ -98,6 +99,20 @@ export default class DependenceService {
    }
  }

+  private installDependenceOneByOne(
+    docs: Dependence[],
+    isInstall: boolean = true,
+    force: boolean = false,
+  ) {
+    concurrentRun(
+      docs.map(
+        (dep) => async () =>
+          await this.installOrUninstallDependencies([dep], isInstall, force),
+      ),
+      1,
+    );
+  }
+
  public async reInstall(ids: number[]): Promise<Dependence[]> {
    await DependenceModel.update(
      { status: DependenceStatus.installing, log: [] },
@@ -105,7 +120,7 @@ export default class DependenceService {
    );

    const docs = await DependenceModel.findAll({ where: { id: ids } });
-    await this.installOrUninstallDependencies(docs);
+    this.installDependenceOneByOne(docs);
    return docs;
  }

@@ -128,12 +143,16 @@ export default class DependenceService {
  public installOrUninstallDependencies(
    dependencies: Dependence[],
    isInstall: boolean = true,
+    force: boolean = false,
  ) {
    return new Promise(async (resolve) => {
      if (dependencies.length === 0) {
        resolve(null);
        return;
      }
+      const socketMessageType = !force
+        ? 'installDependence'
+        : 'uninstallDependence';
      const depNames = dependencies.map((x) => x.name).join(' ');
      const depRunCommand = (
        isInstall
@@ -142,24 +161,26 @@ export default class DependenceService {
      )[dependencies[0].type as any];
      const actionText = isInstall ? '安装' : '删除';
      const depIds = dependencies.map((x) => x.id) as number[];
-      const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
      const startTime = Date.now();
      this.sockService.sendMessage({
-        type: 'installDependence',
+        type: socketMessageType,
        message: `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
          startTime,
-        ).toLocaleString()}`,
+        ).toLocaleString()}\n\n`,
        references: depIds,
      });
      await this.updateLog(
        depIds,
        `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
          startTime,
-        ).toLocaleString()}\n`,
+        ).toLocaleString()}\n\n`,
      );
+
+      const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
+
      cp.stdout.on('data', async (data) => {
        this.sockService.sendMessage({
-          type: 'installDependence',
+          type: socketMessageType,
          message: data.toString(),
          references: depIds,
        });
@@ -168,7 +189,7 @@ export default class DependenceService {

      cp.stderr.on('data', async (data) => {
        this.sockService.sendMessage({
-          type: 'installDependence',
+          type: socketMessageType,
          message: data.toString(),
          references: depIds,
        });
@@ -177,7 +198,7 @@ export default class DependenceService {

      cp.on('error', async (err) => {
        this.sockService.sendMessage({
-          type: 'installDependence',
+          type: socketMessageType,
          message: JSON.stringify(err),
          references: depIds,
        });
@@ -191,15 +212,15 @@ export default class DependenceService {
        const resultText = isSucceed ? '成功' : '失败';

        this.sockService.sendMessage({
-          type: 'installDependence',
-          message: `依赖${actionText}${resultText}，结束时间 ${new Date(
+          type: socketMessageType,
+          message: `\n依赖${actionText}${resultText}，结束时间 ${new Date(
            endTime,
          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
          references: depIds,
        });
        await this.updateLog(
          depIds,
-          `依赖${actionText}${resultText}，结束时间 ${new Date(
+          `\n依赖${actionText}${resultText}，结束时间 ${new Date(
            endTime,
          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
        );
@@ -216,11 +237,9 @@ export default class DependenceService {
        }
        await DependenceModel.update({ status }, { where: { id: depIds } });

-        // 如果删除依赖成功，3秒后删除数据库记录
-        if (isSucceed && !isInstall) {
-          setTimeout(() => {
-            this.removeDb(depIds);
-          }, 5000);
+        // 如果删除依赖成功或者强制删除
+        if ((isSucceed || force) && !isInstall) {
+          this.removeDb(depIds);
        }

        resolve(null);
@@ -168,13 +168,11 @@ export default class EnvService {
            .filter((x) => x.status !== EnvStatus.disabled)
            .map('value')
            .join('&')
-            .replace(/ /g, '');
-          if (/"/.test(value)) {
-            value = `'${value}'`;
-          } else {
-            value = `"${value}"`;
-          }
-          env_string += `export ${key}=${value}\n`;
+            .replace(/(\\)[^\n]/g, '\\\\')
+            .replace(/(\\$)/, '\\\\')
+            .replace(/"/g, '\\"')
+            .trim();
+          env_string += `export ${key}="${value}"\n`;
        }
      }
    }
@@ -119,15 +119,14 @@ export default class NotificationService {

  private async pushDeer() {
    const { pushDeerKey } = this.params;
-    // https://api2.pushdeer.com/message/push?pushkey=<key>&text=标题&desp=<markdown>&type=markdown
    const url = `https://api2.pushdeer.com/message/push`;
    const res: any = await got
      .post(url, {
        timeout: this.timeout,
        retry: 0,
-        body: `pushkey=${pushDeerKey}&text=${
-          this.title
-        }&desp=${encodeURIComponent(this.content)}&type=markdown`,
+        body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
+          this.title,
+        )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
      })
      .json();
@@ -1,14 +1,35 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import nodeSchedule from 'node-schedule';
-import { Crontab } from '../data/cron';
-import { exec } from 'child_process';
+import { ChildProcessWithoutNullStreams, exec, spawn } from 'child_process';
 import {
  ToadScheduler,
-  SimpleIntervalJob,
-  Task,
+  LongIntervalJob,
+  AsyncTask,
  SimpleIntervalSchedule,
 } from 'toad-scheduler';
+import dayjs from 'dayjs';
+
+interface ScheduleTaskType {
+  id: number;
+  command: string;
+  name?: string;
+  schedule?: string;
+}
+
+export interface TaskCallbacks {
+  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 {
@@ -16,9 +37,77 @@ export default class ScheduleService {

  private intervalSchedule = new ToadScheduler();

+  private maxBuffer = 200 * 1024 * 1024;
+
  constructor(@Inject('logger') private logger: winston.Logger) {}

-  async createCronTask({ id = 0, command, name, schedule = '' }: Crontab) {
+  async runTask(command: string, callbacks: TaskCallbacks = {}) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const startTime = dayjs();
+        const cp = spawn(command, { shell: '/bin/bash' });
+
+        // TODO:
+        callbacks.onStart?.(cp, startTime);
+
+        cp.stdout.on('data', async (data) => {
+          await callbacks.onLog?.(data.toString());
+        });
+
+        cp.stderr.on('data', async (data) => {
+          this.logger.error(
+            '执行任务 %s 失败，时间：%s, 错误信息：%j',
+            command,
+            new Date().toLocaleString(),
+            data.toString(),
+          );
+          await callbacks.onError?.(data.toString());
+        });
+
+        cp.on('error', async (err) => {
+          this.logger.error(
+            '创建任务 %s 失败，时间：%s, 错误信息：%j',
+            command,
+            new Date().toLocaleString(),
+            err,
+          );
+          await callbacks.onError?.(JSON.stringify(err));
+        });
+
+        cp.on('exit', async (code, signal) => {
+          this.logger.info(
+            `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
+          );
+        });
+
+        cp.on('close', async (code) => {
+          const endTime = dayjs();
+          this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
+          await callbacks.onEnd?.(
+            cp,
+            endTime,
+            endTime.diff(startTime, 'seconds'),
+          );
+          resolve(null);
+        });
+      } catch (error) {
+        await this.logger.error(
+          '执行任务%s失败，时间：%s, 错误信息：%j',
+          command,
+          new Date().toLocaleString(),
+          error,
+        );
+        await callbacks.onError?.(JSON.stringify(error));
+        resolve(null);
+      }
+    });
+  }
+
+  async createCronTask(
+    { id = 0, command, name, schedule = '' }: ScheduleTaskType,
+    callbacks?: TaskCallbacks,
+    runImmediately = false,
+  ) {
    const _id = this.formatId(id);
    this.logger.info(
      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
@@ -30,49 +119,27 @@ export default class ScheduleService {

    this.scheduleStacks.set(
      _id,
-      nodeSchedule.scheduleJob(id + '', schedule, async () => {
-        try {
-          exec(command, async (error, stdout, stderr) => {
-            if (error) {
-              await this.logger.info(
-                '执行任务%s失败，时间：%s, 错误信息：%j',
-                command,
-                new Date().toLocaleString(),
-                error,
-              );
-            }
-
-            if (stderr) {
-              await this.logger.info(
-                '执行任务%s失败，时间：%s, 错误信息：%j',
-                command,
-                new Date().toLocaleString(),
-                stderr,
-              );
-            }
-          });
-        } catch (error) {
-          await this.logger.info(
-            '执行任务%s失败，时间：%s, 错误信息：%j',
-            command,
-            new Date().toLocaleString(),
-            error,
-          );
-        } finally {
-        }
+      nodeSchedule.scheduleJob(_id, schedule, async () => {
+        await this.runTask(command, callbacks);
      }),
    );
+
+    if (runImmediately) {
+      await this.runTask(command, callbacks);
+    }
  }

-  async cancelCronTask({ id = 0, name }: Crontab) {
+  async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
    const _id = this.formatId(id);
    this.logger.info('[取消定时任务]，任务名：%s', name);
    this.scheduleStacks.has(_id) && this.scheduleStacks.get(_id)?.cancel();
  }

  async createIntervalTask(
-    { id = 0, command, name = '' }: Crontab,
+    { id = 0, command, name = '' }: ScheduleTaskType,
    schedule: SimpleIntervalSchedule,
+    runImmediately = true,
+    callbacks?: TaskCallbacks,
  ) {
    const _id = this.formatId(id);
    this.logger.info(
@@ -81,44 +148,37 @@ export default class ScheduleService {
      name,
      command,
    );
-    const task = new Task(name, async () => {
-      try {
-        exec(command, async (error, stdout, stderr) => {
-          if (error) {
-            await this.logger.info(
-              '执行任务%s失败，时间：%s, 错误信息：%j',
-              command,
-              new Date().toLocaleString(),
-              error,
-            );
-          }
-
-          if (stderr) {
-            await this.logger.info(
-              '执行任务%s失败，时间：%s, 错误信息：%j',
-              command,
-              new Date().toLocaleString(),
-              stderr,
-            );
-          }
+    const task = new AsyncTask(
+      name,
+      async () => {
+        return new Promise(async (resolve, reject) => {
+          await this.runTask(command, callbacks);
        });
-      } catch (error) {
-        await this.logger.info(
+      },
+      (err) => {
+        this.logger.error(
          '执行任务%s失败，时间：%s, 错误信息：%j',
          command,
          new Date().toLocaleString(),
-          error,
+          err,
        );
-      } finally {
-      }
-    });
+      },
+    );

-    const job = new SimpleIntervalJob({ ...schedule }, task, _id);
+    const job = new LongIntervalJob(
+      { ...schedule, runImmediately: false },
+      task,
+      _id,
+    );

    this.intervalSchedule.addIntervalJob(job);
+
+    if (runImmediately) {
+      await this.runTask(command, callbacks);
+    }
  }

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

  public async updateLogRemoveFrequency(frequency: number) {
+    const oDoc = await this.getLogRemoveFrequency();
    const result = await this.updateAuthDb({
+      ...oDoc,
      type: AuthDataType.removeLogFrequency,
      info: { frequency },
    });
@@ -109,7 +111,7 @@ export default class SystemService {
    } catch (error: any) {
      return {
        code: 400,
-        data: error.message,
+        message: error.message,
      };
    }
  }
@@ -167,9 +169,9 @@ export default class SystemService {
  public async notify({ title, content }: { title: string; content: string }) {
    const isSuccess = await this.notificationService.notify(title, content);
    if (isSuccess) {
-      return { code: 200, data: '通知发送成功' };
+      return { code: 200, message: '通知发送成功' };
    } else {
-      return { code: 400, data: '通知发送失败，请检查参数' };
+      return { code: 400, message: '通知发送失败，请检查系统设置/通知配置' };
    }
  }
 }
@@ -221,6 +221,12 @@ export default class UserService {
    return { code: 200, message: '更新成功' };
  }

+  public async updateAvatar(avatar: string) {
+    const authInfo = this.getAuthInfo();
+    this.updateAuthInfo(authInfo, { avatar });
+    return { code: 200, data: avatar, message: '更新成功' };
+  }
+
  public getUserInfo(): Promise<any> {
    return new Promise((resolve) => {
      fs.readFile(config.authConfigFile, 'utf8', (err, data) => {
@@ -340,7 +346,7 @@ export default class UserService {
      });
      return { code: 200, data: { ...result, code } };
    } else {
-      return { code: 400, data: '通知发送失败，请检查参数' };
+      return { code: 400, message: '通知发送失败，请检查参数' };
    }
  }
 }
@@ -5,7 +5,7 @@ LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=master

-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+ENV 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 \
    LANG=zh_CN.UTF-8 \
    SHELL=/bin/bash \
    PS1="\u@\h:\w \$ " \
@@ -35,12 +35,12 @@ RUN set -x \
    && rm -rf /var/cache/apk/* \
    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
    && echo "Asia/Shanghai" > /etc/timezone \
-    && touch ~/.bashrc \
    && git config --global user.email "qinglong@@users.noreply.github.com" \
    && git config --global user.name "qinglong" \
    && npm install -g pnpm \
-    && pnpm install -g pm2 \
-    && pnpm install -g ts-node typescript tslib \
+    && pnpm setup \
+    && source ~/.bashrc \
+    && pnpm add -g pm2 ts-node typescript tslib \
    && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
    && cd ${QL_DIR} \
    && cp -f .env.example .env \
@@ -48,6 +48,7 @@ RUN set -x \
    && chmod 777 ${QL_DIR}/docker/*.sh \
    && pnpm install --prod \
    && rm -rf /root/.pnpm-store \
+    && rm -rf /root/.local/share/pnpm/store \
    && rm -rf /root/.cache \
    && rm -rf /root/.npm \
    && git clone -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
@@ -11,7 +11,7 @@
    "schedule": "npm run build:back && node static/build/schedule.js",
    "public": "npm run build:back && node static/build/public.js",
    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "prepare": "umi generate tmp",
+    "postinstall": "umi generate tmp 2>/dev/null || true",
    "test": "umi-test",
    "test:coverage": "umi-test --coverage"
  },
@@ -26,6 +26,18 @@
      "prettier --parser=typescript --write"
    ]
  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "react": "17",
+        "react-dom": "17"
+      },
+      "ignoreMissing": [
+        "monaco-editor",
+        "react-router"
+      ]
+    }
+  },
  "dependencies": {
    "@otplib/preset-default": "^12.0.1",
    "@sentry/node": "^6.18.1",
@@ -35,6 +47,7 @@
    "chokidar": "^3.5.3",
    "cors": "^2.8.5",
    "cron-parser": "^4.2.1",
+    "dayjs": "^1.11.2",
    "dotenv": "^16.0.0",
    "express": "^4.17.3",
    "express-jwt": "^6.1.1",
@@ -44,8 +57,8 @@
    "iconv-lite": "^0.6.3",
    "jsonwebtoken": "^8.5.1",
    "lodash": "^4.17.21",
+    "multer": "^1.4.4",
    "nedb": "^1.8.0",
-    "node-fetch": "^3.2.1",
    "node-schedule": "^2.1.0",
    "nodemailer": "^6.7.2",
    "p-queue": "7.2.0",
@@ -53,7 +66,7 @@
    "sequelize": "^6.17.0",
    "serve-handler": "^6.1.3",
    "sockjs": "^0.3.24",
-    "sqlite3": "npm:@louislam/sqlite3@^6.0.1",
+    "sqlite3": "npm:@louislam/sqlite3@^15.0.3",
    "toad-scheduler": "^1.6.0",
    "typedi": "^0.10.0",
    "uuid": "^8.3.2",
@@ -65,14 +78,15 @@
    "@ant-design/pro-layout": "^6.33.1",
    "@monaco-editor/react": "^4.3.1",
    "@sentry/react": "^6.18.1",
+    "@types/body-parser": "^1.19.2",
    "@types/cors": "^2.8.12",
    "@types/express": "^4.17.13",
    "@types/express-jwt": "^6.0.4",
    "@types/jsonwebtoken": "^8.5.8",
    "@types/lodash": "^4.14.179",
+    "@types/multer": "^1.4.7",
    "@types/nedb": "^1.8.12",
    "@types/node": "^17.0.21",
-    "@types/node-fetch": "^2.6.1",
    "@types/node-schedule": "^1.3.2",
    "@types/nodemailer": "^6.4.4",
    "@types/qrcode.react": "^1.0.2",
@@ -84,18 +98,20 @@
    "@types/uuid": "^8.3.4",
    "@umijs/plugin-antd": "^0.15.0",
    "@umijs/plugin-esbuild": "^1.4.1",
+    "@umijs/ssr-darkreader": "^4.9.45",
    "@umijs/test": "^3.5.21",
    "ansi-to-react": "^6.1.6",
-    "antd": "^4.18.9",
+    "antd": "^4.20.5",
+    "antd-img-crop": "^4.2.3",
    "codemirror": "^5.65.2",
    "compression-webpack-plugin": "9.2.0",
    "concurrently": "^7.0.0",
-    "darkreader": "4.9.44",
    "lint-staged": "^12.3.4",
    "nodemon": "^2.0.15",
    "prettier": "^2.5.1",
    "qiniu": "^7.4.0",
    "qrcode.react": "^1.0.1",
+    "rc-tween-one": "^3.0.6",
    "react": "17.x",
    "react-codemirror2": "^7.2.1",
    "react-diff-viewer": "^3.1.1",
@@ -51,7 +51,7 @@ export PUSH_KEY=""
 ## 下方填写app提供的设备码，例如：https://api.day.app/123 那么此处的设备码就是123
 export BARK_PUSH=""
 ## 下方填写推送图标设置，自定义推送图标(需iOS15或以上)
-export BARK_ICON="https://qn.whyour.cn/logo.png"
+export BARK_ICON="http://qn.whyour.cn/logo.png"
 ## 下方填写推送声音设置，例如choo，具体值请在bark-推送铃声-查看所有铃声
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash

 ## 添加你需要重启自动执行的任意命令，比如 ql repo
-## 安装node依赖使用 pnpm install -g xxx xxx
+## 安装node依赖使用 pnpm add -g xxx xxx
 ## 安装python依赖使用 pip3 install xxx
@@ -43,7 +43,7 @@ let PUSHDEER_KEY = '';
 //此处填你BarkAPP的信息(IP/设备码，例如：https://api.day.app/XXXXXXXX)
 let BARK_PUSH = '';
 //BARK app推送图标,自定义推送图标(需iOS15或以上)
-let BARK_ICON = 'https://qn.whyour.cn/logo.png';
+let BARK_ICON = 'http://qn.whyour.cn/logo.png';
 //BARK app推送铃声,铃声列表去APP查看复制填写
 let BARK_SOUND = '';
 //BARK app推送消息的分组, 默认为"QingLong"
@@ -383,7 +383,7 @@ function PushDeerNotify(text, desp, time = 2100) {
              console.log(err);
            } else {
              data = JSON.parse(data);
-              // 通过反悔的result的长度来判断是否成功
+              // 通过返回的result的长度来判断是否成功
              if (
                data.content.result.length !== undefined &&
                data.content.result.length > 0
@@ -529,9 +529,13 @@ function tgBotNotify(text, desp) {
    if (TG_BOT_TOKEN && TG_USER_ID) {
      const options = {
        url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`,
-        body: `chat_id=${TG_USER_ID}&text=${text}\n\n${desp}&disable_web_page_preview=true`,
+        json: {
+          chat_id: `${TG_USER_ID}`,
+          text: `${text}\n\n${desp}`,
+          disable_web_page_preview: true,
+        },
        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Type': 'application/json',
        },
        timeout,
      };
@@ -271,7 +271,7 @@ def pushdeer(title: str, content: str) -> None:
        print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
        return
    print("PushDeer 服务启动")
-    data = {"text": title, "desp": urllib.parse.urlencode({"text": content})}
+    data = {"text": title, "desp": content, "type": "markdown", "pushkey": push_config.get("DEER_KEY")}
    url = 'https://api2.pushdeer.com/message/push'
    response = requests.post(url, data=data).json()
    
@@ -5,8 +5,9 @@ const envFound = dotenv.config();
 const accessKey = process.env.QINIU_AK;
 const secretKey = process.env.QINIU_SK;
 const mac = new qiniu.auth.digest.Mac(accessKey, secretKey);
+const key = 'version.ts';
 const options = {
-  scope: process.env.QINIU_SCOPE,
+  scope: `${process.env.QINIU_SCOPE}:${key}`,
 };
 const putPolicy = new qiniu.rs.PutPolicy(options);
 const uploadToken = putPolicy.uploadToken(mac);
@@ -14,8 +15,11 @@ const uploadToken = putPolicy.uploadToken(mac);
 const localFile = 'src/version.ts';
 const config = new qiniu.conf.Config({ zone: qiniu.zone.Zone_z1 });
 const formUploader = new qiniu.form_up.FormUploader(config);
-const putExtra = new qiniu.form_up.PutExtra('', '', 'text/plain');
-const key = 'version.ts';
+const putExtra = new qiniu.form_up.PutExtra(
+  '',
+  {},
+  'text/plain; charset=utf-8',
+);
 // 文件上传
 formUploader.putFile(
  uploadToken,
@@ -178,7 +178,7 @@ update_cron() {

 notify_api() {
    local title=$1
-    local content=$1
+    local content=$2
    local currentTimeStamp=$(date +%s)
    local api=$(
        curl -s --noproxy "*" "http://0.0.0.0:5600/api/system/notify?t=$currentTimeStamp" \
@@ -196,9 +196,9 @@ notify_api() {
    code=$(echo $api | jq -r .code)
    message=$(echo $api | jq -r .message)
    if [[ $code == 200 ]]; then
-        echo -e "成功"
+        echo -e "通知发送成功"
    else
-        echo -e "失败(${message})"
+        echo -e "通知失败(${message})"
    fi
 }

@@ -34,16 +34,6 @@ copy_dep() {
  echo -e "---> 配置文件复制完成\n"
 }

-reload_pm2() {
-  pm2 l &>/dev/null
-
-  pm2 delete panel --source-map-support --time &>/dev/null
-  pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
-
-  pm2 delete schedule --source-map-support --time &>/dev/null
-  pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
-}
-
 pm2_log() {
  echo -e "---> pm2日志"
  local panelOut="/root/.pm2/logs/panel-out.log"
@@ -98,7 +88,7 @@ check_pm2() {

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

 init_env() {
-    export NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules
+    export NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules
    export PYTHONUNBUFFERED=1
 }

@@ -252,7 +252,7 @@ npm_install_sub() {
    elif ! type pnpm &>/dev/null; then
        npm install --production --registry=https://registry.npm.taobao.org || npm install --production
    else
-        pnpm install --production --registry=https://registry.npm.taobao.org || pnpm install --production
+        pnpm install --loglevel error --production --registry=https://registry.npm.taobao.org || pnpm install --production --loglevel error
    fi
    unset_proxy
 }
@@ -364,6 +364,22 @@ random_range() {
    echo $((RANDOM % ($end - $beg) + $beg))
 }

+reload_pm2() {
+    pm2 l &>/dev/null
+
+    echo -e "启动面板服务\n"
+    pm2 delete panel --source-map-support --time &>/dev/null
+    pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
+
+    echo -e "启动定时任务服务\n"
+    pm2 delete schedule --source-map-support --time &>/dev/null
+    pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
+
+    echo -e "启动公开服务\n"
+    pm2 delete public --source-map-support --time &>/dev/null
+    pm2 start $dir_static/build/public.js -n public --source-map-support --time &>/dev/null
+}
+
 init_env
 detect_termux
 detect_macos
@@ -7,14 +7,14 @@ dir_shell=$QL_DIR/shell

 ## 选择python3还是node
 define_program() {
-    local first_param=$1
-    if [[ $first_param == *.js ]]; then
+    local file_param=$1
+    if [[ $file_param == *.js ]]; then
        which_program="node"
-    elif [[ $first_param == *.py ]] || [[ $first_param == *.pyc ]]; then
+    elif [[ $file_param == *.py ]] || [[ $file_param == *.pyc ]]; then
        which_program="python3"
-    elif [[ $first_param == *.sh ]]; then
+    elif [[ $file_param == *.sh ]]; then
        which_program="bash"
-    elif [[ $first_param == *.ts ]]; then
+    elif [[ $file_param == *.ts ]]; then
        which_program="ts-node-transpile-only"
    else
        which_program=""
@@ -76,41 +76,49 @@ run_nohup() {

 ## 正常运行单个脚本，$1：传入参数
 run_normal() {
-    local first_param=$1
-    define_program "$first_param"
-    if [[ $first_param == *.js ]]; then
+    local file_param=$1
+    define_program "$file_param"
+    if [[ $file_param == *.js ]]; then
        if [[ $# -eq 1 ]]; then
            random_delay
        fi
    fi

-    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_dir_tmp="${first_param##*/}"
-    log_dir_tmp_path="${first_param%%/*}"
+    local time=$(date)
+    log_time=$(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    log_dir_tmp="${file_param##*/}"
+    if [[ $file_param =~ "/" ]]; then
+        if [[ $file_param == /* ]]; then
+            log_dir_tmp_path="${file_param:1}"
+        else
+            log_dir_tmp_path="${file_param}"
+        fi
+    fi
+    log_dir_tmp_path="${log_dir_tmp_path%/*}"
    log_dir_tmp_path="${log_dir_tmp_path##*/}"
    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_dir="${log_dir_tmp%.*}"
    log_path="$log_dir/$log_time.log"
-    cmd="&>> $log_path"
+    cmd="&>> $dir_log/$log_path"
    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir "$log_dir"
+    make_dir "$dir_log/$log_dir"

-    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local begin_timestamp=$(date "+%s")
+    local begin_time=$(date -d "$time" "+%Y-%m-%d %H:%M:%S")
+    local begin_timestamp=$(date -d "$time" "+%s")
    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd

-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
+    local id=$(cat $list_crontab_user | grep -E "$cmd_task $file_param" | perl -pe "s|.*ID=(.*) $cmd_task $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
    eval . $file_task_before "$@" $cmd

    cd $dir_scripts
-    local relative_path="${first_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${first_param} =~ "/" ]]; then
+    local relative_path="${file_param%/*}"
+    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
        cd ${relative_path}
-        first_param=${first_param/$relative_path\//}
+        file_param=${file_param/$relative_path\//}
    fi
-    eval timeout -k 10s $command_timeout_time $which_program $first_param $cmd
+    eval timeout -k 10s $command_timeout_time $which_program $file_param $cmd

    eval . $file_task_after "$@" $cmd
    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
@@ -122,7 +130,7 @@ run_normal() {

 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
 run_concurrent() {
-    local first_param="$1"
+    local file_param="$1"
    local env_param="$2"
    local num_param=$(echo "$3" | perl -pe "s|.*$2(.*)|\1|")
    if [[ ! $env_param ]]; then
@@ -145,25 +153,33 @@ run_concurrent() {
    local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
    [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}

-    define_program "$first_param"
-    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_dir_tmp="${first_param##*/}"
-    log_dir_tmp_path="${first_param%%/*}"
+    define_program "$file_param"
+    local time=$(date)
+    log_time=$(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    log_dir_tmp="${file_param##*/}"
+    if [[ $file_param =~ "/" ]]; then
+        if [[ $file_param == /* ]]; then
+            log_dir_tmp_path="${file_param:1}"
+        else
+            log_dir_tmp_path="${file_param}"
+        fi
+    fi
+    log_dir_tmp_path="${log_dir_tmp_path%/*}"
    log_dir_tmp_path="${log_dir_tmp_path##*/}"
    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_dir="${log_dir_tmp%.*}"
    log_path="$log_dir/$log_time.log"
-    cmd="&>> $log_path"
+    cmd="&>> $dir_log/$log_path"
    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir $log_dir
+    make_dir "$dir_log/$log_dir"

-    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local begin_timestamp=$(date "+%s")
+    local begin_time=$(date -d "$time" "+%Y-%m-%d %H:%M:%S")
+    local begin_timestamp=$(date -d "$time" "+%s")

    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd

-    local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
+    local id=$(cat $list_crontab_user | grep -E "$cmd_task $file_param" | perl -pe "s|.*ID=(.*) $cmd_task $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
    [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
    eval . $file_task_before "$@" $cmd

@@ -172,20 +188,20 @@ run_concurrent() {
    single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")

    cd $dir_scripts
-    local relative_path="${first_param%/*}"
-    if [[ ! -z ${relative_path} ]] && [[ ${first_param} =~ "/" ]]; then
+    local relative_path="${file_param%/*}"
+    if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
        cd ${relative_path}
-        first_param=${first_param/$relative_path\//}
+        file_param=${file_param/$relative_path\//}
    fi
    for i in "${!array[@]}"; do
        export ${env_param}=${array[i]}
-        single_log_path="$log_dir/${single_log_time}_$((i + 1)).log"
-        timeout -k 10s $command_timeout_time $which_program $first_param &>$single_log_path &
+        single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
+        timeout -k 10s $command_timeout_time $which_program $file_param &>$single_log_path &
    done

    wait
    for i in "${!array[@]}"; do
-        single_log_path="$log_dir/${single_log_time}_$((i + 1)).log"
+        single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
        eval cat $single_log_path $cmd
        [[ -f $single_log_path ]] && rm -f $single_log_path
    done
@@ -208,19 +224,27 @@ run_designated() {
    fi

    define_program "$file_param"
-    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
+    local time=$(date)
+    log_time=$(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
    log_dir_tmp="${file_param##*/}"
-    log_dir_tmp_path="${file_param%%/*}"
+    if [[ $file_param =~ "/" ]]; then
+        if [[ $file_param == /* ]]; then
+            log_dir_tmp_path="${file_param:1}"
+        else
+            log_dir_tmp_path="${file_param}"
+        fi
+    fi
+    log_dir_tmp_path="${log_dir_tmp_path%/*}"
    log_dir_tmp_path="${log_dir_tmp_path##*/}"
    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_dir="${log_dir_tmp%.*}"
    log_path="$log_dir/$log_time.log"
-    cmd="&>> $log_path"
+    cmd="&>> $dir_log/$log_path"
    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir $log_dir
+    make_dir "$dir_log/$log_dir"

-    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local begin_timestamp=$(date "+%s")
+    local begin_time=$(date -d "$time" "+%Y-%m-%d %H:%M:%S")
+    local begin_timestamp=$(date -d "$time" "+%s")

    local envs=$(eval echo "\$${env_param}")
    local array=($(echo $envs | sed 's/&/ /g'))
@@ -264,19 +288,27 @@ run_designated() {
 run_else() {
    local file_param="$1"
    define_program "$file_param"
-    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
+    local time=$(date)
+    log_time=$(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
    log_dir_tmp="${file_param##*/}"
-    log_dir_tmp_path="${file_param%%/*}"
+    if [[ $file_param =~ "/" ]]; then
+        if [[ $file_param == /* ]]; then
+            log_dir_tmp_path="${file_param:1}"
+        else
+            log_dir_tmp_path="${file_param}"
+        fi
+    fi
+    log_dir_tmp_path="${log_dir_tmp_path%/*}"
    log_dir_tmp_path="${log_dir_tmp_path##*/}"
    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_dir="${log_dir_tmp%.*}"
    log_path="$log_dir/$log_time.log"
-    cmd="&>> $log_path"
+    cmd="&>> $dir_log/$log_path"
    [[ "$show_log" == "true" ]] && cmd=""
-    make_dir $log_dir
+    make_dir "$dir_log/$log_dir"

-    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    local begin_timestamp=$(date "+%s")
+    local begin_time=$(date -d "$time" "+%Y-%m-%d %H:%M:%S")
+    local begin_timestamp=$(date -d "$time" "+%s")

    eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
@@ -338,7 +370,7 @@ main() {
            esac
            ;;
        esac
-        [[ -f $log_path ]] && cat $log_path
+        [[ -f "$dir_log/$log_path" ]] && cat "$dir_log/$log_path"
    elif [[ $# -eq 0 ]]; then
        echo
        usage
@@ -141,6 +141,7 @@ update_repo() {
    local blackword="$3"
    local dependence="$4"
    local branch="$5"
+    local extensions="$6"
    local tmp="${url%/*}"
    local authorTmp1="${tmp##*/}"
    local authorTmp2="${authorTmp1##*:}"
@@ -159,7 +160,7 @@ update_repo() {
    fi
    if [[ $exit_status -eq 0 ]]; then
        echo -e "\n更新${repo_path}成功...\n"
-        diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence"
+        diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions"
    else
        echo -e "\n更新${repo_path}失败，请检查网络...\n"
    fi
@@ -228,15 +229,15 @@ run_extra_shell() {
 ## 脚本用法
 usage() {
    echo -e "本脚本用法："
-    echo -e "1. $cmd_update update                                                    # 更新并重启青龙"
-    echo -e "2. $cmd_update extra                                                     # 运行自定义脚本"
-    echo -e "3. $cmd_update raw <fileurl>                                             # 更新单个脚本文件"
-    echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch>   # 更新单个仓库的脚本"
-    echo -e "5. $cmd_update rmlog <days>                                              # 删除旧日志"
-    echo -e "6. $cmd_update bot                                                       # 启动tg-bot"
-    echo -e "7. $cmd_update check                                                     # 检测青龙环境并修复"
-    echo -e "8. $cmd_update resetlet                                                  # 重置登录错误次数"
-    echo -e "9. $cmd_update resettfa                                                  # 禁用两步登录"
+    echo -e "1. $cmd_update update                                                                  # 更新并重启青龙"
+    echo -e "2. $cmd_update extra                                                                   # 运行自定义脚本"
+    echo -e "3. $cmd_update raw <fileurl>                                                           # 更新单个脚本文件"
+    echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch> <extensions>    # 更新单个仓库的脚本"
+    echo -e "5. $cmd_update rmlog <days>                                                            # 删除旧日志"
+    echo -e "6. $cmd_update bot                                                                     # 启动tg-bot"
+    echo -e "7. $cmd_update check                                                                   # 检测青龙环境并修复"
+    echo -e "8. $cmd_update resetlet                                                                # 重置登录错误次数"
+    echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
 }

 ## 更新qinglong
@@ -303,6 +304,11 @@ patch_version() {
        pnpm i -g ts-node typescript tslib
    fi

+    # 兼容pnpm@7 
+    npm i -g pnpm
+    pnpm setup
+    source ~/.bashrc
+
    git config --global pull.rebase false

    cp -f $dir_root/.env.example $dir_root/.env
@@ -333,16 +339,6 @@ patch_version() {

 }

-reload_pm2() {
-    pm2 l &>/dev/null
-
-    pm2 delete panel --source-map-support --time &>/dev/null
-    pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null
-
-    pm2 delete schedule --source-map-support --time &>/dev/null
-    pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null
-}
-
 ## 对比脚本
 diff_scripts() {
    local dir_current=$(pwd)
@@ -351,8 +347,9 @@ diff_scripts() {
    local path="$3"
    local blackword="$4"
    local dependence="$5"
+    local extensions="$6"

-    gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence"
+    gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions"

    local list_add="$dir_list_tmp/${uniq_path}_add.list"
    local list_drop="$dir_list_tmp/${uniq_path}_drop.list"
@@ -388,6 +385,9 @@ gen_list_repo() {

    local cmd="find ."
    local index=0
+    if [[ $6 ]]; then
+        file_extensions="$6"
+    fi
    for extension in $file_extensions; do
        if [[ $index -eq 0 ]]; then
            cmd="${cmd} -name \"*.${extension}\""
@@ -468,6 +468,7 @@ main() {
    local p4=$4
    local p5=$5
    local p6=$6
+    local p7=$7
    local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
    local log_path="$dir_log/update/${log_time}_$p1.log"
    local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
@@ -488,11 +489,8 @@ main() {
    repo)
        get_user_info
        get_uniq_path "$p2" "$p6"
-        log_path="$dir_log/update/${log_time}_${uniq_path}.log"
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
        if [[ -n $p2 ]]; then
-            update_repo "$p2" "$p3" "$p4" "$p5" "$p6" >>$log_path
+            update_repo "$p2" "$p3" "$p4" "$p5" "$p6" "$p7"
        else
            echo -e "命令输入错误...\n"
            usage
@@ -501,11 +499,8 @@ main() {
    raw)
        get_user_info
        get_uniq_path "$p2"
-        log_path="$dir_log/update/${log_time}_${uniq_path}.log"
-        echo -e "## 开始执行... $begin_time\n" >>$log_path
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path >>$log_path
        if [[ -n $p2 ]]; then
-            update_raw "$p2" >>$log_path
+            update_raw "$p2"
        else
            echo -e "命令输入错误...\n"
            usage
@@ -545,8 +540,10 @@ main() {
    esac
    local end_time=$(date '+%Y-%m-%d %H:%M:%S')
    local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >>$log_path
-    cat $log_path
+    if [[ $p1 != "repo" ]] && [[ $p1 != "raw" ]]; then
+        echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >>$log_path
+        cat $log_path
+    fi
 }

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

 export default {
  route: {
@@ -34,43 +35,49 @@ export default {
      {
        path: '/crontab',
        name: '定时任务',
-        icon: <FieldTimeOutlined />,
+        icon: <IconFont type="ql-icon-crontab" />,
        component: '@/pages/crontab/index',
      },
+      {
+        path: '/subscription',
+        name: '订阅管理',
+        icon: <IconFont type="ql-icon-subs" />,
+        component: '@/pages/subscription/index',
+      },
      {
        path: '/env',
        name: '环境变量',
-        icon: <RadiusSettingOutlined />,
+        icon: <IconFont type="ql-icon-env" />,
        component: '@/pages/env/index',
      },
      {
        path: '/config',
        name: '配置文件',
-        icon: <ControlOutlined />,
+        icon: <IconFont type="ql-icon-config" />,
        component: '@/pages/config/index',
      },
      {
        path: '/script',
        name: '脚本管理',
-        icon: <FormOutlined />,
+        icon: <IconFont type="ql-icon-script" />,
        component: '@/pages/script/index',
      },
      {
        path: '/dependence',
        name: '依赖管理',
-        icon: <ContainerOutlined />,
+        icon: <IconFont type="ql-icon-dependence" />,
        component: '@/pages/dependence/index',
      },
      {
        path: '/diff',
        name: '对比工具',
-        icon: <DiffOutlined />,
+        icon: <IconFont type="ql-icon-diff" />,
        component: '@/pages/diff/index',
      },
      {
        path: '/log',
        name: '任务日志',
-        icon: <FolderOutlined />,
+        icon: <IconFont type="ql-icon-log" />,
        component: '@/pages/log/index',
      },
      {
@@ -1,4 +1,4 @@
-@import '~antd/lib/style/themes/default.less';
+@import '~antd/es/style/themes/default.less';
@import '~@/styles/variable.less';
@import '~codemirror/lib/codemirror.css';

@@ -9,6 +9,12 @@
    url('../assets/fonts/SourceCodePro-Regular.ttf') format('truetype');
 }

+.ant-modal-body {
+  max-height: calc(85vh - 110px);
+  max-height: calc(85vh - var(--vh-offset, 110px));
+  overflow-y: auto;
+}
+
 .log-modal {
  .ant-modal {
    padding-bottom: 0 !important;
@@ -49,7 +55,7 @@
  .ant-pro-page-container-children-content {
    overflow: auto;
    height: 100%;
-    background-color: #fff;
+    background-color: @component-background;
    padding: 16px;
  }
 }
@@ -166,7 +172,7 @@
 }

 .Resizer {
-  background: #fff;
+  background: @component-background;
  opacity: 0.2;
  z-index: 1;
  -moz-box-sizing: border-box;
@@ -278,7 +284,7 @@
  display: flex;
  justify-content: space-between;
  align-items: center;
-  color: rgba(0, 0, 0, 0.85);
+  color: @text-color;

  .side-menu-collapse-button:hover {
    color: #1890ff;
@@ -295,11 +301,11 @@
  text-align: left;
  outline: none;
  padding: 4px 0;
-  border: 1px solid rgba(255, 255, 255, 0.12);
+  border: 1px solid fade(@component-background, 0.12);
  border-radius: 4px;
  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
  overflow: auto;
-  background-color: #fff;
+  background-color: @component-background;
 }

 [data-dark='true'] .side-menu-user-drop-menu {
@@ -1,11 +1,6 @@
 import React, { useEffect, useState, useRef } from 'react';
 import ProLayout, { PageLoading } from '@ant-design/pro-layout';
-import {
-  enable as enableDarkMode,
-  disable as disableDarkMode,
-  auto as followSystemColorScheme,
-  setFetchMethod,
-} from 'darkreader';
+import * as DarkReader from '@umijs/ssr-darkreader';
 import defaultProps from './defaultProps';
 import { Link, history } from 'umi';
 import {
@@ -28,13 +23,20 @@ import { init } from '../utils/init';

 export default function (props: any) {
  const ctx = useCtx();
-  const theme = useTheme();
-  const [user, setUser] = useState<any>();
+  const { theme, reloadTheme } = useTheme();
+  const [user, setUser] = useState<any>({});
  const [loading, setLoading] = useState<boolean>(true);
  const [systemInfo, setSystemInfo] = useState<{ isInitialized: boolean }>();
  const ws = useRef<any>(null);
  const [socketMessage, setSocketMessage] = useState<any>();
  const [collapsed, setCollapsed] = useState(false);
+  const {
+    enable: enableDarkMode,
+    disable: disableDarkMode,
+    exportGeneratedCSS: collectCSS,
+    setFetchMethod,
+    auto: followSystemColorScheme,
+  } = DarkReader || {};

  const logout = () => {
    request.post(`${config.apiPrefix}user/logout`).then(() => {
@@ -84,20 +86,8 @@ export default function (props: any) {
      });
  };

-  const reloadUser = () => {
-    getUser(false);
-  };
-
-  const setTheme = () => {
-    const media = window.matchMedia('(prefers-color-scheme: dark)');
-    const storageTheme = localStorage.getItem('qinglong_dark_theme');
-    const isDark =
-      (media.matches && storageTheme !== 'light') || storageTheme === 'dark';
-    if (isDark) {
-      document.body.setAttribute('data-dark', 'true');
-    } else {
-      document.body.setAttribute('data-dark', 'false');
-    }
+  const reloadUser = (needLoading = false) => {
+    getUser(needLoading);
  };

  useEffect(() => {
@@ -113,15 +103,25 @@ export default function (props: any) {
  }, [systemInfo]);

  useEffect(() => {
-    setTheme();
-  }, [theme.theme]);
+    if (theme === 'vs-dark') {
+      document.body.setAttribute('data-dark', 'true');
+    } else {
+      document.body.setAttribute('data-dark', 'false');
+    }
+  }, [theme]);

  useEffect(() => {
    vhCheck();
    init();

    const _theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
-    setFetchMethod(window.fetch);
+    if (typeof window === 'undefined') return;
+    if (typeof window.matchMedia === 'undefined') return;
+    if (!DarkReader) {
+      return () => null;
+    }
+    setFetchMethod(fetch);
+
    if (_theme === 'dark') {
      enableDarkMode({});
    } else if (_theme === 'light') {
@@ -129,6 +129,10 @@ export default function (props: any) {
    } else {
      followSystemColorScheme({});
    }
+
+    return () => {
+      disableDarkMode();
+    };
  }, []);

  useEffect(() => {
@@ -196,10 +200,10 @@ export default function (props: any) {
      return React.Children.map(props.children, (child) => {
        return React.cloneElement(child, {
          ...ctx,
-          ...theme,
+          theme,
          user,
          reloadUser,
-          reloadTheme: setTheme,
+          reloadTheme,
          ws: ws.current,
        });
      });
@@ -213,11 +217,11 @@ export default function (props: any) {
  const isQQBrowser = navigator.userAgent.includes('QQBrowser');

  const menu = (
-    <Menu className="side-menu-user-drop-menu">
-      <Menu.Item key="1" icon={<LogoutOutlined />} onClick={logout}>
-        退出登录
-      </Menu.Item>
-    </Menu>
+    <Menu
+      className="side-menu-user-drop-menu"
+      items={[{ label: '退出登录', key: 'logout', icon: <LogoutOutlined /> }]}
+      onClick={logout}
+    />
  );
  return loading ? (
    <PageLoading />
@@ -226,7 +230,7 @@ export default function (props: any) {
      selectedKeys={[props.location.pathname]}
      loading={loading}
      ErrorBoundary={Sentry.ErrorBoundary}
-      logo={<Image preview={false} src="https://qn.whyour.cn/logo.png" />}
+      logo={<Image preview={false} src="http://qn.whyour.cn/logo.png" />}
      title={
        <>
          <span style={{ fontSize: 16 }}>控制面板</span>
@@ -274,8 +278,13 @@ export default function (props: any) {
        ctx.isPhone && (
          <Dropdown overlay={menu} placement="bottomRight" trigger={['click']}>
            <span className="side-menu-user-wrapper">
-              <Avatar shape="square" size="small" icon={<UserOutlined />} />
-              <span style={{ marginLeft: 5 }}>admin</span>
+              <Avatar
+                shape="square"
+                size="small"
+                icon={<UserOutlined />}
+                src={`/api/static/${user.avatar}`}
+              />
+              <span style={{ marginLeft: 5 }}>{user.username}</span>
            </span>
          </Dropdown>
        )
@@ -291,8 +300,13 @@ export default function (props: any) {
          {!collapsed && !ctx.isPhone && (
            <Dropdown overlay={menu} placement="topLeft" trigger={['hover']}>
              <span className="side-menu-user-wrapper">
-                <Avatar shape="square" size="small" icon={<UserOutlined />} />
-                <span style={{ marginLeft: 5 }}>admin</span>
+                <Avatar
+                  shape="square"
+                  size="small"
+                  icon={<UserOutlined />}
+                  src={`/api/static/${user.avatar}`}
+                />
+                <span style={{ marginLeft: 5 }}>{user.username}</span>
              </span>
            </Dropdown>
          )}
@@ -309,10 +323,10 @@ export default function (props: any) {
      {React.Children.map(props.children, (child) => {
        return React.cloneElement(child, {
          ...ctx,
-          ...theme,
+          theme,
          user,
          reloadUser,
-          reloadTheme: setTheme,
+          reloadTheme,
          socketMessage,
        });
      })}
@@ -10,6 +10,7 @@ import {
  List,
  Divider,
  Typography,
+  Tooltip,
 } from 'antd';
 import {
  ClockCircleOutlined,
@@ -17,6 +18,8 @@ import {
  FieldTimeOutlined,
  Loading3QuartersOutlined,
  FileOutlined,
+  PlayCircleOutlined,
+  PauseCircleOutlined,
 } from '@ant-design/icons';
 import { CrontabStatus } from './index';
 import { diffTime } from '@/utils/date';
@@ -24,6 +27,7 @@ import { request } from '@/utils/http';
 import config from '@/utils/config';
 import CronLogModal from './logModal';
 import Editor from '@monaco-editor/react';
+import IconFont from '@/components/iconfont';

 const { Text } = Typography;

@@ -37,6 +41,12 @@ const tabList = [
    tab: '脚本',
  },
 ];
+const LangMap: any = {
+  '.py': 'python',
+  '.js': 'javascript',
+  '.sh': 'shell',
+  '.ts': 'typescript',
+};

 interface LogItem {
  directory: string;
@@ -68,6 +78,7 @@ const CronDetailModal = ({
  const [scriptInfo, setScriptInfo] = useState<any>({});
  const [logUrl, setLogUrl] = useState('');
  const [validTabs, setValidTabs] = useState(tabList);
+  const [currentCron, setCurrentCron] = useState<any>({});

  const contentList: any = {
    log: (
@@ -82,9 +93,9 @@ const CronDetailModal = ({
        )}
      />
    ),
-    script: (
+    script: scriptInfo.filename && (
      <Editor
-        language="shell"
+        language={LangMap[scriptInfo.filename.slice(-3)] || ''}
        theme={theme}
        value={value}
        options={{
@@ -103,10 +114,14 @@ const CronDetailModal = ({
  };

  const onClickItem = (item: LogItem) => {
-    localStorage.setItem('logCron', cron.id);
-    setLogUrl(`${config.apiPrefix}logs/${item.directory}/${item.filename}`);
+    localStorage.setItem('logCron', currentCron.id);
+    setLogUrl(
+      `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+    );
    request
-      .get(`${config.apiPrefix}logs/${item.directory}/${item.filename}`)
+      .get(
+        `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+      )
      .then((data) => {
        setLog(data.data);
        setIsLogModalVisible(true);
@@ -196,8 +211,150 @@ const CronDetailModal = ({
    });
  };

+  const runCron = () => {
+    Modal.confirm({
+      title: '确认运行',
+      content: (
+        <>
+          确认运行定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {currentCron.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}crons/run`, { data: [currentCron.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              setCurrentCron({ ...currentCron, status: CrontabStatus.running });
+              setTimeout(() => {
+                getLogs();
+              }, 1000);
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const stopCron = () => {
+    Modal.confirm({
+      title: '确认停止',
+      content: (
+        <>
+          确认停止定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {currentCron.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}crons/stop`, { data: [currentCron.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              setCurrentCron({ ...currentCron, status: CrontabStatus.idle });
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const enabledOrDisabledCron = () => {
+    Modal.confirm({
+      title: `确认${currentCron.isDisabled === 1 ? '启用' : '禁用'}`,
+      content: (
+        <>
+          确认{currentCron.isDisabled === 1 ? '启用' : '禁用'}
+          定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {currentCron.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(
+            `${config.apiPrefix}crons/${
+              currentCron.isDisabled === 1 ? 'enable' : 'disable'
+            }`,
+            {
+              data: [currentCron.id],
+            },
+          )
+          .then((data: any) => {
+            if (data.code === 200) {
+              setCurrentCron({
+                ...currentCron,
+                isDisabled: currentCron.isDisabled === 1 ? 0 : 1,
+              });
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const pinOrUnPinCron = () => {
+    Modal.confirm({
+      title: `确认${currentCron.isPinned === 1 ? '取消置顶' : '置顶'}`,
+      content: (
+        <>
+          确认{currentCron.isPinned === 1 ? '取消置顶' : '置顶'}
+          定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {currentCron.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(
+            `${config.apiPrefix}crons/${
+              currentCron.isPinned === 1 ? 'unpin' : 'pin'
+            }`,
+            {
+              data: [currentCron.id],
+            },
+          )
+          .then((data: any) => {
+            if (data.code === 200) {
+              setCurrentCron({
+                ...currentCron,
+                isPinned: currentCron.isPinned === 1 ? 0 : 1,
+              });
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
  useEffect(() => {
    if (cron && cron.id) {
+      setCurrentCron(cron);
      getLogs();
      getScript();
    }
@@ -206,19 +363,76 @@ const CronDetailModal = ({
  return (
    <Modal
      title={
-        <>
-          <span>{cron.name}</span>
-          {cron.labels?.length > 0 && cron.labels[0] !== '' && (
-            <Divider type="vertical"></Divider>
-          )}
-          {cron.labels?.length > 0 &&
-            cron.labels[0] !== '' &&
-            cron.labels?.map((label: string, i: number) => (
-              <Tag color="blue" style={{ marginRight: 5 }}>
-                {label}
-              </Tag>
-            ))}
-        </>
+        <div className="crontab-title-wrapper">
+          <div>
+            <span>{currentCron.name}</span>
+            {currentCron.labels?.length > 0 && currentCron.labels[0] !== '' && (
+              <Divider type="vertical"></Divider>
+            )}
+            {currentCron.labels?.length > 0 &&
+              currentCron.labels[0] !== '' &&
+              currentCron.labels?.map((label: string, i: number) => (
+                <Tag color="blue" style={{ marginRight: 5 }}>
+                  {label}
+                </Tag>
+              ))}
+          </div>
+
+          <div className="operations">
+            <Tooltip
+              title={
+                currentCron.status === CrontabStatus.idle ? '运行' : '停止'
+              }
+            >
+              <Button
+                type="link"
+                icon={
+                  currentCron.status === CrontabStatus.idle ? (
+                    <PlayCircleOutlined />
+                  ) : (
+                    <PauseCircleOutlined />
+                  )
+                }
+                size="small"
+                onClick={
+                  currentCron.status === CrontabStatus.idle ? runCron : stopCron
+                }
+              />
+            </Tooltip>
+            <Tooltip title={currentCron.isDisabled === 1 ? '启用' : '禁用'}>
+              <Button
+                type="link"
+                icon={
+                  <IconFont
+                    type={
+                      currentCron.isDisabled === 1
+                        ? 'ql-icon-enable'
+                        : 'ql-icon-disable'
+                    }
+                  />
+                }
+                size="small"
+                onClick={enabledOrDisabledCron}
+              />
+            </Tooltip>
+            <Tooltip title={currentCron.isPinned === 1 ? '取消置顶' : '置顶'}>
+              <Button
+                type="link"
+                icon={
+                  <IconFont
+                    type={
+                      currentCron.isPinned === 1
+                        ? 'ql-icon-untop'
+                        : 'ql-icon-top'
+                    }
+                  />
+                }
+                size="small"
+                onClick={pinOrUnPinCron}
+              />
+            </Tooltip>
+          </div>
+        </div>
      }
      centered
      visible={visible}
@@ -232,21 +446,22 @@ const CronDetailModal = ({
        <Card>
          <div className="cron-detail-info-item">
            <div className="cron-detail-info-title">任务</div>
-            <div className="cron-detail-info-value">{cron.command}</div>
+            <div className="cron-detail-info-value">{currentCron.command}</div>
          </div>
        </Card>
        <Card style={{ marginTop: 10 }}>
          <div className="cron-detail-info-item">
            <div className="cron-detail-info-title">状态</div>
            <div className="cron-detail-info-value">
-              {(!cron.isDisabled || cron.status !== CrontabStatus.idle) && (
+              {(!currentCron.isDisabled ||
+                currentCron.status !== CrontabStatus.idle) && (
                <>
-                  {cron.status === CrontabStatus.idle && (
+                  {currentCron.status === CrontabStatus.idle && (
                    <Tag icon={<ClockCircleOutlined />} color="default">
                      空闲中
                    </Tag>
                  )}
-                  {cron.status === CrontabStatus.running && (
+                  {currentCron.status === CrontabStatus.running && (
                    <Tag
                      icon={<Loading3QuartersOutlined spin />}
                      color="processing"
@@ -254,29 +469,30 @@ const CronDetailModal = ({
                      运行中
                    </Tag>
                  )}
-                  {cron.status === CrontabStatus.queued && (
+                  {currentCron.status === CrontabStatus.queued && (
                    <Tag icon={<FieldTimeOutlined />} color="default">
                      队列中
                    </Tag>
                  )}
                </>
              )}
-              {cron.isDisabled === 1 && cron.status === CrontabStatus.idle && (
-                <Tag icon={<CloseCircleOutlined />} color="error">
-                  已禁用
-                </Tag>
-              )}
+              {currentCron.isDisabled === 1 &&
+                currentCron.status === CrontabStatus.idle && (
+                  <Tag icon={<CloseCircleOutlined />} color="error">
+                    已禁用
+                  </Tag>
+                )}
            </div>
          </div>
          <div className="cron-detail-info-item">
            <div className="cron-detail-info-title">定时</div>
-            <div className="cron-detail-info-value">{cron.schedule}</div>
+            <div className="cron-detail-info-value">{currentCron.schedule}</div>
          </div>
          <div className="cron-detail-info-item">
            <div className="cron-detail-info-title">最后运行时间</div>
            <div className="cron-detail-info-value">
-              {cron.last_execution_time
-                ? new Date(cron.last_execution_time * 1000)
+              {currentCron.last_execution_time
+                ? new Date(currentCron.last_execution_time * 1000)
                    .toLocaleString(language, {
                      hour12: false,
                    })
@@ -287,14 +503,16 @@ const CronDetailModal = ({
          <div className="cron-detail-info-item">
            <div className="cron-detail-info-title">最后运行时长</div>
            <div className="cron-detail-info-value">
-              {cron.last_running_time ? diffTime(cron.last_running_time) : '-'}
+              {currentCron.last_running_time
+                ? diffTime(currentCron.last_running_time)
+                : '-'}
            </div>
          </div>
          <div className="cron-detail-info-item">
            <div className="cron-detail-info-title">下次运行时间</div>
            <div className="cron-detail-info-value">
-              {cron.nextRunTime &&
-                cron.nextRunTime
+              {currentCron.nextRunTime &&
+                currentCron.nextRunTime
                  .toLocaleString(language, {
                    hour12: false,
                  })
@@ -77,6 +77,22 @@
      margin-top: 12px;
    }
  }
+
+  .crontab-title-wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-right: 32px;
+
+    .operations {
+      display: flex;
+      align-items: center;
+
+      .ant-btn:not(:first-child) {
+        margin-left: 8px;
+      }
+    }
+  }
 }

 .log-item {
@@ -73,7 +73,7 @@ enum OperationPath {
 const Crontab = ({ headerStyle, isPhone, theme }: any) => {
  const columns: any = [
    {
-      title: '任务名',
+      title: '名称',
      dataIndex: 'name',
      key: 'name',
      width: 150,
@@ -127,7 +127,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      },
    },
    {
-      title: '任务',
+      title: '命令',
      dataIndex: 'command',
      key: 'command',
      width: 250,
@@ -152,7 +152,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      },
    },
    {
-      title: '任务定时',
+      title: '定时规则',
      dataIndex: 'schedule',
      key: 'schedule',
      width: 110,
@@ -200,18 +200,9 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
        },
      },
      render: (text: string, record: any) => {
-        const language = navigator.language || navigator.languages[0];
-        return (
-          <span
-            style={{
-              display: 'block',
-            }}
-          >
-            {record.last_running_time
-              ? diffTime(record.last_running_time)
-              : '-'}
-          </span>
-        );
+        return record.last_running_time
+          ? diffTime(record.last_running_time)
+          : '-';
      },
    },
    {
@@ -225,19 +216,11 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      },
      render: (text: string, record: any) => {
        const language = navigator.language || navigator.languages[0];
-        return (
-          <span
-            style={{
-              display: 'block',
-            }}
-          >
-            {record.nextRunTime
-              .toLocaleString(language, {
-                hour12: false,
-              })
-              .replace(' 24:', ' 00:')}
-          </span>
-        );
+        return record.nextRunTime
+          .toLocaleString(language, {
+            hour12: false,
+          })
+          .replace(' 24:', ' 00:');
      },
    },

@@ -455,8 +438,10 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
              message.success('删除成功');
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1);
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1);
+                setValue(result);
+              }
            } else {
              message.error(data);
            }
@@ -487,11 +472,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
            if (data.code === 200) {
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                status: CrontabStatus.running,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  status: CrontabStatus.running,
+                });
+                setValue(result);
+              }
            } else {
              message.error(data);
            }
@@ -522,12 +509,14 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
            if (data.code === 200) {
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                pid: null,
-                status: CrontabStatus.idle,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  pid: null,
+                  status: CrontabStatus.idle,
+                });
+                setValue(result);
+              }
            } else {
              message.error(data);
            }
@@ -567,11 +556,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
              const newStatus = record.isDisabled === 1 ? 0 : 1;
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                isDisabled: newStatus,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  isDisabled: newStatus,
+                });
+                setValue(result);
+              }
            } else {
              message.error(data);
            }
@@ -611,11 +602,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
              const newStatus = record.isPinned === 1 ? 0 : 1;
              const result = [...value];
              const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                isPinned: newStatus,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  isPinned: newStatus,
+                });
+                setValue(result);
+              }
            } else {
              message.error(data);
            }
@@ -627,6 +620,24 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
    });
  };

+  const getMenuItems = (record: any) => {
+    return [
+      { label: '编辑', key: 'edit', icon: <EditOutlined /> },
+      {
+        label: record.isDisabled === 1 ? '启用' : '禁用',
+        key: 'enableOrDisable',
+        icon:
+          record.isDisabled === 1 ? <CheckCircleOutlined /> : <StopOutlined />,
+      },
+      { label: '删除', key: 'delete', icon: <DeleteOutlined /> },
+      {
+        label: record.isPinned === 1 ? '取消置顶' : '置顶',
+        key: 'pinOrUnPin',
+        icon: record.isPinned === 1 ? <StopOutlined /> : <PushpinOutlined />,
+      },
+    ];
+  };
+
  const MoreBtn: React.FC<{
    record: any;
    index: number;
@@ -637,38 +648,12 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
      trigger={['click']}
      overlay={
        <Menu
+          items={getMenuItems(record)}
          onClick={({ key, domEvent }) => {
            domEvent.stopPropagation();
            action(key, record, index);
          }}
-        >
-          <Menu.Item key="edit" icon={<EditOutlined />}>
-            编辑
-          </Menu.Item>
-          <Menu.Item
-            key="enableOrDisable"
-            icon={
-              record.isDisabled === 1 ? (
-                <CheckCircleOutlined />
-              ) : (
-                <StopOutlined />
-              )
-            }
-          >
-            {record.isDisabled === 1 ? '启用' : '禁用'}
-          </Menu.Item>
-          <Menu.Item key="delete" icon={<DeleteOutlined />}>
-            删除
-          </Menu.Item>
-          <Menu.Item
-            key="pinOrUnPin"
-            icon={
-              record.isPinned === 1 ? <StopOutlined /> : <PushpinOutlined />
-            }
-          >
-            {record.isPinned === 1 ? '取消置顶' : '置顶'}
-          </Menu.Item>
-        </Menu>
+        />
      }
    >
      <a onClick={(e) => e.stopPropagation()}>
@@ -734,11 +719,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
          .parseExpression(data.data.schedule)
          .next()
          .toDate();
-        result.splice(index, 1, {
-          ...cron,
-          ...data.data,
-        });
-        setValue(result);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...cron,
+            ...data.data,
+          });
+          setValue(result);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -95,7 +95,7 @@ const CronLogModal = ({
      <>
        {(executing || loading) && <Loading3QuartersOutlined spin />}
        {!executing && !loading && <CheckCircleOutlined />}
-        <span style={{ marginLeft: 5 }}>日志-{cron && cron.name}</span>{' '}
+        <span style={{ marginLeft: 5 }}>{cron && cron.name}</span>
      </>
    );
  };
@@ -123,8 +123,6 @@ const CronLogModal = ({
      centered
      className="log-modal"
      bodyStyle={{
-        overflowY: 'auto',
-        maxHeight: 'calc(80vh - var(--vh-offset, 0px))',
        minHeight: '300px',
      }}
      forceRender
@@ -3,6 +3,7 @@ import { Modal, message, Input, Form, Button } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import cronParse from 'cron-parser';
+import EditableTagGroup from '@/components/tag';

 const CronModal = ({
  cron,
@@ -20,11 +21,6 @@ const CronModal = ({
    setLoading(true);
    const method = cron ? 'put' : 'post';
    const payload = { ...values };
-    if (typeof payload.labels === 'string') {
-      payload.labels = values.labels.split(/,|，/);
-    } else if (!payload.labels) {
-      payload.labels = [];
-    }
    if (cron) {
      payload.id = cron.id;
    }
@@ -53,6 +49,8 @@ const CronModal = ({
      title={cron ? '编辑任务' : '新建任务'}
      visible={visible}
      forceRender
+      centered
+      maskClosable={false}
      onOk={() => {
        form
          .validateFields()
@@ -93,7 +91,7 @@ const CronModal = ({
            { required: true },
            {
              validator: (rule, value) => {
-                if (cronParse.parseExpression(value).hasNext()) {
+                if (!value || cronParse.parseExpression(value).hasNext()) {
                  return Promise.resolve();
                } else {
                  return Promise.reject('Cron表达式格式有误');
@@ -105,7 +103,7 @@ const CronModal = ({
          <Input placeholder="秒(可选) 分 时 天 月 周" />
        </Form.Item>
        <Form.Item name="labels" label="标签">
-          <Input placeholder="请输入任务标签" />
+          <EditableTagGroup />
        </Form.Item>
      </Form>
    </Modal>
@@ -128,9 +126,6 @@ const CronLabelModal = ({
    form
      .validateFields()
      .then(async (values) => {
-        if (typeof values.labels === 'string') {
-          values.labels = values.labels.split(/,|，/);
-        }
        setLoading(true);
        const payload = { ids, labels: values.labels };
        const { code, data } = await request[action](
@@ -173,13 +168,15 @@ const CronLabelModal = ({
      title="批量修改标签"
      visible={visible}
      footer={buttons}
+      centered
+      maskClosable={false}
      forceRender
      onCancel={() => handleCancel(false)}
      confirmLoading={loading}
    >
      <Form form={form} layout="vertical" name="form_in_label_modal">
        <Form.Item name="labels" label="标签">
-          <Input placeholder="请输入任务标签" />
+          <EditableTagGroup />
        </Form.Item>
      </Form>
    </Modal>
@@ -16,7 +16,7 @@ import {
  DeleteOutlined,
  SyncOutlined,
  CheckCircleOutlined,
-  StopOutlined,
+  DeleteFilled,
  BugOutlined,
  FileTextOutlined,
 } from '@ant-design/icons';
@@ -120,6 +120,15 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
        const isPc = !isPhone;
        return (
          <Space size="middle">
+            <Tooltip title={isPc ? '日志' : ''}>
+              <a
+                onClick={() => {
+                  setLogDependence({ ...record, timestamp: Date.now() });
+                }}
+              >
+                <FileTextOutlined />
+              </a>
+            </Tooltip>
            {record.status !== Status.安装中 &&
              record.status !== Status.删除中 && (
                <>
@@ -133,17 +142,13 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
                      <DeleteOutlined />
                    </a>
                  </Tooltip>
+                  <Tooltip title={isPc ? '强制删除' : ''}>
+                    <a onClick={() => deleteDependence(record, index, true)}>
+                      <DeleteFilled />
+                    </a>
+                  </Tooltip>
                </>
              )}
-            <Tooltip title={isPc ? '日志' : ''}>
-              <a
-                onClick={() => {
-                  setLogDependence({ ...record, timestamp: Date.now() });
-                }}
-              >
-                <FileTextOutlined />
-              </a>
-            </Tooltip>
          </Space>
        );
      },
@@ -182,7 +187,11 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
    setIsModalVisible(true);
  };

-  const deleteDependence = (record: any, index: number) => {
+  const deleteDependence = (
+    record: any,
+    index: number,
+    force: boolean = false,
+  ) => {
    Modal.confirm({
      title: '确认删除',
      content: (
@@ -196,10 +205,19 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
      ),
      onOk() {
        request
-          .delete(`${config.apiPrefix}dependencies`, { data: [record.id] })
+          .delete(`${config.apiPrefix}dependencies${force ? '/force' : ''}`, {
+            data: [record.id],
+          })
          .then((data: any) => {
            if (data.code === 200) {
-              handleDependence(data.data[0]);
+              if (force) {
+                const i = value.findIndex((x) => x.id === data.data[0].id);
+                if (i !== -1) {
+                  const result = [...value];
+                  result.splice(i, 1);
+                  setValue(result);
+                }
+              }
            } else {
              message.error(data);
            }
@@ -253,9 +271,11 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
      result.push(...dependence);
    } else {
      const index = value.findIndex((x) => x.id === dependence.id);
-      result.splice(index, 1, {
-        ...dependence,
-      });
+      if (index !== -1) {
+        result.splice(index, 1, {
+          ...dependence,
+        });
+      }
    }
    setValue(result);
  };
@@ -275,13 +295,16 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
    onChange: onSelectChange,
  };

-  const delDependencies = () => {
+  const delDependencies = (force: boolean) => {
+    const forceUrl = force ? '/force' : '';
    Modal.confirm({
      title: '确认删除',
      content: <>确认删除选中的依赖吗</>,
      onOk() {
        request
-          .delete(`${config.apiPrefix}dependencies`, { data: selectedRowIds })
+          .delete(`${config.apiPrefix}dependencies${forceUrl}`, {
+            data: selectedRowIds,
+          })
          .then((data: any) => {
            if (data.code === 200) {
              setSelectedRowIds([]);
@@ -303,11 +326,13 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
      .then((data: any) => {
        const index = value.findIndex((x) => x.id === dependence.id);
        const result = [...value];
-        result.splice(index, 1, {
-          ...dependence,
-          ...data.data,
-        });
-        setValue(result);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...dependence,
+            ...data.data,
+          });
+          setValue(result);
+        }
      })
      .finally(() => setLoading(false));
  };
@@ -350,10 +375,12 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
      const result = [...value];
      for (let i = 0; i < references.length; i++) {
        const index = value.findIndex((x) => x.id === references[i]);
-        result.splice(index, 1, {
-          ...result[index],
-          status,
-        });
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...value[index],
+            status,
+          });
+        }
      }
      setValue(result);

@@ -362,7 +389,9 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
          const _result = [...value];
          for (let i = 0; i < references.length; i++) {
            const index = value.findIndex((x) => x.id === references[i]);
-            _result.splice(index, 1);
+            if (index !== -1) {
+              _result.splice(index, 1);
+            }
          }
          setValue(_result);
        }, 5000);
@@ -377,10 +406,17 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
          <Button
            type="primary"
            style={{ marginBottom: 5, marginLeft: 8 }}
-            onClick={delDependencies}
+            onClick={() => delDependencies(false)}
          >
            批量删除
          </Button>
+          <Button
+            type="primary"
+            style={{ marginBottom: 5, marginLeft: 8 }}
+            onClick={() => delDependencies(true)}
+          >
+            批量强制删除
+          </Button>
          <span style={{ marginLeft: 8 }}>
            已选择
            <a>{selectedRowIds?.length}</a>项
@@ -455,8 +491,10 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
          if (needRemove) {
            const index = value.findIndex((x) => x.id === logDependence.id);
            const result = [...value];
-            result.splice(index, 1);
-            setValue(result);
+            if (index !== -1) {
+              result.splice(index, 1);
+              setValue(result);
+            }
          } else if ([...value].map((x) => x.id).includes(logDependence.id)) {
            getDependenceDetail(logDependence);
          }
@@ -7,6 +7,7 @@ import {
  CheckCircleOutlined,
 } from '@ant-design/icons';
 import { PageLoading } from '@ant-design/pro-layout';
+import Ansi from 'ansi-to-react';

 const DependenceLogModal = ({
  dependence,
@@ -89,17 +90,19 @@ const DependenceLogModal = ({
  }, [dependence]);

  useEffect(() => {
-    if (!socketMessage) return;
+    if (!socketMessage || !dependence) return;
    const { type, message, references } = socketMessage;
    if (
      type === 'installDependence' &&
-      message.includes('结束时间') &&
-      references.length > 0
+      references.length > 0 &&
+      references.includes(dependence.id)
    ) {
-      setExecuting(false);
-      setIsRemoveFailed(message.includes('删除失败'));
+      if (message.includes('结束时间')) {
+        setExecuting(false);
+        setIsRemoveFailed(message.includes('删除失败'));
+      }
+      setValue(`${value}${message}`);
    }
-    setValue(`${value}${message}`);
  }, [socketMessage]);

  useEffect(() => {
@@ -140,7 +143,7 @@ const DependenceLogModal = ({
              : {}
          }
        >
-          {value}
+          <Ansi>{value}</Ansi>
        </pre>
      )}
    </Modal>
@@ -71,6 +71,8 @@ const DependenceModal = ({
      title={dependence ? '编辑依赖' : '新建依赖'}
      visible={visible}
      forceRender
+      centered
+      maskClosable={false}
      onOk={() => {
        form
          .validateFields()
@@ -41,6 +41,8 @@ const EditNameModal = ({
      title="修改环境变量名称"
      visible={visible}
      forceRender
+      centered
+      maskClosable={false}
      onOk={() => {
        form
          .validateFields()
@@ -61,6 +61,8 @@ const EnvModal = ({
      title={env ? '编辑变量' : '新建变量'}
      visible={visible}
      forceRender
+      centered
+      maskClosable={false}
      onOk={() => {
        form
          .validateFields()
@@ -22,7 +22,7 @@ const Error = ({ user, theme }: any) => {
  };

  useEffect(() => {
-    if (user) {
+    if (user && user.username) {
      history.push('/crontab');
    }
  }, [user]);
@@ -233,7 +233,7 @@ const Initialization = () => {
          <img
            alt="logo"
            className={styles.logo}
-            src="https://qn.whyour.cn/logo.png"
+            src="http://qn.whyour.cn/logo.png"
          />
          <span className={styles.title}>初始化配置</span>
        </div>
@@ -1,10 +1,11 @@
+@import '~antd/es/style/themes/default.less';
@import '~@/styles/variable.less';

 .left-tree {
  &-container {
    overflow: hidden;
    position: relative;
-    background-color: #fff;
+    background-color: @component-background;
    height: calc(100vh - 128px);
    height: calc(100vh - var(--vh-offset, 0px) - 128px);
    display: flex;
@@ -25,6 +26,6 @@
 :global {
  .Pane.vertical.Pane1 {
    padding-right: 5px;
-    border-right: 1px dashed #f0f0f0;
+    border-right: 1px dashed @text-color;
  }
 }
@@ -52,34 +52,18 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
    request
      .get(`${config.apiPrefix}logs`)
      .then((data) => {
-        const result = formatData(data.dirs) as any;
-        setData(result);
-        setFilterData(result);
+        setData(data.data);
+        setFilterData(data.data);
      })
      .finally(() => setLoading(false));
  };

-  const formatData = (tree: any[]) => {
-    return tree.map((x) => {
-      x.title = x.name;
-      x.value = x.name;
-      x.disabled = x.isDir;
-      x.key = x.name;
-      x.children = x.files.map((y: string) => ({
-        title: y,
-        value: `${x.name}/${y}`,
-        key: `${x.name}/${y}`,
-        parent: x.name,
-        isLeaf: true,
-      }));
-      return x;
-    });
-  };
-
  const getLog = (node: any) => {
-    request.get(`${config.apiPrefix}logs/${node.value}`).then((data) => {
-      setValue(data.data);
-    });
+    request
+      .get(`${config.apiPrefix}logs/${node.value}?path=${node.parent || ''}`)
+      .then((data) => {
+        setValue(data.data);
+      });
  };

  const onSelect = (value: any, node: any) => {
@@ -88,7 +72,7 @@ const Log = ({ headerStyle, isPhone, theme }: any) => {
    }
    setValue('加载中...');
    setSelect(value);
-    setTitle(node.parent || node.value);
+    setTitle(node.key);
    getLog(node);
  };

@@ -18,7 +18,7 @@ import { MobileOutlined } from '@ant-design/icons';
 const FormItem = Form.Item;
 const { Countdown } = Statistic;

-const Login = () => {
+const Login = ({ reloadUser }: any) => {
  const [loading, setLoading] = useState(false);
  const [waitTime, setWaitTime] = useState<any>();
  const { theme } = useTheme();
@@ -100,8 +100,8 @@ const Login = () => {
            <div>上次登录状态：{retries > 0 ? `失败${retries}次` : '成功'}</div>
          </>
        ),
-        duration: 5,
      });
+      reloadUser(true);
      history.push('/crontab');
    } else if (data.code === 100) {
      message.warn(data.message);
@@ -135,7 +135,7 @@ const Login = () => {
          <img
            alt="logo"
            className={styles.logo}
-            src="https://qn.whyour.cn/logo.png"
+            src="http://qn.whyour.cn/logo.png"
          />
          <span className={styles.title}>
            {twoFactor ? '两步验证' : config.siteName}
@@ -56,6 +56,8 @@ const EditScriptNameModal = ({
      title="新建文件"
      visible={visible}
      forceRender
+      centered
+      maskClosable={false}
      onOk={() => {
        form
          .validateFields()
@@ -1,10 +1,11 @@
+@import '~antd/es/style/themes/default.less';
@import '~@/styles/variable.less';

 .left-tree {
  &-container {
    overflow: hidden;
    position: relative;
-    background-color: #fff;
+    background-color: @component-background;
    height: calc(100vh - 128px);
    height: calc(100vh - var(--vh-offset, 0px) - 128px);
    display: flex;
@@ -25,6 +26,6 @@
 :global {
  .Pane.vertical.Pane1 {
    padding-right: 5px;
-    border-right: 1px dashed #f0f0f0;
+    border-right: 1px dashed @text-color;
  }
 }
@@ -93,7 +93,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
  const getScripts = () => {
    setLoading(true);
    request
-      .get(`${config.apiPrefix}scripts/files`)
+      .get(`${config.apiPrefix}scripts`)
      .then((data) => {
        setData(data.data);
        setFilterData(data.data);
@@ -135,7 +135,7 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
    const newMode = value ? LangMap[value.slice(-3)] : '';
    setMode(isPhone && newMode === 'typescript' ? 'javascript' : newMode);
    setSelect(node.key);
-    setTitle(node.parent || node.value);
+    setTitle(node.key);
    setCurrentNode(node);
    getDetail(node);
  };
@@ -278,13 +278,17 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                const index = parentNode.children.findIndex(
                  (y) => y.key === currentNode.key,
                );
-                parentNode.children.splice(index, 1);
-                newData.splice(parentNodeIndex, 1, { ...parentNode });
+                if (index !== -1 && parentNodeIndex !== -1) {
+                  parentNode.children.splice(index, 1);
+                  newData.splice(parentNodeIndex, 1, { ...parentNode });
+                }
              } else {
                const index = newData.findIndex(
                  (x) => x.key === currentNode.key,
                );
-                newData.splice(index, 1);
+                if (index !== -1) {
+                  newData.splice(index, 1);
+                }
              }
              setData(newData);
            } else {
@@ -314,13 +318,15 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
      const _file = { title: filename, key, value: filename, parent: path };
      if (path) {
        const parentNodeIndex = newData.findIndex((x) => x.key === path);
-        const parentNode = newData[parentNodeIndex];
-        if (parentNode.children && parentNode.children.length > 0) {
-          parentNode.children.unshift(_file);
-        } else {
-          parentNode.children = [_file];
+        if (parentNodeIndex !== -1) {
+          const parentNode = newData[parentNodeIndex];
+          if (parentNode.children && parentNode.children.length > 0) {
+            parentNode.children.unshift(_file);
+          } else {
+            parentNode.children = [_file];
+          }
+          newData.splice(parentNodeIndex, 1, { ...parentNode });
        }
-        newData.splice(parentNodeIndex, 1, { ...parentNode });
      } else {
        newData.unshift(_file);
      }
@@ -367,37 +373,68 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
    }
  }, []);

+  const action = (key: string | number) => {
+    switch (key) {
+      case 'save':
+        saveFile();
+        break;
+      case 'exit':
+        cancelEdit();
+        break;
+      default:
+        break;
+    }
+  };
+
+  const menuAction = (key: string | number) => {
+    switch (key) {
+      case 'save':
+        addFile();
+        break;
+      case 'edit':
+        editFile();
+        break;
+      case 'delete':
+        deleteFile();
+        break;
+      default:
+        break;
+    }
+  };
+
  const menu = isEditing ? (
-    <Menu>
-      <Menu.Item key="save" icon={<PlusOutlined />} onClick={saveFile}>
-        保存
-      </Menu.Item>
-      <Menu.Item key="exit" icon={<EditOutlined />} onClick={cancelEdit}>
-        退出编辑
-      </Menu.Item>
-    </Menu>
+    <Menu
+      items={[
+        { label: '保存', key: 'save', icon: <PlusOutlined /> },
+        { label: '退出编辑', key: 'exit', icon: <EditOutlined /> },
+      ]}
+      onClick={({ key, domEvent }) => {
+        domEvent.stopPropagation();
+        action(key);
+      }}
+    />
  ) : (
-    <Menu>
-      <Menu.Item key="add" icon={<PlusOutlined />} onClick={addFile}>
-        新建
-      </Menu.Item>
-      <Menu.Item
-        key="edit"
-        icon={<EditOutlined />}
-        onClick={editFile}
-        disabled={!select}
-      >
-        编辑
-      </Menu.Item>
-      <Menu.Item
-        key="delete"
-        icon={<DeleteOutlined />}
-        onClick={deleteFile}
-        disabled={!select}
-      >
-        删除
-      </Menu.Item>
-    </Menu>
+    <Menu
+      items={[
+        { label: '新建', key: 'add', icon: <PlusOutlined /> },
+        {
+          label: '编辑',
+          key: 'edit',
+          icon: <EditOutlined />,
+          disabled: !select,
+        },
+        {
+          label: '删除',
+          key: 'delete',
+          icon: <DeleteOutlined />,
+          disabled: !select,
+        },
+      ]}
+      onClick={({ key, domEvent }) => {
+        domEvent.stopPropagation();
+        menuAction(key);
+      }}
+    />
  );

  return (
@@ -43,6 +43,8 @@ const SaveModal = ({
      title="保存文件"
      visible={visible}
      forceRender
+      centered
+      maskClosable={false}
      onOk={() => {
        form
          .validateFields()
@@ -43,6 +43,7 @@ const SettingModal = ({
      title="运行设置"
      visible={visible}
      forceRender
+      centered
      onCancel={() => handleCancel()}
    >
      <Form
@@ -10,7 +10,7 @@ const About = () => {
      <img
        alt="logo"
        style={{ width: 140, marginRight: 20 }}
-        src="https://qn.whyour.cn/logo.png"
+        src="http://qn.whyour.cn/logo.png"
      />
      <div className={styles.right}>
        <span className={styles.title}>青龙</span>
@@ -43,6 +43,8 @@ const AppModal = ({
      title={app ? '编辑应用' : '新建应用'}
      visible={visible}
      forceRender
+      centered
+      maskClosable={false}
      onOk={() => {
        form
          .validateFields()
@@ -17,12 +17,7 @@ import {
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
 import { request } from '@/utils/http';
-import {
-  enable as enableDarkMode,
-  disable as disableDarkMode,
-  auto as followSystemColorScheme,
-  setFetchMethod,
-} from 'darkreader';
+import * as DarkReader from '@umijs/ssr-darkreader';
 import AppModal from './appModal';
 import {
  EditOutlined,
@@ -116,8 +111,7 @@ const Setting = ({
  ];

  const [loading, setLoading] = useState(true);
-  const defaultDarken = localStorage.getItem('qinglong_dark_theme') || 'auto';
-  const [theme, setTheme] = useState(defaultDarken);
+  const defaultTheme = localStorage.getItem('qinglong_dark_theme') || 'auto';
  const [dataSource, setDataSource] = useState<any[]>([]);
  const [isModalVisible, setIsModalVisible] = useState(false);
  const [editedApp, setEditedApp] = useState<any>();
@@ -126,10 +120,27 @@ const Setting = ({
  const [notificationInfo, setNotificationInfo] = useState<any>();
  const [logRemoveFrequency, setLogRemoveFrequency] = useState<number>();
  const [form] = Form.useForm();
+  const {
+    enable: enableDarkMode,
+    disable: disableDarkMode,
+    exportGeneratedCSS: collectCSS,
+    setFetchMethod,
+    auto: followSystemColorScheme,
+  } = DarkReader || {};

  const themeChange = (e: any) => {
-    setTheme(e.target.value);
+    const _theme = e.target.value;
    localStorage.setItem('qinglong_dark_theme', e.target.value);
+    setFetchMethod(fetch);
+
+    if (_theme === 'dark') {
+      enableDarkMode({});
+    } else if (_theme === 'light') {
+      disableDarkMode();
+    } else {
+      followSystemColorScheme({});
+    }
+    reloadTheme();
  };

  const getApps = () => {
@@ -300,18 +311,6 @@ const Setting = ({
    });
  };

-  useEffect(() => {
-    setFetchMethod(window.fetch);
-    if (theme === 'dark') {
-      enableDarkMode({});
-    } else if (theme === 'light') {
-      disableDarkMode();
-    } else {
-      followSystemColorScheme({});
-    }
-    reloadTheme(theme);
-  }, [theme]);
-
  return (
    <PageContainer
      className="ql-container-wrapper"
@@ -357,11 +356,15 @@ const Setting = ({
        </Tabs.TabPane>
        <Tabs.TabPane tab="其他设置" key="other">
          <Form layout="vertical" form={form}>
-            <Form.Item label="主题设置" name="theme" initialValue={theme}>
+            <Form.Item
+              label="主题设置"
+              name="theme"
+              initialValue={defaultTheme}
+            >
              <Radio.Group
                options={optionsWithDisabled}
                onChange={themeChange}
-                value={theme}
+                value={defaultTheme}
                optionType="button"
                buttonStyle="solid"
              />
@@ -21,7 +21,7 @@ const columns = [
    align: 'center' as const,
    width: 50,
    render: (text: string, record: any, index: number) => {
-      return <span style={{ cursor: 'text' }}>{index + 1} </span>;
+      return index + 1;
    },
  },
  {
@@ -30,7 +30,7 @@ const columns = [
    key: 'timestamp',
    align: 'center' as const,
    render: (text: string, record: any) => {
-      return <span>{new Date(record.timestamp).toLocaleString()}</span>;
+      return new Date(record.timestamp).toLocaleString();
    },
  },
  {
@@ -1,10 +1,13 @@
 import React, { useEffect, useState } from 'react';
-import { Typography, Input, Form, Button, message } from 'antd';
+import { Typography, Input, Form, Button, message, Avatar, Upload } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import { history } from 'umi';
 import QRCode from 'qrcode.react';
 import { PageLoading } from '@ant-design/pro-layout';
+import { UploadOutlined, UserOutlined } from '@ant-design/icons';
+import ImgCrop from 'antd-img-crop';
+import 'antd/es/slider/style';

 const { Title, Link } = Typography;

@@ -14,6 +17,7 @@ const SecuritySettings = ({ user, userChange }: any) => {
  const [twoFactoring, setTwoFactoring] = useState(false);
  const [twoFactorInfo, setTwoFactorInfo] = useState<any>();
  const [code, setCode] = useState<string>();
+  const [avatar, setAvatar] = useState<string>();

  const handleOk = (values: any) => {
    request
@@ -86,8 +90,16 @@ const SecuritySettings = ({ user, userChange }: any) => {
      });
  };

+  const onChange = (e) => {
+    if (e.file && e.file.response) {
+      setAvatar(`/api/static/${e.file.response.data}`);
+      userChange();
+    }
+  };
+
  useEffect(() => {
    setTwoFactorActivated(user && user.twoFactorActivated);
+    setAvatar(user.avatar && `/api/static/${user.avatar}`);
  }, [user]);

  return twoFactoring ? (
@@ -210,6 +222,36 @@ const SecuritySettings = ({ user, userChange }: any) => {
      >
        {twoFactorActivated ? '禁用' : '启用'}
      </Button>
+
+      <div
+        style={{
+          fontSize: 18,
+          borderBottom: '1px solid #f0f0f0',
+          marginBottom: 8,
+          paddingBottom: 4,
+          marginTop: 16,
+        }}
+      >
+        头像
+      </div>
+      <Avatar size={128} shape="square" icon={<UserOutlined />} src={avatar} />
+      <ImgCrop rotate>
+        <Upload
+          method="put"
+          showUploadList={false}
+          maxCount={1}
+          action="/api/user/avatar"
+          onChange={onChange}
+          name="avatar"
+          headers={{
+            Authorization: `Bearer ${localStorage.getItem(config.authKey)}`,
+          }}
+        >
+          <Button icon={<UploadOutlined />} style={{ marginLeft: 8 }}>
+            更换头像
+          </Button>
+        </Upload>
+      </ImgCrop>
    </>
  );
 };
@@ -0,0 +1,608 @@
+import React, { useState, useEffect } from 'react';
+import {
+  Button,
+  message,
+  Modal,
+  Table,
+  Tag,
+  Space,
+  Dropdown,
+  Menu,
+  Typography,
+  Input,
+  Tooltip,
+} from 'antd';
+import {
+  ClockCircleOutlined,
+  Loading3QuartersOutlined,
+  CloseCircleOutlined,
+  EllipsisOutlined,
+  CheckCircleOutlined,
+  EditOutlined,
+  StopOutlined,
+  DeleteOutlined,
+  FileTextOutlined,
+  PauseCircleOutlined,
+  PlayCircleOutlined,
+} from '@ant-design/icons';
+import config from '@/utils/config';
+import { PageContainer } from '@ant-design/pro-layout';
+import { request } from '@/utils/http';
+import SubscriptionModal from './modal';
+import { getTableScroll } from '@/utils/index';
+import { history } from 'umi';
+import './index.less';
+import SubscriptionLogModal from './logModal';
+
+const { Text, Paragraph } = Typography;
+const { Search } = Input;
+
+export enum SubscriptionStatus {
+  'running',
+  'idle',
+  'disabled',
+  'queued',
+}
+
+export enum IntervalSchedule {
+  'days' = '天',
+  'hours' = '时',
+  'minutes' = '分',
+  'seconds' = '秒',
+}
+
+export enum SubscriptionType {
+  'private-repo' = '私有仓库',
+  'public-repo' = '公开仓库',
+  'file' = '单文件',
+}
+
+const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
+  const columns: any = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name',
+      width: 150,
+      align: 'center' as const,
+      sorter: {
+        compare: (a: any, b: any) => a.name.localeCompare(b.name),
+        multiple: 2,
+      },
+    },
+    {
+      title: '链接',
+      dataIndex: 'url',
+      key: 'url',
+      align: 'center' as const,
+      sorter: {
+        compare: (a: any, b: any) => a.name.localeCompare(b.name),
+        multiple: 2,
+      },
+      render: (text: string, record: any) => {
+        return (
+          <Paragraph
+            style={{
+              wordBreak: 'break-all',
+              marginBottom: 0,
+              textAlign: 'left',
+            }}
+            ellipsis={{ tooltip: text, rows: 2 }}
+          >
+            {text}
+          </Paragraph>
+        );
+      },
+    },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      width: 130,
+      align: 'center' as const,
+      render: (text: string, record: any) => {
+        return (SubscriptionType as any)[record.type];
+      },
+    },
+    {
+      title: '分支',
+      dataIndex: 'branch',
+      key: 'branch',
+      width: 130,
+      align: 'center' as const,
+      render: (text: string, record: any) => {
+        return record.branch || '-';
+      },
+    },
+    {
+      title: '定时规则',
+      width: 180,
+      align: 'center' as const,
+      render: (text: string, record: any) => {
+        if (record.schedule_type === 'interval') {
+          const { type, value } = record.interval_schedule;
+          return `每${value}${(IntervalSchedule as any)[type]}`;
+        }
+        return record.schedule;
+      },
+    },
+    {
+      title: '状态',
+      key: 'status',
+      dataIndex: 'status',
+      align: 'center' as const,
+      width: 110,
+      filters: [
+        {
+          text: '运行中',
+          value: 0,
+        },
+        {
+          text: '空闲中',
+          value: 1,
+        },
+        {
+          text: '已禁用',
+          value: 2,
+        },
+      ],
+      onFilter: (value: number, record: any) => {
+        if (record.is_disabled && record.status !== 0) {
+          return value === 2;
+        } else {
+          return record.status === value;
+        }
+      },
+      render: (text: string, record: any) => (
+        <>
+          {(!record.is_disabled ||
+            record.status !== SubscriptionStatus.idle) && (
+            <>
+              {record.status === SubscriptionStatus.idle && (
+                <Tag icon={<ClockCircleOutlined />} color="default">
+                  空闲中
+                </Tag>
+              )}
+              {record.status === SubscriptionStatus.running && (
+                <Tag
+                  icon={<Loading3QuartersOutlined spin />}
+                  color="processing"
+                >
+                  运行中
+                </Tag>
+              )}
+            </>
+          )}
+          {record.is_disabled === 1 &&
+            record.status === SubscriptionStatus.idle && (
+              <Tag icon={<CloseCircleOutlined />} color="error">
+                已禁用
+              </Tag>
+            )}
+        </>
+      ),
+    },
+    {
+      title: '操作',
+      key: 'action',
+      align: 'center' as const,
+      width: 130,
+      render: (text: string, record: any, index: number) => {
+        const isPc = !isPhone;
+        return (
+          <Space size="middle">
+            {record.status === SubscriptionStatus.idle && (
+              <Tooltip title={isPc ? '运行' : ''}>
+                <a
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    runSubscription(record, index);
+                  }}
+                >
+                  <PlayCircleOutlined />
+                </a>
+              </Tooltip>
+            )}
+            {record.status !== SubscriptionStatus.idle && (
+              <Tooltip title={isPc ? '停止' : ''}>
+                <a
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    stopSubsciption(record, index);
+                  }}
+                >
+                  <PauseCircleOutlined />
+                </a>
+              </Tooltip>
+            )}
+            <Tooltip title={isPc ? '日志' : ''}>
+              <a
+                onClick={(e) => {
+                  e.stopPropagation();
+                  setLogSubscription({ ...record, timestamp: Date.now() });
+                }}
+              >
+                <FileTextOutlined />
+              </a>
+            </Tooltip>
+            <MoreBtn key="more" record={record} index={index} />
+          </Space>
+        );
+      },
+    },
+  ];
+
+  const [value, setValue] = useState<any[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [isModalVisible, setIsModalVisible] = useState(false);
+  const [editedSubscription, setEditedSubscription] = useState();
+  const [searchText, setSearchText] = useState('');
+  const [currentPage, setCurrentPage] = useState(1);
+  const [pageSize, setPageSize] = useState(20);
+  const [tableScrollHeight, setTableScrollHeight] = useState<number>();
+  const [searchValue, setSearchValue] = useState('');
+  const [isLogModalVisible, setIsLogModalVisible] = useState(false);
+  const [logSubscription, setLogSubscription] = useState<any>();
+
+  const runSubscription = (record: any, index: number) => {
+    Modal.confirm({
+      title: '确认运行',
+      content: (
+        <>
+          确认运行定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}subscriptions/run`, { data: [record.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              const result = [...value];
+              const i = result.findIndex((x) => x.id === record.id);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  status: SubscriptionStatus.running,
+                });
+                setValue(result);
+              }
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const stopSubsciption = (record: any, index: number) => {
+    Modal.confirm({
+      title: '确认停止',
+      content: (
+        <>
+          确认停止定时任务{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}subscriptions/stop`, { data: [record.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              const result = [...value];
+              const i = result.findIndex((x) => x.id === record.id);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  pid: null,
+                  status: SubscriptionStatus.idle,
+                });
+                setValue(result);
+              }
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const getSubscriptions = () => {
+    setLoading(true);
+    request
+      .get(`${config.apiPrefix}subscriptions?searchValue=${searchText}`)
+      .then((data: any) => {
+        setValue(data.data);
+        setCurrentPage(1);
+      })
+      .finally(() => setLoading(false));
+  };
+
+  const addSubscription = () => {
+    setEditedSubscription(null as any);
+    setIsModalVisible(true);
+  };
+
+  const editSubscription = (record: any, index: number) => {
+    setEditedSubscription(record);
+    setIsModalVisible(true);
+  };
+
+  const delSubscription = (record: any, index: number) => {
+    Modal.confirm({
+      title: '确认删除',
+      content: (
+        <>
+          确认删除定时订阅{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .delete(`${config.apiPrefix}subscriptions`, { data: [record.id] })
+          .then((data: any) => {
+            if (data.code === 200) {
+              message.success('删除成功');
+              const result = [...value];
+              const i = result.findIndex((x) => x.id === record.id);
+              if (i !== -1) {
+                result.splice(i, 1);
+                setValue(result);
+              }
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const enabledOrDisabledSubscription = (record: any, index: number) => {
+    Modal.confirm({
+      title: `确认${record.is_disabled === 1 ? '启用' : '禁用'}`,
+      content: (
+        <>
+          确认{record.is_disabled === 1 ? '启用' : '禁用'}
+          定时订阅{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          吗
+        </>
+      ),
+      onOk() {
+        request
+          .put(
+            `${config.apiPrefix}subscriptions/${
+              record.is_disabled === 1 ? 'enable' : 'disable'
+            }`,
+            {
+              data: [record.id],
+            },
+          )
+          .then((data: any) => {
+            if (data.code === 200) {
+              const newStatus = record.is_disabled === 1 ? 0 : 1;
+              const result = [...value];
+              const i = result.findIndex((x) => x.id === record.id);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  is_disabled: newStatus,
+                });
+                setValue(result);
+              }
+            } else {
+              message.error(data);
+            }
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  const MoreBtn: React.FC<{
+    record: any;
+    index: number;
+  }> = ({ record, index }) => (
+    <Dropdown
+      arrow={{ pointAtCenter: true }}
+      placement="bottomRight"
+      trigger={['click']}
+      overlay={
+        <Menu
+          items={[
+            { label: '编辑', key: 'edit', icon: <EditOutlined /> },
+            {
+              label: record.is_disabled === 1 ? '启用' : '禁用',
+              key: 'enableOrDisable',
+              icon:
+                record.is_disabled === 1 ? (
+                  <CheckCircleOutlined />
+                ) : (
+                  <StopOutlined />
+                ),
+            },
+            { label: '删除', key: 'delete', icon: <DeleteOutlined /> },
+          ]}
+          onClick={({ key, domEvent }) => {
+            domEvent.stopPropagation();
+            action(key, record, index);
+          }}
+        />
+      }
+    >
+      <a onClick={(e) => e.stopPropagation()}>
+        <EllipsisOutlined />
+      </a>
+    </Dropdown>
+  );
+
+  const action = (key: string | number, record: any, index: number) => {
+    switch (key) {
+      case 'edit':
+        editSubscription(record, index);
+        break;
+      case 'enableOrDisable':
+        enabledOrDisabledSubscription(record, index);
+        break;
+      case 'delete':
+        delSubscription(record, index);
+        break;
+      default:
+        break;
+    }
+  };
+
+  const handleCancel = (subscription?: any) => {
+    setIsModalVisible(false);
+    if (subscription) {
+      handleSubscriptions(subscription);
+    }
+  };
+
+  const onSearch = (value: string) => {
+    setSearchText(value.trim());
+  };
+
+  const handleSubscriptions = (subscription: any) => {
+    const index = value.findIndex((x) => x.id === subscription.id);
+    const result = [...value];
+    if (index === -1) {
+      result.unshift(subscription);
+    } else {
+      result.splice(index, 1, {
+        ...subscription,
+      });
+    }
+    setValue(result);
+  };
+
+  const onPageChange = (page: number, pageSize: number | undefined) => {
+    setCurrentPage(page);
+    setPageSize(pageSize as number);
+    localStorage.setItem('pageSize', pageSize + '');
+  };
+
+  const getRowClassName = (record: any, index: number) => {
+    return record.isPinned
+      ? 'pinned-subscription subscription'
+      : 'subscription';
+  };
+
+  useEffect(() => {
+    if (!socketMessage) return;
+    const { type, message, references } = socketMessage;
+    if (type === 'runSubscriptionEnd' && references.length > 0) {
+      const result = [...value];
+      for (let i = 0; i < references.length; i++) {
+        const index = value.findIndex((x) => x.id === references[i]);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...value[index],
+            status: SubscriptionStatus.idle,
+          });
+        }
+      }
+      setValue(result);
+    }
+  }, [socketMessage]);
+
+  useEffect(() => {
+    if (logSubscription) {
+      localStorage.setItem('logSubscription', logSubscription.id);
+      setIsLogModalVisible(true);
+    }
+  }, [logSubscription]);
+
+  useEffect(() => {
+    getSubscriptions();
+  }, [searchText]);
+
+  useEffect(() => {
+    setPageSize(parseInt(localStorage.getItem('pageSize') || '20'));
+    setTimeout(() => {
+      setTableScrollHeight(getTableScroll());
+    });
+  }, []);
+
+  return (
+    <PageContainer
+      className="ql-container-wrapper subscriptiontab-wrapper"
+      title="订阅管理"
+      extra={[
+        <Search
+          placeholder="请输入名称或者关键词"
+          style={{ width: 'auto' }}
+          enterButton
+          allowClear
+          loading={loading}
+          value={searchValue}
+          onChange={(e) => setSearchValue(e.target.value)}
+          onSearch={onSearch}
+        />,
+        <Button key="2" type="primary" onClick={() => addSubscription()}>
+          新建订阅
+        </Button>,
+      ]}
+      header={{
+        style: headerStyle,
+      }}
+    >
+      <Table
+        columns={columns}
+        pagination={{
+          current: currentPage,
+          onChange: onPageChange,
+          pageSize: pageSize,
+          showSizeChanger: true,
+          simple: isPhone,
+          defaultPageSize: 20,
+          showTotal: (total: number, range: number[]) =>
+            `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
+          pageSizeOptions: [20, 100, 500, 1000] as any,
+        }}
+        dataSource={value}
+        rowKey="id"
+        size="middle"
+        scroll={{ x: 1000, y: tableScrollHeight }}
+        loading={loading}
+        rowClassName={getRowClassName}
+      />
+      <SubscriptionModal
+        visible={isModalVisible}
+        handleCancel={handleCancel}
+        subscription={editedSubscription}
+      />
+      <SubscriptionLogModal
+        visible={isLogModalVisible}
+        handleCancel={() => {
+          setIsLogModalVisible(false);
+        }}
+        subscription={logSubscription}
+      />
+    </PageContainer>
+  );
+};
+
+export default Subscription;
@@ -0,0 +1,132 @@
+import React, { useEffect, useState } from 'react';
+import { Modal, message, Input, Form, Statistic, Button } from 'antd';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+import {
+  Loading3QuartersOutlined,
+  CheckCircleOutlined,
+} from '@ant-design/icons';
+import { PageLoading } from '@ant-design/pro-layout';
+
+const SubscriptionLogModal = ({
+  subscription,
+  handleCancel,
+  visible,
+  data,
+  logUrl,
+}: {
+  subscription?: any;
+  visible: boolean;
+  handleCancel: () => void;
+  data?: string;
+  logUrl?: string;
+}) => {
+  const [value, setValue] = useState<string>('启动中...');
+  const [loading, setLoading] = useState<any>(true);
+  const [executing, setExecuting] = useState<any>(true);
+  const [isPhone, setIsPhone] = useState(false);
+
+  const getCronLog = (isFirst?: boolean) => {
+    if (isFirst) {
+      setLoading(true);
+    }
+    request
+      .get(
+        logUrl
+          ? logUrl
+          : `${config.apiPrefix}subscriptions/${subscription.id}/log`,
+      )
+      .then((data: any) => {
+        if (
+          localStorage.getItem('logSubscription') === String(subscription.id)
+        ) {
+          const log = data.data as string;
+          setValue(log || '暂无日志');
+          setExecuting(log && !log.includes('执行结束'));
+          if (log && !log.includes('执行结束')) {
+            setTimeout(() => {
+              getCronLog();
+            }, 2000);
+          }
+        }
+      })
+      .finally(() => {
+        if (isFirst) {
+          setLoading(false);
+        }
+      });
+  };
+
+  const cancel = () => {
+    localStorage.removeItem('logSubscription');
+    handleCancel();
+  };
+
+  const titleElement = () => {
+    return (
+      <>
+        {(executing || loading) && <Loading3QuartersOutlined spin />}
+        {!executing && !loading && <CheckCircleOutlined />}
+        <span style={{ marginLeft: 5 }}>
+          {subscription && subscription.name}
+        </span>
+      </>
+    );
+  };
+
+  useEffect(() => {
+    if (subscription && subscription.id && visible) {
+      getCronLog(true);
+    }
+  }, [subscription, visible]);
+
+  useEffect(() => {
+    if (data) {
+      setValue(data);
+    }
+  }, [data]);
+
+  useEffect(() => {
+    setIsPhone(document.body.clientWidth < 768);
+  }, []);
+
+  return (
+    <Modal
+      title={titleElement()}
+      visible={visible}
+      centered
+      className="log-modal"
+      bodyStyle={{
+        minHeight: '300px',
+      }}
+      forceRender
+      onOk={() => cancel()}
+      onCancel={() => cancel()}
+      footer={[
+        <Button type="primary" onClick={() => cancel()}>
+          知道了
+        </Button>,
+      ]}
+    >
+      {loading ? (
+        <PageLoading />
+      ) : (
+        <pre
+          style={
+            isPhone
+              ? {
+                  fontFamily: 'Source Code Pro',
+                  width: 375,
+                  zoom: 0.83,
+                }
+              : {}
+          }
+        >
+          {value}
+        </pre>
+      )}
+    </Modal>
+  );
+};
+
+export default SubscriptionLogModal;
@@ -0,0 +1,456 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { Modal, message, InputNumber, Form, Radio, Select, Input } from 'antd';
+import { request } from '@/utils/http';
+import config from '@/utils/config';
+import cron_parser from 'cron-parser';
+
+const { Option } = Select;
+const repoUrlRegx = /[^\/\:]+\/[^\/]+(?=\.git)/;
+const fileUrlRegx = /[^\/\:]+\/[^\/]+$/;
+
+const SubscriptionModal = ({
+  subscription,
+  handleCancel,
+  visible,
+}: {
+  subscription?: any;
+  visible: boolean;
+  handleCancel: (needUpdate?: boolean) => void;
+}) => {
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+  const [type, setType] = useState('public-repo');
+  const [scheduleType, setScheduleType] = useState('crontab');
+  const [pullType, setPullType] = useState<'ssh-key' | 'user-pwd'>('ssh-key');
+
+  const handleOk = async (values: any) => {
+    setLoading(true);
+    const method = subscription ? 'put' : 'post';
+    const payload = { ...values };
+    if (subscription) {
+      payload.id = subscription.id;
+    }
+    try {
+      const { code, data } = await request[method](
+        `${config.apiPrefix}subscriptions`,
+        {
+          data: payload,
+        },
+      );
+      if (code === 200) {
+        message.success(subscription ? '更新订阅成功' : '新建订阅成功');
+      } else {
+        message.error(data);
+      }
+      setLoading(false);
+      handleCancel(data);
+    } catch (error: any) {
+      setLoading(false);
+    }
+  };
+
+  const typeChange = (e) => {
+    setType(e.target.value);
+    const _url = form.getFieldValue('url');
+    const _branch = form.getFieldValue('branch');
+    form.setFieldsValue({
+      alias: formatAlias(_url, _branch, e.target.value),
+    });
+    if (_url) {
+      form.validateFields(['url']);
+    }
+  };
+
+  const scheduleTypeChange = (e) => {
+    setScheduleType(e.target.value);
+    form.setFieldsValue({ schedule: '' });
+  };
+
+  const pullTypeChange = (e) => {
+    setPullType(e.target.value);
+  };
+
+  const onUrlChange = (e) => {
+    const _branch = form.getFieldValue('branch');
+    form.setFieldsValue({
+      alias: formatAlias(e.target.value, _branch),
+    });
+  };
+
+  const onBranchChange = (e) => {
+    const _url = form.getFieldValue('url');
+    form.setFieldsValue({
+      alias: formatAlias(_url, e.target.value),
+    });
+  };
+
+  const formatAlias = (_url: string, _branch: string, _type = type) => {
+    let _alias = '';
+    const _regx = _type === 'file' ? fileUrlRegx : repoUrlRegx;
+    if (_regx.test(_url)) {
+      _alias = _url.match(_regx)![0].replaceAll('/', '_').replaceAll('.', '_');
+    }
+    if (_branch) {
+      _alias = _alias + '_' + _branch;
+    }
+    return _alias;
+  };
+
+  const IntervalSelect = ({
+    value,
+    onChange,
+  }: {
+    value?: any;
+    onChange?: (param: any) => void;
+  }) => {
+    const [intervalType, setIntervalType] = useState('days');
+    const [intervalNumber, setIntervalNumber] = useState<number>();
+    const intervalTypeChange = (type: string) => {
+      setIntervalType(type);
+      onChange?.({ type, value: intervalNumber });
+    };
+
+    const numberChange = (value: number) => {
+      setIntervalNumber(value);
+      onChange?.({ type: intervalType, value });
+    };
+
+    useEffect(() => {
+      if (value) {
+        setIntervalType(value.type);
+        setIntervalNumber(value.value);
+      }
+    }, [value]);
+    return (
+      <Input.Group compact>
+        <InputNumber
+          addonBefore="每"
+          precision={0}
+          min={1}
+          value={intervalNumber}
+          style={{ width: 'calc(100% - 58px)' }}
+          onChange={numberChange}
+        />
+        <Select value={intervalType} onChange={intervalTypeChange}>
+          <Option value="days">天</Option>
+          <Option value="hours">时</Option>
+          <Option value="minutes">分</Option>
+          <Option value="seconds">秒</Option>
+        </Select>
+      </Input.Group>
+    );
+  };
+
+  const PullOptions = ({
+    value,
+    onChange,
+    type,
+  }: {
+    value?: any;
+    type: 'ssh-key' | 'user-pwd';
+    onChange?: (param: any) => void;
+  }) => {
+    return type === 'ssh-key' ? (
+      <Form.Item
+        name={['pull_option', 'private_key']}
+        label="私钥"
+        rules={[{ required: true }]}
+      >
+        <Input.TextArea
+          rows={4}
+          autoSize={{ minRows: 1, maxRows: 6 }}
+          placeholder="请输入私钥"
+        />
+      </Form.Item>
+    ) : (
+      <>
+        <Form.Item
+          name={['pull_option', 'username']}
+          label="用户名"
+          rules={[{ required: true }]}
+        >
+          <Input placeholder="请输入认证用户名" />
+        </Form.Item>
+        <Form.Item
+          name={['pull_option', 'password']}
+          tooltip="Github已不支持密码认证，请使用Token方式"
+          label="密码/Token"
+          rules={[{ required: true }]}
+        >
+          <Input placeholder="请输入密码或者Token" />
+        </Form.Item>
+      </>
+    );
+  };
+
+  const onPaste = useCallback((e: any) => {
+    const text = e.clipboardData.getData('text');
+    if (!subscription && text.includes('ql ')) {
+      const [
+        ,
+        type,
+        url,
+        whitelist,
+        blacklist,
+        dependences,
+        branch,
+        extensions,
+      ] = text
+        .split(' ')
+        .map((x) => x.trim().replace(/\"/g, '').replace(/\'/, ''));
+      form.setFieldsValue({
+        type:
+          type === 'raw'
+            ? 'file'
+            : url.startsWith('http')
+            ? 'public-repo'
+            : 'private-repo',
+        url,
+        whitelist,
+        blacklist,
+        dependences,
+        branch,
+        extensions,
+        alias: formatAlias(url, branch),
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    if (visible) {
+      window.addEventListener('paste', onPaste);
+    } else {
+      window.removeEventListener('paste', onPaste);
+    }
+  }, [visible]);
+
+  useEffect(() => {
+    form.setFieldsValue(subscription || {});
+    setType((subscription && subscription.type) || 'public-repo');
+    setScheduleType((subscription && subscription.schedule_type) || 'crontab');
+    setPullType((subscription && subscription.pull_type) || 'ssh-key');
+    if (!subscription) {
+      form.resetFields();
+    }
+  }, [subscription, visible]);
+
+  const isFirefox = navigator.userAgent.includes('Firefox');
+  const isSafari =
+    navigator.userAgent.includes('Safari') &&
+    !navigator.userAgent.includes('Chrome');
+  const isQQBrowser = navigator.userAgent.includes('QQBrowser');
+
+  return (
+    <Modal
+      title={
+        subscription ? (
+          '编辑订阅'
+        ) : (
+          <span>
+            新建订阅
+            <small
+              style={{
+                color: '#999',
+                fontWeight: 400,
+                fontSize: isFirefox ? 9 : 12,
+                marginLeft: 2,
+                zoom: isSafari ? 0.66 : 0.8,
+                letterSpacing: isQQBrowser ? -2 : 0,
+              }}
+            >
+              支持repo/raw命令，粘贴导入
+            </small>
+          </span>
+        )
+      }
+      visible={visible}
+      forceRender
+      centered
+      maskClosable={false}
+      onOk={() => {
+        form
+          .validateFields()
+          .then((values) => {
+            handleOk(values);
+          })
+          .catch((info) => {
+            console.log('Validate Failed:', info);
+          });
+      }}
+      onCancel={() => handleCancel()}
+      confirmLoading={loading}
+    >
+      <Form form={form} name="form_in_modal" layout="vertical">
+        <Form.Item name="name" label="名称">
+          <Input placeholder="请输入订阅名" />
+        </Form.Item>
+        <Form.Item
+          name="type"
+          label="类型"
+          rules={[{ required: true }]}
+          initialValue={'public-repo'}
+        >
+          <Radio.Group onChange={typeChange}>
+            <Radio value="public-repo">公开仓库</Radio>
+            <Radio value="private-repo">私有仓库</Radio>
+            <Radio value="file">单文件</Radio>
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item
+          name="url"
+          label="链接"
+          rules={[
+            { required: true },
+            { pattern: type === 'file' ? fileUrlRegx : repoUrlRegx },
+          ]}
+        >
+          <Input.TextArea
+            rows={4}
+            autoSize={true}
+            placeholder="请输入订阅链接"
+            onPaste={onUrlChange}
+            onChange={onUrlChange}
+          />
+        </Form.Item>
+        {type !== 'file' && (
+          <Form.Item name="branch" label="分支">
+            <Input
+              placeholder="请输入分支"
+              onPaste={onBranchChange}
+              onChange={onBranchChange}
+            />
+          </Form.Item>
+        )}
+        <Form.Item
+          name="alias"
+          label="唯一值"
+          rules={[{ required: true, message: '' }]}
+          tooltip="唯一值用于日志目录和私钥别名"
+        >
+          <Input placeholder="自动生成" disabled />
+        </Form.Item>
+        {type === 'private-repo' && (
+          <>
+            <Form.Item
+              name="pull_type"
+              label="拉取方式"
+              initialValue={'ssh-key'}
+              rules={[{ required: true }]}
+            >
+              <Radio.Group onChange={pullTypeChange}>
+                <Radio value="ssh-key">私钥</Radio>
+                <Radio value="user-pwd">用户名密码/Token</Radio>
+              </Radio.Group>
+            </Form.Item>
+            <PullOptions type={pullType} />
+          </>
+        )}
+        <Form.Item
+          name="schedule_type"
+          label="定时类型"
+          initialValue={'crontab'}
+          rules={[{ required: true }]}
+        >
+          <Radio.Group onChange={scheduleTypeChange}>
+            <Radio value="crontab">crontab</Radio>
+            <Radio value="interval">interval</Radio>
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item
+          name={scheduleType === 'crontab' ? 'schedule' : 'interval_schedule'}
+          label="定时规则"
+          rules={[
+            { required: true },
+            {
+              validator: (rule, value) => {
+                if (
+                  scheduleType === 'interval' ||
+                  !value ||
+                  cron_parser.parseExpression(value).hasNext()
+                ) {
+                  return Promise.resolve();
+                } else {
+                  return Promise.reject('Subscription表达式格式有误');
+                }
+              },
+            },
+          ]}
+        >
+          {scheduleType === 'interval' ? (
+            <IntervalSelect />
+          ) : (
+            <Input placeholder="秒(可选) 分 时 天 月 周" />
+          )}
+        </Form.Item>
+        {type !== 'file' && (
+          <>
+            <Form.Item
+              name="whitelist"
+              label="白名单"
+              tooltip="多个关键词竖线分割，支持正则表达式"
+            >
+              <Input.TextArea
+                rows={4}
+                autoSize={true}
+                placeholder="请输入脚本筛选白名单关键词，多个关键词竖线分割"
+              />
+            </Form.Item>
+            <Form.Item
+              name="blacklist"
+              label="黑名单"
+              tooltip="多个关键词竖线分割，支持正则表达式"
+            >
+              <Input.TextArea
+                rows={4}
+                autoSize={true}
+                placeholder="请输入脚本筛选黑名单关键词，多个关键词竖线分割"
+              />
+            </Form.Item>
+            <Form.Item
+              name="dependences"
+              label="依赖文件"
+              tooltip="多个关键词竖线分割，支持正则表达式"
+            >
+              <Input.TextArea
+                rows={4}
+                autoSize={true}
+                placeholder="请输入脚本依赖文件关键词，多个关键词竖线分割"
+              />
+            </Form.Item>
+            <Form.Item
+              name="extensions"
+              label="文件后缀"
+              tooltip="仓库需要拉取的文件后缀，多个后缀空格分隔，默认使用配置文件中的RepoFileExtensions"
+            >
+              <Input placeholder="请输入文件后缀" />
+            </Form.Item>
+            <Form.Item
+              name="sub_before"
+              label="执行前"
+              tooltip="运行订阅前执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js"
+            >
+              <Input.TextArea
+                rows={4}
+                autoSize={true}
+                placeholder="请输入运行订阅前要执行的命令"
+              />
+            </Form.Item>
+            <Form.Item
+              name="sub_after"
+              label="执行后"
+              tooltip="运行订阅后执行的命令，比如 cp/mv/python3 xxx.py/node xxx.js"
+            >
+              <Input.TextArea
+                rows={4}
+                autoSize={true}
+                placeholder="请输入运行订阅后要执行的命令"
+              />
+            </Form.Item>
+          </>
+        )}
+      </Form>
+    </Modal>
+  );
+};
+
+export default SubscriptionModal;
@@ -43,6 +43,10 @@ export default {
      name: '环境变量',
      value: 'envs',
    },
+    {
+      name: '订阅管理',
+      value: 'subscriptions',
+    },
    {
      name: '配置文件',
      value: 'configs',
@@ -67,6 +71,7 @@ export default {
  scopesMap: {
    crons: '定时任务',
    envs: '环境变量',
+    subscriptions: '订阅管理',
    configs: '配置文件',
    scripts: '脚本管理',
    logs: '任务日志',
@@ -77,7 +82,7 @@ export default {
    { value: 'gotify', label: 'Gotify' },
    { value: 'goCqHttpBot', label: 'GoCqHttpBot' },
    { value: 'serverChan', label: 'Server酱' },
-    { value: 'PushDeer', label: 'PushDeer' },
+    { value: 'pushDeer', label: 'PushDeer' },
    { value: 'bark', label: 'Bark' },
    { value: 'telegramBot', label: 'Telegram机器人' },
    { value: 'dingtalkBot', label: '钉钉机器人' },
@@ -114,7 +119,13 @@ export default {
    serverChan: [
      { label: 'serverChanKey', tip: 'Server酱SENDKEY', required: true },
    ],
-    PushDeer: [{ label: 'PushDeerKey', tip: 'PushDeer的Key', required: true }],
+    pushDeer: [
+      {
+        label: 'pushDeerKey',
+        tip: 'PushDeer的Key，https://github.com/easychen/pushdeer',
+        required: true,
+      },
+    ],
    bark: [
      {
        label: 'barkPush',
@@ -208,6 +219,7 @@ export default {
    '/initialization': '初始化',
    '/cron': '定时任务',
    '/env': '环境变量',
+    '/subscription': '订阅管理',
    '/config': '配置文件',
    '/script': '脚本管理',
    '/diff': '对比工具',
@@ -38,7 +38,15 @@ export const useCtx = () => {
 };

 export const useTheme = () => {
-  const [theme, setTheme] = useState<string>('');
+  const [theme, setTheme] = useState<'vs' | 'vs-dark'>();
+
+  const reloadTheme = () => {
+    const media = window.matchMedia('(prefers-color-scheme: dark)');
+    const storageTheme = localStorage.getItem('qinglong_dark_theme');
+    const isDark =
+      (media.matches && storageTheme !== 'light') || storageTheme === 'dark';
+    setTheme(isDark ? 'vs-dark' : 'vs');
+  };

  useEffect(() => {
    const media = window.matchMedia('(prefers-color-scheme: dark)');
@@ -63,5 +71,5 @@ export const useTheme = () => {
    }
  }, []);

-  return { theme };
+  return { theme, reloadTheme };
 };
@@ -11,7 +11,7 @@ const time = Date.now();
 const errorHandler = function (error: any) {
  if (error.response) {
    const msg = error.data
-      ? error.data.message || error.data
+      ? error.data.message || error.message || error.data
      : error.response.statusText;
    const responseStatus = error.response.status;
    if ([502, 504].includes(responseStatus)) {
@@ -10,12 +10,19 @@ export function init() {
    integrations: [new Integrations.BrowserTracing()],
    release: version,
    tracesSampleRate: 1.0,
+    beforeBreadcrumb(breadcrumb, hint?) {
+      if (breadcrumb.data && breadcrumb.data.url) {
+        const url = breadcrumb.data.url.replace(/token=.*/, '');
+        breadcrumb.data.url = url;
+      }
+      return breadcrumb;
+    },
  });

  // monaco 编辑器配置cdn和locale
  loader.config({
    paths: {
-      vs: 'https://cdn.staticfile.org/monaco-editor/0.32.1/min/vs',
+      vs: 'https://cdn.staticfile.org/monaco-editor/0.33.0/min/vs',
    },
    'vs/nls': {
      availableLanguages: {
@@ -1,15 +1,8 @@
-export const version = '2.12.0';
-export const changeLogLink = 'https://t.me/jiao_long/288';
-export const changeLog = `2.12.0 版本说明
-1. 全新定时任务详情，支持日志查看、脚本编辑
-2. openapi增加发送通知接口，可用于脚本直接调用
-3. 增加pushDeer推送，感谢 https://github.com/NekoMio PR
-4. 增加public服务，当服务异常时，查询服务状态及日志，供页面使用。
-5. 增加ql check可视化错误提示
-6. 修改openapi获取token逻辑，最多存储5个可用的token。
-7. 调整数据目录，log、db、scripts、config等目录迁移到 /ql/data 目录，docker映射只需映射data目录
-8. 版本文件存储到七牛云，方便检查更新
-9. 修复编辑应用初始值
-10. 修复退出登录和定时任务搜索
-11. 其他bug修复
+export const version = '2.13.1';
+export const changeLogLink = 'https://t.me/jiao_long/303';
+export const changeLog = `2.13.1 版本说明
+1. 修复新建订阅repo命令快捷导入
+2. 修复执行订阅任务含有before/after命令时，造成面板无法访问
+3. 修复任务详情日志列表访问
+4. 修复安装依赖造成CPU满负荷，服务器崩溃
 `;
@@ -13,7 +13,7 @@
      "@/*": ["src/*"],
      "@@/*": ["src/.umi/*"]
    },
-    "lib": ["dom", "es2017", "esnext.asynciterable"],
+    "lib": ["dom", "es2021", "esnext.asynciterable"],
    "typeRoots": [
      "./node_modules/@types",
      "./back/types",
Author	SHA1	Message	Date
whyour	99d7eaeff0	更新版本 v2.13.1	2022-05-29 01:50:46 +08:00
whyour	c8f5eb7c2e	修复pnpm版本兼容	2022-05-29 01:50:05 +08:00
whyour	109e16e8fb	修复前端列表查询	2022-05-28 21:49:34 +08:00
whyour	555f6e04e8	修复依赖日志查看	2022-05-28 21:10:24 +08:00
whyour	bcde0a54bf	修复依赖安装日志	2022-05-28 20:51:25 +08:00
whyour	eee7f25bc3	修复订阅日志查看	2022-05-28 20:11:38 +08:00
whyour	b10157b09a	修复系统启动执行订阅任务	2022-05-28 19:56:12 +08:00
whyour	a09a21fa5d	依赖改为串行安装	2022-05-28 19:41:37 +08:00
whyour	ec2918b427	修改订阅日志排版	2022-05-28 19:04:46 +08:00
whyour	57bfc19ecf	修复execSync卡死主进程	2022-05-28 18:55:52 +08:00
whyour	aa110d4187	修复任务详情日志访问，修复新建订阅粘贴repo命令	2022-05-28 17:36:41 +08:00
whyour	9e8febfc11	修复七牛sdk参数	2022-05-28 00:11:43 +08:00
whyour	5905c2ce25	更新版本 2.13.0	2022-05-28 00:08:48 +08:00
whyour	b03ef0d494	移除sentry上报信息可能出现的token	2022-05-27 23:47:17 +08:00
whyour	585f77ed49	修改workflow	2022-05-26 15:12:45 +08:00
whyour	1c580ea2f9	修复切换订阅interval	2022-05-26 14:41:22 +08:00
whyour	b1af6575b9	修改workflow	2022-05-26 00:25:31 +08:00
whyour	b24c5fdee1	更新readme	2022-05-26 00:23:25 +08:00
whyour	a256ada847	修复定时任务标签默认值	2022-05-26 00:18:04 +08:00
whyour	a8cdab629d	修复安装依赖逻辑	2022-05-25 02:04:13 +08:00
whyour	09cca0a920	修改linux依赖安装命令	2022-05-25 01:23:33 +08:00
whyour	6a0aa6aae2	修改node依赖安装命令	2022-05-25 01:20:23 +08:00
whyour	565cc06c27	修改文本	2022-05-25 01:10:04 +08:00
whyour	29caa4b770	新建订阅支持粘贴导入	2022-05-25 01:09:05 +08:00
whyour	953cf4795a	修复日志获取	2022-05-24 10:00:42 +08:00
whyour	31bc8395aa	修复获取脚本列表	2022-05-23 19:22:20 +08:00
whyour	eb94b39e40	修复主题切换	2022-05-23 12:03:01 +08:00
whyour	c16bbe0f9a	修改订阅before/after执行时机	2022-05-22 22:14:32 +08:00
whyour	b60caa60d5	修改新建订阅文件后缀提示	2022-05-22 21:35:02 +08:00
whyour	1ea97e9206	修复错误界面user判断	2022-05-22 21:28:30 +08:00
whyour	32970bca71	修复登录跳转	2022-05-22 18:07:48 +08:00
whyour	1fc9f87eaa	修改antd样式目录	2022-05-22 00:44:13 +08:00
whyour	b2f5960097	使用ssr-darkreader代替darkreader	2022-05-21 21:19:44 +08:00
whyour	1cfcc66548	修复根组件刷新异常	2022-05-21 11:51:16 +08:00
whyour	60152a313f	修复spawn监听事件	2022-05-21 00:47:05 +08:00
whyour	d50ff20ff8	修改新建订阅字段提示	2022-05-21 00:12:12 +08:00
whyour	3aed5ef955	订阅同步表字段	2022-05-20 11:18:40 +08:00
whyour	61e0e8dbe2	订阅增加before/after	2022-05-20 01:15:45 +08:00
whyour	1ba5d52ee7	修复登录成功获取用户信息	2022-05-19 23:40:19 +08:00
whyour	03bc5bb882	增加初始化订阅任务	2022-05-18 23:30:59 +08:00
whyour	8011b4b793	修改生成ssh配置	2022-05-18 20:10:28 +08:00
whyour	deb124ae23	修复删除私钥	2022-05-18 20:06:46 +08:00
whyour	a3114e40d1	修复私钥权限	2022-05-18 19:23:32 +08:00
whyour	0b9ecfc3a5	完善拉取私有仓库	2022-05-18 01:14:10 +08:00
whyour	c32bb4157b	统一api错误提示	2022-05-17 23:31:29 +08:00
whyour	7f9c9f05b8	修复订阅执行日志输出	2022-05-17 22:27:41 +08:00
whyour	906a074634	修复环境变量PATH	2022-05-17 13:24:19 +08:00
whyour	286ec0e714	修改dockerfile	2022-05-17 12:38:58 +08:00
whyour	0f81414497	action安装pnpm	2022-05-17 12:18:29 +08:00
whyour	b451831db2	移除pnpm action缓存	2022-05-17 12:14:44 +08:00
whyour	ae13185319	pnpm action缓存	2022-05-17 12:13:26 +08:00
whyour	f2bcbaefd2	pnpm action缓存	2022-05-17 12:12:25 +08:00
whyour	96ddcf49c5	pnpm action缓存	2022-05-17 12:10:59 +08:00
whyour	322a4e2729	删除pnpm缓存	2022-05-17 12:06:29 +08:00
whyour	8e48960253	完善拉取公开仓库	2022-05-17 00:42:18 +08:00
whyour	3b419a8e96	兼容antd Menu	2022-05-16 01:47:03 +08:00
whyour	bf1685bf79	重构任务执行逻辑	2022-05-15 20:40:29 +08:00
whyour	3ab84428f0	修复编译错误	2022-05-15 15:35:52 +08:00
whyour	fdda732c4c	更新新建文件订阅	2022-05-15 15:25:23 +08:00
whyour	f46b30498b	完善订阅接口	2022-05-14 21:38:26 +08:00
whyour	d7ee2576f2	完善新建订阅页面	2022-05-14 19:21:35 +08:00
whyour	d2c03bc298	增加订阅api	2022-05-10 19:54:05 +08:00
whyour	6283e23d29	修复编译错误	2022-05-10 14:42:25 +08:00
whyour	dc9923ac13	增加新建订阅	2022-05-10 14:38:06 +08:00
whyour	62ac80257a	修复设置头像	2022-05-09 15:33:18 +08:00
whyour	868452f13c	修复设置头像	2022-05-09 15:32:44 +08:00
whyour	6c368f7ea7	支持更换头像	2022-05-09 15:31:41 +08:00
whyour	732d63d588	增加ssh key操作service	2022-05-08 22:41:56 +08:00
whyour	ae40947801	更新readme	2022-05-08 11:33:39 +08:00
whyour	079d4dfa06	修复用户名显示	2022-05-08 10:06:56 +08:00
whyour	67c50bf622	添加订阅管理前端	2022-05-08 09:41:06 +08:00
whyour	f1e494b1fc	修复生产环境安装依赖prepare失败	2022-05-03 18:44:00 +08:00
whyour	f4f275490e	修复npm prepare命令	2022-05-03 18:25:52 +08:00
whyour	baad96106f	修复pnpm全局安装	2022-05-03 18:07:12 +08:00
whyour	15fa7754b5	修复peerDependence	2022-05-03 15:55:39 +08:00
whyour	8f175f8447	修复pnpm依赖	2022-05-03 15:43:15 +08:00
whyour	9c45cfd7ed	修改action依赖	2022-05-03 15:06:28 +08:00
whyour	f2426c3f66	修改依赖	2022-05-03 14:59:48 +08:00
whyour	36ae6e460d	测试pnpm版本	2022-05-03 14:47:59 +08:00
whyour	7ae93efe07	测试pnpm版本	2022-05-03 14:44:10 +08:00
whyour	8b97d92d0a	添加依赖rc-tween-one	2022-05-01 14:20:00 +08:00
whyour	e5c06335ec	修复pnpm版本	2022-05-01 14:15:29 +08:00
whyour	2bd8e49302	修改定时任务添加标签交互	2022-05-01 13:51:33 +08:00
whyour	c0d401e296	修复环境变量转义	2022-04-25 23:55:25 +08:00
whyour	e07d2b6639	修复获取最新version文件	2022-04-24 18:43:09 +08:00
whyour	220a87627d	更新版本 v2.12.2	2022-04-24 17:50:03 +08:00
whyour	87bca2ac4e	任务详情增加运行、禁用、置顶操作	2022-04-24 17:45:50 +08:00
whyour	c320906149	依赖管理增加直接强制删除	2022-04-23 15:02:54 +08:00
JerryWnandGitHub	27958a1a90	修复双引号转义逻辑 #1331 (#1337 )	2022-04-18 22:55:37 +08:00
whyour	82c7011522	修复定时删除日志设置，主持设置大于24天	2022-04-18 22:29:14 +08:00
whyour	fa6d57d809	修复shell发送通知	2022-04-09 11:13:08 +08:00
whyour	1060fc7476	修复并发日志目录	2022-04-06 12:18:16 +08:00
whyour	56bc38e9e7	更新readme	2022-04-05 23:24:27 +08:00
whyour	18be65d6fe	更新发布脚本	2022-04-05 23:17:03 +08:00
whyour	3409085195	更新发布脚本	2022-04-05 23:14:47 +08:00
whyour	17e17ac077	增加发布脚本	2022-04-05 23:11:48 +08:00
whyour	c655e1da38	修复日志目录判断	2022-04-05 00:28:14 +08:00
whyour	0ea158724f	修复日志目录获取	2022-04-05 00:21:32 +08:00
whyour	fb521498ff	修复task日志打印	2022-04-04 23:32:27 +08:00
whyour	399550ccad	修复日志创建目录	2022-04-04 22:40:02 +08:00
whyour	c7c30c86f2	修复目录获取	2022-04-04 18:06:21 +08:00
whyour	5f6c0882d6	修改版本说明	2022-04-04 17:28:15 +08:00
whyour	6e05a4f3a5	更新版本号 v2.12.1	2022-04-04 17:24:42 +08:00
whyour	ea8aa6a231	修改获取版本链接	2022-04-04 17:17:34 +08:00
whyour	ae2570c677	修复shell日志路径截取	2022-04-03 22:31:11 +08:00
whyour	c76d952d41	修改yarn命令	2022-04-03 21:49:20 +08:00
whyour	cdf9fb24be	修复定时任务获取日志	2022-04-03 20:00:31 +08:00
whyour	2131e16781	删除console	2022-04-03 19:50:44 +08:00
whyour	b0c8425639	修复日志路径拼接规则	2022-04-03 19:32:44 +08:00
whyour	f0869567de	七牛云改为http访问	2022-04-01 08:29:16 +08:00
whyour	be2a19949b	修复获取日志相对目录	2022-03-30 11:34:36 +08:00
whyour	8627cccb58	修改日志路径合并方式	2022-03-30 11:17:11 +08:00
whyour	4a8eaebf17	修复获取任务日志路径	2022-03-30 10:57:43 +08:00
kan3GitandGitHub	e7edd0a5a4	tg发送消息改json (#1269 ) 发现有带&的消息都会漏掉&后面的内容，改为JSON发送	2022-03-26 17:23:54 +08:00
chen310andGitHub	9ccbea0a04	修复PushDeer推送Python版本错误 (#1270 ) * 修复PushDeer推送Python版本错误	2022-03-26 17:20:02 +08:00
whyour	ab715ef840	修复系统pushDeer通知	2022-03-26 17:17:13 +08:00
whyour	117822fe7c	修改任务最大内存占用200兆	2022-03-26 16:53:03 +08:00
whyour	da922678a1	修复定时任务获取日志目录	2022-03-26 00:29:42 +08:00