feat: 切换正式管理端默认地址 (#148)

client/src/current_client_service.py

@@ -6,12 +6,29 @@ import uuid
 from dataclasses import dataclass
 from typing import Callable, Optional
 
+from .http_admin_gateway import DEFAULT_ADMIN_BASE_URL
 from .settings_repository import SettingsRepository
 
 
 CLIENT_ID_KEY = "admin.client_id"
 CLIENT_NAME_KEY = "admin.client_name"
 ADMIN_BASE_URL_KEY = "admin.base_url"
+LEGACY_ADMIN_BASE_URL = "http://127.0.0.1:8080"
+
+
+def load_admin_base_url(repository: SettingsRepository) -> str:
+    """读取管理端地址，并把空值或旧默认值迁移到当前默认地址。"""
+
+    saved_value = repository.get(ADMIN_BASE_URL_KEY)
+    normalized_value = (
+        saved_value.strip().rstrip("/")
+        if isinstance(saved_value, str)
+        else ""
+    )
+    if not normalized_value or normalized_value == LEGACY_ADMIN_BASE_URL:
+        repository.set(ADMIN_BASE_URL_KEY, DEFAULT_ADMIN_BASE_URL)
+        return DEFAULT_ADMIN_BASE_URL
+    return normalized_value
 
 
 def generate_client_device_id() -> str:

client/src/http_admin_gateway.py

@@ -22,7 +22,7 @@ from .admin_gateway import (
 from .task_models import TaskType
 
 
-DEFAULT_ADMIN_BASE_URL = "http://127.0.0.1:8080"
+DEFAULT_ADMIN_BASE_URL = "https://buy.833729.com"
 
 
 class HttpAdminGateway(AdminGateway):

client/src/pdd_ui_event.py

@@ -43,8 +43,8 @@ from .admin_gateway import (
     AdminGateway,
 )
 from .collect_task_service import CollectServiceFactory, CollectTaskService
-from .current_client_service import CurrentClientService
-from .http_admin_gateway import DEFAULT_ADMIN_BASE_URL, HttpAdminGateway
+from .current_client_service import CurrentClientService, load_admin_base_url
+from .http_admin_gateway import HttpAdminGateway
 from .pdd_ui import PDDTaskPage, TaskRow
 from .pdd_device_service import (
     PersistentPddDeviceService,
@@ -630,7 +630,7 @@ class PDDTaskPageEvent(QObject):
         self._owns_claim_gateway = claim_gateway is None
         self._claim_gateway_error = ""
         if self._claim_gateway is None:
-            base_url = settings.get("admin.base_url", DEFAULT_ADMIN_BASE_URL)
+            base_url = load_admin_base_url(settings)
             timeout_value = settings.get("admin.request_timeout_seconds", 3.0)
             try:
                 timeout_seconds = float(timeout_value)

client/src/settings_ui.py

@@ -244,7 +244,7 @@ class SettingsPage(QWidget):
         self.deviceNameInput.setAccessibleName("当前客户端设备名")
 
         self.adminBaseUrlInput = LineEdit(self)
-        self.adminBaseUrlInput.setPlaceholderText("http://127.0.0.1:8080")
+        self.adminBaseUrlInput.setPlaceholderText("https://buy.833729.com")
         self.adminBaseUrlInput.setClearButtonEnabled(True)
         self.adminBaseUrlInput.setAccessibleName("Admin 管理端地址")
 

client/src/settings_ui_event.py

@@ -30,11 +30,11 @@ from .admin_gateway import (
     ClientRegistrationGateway,
 )
 from .current_client_service import (
-    ADMIN_BASE_URL_KEY,
     CurrentClientService,
     generate_client_device_id,
+    load_admin_base_url,
 )
-from .http_admin_gateway import DEFAULT_ADMIN_BASE_URL, HttpAdminGateway
+from .http_admin_gateway import HttpAdminGateway
 from .selected_android_device_service import SelectedAndroidDeviceService
 from .settings_repository import SettingsRepository
 from .settings_ui import AndroidDeviceRow
@@ -381,7 +381,7 @@ class SettingsPageEventBinder(QObject):
         self._pending_admin_gateway = None
         self._gateway_error = ""
         if self._admin_gateway is None:
-            base_url = repository.get("admin.base_url", DEFAULT_ADMIN_BASE_URL)
+            base_url = load_admin_base_url(repository)
             timeout_value = repository.get("admin.request_timeout_seconds", 3.0)
             try:
                 timeout_seconds = float(timeout_value)
@@ -946,14 +946,8 @@ class SettingsPageEventBinder(QObject):
         """页面创建时恢复本地 Client 信息。"""
 
         try:
-            base_url = self._settings_repository.get(
-                ADMIN_BASE_URL_KEY,
-                DEFAULT_ADMIN_BASE_URL,
-            )
-            displayed_base_url = (
-                base_url.strip()
-                if isinstance(base_url, str) and base_url.strip()
-                else DEFAULT_ADMIN_BASE_URL
+            displayed_base_url = load_admin_base_url(
+                self._settings_repository
             )
             saved = self._client_service.load()
         except Exception as exc: