From 7a8c26f1cb48c77d0234e6fda2d193d0154def40 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Mon, 6 Sep 2021 16:20:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CrypConfigureServiceImpl.java        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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 9a5747c..beb6040 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
@@ -86,7 +86,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl<CrypConfigureMappe
             if(map.get("BODY_LIST")!=null){
                 signObject = map.get("BODY_LIST");
             }else{
-                signObject = map;
+                signObject = bean.getObject();
             }
             //传入数据解密
             String sign = getSignValue(signObject);
@@ -224,7 +224,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl<CrypConfigureMappe
     public Boolean verifyObject(CrypBean bean){
 
         try{
-            log.info("解密参数:"+JSONArray.toJSONString(bean.getObject()));
+            log.info("解密参数:"+bean);
             InputStream is = CrypConfigureServiceImpl.class.getClassLoader().getResourceAsStream(CRT_PATH);
             Boolean b = CrypServiceImpl.verifyValue(bean.getSign(),bean.getObject(),IOUtils.toString(is));
             return b;
@@ -256,10 +256,17 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl<CrypConfigureMappe
         String json = "{\"RESULT_ID\":\"123\",\"TP_ID\":\"12312\",\"SECTION_ID\":\"1232\",\"REPORT_ID\":\"12321\",\"RESULTDETAIL\":[{\"RESULT_DETAIL_ID\":\"12321\",\"RESULT_ID\":\"1232131\",\"TENDERER_ID\":\"12321321\",\"WINNER_CANDIDATE\":\"123213\",\"PRICE\":\"1232131\",\"PRICE_REVIEW\":\"12321321\",\"BUSINESS_SCORE\":\"123213213\",\"TECHNICAL_SCORE\":\"1232132\",\"SERVICE_SCORE\":\"123213\",\"PRICE_SCORE\":\"123213\",\"TOTAL_SCORE\":\"12321\",\"CONTRACTED_MONEY\":\"12321\",\"TAX_RATE_PRICE\":\"12321\"},{\"RESULT_DETAIL_ID\":\"12321\",\"RESULT_ID\":\"1232131\",\"TENDERER_ID\":\"12321321\",\"WINNER_CANDIDATE\":\"123213\",\"PRICE\":\"1232131\",\"PRICE_REVIEW\":\"12321321\",\"BUSINESS_SCORE\":\"123213213\",\"TOTAL_SCORE\":\"12321\",\"CONTRACTED_MONEY\":\"12321\",\"TAX_RATE_PRICE\":\"12321\",\"SCOREDETAIL\":[{\"RESULT_DETAIL_ID\":\"12321\",\"TENDERER_ID\":\"12321\",\"USER_ID\":\"12321\",\"BUSINESS_SCORE\":\"12321\",\"TECHNICAL_SCORE\":\"12312\",\"SERVICE_SCORE\":\"12321\",\"PRICE_SCORE\":\"12323\"}]}]}";
         Map jsonMap = JSONArray.parseObject(json,Map.class);
 
+
+
         CrypConfigureServiceImpl crypService = new CrypConfigureServiceImpl();
+
+        System.out.println(jsonMap);
         CrypBean bean = crypService.signObject(jsonMap);
         bean.setSign("MEUCIQCqbcS4d8je+XvTwlSJ1/5IEgiZBYgJlQ+nU/oi2ZeLAgIgd+SZ72Hk8xdKhcVnxwrFsIL6gHMKOFDIbo4nLzmYroM=");
         System.out.println("signature of Map: "+bean.getSign());
+        System.out.println("signature object of Map: "+bean.getObject());
+        byte[] b = JSON.toJSONBytes(bean.getObject(), new SerializerFeature[]{SerializerFeature.MapSortField, SerializerFeature.SortField});
+        System.out.println("signature object2 of Map: "+new String(b));
         boolean isOk =  crypService.verifyObject(bean);
         System.out.println("verify result of Map: "+ isOk);