mirror of
https://github.com/hicccc77/WeFlow.git
synced 2026-04-12 07:25:50 +00:00
适配更多wechat路径,优化拉起失败提示
This commit is contained in:
@@ -98,7 +98,12 @@ export class KeyServiceLinux {
|
|||||||
'xwechat',
|
'xwechat',
|
||||||
'/opt/wechat/wechat',
|
'/opt/wechat/wechat',
|
||||||
'/usr/bin/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) {
|
for (const binName of wechatBins) {
|
||||||
@@ -152,7 +157,7 @@ export class KeyServiceLinux {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!pid) {
|
if (!pid) {
|
||||||
const err = '未能自动启动微信,或获取PID失败,请查看控制台日志或手动启动并登录。'
|
const err = '未能自动启动微信,或获取PID失败,请查看控制台日志或手动启动微信,看到登录窗口后点击确认。'
|
||||||
onStatus?.(err, 2)
|
onStatus?.(err, 2)
|
||||||
return { success: false, error: err }
|
return { success: false, error: err }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1222,7 +1222,13 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
|
|||||||
const keysOverride = buildKeysFromInputs({ decryptKey: result.key })
|
const keysOverride = buildKeysFromInputs({ decryptKey: result.key })
|
||||||
await handleScanWxid(true, { preferCurrentKeys: true, showDialog: false, keysOverride })
|
await handleScanWxid(true, { preferCurrentKeys: true, showDialog: false, keysOverride })
|
||||||
} else {
|
} 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)
|
setIsManualStartPrompt(true)
|
||||||
setDbKeyStatus('需要手动启动微信')
|
setDbKeyStatus('需要手动启动微信')
|
||||||
} else {
|
} else {
|
||||||
@@ -2146,9 +2152,9 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
|
|||||||
</div>
|
</div>
|
||||||
{isManualStartPrompt ? (
|
{isManualStartPrompt ? (
|
||||||
<div className="manual-prompt">
|
<div className="manual-prompt">
|
||||||
<p className="prompt-text">未能自动启动微信,请手动启动并登录后点击下方确认</p>
|
<p className="prompt-text">未能自动启动微信,请手动启动微信,看到登录窗口后点击下方确认</p>
|
||||||
<button className="btn btn-primary btn-sm" onClick={handleManualConfirm}>
|
<button className="btn btn-primary btn-sm" onClick={handleManualConfirm}>
|
||||||
我已启动微信,继续检测
|
我已看到登录窗口,继续检测
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
@@ -368,7 +368,13 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
|
|||||||
setError('')
|
setError('')
|
||||||
await handleScanWxid(true)
|
await handleScanWxid(true)
|
||||||
} else {
|
} 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)
|
setIsManualStartPrompt(true)
|
||||||
setDbKeyStatus('需要手动启动微信')
|
setDbKeyStatus('需要手动启动微信')
|
||||||
} else {
|
} else {
|
||||||
@@ -844,9 +850,9 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
|
|||||||
<div className="key-actions">
|
<div className="key-actions">
|
||||||
{isManualStartPrompt ? (
|
{isManualStartPrompt ? (
|
||||||
<div className="manual-prompt">
|
<div className="manual-prompt">
|
||||||
<p>未能自动启动微信,请手动启动并登录</p>
|
<p>未能自动启动微信,请手动启动微信,看到登录窗口后点击下方确认</p>
|
||||||
<button className="btn btn-primary" onClick={handleManualConfirm}>
|
<button className="btn btn-primary" onClick={handleManualConfirm}>
|
||||||
我已登录,继续
|
我已看到登录窗口,继续
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
Reference in New Issue
Block a user