From 641d7d8e42ac45a339b885191822646cec842fc7 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 07 六月 2021 11:32:07 +0800
Subject: [PATCH] 修复无参数zlm请求代理失败的问题 添加对无密码直接注册功能的支持
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java | 3 +++
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 7 +++----
2 files changed, 6 insertions(+), 4 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 253904c..06d62df 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -51,12 +51,11 @@
@Override
protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
- if (queryStr != null) {
- queryStr += "&";
+ if (!StringUtils.isEmpty(queryStr)) {
+ queryStr += "&secret=" + mediaConfig.getSecret();
}else {
- queryStr = "?";
+ queryStr = "secret=" + mediaConfig.getSecret();
}
- queryStr += "secret=" + mediaConfig.getSecret();
return queryStr;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
index aa501d9..574f9c7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
@@ -77,6 +77,9 @@
passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request,
sipConfig.getSipPassword());
}
+ if (StringUtils.isEmpty(sipConfig.getSipPassword())){
+ passwordCorrect = true;
+ }
// 鏈惡甯︽巿鏉冨ご鎴栬�呭瘑鐮侀敊璇� 鍥炲401
if (authorhead == null || !passwordCorrect) {
--
Gitblit v1.8.0