From 407a5b77c3586fef44dc771e48f05c2354740795 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期二, 07 九月 2021 09:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/web/ApiController.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiController.java
index 002b2cc..cafa40c 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiController.java
@@ -5,15 +5,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
/**
- * 鍏煎LiveGBS鐨凙PI锛氱郴缁熸帴鍙�
+ * API鍏煎锛氱郴缁熸帴鍙�
*/
@Controller
@CrossOrigin
@@ -40,10 +38,10 @@
result.put("ServerTime","2020-09-02 17锛�11");
result.put("StartUpTime","2020-09-02 17锛�11");
result.put("Server","");
- result.put("SIPSerial", sipConfig.getSipId());
- result.put("SIPRealm", sipConfig.getSipDomain());
- result.put("SIPHost", sipConfig.getSipIp());
- result.put("SIPPort", sipConfig.getSipPort());
+ result.put("SIPSerial", sipConfig.getId());
+ result.put("SIPRealm", sipConfig.getDomain());
+ result.put("SIPHost", sipConfig.getIp());
+ result.put("SIPPort", sipConfig.getPort());
result.put("ChannelCount","1000");
result.put("VersionType","");
result.put("LogoMiniText","");
@@ -67,10 +65,10 @@
// result.put("ServerTime","2020-09-02 17锛�11");
// result.put("StartUpTime","2020-09-02 17锛�11");
// result.put("Server","");
-// result.put("SIPSerial", sipConfig.getSipId());
-// result.put("SIPRealm", sipConfig.getSipDomain());
-// result.put("SIPHost", sipConfig.getSipIp());
-// result.put("SIPPort", sipConfig.getSipPort());
+// result.put("SIPSerial", sipConfig.getId());
+// result.put("SIPRealm", sipConfig.getDomain());
+// result.put("SIPHost", sipConfig.getIp());
+// result.put("SIPPort", sipConfig.getPort());
// result.put("ChannelCount","1000");
// result.put("VersionType","");
// result.put("LogoMiniText","");
--
Gitblit v1.8.0