restaurant/DishMatch
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: restaurant/DishMatch:acd1dd46051d5bc5d629f377952a0b9ecac1e409
Branches Tags
restaurant/DishMatch:main restaurant/DishMatch:dev_260316_新设备 restaurant/DishMatch:dev_新系统适配_0526_基于260316新设备 restaurant/DishMatch:dev_旧版配比秤260519基于main分支 restaurant/DishMatch:dev_260127_新版
..
compare: restaurant/DishMatch:45543295e3f41ba4e5c200e76c0d896eb939978f
Branches Tags
restaurant/DishMatch:dev_260316_新设备 restaurant/DishMatch:dev_新系统适配_0526_基于260316新设备 restaurant/DishMatch:dev_旧版配比秤260519基于main分支 restaurant/DishMatch:dev_260127_新版 restaurant/DishMatch:main
2 Commits
acd1dd4605 .. 45543295e3
Author SHA1 Message Date
mazengfei 45543295e3 Merge remote-tracking branch 'origin/dev_260316_新设备' into dev_260316_新设备 2026-09-08 14:13:05 +08:00
mazengfei 049c724303 config(base): 更新生产环境配置地址和设备ID 
- 将appBaseUrl从UAT环境切换到PROD生产环境
- 更新PROD_BASE_URL为正式平台API地址
- 更换SCALE设备的正式环境DEVICE_ID_2
- 移除测试设备ID注释，启用正式设备ID配置
 2026-09-08 14:12:48 +08:00
2 changed files with 2 additions and 2 deletions
Expand all files Collapse all files
app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt
+1 -1
View File
@@ -8,7 +8,7 @@ package com.shuwei.dish.match.base
enum class DeviceRole { MASTER, SLAVE } enum class DeviceRole { MASTER, SLAVE }
object GlobalData { object GlobalData {
var appBaseUrl: String = UAT_BASE_URL var appBaseUrl: String = PROD_BASE_URL
/** /**
* 具体业务 BaseUrl * 具体业务 BaseUrl
app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt
+1 -1
View File
@@ -6,7 +6,7 @@ package com.shuwei.dish.match.scale
*/ */
object ScaleDeviceConfig { 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_22 = "a46fa55c-113c-3511-bb1f-41e5eff77c4b"
const val DEVICE_ID_18 = "1038da9f-c6eb-326e-a1d9-d6d3af978b22" const val DEVICE_ID_18 = "1038da9f-c6eb-326e-a1d9-d6d3af978b22"
const val DEVICE_ID_1 = "7cc0f6ea-f13d-3013-a867-fc998eb554ac" const val DEVICE_ID_1 = "7cc0f6ea-f13d-3013-a867-fc998eb554ac"