OCT
REM: 1. 修改移除CheckStyle错误 2. 打开pom.xml配置文件中的单元测试 3. 补充2个函数的JavaDoc注释
This commit is contained in:
parent
197a61c509
commit
66b65ed0f2
2
pom.xml
2
pom.xml
|
@ -283,7 +283,7 @@
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<testFailureIgnore>true</testFailureIgnore>
|
<testFailureIgnore>true</testFailureIgnore>
|
||||||
<skip>true</skip>
|
<skip>false</skip>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
|
@ -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 {
|
public static boolean ipInRange(String startIp, String endIp, String ipAddr) throws AddressStringException {
|
||||||
IPAddress lower = new IPAddressString(startIp).toAddress();
|
IPAddress lower = new IPAddressString(startIp).toAddress();
|
||||||
IPAddress upper = new IPAddressString(endIp).toAddress();
|
IPAddress upper = new IPAddressString(endIp).toAddress();
|
||||||
|
@ -42,6 +51,14 @@ public enum IPAddrType {
|
||||||
return range.contains(addr);
|
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 {
|
public static boolean ipInRange(String rangeIp, String ipAddr) throws AddressStringException {
|
||||||
String[] ipList = rangeIp.split("-");
|
String[] ipList = rangeIp.split("-");
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class UserAccountCacheManagerImpl implements UserAccountCacheManager {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public ErrorCode verifyPermission(String token) {
|
public ErrorCode verifyPermission(String token) {
|
||||||
if (disposeConfigure.getCheckAdminPermission().equals("false")) {
|
if ("false".equals(disposeConfigure.getCheckAdminPermission())) {
|
||||||
return ErrorCode.ERR_OK;
|
return ErrorCode.ERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue