From bb5ef9ccbf944cbf50270279e162812d3842906e Mon Sep 17 00:00:00 2001 From: haosicheng Date: Fri, 10 Oct 2025 10:53:16 +0800 Subject: [PATCH] =?UTF-8?q?[patch]=20=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=98=BE=E7=A4=BA=20=E4=B8=8E=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8F=90=E7=A4=BA=EF=BC=88=E4=BF=AE=E6=94=B9=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E4=BF=A1=E6=81=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/scripts/gui_version_creator.py | 9 ++++++--- main.py | 22 +++++++++++++++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.gitea/scripts/gui_version_creator.py b/.gitea/scripts/gui_version_creator.py index a31b52e..14769e0 100644 --- a/.gitea/scripts/gui_version_creator.py +++ b/.gitea/scripts/gui_version_creator.py @@ -167,7 +167,7 @@ class DatabaseVersionManager: try: cursor = self.conn.cursor() cursor.execute(""" - SELECT version FROM web_version_history + SELECT version FROM web_versionhistory WHERE type = '水滴智能通讯插件' AND is_delete = FALSE ORDER BY release_time DESC LIMIT 1 """) @@ -211,7 +211,7 @@ class DatabaseVersionManager: try: cursor = self.conn.cursor() cursor.execute(""" - SELECT version FROM web_version_history + SELECT version FROM web_versionhistory WHERE content LIKE %s AND type = '水滴智能通讯插件' ORDER BY release_time DESC LIMIT 1 """, (f'%{commit_id}%',)) @@ -241,7 +241,7 @@ class DatabaseVersionManager: cursor = self.conn.cursor() cursor.execute(""" - INSERT INTO web_version_history + INSERT INTO web_versionhistory (id, version, type, content, download_url, release_time, is_delete) VALUES (%s, %s, %s, %s, %s, %s, %s) """, ( @@ -258,6 +258,9 @@ class DatabaseVersionManager: cursor.close() logger.info(f"✅ 版本记录已保存到数据库 (ID: {record_id})") + logger.info(f" 📦 版本: {version_record['version']}") + logger.info(f" 🔗 下载地址: {version_record.get('download_url', '')}") + logger.info(f" 📝 内容: {version_record['content'][:50]}...") return True except Exception as e: diff --git a/main.py b/main.py index a835321..861d0de 100644 --- a/main.py +++ b/main.py @@ -725,20 +725,36 @@ class LoginWindow(QMainWindow): QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes ) - + if reply == QMessageBox.Yes: - self.trigger_update(download_url) + self.trigger_update(download_url, latest_version) except Exception as e: self.add_log(f"❌ 显示更新通知失败: {e}", "ERROR") + import traceback + self.add_log(f"详细错误: {traceback.format_exc()}", "ERROR") - def trigger_update(self, download_url): + def trigger_update(self, download_url, latest_version): """触发更新下载""" import webbrowser try: + # 检查下载地址是否有效 + if not download_url or download_url.strip() == "": + self.add_log("⚠️ 下载地址为空,无法打开更新页面", "WARNING") + QMessageBox.warning( + self, + "下载地址缺失", + f"版本 {latest_version} 的下载地址暂未配置。\n\n请联系管理员或稍后再试。", + QMessageBox.Ok + ) + return + + self.add_log(f"📂 打开下载页面: {download_url}", "INFO") webbrowser.open(download_url) self.add_log("✅ 已打开更新下载页面", "SUCCESS") except Exception as e: self.add_log(f"❌ 打开下载页面失败: {e}", "ERROR") + import traceback + self.add_log(f"详细错误: {traceback.format_exc()}", "ERROR") def main():