From a21e2693fa82db2804864fcab4601f584f24cffc Mon Sep 17 00:00:00 2001 From: haosicheng Date: Fri, 10 Oct 2025 10:10:07 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/gui-version-release.yml | 8 +++++--- config.py | 12 ++++++------ main.py | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/gui-version-release.yml b/.gitea/workflows/gui-version-release.yml index d2f3d10..6805686 100644 --- a/.gitea/workflows/gui-version-release.yml +++ b/.gitea/workflows/gui-version-release.yml @@ -2,7 +2,7 @@ name: GUI Version Release on: push: - branches: [ master ] + branches: [ master, develop ] # 临时添加 develop 用于测试 jobs: gui-version-release: @@ -145,9 +145,11 @@ jobs: $hasChanges = git diff --staged --quiet if ($LASTEXITCODE -ne 0) { + # 动态获取当前分支名 (用于测试使用) + $BRANCH = git rev-parse --abbrev-ref HEAD git commit -m "[skip ci] Update version to $VERSION" - git push origin master - Write-Host "Version changes committed and pushed" + git push origin $BRANCH + Write-Host "Version changes committed and pushed to $BRANCH" } else { Write-Host "No changes to commit" } diff --git a/config.py b/config.py index 861edca..d5ac301 100644 --- a/config.py +++ b/config.py @@ -9,13 +9,13 @@ import json # 用于将令牌保存为 JSON 格式 # 后端服务器配置 # BACKEND_HOST = "192.168.5.233" -BACKEND_HOST = "192.168.5.12" -# BACKEND_HOST = "shuidrop.com" +# BACKEND_HOST = "192.168.5.12" +BACKEND_HOST = "shuidrop.com" # BACKEND_HOST = "test.shuidrop.com" -BACKEND_PORT = "8000" -# BACKEND_PORT = "" -BACKEND_WS_URL = f"ws://{BACKEND_HOST}:{BACKEND_PORT}" -# BACKEND_WS_URL = f"wss://{BACKEND_HOST}" +# BACKEND_PORT = "8000" +BACKEND_PORT = "" +# BACKEND_WS_URL = f"ws://{BACKEND_HOST}:{BACKEND_PORT}" +BACKEND_WS_URL = f"wss://{BACKEND_HOST}" # WebSocket配置 WS_CONNECT_TIMEOUT = 16.0 diff --git a/main.py b/main.py index eceea62..a835321 100644 --- a/main.py +++ b/main.py @@ -48,7 +48,7 @@ class LoginWindow(QMainWindow): def initUI(self): # 设置窗口基本属性 - self.setWindowTitle('AI客服智能助手') + self.setWindowTitle(f'AI客服智能助手 v{config.APP_VERSION}') self.setGeometry(300, 300, 450, 300) # 进一步减小窗口尺寸 self.setMinimumSize(420, 280) # 设置更小的最小尺寸 self.setMaximumSize(500, 350) # 设置最大尺寸，保持紧凑