From 049c724303f958bdeef1842c5c2c4cbdf4b8be75 Mon Sep 17 00:00:00 2001 From: mazengfei <331023091@qq.com> Date: Tue, 8 Sep 2026 14:12:48 +0800 Subject: [PATCH] =?UTF-8?q?config(base):=20=E6=9B=B4=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=92=8C=E8=AE=BE=E5=A4=87ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将appBaseUrl从UAT环境切换到PROD生产环境 - 更新PROD_BASE_URL为正式平台API地址 - 更换SCALE设备的正式环境DEVICE_ID_2 - 移除测试设备ID注释,启用正式设备ID配置 --- app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt | 4 ++-- .../java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt b/app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt index 901b4e7..83a477d 100644 --- a/app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt +++ b/app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt @@ -8,14 +8,14 @@ package com.shuwei.dish.match.base enum class DeviceRole { MASTER, SLAVE } object GlobalData { - var appBaseUrl: String = UAT_BASE_URL + var appBaseUrl: String = PROD_BASE_URL /** * 具体业务 BaseUrl */ const val TEST_BASE_URL = "http://192.168.10.101:24801" const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8081" - const val PROD_BASE_URL = "https://api.dm.yixiong-tech.com:8443" + const val PROD_BASE_URL = "https://platform-api.uat.shuziweidao.com" /** * 设备id */ diff --git a/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt b/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt index 8c42655..16f57a2 100644 --- a/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt +++ b/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt @@ -6,7 +6,7 @@ package com.shuwei.dish.match.scale */ object ScaleDeviceConfig { - const val DEVICE_ID_2 = "0bd74d78-c221-3182-b5ee-55d86dd79283"//测试0bd74d78-c221-3182-b5ee-55d86dd79283 正式8fc2ab34-2137-3112-acca-f884ea8736d4 + const val DEVICE_ID_2 = "8fc2ab34-2137-3112-acca-f884ea8736d4"//测试0bd74d78-c221-3182-b5ee-55d86dd79283 正式8fc2ab34-2137-3112-acca-f884ea8736d4 const val DEVICE_ID_22 = "a46fa55c-113c-3511-bb1f-41e5eff77c4b" const val DEVICE_ID_18 = "1038da9f-c6eb-326e-a1d9-d6d3af978b22" const val DEVICE_ID_1 = "7cc0f6ea-f13d-3013-a867-fc998eb554ac"