diff --git a/mallinkPublicApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkPublicApi/src/main/java/com/iformall/config/WebMvcConfig.java index eaa822bff..de640f6e5 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkPublicApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -65,19 +65,6 @@ public class WebMvcConfig implements WebMvcConfigurer { .maxAge(3600); } - /** - * 用于处理编码问题 - * - * @return - */ - @Bean("myCharacterEncodingFilter") - public Filter characterEncodingFilter() { - CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter(); - characterEncodingFilter.setEncoding("UTF-8"); - characterEncodingFilter.setForceEncoding(true); - return characterEncodingFilter; - } - @Override public void configureMessageConverters(List> converters) { MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); diff --git a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index 92a55106d..4c8a95f28 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -25,6 +25,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; import java.util.*; /** @@ -129,6 +132,13 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { private Map StringToMap(String body){ Map map = new HashMap(); + try { + URLDecoder.decode(body, "utf-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + return map; + } + String[] keyValues = body.split("&"); for (String kv:keyValues) { if(StringUtils.isBlank(kv) || !kv.contains("=")){ diff --git a/mallinkPublicApi/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java b/mallinkPublicApi/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java index d6a60de9f..19be5e6a7 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java @@ -25,15 +25,9 @@ public class HttpServletRequestWrapperFilter implements Filter { long start = System.currentTimeMillis(); ServletRequest requestWrapper = null; + /* // 跨域访问 HttpServletRequest req = (HttpServletRequest) request; HttpServletResponse res = (HttpServletResponse) response; - - req.setCharacterEncoding("UTF-8"); - res.setCharacterEncoding("UTF-8"); - - - /* // 跨域访问 - String originHeader = req.getHeader("Origin"); if (Arrays.asList(ALLOW_DOMAIN).contains(originHeader)) { diff --git a/mallinkPublicApi/src/main/resources/application.yml b/mallinkPublicApi/src/main/resources/application.yml index a4bbf3cc2..26270095d 100644 --- a/mallinkPublicApi/src/main/resources/application.yml +++ b/mallinkPublicApi/src/main/resources/application.yml @@ -12,11 +12,6 @@ spring: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 default-property-inclusion: non_null - http: - encoding: - force: true - charset: UTF-8 - enabled: true # rocketmq: # nameServer: 127.0.0.1:9876 # producer: