Merge branch 'whyour:develop' into develop

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)

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 (推荐)

src/pages/crontab/logModal.tsx

@@ -46,10 +46,7 @@ const CronLogModal = ({
           const log = data as string;
           setValue(log || '暂无日志');
           const hasNext = Boolean(
-            log &&
+            log && !logEnded(log) && !log.includes('任务未运行'),
-              !logEnded(log) &&
-              !log.includes('重启面板') &&
-              !log.includes('任务未运行'),
           );
           setExecuting(hasNext);
           autoScroll();
@@ -58,29 +55,6 @@ const CronLogModal = ({
               getCronLog();
             }, 2000);
           }
-          if (
-            log &&
-            log.includes('重启面板') &&
-            cron.status === CrontabStatus.running
-          ) {
-            message.warning({
-              content: (
-                <span>
-                  系统将在
-                  <Countdown
-                    className="inline-countdown"
-                    format="ss"
-                    value={Date.now() + 1000 * 30}
-                  />
-                  秒后自动刷新
-                </span>
-              ),
-              duration: 10,
-            });
-            setTimeout(() => {
-              window.location.reload();
-            }, 30000);
-          }
         }
       })
       .finally(() => {

src/pages/setting/checkUpdate.tsx

@@ -143,7 +143,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
                   秒后自动刷新
                 </span>
               ),
-              duration: 15,
+              duration: 30,
             });
             setTimeout(() => {
               window.location.reload();

src/pages/setting/other.tsx

@@ -141,7 +141,7 @@ const Other = ({
                   秒后自动刷新
                 </span>
               ),
-              duration: 15,
+              duration: 30,
             });
             setTimeout(() => {
               window.location.reload();

version.yaml

@@ -1,7 +1,7 @@
-version: 2.15.17
+version: 2.15.18
-changeLogLink: https://t.me/jiao_long/383
+changeLogLink: https://t.me/jiao_long/384
-publishTime: 2023-07-11 23:51
+publishTime: 2023-07-19 21:21
 changeLog: |
-  1. 系统设置增加定时任务并发数设置
+  1. 增加备份恢复功能
-  2. 修改默认并发数
+  2. 重构系统检查更新逻辑
-  3. 修改更新仓库逻辑
+  3. 修复系统设置自动删除日志启动时失效