From 54848dce003cbd4c0d2a2c14e8fa3d3e7f273249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= Date: Tue, 16 Apr 2024 11:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9user-agent=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=A4=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ynxbd/wx/servlet/QServlet.java | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ynxbd/wx/servlet/QServlet.java b/src/main/java/com/ynxbd/wx/servlet/QServlet.java index 6f7f00b..66b2392 100644 --- a/src/main/java/com/ynxbd/wx/servlet/QServlet.java +++ b/src/main/java/com/ynxbd/wx/servlet/QServlet.java @@ -7,6 +7,7 @@ import com.ynxbd.common.result.ResultEnum; import com.ynxbd.wx.config.WeChatConfig; import com.ynxbd.wx.wxfactory.ReqParamHelper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; @@ -33,19 +34,28 @@ public class QServlet extends HttpServlet { MDC.remove("ip"); MDC.put("ip", HttpHelper.getIpAddress(request)); - String userAgent = request.getHeader("user-agent"); - if (StringUtils.isEmpty(userAgent)) { - log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); - HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); - return; - } +// if (StringUtils.isEmpty(userAgent)) { +// log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); +// HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); +// return; +// } + MerchantEnum merchantEnum = MerchantEnum.WX; - MerchantEnum merchantEnum = MerchantEnum.getMerchantEnumByQr(userAgent); - if (merchantEnum == null) { - log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); - HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); - return; + String userAgent = request.getHeader("user-agent"); + if (!ObjectUtils.isEmpty(userAgent)) { + merchantEnum = MerchantEnum.getMerchantEnumByQr(userAgent); + if (merchantEnum == null) { + log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); + HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); + return; + } } +// MerchantEnum merchantEnum = MerchantEnum.getMerchantEnumByQr(userAgent); +// if (merchantEnum == null) { +// log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); +// HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); +// return; +// } String patientId = request.getParameter("p"); log.info("{} [patientId={}]多张处方扫码请求，开始解析...", merchantEnum.NAME, patientId);