支持自动化条件导出；优化引导页面提示；支持快速添加账号

electron/main.ts

@@ -950,8 +950,17 @@ function closeSplash() {
 /**
  * 创建首次引导窗口
  */
-function createOnboardingWindow() {
+function createOnboardingWindow(mode: 'default' | 'add-account' = 'default') {
+  const onboardingHash = mode === 'add-account'
+    ? '/onboarding-window?mode=add-account'
+    : '/onboarding-window'
+
   if (onboardingWindow && !onboardingWindow.isDestroyed()) {
+    if (process.env.VITE_DEV_SERVER_URL) {
+      onboardingWindow.loadURL(`${process.env.VITE_DEV_SERVER_URL}#${onboardingHash}`)
+    } else {
+      onboardingWindow.loadFile(join(__dirname, '../dist/index.html'), { hash: onboardingHash })
+    }
     onboardingWindow.focus()
     return onboardingWindow
   }
@@ -987,9 +996,9 @@ function createOnboardingWindow() {
   })
 
   if (process.env.VITE_DEV_SERVER_URL) {
-    onboardingWindow.loadURL(`${process.env.VITE_DEV_SERVER_URL}#/onboarding-window`)
+    onboardingWindow.loadURL(`${process.env.VITE_DEV_SERVER_URL}#${onboardingHash}`)
   } else {
-    onboardingWindow.loadFile(join(__dirname, '../dist/index.html'), { hash: '/onboarding-window' })
+    onboardingWindow.loadFile(join(__dirname, '../dist/index.html'), { hash: onboardingHash })
   }
 
   onboardingWindow.on('closed', () => {
@@ -2260,6 +2269,39 @@ function registerIpcHandlers() {
         const defaultValue = key === 'lastSession' ? '' : {}
         cfg.set(key as any, defaultValue as any)
       }
+
+      try {
+        const dbPath = String(cfg.get('dbPath') || '').trim()
+        const automationMapRaw = cfg.get('exportAutomationTaskMap') as Record<string, unknown> | undefined
+        if (automationMapRaw && typeof automationMapRaw === 'object') {
+          const nextAutomationMap: Record<string, unknown> = { ...automationMapRaw }
+          let changed = false
+          for (const scopeKey of Object.keys(automationMapRaw)) {
+            const normalizedScopeKey = String(scopeKey || '').trim()
+            if (!normalizedScopeKey) continue
+            const separatorIndex = normalizedScopeKey.lastIndexOf('::')
+            const scopedDbPath = separatorIndex >= 0
+              ? normalizedScopeKey.slice(0, separatorIndex)
+              : ''
+            const scopedWxidRaw = separatorIndex >= 0
+              ? normalizedScopeKey.slice(separatorIndex + 2)
+              : normalizedScopeKey
+            const scopedWxid = normalizeAccountId(scopedWxidRaw)
+            const wxidMatched = wxidCandidates.includes(scopedWxidRaw) || scopedWxid === normalizedWxid
+            const dbPathMatched = !dbPath || !scopedDbPath || scopedDbPath === dbPath
+            if (!wxidMatched || !dbPathMatched) continue
+            delete nextAutomationMap[scopeKey]
+            changed = true
+          }
+          if (changed) {
+            cfg.set('exportAutomationTaskMap' as any, nextAutomationMap as any)
+          } else if (!Object.keys(automationMapRaw).length) {
+            cfg.set('exportAutomationTaskMap' as any, {} as any)
+          }
+        }
+      } catch (error) {
+        warnings.push(`清理自动化导出任务失败: ${String(error)}`)
+      }
     }
 
     if (clearCache) {
@@ -3019,12 +3061,13 @@ function registerIpcHandlers() {
   })
 
   // 重新打开首次引导窗口，并隐藏主窗口
-  ipcMain.handle('window:openOnboardingWindow', async () => {
+  ipcMain.handle('window:openOnboardingWindow', async (_, options?: { mode?: 'add-account' }) => {
     shouldShowMain = false
     if (mainWindow && !mainWindow.isDestroyed()) {
       mainWindow.hide()
     }
-    createOnboardingWindow()
+    const mode = options?.mode === 'add-account' ? 'add-account' : 'default'
+    createOnboardingWindow(mode)
     return true
   })
 

electron/preload.ts

@@ -110,7 +110,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
       ipcRenderer.invoke('window:respondCloseConfirm', action),
     openAgreementWindow: () => ipcRenderer.invoke('window:openAgreementWindow'),
     completeOnboarding: () => ipcRenderer.invoke('window:completeOnboarding'),
-    openOnboardingWindow: () => ipcRenderer.invoke('window:openOnboardingWindow'),
+    openOnboardingWindow: (options?: { mode?: 'add-account' }) => ipcRenderer.invoke('window:openOnboardingWindow', options),
     setTitleBarOverlay: (options: { symbolColor: string }) => ipcRenderer.send('window:setTitleBarOverlay', options),
     openVideoPlayerWindow: (videoPath: string, videoWidth?: number, videoHeight?: number) =>
       ipcRenderer.invoke('window:openVideoPlayerWindow', videoPath, videoWidth, videoHeight),

electron/services/config.ts

@@ -71,6 +71,7 @@ interface ConfigSchema {
   quoteLayout: 'quote-top' | 'quote-bottom'
   wordCloudExcludeWords: string[]
   exportWriteLayout: 'A' | 'B' | 'C'
+  exportAutomationTaskMap: Record<string, unknown>
 
   // AI 见解
   aiModelApiBaseUrl: string
@@ -185,6 +186,7 @@ export class ConfigService {
       quoteLayout: 'quote-top',
       wordCloudExcludeWords: [],
       exportWriteLayout: 'A',
+      exportAutomationTaskMap: {},
       aiModelApiBaseUrl: '',
       aiModelApiKey: '',
       aiModelApiModel: 'gpt-4o-mini',

electron/services/keyService.ts

@@ -9,7 +9,7 @@ import crypto from 'crypto'
 const execFileAsync = promisify(execFile)
 
 type DbKeyResult = { success: boolean; key?: string; error?: string; logs?: string[] }
-type ImageKeyResult = { success: boolean; xorKey?: number; aesKey?: string; error?: string }
+type ImageKeyResult = { success: boolean; xorKey?: number; aesKey?: string; verified?: boolean; error?: string }
 
 export class KeyService {
   private readonly isMac = process.platform === 'darwin'
@@ -814,7 +814,7 @@ export class KeyService {
           if (!this.verifyDerivedAesKey(aesKey, verifyCiphertext)) continue
           onProgress?.(`密钥获取成功 (wxid: ${candidateWxid}, code: ${code})`)
           console.log('[ImageKey] 校验命中: wxid=', candidateWxid, 'code=', code)
-          return { success: true, xorKey, aesKey }
+          return { success: true, xorKey, aesKey, verified: true }
         }
       }
       return { success: false, error: '缓存 code 与当前账号 wxid 未匹配，请确认账号目录后重试，或使用内存扫描' }
@@ -826,7 +826,7 @@ export class KeyService {
     const { xorKey, aesKey } = this.deriveImageKeys(fallbackCode, fallbackWxid)
     onProgress?.(`密钥获取成功 (wxid: ${fallbackWxid}, code: ${fallbackCode})`)
     console.log('[ImageKey] 回退计算: wxid=', fallbackWxid, 'code=', fallbackCode)
-    return { success: true, xorKey, aesKey }
+    return { success: true, xorKey, aesKey, verified: false }
   }
 
   // --- 内存扫描备选方案（融合 Dart+Python 优点）---

electron/services/keyServiceLinux.ts

@@ -3,6 +3,7 @@ import { join } from 'path'
 import { existsSync, readdirSync, statSync, readFileSync } from 'fs'
 import { execFile, exec, spawn } from 'child_process'
 import { promisify } from 'util'
+import crypto from 'crypto'
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
@@ -10,7 +11,7 @@ const execFileAsync = promisify(execFile)
 const execAsync = promisify(exec)
 
 type DbKeyResult = { success: boolean; key?: string; error?: string; logs?: string[] }
-type ImageKeyResult = { success: boolean; xorKey?: number; aesKey?: string; error?: string }
+type ImageKeyResult = { success: boolean; xorKey?: number; aesKey?: string; verified?: boolean; error?: string }
 
 export class KeyServiceLinux {
   private sudo: any
@@ -243,7 +244,14 @@ export class KeyServiceLinux {
       if (account && account.keys && account.keys.length > 0) {
         onProgress?.(`已找到匹配的图片密钥 (wxid: ${account.wxid})`);
         const keyObj = account.keys[0]
-        return { success: true, xorKey: keyObj.xorKey, aesKey: keyObj.aesKey }
+        const aesKey = String(keyObj.aesKey || '')
+        const verified = await this.verifyImageKeyByTemplate(accountPath, aesKey)
+        if (verified === true) {
+          onProgress?.('缓存密钥校验成功，已确认可用')
+        } else if (verified === false) {
+          onProgress?.('已从缓存计算密钥，但未通过本地模板校验')
+        }
+        return { success: true, xorKey: keyObj.xorKey, aesKey, verified: verified === true }
       }
       return { success: false, error: '未在缓存中找到匹配的图片密钥' }
     } catch (err: any) {
@@ -251,6 +259,35 @@ export class KeyServiceLinux {
     }
   }
 
+  private async verifyImageKeyByTemplate(accountPath: string | undefined, aesKey: string): Promise<boolean | null> {
+    const normalizedPath = String(accountPath || '').trim()
+    if (!normalizedPath || !aesKey || aesKey.length < 16 || !existsSync(normalizedPath)) return null
+    try {
+      const template = await this._findTemplateData(normalizedPath, 32)
+      if (!template.ciphertext) return null
+      return this.verifyDerivedAesKey(aesKey, template.ciphertext)
+    } catch {
+      return null
+    }
+  }
+
+  private verifyDerivedAesKey(aesKey: string, ciphertext: Buffer): boolean {
+    try {
+      if (!aesKey || aesKey.length < 16 || ciphertext.length !== 16) return false
+      const decipher = crypto.createDecipheriv('aes-128-ecb', Buffer.from(aesKey, 'ascii').subarray(0, 16), null)
+      decipher.setAutoPadding(false)
+      const dec = Buffer.concat([decipher.update(ciphertext), decipher.final()])
+      if (dec[0] === 0xFF && dec[1] === 0xD8 && dec[2] === 0xFF) return true
+      if (dec[0] === 0x89 && dec[1] === 0x50 && dec[2] === 0x4E && dec[3] === 0x47) return true
+      if (dec[0] === 0x52 && dec[1] === 0x49 && dec[2] === 0x46 && dec[3] === 0x46) return true
+      if (dec[0] === 0x77 && dec[1] === 0x78 && dec[2] === 0x67 && dec[3] === 0x66) return true
+      if (dec[0] === 0x47 && dec[1] === 0x49 && dec[2] === 0x46) return true
+      return false
+    } catch {
+      return false
+    }
+  }
+
   public async autoGetImageKeyByMemoryScan(
       accountPath: string,
       onProgress?: (msg: string) => void

electron/services/keyServiceMac.ts

@@ -7,7 +7,7 @@ import crypto from 'crypto'
 import { homedir } from 'os'
 
 type DbKeyResult = { success: boolean; key?: string; error?: string; logs?: string[] }
-type ImageKeyResult = { success: boolean; xorKey?: number; aesKey?: string; error?: string }
+type ImageKeyResult = { success: boolean; xorKey?: number; aesKey?: string; verified?: boolean; error?: string }
 const execFileAsync = promisify(execFile)
 
 export class KeyServiceMac {
@@ -647,7 +647,7 @@ export class KeyServiceMac {
               const { xorKey, aesKey } = this.deriveImageKeys(code, candidateWxid)
               if (!this.verifyDerivedAesKey(aesKey, template.ciphertext)) continue
               onStatus?.(`密钥获取成功 (wxid: ${candidateWxid}, code: ${code})`)
-              return { success: true, xorKey, aesKey }
+              return { success: true, xorKey, aesKey, verified: true }
             }
           }
         }
@@ -662,7 +662,7 @@ export class KeyServiceMac {
       const fallbackCode = codes[0]
       const { xorKey, aesKey } = this.deriveImageKeys(fallbackCode, fallbackWxid)
       onStatus?.(`密钥获取成功 (wxid: ${fallbackWxid}, code: ${fallbackCode})`)
-      return { success: true, xorKey, aesKey }
+      return { success: true, xorKey, aesKey, verified: false }
     } catch (e: any) {
       return { success: false, error: `自动获取图片密钥失败: ${e.message}` }
     }