修复isMatchedIp的参数判断产生空指针的问题
This commit is contained in:
		
							parent
							
								
									3402b69556
								
							
						
					
					
						commit
						90970eb9fe
					
				@ -145,7 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 计算时间差(单位:分钟)
 | 
			
		||||
     * 计算时间差
 | 
			
		||||
     *
 | 
			
		||||
     * @param endTime 最后时间
 | 
			
		||||
     * @param startTime 开始时间
 | 
			
		||||
 | 
			
		||||
@ -357,7 +357,7 @@ public class IpUtils
 | 
			
		||||
     */
 | 
			
		||||
    public static boolean isMatchedIp(String filter, String ip)
 | 
			
		||||
    {
 | 
			
		||||
        if (StringUtils.isEmpty(filter) && StringUtils.isEmpty(ip))
 | 
			
		||||
        if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))
 | 
			
		||||
        {
 | 
			
		||||
            return false;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user