diff --git a/pom.xml b/pom.xml index 6553f7ee..75685c4e 100644 --- a/pom.xml +++ b/pom.xml @@ -283,7 +283,7 @@ maven-surefire-plugin true - true + false diff --git a/src/main/java/com/dispose/common/IPAddrType.java b/src/main/java/com/dispose/common/IPAddrType.java index 4fe74f15..5b11ce1e 100644 --- a/src/main/java/com/dispose/common/IPAddrType.java +++ b/src/main/java/com/dispose/common/IPAddrType.java @@ -32,6 +32,15 @@ public enum IPAddrType { } } + /** + * Ip in range boolean. + * + * @param startIp the start ip + * @param endIp the end ip + * @param ipAddr the ip addr + * @return the boolean + * @throws AddressStringException the address string exception + */ public static boolean ipInRange(String startIp, String endIp, String ipAddr) throws AddressStringException { IPAddress lower = new IPAddressString(startIp).toAddress(); IPAddress upper = new IPAddressString(endIp).toAddress(); @@ -42,6 +51,14 @@ public enum IPAddrType { return range.contains(addr); } + /** + * Ip in range boolean. + * + * @param rangeIp the range ip + * @param ipAddr the ip addr + * @return the boolean + * @throws AddressStringException the address string exception + */ public static boolean ipInRange(String rangeIp, String ipAddr) throws AddressStringException { String[] ipList = rangeIp.split("-"); diff --git a/src/main/java/com/dispose/manager/impl/UserAccountCacheManagerImpl.java b/src/main/java/com/dispose/manager/impl/UserAccountCacheManagerImpl.java index b88aa179..fd41cf22 100644 --- a/src/main/java/com/dispose/manager/impl/UserAccountCacheManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/UserAccountCacheManagerImpl.java @@ -51,7 +51,7 @@ public class UserAccountCacheManagerImpl implements UserAccountCacheManager { */ @Override public ErrorCode verifyPermission(String token) { - if (disposeConfigure.getCheckAdminPermission().equals("false")) { + if ("false".equals(disposeConfigure.getCheckAdminPermission())) { return ErrorCode.ERR_OK; }