Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2023-08-16 9d56da5680fe1bb78a928d3f5f747b90a2364248

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

old mode 100644
new mode 100755
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -72,6 +73,9 @@
    @Autowired
    private IRedisCatchStorage redisCatchStorage;

    @Autowired
    private SendRtpPortManager sendRtpPortManager;


    @GetMapping(value = "/media_server/list")
    @ResponseBody