From dd2ae6578673651712134fd1867dca514cfec61f Mon Sep 17 00:00:00 2001 From: chenzhangyue <chenzhangyue01@weidian.com> Date: 星期四, 10 八月 2023 20:00:43 +0800 Subject: [PATCH] 修复代理访问跨域问题,和ScheduledFuture取消任务时指令重排异常,不结束正在运行的任务。防止 Command interrupted --- src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 4 ++++ 1 files changed, 4 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 bef7ffb..72641be 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 @@ -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 -- Gitblit v1.8.0