feat: 切换正式管理端默认地址 (#148)
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user