Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -135,7 +135,8 @@ public class SysLoginController
      */
     @GetMapping("/scanCode/getPool/{uuid}")
     public R<?> getPool(@PathVariable String uuid) {
-        return tokenService.getPool(uuid);
+        R<?> pool = tokenService.getPool(uuid);
+        return pool;
     }
 
     /**

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

@@ -294,16 +294,17 @@ public class TokenService
         try {
             if (StringUtils.isBlank(cacheObject)) {
                 r.setMsg("该二维码已经失效,请重新获取");
-            } else if (cacheObject.equals(SUCCESS.toString())) {
+            } else if (cacheObject.equals(SUCCESS)) {
                 r.setMsg("has_scan");
             } else if (cacheObject.length() > 3) {
-                SysUser user = sysUserService.getByPhone(cacheObject.toString());
+                SysUser user = sysUserService.getByPhone(cacheObject);
                 LoginUser loginUser = packPermDeptRoles(user);
                 //获取token
                 Map<String, Object> token = tokenService.createTokenQr(loginUser);
                 Object accessToken = token.get("access_token");
                 r.setCode(SUCCESS_QR);
                 r.setMsg(LOGIN_SUCCESS_APP+accessToken);
+                //删除这个二维码信息
                 redisCache.deleteObject(uuid);
                 return r;
             }
@@ -341,12 +342,13 @@ public class TokenService
         loginUser.setUserEnv(userEnv);
         loginUser.setLoginType("PC");
         refreshToken(loginUser);
-
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(Constants.LOGIN_USER_KEY, token);
         // 保存或更新用户token
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("access_token", token);
+        map.put("access_token", createToken(claims));
         map.put("expires_in", EXPIRE_TIME);
-        redisService.setCacheObject(ACCESS_TOKEN + token, loginUser, EXPIRE_TIME, TimeUnit.SECONDS);
+        //redisService.setCacheObject(ACCESS_TOKEN + token, loginUser, EXPIRE_TIME, TimeUnit.SECONDS);
         return map;
     }
 
@@ -384,7 +386,7 @@ public class TokenService
             r.setMsg("该二维码已经失效,请重新获取");
         }
         if (code != null) {
-            redisService.setCacheObject(uuid, SUCCESS_QR);
+            redisService.setCacheObject(uuid, SUCCESS);
         }
         return r;
     }