diff --git a/lib/access_token1.3.jar b/lib/access_token1.3.jar new file mode 100644 index 0000000..dc162fc Binary files /dev/null and b/lib/access_token1.3.jar differ diff --git a/pom.xml b/pom.xml index 1474efd..31bcbf8 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ cryp.access accessToken - 1.0 + 1.3 system - ${basedir}/lib/access_token1.1.jar + ${basedir}/lib/access_token1.3.jar 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 b353849..71959cc 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 @@ -3,15 +3,11 @@ package com.chinaunicom.mall.ebtp.extend.crypconfigure.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.baas.util.AccessToken; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.constant.CommonConstants; import com.chinaunicom.mall.ebtp.common.crypto.service.CrypServiceImpl; -import com.chinaunicom.mall.ebtp.common.crypto.tenderfee.test; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.uniBss.constant.UniBssConstant; import com.chinaunicom.mall.ebtp.common.uniBss.entity.*; @@ -27,13 +23,11 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.ClassPathResource; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.io.InputStream; import java.io.UnsupportedEncodingException; -import java.net.URL; import java.text.SimpleDateFormat; import java.util.*; @@ -165,7 +159,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl jsonMap = JSONArray.parseObject(json,Map.class); + Map jsonMap = JSONArray.parseObject(json); Object signObject = new Object(); if(jsonMap.get("BODY_LIST")!=null){ @@ -276,10 +270,36 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl parseJSON2Map(String jsonStr){ + Map map = new HashMap(); + Map strmap = JSONArray.parseObject(jsonStr,Map.class); + for(Object k : strmap.keySet()){ + Object v = strmap.get(k); + if(v instanceof JSONArray){ + List> list = new ArrayList>(); + Iterator it = ((JSONArray)v).iterator(); + while (it.hasNext()){ + Object json2 = it.next(); + list.add(parseJSON2Map(json2.toString())); + } + map.put(k.toString(),list); + }else{ + map.put(k.toString(),v); + } + } + return map; + } + public static void main(String[] args) throws ClassNotFoundException, IllegalAccessException, InstantiationException, UnsupportedEncodingException { -// String token = AccessToken.tokenCreate("123"); -// System.out.println(token); + //String json = "{\"RESULT_ID\":\"1\",\"TP_ID\":\"2\",\"SECTION_ID\":\"3\",\"REPORT_ID\":\"4\",\"RESULTDETAIL\":[{\"RESULT_DETAIL_ID\":\"51\",\"RESULT_ID\":\"52\",\"TENDERER_ID\":\"53\",\"WINNER_CANDIDATE\":\"54\",\"PRICE\":\"55\",\"PRICE_REVIEW\":\"56\",\"BUSINESS_SCORE\":\"57\",\"TECHNICAL_SCORE\":\"58\",\"SERVICE_SCORE\":\"59\",\"PRICE_SCORE\":\"60\",\"TOTAL_SCORE\":\"61\",\"CONTRACTED_MONEY\":\"62\",\"TAX_RATE_PRICE\":\"63\",\"SCOREDETAIL\":[{\"RESULT_DETAIL_ID\":\"71\",\"TENDERER_ID\":\"72\",\"USER_ID\":\"73\",\"BUSINESS_SCORE\":\"74\",\"TECHNICAL_SCORE\":\"75\",\"SERVICE_SCORE\":\"76\",\"PRICE_SCORE\":\"77\"}]}]}"; + + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //format.setTimeZone(TimeZone.getTimeZone("GMT")); + String date = format.format(new Date()); + + String token = AccessToken.tokenCreate("bidding"); + System.out.println(token); // example of HashMap entity, treeMap can also work out, // but LinkedHashMap is NOT supported // Map mapb= new HashMap<>(); @@ -294,25 +314,24 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl