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: