Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-22 f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1

 src/main/java/com/ruoyi/framework/security/service/TokenService.java

@@ -1,20 +1,6 @@
package com.ruoyi.framework.security.service;



import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.TimeUnit;

import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.ruoyi.project.system.domain.SysUserDept;

import com.ruoyi.project.system.mapper.SysUserDeptMapper;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.stereotype.Component;

import com.ruoyi.common.constant.CacheConstants;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.utils.ServletUtils;

@@ -25,11 +11,26 @@
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysUserDept;

import com.ruoyi.project.system.mapper.SysUserDeptMapper;

import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims;

import io.jsonwebtoken.Jwts;

import io.jsonwebtoken.SignatureAlgorithm;

import io.jsonwebtoken.security.Keys;

import jakarta.servlet.http.HttpServletRequest;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.stereotype.Component;

import org.springframework.util.CollectionUtils;



import javax.crypto.SecretKey;

import java.nio.charset.StandardCharsets;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.TimeUnit;



/**

 * token验证处理

@@ -252,6 +253,11 @@
        loginUser.setOs(userAgent.getOperatingSystem().getName());

    }



    private SecretKey getSigningKey() {

        byte[] keyBytes = secret.getBytes(StandardCharsets.UTF_8);

        return Keys.hmacShaKeyFor(keyBytes);

    }



    /**

     * 从数据声明生成令牌

     *

@@ -260,10 +266,10 @@
     */

    private String createToken(Map<String, Object> claims)

    {

        String token = Jwts.builder()

                .setClaims(claims)

                .signWith(SignatureAlgorithm.HS512, secret).compact();

        return token;

        return Jwts.builder()

                .claims(claims) // 注意：新版方法名变了，不再是 setClaims

                .signWith(getSigningKey(), Jwts.SIG.HS512) // 使用新的签名常量

                .compact();

    }



    /**

@@ -275,9 +281,10 @@
    private Claims parseToken(String token)

    {

        return Jwts.parser()

                .setSigningKey(secret)

                .parseClaimsJws(token)

                .getBody();

                .verifyWith(getSigningKey()) // 新版使用 verifyWith

                .build()

                .parseSignedClaims(token)

                .getPayload();

    }



    /**