1.加入密码过期机制

徐烜 · 王通
1 parent e3e011f6
Showing 8 changed files with 244 additions and 41 deletions
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/repository/sys/SysUserRepository.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/static/pages/home.html
src/main/resources/static/pages/permission/user/list.html
src/main/resources/static/pages/permission/user/resetPWD.html
@@ -5,7 +5,6 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.controller.sys.dto.CompanyData;
 import com.bsth.controller.sys.util.RSAUtils;
-import com.bsth.email.entity.EmailBean;
 import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
@@ -13,12 +12,13 @@ import com.bsth.security.SsoConfig;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.sys.CompanyAuthorityService;
 import com.bsth.service.sys.SysUserService;
-import com.bsth.service.sys.impl.PwdGenerator;
 import com.bsth.util.HttpClientUtils;
-import com.bsth.util.IpUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.Period;
+import org.joda.time.PeriodType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -198,6 +198,25 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
                 return rs;
             }
+            // 检验密码有效期
+            Date lastPwdDate = user.getLastPwdDate();
+            if (lastPwdDate != null) {
+                if (user.getPwdExpiredDate().before(new Date())) {
+                    return put(rs, "msg", "密码已过期，不能登录，请联系管理员");
+                }
+
+                Integer validPeriod = user.getPwdValidPeriod();
+                if (validPeriod == null) {
+                    validPeriod = 30;
+                }
+                Period p = new Period(new DateTime(lastPwdDate), new DateTime(new Date()), PeriodType.days());
+                if (p.getDays() > validPeriod) {
+                    return put(rs, "msg", "天没有修改密码，不能登录，请联系管理员");
+                }
+            } else {
+                return put(rs, "msg", "从未更新过密码，不能登录，请联系管理员");
+            }
+
             // 弱密码检查
             Matcher matcher = pattern.matcher(password);
             if (!matcher.matches()) {
@@ -385,6 +404,18 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
         return msg;
     }
+    @RequestMapping(value = "/validPWDExpired", method = RequestMethod.GET)
+    public String validPWDExpired() {
+        try {
+            SysUser sysUser = SecurityUtils.getCurrentUser();
+            this.sysUserService.validPWDExpired(sysUser.getUserName());
+            return "ok";
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            return exp.getMessage();
+        }
+    }
+
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public Map<String, Object> register(SysUser u) {
         return sysUserService.register(u);
@@ -398,8 +429,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
     // 重置密码
     @RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
-    public Map<String, Object> resetPassword(@RequestParam Integer id) {
-        return sysUserService.resetPassword(id);
+    public Map<String, Object> resetPassword(@RequestParam Integer id, @RequestParam Integer pwdValidPeriod) {
+        return sysUserService.resetPassword(id, pwdValidPeriod);
     }
     /**
@@ -2,6 +2,7 @@ package com.bsth.entity.sys;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.joda.time.DateTime;
 import javax.persistence.*;
 import java.io.Serializable;
@@ -38,13 +39,23 @@ public class SysUser implements Serializable {
 	private Date lastLoginDate;
+    /** 最近密码更新时间 */
+    private Date lastPwdDate;
+    /** 密码有效期 */
+    private Integer pwdValidPeriod;
+
 	private String agencies;
 	private boolean enabled;
 	@ManyToMany(fetch = FetchType.EAGER)
 	private Set<Role> roles = new LinkedHashSet<>();
-	
+
+	/**
+	 * 密码过期时间
+	 */
+	@Transient
+	private Date pwdExpiredDate;
 	public Integer getId() {
 		return id;
@@ -125,4 +136,33 @@ public class SysUser implements Serializable {
 	public void setRoles(Set<Role> roles) {
 		this.roles = roles;
 	}
+
+    public Date getLastPwdDate() {
+        return lastPwdDate;
+    }
+
+    public void setLastPwdDate(Date lastPwdDate) {
+        this.lastPwdDate = lastPwdDate;
+    }
+
+    public Integer getPwdValidPeriod() {
+        return pwdValidPeriod;
+    }
+
+    public void setPwdValidPeriod(Integer pwdValidPeriod) {
+        this.pwdValidPeriod = pwdValidPeriod;
+    }
+
+	public Date getPwdExpiredDate() {
+		DateTime dateTime = new DateTime(getLastPwdDate());
+		if (pwdValidPeriod != null) {
+			dateTime = dateTime.plusDays(pwdValidPeriod);
+		}
+
+		return dateTime.toDate();
+	}
+
+	public void setPwdExpiredDate(Date pwdExpiredDate) {
+		this.pwdExpiredDate = pwdExpiredDate;
+	}
 }
@@ -22,7 +22,7 @@ public interface SysUserRepository extends BaseRepository&lt;SysUser, Integer&gt;{
 	@Transactional
 	@Modifying
-	@Query(value="update bsth_c_sys_user set password=?2 where id=?1",nativeQuery=true)
+	@Query(value="update bsth_c_sys_user set password=?2, last_pwd_date = now() where id=?1",nativeQuery=true)
 	int changePWD(int id,String newPWD);
 	@EntityGraph(value = "sysUser_role", type = EntityGraph.EntityGraphType.FETCH)
@@ -2,7 +2,6 @@ package com.bsth.service.sys;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.BaseService;
-import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import java.util.Map;
@@ -15,11 +14,17 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	int changePWD(int id,String newPWD);
+    /**
+     * 检测指定用户密码是否过期
+     * @param userName 用户名
+     */
+	boolean validPWDExpired(String userName);
+
 	Map<String,Object> register(SysUser u);
 	List<SysUser> findAll_distinct();
-	Map<String, Object> resetPassword(@RequestParam Integer id);
+	Map<String, Object> resetPassword(Integer id, Integer pwdValidPeriod);
 	void recordLoginDate(String userName);
 }
@@ -2,7 +2,6 @@ package com.bsth.service.sys.impl;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.sys.util.RSAUtils;
-import com.bsth.email.SendEmailController;
 import com.bsth.email.entity.EmailBean;
 import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
@@ -15,13 +14,14 @@ import com.bsth.util.IpUtils;
 import com.bsth.util.MailUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import org.joda.time.DateTime;
+import org.joda.time.Days;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -72,7 +72,33 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
 	}
-	@Override
+    @Override
+    public boolean validPWDExpired(String userName) {
+        SysUser sysUser = this.sysUserRepository.findByUserName(userName);
+        if (sysUser == null) {
+            throw new RuntimeException("用户[" + userName + "]不存在！");
+        }
+        if (sysUser.getPwdValidPeriod() == null || sysUser.getLastPwdDate() == null) {
+            // 如果没有设定密码过期时间，判定为不过期
+            return true;
+        }
+        DateTime now = new DateTime();
+        DateTime lastPwdDate = new DateTime(sysUser.getLastPwdDate());
+        Integer now_period_days = Days.daysBetween(lastPwdDate, now).getDays();
+        Integer expiredTipDays = 3; // 密码过期提前提示天数
+        if (now_period_days < (sysUser.getPwdValidPeriod() - expiredTipDays)) {
+            return true;
+        } else if (now_period_days >= (sysUser.getPwdValidPeriod() - expiredTipDays) &&
+                now_period_days < sysUser.getPwdValidPeriod()) {
+            // 快过期前提示
+            throw new RuntimeException("当前用户密码还有[" + (sysUser.getPwdValidPeriod() - now_period_days) + "]天过期！");
+        } else {
+            throw new RuntimeException("当前用户密码已过期！");
+        }
+
+    }
+
+    @Override
 	public Map<String, Object> register(SysUser u) {
 		Map<String, Object> rs = new HashMap();
 		boolean isLegality = false;
@@ -161,7 +187,8 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	}
 	@Override
-	public Map<String, Object> resetPassword(@RequestParam Integer id){
+	@Transactional
+	public Map<String, Object> resetPassword(Integer id, Integer pwdValidPeriod){
 		Map<String, Object> rs = new HashMap();
 		try{
 			// 获取当前用户
@@ -176,7 +203,10 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 			}
 			if(Legality){
 				String pwd = PwdGenerator.randomPassword(16);
-				sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(pwd));
+				user = sysUserRepository.findById(id).get();
+				user.setPwdValidPeriod(pwdValidPeriod);
+				sysUserRepository.save(user);
+				sysUserRepository.changePWD(id, new BCryptPasswordEncoder(4).encode(pwd));
 				//发送邮件
 				EmailBean mail = new EmailBean();
 				mail.setSubject(IpUtils.getLocalIpAddress() +":密码重置");
@@ -73,7 +73,7 @@
 </div>
 <script type="text/javascript">
-    $.ajax({
+    /*$.ajax({
         url: '/eci/validate_get_destroy_info',
         dataType: "json",
         success: function(rs) {
@@ -111,6 +111,25 @@
                 }
             }
         }
+    });*/
+
+    $.get("/user/validPWDExpired", function(msg) {
+        if ("ok" === msg) {
+            return;
+        }
+
+        var htmlText = [];
+        htmlText.push("<span style='font-weight: bold; font-style: italic; '>" + msg + "</span></br>");
+        swal({
+            title: "账户密码提示",
+            text: htmlText.join("</br>"),
+            html: true,
+            type: "warning",
+            showCancelButton: true,
+            cancelButtonText: "关闭",
+            confirmButtonColor: "#3598dc",
+            closeOnConfirm: false
+        });
     });
 </script>
@@ -118,7 +118,7 @@
 			<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
 		{{/if}}
 		{{if obj.isAdmin}}
-			<a class="btn btn-sm red btn-outline reset_password" data-id="{{obj.id}}" data-name="{{obj.userName}}" data-pjax><i class="fa fa-undo"></i> 重置密码</a>
+			<a class="btn btn-sm red btn-outline reset_password" data-id="{{obj.id}}" data-name="{{obj.userName}}" data-last="{{obj.lastPwdDate}}"><i class="fa fa-undo"></i> 重置密码</a>
 		{{/if}}
 		{{if obj.isAdmin}}
 			<a class="btn btn-sm red btn-outline unlock" data-name="{{obj.userName}}" data-pjax><i class="fa fa-unlock"></i> 解除锁定</a>
@@ -153,31 +153,24 @@ $(function(){
 	setTimeout(function () {
         $(document).on('click', 'a.reset_password', function () {
-            var id = $(this).data('id');
-            var name = $(this).data('name');
-            swal({
-				title: "重置密码",
-				text: "将登录名为"+name+"的用户，密码重置为随机密码！",
-				type: "warning",
-				showCancelButton: true,
-				confirmButtonColor: "#DD6B55",
-				confirmButtonText: "重置",
-				cancelButtonText: "取消",
-				closeOnConfirm: false },
-                function(){
-                    $.post('/user/resetPassword',{'id':id},function(result){
-                        if(result.status=='SUCCESS') {
-                            // 弹出添加成功提示消息
-                            swal("登录名为"+name+"的用户密码重置成功！", "success");
-                        } else if(result.status=='ERROR') {
-                            // 弹出添加失败提示消息
-                            swal("重置失败！", result.msg+"，请联系开发人员！", "ERROR");
-                        }
-                        //				loadPage('list.html');
-                        // 发布后刷新页面
-                        jsDoQuery(getParams(), true);
-                    });
-                });
+            var id = $(this).data('id'), name = $(this).data('name'), last = $(this).data('last');
+			$.get('/pages/permission/user/resetPWD.html', function (content) {
+				layer.open({
+					type: 1,
+					area: ['600px', '360px'],
+					content: content,
+					title: '修改密码',
+					shift: 5,
+					scrollbar: false,
+					success: function (layero, index) {
+						$(layero).find('#user_id').val(id);
+						$(layero).find('#user_name').val(name);
+						debugger
+						$(layero).find('#last_pwd_date').val(last ? moment(last).format("YYYY-MM-DD HH:mm:ss") : '');
+						$(layero).find('#window_index').val(index);
+					}
+				});
+			});
         }).on('click', 'a.unlock', function () {
 			var name = $(this).data('name');
 			swal({
@@ -360,4 +353,23 @@ function changeEnabled(id,enabled){
 		jsDoQuery(null, true);
 	})
 }
+// 重置密码
+function resetPassword(userId, ld) {
+    $.get('/pages/permission/user/resetPWD.html', function (content) {
+        layer.open({
+            type: 1,
+            area: ['600px', '360px'],
+            content: content,
+            title: '修改密码',
+            shift: 5,
+            scrollbar: false,
+            success: function (layero, index) {
+                $(layero).find('#user_id').val(userId);
+                $(layero).find('#last_pwd_date').val(ld ? moment(ld).format("YYYY-MM-DD HH:mm:ss") : '');
+                $(layero).find('#window_index').val(index);
+            }
+        });
+    });
+
+}
 </script>
 \ No newline at end of file
+<div class="row">
+    <div class="col-md-12">
+        <!-- BEGIN VALIDATION STATES-->
+        <div class="portlet light portlet-fit portlet-form bordered">
+            <input type="hidden" id="window_index" name="window_index">
+            <div class="portlet-body">
+                <form class="form-horizontal" id="resetPWDForm">
+                    <input type="hidden" id="user_id" name="id">
+                    <input type="hidden" id="user_name">
+                    <div class="form-group" style="margin-top: 60px">
+                        <label class="control-label col-md-4">最近密码更新时间：
+                        </label>
+                        <div class="col-md-6">
+                            <div class="input-icon right">
+                                <i class="fa"></i>
+                                <input type="text" readonly class="form-control" id="last_pwd_date" /> </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group" >
+                        <label class="control-label col-md-4">密码有效期（天）：
+                        </label>
+                        <div class="col-md-6">
+                            <div class="input-icon right">
+                                <i class="fa"></i>
+                                <input type="number" class="form-control" name="pwdValidPeriod" id="pwd_valid_period" value="30" /> </div>
+                        </div>
+                    </div>
+                    <div class="form-actions">
+                        <div class="row">
+                            <div class="col-md-offset-5 col-md-7">
+                                <button type="button" id="confirm" class="btn green">确定</button>
+                                <button type="button" class="btn default">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<script>
+    $(function(){
+        $("#confirm").on('click',function(){
+            var data = $('#resetPWDForm').serializeJSON();
+            var index = $('#window_index').val(), name = $('#user_name').val();
+            $.post('/user/resetPassword', data, function(result) {
+                parent.layer.close(index);
+                if(result.status == 'SUCCESS') {
+                    // 弹出添加成功提示消息
+                    swal('登录名为' + name + '的用户密码重置成功！', 'success');
+                } else if(result.status == 'ERROR') {
+                    // 弹出添加失败提示消息
+                    swal('重置失败！', result.msg + '，请联系开发人员！', 'ERROR');
+                }
+            });
+        });
+
+        $("#pwd_cancel").on('click', function() {
+            var index = $('#window_index').val();
+            parent.layer.close(index);
+        });
+    });
+</script>
 \ No newline at end of file