From c88681c7ad06391fa8cce0b910f45cf4f479889d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 八月 2024 10:41:54 +0800
Subject: [PATCH] 合并分支
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
index 97803f9..debc3b2 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
@@ -89,7 +89,7 @@
@GetMapping("/server_config")
public JSONObject serverConfig() {
JSONObject result = new JSONObject();
- result.put("deviceIp", sipConfig.getIp());
+ result.put("deviceIp", sipConfig.getShowIp());
result.put("devicePort", sipConfig.getPort());
result.put("username", sipConfig.getId());
result.put("password", sipConfig.getPassword());
--
Gitblit v1.8.0