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 = {}) { {isManualStartPrompt ? (
-

未能自动启动微信,请手动启动并登录后点击下方确认

+

未能自动启动微信,请手动启动微信,看到登录窗口后点击下方确认

) : ( 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) {
{isManualStartPrompt ? (
-

未能自动启动微信,请手动启动并登录

+

未能自动启动微信,请手动启动微信,看到登录窗口后点击下方确认

) : (