取出错误配置

64850858

2021-06-07 df11956c3c203434d3ef54955a502c466f1382dd

 src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java

@@ -1,9 +1,13 @@
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 com.genersoft.iot.vmp.vmanager.gbStream.bean.GbStreamParam;
import gov.nist.javax.sip.SipStackImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.web.bind.annotation.*;
@@ -11,8 +15,11 @@
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
@RequestMapping("/api/server")
@@ -21,8 +28,23 @@
    @Autowired
    private ConfigurableApplicationContext context;

    @Autowired
    private IRedisCatchStorage redisCatchStorage;

    @RequestMapping(value = "/restart")

    @ApiOperation("流媒体服务列表")
    @GetMapping(value = "/media_server/list")
    @ResponseBody
    public Object getMediaServerList(){
        // TODO 为后续多个zlm支持准备
        ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
        ArrayList<ZLMServerConfig> result = new ArrayList<>();
        result.add(mediaInfo);
        return result;
    }

    @ApiOperation("重启服务")
    @GetMapping(value = "/restart")
    @ResponseBody
    public Object restart(){
        Thread restartThread = new Thread(new Runnable() {