hicccc77/WeFlow
1
0
Fork 0
mirror of https://github.com/hicccc77/WeFlow.git synced 2026-03-28 15:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: 修复 Linux 下内存扫描找不到微信进程的问题\n\n增加 pidof/pgrep/ps aux 三重兜底逻辑，兼容不同发行版\n（flatpak、AppImage、wechat-bin 等安装方式），解决 #575"

Browse Source 
This reverts commit 3fb09bad0d.
This commit is contained in:
hicccc77
2026-03-28 19:28:45 +08:00
parent 3fb09bad0d
commit bd70a7bfa8
1 changed files with 5 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
electron/services/keyServiceLinux.ts
View File

@@ -256,45 +256,11 @@ export class KeyServiceLinux {
onProgress?.(`XOR 密钥: 0x${xorKey.toString(16).padStart(2, '0')}，正在查找微信进程...`) onProgress?.(`XOR 密钥: 0x${xorKey.toString(16).padStart(2, '0')}，正在查找微信进程...`)
// 2. 找微信 PID（多种方式兜底，兼容不同发行版/安装方式） // 2. 找微信 PID
const envWithPath = { const { stdout } = await execAsync('pidof wechat wechat-bin xwechat').catch(() => ({ stdout: '' }))
...process.env, const pids = stdout.trim().split(/\s+/).filter(p => p)
PATH: `${process.env.PATH || ''}:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin` if (pids.length === 0) return { success: false, error: '微信未运行，无法扫描内存' }
} const pid = parseInt(pids[0], 10)
let pid = 0
// 方式1: pidof
try {
const { stdout } = await execAsync('pidof wechat wechat-bin xwechat WeChat', { env: envWithPath })
const pids = stdout.trim().split(/\s+/).filter(p => p)
if (pids.length > 0) pid = parseInt(pids[0], 10)
} catch { /* 未找到进程，继续尝试 */ }
// 方式2: pgrep 兜底
if (!pid) {
try {
const { stdout } = await execAsync('pgrep -x -i "wechat|wechat-bin|xwechat"', { env: envWithPath })
const pids = stdout.trim().split(/\s+/).filter(p => p)
if (pids.length > 0) pid = parseInt(pids[0], 10)
} catch { /* 继续 */ }
}
// 方式3: ps aux 全名匹配（覆盖 flatpak / AppImage 等场景）
if (!pid) {
try {
const { stdout } = await execAsync('ps aux', { env: envWithPath })
for (const line of stdout.split('\n')) {
const lower = line.toLowerCase()
if (lower.includes('wechat') && !lower.includes('grep')) {
const parts = line.trim().split(/\s+/)
const candidate = parseInt(parts[1], 10)
if (!isNaN(candidate)) { pid = candidate; break }
}
}
} catch { /* 继续 */ }
}
if (!pid) return { success: false, error: '微信未运行，无法扫描内存（已尝试 pidof/pgrep/ps，均未找到微信进程）' }
onProgress?.(`已找到微信进程 PID=${pid}，正在提权扫描进程内存...`); onProgress?.(`已找到微信进程 PID=${pid}，正在提权扫描进程内存...`);