From 6bc6042197cb8b963eee9a9da8a0139ec36f556e Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 19 七月 2021 17:54:01 +0800
Subject: [PATCH] 更换云端录像的代理方式
---
/dev/null | 79 -------------------
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 100 ++++++++++++++++++++++++
web_src/src/components/CloudRecord.vue | 3
3 files changed, 101 insertions(+), 81 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 c543e6e..c2fb326 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -73,7 +73,7 @@
if (ioException instanceof ConnectException) {
logger.error("zlm 杩炴帴澶辫触");
} else if (ioException instanceof ClientAbortException) {
- logger.error("鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
+ logger.error("zlm: 鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
} else {
logger.error("zlm 浠ｇ悊澶辫触锛� ", e);
}
@@ -141,4 +141,102 @@
}
}
+
+
+ @Bean
+ public ServletRegistrationBean recordServletRegistrationBean(){
+ ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new RecordProxySerlet(),"/record_proxy/*");
+ servletRegistrationBean.setName("record_proxy");
+ servletRegistrationBean.addInitParameter("targetUri", "http://127.0.0.1:18081");
+ servletRegistrationBean.addUrlMappings();
+ if (logger.isDebugEnabled()) {
+ servletRegistrationBean.addInitParameter("log", "true");
+ }
+ return servletRegistrationBean;
+ }
+
+ class RecordProxySerlet extends ProxyServlet{
+
+
+ /**
+ * 寮傚父澶勭悊
+ */
+ @Override
+ protected void handleRequestException(HttpRequest proxyRequest, HttpResponse proxyResonse, Exception e){
+ try {
+ super.handleRequestException(proxyRequest, proxyResonse, e);
+ } catch (ServletException servletException) {
+ logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
+ } catch (IOException ioException) {
+ if (ioException instanceof ConnectException) {
+ logger.error("褰曞儚鏈嶅姟 杩炴帴澶辫触");
+ } else if (ioException instanceof ClientAbortException) {
+ logger.error("褰曞儚鏈嶅姟:鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
+ } else {
+ logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
+ }
+ } catch (RuntimeException exception){
+ logger.error("褰曞儚鏈嶅姟 浠ｇ悊澶辫触锛� ", e);
+ }
+ }
+
+ /**
+ * 瀵逛簬涓烘寜鐓ф牸寮忚姹傜殑鍙互鐩存帴杩斿洖404
+ */
+ @Override
+ protected String getTargetUri(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+
+ String uri = null;
+ if (mediaInfo != null) {
+// String realRequestURI = requestURI.substring(requestURI.indexOf(mediaInfo.getId())+ mediaInfo.getId().length());
+ uri = String.format("http://%s:%s", mediaInfo.getIp(), mediaInfo.getRecordAssistPort());
+ }else {
+ uri = "http://127.0.0.1:" + serverPort +"/index/hook/null"; // 鍙槸涓�涓兘杩斿洖404鐨勮姹傝�屽凡锛� 鍏朵粬鐨勪篃鍙互
+ }
+ return uri;
+ }
+
+ /**
+ * 鍔ㄦ�佹浛鎹㈣姹傜洰鏍�
+ */
+ @Override
+ protected HttpHost getTargetHost(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ HttpHost host;
+ if (mediaInfo != null) {
+ host = new HttpHost(mediaInfo.getIp(), mediaInfo.getRecordAssistPort());
+ }else {
+ host = new HttpHost("127.0.0.1", serverPort);
+ }
+ return host;
+
+ }
+
+ /**
+ * 鏍规嵁uri鑾峰彇娴佸獟浣撲俊鎭�
+ */
+ IMediaServerItem getMediaInfoByUri(String uri){
+ String[] split = uri.split("/");
+ String mediaServerId = split[2];
+ return mediaServerService.getOne(mediaServerId);
+ }
+
+ /**
+ * 鍘绘帀url涓殑鏍囧織淇℃伅
+ */
+ @Override
+ protected String rewriteUrlFromRequest(HttpServletRequest servletRequest) {
+ String requestURI = servletRequest.getRequestURI();
+ IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
+ String url = super.rewriteUrlFromRequest(servletRequest);
+ if (mediaInfo == null) {
+ return url;
+ }
+ return url.replace(mediaInfo.getId() + "/", "");
+ }
+ }
+
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecoderProxyController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecoderProxyController.java
deleted file mode 100644
index f00e2ab..0000000
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecoderProxyController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.genersoft.iot.vmp.vmanager.record;
-
-import com.genersoft.iot.vmp.conf.MediaConfig;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestTemplate;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
-@RestController
-@RequestMapping("/record_proxy")
-public class RecoderProxyController {
-
-
- // private final static Logger logger = LoggerFactory.getLogger(ZLMHTTPProxyController.class);
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
- @Autowired
- private IMediaServerService mediaServerService;
-
- @Autowired
- private MediaConfig mediaConfig;
-
- @ResponseBody
- @RequestMapping(value = "/**/**/**", produces = "application/json;charset=UTF-8")
- public Object proxy(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException{
-
-
- String baseRequestURI = request.getRequestURI();
- String[] split = baseRequestURI.split("/");
- if (split.length <= 2) {
- response.setStatus(HttpStatus.NOT_FOUND.value());
- return null;
- }
- String mediaId = split[2];
- if (StringUtils.isEmpty(mediaId)){
- response.setStatus(HttpStatus.BAD_REQUEST.value());
- return null;
- }
- // 鍚庣画鏀逛负鏍规嵁Id鑾峰彇瀵瑰簲鐨刏LM
- IMediaServerItem mediaInfo = mediaServerService.getOne(mediaId);
- if (mediaInfo == null) {
- response.setStatus(HttpStatus.NOT_FOUND.value());
- return null;
- }
- String requestURI = String.format("http://%s:%s%s?%s",
- mediaInfo.getSdpIp(),
- mediaConfig.getRecordAssistPort(),
- baseRequestURI.substring(baseRequestURI.indexOf(mediaId) + mediaId.length()),
- URLDecoder.decode(request.getQueryString(), "UTF-8")
- );
- // 鍙戦�佽姹�
- RestTemplate restTemplate = new RestTemplate();
- //灏嗘寚瀹氱殑url杩斿洖鐨勫弬鏁拌嚜鍔ㄥ皝瑁呭埌鑷畾涔夊ソ鐨勫搴旂被瀵硅薄涓�
- Object result = null;
- try {
- result = restTemplate.getForObject(requestURI,Object.class);
-
- }catch (HttpClientErrorException httpClientErrorException) {
- response.setStatus(httpClientErrorException.getStatusCode().value());
- }
- return result;
- }
-}
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index c08a6cc..e39cd5b 100644
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -8,7 +8,8 @@
<div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;">
<span style="font-size: 1rem; font-weight: bold;">浜戠褰曞儚</span>
<div style="position: absolute; right: 5rem; top: 0.3rem;">
- 鑺傜偣閫夋嫨: <el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨">
+ 鑺傜偣閫夋嫨:
+ <el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨" :disabled="recordDetail">
<el-option
v-for="item in mediaServerList"
:key="item.id"
--
Gitblit v1.8.0