update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题

疯狂的狮子li

2021-06-12 b3541e975898e17a6cbc1a9ea776f3ec7e91d39a

update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -54,10 +54,10 @@

            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
            FileUtils.setAttachmentResponseHeader(response, realFileName);
            FileUtils.writeBytes(filePath, response.getOutputStream());
            FileUtils.writeToStream(filePath, response.getOutputStream());
            if (delete)
            {
                FileUtils.deleteFile(filePath);
                FileUtils.del(filePath);
            }
        }
        catch (Exception e)
@@ -111,7 +111,7 @@
            String downloadName = StrUtil.subAfter(downloadPath, "/",true);
            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
            FileUtils.setAttachmentResponseHeader(response, downloadName);
            FileUtils.writeBytes(downloadPath, response.getOutputStream());
            FileUtils.writeToStream(downloadPath, response.getOutputStream());
        }
        catch (Exception e)
        {

 ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java

@@ -1,15 +1,17 @@
package com.ruoyi.common.filter;



import java.io.BufferedReader;

import java.io.ByteArrayInputStream;

import java.io.IOException;

import java.io.InputStreamReader;

import cn.hutool.core.io.IoUtil;

import javax.servlet.ReadListener;

import javax.servlet.ServletInputStream;

import javax.servlet.ServletResponse;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletRequestWrapper;

import com.ruoyi.common.utils.http.HttpHelper;

import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;


/**

 * æž„建可重复读取inputStream的request

@@ -26,7 +28,7 @@
        request.setCharacterEncoding("UTF-8");

        response.setCharacterEncoding("UTF-8");



        body = HttpHelper.getBodyString(request).getBytes("UTF-8");

        body = IoUtil.readUtf8(request.getInputStream()).getBytes(StandardCharsets.UTF_8);
    }



    @Override


 ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java

@@ -1,9 +1,9 @@
package com.ruoyi.common.filter;

import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HtmlUtil;
import org.apache.commons.io.IOUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;

@@ -13,6 +13,7 @@
import javax.servlet.http.HttpServletRequestWrapper;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;

/**
 * XSS过滤处理
@@ -57,7 +58,7 @@
        }

        // ä¸ºç©ºï¼Œç›´æŽ¥è¿”回
        String json = IOUtils.toString(super.getInputStream(), "utf-8");
        String json = IoUtil.read(super.getInputStream(), StandardCharsets.UTF_8);
        if (Validator.isEmpty(json))
        {
            return super.getInputStream();
@@ -65,7 +66,8 @@

        // xss过滤
        json = HtmlUtil.cleanHtmlTag(json).trim();
        final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));

        final ByteArrayInputStream bis = IoUtil.toStream(json, StandardCharsets.UTF_8);
        return new ServletInputStream()
        {
            @Override

 ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java

@@ -2,6 +2,9 @@

import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -10,72 +13,64 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.nio.charset.StandardCharsets;

/**
 * å®¢æˆ·ç«¯å·¥å…·ç±»
 * 
 * @author ruoyi
 */
public class ServletUtils
{
public class ServletUtils extends ServletUtil {
    /**
     * èŽ·å–String参数
     */
    public static String getParameter(String name)
    {
    public static String getParameter(String name) {
        return getRequest().getParameter(name);
    }

    /**
     * èŽ·å–String参数
     */
    public static String getParameter(String name, String defaultValue)
    {
    public static String getParameter(String name, String defaultValue) {
        return Convert.toStr(getRequest().getParameter(name), defaultValue);
    }

    /**
     * èŽ·å–Integer参数
     */
    public static Integer getParameterToInt(String name)
    {
    public static Integer getParameterToInt(String name) {
        return Convert.toInt(getRequest().getParameter(name));
    }

    /**
     * èŽ·å–Integer参数
     */
    public static Integer getParameterToInt(String name, Integer defaultValue)
    {
    public static Integer getParameterToInt(String name, Integer defaultValue) {
        return Convert.toInt(getRequest().getParameter(name), defaultValue);
    }

    /**
     * èŽ·å–request
     */
    public static HttpServletRequest getRequest()
    {
    public static HttpServletRequest getRequest() {
        return getRequestAttributes().getRequest();
    }

    /**
     * èŽ·å–response
     */
    public static HttpServletResponse getResponse()
    {
    public static HttpServletResponse getResponse() {
        return getRequestAttributes().getResponse();
    }

    /**
     * èŽ·å–session
     */
    public static HttpSession getSession()
    {
    public static HttpSession getSession() {
        return getRequest().getSession();
    }

    public static ServletRequestAttributes getRequestAttributes()
    {
    public static ServletRequestAttributes getRequestAttributes() {
        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
        return (ServletRequestAttributes) attributes;
    }
@@ -87,17 +82,13 @@
     * @param string å¾…渲染的字符串
     * @return null
     */
    public static String renderString(HttpServletResponse response, String string)
    {
        try
        {
            response.setStatus(200);
            response.setContentType("application/json");
            response.setCharacterEncoding("utf-8");
    public static String renderString(HttpServletResponse response, String string) {
        try {
            response.setStatus(HttpStatus.HTTP_OK);
            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
            response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
            response.getWriter().print(string);
        }
        catch (IOException e)
        {
        } catch (IOException e) {
            e.printStackTrace();
        }
        return null;
@@ -108,31 +99,32 @@
     * 
     * @param request
     */
    public static boolean isAjaxRequest(HttpServletRequest request)
    {
    public static boolean isAjaxRequest(HttpServletRequest request) {

        String accept = request.getHeader("accept");
        if (accept != null && accept.indexOf("application/json") != -1)
        {
        if (accept != null && accept.indexOf("application/json") != -1) {
            return true;
        }

        String xRequestedWith = request.getHeader("X-Requested-With");
        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
        {
        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
            return true;
        }

        String uri = request.getRequestURI();
        if (StrUtil.equalsAnyIgnoreCase(uri, ".json", ".xml"))
        {
        if (StrUtil.equalsAnyIgnoreCase(uri, ".json", ".xml")) {
            return true;
        }

        String ajax = request.getParameter("__ajax");
        if (StrUtil.equalsAnyIgnoreCase(ajax, "json", "xml"))
        {
        if (StrUtil.equalsAnyIgnoreCase(ajax, "json", "xml")) {
            return true;
        }
        return false;
    }

    public static String getClientIP() {
        return getClientIP(getRequest());
    }

}

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

@@ -1,5 +1,6 @@
package com.ruoyi.common.utils.file;

import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;

@@ -14,84 +15,9 @@
 * 
 * @author ruoyi
 */
public class FileUtils extends org.apache.commons.io.FileUtils
public class FileUtils extends FileUtil
{
    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";

    /**
     * è¾“出指定文件的byte数组
     * 
     * @param filePath æ–‡ä»¶è·¯å¾„
     * @param os è¾“出流
     * @return
     */
    public static void writeBytes(String filePath, OutputStream os) throws IOException
    {
        FileInputStream fis = null;
        try
        {
            File file = new File(filePath);
            if (!file.exists())
            {
                throw new FileNotFoundException(filePath);
            }
            fis = new FileInputStream(file);
            byte[] b = new byte[1024];
            int length;
            while ((length = fis.read(b)) > 0)
            {
                os.write(b, 0, length);
            }
        }
        catch (IOException e)
        {
            throw e;
        }
        finally
        {
            if (os != null)
            {
                try
                {
                    os.close();
                }
                catch (IOException e1)
                {
                    e1.printStackTrace();
                }
            }
            if (fis != null)
            {
                try
                {
                    fis.close();
                }
                catch (IOException e1)
                {
                    e1.printStackTrace();
                }
            }
        }
    }

    /**
     * åˆ é™¤æ–‡ä»¶
     * 
     * @param filePath æ–‡ä»¶
     * @return
     */
    public static boolean deleteFile(String filePath)
    {
        boolean flag = false;
        File file = new File(filePath);
        // è·¯å¾„为文件且不为空则进行删除
        if (file.isFile() && file.exists())
        {
            file.delete();
            flag = true;
        }
        return flag;
    }

    /**
     * æ–‡ä»¶åç§°éªŒè¯
@@ -142,7 +68,7 @@
        if (agent.contains("MSIE"))
        {
            // IE浏览器
            filename = URLEncoder.encode(filename, "utf-8");
            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString());
            filename = filename.replace("+", " ");
        }
        else if (agent.contains("Firefox"))
@@ -153,12 +79,12 @@
        else if (agent.contains("Chrome"))
        {
            // google浏览器
            filename = URLEncoder.encode(filename, "utf-8");
            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString());
        }
        else
        {
            // å…¶å®ƒæµè§ˆå™¨
            filename = URLEncoder.encode(filename, "utf-8");
            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString());
        }
        return filename;
    }

 ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java

ÎļþÒÑɾ³ý

 ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

ÎļþÒÑɾ³ý

 ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java

@@ -1,21 +1,20 @@
package com.ruoyi.common.utils.ip;

import cn.hutool.core.net.NetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.http.HttpUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;

/**
 * èŽ·å–地址类
 * 
 * @author ruoyi
 */
public class AddressUtils
{
    private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
@Slf4j
public class AddressUtils {

    // IP地址查询
    public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
@@ -23,21 +22,19 @@
    // æœªçŸ¥åœ°å€
    public static final String UNKNOWN = "XX XX";

    public static String getRealAddressByIP(String ip)
    {
    public static String getRealAddressByIP(String ip) {
        String address = UNKNOWN;
        // å†…网不查询
        if (IpUtils.internalIp(ip))
        {
        if (NetUtil.isInnerIP(ip)) {
            return "内网IP";
        }
        if (RuoYiConfig.isAddressEnabled())
        {
            try
            {
                String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
                if (StrUtil.isEmpty(rspStr))
                {
        if (RuoYiConfig.isAddressEnabled()) {
            try {
                String rspStr = HttpUtil.createGet(IP_URL)
                    .body("ip=" + ip + "&json=true", Constants.GBK)
                    .execute()
                    .body();
                if (StrUtil.isEmpty(rspStr)) {
                    log.error("获取地理位置异常 {}", ip);
                    return UNKNOWN;
                }
@@ -45,9 +42,7 @@
                String region = obj.getString("pro");
                String city = obj.getString("city");
                return String.format("%s %s", region, city);
            }
            catch (Exception e)
            {
            } catch (Exception e) {
                log.error("获取地理位置异常 {}", ip);
            }
        }

 ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java

ÎļþÒÑɾ³ý

 ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java

@@ -1,44 +1,32 @@
package com.ruoyi.common.utils.reflect;



import cn.hutool.core.convert.Convert;

import com.ruoyi.common.utils.DateUtils;

import org.apache.commons.lang3.StringUtils;

import org.apache.commons.lang3.Validate;

import org.apache.poi.ss.usermodel.DateUtil;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;


import java.lang.reflect.*;

import java.util.Date;

import java.lang.reflect.Method;


/**

 * åå°„工具类. æä¾›è°ƒç”¨getter/setter方法, è®¿é—®ç§æœ‰å˜é‡, è°ƒç”¨ç§æœ‰æ–¹æ³•, èŽ·å–泛型类型Class, è¢«AOP过的真实类等工具函数.

 * 

 * @author ruoyi

 * @author Lion Li
 */

@SuppressWarnings("rawtypes")

public class ReflectUtils

{

public class ReflectUtils extends ReflectUtil {

    private static final String SETTER_PREFIX = "set";



    private static final String GETTER_PREFIX = "get";



    private static final String CGLIB_CLASS_SEPARATOR = "$$";



    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);



    /**

     * è°ƒç”¨Getter方法.

     * æ”¯æŒå¤šçº§ï¼Œå¦‚：对象名.对象名.方法

     */

    @SuppressWarnings("unchecked")

    public static <E> E invokeGetter(Object obj, String propertyName)

    {

    public static <E> E invokeGetter(Object obj, String propertyName) {
        Object object = obj;

        for (String name : StringUtils.split(propertyName, "."))

        {

            String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);

            object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});

        for (String name : StrUtil.split(propertyName, ".")) {
            String getterMethodName = GETTER_PREFIX + StrUtil.upperFirst(name);
            object = invoke(object, getterMethodName);
        }

        return (E) object;

    }

@@ -47,360 +35,19 @@
     * è°ƒç”¨Setter方法, ä»…匹配方法名。

     * æ”¯æŒå¤šçº§ï¼Œå¦‚：对象名.对象名.方法

     */

    public static <E> void invokeSetter(Object obj, String propertyName, E value)

    {

    public static <E> void invokeSetter(Object obj, String propertyName, E value) {
        Object object = obj;

        String[] names = StringUtils.split(propertyName, ".");

        for (int i = 0; i < names.length; i++)

        {

            if (i < names.length - 1)

            {

                String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);

                object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});

            }

            else

            {

                String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);

                invokeMethodByName(object, setterMethodName, new Object[] { value });

        String[] names = StrUtil.split(propertyName, ".");
        for (int i = 0; i < names.length; i++) {
            if (i < names.length - 1) {
                String getterMethodName = GETTER_PREFIX + StrUtil.upperFirst(names[i]);
                object = invoke(object, getterMethodName);
            } else {
                String setterMethodName = SETTER_PREFIX + StrUtil.upperFirst(names[i]);
                Method method = getMethodByName(object.getClass(), setterMethodName);
                invoke(object, method, value);
            }

        }

    }



    /**

     * ç›´æŽ¥è¯»å–对象属性值, æ— è§†private/protected修饰符, ä¸ç»è¿‡getter函数.

     */

    @SuppressWarnings("unchecked")

    public static <E> E getFieldValue(final Object obj, final String fieldName)

    {

        Field field = getAccessibleField(obj, fieldName);

        if (field == null)

        {

            logger.debug("在 [" + obj.getClass() + "] ä¸­ï¼Œæ²¡æœ‰æ‰¾åˆ° [" + fieldName + "] å­—段 ");

            return null;

        }

        E result = null;

        try

        {

            result = (E) field.get(obj);

        }

        catch (IllegalAccessException e)

        {

            logger.error("不可能抛出的异常{}", e.getMessage());

        }

        return result;

    }



    /**

     * ç›´æŽ¥è®¾ç½®å¯¹è±¡å±žæ€§å€¼, æ— è§†private/protected修饰符, ä¸ç»è¿‡setter函数.

     */

    public static <E> void setFieldValue(final Object obj, final String fieldName, final E value)

    {

        Field field = getAccessibleField(obj, fieldName);

        if (field == null)

        {

            // throw new IllegalArgumentException("在 [" + obj.getClass() + "] ä¸­ï¼Œæ²¡æœ‰æ‰¾åˆ° [" + fieldName + "] å­—段 ");

            logger.debug("在 [" + obj.getClass() + "] ä¸­ï¼Œæ²¡æœ‰æ‰¾åˆ° [" + fieldName + "] å­—段 ");

            return;

        }

        try

        {

            field.set(obj, value);

        }

        catch (IllegalAccessException e)

        {

            logger.error("不可能抛出的异常: {}", e.getMessage());

        }

    }



    /**

     * ç›´æŽ¥è°ƒç”¨å¯¹è±¡æ–¹æ³•, æ— è§†private/protected修饰符.

     * ç”¨äºŽä¸€æ¬¡æ€§è°ƒç”¨çš„情况，否则应使用getAccessibleMethod()函数获得Method后反复调用.

     * åŒæ—¶åŒ¹é…æ–¹æ³•å+参数类型，

     */

    @SuppressWarnings("unchecked")

    public static <E> E invokeMethod(final Object obj, final String methodName, final Class<?>[] parameterTypes,

            final Object[] args)

    {

        if (obj == null || methodName == null)

        {

            return null;

        }

        Method method = getAccessibleMethod(obj, methodName, parameterTypes);

        if (method == null)

        {

            logger.debug("在 [" + obj.getClass() + "] ä¸­ï¼Œæ²¡æœ‰æ‰¾åˆ° [" + methodName + "] æ–¹æ³• ");

            return null;

        }

        try

        {

            return (E) method.invoke(obj, args);

        }

        catch (Exception e)

        {

            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";

            throw convertReflectionExceptionToUnchecked(msg, e);

        }

    }



    /**

     * ç›´æŽ¥è°ƒç”¨å¯¹è±¡æ–¹æ³•, æ— è§†private/protected修饰符，

     * ç”¨äºŽä¸€æ¬¡æ€§è°ƒç”¨çš„情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.

     * åªåŒ¹é…å‡½æ•°åï¼Œå¦‚果有多个同名函数调用第一个。

     */

    @SuppressWarnings("unchecked")

    public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args)

    {

        Method method = getAccessibleMethodByName(obj, methodName, args.length);

        if (method == null)

        {

            // å¦‚果为空不报错，直接返回空。

            logger.debug("在 [" + obj.getClass() + "] ä¸­ï¼Œæ²¡æœ‰æ‰¾åˆ° [" + methodName + "] æ–¹æ³• ");

            return null;

        }

        try

        {

            // ç±»åž‹è½¬æ¢ï¼ˆå°†å‚数数据类型转换为目标方法参数类型）

            Class<?>[] cs = method.getParameterTypes();

            for (int i = 0; i < cs.length; i++)

            {

                if (args[i] != null && !args[i].getClass().equals(cs[i]))

                {

                    if (cs[i] == String.class)

                    {

                        args[i] = Convert.toStr(args[i]);

                        if (StringUtils.endsWith((String) args[i], ".0"))

                        {

                            args[i] = StringUtils.substringBefore((String) args[i], ".0");

                        }

                    }

                    else if (cs[i] == Integer.class)

                    {

                        args[i] = Convert.toInt(args[i]);

                    }

                    else if (cs[i] == Long.class)

                    {

                        args[i] = Convert.toLong(args[i]);

                    }

                    else if (cs[i] == Double.class)

                    {

                        args[i] = Convert.toDouble(args[i]);

                    }

                    else if (cs[i] == Float.class)

                    {

                        args[i] = Convert.toFloat(args[i]);

                    }

                    else if (cs[i] == Date.class)

                    {

                        if (args[i] instanceof String)

                        {

                            args[i] = DateUtils.parseDate(args[i]);

                        }

                        else

                        {

                            args[i] = DateUtil.getJavaDate((Double) args[i]);

                        }

                    }

                    else if (cs[i] == boolean.class || cs[i] == Boolean.class)

                    {

                        args[i] = Convert.toBool(args[i]);

                    }

                }

            }

            return (E) method.invoke(obj, args);

        }

        catch (Exception e)

        {

            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";

            throw convertReflectionExceptionToUnchecked(msg, e);

        }

    }



    /**

     * å¾ªçŽ¯å‘上转型, èŽ·å–对象的DeclaredField, å¹¶å¼ºåˆ¶è®¾ç½®ä¸ºå¯è®¿é—®.

     * å¦‚向上转型到Object仍无法找到, è¿”回null.

     */

    public static Field getAccessibleField(final Object obj, final String fieldName)

    {

        // ä¸ºç©ºä¸æŠ¥é”™ã€‚直接返回 null

        if (obj == null)

        {

            return null;

        }

        Validate.notBlank(fieldName, "fieldName can't be blank");

        for (Class<?> superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())

        {

            try

            {

                Field field = superClass.getDeclaredField(fieldName);

                makeAccessible(field);

                return field;

            }

            catch (NoSuchFieldException e)

            {

                continue;

            }

        }

        return null;

    }



    /**

     * å¾ªçŽ¯å‘上转型, èŽ·å–对象的DeclaredMethod,并强制设置为可访问.

     * å¦‚向上转型到Object仍无法找到, è¿”回null.

     * åŒ¹é…å‡½æ•°å+参数类型。

     * ç”¨äºŽæ–¹æ³•éœ€è¦è¢«å¤šæ¬¡è°ƒç”¨çš„情况. å…ˆä½¿ç”¨æœ¬å‡½æ•°å…ˆå–å¾—Method,然后调用Method.invoke(Object obj, Object... args)

     */

    public static Method getAccessibleMethod(final Object obj, final String methodName,

            final Class<?>... parameterTypes)

    {

        // ä¸ºç©ºä¸æŠ¥é”™ã€‚直接返回 null

        if (obj == null)

        {

            return null;

        }

        Validate.notBlank(methodName, "methodName can't be blank");

        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())

        {

            try

            {

                Method method = searchType.getDeclaredMethod(methodName, parameterTypes);

                makeAccessible(method);

                return method;

            }

            catch (NoSuchMethodException e)

            {

                continue;

            }

        }

        return null;

    }



    /**

     * å¾ªçŽ¯å‘上转型, èŽ·å–对象的DeclaredMethod,并强制设置为可访问.

     * å¦‚向上转型到Object仍无法找到, è¿”回null.

     * åªåŒ¹é…å‡½æ•°åã€‚

     * ç”¨äºŽæ–¹æ³•éœ€è¦è¢«å¤šæ¬¡è°ƒç”¨çš„情况. å…ˆä½¿ç”¨æœ¬å‡½æ•°å…ˆå–å¾—Method,然后调用Method.invoke(Object obj, Object... args)

     */

    public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)

    {

        // ä¸ºç©ºä¸æŠ¥é”™ã€‚直接返回 null

        if (obj == null)

        {

            return null;

        }

        Validate.notBlank(methodName, "methodName can't be blank");

        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())

        {

            Method[] methods = searchType.getDeclaredMethods();

            for (Method method : methods)

            {

                if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)

                {

                    makeAccessible(method);

                    return method;

                }

            }

        }

        return null;

    }



    /**

     * æ”¹å˜private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。

     */

    public static void makeAccessible(Method method)

    {

        if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))

                && !method.isAccessible())

        {

            method.setAccessible(true);

        }

    }



    /**

     * æ”¹å˜private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。

     */

    public static void makeAccessible(Field field)

    {

        if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())

                || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())

        {

            field.setAccessible(true);

        }

    }



    /**

     * é€šè¿‡åå°„, èŽ·å¾—Class定义中声明的泛型参数的类型, æ³¨æ„æ³›åž‹å¿…须定义在父类处

     * å¦‚无法找到, è¿”回Object.class.

     */

    @SuppressWarnings("unchecked")

    public static <T> Class<T> getClassGenricType(final Class clazz)

    {

        return getClassGenricType(clazz, 0);

    }



    /**

     * é€šè¿‡åå°„, èŽ·å¾—Class定义中声明的父类的泛型参数的类型.

     * å¦‚无法找到, è¿”回Object.class.

     */

    public static Class getClassGenricType(final Class clazz, final int index)

    {

        Type genType = clazz.getGenericSuperclass();



        if (!(genType instanceof ParameterizedType))

        {

            logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");

            return Object.class;

        }



        Type[] params = ((ParameterizedType) genType).getActualTypeArguments();



        if (index >= params.length || index < 0)

        {

            logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "

                    + params.length);

            return Object.class;

        }

        if (!(params[index] instanceof Class))

        {

            logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");

            return Object.class;

        }



        return (Class) params[index];

    }



    public static Class<?> getUserClass(Object instance)

    {

        if (instance == null)

        {

            throw new RuntimeException("Instance must not be null");

        }

        Class clazz = instance.getClass();

        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))

        {

            Class<?> superClass = clazz.getSuperclass();

            if (superClass != null && !Object.class.equals(superClass))

            {

                return superClass;

            }

        }

        return clazz;



    }



    /**

     * å°†åå°„时的checked exception转换为unchecked exception.

     */

    public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)

    {

        if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException

                || e instanceof NoSuchMethodException)

        {

            return new IllegalArgumentException(msg, e);

        }

        else if (e instanceof InvocationTargetException)

        {

            return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());

        }

        return new RuntimeException(msg, e);

    }

}


 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -1,17 +1,19 @@
package com.ruoyi.framework.interceptor.impl;



import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Validator;

import com.alibaba.fastjson.JSONObject;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.core.redis.RedisCache;

import com.ruoyi.common.filter.RepeatedlyRequestWrapper;

import com.ruoyi.common.utils.http.HttpHelper;

import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

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

import org.springframework.stereotype.Component;



import javax.servlet.http.HttpServletRequest;

import java.io.IOException;
import java.util.HashMap;

import java.util.Map;

import java.util.concurrent.TimeUnit;

@@ -22,6 +24,7 @@
 * 

 * @author ruoyi

 */

@Slf4j
@Component

public class SameUrlDataInterceptor extends RepeatSubmitInterceptor

{

@@ -56,7 +59,11 @@
        if (request instanceof RepeatedlyRequestWrapper)

        {

            RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request;

            nowParams = HttpHelper.getBodyString(repeatedlyRequest);

            try {
                nowParams = IoUtil.readUtf8(repeatedlyRequest.getInputStream());
            } catch (IOException e) {
                log.warn("读取流出现问题！");
            }
        }



        // body参数为空，获取Parameter的数据


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

@@ -9,7 +9,6 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.config.properties.TokenProperties;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
@@ -131,7 +130,7 @@
     */
    public void setUserAgent(LoginUser loginUser) {
        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
        String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
        String ip = ServletUtils.getClientIP();
        loginUser.setIpaddr(ip);
        loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
        loginUser.setBrowser(userAgent.getBrowser().getName());

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -263,12 +263,8 @@
                StringWriter sw = new StringWriter();
                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
                tpl.merge(context, sw);
                try {
                    String path = getGenPath(table, template);
                    FileUtils.writeStringToFile(new File(path), sw.toString(), Constants.UTF8);
                } catch (IOException e) {
                    throw new CustomException("渲染模板失败，表名：" + table.getTableName());
                }
                FileUtils.writeUtf8String(sw.toString(), path);
            }
        }
    }