From 49753566c3d1fd5ecee1158ca185b56b7b16ffdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A6=E5=90=9B?=
 <73606411+setube@users.noreply.github.com>
Date: Sat, 27 Dec 2025 01:37:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96webdav=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/WebDAVConfigDialog.vue           | 11 +++---
 src/services/webdavService.ts                 | 36 +++----------------
 src/stores/gameStore.ts                       |  6 ++--
 src/types/game.ts                             |  8 +++++
 src/views/SettingsView.vue                    | 16 ++-------
 5 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/src/components/settings/WebDAVConfigDialog.vue b/src/components/settings/WebDAVConfigDialog.vue
index a8af883..81629f1 100644
--- a/src/components/settings/WebDAVConfigDialog.vue
+++ b/src/components/settings/WebDAVConfigDialog.vue
@@ -81,6 +81,7 @@
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
 import { useI18n } from '@/composables/useI18n'
+import { useGameStore } from '@/stores/gameStore'
 import {
   Dialog,
   DialogContent,
@@ -95,13 +96,11 @@ import { Label } from '@/components/ui/label'
 import { Loader2 } from 'lucide-vue-next'
 import {
   type WebDAVConfig,
-  getWebDAVConfig,
-  saveWebDAVConfig,
-  clearWebDAVConfig,
   testWebDAVConnection
 } from '@/services/webdavService'
 
 const { t } = useI18n()
+const gameStore = useGameStore()
 
 const isOpen = defineModel<boolean>('open', { default: false })
 
@@ -130,7 +129,7 @@ const isConfigValid = computed(() => {
 // 加载已保存的配置
 watch(isOpen, (open) => {
   if (open) {
-    const saved = getWebDAVConfig()
+    const saved = gameStore.webdavConfig
     if (saved) {
       config.value = { ...saved }
       hasExistingConfig.value = true
@@ -163,14 +162,14 @@ const handleTest = async () => {
 }
 
 const handleSave = () => {
-  saveWebDAVConfig(config.value)
+  gameStore.webdavConfig = { ...config.value }
   hasExistingConfig.value = true
   emit('saved', config.value)
   isOpen.value = false
 }
 
 const handleClear = () => {
-  clearWebDAVConfig()
+  gameStore.webdavConfig = null
   hasExistingConfig.value = false
   config.value = {
     serverUrl: '',
diff --git a/src/services/webdavService.ts b/src/services/webdavService.ts
index 7e87fef..6e035ca 100644
--- a/src/services/webdavService.ts
+++ b/src/services/webdavService.ts
@@ -1,14 +1,13 @@
 /**
  * WebDAV 同步服务
  * 支持将存档上传到 WebDAV 服务器（如坚果云、Nextcloud、NAS等）
+ * 注意：WebDAV 配置存储在 gameStore.webdavConfig 中，与用户数据一起持久化
  */
 
-export interface WebDAVConfig {
-  serverUrl: string // WebDAV 服务器地址
-  username: string // 用户名
-  password: string // 密码或应用专用密码
-  basePath: string // 存档存放路径
-}
+import type { WebDAVConfig } from '@/types/game'
+
+// 重新导出类型以保持向后兼容
+export type { WebDAVConfig }
 
 export interface WebDAVFile {
   name: string
@@ -61,31 +60,6 @@ export interface WebDAVResult {
   files?: WebDAVFile[]
 }
 
-const STORAGE_KEY = 'ogame-webdav-config'
-
-// 获取保存的 WebDAV 配置
-export const getWebDAVConfig = (): WebDAVConfig | null => {
-  try {
-    const saved = localStorage.getItem(STORAGE_KEY)
-    if (saved) {
-      return JSON.parse(saved)
-    }
-  } catch (e) {
-    console.error('Failed to load WebDAV config:', e)
-  }
-  return null
-}
-
-// 保存 WebDAV 配置
-export const saveWebDAVConfig = (config: WebDAVConfig): void => {
-  localStorage.setItem(STORAGE_KEY, JSON.stringify(config))
-}
-
-// 清除 WebDAV 配置
-export const clearWebDAVConfig = (): void => {
-  localStorage.removeItem(STORAGE_KEY)
-}
-
 // 构建 Authorization header
 const buildAuthHeader = (config: WebDAVConfig): string => {
   const credentials = btoa(`${config.username}:${config.password}`)
diff --git a/src/stores/gameStore.ts b/src/stores/gameStore.ts
index d3081db..f410fa3 100644
--- a/src/stores/gameStore.ts
+++ b/src/stores/gameStore.ts
@@ -12,7 +12,8 @@ import type {
   IncomingFleetAlert,
   MissileAttack,
   AchievementStats,
-  AchievementProgress
+  AchievementProgress,
+  WebDAVConfig
 } from '@/types/game'
 import { TechnologyType, OfficerType } from '@/types/game'
 import { initializeAchievementStats, initializeAchievements } from '@/logic/achievementLogic'
@@ -61,7 +62,8 @@ export const useGameStore = defineStore('game', {
         research: true,
         unlock: true
       }
-    }
+    },
+    webdavConfig: null as WebDAVConfig | null
   }),
   actions: {
     async requestBrowserPermission(): Promise<boolean> {
diff --git a/src/types/game.ts b/src/types/game.ts
index 777e4cc..ab48d08 100644
--- a/src/types/game.ts
+++ b/src/types/game.ts
@@ -1226,3 +1226,11 @@ export interface QuestNotification {
   rewards?: QuestReward
   read?: boolean
 }
+
+// WebDAV 配置
+export interface WebDAVConfig {
+  serverUrl: string // WebDAV 服务器地址
+  username: string // 用户名
+  password: string // 密码或应用专用密码
+  basePath: string // 存档存放路径
+}
diff --git a/src/views/SettingsView.vue b/src/views/SettingsView.vue
index 13b66a3..e966a90 100644
--- a/src/views/SettingsView.vue
+++ b/src/views/SettingsView.vue
@@ -334,7 +334,7 @@
     <PrivacyDialog v-model:open="showPrivacyDialog" />
 
     <!-- WebDAV 配置对话框 -->
-    <WebDAVConfigDialog v-model:open="showWebDAVConfig" @saved="onWebDAVConfigSaved" />
+    <WebDAVConfigDialog v-model:open="showWebDAVConfig" />
 
     <!-- WebDAV 文件列表对话框 -->
     <WebDAVFileListDialog v-model:open="showWebDAVFiles" :config="webdavConfig" @select="handleWebDAVDownload" />
@@ -389,12 +389,7 @@
   import WebDAVConfigDialog from '@/components/settings/WebDAVConfigDialog.vue'
   import WebDAVFileListDialog from '@/components/settings/WebDAVFileListDialog.vue'
   import { useHints } from '@/composables/useHints'
-  import {
-    type WebDAVConfig,
-    getWebDAVConfig,
-    uploadToWebDAV,
-    downloadFromWebDAV
-  } from '@/services/webdavService'
+  import { uploadToWebDAV, downloadFromWebDAV } from '@/services/webdavService'
 
   const { t } = useI18n()
   const { hintsEnabled, setHintsEnabled, resetHints } = useHints()
@@ -415,7 +410,7 @@
   // WebDAV 相关状态
   const showWebDAVConfig = ref(false)
   const showWebDAVFiles = ref(false)
-  const webdavConfig = ref<WebDAVConfig | null>(getWebDAVConfig())
+  const webdavConfig = computed(() => gameStore.webdavConfig)
   const isWebDAVUploading = ref(false)
 
   // 确保通知设置存在
@@ -758,11 +753,6 @@
     gameStore.player.backgroundEnabled = val
   }
 
-  // WebDAV 配置保存回调
-  const onWebDAVConfigSaved = () => {
-    webdavConfig.value = getWebDAVConfig()
-  }
-
   // WebDAV 上传
   const handleWebDAVUpload = async () => {
     if (!webdavConfig.value) return