Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-08-02 cfdeada3fdb415ea451fb3fb76b96a2e7977752c

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

@@ -50,12 +50,15 @@
        // 获取请求携带的令牌
        String token = getToken(request);
        if (Validator.isNotEmpty(token)) {
         try {
            Claims claims = parseToken(token);
            // 解析对应的权限以及用户信息
            String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
            String userKey = getTokenKey(uuid);
            LoginUser user = redisCache.getCacheObject(userKey);
            return user;
            catch (Exception e) {
         }
        }
        return null;
    }