教研密码

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -13,15 +13,12 @@ import com.xhkjedu.suser.model.system.TUserLog;
 import com.xhkjedu.suser.utils.JedisUtil;
 import com.xhkjedu.suser.utils.PoiUtils;
 import com.xhkjedu.suser.utils.SMSSender;
+import com.xhkjedu.suser.utils.UserUtil;
 import com.xhkjedu.suser.vo.assess.AssessParams;
 import com.xhkjedu.suser.vo.system.TeacherVo;
 import com.xhkjedu.suser.vo.system.UserVo;
 import com.xhkjedu.suser.vo.system.ZtMsgVo;
-import com.xhkjedu.utils.DESUtils;
-import com.xhkjedu.utils.DatesUtil;
-import com.xhkjedu.utils.MD5;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.utils.*;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
@@ -32,11 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @ClassName UserService
@@ -58,19 +51,20 @@ public class UserService extends JedisUtil {
     private SchoolMapper schoolMapper;
 
     /**
-     *功能描述  根据登录名和密码获取用户信息
+     * 功能描述  根据登录名和密码获取用户信息
+     *
+     * @param * @param user
+     * @return com.xhkjedu.vo.ResultVo
      * @author WN
      * @date 2020/6/1
-     * @param  * @param user
-     * @return com.xhkjedu.vo.ResultVo
      */
-    public ResultVo getUserByLoginnameAndPwd(TUser user,HttpServletRequest request){
+    public ResultVo getUserByLoginnameAndPwd(TUser user, HttpServletRequest request) {
         ResultVo resultVo = null;
         String loginpwd = user.getLoginpwd();
         setLoginPwd(user);
         UserVo userVo = userMapper.getUserByLoginname(user.getLoginname());
 
-        if(userVo!=null && userVo.getUserid()>0){
+        if (userVo != null && userVo.getUserid() > 0) {
             user.setUserid(userVo.getUserid());
             user.setUsername(userVo.getUsername());
             user.setSchoolid(userVo.getSchoolid());
@@ -81,31 +75,31 @@ public class UserService extends JedisUtil {
                     resultVo = new ResultVo(0, "登录成功", userVo);
                 } else if (userVo.getUsertype() == 2) {
                     resultVo = new ResultVo(1, "禁止学生登录");
-                } else if(userVo.getSchoolstate()!=1){
-                    resultVo = new ResultVo(1,"用户所在学校暂无权限");
-                }else{
-                    if(userVo.getUserstate()!=1){
-                        resultVo = new ResultVo(1,"该账户无权访问，请联系老师");
-                    }else{
-                        resultVo = new ResultVo(0,"登录成功",userVo);
+                } else if (userVo.getSchoolstate() != 1) {
+                    resultVo = new ResultVo(1, "用户所在学校暂无权限");
+                } else {
+                    if (userVo.getUserstate() != 1) {
+                        resultVo = new ResultVo(1, "该账户无权访问，请联系老师");
+                    } else {
+                        resultVo = new ResultVo(0, "登录成功", userVo);
                     }
                 }
             }
-        }else{
-            resultVo = new ResultVo(1,"该账号不存在");
+        } else {
+            resultVo = new ResultVo(1, "该账号不存在");
         }
 
         return getLogResultVo(user, resultVo, loginpwd, request);
     }
 
     //教师登录
-    public ResultVo loginTeacher(TUser user,HttpServletRequest request){
+    public ResultVo loginTeacher(TUser user, HttpServletRequest request) {
         ResultVo resultVo = null;
         String loginpwd = user.getLoginpwd();
         setLoginPwd(user);
         UserVo userVo = userMapper.getUserByLoginname(user.getLoginname());
 
-        if(userVo!=null && userVo.getUserid()>0) {
+        if (userVo != null && userVo.getUserid() > 0) {
             user.setUserid(userVo.getUserid());
             user.setUsername(userVo.getUsername());
             user.setSchoolid(userVo.getSchoolid());
@@ -116,16 +110,16 @@ public class UserService extends JedisUtil {
                     resultVo = new ResultVo(1, "禁止非教师账号登录");
                 } else if (userVo.getSchoolstate() != 1) {
                     resultVo = new ResultVo(1, "用户所在学校暂无权限");
-                }else{
-                    if(userVo.getUserstate()!=1){
-                        resultVo = new ResultVo(1,"该账户无权访问，请联系老师");
-                    }else{
-                        resultVo = new ResultVo(0,"登录成功",userVo);
+                } else {
+                    if (userVo.getUserstate() != 1) {
+                        resultVo = new ResultVo(1, "该账户无权访问，请联系老师");
+                    } else {
+                        resultVo = new ResultVo(0, "登录成功", userVo);
                     }
                 }
             }
-        }else{
-            resultVo = new ResultVo(1,"该账号不存在");
+        } else {
+            resultVo = new ResultVo(1, "该账号不存在");
         }
 
         return getLogResultVo(user, resultVo, loginpwd, request);
@@ -133,19 +127,20 @@ public class UserService extends JedisUtil {
 
     /**
      * 学生登录
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 11:14
-     * @return com.xhkjedu.vo.ResultVo
      **/
-    public ResultVo loginStudent(TUser user, HttpServletRequest request){
+    public ResultVo loginStudent(TUser user, HttpServletRequest request) {
         ResultVo resultVo = null;
         String loginpwd = user.getLoginpwd();
         setLoginPwd(user);
         String mac = user.getMac();
-        UserVo userVo = userMapper.getUserByLoginnameMac(user.getLoginname(),mac);
+        UserVo userVo = userMapper.getUserByLoginnameMac(user.getLoginname(), mac);
 
-        if(userVo!=null && userVo.getUserid()>0) {
+        if (userVo != null && userVo.getUserid() > 0) {
             Integer sbindmac = userVo.getSbindmac();
             user.setUserid(userVo.getUserid());
             user.setUsername(userVo.getUsername());
@@ -156,7 +151,7 @@ public class UserService extends JedisUtil {
                 if (userVo.getUsertype() != 2) {
                     resultVo = new ResultVo(1, "登录失败，仅允许学生登录");
                 } else if (userVo.getXznum() == 0) {
-                    resultVo = new ResultVo(1,"该账号未分配班级");
+                    resultVo = new ResultVo(1, "该账号未分配班级");
                 } else if (sbindmac == 1 && N_Utils.isNotEmpty(mac)) {
                     if (N_Utils.isNotEmpty(userVo.getMac()) && !mac.equals(userVo.getMac())) {
                         resultVo = new ResultVo(1, "登录失败，该账号已与其他设备关联");
@@ -176,8 +171,8 @@ public class UserService extends JedisUtil {
                 userVo.setBindmac(sbindmac);
                 userMapper.updateBindMac(userVo);
             }
-        }else{
-            resultVo = new ResultVo(1,"该账号不存在");
+        } else {
+            resultVo = new ResultVo(1, "该账号不存在");
         }
 
         return getLogResultVo(user, resultVo, loginpwd, request);
@@ -185,10 +180,11 @@ public class UserService extends JedisUtil {
 
     /**
      * 登录日志
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [loginname, device, user, result]
      * @Author ywx
      * @Date 2020/6/2 11:08
-     * @return com.xhkjedu.vo.ResultVo
      **/
     private ResultVo getLogResultVo(TUser user, ResultVo result, String loginpwd, HttpServletRequest request) {
         String loginname = user.getLoginname();
@@ -209,9 +205,9 @@ public class UserService extends JedisUtil {
             //redis
             String ticketKey = UUID.randomUUID().toString().replace("-", "");
             String token = DESUtils.encrypt(ticketKey, ConfigKey.secretKey);//加密
-            String key = userVo.getCloudcode()+"_"+userVo.getUserid()+"_"+user.getUltype();
+            String key = userVo.getCloudcode() + "_" + userVo.getUserid() + "_" + user.getUltype();
             Boolean redis_rtn = set(key, token, ConfigKey.redisdatatime);
-            if(!redis_rtn){
+            if (!redis_rtn) {
                 result.setCode(1);
                 result.setMsg("加入缓存出错!");
                 return result;
@@ -224,7 +220,7 @@ public class UserService extends JedisUtil {
             }
         } else {
             userLog.setLoginstate(2);
-            userLog.setLogtxt(result.getMsg()+"，密码："+loginpwd);
+            userLog.setLogtxt(result.getMsg() + "，密码：" + loginpwd);
         }
         try {
             userLog.setUserid(user.getUserid());
@@ -245,10 +241,11 @@ public class UserService extends JedisUtil {
 
     /**
      * 添加用户信息
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 9:45
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo save(TUser user) {
         Integer schoolid = user.getSchoolid();
@@ -257,22 +254,23 @@ public class UserService extends JedisUtil {
             Integer usernum2 = userMapper.getUserNumBySchoolId(schoolid);
             usernum2 = usernum2 + 1;//学校账号数量+本次添加的人
             if (usernum.compareTo(usernum2) == -1) {
-                return new ResultVo(1,"账号数量已超限，请联系管理员");
+                return new ResultVo(1, "账号数量已超限，请联系管理员");
             }
         }
         user.setUserstate(1);
         user.setCreatetime(N_Utils.getSecondTimestamp());
         setLoginPwd(user);
         userMapper.insertUseGeneratedKeys(user);
-        return new ResultVo(0, "保存成功",user.getId());
+        return new ResultVo(0, "保存成功", user.getId());
     }
 
     /**
      * 修改用户信息
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 9:51
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo update(TUser user) {
         if (N_Utils.isNotEmpty(user.getLoginpwd())) {
@@ -282,13 +280,13 @@ public class UserService extends JedisUtil {
         if (N_Utils.isNotEmpty(loginname)) {
             TUser user1 = getObjByLoginName(loginname);
             //登录账号改变并且和别的账号冲突
-            if (user1!=null && !user1.getUserid().equals(user.getUserid())) {
-                return new ResultVo(1,"此用户已存在，请更换！");
+            if (user1 != null && !user1.getUserid().equals(user.getUserid())) {
+                return new ResultVo(1, "此用户已存在，请更换！");
             }
         }
         user.setCreatetime(N_Utils.getSecondTimestamp());
         userMapper.updateByPrimaryKeySelective(user);
-        return new ResultVo(0,"修改成功");
+        return new ResultVo(0, "修改成功");
     }
 
     private void setLoginPwd(TUser user) {
@@ -299,87 +297,96 @@ public class UserService extends JedisUtil {
 
     /**
      * 删除用户
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 9:59
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo deleteById(TUser user) {
         user.setDeletetime(N_Utils.getSecondTimestamp());
         userMapper.deleteById(user);
-        return new ResultVo(0,"删除成功");
+        return new ResultVo(0, "删除成功");
     }
 
     /**
      * 获取用户列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:06
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo findAll(TUser user) {
         PageHelper.startPage(user.getPage(), user.getPageSize());
         List<UserVo> list = userMapper.findAll(user);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0,"获取列表成功", pageResult);
+        return new ResultVo(0, "获取列表成功", pageResult);
     }
 
     /**
      * 获取用户详情
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [userid]
      * @Author ywx
      * @Date 2020/6/2 10:23
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo findById(Integer userid) {
         UserVo userVo = userMapper.findById(userid);
-        return new ResultVo(0,"获取详情成功", userVo);
+        return new ResultVo(0, "获取详情成功", userVo);
     }
 
     /**
      * 修改用户密码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:30
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo updatePwd(TUser user) {
-        UserVo userVo = userMapper.findById(user.getUserid());
-
-        String oldpwd = this.md5pwd(user.getOldpwd());
-        if(userVo.getLoginpwd().equals(oldpwd)){
-            setLoginPwd(user);
-            userMapper.updatePwd(user);
-            return new ResultVo(0,"修改成功");
-        }else{
-            return new ResultVo(1,"原密码错误");
+        ResultVo pwdResultVo = UserUtil.checkhLoginPwd(user.getLoginpwd());
+        if (pwdResultVo.getCode() == 0) {
+            UserVo userVo = userMapper.findById(user.getUserid());
+            String oldpwd = this.md5pwd(user.getOldpwd());
+            if (userVo.getLoginpwd().equals(oldpwd)) {
+                setLoginPwd(user);
+                userMapper.updatePwd(user);
+                return new ResultVo(0, "修改成功");
+            } else {
+                return new ResultVo(1, "原密码错误");
+            }
+        } else {
+            return pwdResultVo;
         }
-
     }
 
     /**
      * 修改用户头像
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/6/2 10:37
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo updateHeadPic(TUser user) {
         userMapper.updateHeadPic(user);
-        return new ResultVo(0,"修改成功");
+        return new ResultVo(0, "修改成功");
     }
 
     /**
      * 检查登录账号是否存在
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [loginname]
      * @Author ywx
      * @Date 2020/6/2 10:44
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo checkLoginName(String loginname) {
         Integer num = userMapper.checkLoginName(loginname);
-        if (num != 0){
-            return new ResultVo(1,"此用户已存在，请更换！");
+        if (num != 0) {
+            return new ResultVo(1, "此用户已存在，请更换！");
         } else {
             return new ResultVo(0, "检查登录账号是否存在成功");
         }
@@ -387,10 +394,11 @@ public class UserService extends JedisUtil {
 
     /**
      * 根据登录账号获取用户详情
+     *
+     * @return com.xhkjedu.model.system.TUser
      * @Param [loginname]
      * @Author ywx
      * @Date 2020/6/3 9:33
-     * @return com.xhkjedu.model.system.TUser
      **/
     public TUser getObjByLoginName(String loginname) {
         return userMapper.getObjByLoginName(loginname);
@@ -398,10 +406,11 @@ public class UserService extends JedisUtil {
 
     /**
      * 批量添加
+     *
+     * @return void
      * @Param [users]
      * @Author ywx
      * @Date 2020/6/3 18:27
-     * @return void
      **/
     public void batchSave(List<TUser> users) throws Exception {
         Integer schoolid = users.get(0).getSchoolid();
@@ -418,10 +427,11 @@ public class UserService extends JedisUtil {
 
     /**
      * 修改用户状态
+     *
+     * @return void
      * @Param [userid, userstate]
      * @Author ywx
      * @Date 2020/6/4 9:08
-     * @return void
      **/
     public void updateState(Integer userid, int userstate) {
         userMapper.updateState(userid, userstate);
@@ -429,18 +439,19 @@ public class UserService extends JedisUtil {
 
     /**
      * 导入教师
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [file, tUser]
      * @Author ywx
      * @Date 2020/6/5 8:47
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo importTeacher(MultipartFile file, TUser tUser) {
         Integer schoolid = tUser.getSchoolid();
         Integer createid = tUser.getCreateid();
-        N_Utils.validation(new Object[]{schoolid,"学校id",1,createid,"创建人id",1});
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1, createid, "创建人id", 1});
         try {
-            Map<String,Object> map = PoiUtils.readExcelUser(file, 1);
-            List<TUser> teachers = (List<TUser>)map.get("users");
+            Map<String, Object> map = PoiUtils.readExcelUser(file, 1);
+            List<TUser> teachers = (List<TUser>) map.get("users");
             map.remove("users");//导入成功的教师信息不返回给前端
 
             List<TUser> users = new ArrayList<>();
@@ -448,14 +459,14 @@ public class UserService extends JedisUtil {
             List<TUser> usersExisted = new ArrayList<>();
             for (TUser user : teachers) {
                 TUser u = getObjByLoginName(user.getLoginname());
-                if (null == u){
+                if (null == u) {
                     user.setSchoolid(schoolid);
                     user.setCreateid(createid);
                     user.setCreatetime(N_Utils.getSecondTimestamp());
                     user.setUserstate(1);
                     users.add(user);
                 } else {
-                    if (1 != u.getUsertype() || schoolid != u.getSchoolid()){
+                    if (1 != u.getUsertype() || schoolid != u.getSchoolid()) {
                         usersExisted.add(u);
                     } else {
                         usersExisted.add(u);
@@ -467,11 +478,11 @@ public class UserService extends JedisUtil {
             if (!CollectionUtils.isEmpty(users)) {
                 batchSave(users);
             }
-            map.put("usersExisted",usersExisted);
-            if (N_Utils.isListNotEmpty(usersExisted)){
-                map.put("code",1);
+            map.put("usersExisted", usersExisted);
+            if (N_Utils.isListNotEmpty(usersExisted)) {
+                map.put("code", 1);
             } else {
-                map.put("code",0);
+                map.put("code", 0);
             }
             return new ResultVo(0, "导入成功", map);
         } catch (Exception e) {
@@ -480,42 +491,45 @@ public class UserService extends JedisUtil {
         }
     }
 
-    private String md5pwd(String pwd){
+    private String md5pwd(String pwd) {
         MD5 m = new MD5();
         String loginpwd = m.getMD5ofStr(m.getMD5ofStr(m.getMD5ofStr(pwd)));
         return loginpwd;
     }
 
     /**
-     *功能描述 修改操作密码
+     * 功能描述 修改操作密码
+     *
+     * @param * @param user
+     * @return void
      * @author WN
      * @date 2020/6/17
-     * @param  * @param user
-     * @return void
      */
-    public void updateOpepasswordByUserId(TUser user){
+    public void updateOpepasswordByUserId(TUser user) {
         String pwd = md5pwd(user.getOpepassword());
-        userMapper.updateOpepasswordByUserId(user.getUserid(),pwd);
+        userMapper.updateOpepasswordByUserId(user.getUserid(), pwd);
     }
 
     /**
-     *功能描述 验证用户操作密码
+     * 功能描述 验证用户操作密码
+     *
+     * @param * @param user
+     * @return java.lang.Integer
      * @author WN
      * @date 2020/6/17
-     * @param  * @param user
-     * @return java.lang.Integer
      */
-    public Integer getUserIdByOpepassword(TUser user){
+    public Integer getUserIdByOpepassword(TUser user) {
         String pwd = md5pwd(user.getOpepassword());
-        return userMapper.getUserIdByOpepassword(user.getUserid(),pwd);
+        return userMapper.getUserIdByOpepassword(user.getUserid(), pwd);
     }
 
     /**
      * 教师基本信息
+     *
+     * @return com.xhkjedu.suser.vo.system.TeacherVo
      * @Param [userid]
      * @Author ywx
      * @Date 2020/6/29 16:23
-     * @return com.xhkjedu.suser.vo.system.TeacherVo
      **/
     public TeacherVo getTeacherInfo(Integer userid, Integer classtype) {
         return userMapper.getTeacherInfo(userid, classtype);
@@ -523,23 +537,30 @@ public class UserService extends JedisUtil {
 
     /**
      * 重置密码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/7/30 14:25
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo resetPwd(TUser user) {
-        setLoginPwd(user);
-        userMapper.updatePwd(user);
-        return new ResultVo(0,"重置密码成功");
+        ResultVo pwdResultVo = UserUtil.checkhLoginPwd(user.getLoginpwd());
+        if (pwdResultVo.getCode() == 0) {//密码验证通过
+            setLoginPwd(user);
+            userMapper.updatePwd(user);
+            return new ResultVo(0, "重置密码成功");
+        } else {
+            return pwdResultVo;
+        }
     }
 
     /**
      * 解除mac绑定
+     *
+     * @return void
      * @Param [studentid]
      * @Author ywx
      * @Date 2020/9/18 11:56
-     * @return void
      **/
     public void removeBind(Integer studentid) {
         UserVo user = new UserVo();
@@ -551,23 +572,25 @@ public class UserService extends JedisUtil {
 
     /**
      * 生成修改码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [userphone]
      * @Author ywx
      * @Date 2020/10/13 15:08
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo updateCode(String userphone) {
         String templateCode = "xgmm";
         if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在5分钟之后重新点击");
-        return new ResultVo(0,"生成修改码成功");
+        return new ResultVo(0, "生成修改码成功");
     }
 
     /**
      * 生成验证码
+     *
+     * @return boolean
      * @Param [userphone, templateCode]
      * @Author ywx
      * @Date 2020/5/8 10:04
-     * @return boolean
      **/
     private boolean generateCode(String userphone, String templateCode) {
         Integer msgNum = msgMapper.getMsgNumByUserPhone(userphone);//5分钟内发送短信次数
@@ -599,25 +622,32 @@ public class UserService extends JedisUtil {
 
     /**
      * 通过短信修改密码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/13 15:17
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo updatePwdByCode(TUser user) {
-        setLoginPwd(user);
-        ResultVo x = getCodeResultVo(user.getUserphone(), user.getMsgcode());
-        if (x != null) return x;
-        userMapper.updatePwdByCode(user);
-        return new ResultVo(0,"修改成功");
+        ResultVo pwdResultVo = UserUtil.checkhLoginPwd(user.getLoginpwd());
+        if (pwdResultVo.getCode() == 0) {
+            setLoginPwd(user);
+            ResultVo x = getCodeResultVo(user.getUserphone(), user.getMsgcode());
+            if (x != null) return x;
+            userMapper.updatePwdByCode(user);
+            return new ResultVo(0, "修改成功");
+        } else {
+            return pwdResultVo;
+        }
     }
 
     /**
      * 判断验证码是否有效
+     *
+     * @return com.xhkjedu.model.baseinfo.ResultVo
      * @Param [userphone, messageCode]
      * @Author ywx
      * @Date 2020/5/8 10:21
-     * @return com.xhkjedu.model.baseinfo.ResultVo
      **/
     private ResultVo getCodeResultVo(String userphone, Integer messageCode) {
         TMsg msg = msgMapper.findByUserPhoneAndCode(userphone, messageCode);//根据手机号和验证码获取短信信息
@@ -629,58 +659,60 @@ public class UserService extends JedisUtil {
 
     /**
      * 生成登录确认码
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [userphone]
      * @Author ywx
      * @Date 2020/10/13 15:19
-     * @return com.xhkjedu.vo.ResultVo
      **/
     public ResultVo loginCode(String userphone) {
-        N_Utils.validation(new Object[]{userphone,"手机号",2});
+        N_Utils.validation(new Object[]{userphone, "手机号", 2});
         String templateCode = "dlqr";
         if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在5分钟之后重新点击");
-        return new ResultVo(0,"生成登录确认码成功");
+        return new ResultVo(0, "生成登录确认码成功");
     }
 
     /**
      * 验证码登录
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [user]
      * @Author ywx
      * @Date 2020/10/13 15:36
-     * @return com.xhkjedu.vo.ResultVo
      **/
-    public ResultVo loginByCode(TUser user,HttpServletRequest request) {
+    public ResultVo loginByCode(TUser user, HttpServletRequest request) {
         ResultVo resultVo = getCodeResultVo(user.getUserphone(), user.getMsgcode());
         if (resultVo != null) return resultVo;
         UserVo userVo = userMapper.getUserByLoginname(user.getUserphone());
 
-        if(userVo!=null && userVo.getUserid()>0){
+        if (userVo != null && userVo.getUserid() > 0) {
             user.setUserid(userVo.getUserid());
             user.setUsername(userVo.getUsername());
             user.setSchoolid(userVo.getSchoolid());
-            if(userVo.getUsertype()==999){
-                resultVo = new ResultVo(0,"登录成功",userVo);
-            } else if(userVo.getUsertype()==2){
-                resultVo = new ResultVo(1,"禁止学生登录");
-            } else if(userVo.getSchoolstate()!=1){
-                resultVo = new ResultVo(1,"用户所在学校暂无权限");
-            }else{
-                if(userVo.getUserstate()!=1){
-                    resultVo = new ResultVo(1,"该账户无权访问，请联系老师");
-                }else{
-                    resultVo = new ResultVo(0,"登录成功",userVo);
+            if (userVo.getUsertype() == 999) {
+                resultVo = new ResultVo(0, "登录成功", userVo);
+            } else if (userVo.getUsertype() == 2) {
+                resultVo = new ResultVo(1, "禁止学生登录");
+            } else if (userVo.getSchoolstate() != 1) {
+                resultVo = new ResultVo(1, "用户所在学校暂无权限");
+            } else {
+                if (userVo.getUserstate() != 1) {
+                    resultVo = new ResultVo(1, "该账户无权访问，请联系老师");
+                } else {
+                    resultVo = new ResultVo(0, "登录成功", userVo);
                 }
             }
-        }else{
-            resultVo = new ResultVo(1,"该账号不存在");
+        } else {
+            resultVo = new ResultVo(1, "该账号不存在");
         }
 
-        return getLogResultVo(user, resultVo, user.getMsgcode()+"", request);
+        return getLogResultVo(user, resultVo, user.getMsgcode() + "", request);
     }
 
     public ResultVo batchUpdatePwd(TUser user) {
         setLoginPwd(user);
         userMapper.batchUpdatePwd(user);
-        return new ResultVo(0,"修改成功");
+        return new ResultVo(0, "修改成功");
     }
 
     public ResultVo checkLogin(Integer userid, String loginpwd) {
@@ -719,26 +751,26 @@ public class UserService extends JedisUtil {
         ResultVo resultVo = null;
         UserVo userVo = userMapper.getUserByLoginname(user.getLoginname());
 
-        if(userVo!=null && userVo.getUserid()>0){
+        if (userVo != null && userVo.getUserid() > 0) {
             user.setUserid(userVo.getUserid());
             user.setUsername(userVo.getUsername());
             user.setSchoolid(userVo.getSchoolid());
             user.setUltype("p_web_t");
-            if(userVo.getUsertype()==999){
-                resultVo = new ResultVo(0,"登录成功",userVo);
-            } else if(userVo.getUsertype()==2){
-                resultVo = new ResultVo(1,"禁止学生登录");
-            } else if(userVo.getSchoolstate()!=1){
-                resultVo = new ResultVo(1,"用户所在学校暂无权限");
-            }else{
-                if(userVo.getUserstate()!=1){
-                    resultVo = new ResultVo(1,"该账户无权访问，请联系老师");
-                }else{
-                    resultVo = new ResultVo(0,"登录成功",userVo);
+            if (userVo.getUsertype() == 999) {
+                resultVo = new ResultVo(0, "登录成功", userVo);
+            } else if (userVo.getUsertype() == 2) {
+                resultVo = new ResultVo(1, "禁止学生登录");
+            } else if (userVo.getSchoolstate() != 1) {
+                resultVo = new ResultVo(1, "用户所在学校暂无权限");
+            } else {
+                if (userVo.getUserstate() != 1) {
+                    resultVo = new ResultVo(1, "该账户无权访问，请联系老师");
+                } else {
+                    resultVo = new ResultVo(0, "登录成功", userVo);
                 }
             }
-        }else{
-            resultVo = new ResultVo(1,"该账号不存在");
+        } else {
+            resultVo = new ResultVo(1, "该账号不存在");
         }
 
         return getLogResultVo(user, resultVo, "", request);
@@ -746,10 +778,11 @@ public class UserService extends JedisUtil {
 
     /**
      * 获取头像是否可以修改
+     *
+     * @return java.lang.Integer
      * @Param [userid]
      * @Author ywx
      * @Date 2022/3/14 9:58
-     * @return java.lang.Integer
      **/
     public Integer getHeadTime(Integer userid) {
         return userMapper.getHeadTime(userid);

suser/src/main/java/com/xhkjedu/suser/utils/UserUtil.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.suser.utils;
 
+import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -22,10 +23,11 @@ import java.util.List;
 public class UserUtil {
     /**
      * 发送form-data请求返回json结果
+     *
+     * @return java.lang.String
      * @Param [apiUrl, param]
      * @Author ywx
      * @Date 2021/5/14 17:41
-     * @return java.lang.String
      **/
     public static String sendFormData(String apiUrl, MultiValueMap<String, String> param) {
         try {
@@ -39,8 +41,25 @@ public class UserUtil {
             String result = response.getBody();
             return result;
         } catch (RestClientException e) {
-            log.error("发送form-data请求失败",e.getMessage());
+            log.error("发送form-data请求失败", e.getMessage());
             return null;
         }
     }
+
+    /**
+     * 功能描述  校验密码，包含字母和数字，长度6-16
+     *
+     * @param * @param loginpwd
+     * @return ResultVo
+     * @author WN
+     * @date 2022/3/15
+     */
+    public static ResultVo checkhLoginPwd(String loginpwd) {
+        ResultVo resultVo = new ResultVo(1, "密码必须是6-16位的英文字母、数字组合");
+        String passRegex = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$";
+        if (loginpwd.matches(passRegex)) {
+            resultVo = new ResultVo(0, "密码符合规范");
+        }
+        return resultVo;
+    }
 }