Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	resources/redis.properties

src/com/ejweb/modules/user/api/UserController.java

@@ -52,6 +52,10 @@ public class UserController {
     private int ipWithinSeconds;
     @Value("${redis.ipLimitTimes}")
     private int ipLimitTimes;
+    @Value("${redis.userSealUpSeconds}")
+    private int userSealUpSeconds;
+    @Value("${redis.userOverdueSeconds}")
+    private int userOverdueSeconds;
     @Value("${redis.usernameWithinSeconds}")
     private int usernameWithinSeconds;
     @Value("${redis.usernameLimitTimes}")
@@ -155,9 +159,9 @@ public class UserController {
             }
             String blackUsername = redisUtils.get("black_username:" + loginBean.getLoginName(), indexDb);
             boolean sealup = false;
-            if (null != redisUsername && Integer.parseInt(redisUsername) >= usernameLimitTimes && StringUtils.isEmpty(blackUsername)) {
+            if (null != redisUsername && Integer.parseInt(redisUsername) >= 5 && StringUtils.isEmpty(blackUsername)) {
                 redisUtils.set("black_username:" + loginBean.getLoginName(), 1, indexDb);
-                redisUtils.expire("black_username:" + loginBean.getLoginName(), blackUsernameTime, indexDb);
+                redisUtils.expire("black_username:" + loginBean.getLoginName(), userSealUpSeconds, indexDb);
                 sealup = true;
             } else if (blackUsername != null) {
                 sealup = true;
@@ -176,7 +180,7 @@ public class UserController {
                 // 用户信息redis初始时间 增加value值
                 if (StringUtils.isEmpty(redisUsername)) {
                     redisUtils.set(loginBean.getLoginName(), 1, indexDb);
-                    redisUtils.expire(loginBean.getLoginName(), usernameWithinSeconds, indexDb);
+                    redisUtils.expire(loginBean.getLoginName(), userOverdueSeconds, indexDb);
                 } else {
                     redisUtils.incrNotResetExpireTime(loginBean.getLoginName(), indexDb);
                 }
@@ -225,7 +229,7 @@ public class UserController {
                 // 用户信息redis初始时间 增加value值
                 if (StringUtils.isEmpty(redisUsername)) {
                     redisUtils.set(loginBean.getLoginName(), 1, indexDb);
-                    redisUtils.expire(loginBean.getLoginName(), usernameWithinSeconds, indexDb);
+                    redisUtils.expire(loginBean.getLoginName(), userOverdueSeconds, indexDb);
                 } else {
                     redisUtils.incrNotResetExpireTime(loginBean.getLoginName(), indexDb);
                 }