From df11956c3c203434d3ef54955a502c466f1382dd Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 07 六月 2021 15:42:01 +0800
Subject: [PATCH] 取出错误配置
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 84d246f..6c8ba2b 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,6 +1,9 @@
package com.genersoft.iot.vmp.vmanager.server;
import com.genersoft.iot.vmp.VManageBootstrap;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.impl.RedisCatchStorageImpl;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
import gov.nist.javax.sip.SipStackImpl;
import io.swagger.annotations.Api;
@@ -12,8 +15,10 @@
import javax.sip.ListeningPoint;
import javax.sip.ObjectInUseException;
import javax.sip.SipProvider;
+import java.util.ArrayList;
import java.util.Iterator;
+@SuppressWarnings("rawtypes")
@Api(tags = "鏈嶅姟鎺у埗")
@CrossOrigin
@RestController
@@ -23,9 +28,23 @@
@Autowired
private ConfigurableApplicationContext context;
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+
+ @ApiOperation("娴佸獟浣撴湇鍔″垪琛�")
+ @GetMapping(value = "/media_server/list")
+ @ResponseBody
+ public Object getMediaServerList(){
+ // TODO 涓哄悗缁涓獄lm鏀寔鍑嗗
+ ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+ ArrayList<ZLMServerConfig> result = new ArrayList<>();
+ result.add(mediaInfo);
+ return result;
+ }
@ApiOperation("閲嶅惎鏈嶅姟")
- @RequestMapping(value = "/restart")
+ @GetMapping(value = "/restart")
@ResponseBody
public Object restart(){
Thread restartThread = new Thread(new Runnable() {
--
Gitblit v1.8.0