From 01e2bd007db1461e18b4218ba48e7dd0a944f7ca Mon Sep 17 00:00:00 2001 From: whyour Date: Tue, 18 Jul 2023 21:39:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8C=81=E7=BB=AD=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/crontab/logModal.tsx | 28 +--------------------------- src/pages/setting/checkUpdate.tsx | 2 +- src/pages/setting/other.tsx | 2 +- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx index e8d9bd04..13f99aaa 100644 --- a/src/pages/crontab/logModal.tsx +++ b/src/pages/crontab/logModal.tsx @@ -46,10 +46,7 @@ const CronLogModal = ({ const log = data as string; setValue(log || '暂无日志'); const hasNext = Boolean( - log && - !logEnded(log) && - !log.includes('重启面板') && - !log.includes('任务未运行'), + log && !logEnded(log) && !log.includes('任务未运行'), ); setExecuting(hasNext); autoScroll(); @@ -58,29 +55,6 @@ const CronLogModal = ({ getCronLog(); }, 2000); } - if ( - log && - log.includes('重启面板') && - cron.status === CrontabStatus.running - ) { - message.warning({ - content: ( - - 系统将在 - - 秒后自动刷新 - - ), - duration: 10, - }); - setTimeout(() => { - window.location.reload(); - }, 30000); - } } }) .finally(() => { diff --git a/src/pages/setting/checkUpdate.tsx b/src/pages/setting/checkUpdate.tsx index cd441049..12202b32 100644 --- a/src/pages/setting/checkUpdate.tsx +++ b/src/pages/setting/checkUpdate.tsx @@ -143,7 +143,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => { 秒后自动刷新 ), - duration: 15, + duration: 30, }); setTimeout(() => { window.location.reload(); diff --git a/src/pages/setting/other.tsx b/src/pages/setting/other.tsx index 509afd41..b935764d 100644 --- a/src/pages/setting/other.tsx +++ b/src/pages/setting/other.tsx @@ -141,7 +141,7 @@ const Other = ({ 秒后自动刷新 ), - duration: 15, + duration: 30, }); setTimeout(() => { window.location.reload(); From fe559299598015955b42cc282427939df103b298 Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 19 Jul 2023 21:02:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-en.md | 18 ++++++++++++++++++ README.md | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/README-en.md b/README-en.md index c2895a7d..67c2acaf 100644 --- a/README-en.md +++ b/README-en.md @@ -35,6 +35,24 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript - Support dark mode - Support cell phone operation +## Version +### docker + +The `latest` image is built on `alpine` and the `debian` image is built on `debian-slim`. If you need to use a dependency that is not supported by `alpine`, it is recommended that you use the `debian` image. + +```bash +docker pull whyour/qinglong:latest +docker pull whyour/qinglong:debian +``` + +### npm + +The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed. + +```bash +npm i @whyour/qinglong +``` + ## Deployment ### Docker (Recommended) diff --git a/README.md b/README.md index 2c908984..48252498 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,24 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript - 支持暗黑模式 - 支持手机端操作 +## 版本 +### docker + +`latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像 + +```bash +docker pull whyour/qinglong:latest +docker pull whyour/qinglong:debian +``` + +### npm + +npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3` + +```bash +npm i @whyour/qinglong +``` + ## 部署 ### docker (推荐) From 56eb0c54089e4e6c9ca1c66a75aa044c7e466083 Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 19 Jul 2023 21:17:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=20v2.1?= =?UTF-8?q?5.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/version.yaml b/version.yaml index 7ba37e4f..f01e57db 100644 --- a/version.yaml +++ b/version.yaml @@ -1,7 +1,7 @@ -version: 2.15.17 -changeLogLink: https://t.me/jiao_long/383 -publishTime: 2023-07-11 23:51 +version: 2.15.18 +changeLogLink: https://t.me/jiao_long/384 +publishTime: 2023-07-19 21:21 changeLog: | - 1. 系统设置增加定时任务并发数设置 - 2. 修改默认并发数 - 3. 修改更新仓库逻辑 + 1. 增加备份恢复功能 + 2. 重构系统检查更新逻辑 + 3. 修复系统设置自动删除日志启动时失效