Skip to content

Commit a654529

Browse files
committed
Revert "fix(decrypt): 修复数据库原始密钥解密与设备绑定提示"
This reverts commit 7958e02.
1 parent 2467d51 commit a654529

5 files changed

Lines changed: 133 additions & 467 deletions

File tree

frontend/pages/decrypt.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@
7373
</svg>
7474
点击按钮将自动获取【数据库】与【图片】双重密钥。您也可以手动输入已知的64位密钥(使用<a href="https://github.com/ycccccccy/wx_key" target="_blank" class="text-[#07C160] hover:text-[#06AD56]">wx_key</a>等工具获取)。
7575
</p>
76-
<div class="mt-3 rounded-lg border border-amber-200 bg-amber-50 px-3 py-2 text-xs leading-5 text-amber-900">
77-
提示:数据库密钥跟随“账号 + 设备”下发。同一账号在另一台电脑生成的聊天记录,复制到当前设备后,通常无法在当前设备重新获取原设备对应的密钥,因此也无法直接解密。
78-
</div>
7976
</div>
8077

8178
<!-- 数据库路径输入 -->

src/wechat_decrypt_tool/routers/decrypt.py

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@
1414
from ..logging_config import get_logger
1515
from ..path_fix import PathFixRoute
1616
from ..key_store import upsert_account_keys_in_store
17-
from ..wechat_decrypt import (
18-
WeChatDatabaseDecryptor,
19-
build_decrypt_result_message,
20-
decrypt_wechat_databases,
21-
scan_account_databases_from_path,
22-
)
17+
from ..wechat_decrypt import WeChatDatabaseDecryptor, decrypt_wechat_databases, scan_account_databases_from_path
2318

2419
logger = get_logger(__name__)
2520

@@ -81,7 +76,6 @@ async def decrypt_databases(request: DecryptRequest):
8176
"message": results["message"],
8277
"processed_files": results["processed_files"],
8378
"failed_files": results["failed_files"],
84-
"failure_details": results.get("failure_details", []),
8579
"account_results": results.get("account_results", {}),
8680
}
8781

@@ -165,7 +159,6 @@ async def generate_progress():
165159
fail_count = 0
166160
processed_files: list[str] = []
167161
failed_files: list[str] = []
168-
failure_details: list[dict] = []
169162
account_results: dict = {}
170163
overall_current = 0
171164

@@ -188,7 +181,6 @@ async def generate_progress():
188181
account_success = 0
189182
account_processed: list[str] = []
190183
account_failed: list[str] = []
191-
account_failure_details: list[dict] = []
192184

193185
for db_info in dbs:
194186
if await request.is_disconnected():
@@ -240,20 +232,11 @@ async def generate_progress():
240232
status = "success"
241233
msg = "解密成功"
242234
else:
243-
failure_detail = {
244-
"account": account,
245-
"file": db_path,
246-
"name": db_name,
247-
"code": str(decryptor.last_error_code or "").strip(),
248-
"reason": str(decryptor.last_error_message or "").strip() or "解密失败",
249-
}
250235
account_failed.append(db_path)
251-
account_failure_details.append(failure_detail)
252236
failed_files.append(db_path)
253-
failure_details.append(failure_detail)
254237
fail_count += 1
255238
status = "fail"
256-
msg = failure_detail["reason"]
239+
msg = "解密失败"
257240

258241
yield _sse(
259242
{
@@ -278,7 +261,6 @@ async def generate_progress():
278261
"output_dir": str(account_output_dir),
279262
"processed_files": account_processed,
280263
"failed_files": account_failed,
281-
"failure_details": account_failure_details,
282264
}
283265

284266
# Build cache table (keep behavior consistent with the POST endpoint).
@@ -325,15 +307,9 @@ async def generate_progress():
325307
"success_count": success_count,
326308
"failure_count": total_databases - success_count,
327309
"output_directory": str(base_output_dir.absolute()),
328-
"message": build_decrypt_result_message(
329-
total_databases=total_databases,
330-
success_count=success_count,
331-
failed_count=total_databases - success_count,
332-
failure_details=failure_details,
333-
),
310+
"message": f"解密完成: 成功 {success_count}/{total_databases}",
334311
"processed_files": processed_files,
335312
"failed_files": failed_files,
336-
"failure_details": failure_details,
337313
"account_results": account_results,
338314
}
339315

0 commit comments

Comments
 (0)