Merge branch 'master' into feature/20171030

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
#	src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

src/main/java/cn/quantgroup/xyqb/aspect/captcha/PasswordErrorFiniteValidateAdvisor.java

@@ -3,8 +3,6 @@ package cn.quantgroup.xyqb.aspect.captcha;
 
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.model.JsonResult;
-import cn.quantgroup.xyqb.util.ValidationUtil;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -20,7 +18,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.Objects;
 
 /**
  * 密码错误限次的校验
@@ -61,6 +59,9 @@ public class PasswordErrorFiniteValidateAdvisor {
     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
     // 客户端IP
     String clientIp = getIp(request);
+    if (StringUtils.startsWith(clientIp, "139.198.")){
+      return pjp.proceed();
+    }
     String lockIpv4Key = getLockIpv4Key(clientIp);
     String lock = redisTemplate.opsForValue().get(lockIpv4Key);
     if (Objects.equals(Boolean.TRUE.toString(), lock)){

src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

@@ -27,7 +27,7 @@ public class RequestFilter implements Filter {
 
   private static final String[] ALLOWED_PATTERNS = {
       "/user_detail/**","/hello/**","/innerapi/**", "/user/exist", "/motan/**", "/user/register", "/user/login", "/user/register/fast",
-      "/token/oneTime", "/user/loginV1", "/user/login/fastV1","/user/**","/api/sms/send_login_code_new_forH5",
+      "/token/oneTime", "/user/loginV1", "/user/login/fastV1","/user/**","/api/sms/send_login_code_new_forH5","/user/lock_ipv4",
       "/auth/info/login","/user/login/fast","/user/reset_password", "/user/exist_check","/user/center/**",
       "/jr58/**", "/app/login", "/app/login_super","/app/login2","/user/login2", "/wechat/**", "/config/**", "/api/**", "/user/exists_token","/query/**",
       "/platform/api/page/return_url", "/MP_" +

src/main/java/cn/quantgroup/xyqb/util/ValidationUtil.java

 package cn.quantgroup.xyqb.util;
 
 import cn.quantgroup.xyqb.Constants;
+import cn.quantgroup.xyqb.util.encrypt.MD5Util;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.Calendar;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -56,6 +58,31 @@ public class ValidationUtil {
     return matcher.find();
   }
 
+  /**
+   * 验证密令
+   * 私钥 + 操作 + 时
+   * @param key - Md5密令
+   * @param lock - true or false
+   * @return
+   */
+  public static boolean isValid(String key, boolean lock) {
+    return Objects.equals(key, getMd5Key(lock));
+  }
+
+  /**
+   * 计算密令
+   * 私钥 + 操作 + 时
+   * @param lock - true or false
+   * @return 加密后的Md5
+   */
+  public static String getMd5Key(boolean lock) {
+    Calendar today = Calendar.getInstance();
+    int hour_24 = today.get(Calendar.HOUR_OF_DAY);
+    StringBuilder _key = new StringBuilder();
+    _key.append(Constants.CLEAR_LOCK_FOR_IPV4_KEY).append(lock).append(hour_24);
+    return MD5Util.build(_key.toString());
+  }
+
   public static boolean isAtDangerousTime() {
     Calendar now = Calendar.getInstance();
     int hour = now.get(Calendar.HOUR_OF_DAY);