Merge branch 'wvp-28181-2.0' into main-dev

2023-07-24 09:42:32 +08:00
parent 19c996774e d48f89eee4
commit 7d3cbb8253
15 changed files with 308 additions and 150 deletions
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -344,7 +344,7 @@ public class XmlUtil {
                    if (!ObjectUtils.isEmpty(civilCode)
                            && civilCode.length() <= 8
                            && NumberUtils.isParsable(civilCode)
-                            && Integer.parseInt(civilCode)%2 == 0
+                            && civilCode.length()%2 == 0
                    ) {
                        deviceChannel.setCivilCode(civilCode);
                    }