与master分支同步

src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java

@@ -121,7 +121,9 @@ public class SipLayer implements SipListener {
 		logger.debug(evt.getRequest().toString());
 		// 由于jainsip是单线程程序，为提高性能并发处理
 		processThreadPool.execute(() -> {
+			if (processorFactory != null) {
 				processorFactory.createRequestProcessor(evt).process();
+			}
 		});
 	}
 

src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@@ -66,5 +66,4 @@ public interface DeviceMapper {
 
     @Delete("DELETE FROM device WHERE deviceId=#{deviceId}")
     int del(String deviceId);
-
 }