ソースを参照

[BUG][1000780]:云端测试 version:.434.561:标签短信没有回调出发送结果

release_toaliyun_real
gongbiao 7年前
コミット
a966b1b045
4個のファイルの変更27行の追加16行の削除
  1. +4
    -7
      mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java
  2. +2
    -6
      mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
  3. +18
    -0
      mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java
  4. +3
    -3
      mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml

+ 4
- 7
mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java ファイルの表示

@@ -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() {




+ 2
- 6
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.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 不检查幂等


+ 18
- 0
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");
}

}

+ 3
- 3
mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml ファイルの表示

@@ -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>


読み込み中…
キャンセル
保存