From 66b65ed0f2b1bf79fd7a49cb678f37cf5595790b Mon Sep 17 00:00:00 2001 From: huangxin Date: Sun, 26 Apr 2020 11:37:36 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=94=B9=E7=A7=BB?= =?UTF-8?q?=E9=99=A4CheckStyle=E9=94=99=E8=AF=AF=202.=20=E6=89=93=E5=BC=80?= =?UTF-8?q?pom.xml=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=203.=20=E8=A1=A5=E5=85=852?= =?UTF-8?q?=E4=B8=AA=E5=87=BD=E6=95=B0=E7=9A=84JavaDoc=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../java/com/dispose/common/IPAddrType.java | 17 +++++++++++++++++ .../impl/UserAccountCacheManagerImpl.java | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) 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; }