From 3432548c1a7eeac6ecfc71916ba34ae76cf32412 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 28 六月 2021 15:54:50 +0800
Subject: [PATCH] 修复用户更新sql错误，ffmpeg拉流代理超时时间错误
---
src/main/java/com/genersoft/iot/vmp/vmanager/record/RecoderProxyController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
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
index 8626205..734f62f 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecoderProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecoderProxyController.java
@@ -14,6 +14,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@RestController
@@ -31,7 +33,7 @@
@ResponseBody
@RequestMapping(value = "/**/**/**", produces = "application/json;charset=UTF-8")
- public Object proxy(HttpServletRequest request, HttpServletResponse response){
+ public Object proxy(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException{
String baseRequestURI = request.getRequestURI();
@@ -48,10 +50,10 @@
// 鍚庣画鏀逛负鏍规嵁Id鑾峰彇瀵瑰簲鐨刏LM
ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String requestURI = String.format("http://%s:%s%s?%s",
- mediaInfo.getLocalIP(),
+ mediaInfo.getSdpIp(),
mediaConfig.getRecordAssistPort(),
baseRequestURI.substring(baseRequestURI.indexOf(mediaId) + mediaId.length()),
- URLDecoder.decode(request.getQueryString())
+ URLDecoder.decode(request.getQueryString(), "UTF-8")
);
// 鍙戦�佽姹�
RestTemplate restTemplate = new RestTemplate();
--
Gitblit v1.8.0