新增小程序扫码

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,10 +294,10 @@ 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);
@@ -384,7 +384,7 @@ public class TokenService
             r.setMsg("该二维码已经失效,请重新获取");
         }
         if (code != null) {
-            redisService.setCacheObject(uuid, SUCCESS_QR);
+            redisService.setCacheObject(uuid, SUCCESS);
         }
         return r;
     }