From 44c61c7528d30346b5c92c9b29de42baf0c8e2d2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 9 Jan 2019 11:46:30 +0800 Subject: [PATCH 1/5] =?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 --- .../iformall/interceptor/HttpServletRequestWrapperFilter.java | 3 ++- .../main/java/com/iformall/interceptor/RequestInterceptor.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java index 4df979d09..fdd92deb4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java @@ -20,7 +20,8 @@ public class HttpServletRequestWrapperFilter implements Filter { if (!url.contains("awsFileUpload") && !url.contains("cimgUpload") && !url.contains("ueditor/exec") - && !url.contains("/wxCUserBasicInfo/importTemplate")) { + && !url.contains("/wxCUserBasicInfo/importTemplate") + && !url.contains("wxMsgCallback")) { requestWrapper = new BodyReaderHttpServletRequestWrapper((HttpServletRequest) request); } else { requestWrapper = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java index 3adf70465..cb7503741 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -47,7 +47,8 @@ public class RequestInterceptor extends HandlerInterceptorAdapter { || url.contains("awsFileUpload") || url.contains("cimgUpload") || url.contains("ueditor/exec") - || url.contains("/wxCUserBasicInfo/importTemplate")) { + || url.contains("/wxCUserBasicInfo/importTemplate") + || url.contains("wxMsgCallback")) { // pvlog不检查幂等 // awsFileUpload不检查幂等 // ueditor 不检查幂等 From 43ea2fa2b5dd1a0de44df1acfe160521bc13167e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 9 Jan 2019 13:45:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[exception][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCUserBasicInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index e2b38ee4c..5e5b1f85e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -81,7 +81,7 @@ public class WxCUserBasicInfoController extends BaseController { if (info.getTagId() != null) { WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); - if (StringUtils.isNotBlank(uTag.getTags())) { + if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); info.setTagsList(wxCUserTagsService.findTagList(getTenantId(), ids)); } From 047849d935d7fee3948d9403b585b1f019cd6a6f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 9 Jan 2019 13:51:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[EXCEPTION=E5=A4=84=E7=90=86][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=8D=A1=E5=88=97=E8=A1=A8=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCardPayController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 6b043e982..5f4a90463 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -59,7 +59,12 @@ public class WxCardPayController extends BaseController { public ResultData cardOrderList(@ModelAttribute WxCardVo wxCardVo, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); logger.info("cardPay/cardOrderList: " + ipStr); - if (wxCardVo == null) wxCardVo = new WxCardVo(); + if (wxCardVo == null) {wxCardVo = new WxCardVo();} + else { + if(StringUtils.isBlank(wxCardVo.getOuPhone())) { + wxCardVo.setOuPhone(null); + } + } MallUserInfo user = getUser(); wxCardVo.setTenantId(user.getTenantId()); if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) { From a966b1b045efa724c1c8aed5a26b5fc0c1c4b136 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 9 Jan 2019 13:21:18 +0800 Subject: [PATCH 4/5] =?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},'%') From 526f6faf4baefd60cd2adc5997069adec9ba10d4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 9 Jan 2019 14:29:59 +0800 Subject: [PATCH 5/5] =?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 --- .../src/main/java/com/iformall/enums/EnumMsgSendStatus.java | 1 + .../com/iformall/service/impl/WxMsgCallbackServiceImpl.java | 6 +++++- .../java/com/iformall/service/impl/WxMsgServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java index 5008a1c88..4bec81de7 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java @@ -4,6 +4,7 @@ package com.iformall.enums; * Created by Stormeye on 2018/08/09. */ public enum EnumMsgSendStatus { + MSG_SENDING(2, "发送中"), MSG_SEND_SUCCESS(1,"发送成功"), MSG_SEND_FAIL(0,"发送失败") ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index 2608a5298..fa73fa083 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -83,7 +83,11 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { if(callback!=null){//有更新,无插入 callback.setSign(param.get("sign")); callback.setTenantId(tenantId); - callback.setStatus(wxMsgCallback.getStatus()); + if (!wxMsgCallback.getStatus().equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode())) { + callback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); + } else { + callback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); + } callback.setStatusMsg(wxMsgCallback.getStatusMsg()); callback.setBegintime(wxMsgCallback.getBegintime()); callback.setEndtime(wxMsgCallback.getEndtime()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index e361bd042..352e4b308 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -262,7 +262,8 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsgCallback.setTenantId(wxmsg.getTenantId()); wxMsgCallback.setBatchNo(batchNo); wxMsgCallback.setMsgId(wxmsg.getId()); - wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); + wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); + wxMsgCallback.setStatusMsg(EnumMsgSendStatus.MSG_SENDING.getMessage()); wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insertSelective(wxMsgCallback); }