From a966b1b045efa724c1c8aed5a26b5fc0c1c4b136 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 9 Jan 2019 13:21:18 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][1000780]:=E4=BA=91=E7=AB=AF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=20version:.434.561=EF=BC=9A=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=B2=A1=E6=9C=89=E5=9B=9E=E8=B0=83=E5=87=BA?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HttpServletRequestWrapperFilter.java | 11 ++++------- .../interceptor/RequestInterceptor.java | 8 ++------ .../main/java/com/iformall/utils/UrlCheck.java | 18 ++++++++++++++++++ .../resources/mapper/WxMsgCallbackMapper.xml | 6 +++--- 4 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java index fdd92deb4..644546097 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java @@ -1,5 +1,7 @@ package com.iformall.interceptor; +import com.iformall.utils.UrlCheck; + import javax.servlet.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -17,14 +19,8 @@ public class HttpServletRequestWrapperFilter implements Filter { ServletRequest requestWrapper = null; if (request instanceof HttpServletRequest) { String url = ((HttpServletRequest) request).getRequestURI(); - if (!url.contains("awsFileUpload") - && !url.contains("cimgUpload") - && !url.contains("ueditor/exec") - && !url.contains("/wxCUserBasicInfo/importTemplate") - && !url.contains("wxMsgCallback")) { + if (!UrlCheck.checkUrl(url)) { requestWrapper = new BodyReaderHttpServletRequestWrapper((HttpServletRequest) request); - } else { - requestWrapper = null; } } if (null == requestWrapper) { @@ -35,6 +31,7 @@ public class HttpServletRequestWrapperFilter implements Filter { } + @Override public void destroy() { diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java index cb7503741..fd3d41f9f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -4,6 +4,7 @@ import com.iformall.common.ErrorCode; import com.iformall.exception.MallinkException; import com.iformall.utils.HashUtil; import com.iformall.utils.IPUtil; +import com.iformall.utils.UrlCheck; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.RedisTemplate; @@ -43,12 +44,7 @@ public class RequestInterceptor extends HandlerInterceptorAdapter { String ipaddress = IPUtil.getIpAddr(request); String url = request.getRequestURL().toString(); - if(url.contains("pvlog") - || url.contains("awsFileUpload") - || url.contains("cimgUpload") - || url.contains("ueditor/exec") - || url.contains("/wxCUserBasicInfo/importTemplate") - || url.contains("wxMsgCallback")) { + if (UrlCheck.checkUrl(url)) { // pvlog不检查幂等 // awsFileUpload不检查幂等 // ueditor 不检查幂等 diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java new file mode 100644 index 000000000..b19e6ef37 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java @@ -0,0 +1,18 @@ +package com.iformall.utils; + +/** + * @author gongbiao + */ +public class UrlCheck { + + public static boolean checkUrl(String url) { + return url.contains("awsFileUpload") + || url.contains("cimgUpload") + || url.contains("ueditor/exec") + || url.contains("/wxCUserBasicInfo/importTemplate") + || url.contains("wxMsgCallback") + || url.contains("notify") + || url.contains("pvlog"); + } + +} diff --git a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml index 2b0a7b372..c817cccea 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml @@ -38,9 +38,9 @@ and `batch_no` like concat('%', #{batchNo},'%') - - - + + + and `phone` like concat('%', #{phone},'%')