diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java index 57f99f6..10a6833 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java @@ -10,7 +10,12 @@ import lombok.Data; */ @Data public class CrypBean { - + /** + * 能力req名称 + * BIDDING_PUBLISH_REQ 发标 + */ + @ApiModelProperty(value = "能力req名称") + public String reqName; /** * 签名 */ 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 ee6f644..152c341 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 @@ -5,15 +5,14 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; 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.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.uniBss.constant.UniBssConstant; -import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBss; -import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBssAttached; -import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBssBody; -import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBssHead; +import com.chinaunicom.mall.ebtp.common.uniBss.entity.*; import com.chinaunicom.mall.ebtp.common.uniBss.service.UniBssServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.blockchain.entity.BlockChainLog; @@ -26,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -46,6 +44,9 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), Map.class); + Map map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), Map.class); map.put("sign", sign); - String json = getUniBss(map); + String json = getUniBss(bean.getReqName(),map); log.setResult("天擎接口调用,地址:"+bean.getUrl()+",参数:"+json);//日志 log.setParam(json); @@ -147,7 +147,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map){ + private String getUniBss(String reqName,Map map){ //获取token Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS"); @@ -158,7 +158,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl