guzijian / wvp-GB28181-pro · Commits

Commit 641d7d8e42ac45a339b885191822646cec842fc7

Authored by 64850858
1 parent 2af5cf49

修复无参数zlm请求代理失败的问题 

添加对无密码直接注册功能的支持
Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
  View file @641d7d8
@@ -51,12 +51,11 @@ public class ProxyServletConfig { @@ -51,12 +51,11 @@ public class ProxyServletConfig {
51 @Override 51 @Override
52 protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) { 52 protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
53 String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString); 53 String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
54 - if (queryStr != null) {  
55 - queryStr += "&"; 54 + if (!StringUtils.isEmpty(queryStr)) {
  55 + queryStr += "&secret=" + mediaConfig.getSecret();
56 }else { 56 }else {
57 - queryStr = "?"; 57 + queryStr = "secret=" + mediaConfig.getSecret();
58 } 58 }
59 - queryStr += "secret=" + mediaConfig.getSecret();  
60 return queryStr; 59 return queryStr;
61 } 60 }
62 61
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
  View file @641d7d8
@@ -77,6 +77,9 @@ public class RegisterRequestProcessor extends SIPRequestAbstractProcessor { @@ -77,6 +77,9 @@ public class RegisterRequestProcessor extends SIPRequestAbstractProcessor {
77 passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, 77 passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request,
78 sipConfig.getSipPassword()); 78 sipConfig.getSipPassword());
79 } 79 }
  80 + if (StringUtils.isEmpty(sipConfig.getSipPassword())){
  81 + passwordCorrect = true;
  82 + }
80 83
81 // 未携带授权头或者密码错误 回复401 84 // 未携带授权头或者密码错误 回复401
82 if (authorhead == null || !passwordCorrect) { 85 if (authorhead == null || !passwordCorrect) {