Browse Source

Merge pull request #800 from yjkhtddx/wvp-28181-2.0

优先使用SIP认证用户名
648540858 2 years ago
parent
commit
8a590d5c39

+ 7 - 1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java

@@ -94,7 +94,13 @@ public class SIPRequestHeaderPlarformProvider {
 		SipURI requestURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerIP() + ":" + parentPlatform.getServerPort());
 		if (www == null) {
 			AuthorizationHeader authorizationHeader = sipLayer.getSipFactory().createHeaderFactory().createAuthorizationHeader("Digest");
-			authorizationHeader.setUsername(parentPlatform.getDeviceGBId());
+			String username = parentPlatform.getUsername();
+			if ( username == null || username == "" )
+			{
+				authorizationHeader.setUsername(parentPlatform.getDeviceGBId());
+			} else {
+				authorizationHeader.setUsername(username);
+			}
 			authorizationHeader.setURI(requestURI);
 			authorizationHeader.setAlgorithm("MD5");
 			registerRequest.addHeader(authorizationHeader);