Merge branch 'master' into feature/20171030

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
#	src/main/java/cn/quantgroup/xyqb/aspect/captcha/PasswordErrorFiniteValidateAdvisor.java
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
#	src/main/java/cn/quantgroup/xyqb/util/ValidationUtil.java

src/main/java/cn/quantgroup/xyqb/Constants.java

@@ -12,8 +12,6 @@ public interface Constants {
   String PASSWORD_SALT = "_lkb";
 
   String IMAGE_CAPTCHA_KEY = "img_captcha:";
-  String X_AUTH_TOKEN = "x-auth-token";
-  String ONE_TIME_TOKEN = "oneTimeToken";
   String REDIS_CAPTCHA_KEY = "auth:";
 
   String CONFIG_CAPTCHA = "cfg_captcha_%";
@@ -40,12 +38,12 @@ public interface Constants {
   Long Image_Need_Count = 3L;
   Long IMAGE_FINITE_COUNT = 3L;
 
-  String REDIS_PASSWORD_ERROR_COUNT_FOR_PHONE = "password_error_4_phone:";
+  String REDIS_PASSWORD_ERROR_COUNT = "password_error_count:";
   String REDIS_PASSWORD_ERROR_COUNT_FOR_IPV4 = "password_error_count_4_ipv4:";
   String IPV4_LOCK = "lock_ipv4:";
   Long IPV4_LOCK_MINUTES = 6 * 60L;
   Long IPV4_COUNT_MINUTES = 1L;
-  Long IPV4_LOCK_ON_COUNTS = 60L;
+  Long IPV4_LOCK_ON_COUNTS = 200L;
   int DANGEROUS_TIME_START = 22;
   int DANGEROUS_TIME_END = 6;
   /**