From f4d63d01bd79a07328d741b55d384d08098b3ae0 Mon Sep 17 00:00:00 2001
From: H3CoF6 <1707889225@qq.com>
Date: Sun, 12 Apr 2026 13:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9B=B4=E5=A4=9Awechat?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/services/keyServiceLinux.ts |  9 +++++++--
 src/pages/SettingsPage.tsx           | 12 +++++++++---
 src/pages/WelcomePage.tsx            | 12 +++++++++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/electron/services/keyServiceLinux.ts b/electron/services/keyServiceLinux.ts
index 85d5a36..0e94d6c 100644
--- a/electron/services/keyServiceLinux.ts
+++ b/electron/services/keyServiceLinux.ts
@@ -98,7 +98,12 @@ export class KeyServiceLinux {
         'xwechat',
         '/opt/wechat/wechat',
         '/usr/bin/wechat',
-        '/opt/apps/com.tencent.wechat/files/wechat'
+        '/usr/local/bin/wechat',
+        '/usr/bin/wechat',
+        '/opt/apps/com.tencent.wechat/files/wechat',
+        '/usr/bin/wechat-bin',
+        '/usr/local/bin/wechat-bin',
+        'com.tencent.wechat'
       ]
 
       for (const binName of wechatBins) {
@@ -152,7 +157,7 @@ export class KeyServiceLinux {
       }
 
       if (!pid) {
-        const err = '未能自动启动微信，或获取PID失败，请查看控制台日志或手动启动并登录。'
+        const err = '未能自动启动微信，或获取PID失败，请查看控制台日志或手动启动微信，看到登录窗口后点击确认。'
         onStatus?.(err, 2)
         return { success: false, error: err }
       }
diff --git a/src/pages/SettingsPage.tsx b/src/pages/SettingsPage.tsx
index 770d0f8..48f0ae2 100644
--- a/src/pages/SettingsPage.tsx
+++ b/src/pages/SettingsPage.tsx
@@ -1222,7 +1222,13 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
         const keysOverride = buildKeysFromInputs({ decryptKey: result.key })
         await handleScanWxid(true, { preferCurrentKeys: true, showDialog: false, keysOverride })
       } else {
-        if (result.error?.includes('未找到微信安装路径') || result.error?.includes('启动微信失败')) {
+        if (
+          result.error?.includes('未找到微信安装路径') ||
+          result.error?.includes('启动微信失败') ||
+          result.error?.includes('未能自动启动微信') ||
+          result.error?.includes('未找到微信进程') ||
+          result.error?.includes('微信进程未运行')
+        ) {
           setIsManualStartPrompt(true)
           setDbKeyStatus('需要手动启动微信')
         } else {
@@ -2146,9 +2152,9 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
         </div>
         {isManualStartPrompt ? (
           <div className="manual-prompt">
-            <p className="prompt-text">未能自动启动微信，请手动启动并登录后点击下方确认</p>
+            <p className="prompt-text">未能自动启动微信，请手动启动微信，看到登录窗口后点击下方确认</p>
             <button className="btn btn-primary btn-sm" onClick={handleManualConfirm}>
-              我已启动微信，继续检测
+              我已看到登录窗口，继续检测
             </button>
           </div>
         ) : (
diff --git a/src/pages/WelcomePage.tsx b/src/pages/WelcomePage.tsx
index 2f4bab7..4e83843 100644
--- a/src/pages/WelcomePage.tsx
+++ b/src/pages/WelcomePage.tsx
@@ -368,7 +368,13 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
         setError('')
         await handleScanWxid(true)
       } else {
-        if (result.error?.includes('未找到微信安装路径') || result.error?.includes('启动微信失败')) {
+        if (
+          result.error?.includes('未找到微信安装路径') ||
+          result.error?.includes('启动微信失败') ||
+          result.error?.includes('未能自动启动微信') ||
+          result.error?.includes('未找到微信进程') ||
+          result.error?.includes('微信进程未运行')
+        ) {
           setIsManualStartPrompt(true)
           setDbKeyStatus('需要手动启动微信')
         } else {
@@ -844,9 +850,9 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
                 <div className="key-actions">
                   {isManualStartPrompt ? (
                     <div className="manual-prompt">
-                      <p>未能自动启动微信，请手动启动并登录</p>
+                      <p>未能自动启动微信，请手动启动微信，看到登录窗口后点击下方确认</p>
                       <button className="btn btn-primary" onClick={handleManualConfirm}>
-                        我已登录，继续
+                        我已看到登录窗口，继续
                       </button>
                     </div>
                   ) : (