diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java index 596401d..ba1d66b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java @@ -81,15 +81,9 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), Map.class); - Object signObject = new Object(); - if(map.get("BODY_LIST")!=null){ - signObject = map.get("BODY_LIST"); - }else{ - signObject = bean.getObject(); - } //传入数据解密 - String sign = getSignValue(signObject); + String sign = getSignValue(map); map.put("SIGN", sign); @@ -156,16 +150,27 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl jsonMap = JSONArray.parseObject(json,Map.class); + Map jsonMap = JSONArray.parseObject(json,Map.class); + Object signObject = new Object(); + + if(jsonMap.get("BODY_LIST")!=null){ + List jsonList = (List)jsonMap.get("BODY_LIST"); + log.info("加密参数2:"+jsonList); + InputStream is = CrypConfigureServiceImpl.class.getClassLoader().getResourceAsStream(PEM_PATH); + signValue = CrypServiceImpl.signObject2(jsonList,IOUtils.toString(is)); + }else{ + log.info("加密参数2:"+jsonMap); + InputStream is = CrypConfigureServiceImpl.class.getClassLoader().getResourceAsStream(PEM_PATH); + signValue = CrypServiceImpl.signObject2(jsonMap,IOUtils.toString(is)); + } + - log.info("加密参数2:"+jsonMap); - InputStream is = CrypConfigureServiceImpl.class.getClassLoader().getResourceAsStream(PEM_PATH); - signValue = CrypServiceImpl.signObject2(jsonMap,IOUtils.toString(is)); log.info("加密结果:"+signValue); }catch (Exception e){ - + log.info("---------加密异常-"+e.getMessage()); } return signValue; } @@ -228,16 +233,25 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl jsonMap = JSONArray.parseObject(json,Map.class); - bean.setObject(jsonMap); - log.info("解密参数2:"+bean); - InputStream is = CrypConfigureServiceImpl.class.getClassLoader().getResourceAsStream(CRT_PATH); - Boolean b = CrypServiceImpl.verifyValue(bean.getSign(),jsonMap,IOUtils.toString(is)); - return b; - }catch (Exception e){ + Map jsonMap = JSONArray.parseObject(json, Map.class); + if(jsonMap.get("BODY_LIST")!=null){ + List jsonList = (List)jsonMap.get("BODY_LIST"); + log.info("解密参数2:"+jsonList); + InputStream is = CrypConfigureServiceImpl.class.getClassLoader().getResourceAsStream(CRT_PATH); + Boolean b = CrypServiceImpl.verifyValue(bean.getSign(), jsonList, IOUtils.toString(is)); + return b; + }else { + log.info("解密参数2:" + bean); + InputStream is = CrypConfigureServiceImpl.class.getClassLoader().getResourceAsStream(CRT_PATH); + Boolean b = CrypServiceImpl.verifyValue(bean.getSign(), jsonMap, IOUtils.toString(is)); + return b; + } + + }catch (Exception e){ + log.info("-----------解密失败"+e.getMessage()); } return false; @@ -261,7 +275,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl