去除redis登录

power-admin/src/main/java/com/manage/controller/LoginController.java

@@ -62,28 +62,24 @@ public class LoginController {
         return "loginDir/login";
     }
 
+
+
     @RequestMapping(value = "login", method = RequestMethod.POST)
     @ResponseBody
     public Msg login(Power_User powerUser, HttpServletResponse response, HttpServletRequest request, Model model) throws Exception {
-        Jedis redis = JedisPoolUtil.getJedisPoolInstance().getResource();
-        try {
+
         String userPwd = powerUser.getUserPwd();
-            String userName = powerUser.getUserName();
-            String userInfo = redis.get(userName);
-            //用来记录错误的次数
-            String errorPwsCount = "0";
-            //没有这个id的话新建一个
-            if (userInfo == null) {
-                redis.set(userName, errorPwsCount);
-            }
-            //获取已经记录错误次数
-            int i = Integer.parseInt(redis.get(userName));
-            //小于5可以继续登录,大于5
-            if (i < 5) {
+        //判断是否在可登录时间内
+        Power_Log unlockDate = logService.getUnlockDate(powerUser.getUserName());
+        //不等于空说明账号次数过多被锁定
+        if (unlockDate!=null){
+            return Msg.failUnlockUser(unlockDate.getUnlockDate());
+        }
         try {
             Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser);
             //添加进操作日志
             Power_Log log = new Power_Log();
+            SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
             if (user != null) {
                 //如处于登录状态，先清除缓存
                 //CacheManager.removeCacheByObject(user);
@@ -99,7 +95,6 @@ public class LoginController {
                 String token = UUID.randomUUID().toString();
                 ActionScopeUtils.setSessionAttribute("token", token, Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME)) / 1000);
                 //设置用户登录次数缓存
-                    SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
                 CacheManager.addloginUserCount(fmt.format(new Date()), user.getUserName());
                 CacheManager.addExcCount("noExc");
                 List<Power_Menu> list = null;
@@ -137,6 +132,15 @@ public class LoginController {
                     }
                 }
                 user.setRemark(power_depts.toString());
+                StringBuilder powerCodes= new StringBuilder();
+                for (int c = 0; c < power_depts1.size(); c++) {
+                    if (c < power_depts1.size() - 1) {
+                        powerCodes.append(power_depts1.get(c).getDeptCode()).append(",");
+                    } else {
+                        powerCodes.append(power_depts1.get(c).getDeptCode());
+                    }
+                }
+                user.setUserTel(powerCodes.toString());
                 StringBuilder power_depts3 = new StringBuilder();
                 if (user.getDeptIdQuality() != null) {
                     List<Power_Dept> power_depts2 = power_deptService.selectByPrimaryKeys(user.getDeptIdQuality());
@@ -154,8 +158,6 @@ public class LoginController {
                 ActionScopeUtils.setSessionAttribute("CURRENT_USER", user, Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME)) / 1000);
                 String reg = "^(?![A-Za-z]+$)(?![A-Z\\d]+$)(?![A-Z\\W]+$)(?![a-z\\d]+$)(?![a-z\\W]+$)(?![\\d\\W]+$)\\S{8,20}$";
                 boolean msg = userPwd.matches(reg);
-                    redis.del(userName);
-                    JedisPoolUtil.close(redis);
                 if (msg == false) {
                     String url = "http://" + SERVER_IP + ":" + SERVER_PORT + "/power" + "/font/updatePassword";
                     return Msg.success().add("url", url);
@@ -180,10 +182,13 @@ public class LoginController {
                 log.setLogTitle("登录");
                 log.setLogContent("用户密码错误");
                 log.setRemark("已错误【" + wrongNum + "】次");
+                //如果错误次数=5添加锁定时间
+                if (wrongNum == 5) {
+                    SimpleDateFormat UnlockFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    log.setUnlockDate(UnlockFmt.format(new Date().getTime()+ 15*60*1000));
+                }
                 logService.insert(log);
                 request.setAttribute("msg", "用户名或密码不正确");
-                    redis.incr(userName);
-                    JedisPoolUtil.close(redis);
                 return Msg.failUser();
             }
         } catch (Exception e) {
@@ -191,30 +196,15 @@ public class LoginController {
             e.printStackTrace();
             CacheManager.addExcCount("exc");
         }
-            }else {
-                //失败次数大于五时锁十五分钟
-                redis.setex(userName, 900, i + "");
-                JedisPoolUtil.close(redis);
-                return Msg.failUser2();
-            }
         return null;
-        } catch (NumberFormatException e) {
-            throw new RuntimeException(e);
-        }finally {
-            JedisPoolUtil.close(redis);
-        }
     }
+
     @RequestMapping("refuse")
     public String refuse() {
         return "refuse";
     }
 
 
-
-
-
-
-
     //获取session所剩时间
     @RequestMapping(value = "getSessionRemainingTime", method = RequestMethod.GET, produces = {"text/json;charset=UTF-8"})
     @ResponseBody

power-admin/src/main/resources/config/config.properties

@@ -13,7 +13,7 @@ TOKEN_EXPIRE_TIME = 1200000
 #SERVER_PORT = 9001
 
 
-SERVER_IP = localhost
+SERVER_IP = 127.0.0.1
 SERVER_PORT = 8082
 
 #power\u6743\u9650\u7CFB\u7EDFip
@@ -23,7 +23,7 @@ POWER_PORT = ${SERVER_PORT}
 
 #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDFip
 EMRMEDICALRECORD_IP = ${SERVER_IP}
-#\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3
+#\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3h7
 EMRMEDICALRECORD_PORT = 8083
 
 #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip

power-dao/src/main/java/com/manage/dao/Power_LogMapper.java

@@ -31,4 +31,6 @@ public interface Power_LogMapper {
     List<Power_LogVo> selectAllByIds(@Param("checks")String checks);
 
     void deleteLogByIds(@Param("str")String str);
+
+    Power_Log getUnlockDate(@Param("userName")String userName);
 }

power-dao/src/main/java/com/manage/entity/Power_Log.java

@@ -19,6 +19,16 @@ public class Power_Log {
 
     private String remark;
 
+    private String unlockDate;
+
+    public String getUnlockDate() {
+        return unlockDate;
+    }
+
+    public void setUnlockDate(String unlockDate) {
+        this.unlockDate = unlockDate;
+    }
+
     public Integer getLogId() {
         return logId;
     }

power-dao/src/main/java/com/manage/vo/Power_UserVo.java

@@ -36,6 +36,18 @@ public class Power_UserVo extends Power_User {
 
     private Integer showRecord;
 
+    @Override
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    @Override
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    private String deptCode;
+
     public String getDeptIdQuality() {
         return deptIdQuality;
     }

power-dao/src/main/resources/mapper/Power_LogMapper.xml

@@ -28,11 +28,11 @@
   <insert id="insert" parameterType="com.manage.entity.Power_Log" >
     insert into power_log (log_id, log_title, ip, 
       log_content, sys_flag, sys_id, 
-      create_date, creater, remark
+      create_date, creater, remark,unlock_date
       )
     values (#{logId,jdbcType=INTEGER}, #{logTitle,jdbcType=VARCHAR}, #{ip,jdbcType=CHAR}, 
       #{logContent,jdbcType=VARCHAR}, #{sysFlag,jdbcType=VARCHAR}, #{sysId,jdbcType=INTEGER}, 
-      #{createDate,jdbcType=CHAR}, #{creater,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}
+      #{createDate,jdbcType=CHAR}, #{creater,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},#{unlockDate,jdbcType=CHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.manage.entity.Power_Log" >
@@ -200,6 +200,9 @@
   <select id="selectAllByIds" resultMap="BaseResultMap">
     select * from power_log where log_id in (${checks}) AND sys_flag = 'power'
   </select>
+  <select id="getUnlockDate" resultType="com.manage.entity.Power_Log">
+    SELECT * FROM power_log where log_title='登录' and unlock_date>=sysdate() and creater=#{userName}
+  </select>
   <delete id="deleteLogByIds">
     delete from power_log where log_id in (${str})
   </delete>

power-foundaton/src/main/java/com/manage/util/Msg.java

@@ -38,6 +38,15 @@ public class Msg {
 
 
 
+	public static Msg failUnlockUser(String unlockDate){
+		Msg result=new Msg();
+		result.setCode(200);
+		result.setMsg("登录账号失败次数过多,请在"+unlockDate+"后在登录");
+		return result;
+	}
+
+
+
 	public static Msg updatePassword(){
 		Msg result=new Msg();
 		result.setCode(200);

power-service/src/main/java/com/manage/service/LogService.java

@@ -18,4 +18,7 @@ public interface LogService {
     int delLogsByDate(String date);
 
     void deleteLogByIds(String str);
+
+    Power_Log getUnlockDate(String userName);
+
 }

power-service/src/main/java/com/manage/service/ipml/LogServiceImpl.java

@@ -84,6 +84,11 @@ public class LogServiceImpl implements LogService {
         logMapper.deleteLogByIds(str);
     }
 
+    @Override
+    public Power_Log getUnlockDate(String userName) {
+        return logMapper.getUnlockDate(userName);
+    }
+
     private String getAddressIp( HttpServletRequest request){
         // 获取访问真实IP
         String ipAddress = request.getHeader("x-forwarded-for");
@@ -114,4 +119,5 @@ public class LogServiceImpl implements LogService {
         }
         return ipAddress;
     }
+
 }