| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.interceptor; | package com.iformall.interceptor; | ||||
| import com.iformall.utils.UrlCheck; | |||||
| import javax.servlet.*; | import javax.servlet.*; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| @@ -17,14 +19,8 @@ public class HttpServletRequestWrapperFilter implements Filter { | |||||
| ServletRequest requestWrapper = null; | ServletRequest requestWrapper = null; | ||||
| if (request instanceof HttpServletRequest) { | if (request instanceof HttpServletRequest) { | ||||
| String url = ((HttpServletRequest) request).getRequestURI(); | 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); | requestWrapper = new BodyReaderHttpServletRequestWrapper((HttpServletRequest) request); | ||||
| } else { | |||||
| requestWrapper = null; | |||||
| } | } | ||||
| } | } | ||||
| if (null == requestWrapper) { | if (null == requestWrapper) { | ||||
| @@ -35,6 +31,7 @@ public class HttpServletRequestWrapperFilter implements Filter { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void destroy() { | public void destroy() { | ||||
| @@ -4,6 +4,7 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.utils.HashUtil; | import com.iformall.utils.HashUtil; | ||||
| import com.iformall.utils.IPUtil; | import com.iformall.utils.IPUtil; | ||||
| import com.iformall.utils.UrlCheck; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.data.redis.core.RedisTemplate; | import org.springframework.data.redis.core.RedisTemplate; | ||||
| @@ -43,12 +44,7 @@ public class RequestInterceptor extends HandlerInterceptorAdapter { | |||||
| String ipaddress = IPUtil.getIpAddr(request); | String ipaddress = IPUtil.getIpAddr(request); | ||||
| String url = request.getRequestURL().toString(); | 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不检查幂等 | // pvlog不检查幂等 | ||||
| // awsFileUpload不检查幂等 | // awsFileUpload不检查幂等 | ||||
| // ueditor 不检查幂等 | // ueditor 不检查幂等 | ||||
| @@ -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"); | |||||
| } | |||||
| } | |||||
| @@ -38,9 +38,9 @@ | |||||
| <if test=" null != batchNo "> | <if test=" null != batchNo "> | ||||
| and `batch_no` like concat('%', #{batchNo},'%') | and `batch_no` like concat('%', #{batchNo},'%') | ||||
| </if> | |||||
| <if test=" null != phone "> | |||||
| </if> | |||||
| <if test=" null != phone and phone!=''"> | |||||
| and `phone` like concat('%', #{phone},'%') | and `phone` like concat('%', #{phone},'%') | ||||
| </if> | </if> | ||||