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

疯狂的狮子li

2021-03-30 a29ebef20203f982041c095d9d09af8dddb27f73

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


 Conflicts:

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

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

@@ -27,6 +27,7 @@
        ServletRequest requestWrapper = null;

        if (request instanceof HttpServletRequest

                && StrUtil.equalsAnyIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE))

                && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE))

        {

            requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);

        }