将isAdmin方法统一到SecurityUtils

RuoYi

2026-01-05 1c0562ba18786d00e68fe96a0704e1e6a1f52d77

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -6,20 +6,24 @@
import org.springframework.validation.BindException;

import org.springframework.web.HttpRequestMethodNotSupportedException;

import org.springframework.web.bind.MethodArgumentNotValidException;

import org.springframework.web.bind.MissingPathVariableException;

import org.springframework.web.bind.annotation.ExceptionHandler;

import org.springframework.web.bind.annotation.RestControllerAdvice;

import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;

import com.ruoyi.common.core.constant.HttpStatus;

import com.ruoyi.common.core.exception.DemoModeException;

import com.ruoyi.common.core.exception.InnerAuthException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.exception.auth.NotPermissionException;

import com.ruoyi.common.core.exception.auth.NotRoleException;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.html.EscapeUtil;

import com.ruoyi.common.core.web.domain.AjaxResult;



/**

 * 全局异常处理器

 * 
 *

 * @author ruoyi

 */

@RestControllerAdvice

@@ -53,8 +57,7 @@
     * 请求方式不支持

     */

    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)

    public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,

            HttpServletRequest request)

    public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e, HttpServletRequest request)

    {

        String requestURI = request.getRequestURI();

        log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod());

@@ -73,6 +76,33 @@
    }



    /**

     * 请求路径中缺少必需的路径变量

     */

    @ExceptionHandler(MissingPathVariableException.class)

    public AjaxResult handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request)

    {

        String requestURI = request.getRequestURI();

        log.error("请求路径中缺少必需的路径变量'{}',发生系统异常.", requestURI, e);

        return AjaxResult.error(String.format("请求路径中缺少必需的路径变量[%s]", e.getVariableName()));

    }



    /**

     * 请求参数类型不匹配

     */

    @ExceptionHandler(MethodArgumentTypeMismatchException.class)

    public AjaxResult handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request)

    {

        String requestURI = request.getRequestURI();

        String value = Convert.toStr(e.getValue());

        if (StringUtils.isNotEmpty(value))

        {

            value = EscapeUtil.clean(value);

        }

        log.error("请求参数类型不匹配'{}',发生系统异常.", requestURI, e);

        return AjaxResult.error(String.format("请求参数类型不匹配，参数[%s]要求类型为：'%s'，但输入值为：'%s'", e.getName(), e.getRequiredType().getName(), value));

    }



    /**

     * 拦截未知的运行时异常

     */

    @ExceptionHandler(RuntimeException.class)