李宇
2020-12-18 fe4ed98b4ca70931e4e25d05fcca56a8134102c5
src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -99,8 +99,7 @@
    }
    public void updatePassword() {
           this.username = getUser().getName();
           this.sysUser = getUser();
        this.username = getUser().getName();
    }
@@ -127,6 +126,8 @@
            int totalRows = sheet.getPhysicalNumberOfRows();
            List<SysUser> userList=new ArrayList<>();
            System.out.println("totalRows=========="+totalRows);
            String errorMsg = null;
            for (int i = 1; i < totalRows; i++) {
                row=sheet.getRow(i);
                totalCells= row.getLastCellNum();
@@ -187,7 +188,14 @@
                sysUser.setArp((int)Double.parseDouble(valuesList.get(2))+"");//arp号
                sysUser.setName(valuesList.get(3));//姓名
                sysUser.setAccount(valuesList.get(4));//账号
                String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
                if (!valuesList.get(5).matches(PW_PATTERN)){
                    errorMsg += "第"+i+"行,密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上";
                }
                sysUser.setPassword(MD5Utils.encode((int)Double.parseDouble(valuesList.get(5))+""));//密码
                sysUser.setPhone(valuesList.get(6));//电话
                sysUser.setEmail(valuesList.get(7));//邮箱
                sysUser.setIdCard(valuesList.get(8));//id卡号
@@ -219,6 +227,10 @@
                sysUser.setValidFlag(ValidFlag.VALID);
                userList.add(sysUser);
            }
            if (errorMsg != null){
                FacesUtils.warn(errorMsg);
            }
            this.sysUserService.insertSysUserList(userList);
            System.out.println("=========导入结束=====");
            FacesUtils.info("导入成功。");
@@ -254,25 +266,34 @@
    public String updatePasswordAction() throws NoSuchAlgorithmException, CharacterCodingException
    {
        this.sysUser = getUser();
      if(!this.sysUser.getPassword().equals(MD5Utils.encode(this.oriPassword)))
      {
         FacesUtils.warn("原密码错误,请重新输入!");
            return null;
      }
          if(!this.newPassword.equals(this.newPasswordSecond))
          {
             FacesUtils.warn("新密码不一致,请重新输入。");
            return null;
          }
      if(!this.newPassword.equals(this.newPasswordSecond))
      {
          FacesUtils.warn("新密码不一致,请重新输入。");
          return null;
      }
          this.sysUser.setName(username);
          this.sysUser.setPassword(MD5Utils.encode(this.newPassword));
      String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
        if (!this.newPassword.matches(PW_PATTERN)){
            FacesUtils.warn("密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上");
            return null;
        }
//        this.sysUser.setName(username);
        this.sysUser.setPassword(MD5Utils.encode(this.newPassword));
        this.sysUserService.updateSysUser(sysUser);
        this.newPassword = null;
        this.oriPassword = null;
        this.newPasswordSecond = null;
        FacesUtils.info("修改成功,请重新登录!");
        RequestContext.getCurrentInstance().execute("PF('dialogPassword').hide()");
        RequestContext.getCurrentInstance().execute("PF('changePassword').hide()");
        this.getSubject().logout();
        return Constants.PAGE_LOGIN + Constants.REDIRECT;
    }
@@ -322,6 +343,13 @@
                if(!org.apache.commons.lang.StringUtils.isNotBlank(sysUser.getProjectId())){
                    sysUser.setProjectId(null);
                }
                String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
                if (!sysUser.getPassword().matches(PW_PATTERN)){
                    FacesUtils.warn("密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上");
                    return;
                }
                sysUser.setPassword(MD5Utils.encode(sysUser.getPassword()));
                this.sysUserService.insertSysUser(sysUser);