From a801f014503988419a047ce8dc911e0ee1593017 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 30 Dec 2021 10:14:18 +0800 Subject: [PATCH 1/5] add jinmao debug --- .../iformall/controller/callback/JinMaoController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index 355ec8f04..73e5ebe2b 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -204,6 +204,14 @@ public class JinMaoController extends BaseController { } + @RequestMapping(value = "/dfh/testGetCode") + public String testGetCode(HttpServletRequest request,HttpServletResponse response) throws Exception { + String couponCode = request.getParameter("couponCode"); + if (StringUtils.isBlank(couponCode)) { + return "couponCode is null."; + } + return WxCouponOrderCVo.calcuteExpiredCouponOrderId(couponCode, 30); + } /** From a74d0038a628857766b1c9db112c27a4e125112b Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 31 Dec 2021 10:51:21 +0800 Subject: [PATCH 2/5] fix jinmao --- .../controller/callback/JinMaoController.java | 59 ++++++++++++++++--- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index 73e5ebe2b..303983ea9 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -204,13 +204,58 @@ public class JinMaoController extends BaseController { } - @RequestMapping(value = "/dfh/testGetCode") - public String testGetCode(HttpServletRequest request,HttpServletResponse response) throws Exception { - String couponCode = request.getParameter("couponCode"); - if (StringUtils.isBlank(couponCode)) { - return "couponCode is null."; - } - return WxCouponOrderCVo.calcuteExpiredCouponOrderId(couponCode, 30); + + /** + * 心跳 + * @param request + * @param response + * @throws Exception + */ + @RequestMapping(value = "/dfh/heartBeat") + public void heartBeat(HttpServletRequest request,HttpServletResponse response) throws Exception { + + InputStream inputStream = null; + try { + inputStream = request.getInputStream(); + String paramStr = IOUtils.toString(inputStream, "utf-8"); + logger.info("dfh heartBeat: {}",paramStr); + if (StringUtils.isBlank(paramStr)) { + generateResult(response,true,false, null, "参数不能为空paramStr", null, "参数非法"); + return ; + } + + Map param = JSON.parseObject(paramStr, Map.class); + String keyStr = param.get("Key")==null?"":param.get("Key").toString(); + if (StringUtils.isBlank(keyStr)) { + generateResult(response,true,false, null, "参数非法Key"+keyStr, null, "参数非法"); + return ; + } + + PrintWriter out; + try { + Map retMap = new HashMap(); + retMap.put("Key",keyStr); + response.setContentType("application/json"); + response.setCharacterEncoding("GB2312"); + out = response.getWriter(); + out.print("DATA="+JSON.toJSONString(retMap)); + out.close(); + } catch (IOException e) { + logger.error(" jinmao writeResponse error.",e); + } + + }catch(Exception e){ + logger.error("JinMaoController --heartBeat",e); + generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误"); + return ; + }finally { + if (null != inputStream ) { + inputStream.close(); + } + } + + + } From d5fbb88b6d4eba5d0870422bf18f22a84f476f86 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 31 Dec 2021 11:06:42 +0800 Subject: [PATCH 3/5] fix jinmao --- .../controller/callback/JinMaoController.java | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index 303983ea9..18eef3398 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -220,44 +220,46 @@ public class JinMaoController extends BaseController { String paramStr = IOUtils.toString(inputStream, "utf-8"); logger.info("dfh heartBeat: {}",paramStr); if (StringUtils.isBlank(paramStr)) { - generateResult(response,true,false, null, "参数不能为空paramStr", null, "参数非法"); + generateHeartBeatResult(response,"unvalid param", "参数不能为空paramStr"); return ; } Map param = JSON.parseObject(paramStr, Map.class); String keyStr = param.get("Key")==null?"":param.get("Key").toString(); if (StringUtils.isBlank(keyStr)) { - generateResult(response,true,false, null, "参数非法Key"+keyStr, null, "参数非法"); + generateHeartBeatResult(response,"unvalid param", "参数非法Key"+keyStr); return ; } - - PrintWriter out; - try { - Map retMap = new HashMap(); - retMap.put("Key",keyStr); - response.setContentType("application/json"); - response.setCharacterEncoding("GB2312"); - out = response.getWriter(); - out.print("DATA="+JSON.toJSONString(retMap)); - out.close(); - } catch (IOException e) { - logger.error(" jinmao writeResponse error.",e); - } + generateHeartBeatResult(response,keyStr, null); }catch(Exception e){ logger.error("JinMaoController --heartBeat",e); - generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误"); + generateHeartBeatResult(response,"error", "心跳错误"+e.getMessage()); return ; }finally { if (null != inputStream ) { inputStream.close(); } } - - - } + private void generateHeartBeatResult(HttpServletResponse response,String key,String msg) { + PrintWriter out; + try { + Map retMap = new HashMap(); + retMap.put("Key",key); + if (null != msg) { + retMap.put("Note",msg); + } + response.setContentType("application/json"); + response.setCharacterEncoding("GB2312"); + out = response.getWriter(); + out.print("DATA="+JSON.toJSONString(retMap)); + out.close(); + } catch (IOException e) { + logger.error(" jinmao writeResponse error.",e); + } + } /** * Request: From c3b1481d7ce3d9de21f932ae6aeef52d6a990daf Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 31 Dec 2021 12:26:06 +0800 Subject: [PATCH 4/5] fix jinmao --- .../controller/callback/JinMaoController.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index 18eef3398..fc491a479 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -213,28 +213,28 @@ public class JinMaoController extends BaseController { */ @RequestMapping(value = "/dfh/heartBeat") public void heartBeat(HttpServletRequest request,HttpServletResponse response) throws Exception { - + long currentTime = System.currentTimeMillis(); InputStream inputStream = null; try { inputStream = request.getInputStream(); String paramStr = IOUtils.toString(inputStream, "utf-8"); logger.info("dfh heartBeat: {}",paramStr); if (StringUtils.isBlank(paramStr)) { - generateHeartBeatResult(response,"unvalid param", "参数不能为空paramStr"); + generateHeartBeatResult(response,"unvalid param", "参数不能为空paramStr",currentTime); return ; } Map param = JSON.parseObject(paramStr, Map.class); String keyStr = param.get("Key")==null?"":param.get("Key").toString(); if (StringUtils.isBlank(keyStr)) { - generateHeartBeatResult(response,"unvalid param", "参数非法Key"+keyStr); + generateHeartBeatResult(response,"unvalid param", "参数非法Key"+keyStr,currentTime); return ; } - generateHeartBeatResult(response,keyStr, null); + generateHeartBeatResult(response,keyStr, null,currentTime); }catch(Exception e){ logger.error("JinMaoController --heartBeat",e); - generateHeartBeatResult(response,"error", "心跳错误"+e.getMessage()); + generateHeartBeatResult(response,"error", "心跳错误"+e.getMessage(),currentTime); return ; }finally { if (null != inputStream ) { @@ -243,14 +243,12 @@ public class JinMaoController extends BaseController { } } - private void generateHeartBeatResult(HttpServletResponse response,String key,String msg) { + private void generateHeartBeatResult(HttpServletResponse response,String key,String msg,long startSeconds) { PrintWriter out; try { Map retMap = new HashMap(); retMap.put("Key",key); - if (null != msg) { - retMap.put("Note",msg); - } + retMap.put("Note","timecost:"+(System.currentTimeMillis()-startSeconds)+"; msg:"+msg); response.setContentType("application/json"); response.setCharacterEncoding("GB2312"); out = response.getWriter(); @@ -312,6 +310,7 @@ public class JinMaoController extends BaseController { @RequestMapping(value = "/dfh/verify") public void dfhVerify(HttpServletRequest request,HttpServletResponse response) throws Exception { + long currentTime = System.currentTimeMillis(); InputStream inputStream = null; try { inputStream = request.getInputStream(); @@ -359,7 +358,7 @@ public class JinMaoController extends BaseController { } try { - long currentTime = System.currentTimeMillis(); + WxCouponOrder couponOrder = wxCouponOrderService.verifyByEquiment(couponOrderId, "789", "null", "闸机扫码核销[Serial:"+serial+",MAC:"+mac+"]"); generateResult(response,false,true, couponOrder.getCouponName(), "核销成功:"+(System.currentTimeMillis()-currentTime), String.valueOf(couponOrder.getId()), "核销成功"); return ; @@ -396,7 +395,7 @@ public class JinMaoController extends BaseController { return new String(Base64Util.decode(secureUrlBase64)); } - private void generateResult(HttpServletResponse response,boolean alerm,boolean open,String name, String msg,String card,String voice) { + private void generateResult(HttpServletResponse response,boolean alerm,boolean open,String name, String msg,String card,String voice,long startTime) { Map retMap = new HashMap(); if (alerm) { //报警 @@ -422,9 +421,11 @@ public class JinMaoController extends BaseController { } if (null != msg) { try { - retMap.put("Note", new String(msg.getBytes(),"utf-8")); + retMap.put("Note", "costtimes:"+(System.currentTimeMillis()-startTime)+";msg:"+new String(msg.getBytes(),"utf-8")); } catch (UnsupportedEncodingException e) { } + }else { + retMap.put("Note", "costtimes:"+(System.currentTimeMillis()-startTime)); } if (null != card) { retMap.put("Card", card); From 3f53e541ec272effd8069b2ba8c3fe752e3f99b5 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 31 Dec 2021 12:28:35 +0800 Subject: [PATCH 5/5] fix jinmao --- .../controller/callback/JinMaoController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index fc491a479..159ed7594 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -317,19 +317,19 @@ public class JinMaoController extends BaseController { String paramStr = IOUtils.toString(inputStream, "utf-8"); logger.info("dfh verify: {}",paramStr); if (StringUtils.isBlank(paramStr)) { - generateResult(response,true,false, null, "参数不能为空paramStr", null, "参数非法"); + generateResult(response,true,false, null, "参数不能为空paramStr", null, "参数非法",currentTime); return ; } Map param = JSON.parseObject(paramStr, Map.class); String typeStr = param.get("type")==null?"":param.get("type").toString(); if (StringUtils.isBlank(typeStr) || (!"9".equals(typeStr))) { - generateResult(response,true,false, null, "参数非法type"+typeStr, null, "参数非法"); + generateResult(response,true,false, null, "参数非法type"+typeStr, null, "参数非法",currentTime); return ; } String couponOrderIdStr = param.get("Card")==null?"":param.get("Card").toString(); if (StringUtils.isBlank(couponOrderIdStr)) { - generateResult(response,true,false, null, "参数不能为空Card", null, "参数非法"); + generateResult(response,true,false, null, "参数不能为空Card", null, "参数非法",currentTime); return ; } String mac = (String)param.get("MAC"); @@ -342,7 +342,7 @@ public class JinMaoController extends BaseController { String expiredtimeStr = decodeids[1]; Date expiredtime = DateUtils.string2Date(expiredtimeStr).getTime(); if (expiredtime.before(new Date())) { - generateResult(response,true,false, null, "码已失效,请刷新", null, "码已失效"); + generateResult(response,true,false, null, "码已失效,请刷新", null, "码已失效",currentTime); return ; } } @@ -353,24 +353,24 @@ public class JinMaoController extends BaseController { } catch (NumberFormatException e) { couponOrderId = 0L; logger.error("couponOrderId参数不正确: " + param.toString()); - generateResult(response,true,false, null, "参数非法Card"+couponOrderIdStr, null, "参数非法"); + generateResult(response,true,false, null, "参数非法Card"+couponOrderIdStr, null, "参数非法",currentTime); return ; } try { WxCouponOrder couponOrder = wxCouponOrderService.verifyByEquiment(couponOrderId, "789", "null", "闸机扫码核销[Serial:"+serial+",MAC:"+mac+"]"); - generateResult(response,false,true, couponOrder.getCouponName(), "核销成功:"+(System.currentTimeMillis()-currentTime), String.valueOf(couponOrder.getId()), "核销成功"); + generateResult(response,false,true, couponOrder.getCouponName(), "核销成功", String.valueOf(couponOrder.getId()), "核销成功",currentTime); return ; }catch(Exception e) { logger.error("JinMaoController --dfhOrder",e); - generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误"); + generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误",currentTime); return ; } }catch(Exception e){ logger.error("JinMaoController --dfhOrder",e); - generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误"); + generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误",currentTime); return ; }finally { if (null != inputStream ) {