Pre Merge pull request !34 from WangXuewen/master

pom.xml

@@ -405,11 +405,6 @@
             <version>1.18.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java

@@ -219,9 +219,4 @@ public class UserSetting {
      */
     private boolean useAliasForGroupSync = false;
 
-    /**
-     * 设备ID严格模式，开启后设备注册时如果设备ID不符合规范则拒绝注册, 默认开启
-     */
-    private boolean deviceIdStrict = true;
-
 }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbCode.java

@@ -29,7 +29,7 @@ public class GbCode {
      * 解析国标编号
      */
     public static GbCode decode(String code){
-        if (code == null || code.trim().length() != 20 || !code.matches("\\d{20}")) {
+        if (code == null || code.trim().length() != 20) {
             return null;
         }
         code = code.trim();

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java

@@ -4,7 +4,6 @@ import com.genersoft.iot.vmp.conf.SipConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.GbCode;
 import com.genersoft.iot.vmp.gb28181.bean.GbSipDate;
 import com.genersoft.iot.vmp.common.RemoteAddressInfo;
 import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
@@ -89,17 +88,6 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
             AddressImpl address = (AddressImpl) fromHeader.getAddress();
             SipUri uri = (SipUri) address.getURI();
             String deviceId = uri.getUser();
-            if (userSetting.isDeviceIdStrict()) {
-                // 严格模式下，非20位设备ID不予处理
-                GbCode decode = GbCode.decode(deviceId);
-                if (decode == null) {
-                    // 注册失败
-                    response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
-                    sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
-                    return;
-                }
-
-            }
             // 调整逻辑，如果为设置公共密码，那么就必须要预设用户信息，否则无法注册。
             Device device = deviceService.getDeviceByDeviceId(deviceId);