联调测试扫码登录模拟

imcs-admin-boot/imcs-oauth-biz/src/main/java/com/github/zuihou/oauth/granter/AbstractTokenGranter.java

@@ -87,7 +87,7 @@ public abstract class AbstractTokenGranter implements TokenGranter {
         }
 
         // 3. 验证登录
-        R<User> result = this.getUser(tenant, loginParam.getAccount(), loginParam.getPassword(),loginParam.getCode());
+        R<User> result = this.getUser(tenant, loginParam);
         if (result.getIsError()) {
             return R.fail(result.getCode(), result.getMsg());
         }
@@ -141,20 +141,24 @@ public abstract class AbstractTokenGranter implements TokenGranter {
      * 检测用户密码是否正确
      *
      * @param tenant   租户
-     * @param account  账号
-     * @param password 密码
-     * @param code 验证码
+     * @param loginParam 登陆信息
      * @return 用户信息
      */
-    protected R<User> getUser(Tenant tenant, String account, String password,String code) {
-        User user = this.userService.getByAccount(account);
+    protected R<User> getUser(Tenant tenant, LoginParamDTO loginParam) {
+        User user = this.userService.getByAccount(loginParam.getAccount());
         // 密码错误
         String passwordMd5 = "";
-        if(StringUtils.isBlank(code)){
+        if(StringUtils.isBlank(loginParam.getCode())){
 //            passwordMd5 = password;
-            passwordMd5 = cn.hutool.crypto.SecureUtil.md5(password);
+            // 非扫码登陆
+            if(StringUtils.isBlank(loginParam.getQcodeUser())){
+
+                passwordMd5 = cn.hutool.crypto.SecureUtil.md5(loginParam.getPassword());
+            }else{
+                passwordMd5 = loginParam.getPassword();
+            }
         }else{
-            passwordMd5 = cn.hutool.crypto.SecureUtil.md5(password);
+            passwordMd5 = cn.hutool.crypto.SecureUtil.md5(loginParam.getPassword());
         }
         if (user == null) {
             return R.fail(ExceptionCode.JWT_USER_INVALID);