增加消息通道配置，可以通道redis在wvp上下级之间发送消息

648540858

2023-03-14 943f95ba8ce02f8088f2dfcfd83a60391a8a65a6

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

@@ -1,8 +1,7 @@
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.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.common.VersionPo;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -15,13 +14,10 @@
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.genersoft.iot.vmp.vmanager.bean.ResourceInfo;
import com.genersoft.iot.vmp.vmanager.bean.SystemConfigInfo;
import gov.nist.javax.sip.SipStackImpl;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,14 +27,12 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import javax.sip.ListeningPoint;
import javax.sip.ObjectInUseException;
import javax.sip.SipProvider;
import java.util.*;
import java.util.ArrayList;
import java.util.List;

@SuppressWarnings("rawtypes")
@Tag(name = "服务控制")
@CrossOrigin

@RestController
@RequestMapping("/api/server")
public class ServerController {
@@ -135,14 +129,8 @@
        MediaServerItem mediaServerItemInDatabase = mediaServerService.getOne(mediaServerItem.getId());

        if (mediaServerItemInDatabase != null) {
            if (ObjectUtils.isEmpty(mediaServerItemInDatabase.getSendRtpPortRange()) && ObjectUtils.isEmpty(mediaServerItem.getSendRtpPortRange())) {
                mediaServerItem.setSendRtpPortRange("30000,30500");
            }
            mediaServerService.update(mediaServerItem);
        } else {
            if (ObjectUtils.isEmpty(mediaServerItem.getSendRtpPortRange())) {
                mediaServerItem.setSendRtpPortRange("30000,30500");
            }
            mediaServerService.add(mediaServerItem);
        }
    }
@@ -164,25 +152,25 @@
    @GetMapping(value = "/restart")
    @ResponseBody
    public void restart() {
        taskExecutor.execute(()-> {
            try {
                Thread.sleep(3000);
                SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
                SipStackImpl stack = (SipStackImpl) up.getSipStack();
                stack.stop();
                Iterator listener = stack.getListeningPoints();
                while (listener.hasNext()) {
                    stack.deleteListeningPoint((ListeningPoint) listener.next());
                }
                Iterator providers = stack.getSipProviders();
                while (providers.hasNext()) {
                    stack.deleteSipProvider((SipProvider) providers.next());
                }
                VManageBootstrap.restart();
            } catch (InterruptedException | ObjectInUseException e) {
                throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
            }
        });
//        taskExecutor.execute(()-> {
//            try {
//                Thread.sleep(3000);
//                SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
//                SipStackImpl stack = (SipStackImpl) up.getSipStack();
//                stack.stop();
//                Iterator listener = stack.getListeningPoints();
//                while (listener.hasNext()) {
//                    stack.deleteListeningPoint((ListeningPoint) listener.next());
//                }
//                Iterator providers = stack.getSipProviders();
//                while (providers.hasNext()) {
//                    stack.deleteSipProvider((SipProvider) providers.next());
//                }
//                VManageBootstrap.restart();
//            } catch (InterruptedException | ObjectInUseException e) {
//                throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
//            }
//        });
    };

    @Operation(summary = "获取系统信息信息")