diff --git a/web/admin/src/views/system/settings/GeneralTab.vue b/web/admin/src/views/system/settings/GeneralTab.vue
index 1acc26c..e98b767 100644
--- a/web/admin/src/views/system/settings/GeneralTab.vue
+++ b/web/admin/src/views/system/settings/GeneralTab.vue
@@ -1,6 +1,15 @@
 <script setup lang="ts">
 import { useFormValues } from './useSettings'
 const values = useFormValues()
+
+// 关闭维护模式时自动清空提示信息和时长
+function handleMaintenanceModeChange(enabled: boolean) {
+	values['maintenance_mode'] = enabled
+	if (!enabled) {
+		values['maintenance_message'] = ''
+		values['maintenance_duration'] = ''
+	}
+}
 </script>
 
 <template>
@@ -73,7 +82,7 @@ const values = useFormValues()
 				<span class="switch-desc">开启后控制台显示维护提示</span>
 				<ASwitch
 					:model-value="!!values['maintenance_mode']"
-					@change="(v: string | number | boolean) => values['maintenance_mode'] = v"
+					@change="handleMaintenanceModeChange"
 				/>
 			</div>
 			<div class="section-grid" style="margin-top: 12px">
diff --git a/web/tenant/src/components/common/MaintenanceBanner.vue b/web/tenant/src/components/common/MaintenanceBanner.vue
index e2deb9d..9732111 100644
--- a/web/tenant/src/components/common/MaintenanceBanner.vue
+++ b/web/tenant/src/components/common/MaintenanceBanner.vue
@@ -9,7 +9,8 @@ let timer: ReturnType<typeof setInterval> | null = null
 
 onMounted(async () => {
 	await fetchSettings()
-	timer = setInterval(() => fetchSettings(), 30 * 60 * 1000)
+	// 每 60 秒强制刷新一次维护状态（绕过缓存）
+	timer = setInterval(() => fetchSettings(true), 60 * 1000)
 })
 
 onBeforeUnmount(() => {
diff --git a/web/tenant/src/composables/usePublicSettings.ts b/web/tenant/src/composables/usePublicSettings.ts
index 908bd35..e8cda84 100644
--- a/web/tenant/src/composables/usePublicSettings.ts
+++ b/web/tenant/src/composables/usePublicSettings.ts
@@ -30,7 +30,7 @@ const settings = ref<PublicSettings>({
 
 let fetchPromise: Promise<void> | null = null
 let lastFetchTime = 0
-const CACHE_TTL = 60_000
+const CACHE_TTL = 30_000 // 30秒缓存，维护模式变更时更快响应
 
 export function usePublicSettings() {
 	async function fetchSettings(force = false): Promise<void> {