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

resources/redis.properties

@@ -8,5 +8,5 @@ redis.maxWaitMillis=10000
 redis.testOnBorrow=true
 redis.testOnReturn=true
 redis.dbIndex=3
-ipWithinSeconds=300
-ipLimitTimes=10
\ No newline at end of file
+ipWithinSeconds=3600
+ipLimitTimes=25
\ No newline at end of file

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

@@ -1044,7 +1044,6 @@ public class UserController {
             if (Integer.valueOf(redisUtils.get(userIp, indexDb)) >= ipLimitTimes) {
                 redisUtils.del(userIp, indexDb);
                 userService.insertInfoByIp(userIp);
-
             }
         }
     }