hicccc77/WeFlow
1
0
Fork 0
mirror of https://github.com/hicccc77/WeFlow.git synced 2026-04-12 07:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

适配更多wechat路径，优化拉起失败提示

Browse Source
This commit is contained in:
H3CoF6
2026-04-12 13:27:18 +08:00
parent 48ca54a856
commit f4d63d01bd
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electron/services/keyServiceLinux.ts
View File

@@ -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 }
}

12
src/pages/SettingsPage.tsx
View File

@@ -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>
) : (

12
src/pages/WelcomePage.tsx
View File

@@ -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>
) : (