haosicheng/shuidrop_gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[patch] 解决乱码bug

Browse Source
This commit is contained in:
Gitea Actions Bot
2025-10-11 16:04:35 +08:00
parent 2dddcc9804
commit 2d05024e82
5 changed files with 207 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_production.py
View File

@@ -112,7 +112,6 @@ def main():
restore_logging() restore_logging()
print("\n" + "=" * 60) print("\n" + "=" * 60)
input("Press Enter to exit...")
if __name__ == "__main__": if __name__ == "__main__":
main() main()

2
config.py
View File

@@ -42,7 +42,7 @@ VERSION = "1.0"
WINDOW_TITLE = "AI回复连接入口-V1.0" WINDOW_TITLE = "AI回复连接入口-V1.0"
# 应用版本号（用于版本检查） # 应用版本号（用于版本检查）
APP_VERSION = "1.5.0" APP_VERSION = "1.5.1"
# 平台特定配置 # 平台特定配置
PLATFORMS = { PLATFORMS = {

124
quick_build.py
View File

@@ -12,44 +12,44 @@ from pathlib import Path
def clean_build(): def clean_build():
"""清理构建目录""" """清理构建目录"""
print("🧹 清理旧的构建文件...") print("Cleaning old build files...")
# 跳过进程结束步骤，避免影响当前脚本运行 # 跳过进程结束步骤，避免影响当前脚本运行
print("🔄 跳过进程结束步骤（避免脚本自终止）...") print("Skipping process termination step...")
# 等待少量时间确保文件句柄释放 # 等待少量时间确保文件句柄释放
import time import time
print("⏳ 等待文件句柄释放...") print("Waiting for file handles to release...")
time.sleep(0.5) time.sleep(0.5)
dirs_to_clean = ['dist', 'build'] dirs_to_clean = ['dist', 'build']
for dir_name in dirs_to_clean: for dir_name in dirs_to_clean:
print(f"🔍 检查目录: {dir_name}") print(f"Checking directory: {dir_name}")
if os.path.exists(dir_name): if os.path.exists(dir_name):
try: try:
print(f"🗑️ 正在删除: {dir_name}") print(f"Deleting: {dir_name}")
shutil.rmtree(dir_name) shutil.rmtree(dir_name)
print(f"✅ 已删除: {dir_name}") print(f"Deleted: {dir_name}")
except PermissionError as e: except PermissionError as e:
print(f"⚠️ {dir_name} 被占用，尝试强制删除... 错误: {e}") print(f"WARNING: {dir_name} is in use, attempting force delete... Error: {e}")
try: try:
subprocess.run(['rd', '/s', '/q', dir_name], subprocess.run(['rd', '/s', '/q', dir_name],
shell=True, check=True) shell=True, check=True)
print(f"✅ 强制删除成功: {dir_name}") print(f"Force delete successful: {dir_name}")
except Exception as e2: except Exception as e2:
print(f"❌ 无法删除 {dir_name}: {e2}") print(f"ERROR: Cannot delete {dir_name}: {e2}")
print("💡 请手动删除或运行 force_clean_dist.bat") print("TIP: Please delete manually or run force_clean_dist.bat")
except Exception as e: except Exception as e:
print(f"❌ 删除 {dir_name} 时出错: {e}") print(f"ERROR: Failed to delete {dir_name}: {e}")
else: else:
print(f"ℹ️ {dir_name} 不存在，跳过") print(f"INFO: {dir_name} does not exist, skipping")
print("✅ 清理阶段完成") print("Cleaning phase completed")
def build_with_command(): def build_with_command():
"""使用命令行参数直接打包""" """使用命令行参数直接打包"""
print("🚀 开始打包...") print("Starting build...")
cmd = [ cmd = [
'pyinstaller', 'pyinstaller',
@@ -95,8 +95,8 @@ def build_with_command():
result = subprocess.run(cmd, capture_output=True, text=True, encoding='utf-8') result = subprocess.run(cmd, capture_output=True, text=True, encoding='utf-8')
if result.returncode == 0: if result.returncode == 0:
print("✅ 打包成功!") print("Build successful!")
print("📁 打包结果: dist/MultiPlatformGUI/") print("Build result: dist/MultiPlatformGUI/")
# 验证输出目录（不需要重命名了） # 验证输出目录（不需要重命名了）
if os.path.exists('dist/MultiPlatformGUI/MultiPlatformGUI.exe'): if os.path.exists('dist/MultiPlatformGUI/MultiPlatformGUI.exe'):
@@ -110,18 +110,18 @@ def build_with_command():
os.remove(new_exe) os.remove(new_exe)
os.rename(old_exe, new_exe) os.rename(old_exe, new_exe)
print("✅ 主程序已重命名: MultiPlatformGUI.exe → main.exe") print("Main executable renamed: MultiPlatformGUI.exe -> main.exe")
exe_size = os.path.getsize(new_exe) / 1024 / 1024 exe_size = os.path.getsize(new_exe) / 1024 / 1024
print(f"✅ 主程序验证通过: main.exe ({exe_size:.1f} MB)") print(f"Main executable verified: main.exe ({exe_size:.1f} MB)")
except Exception as e: except Exception as e:
print(f"⚠️ 重命名主程序失败: {e}") print(f"WARNING: Failed to rename main executable: {e}")
elif os.path.exists('dist/MultiPlatformGUI/main.exe'): elif os.path.exists('dist/MultiPlatformGUI/main.exe'):
# 如果已经是 main.exe，直接验证 # 如果已经是 main.exe，直接验证
exe_size = os.path.getsize('dist/MultiPlatformGUI/main.exe') / 1024 / 1024 exe_size = os.path.getsize('dist/MultiPlatformGUI/main.exe') / 1024 / 1024
print(f"✅ 主程序验证通过: main.exe ({exe_size:.1f} MB)") print(f"Main executable verified: main.exe ({exe_size:.1f} MB)")
else: else:
print("⚠️ 未找到主程序文件") print("WARNING: Main executable file not found")
# 创建使用说明 # 创建使用说明
try: try:
@@ -131,14 +131,14 @@ def build_with_command():
return True return True
else: else:
print("❌ 打包失败") print("ERROR: Build failed")
if result.stderr: if result.stderr:
print("错误信息:") print("Error messages:")
print(result.stderr) print(result.stderr)
return False return False
except Exception as e: except Exception as e:
print(f"❌ 打包过程出错: {e}") print(f"ERROR: Build process error: {e}")
return False return False
@@ -197,9 +197,9 @@ MultiPlatformGUI/
try: try:
with open('dist/MultiPlatformGUI/使用说明.txt', 'w', encoding='utf-8') as f: with open('dist/MultiPlatformGUI/使用说明.txt', 'w', encoding='utf-8') as f:
f.write(guide_content) f.write(guide_content)
print("✅ 已生成使用说明文件") print("Usage guide file generated")
except: except:
print("⚠️ 使用说明生成失败") print("WARNING: Usage guide generation failed")
def create_usage_guide_fallback(): def create_usage_guide_fallback():
@@ -227,14 +227,14 @@ cd dist/main
try: try:
with open('dist/main/使用说明.txt', 'w', encoding='utf-8') as f: with open('dist/main/使用说明.txt', 'w', encoding='utf-8') as f:
f.write(guide_content) f.write(guide_content)
print("✅ 已生成使用说明文件 (备用路径)") print("Usage guide file generated (fallback path)")
except: except:
print("⚠️ 使用说明生成失败") print("WARNING: Usage guide generation failed")
def verify_result(): def verify_result():
"""验证打包结果""" """验证打包结果"""
print("\n🔍 验证打包结果...") print("\nVerifying build result...")
# 检查MultiPlatformGUI目录（统一输出目录） # 检查MultiPlatformGUI目录（统一输出目录）
target_dir = "dist/MultiPlatformGUI" target_dir = "dist/MultiPlatformGUI"
@@ -242,8 +242,8 @@ def verify_result():
if os.path.exists(target_dir): if os.path.exists(target_dir):
return _verify_directory(target_dir) return _verify_directory(target_dir)
else: else:
print("❌ 未找到打包输出目录: dist/MultiPlatformGUI") print("ERROR: Build output directory not found: dist/MultiPlatformGUI")
print("💡 请检查 PyInstaller 执行是否成功") print("TIP: Please check if PyInstaller executed successfully")
return False return False
def _verify_directory(base_dir): def _verify_directory(base_dir):
@@ -257,105 +257,105 @@ def _verify_directory(base_dir):
dll_path = f"{base_dir}/_internal/Utils/PythonNew32/SaiNiuApi.dll" dll_path = f"{base_dir}/_internal/Utils/PythonNew32/SaiNiuApi.dll"
static_dir = f"{base_dir}/_internal/static" static_dir = f"{base_dir}/_internal/static"
print(f"📁 验证目录: {base_dir}") print(f"Verifying directory: {base_dir}")
# 检查主程序 # 检查主程序
if os.path.exists(exe_path): if os.path.exists(exe_path):
size = os.path.getsize(exe_path) / 1024 / 1024 # MB size = os.path.getsize(exe_path) / 1024 / 1024 # MB
print(f"✅ 主程序: main.exe ({size:.1f} MB)") print(f"Main executable: main.exe ({size:.1f} MB)")
else: else:
print("❌ 主程序 main.exe 不存在") print("ERROR: Main executable main.exe does not exist")
return False return False
# 检查_internal目录 # 检查_internal目录
if os.path.exists(internal_dir): if os.path.exists(internal_dir):
file_count = len([f for f in os.listdir(internal_dir) if os.path.isfile(os.path.join(internal_dir, f))]) file_count = len([f for f in os.listdir(internal_dir) if os.path.isfile(os.path.join(internal_dir, f))])
dir_count = len([d for d in os.listdir(internal_dir) if os.path.isdir(os.path.join(internal_dir, d))]) dir_count = len([d for d in os.listdir(internal_dir) if os.path.isdir(os.path.join(internal_dir, d))])
print(f"✅ 依赖目录: _internal/ ({file_count} 个文件, {dir_count} 个子目录)") print(f"Dependencies directory: _internal/ ({file_count} files, {dir_count} subdirectories)")
else: else:
print("❌ _internal 目录不存在") print("ERROR: _internal directory does not exist")
return False return False
# 检查关键DLL（可选） # 检查关键DLL（可选）
if os.path.exists(dll_path): if os.path.exists(dll_path):
dll_size = os.path.getsize(dll_path) / 1024 # KB dll_size = os.path.getsize(dll_path) / 1024 # KB
print(f"✅ 千牛DLL: SaiNiuApi.dll ({dll_size:.1f} KB)") print(f"QianNiu DLL: SaiNiuApi.dll ({dll_size:.1f} KB)")
else: else:
print("⚠️ 千牛DLL不存在（可能正常）") print("WARNING: QianNiu DLL does not exist (may be normal)")
# 检查静态资源 # 检查静态资源
if os.path.exists(static_dir): if os.path.exists(static_dir):
icon_files = list(Path(static_dir).glob("*.png")) icon_files = list(Path(static_dir).glob("*.png"))
print(f"✅ 静态资源: static/ ({len(icon_files)} 个图标文件)") print(f"Static resources: static/ ({len(icon_files)} icon files)")
else: else:
print("⚠️ static 目录不存在") print("WARNING: static directory does not exist")
print(f"✅ 目录 {base_dir} 验证通过") print(f"Directory {base_dir} verification passed")
return True return True
def main(): def main():
"""主函数""" """主函数"""
print("🔥 多平台客服GUI快速打包工具") print("Multi-Platform Customer Service GUI Quick Build Tool")
print("=" * 60) print("=" * 60)
try: try:
# 检查依赖 # 检查依赖
print("🔍 检查打包依赖...") print("Checking build dependencies...")
try: try:
import subprocess import subprocess
result = subprocess.run(['pyinstaller', '--version'], result = subprocess.run(['pyinstaller', '--version'],
capture_output=True, text=True, check=False) capture_output=True, text=True, check=False)
if result.returncode == 0: if result.returncode == 0:
print(f"✅ PyInstaller 版本: {result.stdout.strip()}") print(f"PyInstaller version: {result.stdout.strip()}")
else: else:
print("❌ PyInstaller 未安装或不可用") print("ERROR: PyInstaller not installed or unavailable")
print("💡 请运行: pip install pyinstaller") print("TIP: Run: pip install pyinstaller")
return False return False
except Exception as e: except Exception as e:
print(f"❌ 检查PyInstaller时出错: {e}") print(f"ERROR: Failed to check PyInstaller: {e}")
return False return False
# 清理 # 清理
print("\n📍 开始清理阶段...") print("\nCleaning phase started...")
clean_build() clean_build()
print("📍 清理阶段完成") print("Cleaning phase completed")
# 打包 # 打包
print("\n📍 开始打包阶段...") print("\nBuild phase started...")
if not build_with_command(): if not build_with_command():
print("❌ 打包阶段失败") print("ERROR: Build phase failed")
return False return False
print("📍 打包阶段完成") print("Build phase completed")
# 验证 # 验证
print("\n📍 开始验证阶段...") print("\nVerification phase started...")
if not verify_result(): if not verify_result():
print("❌ 验证阶段失败") print("ERROR: Verification phase failed")
return False return False
print("📍 验证阶段完成") print("Verification phase completed")
print("\n" + "=" * 60) print("\n" + "=" * 60)
print("🎉 打包完成！") print("Build completed successfully!")
# 显示打包结果 # 显示打包结果
if os.path.exists("dist/MultiPlatformGUI"): if os.path.exists("dist/MultiPlatformGUI"):
print("📁 打包结果: dist/MultiPlatformGUI/") print("Build result: dist/MultiPlatformGUI/")
print("🚀 运行方式: cd dist/MultiPlatformGUI && .\\main.exe") print("Run command: cd dist/MultiPlatformGUI && .\\main.exe")
print("📦 安装包构建: python installer/build_installer.py") print("Create installer: python installer/build_installer.py")
print("=" * 60) print("=" * 60)
return True return True
except Exception as e: except Exception as e:
print(f"❌ 打包失败: {e}") print(f"ERROR: Build failed: {e}")
return False return False
if __name__ == "__main__": if __name__ == "__main__":
success = main() success = main()
if success: if success:
print("\n✅ 可以开始测试了！") print("\nReady for testing!")
else: else:
print("\n❌ 请检查错误信息并重试") print("\nERROR: Please check error messages and retry")

16
version_history.json
View File

@@ -1,4 +1,20 @@
[ [
{
"version": "1.5.1",
"update_type": "patch",
"content": "[patch] 添加develop用于测试",
"author": "Gitea Actions Bot",
"commit_hash": "2dddcc9804ad4a6966439f2139110ab639ca1452",
"commit_short_hash": "2dddcc98",
"branch": "develop",
"release_time": "2025-10-11 15:56:40",
"download_url": "https://ks3-cn-guangzhou.ksyuncs.com/shuidrop-chat-server/installers/ShuiDi_AI_Assistant_Setup_v1.5.1.exe",
"stats": {
"files_changed": 1,
"lines_added": 1,
"lines_deleted": 1
}
},
{ {
"version": "1.5.0", "version": "1.5.0",
"update_type": "minor", "update_type": "minor",