From fff3d64f850b3ee61b9847cd80e7958c46cc6347 Mon Sep 17 00:00:00 2001
From: 庄梦蝶殇 <linhuaichuan1989@126.com>
Date: 星期三, 27 七月 2022 18:31:33 +0800
Subject: [PATCH] fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
---
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 93b975e..a6facd5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -143,9 +143,13 @@
MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
String url = super.rewriteUrlFromRequest(servletRequest);
if (mediaInfo == null) {
+ logger.error("[ZLM鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
return url;
}
- return url.replace(mediaInfo.getId() + "/", "").replace("default/", "");
+ if (!StringUtils.isEmpty(mediaInfo.getId())) {
+ url = url.replace(mediaInfo.getId() + "/", "");
+ }
+ return url.replace("default/", "");
}
}
@@ -258,9 +262,13 @@
MediaServerItem mediaInfo = getMediaInfoByUri(requestURI);
String url = super.rewriteUrlFromRequest(servletRequest);
if (mediaInfo == null) {
+ logger.error("[褰曞儚鏈嶅姟璁块棶浠ｇ悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI);
return url;
}
- return url.replace(mediaInfo.getId() + "/", "").replace("default/", "");
+ if (!StringUtils.isEmpty(mediaInfo.getId())) {
+ url = url.replace(mediaInfo.getId() + "/", "");
+ }
+ return url.replace("default/", "");
}
}
--
Gitblit v1.8.0