From bc2e5e7a37876b597668db5d8c4af273deca3aea Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十二月 2020 14:55:22 +0800
Subject: [PATCH] Merge pull request #14 from lawrencehj/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
index 8af7cbf..a94685e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.vmanager.platform;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.PageResult;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
@@ -15,6 +16,8 @@
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import com.genersoft.iot.vmp.conf.SipConfig;
+
@CrossOrigin
@RestController
@@ -29,6 +32,19 @@
@Autowired
private ISIPCommanderForPlatform commanderForPlatform;
+ @Autowired
+ private SipConfig sipConfig;
+
+ @GetMapping("/platforms/serverconfig")
+ public ResponseEntity<JSONObject> serverConfig() {
+ JSONObject result = new JSONObject();
+ result.put("deviceIp", sipConfig.getSipIp());
+ result.put("devicePort", sipConfig.getSipPort());
+ result.put("username", sipConfig.getSipId());
+ result.put("password", sipConfig.getSipPassword());
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+
@GetMapping("/platforms/{count}/{page}")
public PageResult<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
--
Gitblit v1.8.0