From 713aa00acc398e44cb2a59e4f5c3f55b4e0784d8 Mon Sep 17 00:00:00 2001
From: xiaoQQya <xiaoQQya@126.com>
Date: 星期三, 22 三月 2023 15:21:22 +0800
Subject: [PATCH] perf(snap): 优化点播成功后截图使用 rtsp 流, 新增对 H265 编码视频截图的支持
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
index 6140720..d24380a 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -2,10 +2,10 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
-import org.apache.catalina.connector.ClientAbortException;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
+import org.junit.jupiter.api.Order;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,11 +15,9 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.ConnectException;
@@ -28,6 +26,7 @@
*/
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
+@Order(1)
public class ProxyServletConfig {
private final static Logger logger = LoggerFactory.getLogger(ProxyServletConfig.class);
@@ -77,9 +76,7 @@
} catch (IOException ioException) {
if (ioException instanceof ConnectException) {
logger.error("zlm 杩炴帴澶辫触");
- } else if (ioException instanceof ClientAbortException) {
- logger.error("zlm: 鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
- } else {
+ } else {
logger.error("zlm 浠ｇ悊澶辫触锛� ", e);
}
} catch (RuntimeException exception){
@@ -128,7 +125,7 @@
MediaServerItem getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
- if ("default".equals(mediaServerId)) {
+ if ("default".equalsIgnoreCase(mediaServerId)) {
return mediaServerService.getDefaultMediaServer();
}else {
return mediaServerService.getOne(mediaServerId);
@@ -195,9 +192,7 @@
} catch (IOException ioException) {
if (ioException instanceof ConnectException) {
logger.error("褰曞儚鏈嶅姟 杩炴帴澶辫触");
- } else if (ioException instanceof ClientAbortException) {
- logger.error("褰曞儚鏈嶅姟:鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
- } else {
+ }else {
logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
}
} catch (RuntimeException exception){
@@ -246,7 +241,7 @@
MediaServerItem getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
- if ("default".equals(mediaServerId)) {
+ if ("default".equalsIgnoreCase(mediaServerId)) {
return mediaServerService.getDefaultMediaServer();
}else {
return mediaServerService.getOne(mediaServerId);
--
Gitblit v1.8.0