Просмотр исходного кода

Merge commit 'refs/tags/jenkins-back-end-567^{}' into release

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
bfb6253502
9 измененных файлов: 42 добавлений и 18 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java
  2. +6
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java
  3. +4
    -6
      mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java
  4. +2
    -5
      mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
  5. +18
    -0
      mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java
  6. +1
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java
  7. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
  8. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
  9. +3
    -3
      mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java Просмотреть файл

@@ -81,7 +81,7 @@ public class WxCUserBasicInfoController extends BaseController {


if (info.getTagId() != null) { if (info.getTagId() != null) {
WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId());
if (StringUtils.isNotBlank(uTag.getTags())) {
if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) {
List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class); List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class);
info.setTagsList(wxCUserTagsService.findTagList(getTenantId(), ids)); info.setTagsList(wxCUserTagsService.findTagList(getTenantId(), ids));
} }


+ 6
- 1
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) { public ResultData cardOrderList(@ModelAttribute WxCardVo wxCardVo, Integer pageNum, Integer pageSize) {
String ipStr = getIpAddr(); String ipStr = getIpAddr();
logger.info("cardPay/cardOrderList: " + ipStr); 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(); MallUserInfo user = getUser();
wxCardVo.setTenantId(user.getTenantId()); wxCardVo.setTenantId(user.getTenantId());
if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) { if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) {


+ 4
- 6
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,13 +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")) {
if (!UrlCheck.checkUrl(url)) {
requestWrapper = new BodyReaderHttpServletRequestWrapper((HttpServletRequest) request); requestWrapper = new BodyReaderHttpServletRequestWrapper((HttpServletRequest) request);
} else {
requestWrapper = null;
} }
} }
if (null == requestWrapper) { if (null == requestWrapper) {
@@ -34,6 +31,7 @@ public class HttpServletRequestWrapperFilter implements Filter {


} }



@Override @Override
public void destroy() { public void destroy() {




+ 2
- 5
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,11 +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")) {
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");
}

}

+ 1
- 0
mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java Просмотреть файл

@@ -4,6 +4,7 @@ package com.iformall.enums;
* Created by Stormeye on 2018/08/09. * Created by Stormeye on 2018/08/09.
*/ */
public enum EnumMsgSendStatus { public enum EnumMsgSendStatus {
MSG_SENDING(2, "发送中"),
MSG_SEND_SUCCESS(1,"发送成功"), MSG_SEND_SUCCESS(1,"发送成功"),
MSG_SEND_FAIL(0,"发送失败") MSG_SEND_FAIL(0,"发送失败")
; ;


+ 5
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java Просмотреть файл

@@ -83,7 +83,11 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService {
if(callback!=null){//有更新,无插入 if(callback!=null){//有更新,无插入
callback.setSign(param.get("sign")); callback.setSign(param.get("sign"));
callback.setTenantId(tenantId); 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.setStatusMsg(wxMsgCallback.getStatusMsg());
callback.setBegintime(wxMsgCallback.getBegintime()); callback.setBegintime(wxMsgCallback.getBegintime());
callback.setEndtime(wxMsgCallback.getEndtime()); callback.setEndtime(wxMsgCallback.getEndtime());


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java Просмотреть файл

@@ -262,7 +262,8 @@ public class WxMsgServiceImpl implements WxMsgService {
wxMsgCallback.setTenantId(wxmsg.getTenantId()); wxMsgCallback.setTenantId(wxmsg.getTenantId());
wxMsgCallback.setBatchNo(batchNo); wxMsgCallback.setBatchNo(batchNo);
wxMsgCallback.setMsgId(wxmsg.getId()); 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()); wxMsgCallback.setCreatetime(new Date());
wxMsgCallbackMapper.insertSelective(wxMsgCallback); wxMsgCallbackMapper.insertSelective(wxMsgCallback);
} }


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


Загрузка…
Отмена
Сохранить