完善登录失败日志

suser/src/main/java/com/xhkjedu/suser/model/system/TUser.java

@@ -172,6 +172,6 @@ public class TUser extends BaseBean {
     private String ultypeband;
 
     @Transient
-    //终端型号（华为mate9、小米13等）
+    //登录终端型号（华为mate9、小米13等）
     private String ultypemodel;
 }

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

@@ -154,11 +154,11 @@ public class UserService extends JedisUtil {
                 UserVo binduser = userMapper.getStudentByuserIdMac(userVo.getUserid(), mac);
                 if (sbindmac == 1 && N_Utils.isNotEmpty(mac)) {
                     if (N_Utils.isNotEmpty(binduser.getMac()) && !mac.equals(binduser.getMac())) {
-                        return new ResultVo(1, "登录失败，该账号已与其他设备关联", userVo);
+                        return new ResultVo(1, "该账号已与其他设备关联", userVo);
                     } else {
                         //20211221添加注释，sql语句修改了，不绑定的情况下会出现一个mac可以绑定多个帐号，绑定情况下没问题
                         if (N_Utils.isNotEmpty(binduser.getMacname()) && !binduser.getMacname().equals(user.getLoginname())) {
-                            return new ResultVo(1, "登录失败，该设备已与其他账号关联", userVo);
+                            return new ResultVo(1, "该设备已与其他账号关联", userVo);
                         } else {
                             return new ResultVo(0, "登录成功", userVo);
                         }
@@ -389,7 +389,6 @@ public class UserService extends JedisUtil {
         TUserLog userLog = new TUserLog();
         userLog.setLoginname(loginname);
         userLog.setMac(user.getMac());
-        Integer usertype = user.getUsertype();
         UserVo userVo = null;
         if (result.getCode() == 0) {
             userVo = (UserVo) result.getObj();
@@ -402,7 +401,7 @@ public class UserService extends JedisUtil {
                 result.setCode(1);
                 result.setMsg("加入缓存出错!");
                 userLog.setLoginstate(2);
-                userLog.setLogtxt("登录失败");
+                userLog.setLogtxt("登录失败，" + result.getMsg());
                 // return result;
             } else {
                 userLog.setLoginstate(1);
@@ -416,7 +415,11 @@ public class UserService extends JedisUtil {
                 userVo = (UserVo) result.getObj();
             }
             userLog.setLoginstate(2);
-            userLog.setLogtxt(result.getMsg() + "，密码：" + loginpwd);
+            if(result.getMsg().contains("密码错误")){
+                userLog.setLogtxt("登录失败，" + result.getMsg() + "，密码：" + loginpwd);
+            }else{
+                userLog.setLogtxt("登录失败，" + result.getMsg());
+            }
         }
 
         //保存登录日志