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

# Conflicts:
#	src/com/ejweb/modules/user/api/UserController.java

resources/spring-mvc.xml

@@ -25,6 +25,7 @@
                 <list>
                     <value>classpath:jdbc.properties</value>
                     <value>classpath:ejweb.properties</value>
+                    <value>classpath:redis.properties</value>
                 </list>
             </property>
     </bean>

src/com/ejweb/core/util/RedisUtils.java

@@ -75,6 +75,21 @@ public class RedisUtils {
         return value;
     }
 
+    public Long del(String key, int indexDb) {
+        Jedis jedis = null;
+        Long value = null;
+        try {
+            jedis = jedisPool.getResource();
+            jedis.select(indexDb);
+            value = jedis.del(key);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        } finally {
+            returnResource(jedisPool, jedis);
+        }
+        return value;
+    }
+
     /**
      * 通过key 对value进行加值+1操作,当value不是int类型时会返回错误,当key不存在是则value为1
      *
@@ -109,9 +124,11 @@ public class RedisUtils {
         try {
             jedis = jedisPool.getResource();
             jedis.select(indexDb);
-            Long expireTime = jedis.pttl(key);
+            Integer expireTime =jedis.ttl(key).intValue();
             res = jedis.incr(key);
-            jedis.expireAt(key, expireTime);
+           // jedis.expireAt(key, expireTime);
+
+            res = jedis.expire(key, expireTime);
         } catch (Exception e) {
             log.error(e.getMessage());
         } finally {
@@ -190,4 +207,5 @@ public class RedisUtils {
             jedisPool.returnResource(jedis);
         }
     }
-}
+
+}
\ No newline at end of file

src/com/ejweb/modules/route/bean/VerifyStatusBean.java

 package com.ejweb.modules.route.bean;
 
-import java.util.List;
-import java.util.Map;
-
+import com.ejweb.core.base.GenericBean;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import com.ejweb.core.base.GenericBean;
+import java.util.List;
+import java.util.Map;
 
 public class VerifyStatusBean extends GenericBean {
 

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

@@ -11,6 +11,7 @@ import com.ejweb.core.fetcher.HCFetcher;
 import com.ejweb.core.util.IdWorker;
 import com.ejweb.core.util.PropertiesUtils;
 import com.ejweb.core.util.RedisUtils;
+import com.ejweb.core.util.RedisUtils;
 import com.ejweb.core.util.Util;
 import com.ejweb.modules.im.service.HuaweiInterfaseService;
 import com.ejweb.modules.mobile.verify.entity.MobileVerifyEntity;
@@ -26,6 +27,7 @@ import com.jdair.util.http.client.HTTPClientUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -51,17 +53,15 @@ public class UserController {
     
     @Autowired
     private MobileVerifyService mobileVerifyService;
-
+    @Value("${redis.dbIndex}")
+    private int indexDb;
+   @Autowired
+    private RedisUtils RedisUtils;
     @Autowired
     private UserRolesService userRolesService;
     
     @Autowired
     private HuaweiInterfaseService huaweiInterfaseService;
-
-    @Autowired
-    private RedisUtils redisUtils;
-
-
     /**
      * 根据用户CODE查询用户信息
      * 
@@ -141,6 +141,24 @@ public class UserController {
         ResponseBean responseBean = new ResponseBean();
         String message = userService.validate(requestBean);
         LoginBean loginBean = requestBean.getObjectBean(LoginBean.class);
+      int a = indexDb;
+
+        String s = RedisUtils.get(loginBean.getLoginName(), indexDb);
+        if (null!=s && Integer.parseInt(s) >=6 ){
+            RedisUtils.expire("black_username"+loginBean.getLoginName(),300,indexDb);
+            responseBean.setStatus(ErrorCode.STATUS_CODE_4101);
+            responseBean.setMessage("该帐号已禁止登录");
+            return responseBean;
+        }
+        if (StringUtils.isEmpty(s)){
+            RedisUtils.set(loginBean.getLoginName(),1,indexDb);
+            RedisUtils.expire(loginBean.getLoginName(),360,indexDb);
+            RedisUtils.incrNotResetExpireTime(loginBean.getLoginName(),indexDb);
+        }else {
+            RedisUtils.incrNotResetExpireTime(loginBean.getLoginName(),indexDb);
+
+        }
+
         message = userService.validate(loginBean);
         if (message == null) {
             LoginIpInfo loginIpInfo = userService.findByIp(userIp);
@@ -157,8 +175,7 @@ public class UserController {
             if(userEntity == null){
                 responseBean.setStatus(ErrorCode.STATUS_CODE_4102);
                 responseBean.setMessage("用户名不存在");
-                //判断ip限制
-                checkIpLimit(redisUtils,userIp,indexDb,responseBean);
+
                 long endTime = System.nanoTime();
                 long duration = endTime - startTime;
                 LOG.debug("[UserController login][STATUS_CODE_4102]总共用时:"+Util.getDurationTime(duration));
@@ -197,8 +214,7 @@ public class UserController {
             if (passwordError){
                 responseBean.setStatus(ErrorCode.STATUS_CODE_4103);
                 responseBean.setMessage("用户名密码不匹配！");
-                //判断ip限制
-                checkIpLimit(redisUtils,userIp,indexDb,responseBean);
+                
                 long endTime = System.nanoTime();
                 long duration = endTime - startTime;
                 LOG.debug("[UserController login][STATUS_CODE_4103]总共用时:"+Util.getDurationTime(duration));
@@ -219,7 +235,7 @@ public class UserController {
                         LOG.debug("[UserController login][STATUS_CODE_4104]总共用时:"+Util.getDurationTime(duration));
                         return responseBean;
                     } else if(entity.getExpireTime().getTime()>System.currentTimeMillis()){// 校验码已经失效
-                        
+                        RedisUtils.del(loginBean.getLoginName(),indexDb);
                         responseBean.setStatus(ErrorCode.STATUS_CODE_4105);
                         responseBean.setMessage("校验码已失效");
                         //判断ip限制
@@ -236,7 +252,7 @@ public class UserController {
 //                loginInfo.setUserId(userEntity.getId());
 //                loginInfo.setLoginDate(new Date());
 //                loginInfo.setLoginIp(clientip);
-                
+                RedisUtils.del(loginBean.getLoginName(),indexDb);
                 
                 UserLoginLogEntity deviceInfoEntity = new UserLoginLogEntity();
                 deviceInfoEntity.setUserId(userEntity.getId());
@@ -353,8 +369,6 @@ public class UserController {
         responseBean.setMessage(message);
         return responseBean;
     }
-
-
     public boolean sendVerifyCode(String telephone, String verifyCode) {
         try {
             HCFetcher fetcher = HCFetcher.getInstance();