imports:
-
'org.python'
- •
_compat_pickle
+
_compat_pickle
•
_pickle
•
argparse
•
codecs
@@ -19712,6 +19711,7 @@ imports:
•
functools
•
io
•
itertools
+ •
org
•
pprint
•
re
•
struct
diff --git a/dist/main.exe b/dist/main.exe
index 37f3334..7ba2603 100644
Binary files a/dist/main.exe and b/dist/main.exe differ
diff --git a/main.py b/main.py
index bb8405e..b85d9c3 100644
--- a/main.py
+++ b/main.py
@@ -13,13 +13,20 @@ class NavicatPassword:
data = binascii.unhexlify(encrypted_str.lower())
cipher = AES.new(self.aes_key, AES.MODE_CBC, self.aes_iv)
decrypted = cipher.decrypt(data)
- # 处理可能的填充字符
- decrypted = decrypted.rstrip(b'\x00')
- # 尝试UTF-8解码，失败则使用latin1
- try:
- return decrypted.decode('utf-8')
- except UnicodeDecodeError:
- return decrypted.decode('latin1')
+ # 处理填充字符和不可打印字符
+ # 仅去除常见的填充字符
+ decrypted = decrypted.rstrip(b'\x00\x03\x04\x05')
+
+ # 直接尝试解码，不进行任何字符过滤
+ encodings = ['utf-8', 'latin1', 'cp1252', 'gbk', 'big5']
+ for encoding in encodings:
+ try:
+ # 直接返回解码结果，保留所有字符
+ return decrypted.decode(encoding)
+ except UnicodeDecodeError:
+ continue
+ # 最后尝试，替换无法解码的字符
+ return decrypted.decode('latin1', errors='replace')
except Exception as e:
raise ValueError(f"解密失败: {str(e)}")
@@ -27,6 +34,7 @@ class App:
def __init__(self, root):
self.root = root
self.root.title("Navicat密码解密工具")
+ self.result_window = None # 用于存储结果窗口
self.password = tk.StringVar()
self.create_widgets()
@@ -36,16 +44,21 @@ class App:
tk.Entry(self.root, textvariable=self.password, width=30).grid(row=0, column=1)
tk.Button(self.root, text="解密", command=self.decrypt_password).grid(row=1, column=1, pady=10)
-
+
def show_result(self, result):
- top = tk.Toplevel(self.root)
- top.title("解密结果")
+ # 如果结果窗口已经存在，则先销毁
+ if self.result_window is not None:
+ self.result_window.destroy()
+
+ self.result_window = tk.Toplevel(self.root)
+ self.result_window.title("解密结果")
- tk.Label(top, text="解密后的密码：").pack(padx=20, pady=5)
+ tk.Label(self.result_window, text="解密后的密码：").pack(padx=20, pady=5)
- # 使用支持更多字符的字体
- font = ('Courier New', 12)
- result_text = tk.Text(top, height=1, width=30, font=font)
+ # 使用更通用的字体，添加字体回退
+ font_family = ('Consolas', 'Courier New', 'Monaco', 'DejaVu Sans Mono')
+ font_size = 12
+ result_text = tk.Text(self.result_window, height=1, width=30, font=(font_family[0], font_size))
result_text.insert(tk.END, result)
result_text.config(state=tk.DISABLED)
result_text.pack(padx=20, pady=5)
@@ -54,7 +67,7 @@ class App:
self.root.clipboard_clear()
self.root.clipboard_append(result)
- tk.Button(top, text="复制密码", command=copy_to_clipboard).pack(pady=10)
+ tk.Button(self.result_window, text="复制密码", command=copy_to_clipboard).pack(pady=10)
def decrypt_password(self):
password = self.password.get().strip()