From 77bf85342b9d5a7954c85f05a54e6a46d41f0bf6 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期四, 02 九月 2021 15:10:47 +0800
Subject: [PATCH] 更新docker,更新readme
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index 4b7adc6..3bfa595 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -1,7 +1,11 @@
package com.genersoft.iot.vmp.vmanager.server;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.VManageBootstrap;
import com.genersoft.iot.vmp.common.VersionPo;
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
@@ -9,9 +13,13 @@
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import gov.nist.javax.sip.SipStackImpl;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.sip.ListeningPoint;
@@ -35,6 +43,15 @@
@Autowired
VersionInfo versionInfo;
+
+ @Autowired
+ SipConfig sipConfig;
+
+ @Autowired
+ UserSetup userSetup;
+
+ @Value("${server.port}")
+ private int serverPort;
@ApiOperation("娴佸獟浣撴湇鍔″垪琛�")
@@ -113,4 +130,34 @@
result.setData(versionInfo.getVersion());
return result;
}
+
+ @ApiOperation("閰嶇疆淇℃伅")
+ @GetMapping(value = "/config")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name="type", value = "閰嶇疆绫诲瀷锛坰ip, base锛�", dataTypeClass = String.class),
+ })
+ @ResponseBody
+ public WVPResult<JSONObject> getVersion(String type){
+ WVPResult<JSONObject> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("server.port", serverPort);
+ if (StringUtils.isEmpty(type)) {
+ jsonObject.put("sip", JSON.toJSON(sipConfig));
+ jsonObject.put("base", JSON.toJSON(userSetup));
+ }else {
+ switch (type){
+ case "sip":
+ jsonObject.put("sip", sipConfig);
+ break;
+ case "base":
+ jsonObject.put("base", userSetup);
+ break;
+ }
+ }
+ result.setData(jsonObject);
+ return result;
+ }
}
--
Gitblit v1.8.0