修改一体机密码登录

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -674,11 +674,9 @@ public class SysLoginService
     public AjaxResult phoneLogin(LoginBody loginBody){
         //AppUser appUser=appUserService.getPhone(loginBody.getUsername());
         AppUser appUser=appUserService.getYtjValidPhone(loginBody.getUsername());
-        if(appUser==null){
+        AjaxResult ajaxResult=validPhoneLogin(loginBody.getPassword(),appUser);
-            return AjaxResult.error("未查询到您的注册信息，请先完成注册后再登录～");
+        if(!ajaxResult.isSuccess()){
-        }
+            return ajaxResult;
-        if(!SiteSecurityUtils.matchesPassword(loginBody.getPassword(),appUser.getYtjPassword())){
-            return AjaxResult.error("您输入的密码有误，请核对后重新尝试～!");
         }
         return getAjax(appUser);
     }
@@ -710,4 +708,27 @@ public class SysLoginService
         ajax.put("isCompanyUser",appUser.getIsCompanyUser());
         return ajax;
     }
+
+    /**
+     * 手机验证登录
+     * @param password
+     * @param appUser
+     * @return
+     */
+    public static AjaxResult validPhoneLogin(String password,AppUser appUser){
+        if(appUser==null){
+            return AjaxResult.error("未查询到您的注册信息，请先完成注册后再登录～");
+        }
+        if(StringUtils.isBlank(appUser.getYtjPassword())){
+            return AjaxResult.error("一体机密码为空，请维护后再进行登录～!");
+        }
+        try {
+            if (!SiteSecurityUtils.matchesPassword(password, appUser.getYtjPassword())) {
+                return AjaxResult.error("您输入的密码有误，请核对后重新尝试～");
+            }
+        } catch (Exception e) {
+            return AjaxResult.error("密码校验失败，请稍后重试～");
+        }
+        return AjaxResult.success("验证成功!");
+    }
 }