diff --git a/shell/update.sh b/shell/update.sh
index d1091ff5..6a345ef8 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -268,7 +268,7 @@ update_qinglong() {
if [[ $exit_status -eq 0 ]]; then
cd $dir_root
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
- echo -e "重启面板完成"
+ echo -e "重启面板中..."
pm2 reload all >/dev/null 2>&1
fi
}
diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx
index 9c71265e..ab5893cc 100644
--- a/src/pages/crontab/logModal.tsx
+++ b/src/pages/crontab/logModal.tsx
@@ -37,7 +37,11 @@ const CronLogModal = ({
const log = data.data as string;
setValue(log || '暂无日志');
setExcuting(log && !log.includes('执行结束'));
- if (log && !log.includes('执行结束')) {
+ if (
+ log &&
+ !log.includes('执行结束') &&
+ !log.includes('重启面板完成')
+ ) {
setTimeout(() => {
getCronLog();
}, 2000);
@@ -65,9 +69,9 @@ const CronLogModal = ({
const titleElement = () => {
return (
<>
- 日志-{cron && cron.name}{' '}
{excuting && }
{!excuting && }
+ 日志-{cron && cron.name}{' '}
>
);
};
diff --git a/src/utils/http.ts b/src/utils/http.ts
index eb1995bb..a2aa0024 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -3,7 +3,7 @@ import { notification } from 'antd';
import config from './config';
notification.config({
- duration: 2.5,
+ duration: 2,
});
const time = Date.now();