From f2b1a589549b920074376a62cf2ed560e1c47e71 Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 26 Aug 2021 12:25:00 +0800 Subject: [PATCH 01/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/riskmanage/controller/RiskManageController.java | 2 +- .../ebtp/extend/riskmanage/service/IRiskManageService.java | 3 ++- .../extend/riskmanage/service/impl/RiskManageServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/controller/RiskManageController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/controller/RiskManageController.java index 19e83ea..b851321 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/controller/RiskManageController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/controller/RiskManageController.java @@ -59,6 +59,6 @@ public class RiskManageController { */ @PostMapping({"/findApplyRegulation"}) public BaseResponse findApplyRegulation(@RequestBody RiskManageRegulationVO riskManageRegulation){ - return BaseResponse.success(riskManageService.findApplyRegulation(riskManageRegulation)); + return riskManageService.findApplyRegulation(riskManageRegulation); } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/IRiskManageService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/IRiskManageService.java index 7e5c5b6..1f2ca93 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/IRiskManageService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/IRiskManageService.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.riskmanage.service; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationVO; /** @@ -14,5 +15,5 @@ public interface IRiskManageService { * @param riskManageRegulation 访问实体 * @return 返回结果 */ - Object findApplyRegulation(RiskManageRegulationVO riskManageRegulation); + BaseResponse findApplyRegulation(RiskManageRegulationVO riskManageRegulation); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java index 0758047..f626ddc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java @@ -33,7 +33,7 @@ public class RiskManageServiceImpl implements IRiskManageService { @SneakyThrows @Override - public Object findApplyRegulation(RiskManageRegulationVO riskManageRegulation) { + public BaseResponse findApplyRegulation(RiskManageRegulationVO riskManageRegulation) { Map params = riskManageRegulation.getParams(); RiskManageRegulation regulation = riskManageRegulation.getRiskManageRegulation(); From 5744420b848712b368d05d6c89260869d50dc9f8 Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 26 Aug 2021 12:32:45 +0800 Subject: [PATCH 02/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E9=85=8D=E7=BD=AE=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 22add41..4ae1048 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -164,6 +164,7 @@ mconfig: tender: biz-service-ebtp-tender #投标服务 documentcenter: core-service-document-center #文档中心 usercenter: core-service-usercenter-public #用户中心 + strategy-center: core-service-strategy-center #风控中心 file: font-address: /storage/fonts/ upload-address: /storage/reviewReport/ From 7a5ccf2b1e280a256d74d1d0f510efc17aeee130 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Thu, 26 Aug 2021 13:35:39 +0800 Subject: [PATCH 03/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blockchain/dao/mapper/SupplyBlockChainLogMapper.xml | 1 + .../ebtp/extend/blockchain/entity/SupplyBlockChainLog.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/SupplyBlockChainLogMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/SupplyBlockChainLogMapper.xml index 8760933..c82782c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/SupplyBlockChainLogMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/SupplyBlockChainLogMapper.xml @@ -9,6 +9,7 @@ + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/SupplyBlockChainLog.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/SupplyBlockChainLog.java index 4ce26ec..7fcf918 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/SupplyBlockChainLog.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/SupplyBlockChainLog.java @@ -52,6 +52,11 @@ public class SupplyBlockChainLog implements Serializable { */ @ApiModelProperty(value = "") private String turnId; + /** + * + */ + @ApiModelProperty(value = "调用接口的地址") + private String interfaceUrl; /** * 传参 From 551d74e59d5575025ac5f61cdcdcf7a2001d36c3 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Thu, 26 Aug 2021 13:45:59 +0800 Subject: [PATCH 04/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ller.java => BlockChainLogController.java} | 24 +++++++++---------- .../blockchain/dao/BlockChainLogMapper.java | 13 ++++++++++ .../dao/SupplyBlockChainLogMapper.java | 13 ---------- ...nLogMapper.xml => BlockChainLogMapper.xml} | 4 ++-- ...yBlockChainLog.java => BlockChainLog.java} | 6 ++--- ...ervice.java => IBlockChainLogService.java} | 4 ++-- .../impl/BlockChainLogServiceImpl.java | 17 +++++++++++++ .../impl/SupplyBlockChainLogServiceImpl.java | 17 ------------- 8 files changed, 49 insertions(+), 49 deletions(-) rename src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/controller/{SupplyBlockChainLogController.java => BlockChainLogController.java} (51%) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/BlockChainLogMapper.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/SupplyBlockChainLogMapper.java rename src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/{SupplyBlockChainLogMapper.xml => BlockChainLogMapper.xml} (95%) rename src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/{SupplyBlockChainLog.java => BlockChainLog.java} (90%) rename src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/{ISupplyBlockChainLogService.java => IBlockChainLogService.java} (57%) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/impl/BlockChainLogServiceImpl.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/impl/SupplyBlockChainLogServiceImpl.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/controller/SupplyBlockChainLogController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/controller/BlockChainLogController.java similarity index 51% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/controller/SupplyBlockChainLogController.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/controller/BlockChainLogController.java index 5439933..815bc73 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/controller/SupplyBlockChainLogController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/controller/BlockChainLogController.java @@ -3,8 +3,8 @@ package com.chinaunicom.mall.ebtp.extend.blockchain.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import com.chinaunicom.mall.ebtp.extend.blockchain.entity.SupplyBlockChainLog; -import com.chinaunicom.mall.ebtp.extend.blockchain.service.ISupplyBlockChainLogService; +import com.chinaunicom.mall.ebtp.extend.blockchain.entity.BlockChainLog; +import com.chinaunicom.mall.ebtp.extend.blockchain.service.IBlockChainLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -15,24 +15,24 @@ import javax.validation.Valid; @RestController @Api(tags = "供应链+区块链接口调用日志") -@RequestMapping("/v1/supplyblockchainlog") -public class SupplyBlockChainLogController{ +@RequestMapping("/v1/blockchainlog") +public class BlockChainLogController { @Resource - private ISupplyBlockChainLogService isupplyBlockChainLogService; + private IBlockChainLogService iBlockChainLogService; /** * 插入新数据 * - * @param supplyBlockChainLog + * @param blockChainLog * * @return */ @ApiOperation("插入新数据") @PostMapping("") - public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid SupplyBlockChainLog supplyBlockChainLog){ - supplyBlockChainLog.setId(PropertyUtils.getSnowflakeId()); - boolean save = isupplyBlockChainLogService.save(supplyBlockChainLog); + public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid BlockChainLog blockChainLog){ + blockChainLog.setId(PropertyUtils.getSnowflakeId()); + boolean save = iBlockChainLogService.save(blockChainLog); return BaseResponse.success(save); } @@ -47,11 +47,11 @@ public class SupplyBlockChainLogController{ */ @ApiOperation("查询数据") @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - SupplyBlockChainLog supplyBlockChainLog = isupplyBlockChainLogService.getById(id); + BlockChainLog blockChainLog = iBlockChainLogService.getById(id); - return BaseResponse.success(supplyBlockChainLog); + return BaseResponse.success(blockChainLog); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/BlockChainLogMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/BlockChainLogMapper.java new file mode 100644 index 0000000..22c42f1 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/BlockChainLogMapper.java @@ -0,0 +1,13 @@ +package com.chinaunicom.mall.ebtp.extend.blockchain.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chinaunicom.mall.ebtp.extend.blockchain.entity.BlockChainLog; + +/** +* @auto.generated + */ +public interface BlockChainLogMapper extends BaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/SupplyBlockChainLogMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/SupplyBlockChainLogMapper.java deleted file mode 100644 index 28c830d..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/SupplyBlockChainLogMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.blockchain.dao; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chinaunicom.mall.ebtp.extend.blockchain.entity.SupplyBlockChainLog; - -/** -* @auto.generated - */ -public interface SupplyBlockChainLogMapper extends BaseMapper { - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/SupplyBlockChainLogMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/BlockChainLogMapper.xml similarity index 95% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/SupplyBlockChainLogMapper.xml rename to src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/BlockChainLogMapper.xml index c82782c..bd42173 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/SupplyBlockChainLogMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/BlockChainLogMapper.xml @@ -1,9 +1,9 @@ - + + type="com.chinaunicom.mall.ebtp.extend.blockchain.entity.BlockChainLog"> diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/SupplyBlockChainLog.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java similarity index 90% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/SupplyBlockChainLog.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java index 7fcf918..9e28fa4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/SupplyBlockChainLog.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; /** - * 实体类 SupplyBlockChainLog + * 实体类 BlockChainLog * * @auto.generated */ @@ -18,8 +18,8 @@ import java.io.Serializable; @Accessors(chain = true) @ApiModel @EqualsAndHashCode(callSuper = false) -@TableName(value = "supply_block_chain_log", autoResultMap = true) -public class SupplyBlockChainLog implements Serializable { +@TableName(value = "block_chain_log", autoResultMap = true) +public class BlockChainLog implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/ISupplyBlockChainLogService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/IBlockChainLogService.java similarity index 57% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/ISupplyBlockChainLogService.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/IBlockChainLogService.java index 1f78a0b..286128f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/ISupplyBlockChainLogService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/IBlockChainLogService.java @@ -2,14 +2,14 @@ package com.chinaunicom.mall.ebtp.extend.blockchain.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.chinaunicom.mall.ebtp.extend.blockchain.entity.SupplyBlockChainLog; +import com.chinaunicom.mall.ebtp.extend.blockchain.entity.BlockChainLog; /** * 对数据表 supply_block_chain_log 操作的 service * @author Auto create * */ -public interface ISupplyBlockChainLogService extends IService { +public interface IBlockChainLogService extends IService { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/impl/BlockChainLogServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/impl/BlockChainLogServiceImpl.java new file mode 100644 index 0000000..d990d97 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/impl/BlockChainLogServiceImpl.java @@ -0,0 +1,17 @@ +package com.chinaunicom.mall.ebtp.extend.blockchain.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.extend.blockchain.dao.BlockChainLogMapper; +import com.chinaunicom.mall.ebtp.extend.blockchain.entity.BlockChainLog; +import com.chinaunicom.mall.ebtp.extend.blockchain.service.IBlockChainLogService; +import org.springframework.stereotype.Service; +/** + * 对数据表 supply_block_chain_log 操作的 serviceImpl + * blockchain + * + */ +@Service +public class BlockChainLogServiceImpl extends ServiceImpl implements IBlockChainLogService { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/impl/SupplyBlockChainLogServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/impl/SupplyBlockChainLogServiceImpl.java deleted file mode 100644 index 0d2c2b1..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/service/impl/SupplyBlockChainLogServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.blockchain.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chinaunicom.mall.ebtp.extend.blockchain.dao.SupplyBlockChainLogMapper; -import com.chinaunicom.mall.ebtp.extend.blockchain.entity.SupplyBlockChainLog; -import com.chinaunicom.mall.ebtp.extend.blockchain.service.ISupplyBlockChainLogService; -import org.springframework.stereotype.Service; -/** - * 对数据表 supply_block_chain_log 操作的 serviceImpl - * blockchain - * - */ -@Service -public class SupplyBlockChainLogServiceImpl extends ServiceImpl implements ISupplyBlockChainLogService { - - -} From c08fde58825c0eba556ae80c9b4ab770366b1294 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Thu, 26 Aug 2021 14:03:01 +0800 Subject: [PATCH 05/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/BlockChainLogMapper.xml | 20 +++++++++---------- .../blockchain/entity/BlockChainLog.java | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/BlockChainLogMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/BlockChainLogMapper.xml index bd42173..6b0433a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/BlockChainLogMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/dao/mapper/BlockChainLogMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java index 9e28fa4..0a540de 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java @@ -74,7 +74,7 @@ public class BlockChainLog implements Serializable { * 0-成功 1-失败 */ @ApiModelProperty(value = "0-成功 1-失败") - private String status; + private Integer status; From 334914dc5bb44bc9ee1436176b7f448205e2d348 Mon Sep 17 00:00:00 2001 From: dxc Date: Mon, 30 Aug 2021 10:45:50 +0800 Subject: [PATCH 06/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E9=85=8D=E7=BD=AE=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskmanage/service/impl/RiskManageServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java index f626ddc..7e3c52e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.extend.riskmanage.service.impl; import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; import com.chinaunicom.mall.ebtp.extend.feign.client.RiskManageRegulationService; import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO; import com.chinaunicom.mall.ebtp.extend.feign.utils.CallRegulationUtil; @@ -11,6 +12,7 @@ import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationGr import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationVO; import com.chinaunicom.mall.ebtp.extend.riskmanage.service.IRiskManageService; import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -22,6 +24,7 @@ import java.util.Map; * @author daixc * @date 2021/08/19 */ +@Slf4j @Service public class RiskManageServiceImpl implements IRiskManageService { @@ -55,7 +58,7 @@ public class RiskManageServiceImpl implements IRiskManageService { BaseCacheUser cacheUser = cacheUserService.getCacheUser(); regulationGroupApply.setOuterVoList(CallRegulationUtil.getCallRegulationMap(params,regulationParams,cacheUser.getOrganizationId())); - + log.info("调用山分风控接口参数：{}", JsonUtils.objectToJson(regulationGroupApply)); //校验信息 return regulationService.applyRegulation(regulationGroupApply); } From 32f84fb49d7e04b1bf938072989c04fda3e0f789 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 30 Aug 2021 14:00:30 +0800 Subject: [PATCH 07/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +- .../controller/CrypConfigureController.java | 134 ++++++++++++++++++ .../dao/CrypConfigureMapper.java | 10 ++ .../dao/mapper/CrypConfigureMapper.xml | 31 ++++ .../extend/crypconfigure/entity/CrypBean.java | 35 +++++ .../crypconfigure/entity/CrypConfigure.java | 73 ++++++++++ .../service/ICrypConfigureService.java | 28 ++++ .../impl/CrypConfigureServiceImpl.java | 92 ++++++++++++ 8 files changed, 410 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/CrypConfigureMapper.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/mapper/CrypConfigureMapper.xml create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypConfigure.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java diff --git a/pom.xml b/pom.xml index 80857ba..c2bdade 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,13 @@ uboot-core 0.0.1-SNAPSHOT - + + + com.chinaunicom.mall.ebtp + uboot-common + 0.0.19-SNAPSHOT + + com.chinaunicom.ebtp mall-ebtp-cloud-attachment-sdk diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java new file mode 100644 index 0000000..47441d0 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -0,0 +1,134 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +@RestController +@Api(value = "区块链参数配置表") +@RequestMapping("/v1/crypconfigure") +public class CrypConfigureController{ + + @Resource + private ICrypConfigureService iCrypConfigureService; + +// /** +// * 插入新数据 +// * +// * @param crypConfigure +// * +// * @return +// */ +// @ApiOperation("插入新数据") +// @PostMapping +// public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CrypConfigure crypConfigure){ +// +// int i = iCrypConfigureService.insert(crypConfigure); +// +// return BaseResponse.success(i); +// } +// +// /** +// * 修改数据 +// * +// * @param crypConfigure +// * +// * @return +// */ +// @ApiOperation("修改数据") +// @PutMapping +// public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody CrypConfigure crypConfigure){ +// +// Boolean i = iCrypConfigureService.updateCrypConfigureById(crypConfigure); +// +// return BaseResponse.success(i); +// } +// +// /** +// * 查询数据 +// * +// * @param id +// * +// * @return +// */ +// @ApiOperation("根据id查询数据") +// @GetMapping("/{id}") +// public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ +// +// CrypConfigure crypConfigure = iCrypConfigureService.getById(id); +// +// return BaseResponse.success(crypConfigure); +// } +// +// /** +// * 删除数据 +// * @param id 主键id +// * @return BaseResponse +// * @author dino +// * @date 2020/10/21 14:56 +// */ +// @ApiOperation(value = "delete",notes = "删除数据") +// @DeleteMapping("/{id}") +// public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { +// int i = iCrypConfigureService.deleteById(id); +// return BaseResponse.success(i); +// } + + /** + * 查询数据 + * + * @param param + * @return + */ + @ApiOperation("查询列表数据") + @GetMapping("/list") + public BaseResponse> list(@ApiParam(value = "查询对象数据", required = false) CrypConfigure param) { + //查询 + LambdaQueryWrapper query = Wrappers.lambdaQuery(param); + List list = iCrypConfigureService.list(query); + //异常处理 + //RespsExceptionEnum.FRAME_EXCEPTION_DEMO_NOT_FIND.customValid(list.isEmpty()); + return BaseResponse.success(list); + } + + /** + * 区块链数据加密 + * + * @param object + * @return + */ + @ApiOperation("区块链数据加密") + @PostMapping("/signObject") + public BaseResponse signObject(@RequestBody Object object) { + + return BaseResponse.success(this.iCrypConfigureService.signObject(object)); + } + + /** + * 区块链数据解密 + * + * @param bean + * @return + */ + @ApiOperation("区块链数据解密") + @PostMapping("/verifyObject") + public BaseResponse verifyObject(@RequestBody CrypBean bean) { + + return BaseResponse.success(this.iCrypConfigureService.verifyObject(bean)); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/CrypConfigureMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/CrypConfigureMapper.java new file mode 100644 index 0000000..16f76f1 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/CrypConfigureMapper.java @@ -0,0 +1,10 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.dao; + + +import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; +import org.springframework.stereotype.Repository; + +@Repository +public interface CrypConfigureMapper extends IBaseMapper { +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/mapper/CrypConfigureMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/mapper/CrypConfigureMapper.xml new file mode 100644 index 0000000..605fa81 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/mapper/CrypConfigureMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + update biz_bid_cryp_configure + set + delete_flag="1" + where ID=#{id } + + \ No newline at end of file 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 new file mode 100644 index 0000000..1c6cee4 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java @@ -0,0 +1,35 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* 实体类 CrypConfigure-区块链参数配置表 +* +* @author yss +*/ +@Data +public class CrypBean { + + /** + * 签名 + */ + @ApiModelProperty(value = "签名") + public String sing; + /** + * 待签名参数 + */ + @ApiModelProperty(value = "待签名参数") + public Object object; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypConfigure.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypConfigure.java new file mode 100644 index 0000000..bcb83cc --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypConfigure.java @@ -0,0 +1,73 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* 实体类 CrypConfigure-区块链参数配置表 +* +* @author yss +*/ +@Data +@Accessors(chain = true) +@TableName(value = "biz_bid_cryp_configure", autoResultMap = true) +@ApiModel(value = "CrypConfigure对象", description = "区块链参数配置表") +public class CrypConfigure extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "主键ID") + private String id; + + @ApiModelProperty(value = "配置标识") + private String cCode; + + @ApiModelProperty(value = "配置说明") + private String cShow; + + @ApiModelProperty(value = "配置类型 1-区块链") + private Integer type; + + @ApiModelProperty(value = "值") + private String cValue; + + @ApiModelProperty(value = "备注") + private String remarks; + + @ApiModelProperty(value = "状态 0-失效 1-生效") + private Integer state; + + + + + + @ApiModelProperty(value = "租户ID") + private String tenantId; + + @ApiModelProperty(value = "租户名称") + private String tenantName; + + @ApiModelProperty(value = "删除标识") + private String deleteFlag; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "删除标识") + private LocalDateTime lastUpdateTime; + + @ApiModelProperty(value = "割接状态；0-割接数据，1-新数据") + private Integer cutoverStatus; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java new file mode 100644 index 0000000..663dc6b --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java @@ -0,0 +1,28 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.service; + + +import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; + +/** + * 对数据表 biz_bid_cryp_configure 操作的 service + * @author yss + * + */ +public interface ICrypConfigureService extends IBaseService { + + /** + * 加密 + * @param object + * @return + */ + CrypBean signObject(Object object); + + /** + * 解密 + * @param bean + * @return + */ + Boolean verifyObject(CrypBean bean); +} 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 new file mode 100644 index 0000000..b2e6a5d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java @@ -0,0 +1,92 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.service.impl; + + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +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.extend.crypconfigure.dao.CrypConfigureMapper; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +import org.bouncycastle.util.encoders.Base64; +import org.springframework.stereotype.Service; + +import java.security.PrivateKey; +import java.util.List; + +/** + * 对数据表 biz_bid_cryp_configure 操作的 serviceImpl + * @author yss + * + */ +@Service +public class CrypConfigureServiceImpl extends BaseServiceImpl implements ICrypConfigureService { + /** + * 加密 + * @param object + * @return + */ + @Override + public CrypBean signObject(Object object){ + CrypBean bean = new CrypBean(); + try{ + bean.setObject(object); + //查询 + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(CrypConfigure::getState,"1") + .eq(CrypConfigure::getDeleteFlag, CommonConstants.STATUS_NORMAL) + .eq(CrypConfigure::getType,"1") + .eq(CrypConfigure::getCCode,"pem_key"); + + List list = this.list(query); + + CrypConfigure crypConfigure = list.get(0); + + String signValue = CrypServiceImpl.signObject2(bean.getObject(),crypConfigure.getCValue()); + + bean.setSing(signValue); + + return bean; + }catch (Exception e){ + log.error("加密异常:"+e); + } + + + return bean; + } + + /** + * 解密 + * @param bean + * @return + */ + @Override + public Boolean verifyObject(CrypBean bean){ + try{ + //查询 + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(CrypConfigure::getState,"1") + .eq(CrypConfigure::getDeleteFlag, CommonConstants.STATUS_NORMAL) + .eq(CrypConfigure::getType,"1") + .eq(CrypConfigure::getCCode,"crt_key"); + + List list = this.list(query); + log.debug("---------获取解密秘钥--------"); + CrypConfigure crypConfigure = list.get(0); + + Boolean b = CrypServiceImpl.verifyBytes(bean.getSing(), + JSON.toJSONBytes(bean.getObject(),SerializerFeature.MapSortField,SerializerFeature.SortField), + crypConfigure.getCValue()); + return b; + }catch (Exception e){ + + } + + + return false; + } +} From 30f342463ef3dc8a76e229779ae7de78a107c8e4 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 30 Aug 2021 14:49:56 +0800 Subject: [PATCH 08/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 4 ++-- 1 file changed, 2 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 b2e6a5d..136c62e 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 @@ -78,8 +78,8 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Tue, 31 Aug 2021 09:38:52 +0800 Subject: [PATCH 09/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/access_token1.0.jar | Bin 0 -> 30211 bytes pom.xml | 9 +++++++++ .../controller/CrypConfigureController.java | 7 +++++++ 3 files changed, 16 insertions(+) create mode 100644 lib/access_token1.0.jar diff --git a/lib/access_token1.0.jar b/lib/access_token1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..aabd9395047f78ee2640309737a9e3893d50c417 GIT binary patch literal 30211 zcmb@tbC4&|vMt=UZFAbTZQHh{e{J`)ZQIkfZ5z|JZFj#p_na^8doS)i@xF*#QGZlK z?c5a=ktynX_V?Mu!Hz-kzg>a!uN5YiR`y0N_E!IX zHTr+C+Stg*`QLm1@4quK`RU;ZaQHWtIRBlc3&6_uKkU$eprD|DIu-xVpQib@c0wj5 zX3oy44mM`?^d`1O&d%9tHYzF_XnGuEWV-YyzYKweyiw5M@?OGJ%b~z!dvOMp-*4hJ zf+D5tJ+I*tx((J!Fa1sc!w%UP=0PdxU;bZ7Uje@7fb2{((jxiNNylmaxS{R`Mzj^p@N52zlCD- zWHQ<$e~yht8gIot6(G5;b`-D6x2Giw^87qp%><|m7$3kNGqWJ(rfKZpv#1oU;IZ7j z$uhN+={OrRRdghfiMi@)hUjXrcTFb<&3WdccK;wLWNXKX)@pZj_c3@8r6WF9E+`_> zES_cS_t=ptM#rPN=6NeemBMNhR!=QOElEa=89b?g(XQBtsiAlbG)ZIjR_R9`^IBXx zoH-(SzOjcng5m2(rN&@r5 zOH&dU2C1;$|EakjVD z@q0({d&hBR$MIoO5O5L|s`2u+^q%#?&ZeE2XB<6=y>(rMNWAl(q>w?azRFBU$GRzz~?K*>FegM&jP;){;Nod)woK(1*%}`*T*}Ujj*lQ41 zQE6Kkbu}nuU~1ZN@sVxPahhWGlm7wFXau!|b0TGuvP!uRyMw!A$Gs}bh8-ZJ+5E+t zkAqom(3Kl>yb(H_TV}D6CK&Vh66L zP4JgDUGjuLL5#a005&HWeo=2b(2e+DUC_rC{!4{2m*@rz{tEA6E6DSmDR5;a&#CYf z^WxSJekv2{>i_~O(S#I#{3dh^!}9n~020eZKXA@7(%cj+!XC(d%A#i&q9gANKGJGP zWZ1k8p_D;C)U*CU4og#`Ny5pUla!h5A;G42#&-TAoDgwG3y8wXO!(Eg{R}$?R6@&Cd&4gRtk8B`8im z<}_r&(UY2!(|Yw|N~!z^RhJn?*P0ju=yM42AxgDU?rA4kRWdD%z%;nZ>-s-rRQK`E zZsVjSn<##ZVq)k<^LA!Cx>W3QMx*a1##BACU=CE;f#OKrD6g|J; z)+PrYB1bBaks|ds4}milK-WNWgP#6?SCoN-x-z(#4+aMUvir+r{~)Y?M)&`l(kTCZ zbQe=m`^yghjO@i4uWqL z=Ix)`UC*2En}^ZgZ@CSGASeB~e0VU-5zMq4()N>{j_^mkWdog2;2c+vz0ryG8^?X- z8w~rvOafGC-4yDGWA1-`O(-G_P-Dlk<`Eb?@4)c3L&xqqVJo=T>ft$zBr=~m+MOf9us+2clKdb(xQ40Tl*b?(Ba z(7jNudkO`rQcR3Hbw;El$A)WT2G`}EmGpcx^hlKV<#Z0^L!J2*yQ@Z3d1mkvRD*4l z6&;**v|&v_M>rr(A`DpSMUy1FD+{kug+#mKkCQ@~vLO(Kwzctj*dw4QrYKN|V$Bkf z#aS70m@aIygouxT;Bm@+LzC|E`U`1GeU3ZzwaMFAE**rKqt@cn1rhBnhy*E$e5cV` zimAbJmBA$zLtQ~xd8}NwSAV6h4Lgi^>JVaQ;48(rl;3EK;4n{y42j1HW8yh7 z=Deh9TXh``6&Ep|SvS7gP&rzy(l+D=72I37n zy;}VYiSX8Ic8=YD5iLm?gZK0@4B7Q4-%$9<71@+l1-3Z07Z{7o|7eBx1$WqwigH8y zfVkGLEKcx)!MOdgxrIf8Ed!HsOR$h5pRL3Hev512Tr4X-tOZWvuF?1Y;y-$Q7FMrMu=7FRPB%f{ZW0YF5B^2?;|0nB?L$3n*-`mk;bQ(X z{2d(+yyLJrdKpamRJJW@THy8WwS|E1dvbxW=VkPjBUhlsJEX<;?kf_;H*}k(RVK{g z`~AFT(KO*^X7OwJ>DSpyU5ub6zSLwiMI&hZZ(}1y?9)puS_IQaMJrGGKbu<~tlT&P z%p57w7}`8j@^ouFJ`Mn4mUy`1gu+dgy7@n≤(lst2Qa*r!*F_wUZYY_pk!I9xbq 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 F`X6=meYOAq literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index c2bdade..07daa8b 100644 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,15 @@ ${basedir}/lib/aspose-words-16.8.0-jdk16.jar + + + cryp.access + accessToken + 1.0 + system + ${basedir}/lib/access_token1.0.jar + + org.apache.velocity velocity-tools diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index 47441d0..63da22a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.extend.crypconfigure.controller; 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.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; @@ -131,4 +132,10 @@ public class CrypConfigureController{ return BaseResponse.success(this.iCrypConfigureService.verifyObject(bean)); } + + public static void main(String[] args) { + String token = AccessToken.tokenCreate(); + System.out.println(token); + + } } From 445ca2720b3a3ce7336b8e95c22b3dc94103955d Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 09:41:38 +0800 Subject: [PATCH 10/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CrypConfigureController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index 63da22a..92c5159 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -133,9 +133,16 @@ public class CrypConfigureController{ return BaseResponse.success(this.iCrypConfigureService.verifyObject(bean)); } - public static void main(String[] args) { - String token = AccessToken.tokenCreate(); - System.out.println(token); + /** + * accessToken获取 + * + * @param bean + * @return + */ + @ApiOperation("accessToken获取") + @PostMapping("/getAccessToken") + public BaseResponse getAccessToken(@RequestBody CrypBean bean) { + return BaseResponse.success( AccessToken.tokenCreate()); } } From a8d60cb680af3dbb02b3992c0566c939ca8bb71c Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 10:38:17 +0800 Subject: [PATCH 11/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/controller/CrypConfigureController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index 92c5159..f330be8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -140,8 +140,8 @@ public class CrypConfigureController{ * @return */ @ApiOperation("accessToken获取") - @PostMapping("/getAccessToken") - public BaseResponse getAccessToken(@RequestBody CrypBean bean) { + @GetMapping("/getAccessToken") + public BaseResponse getAccessToken() { return BaseResponse.success( AccessToken.tokenCreate()); } From a3c404986fc2e10b46880e24b3eb62cc8fcfc388 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 10:39:06 +0800 Subject: [PATCH 12/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/controller/CrypConfigureController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index f330be8..0d60c9e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -136,7 +136,7 @@ public class CrypConfigureController{ /** * accessToken获取 * - * @param bean + * @param * @return */ @ApiOperation("accessToken获取") From 91b3957c4489d3387d31246fe2fc3a5704f20fdf Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 13:56:44 +0800 Subject: [PATCH 13/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 4 ---- 1 file changed, 4 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 136c62e..58ddd60 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 @@ -1,8 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.crypconfigure.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; @@ -12,10 +10,8 @@ import com.chinaunicom.mall.ebtp.extend.crypconfigure.dao.CrypConfigureMapper; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; -import org.bouncycastle.util.encoders.Base64; import org.springframework.stereotype.Service; -import java.security.PrivateKey; import java.util.List; /** From d7c556b9035d28be8afbb294968f6049c2a63a5f Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Tue, 31 Aug 2021 15:30:49 +0800 Subject: [PATCH 14/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/blockchain/entity/BlockChainLog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java index 0a540de..2da0cae 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import java.io.Serializable; /** @@ -76,6 +78,4 @@ public class BlockChainLog implements Serializable { @ApiModelProperty(value = "0-成功 1-失败") private Integer status; - - } From d51eb8dba57189a279ddd3b144ca4601e90ba777 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 18:11:11 +0800 Subject: [PATCH 15/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CrypConfigureController.java | 13 ++ .../extend/crypconfigure/entity/CrypBean.java | 19 +-- .../service/ICrypConfigureService.java | 6 + .../impl/CrypConfigureServiceImpl.java | 146 ++++++++++++++++-- 4 files changed, 158 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index 0d60c9e..174c3ca 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -107,6 +107,19 @@ public class CrypConfigureController{ return BaseResponse.success(list); } + /** + * 调用天擎接口 + * + * @param bean + * @return + */ + @ApiOperation("调用天擎接口") + @PostMapping("/callUniInterface") + public BaseResponse callUniInterface(@RequestBody CrypBean bean) { + + return BaseResponse.success(this.iCrypConfigureService.callUniInterface(bean)); + } + /** * 区块链数据加密 * 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 1c6cee4..57f99f6 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 @@ -1,17 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.crypconfigure.entity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.time.LocalDateTime; /** * 实体类 CrypConfigure-区块链参数配置表 @@ -25,11 +15,16 @@ public class CrypBean { * 签名 */ @ApiModelProperty(value = "签名") - public String sing; + public String sign; /** - * 待签名参数 + * 待签名参数 Map */ @ApiModelProperty(value = "待签名参数") public Object object; + /** + * 天擎接口地址 + */ + @ApiModelProperty(value = "天擎接口地址") + public String url; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java index 663dc6b..865ffe8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java @@ -11,6 +11,12 @@ import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; * */ public interface ICrypConfigureService extends IBaseService { + /** + * 调用天擎接口 + * @param bean + * @return + */ + Boolean callUniInterface(CrypBean bean); /** * 加密 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 58ddd60..ee6f644 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 @@ -1,18 +1,39 @@ package com.chinaunicom.mall.ebtp.extend.crypconfigure.service.impl; +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.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.service.UniBssServiceImpl; +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.extend.blockchain.entity.BlockChainLog; +import com.chinaunicom.mall.ebtp.extend.blockchain.service.IBlockChainLogService; import com.chinaunicom.mall.ebtp.extend.crypconfigure.dao.CrypConfigureMapper; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +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; import java.util.List; +import java.util.Map; + +import static com.chinaunicom.mall.ebtp.common.uniBss.service.UniBssServiceImpl.MD5min; /** * 对数据表 biz_bid_cryp_configure 操作的 serviceImpl @@ -21,6 +42,61 @@ import java.util.List; */ @Service public class CrypConfigureServiceImpl extends BaseServiceImpl implements ICrypConfigureService { + + @Autowired + private IBlockChainLogService iBlockChainLogService; + + @Value("${mconfig.bss.app-id}") + private String app_id; + @Value("${mconfig.bss.app-secret}") + private String app_secret; + + /** + * 调用天擎接口 + * @param bean + * @return + */ + @Override + public Boolean callUniInterface(CrypBean bean){ + BlockChainLog log = new BlockChainLog(); + log.setId(PropertyUtils.getSnowflakeId()); + //天擎地址 + log.setInterfaceUrl(bean.getUrl()); + + + try { + //传入数据解密 + String sign = getSignValue(bean.getObject()); + + Map map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), Map.class); + map.put("sign", sign); + + String json = getUniBss(map); + log.setResult("天擎接口调用，地址："+bean.getUrl()+",参数："+json);//日志 + log.setParam(json); + + String str = UniBssServiceImpl.uniBssHttpPost(bean.getUrl(), json); + UniBss uniBssRsp = JSONArray.parseObject(str, UniBss.class); + if (uniBssRsp != null && UniBssConstant.RESP_CODE_00000.equals(uniBssRsp.getUniBssHead().getRespCode())) { + log.setStatus(0);//成功 + return true; + } else { + log.setStatus(1);//失败 + + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.assertStringNotNullByKey("天擎接口调用错误，" + + "RESP_CODE:" + uniBssRsp.getUniBssHead().getRespCode() + "" + + "(" + UniBssConstant.getRESP_CODE_Map(uniBssRsp.getUniBssHead().getRespCode()) + ")。" + + "RESP_DESC:" + uniBssRsp.getUniBssHead().getRespDesc(), bean); + } + }catch (Exception e){ + log.setStatus(1); + log.setResult(e.getMessage()); + } + + this.iBlockChainLogService.save(log); + + return false; + } /** * 加密 * @param object @@ -31,30 +107,72 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl query = Wrappers.lambdaQuery(); - query.eq(CrypConfigure::getState,"1") - .eq(CrypConfigure::getDeleteFlag, CommonConstants.STATUS_NORMAL) - .eq(CrypConfigure::getType,"1") - .eq(CrypConfigure::getCCode,"pem_key"); - List list = this.list(query); + String signValue = getSignValue(bean.getObject()); - CrypConfigure crypConfigure = list.get(0); - - String signValue = CrypServiceImpl.signObject2(bean.getObject(),crypConfigure.getCValue()); - - bean.setSing(signValue); + bean.setSign(signValue); return bean; }catch (Exception e){ log.error("加密异常:"+e); } - return bean; } + /** + * 获取加密签名 + * @param object + * @return + */ + private String getSignValue(Object object){ + //查询 + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(CrypConfigure::getState,"1") + .eq(CrypConfigure::getDeleteFlag, CommonConstants.STATUS_NORMAL) + .eq(CrypConfigure::getType,"1") + .eq(CrypConfigure::getCCode,"pem_key"); + + List list = this.list(query); + + CrypConfigure crypConfigure = list.get(0); + + String signValue = CrypServiceImpl.signObject2(object,crypConfigure.getCValue()); + + return signValue; + } + + /** + * 获取加密签名 + * @param map + * @return + */ + private String getUniBss(Map map){ + //获取token + Date date = new Date(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS"); + SimpleDateFormat format2 = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + String TIMESTAMP = format.format(date); + String TRANS_ID = format2.format(date) + (int) ((Math.random() * 9 + 1) * 100000); + String s = "APP_ID" + app_id + "TIMESTAMP" + TIMESTAMP + "TRANS_ID" + TRANS_ID + app_secret; + String token = MD5min(s); + UniBss uniBss = new UniBss(); + uniBss.setUniBssAttached(new UniBssAttached().setMediaInf("")); + + UniBssHead head = new UniBssHead(); + head.setAppId(app_id); + head.setTimeStamp(TIMESTAMP); + head.setTransId(TRANS_ID); + head.setToken(token); + uniBss.setUniBssHead(head); + + UniBssBody body = new UniBssBody(); + body.setSingleOrderQryReq(map); + + uniBss.setUniBssBody(body); + + return JSON.toJSONString(uniBss); + } /** * 解密 * @param bean @@ -74,7 +192,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 1 Sep 2021 14:00:03 +0800 Subject: [PATCH 16/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/crypconfigure/entity/CrypBean.java | 7 +++- .../impl/CrypConfigureServiceImpl.java | 37 ++++++++++++------- 2 files changed, 29 insertions(+), 15 deletions(-) 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 Date: Wed, 1 Sep 2021 14:15:23 +0800 Subject: [PATCH 17/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 152c341..895c3cb 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 @@ -176,6 +176,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 1 Sep 2021 14:17:47 +0800 Subject: [PATCH 18/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 895c3cb..9268388 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 @@ -72,10 +72,11 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 1 Sep 2021 16:52:36 +0800 Subject: [PATCH 19/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 9268388..4b07f5b 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 @@ -69,7 +69,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), Map.class); - map.put("sign", sign); + map.put("SIGN", sign); String json = getUniBss(bean.getReqName(),map); @@ -137,7 +137,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl list = this.list(query); CrypConfigure crypConfigure = list.get(0); - + log.debug("加密参数:"+JSONArray.toJSONString(object)); String signValue = CrypServiceImpl.signObject2(object,crypConfigure.getCValue()); return signValue; @@ -172,7 +172,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl query = Wrappers.lambdaQuery(); @@ -203,7 +204,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl list = this.list(query); log.debug("---------获取解密秘钥--------"); CrypConfigure crypConfigure = list.get(0); - + log.debug("解密参数:"+JSONArray.toJSONString(bean.getObject())); Boolean b = CrypServiceImpl.verifyValue(bean.getSign(), bean.getObject(), crypConfigure.getCValue()); From ae23f4700c50f31db5621e020eb62d5a04a2fd6c Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 1 Sep 2021 17:17:36 +0800 Subject: [PATCH 20/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 4b07f5b..4054377 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 @@ -80,6 +80,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Thu, 2 Sep 2021 10:03:00 +0800 Subject: [PATCH 21/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CrypConfigureServiceImpl.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 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 4054377..a51b6f4 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 @@ -26,10 +26,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import static com.chinaunicom.mall.ebtp.common.uniBss.service.UniBssServiceImpl.MD5min; @@ -68,7 +65,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), Map.class); + LinkedHashMap map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), LinkedHashMap.class); map.put("SIGN", sign); String json = getUniBss(bean.getReqName(),map); @@ -79,12 +76,21 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl rspMap = JSONArray.parseObject(JSONArray.toJSONString(rspObject), LinkedHashMap.class); + if(rspMap.get("Code")!=null&&"200".equals(rspMap.get("Code").toString())){ + log.setStatus(0);//成功 + this.iBlockChainLogService.save(log); + return true; + }else{ + log.setStatus(1);//失败 + this.iBlockChainLogService.save(log); + } + + return false; } else { log.setStatus(1);//失败 - CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.assertStringNotNullByKey("天擎接口调用错误，" + "RESP_CODE:" + uniBssRsp.getUniBssHead().getRespCode() + "" + "(" + UniBssConstant.getRESP_CODE_Map(uniBssRsp.getUniBssHead().getRespCode()) + ")。" + @@ -140,7 +146,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map){ + private String getUniBss(String reqName, LinkedHashMap map){ //获取token Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS"); From a6b7c7f4409a306a982a92ae5fdf130eb4ec5283 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Sep 2021 10:20:39 +0800 Subject: [PATCH 22/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 4 ---- 1 file changed, 4 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 a51b6f4..5f9f33b 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 @@ -71,7 +71,6 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Thu, 2 Sep 2021 10:23:12 +0800 Subject: [PATCH 23/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 5f9f33b..5aac4b3 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 @@ -174,17 +174,20 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Thu, 2 Sep 2021 11:10:53 +0800 Subject: [PATCH 24/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ccess_token1.0.jar => access_token1.1.jar} | Bin 30211 -> 30144 bytes pom.xml | 2 +- .../controller/CrypConfigureController.java | 2 +- .../impl/CrypConfigureServiceImpl.java | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename lib/{access_token1.0.jar => access_token1.1.jar} (77%) diff --git a/lib/access_token1.0.jar b/lib/access_token1.1.jar similarity index 77% rename from lib/access_token1.0.jar rename to lib/access_token1.1.jar index aabd9395047f78ee2640309737a9e3893d50c417..ca28bb3f4655e354eb7f0a4641baf9467deef578 100644 GIT binary patch delta 4165 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 delta 4106 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 diff --git a/pom.xml b/pom.xml index 07daa8b..31f7e66 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ accessToken 1.0 system - ${basedir}/lib/access_token1.0.jar + ${basedir}/lib/access_token1.1.jar diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index 174c3ca..35e5449 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -156,6 +156,6 @@ public class CrypConfigureController{ @GetMapping("/getAccessToken") public BaseResponse getAccessToken() { - return BaseResponse.success( AccessToken.tokenCreate()); + return BaseResponse.success( AccessToken.tokenCreate("bidding")); } } 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 5aac4b3..06831c5 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 @@ -176,7 +176,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Thu, 2 Sep 2021 14:36:08 +0800 Subject: [PATCH 25/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CrypConfigureServiceImpl.java | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) 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 06831c5..d12d284 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 @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.UnsupportedEncodingException; import java.text.SimpleDateFormat; import java.util.*; @@ -140,6 +141,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl list = this.list(query); CrypConfigure crypConfigure = list.get(0); + log.debug("秘钥:"+crypConfigure.getCValue()); log.debug("加密参数:"+JSONArray.toJSONString(object)); String signValue = CrypServiceImpl.signObject2(object,crypConfigure.getCValue()); log.debug("加密结果:"+signValue); @@ -208,8 +210,8 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl list = this.list(query); - log.debug("---------获取解密秘钥--------"); CrypConfigure crypConfigure = list.get(0); + log.debug("解密秘钥:"+crypConfigure.getCValue()); log.debug("解密参数:"+JSONArray.toJSONString(bean.getObject())); Boolean b = CrypServiceImpl.verifyValue(bean.getSign(), bean.getObject(), @@ -221,4 +223,38 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl mapb= new HashMap<>(); + + Map map = new HashMap<>(1); + map.put("TENDERER_ID","8533"); + map.put("SHOPPINGCART_ID","L3307"); + map.put("AMOUNT","1000"); + map.put("TP_ID","L3307A"); + map.put("SECTION_ID","1111"); + + List list = new ArrayList(); + list.add(map); + //mapb.put("BODY_LIST",list); + + System.out.println(mapb); + + String pkey = "-----BEGIN PRIVATE KEY-----\n" + + "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfb0OcgWWFJGaOmVI\n" + + "LxEpIRTsICs0ssgJZqpuZQUhTIGhRANCAAQ8dPtVEfZfm2wXdqoqYpColaJ4MxiJ\n" + + "rFoUUMepAwuIQLaSZIH1+YbUkr/P+ybC1cbiBMrZjCxiAimk7dLxmUkx\n" + + "-----END PRIVATE KEY-----"; + //"MEUCIQC0TNG+JlFa2kCwQOdYer69cA4psgDoK9ulqdKyK5BEwQIgFOlVofB+xDVOCSuj7t2Pp3z0fyyiuXPy5dRMsOMoh3U="; + String signature = CrypServiceImpl.signObject2(list,pkey); + System.out.println("signature of Map: "+signature); + boolean isOk = CrypServiceImpl.verifyObject(signature,list,CRT_PATH); + System.out.println("verify result of Map: "+ isOk); + + } } From 6edd9a309e979da9b2f5b5216c58350e2b2660fa Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Sep 2021 15:46:38 +0800 Subject: [PATCH 26/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CrypConfigureServiceImpl.java | 101 +++++++++--------- src/main/resources/adminNew.crt | 16 +++ src/main/resources/admin_certPrivateNew.pem | 5 + 3 files changed, 70 insertions(+), 52 deletions(-) create mode 100644 src/main/resources/adminNew.crt create mode 100644 src/main/resources/admin_certPrivateNew.pem 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 d12d284..369500a 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 @@ -10,6 +10,7 @@ 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.*; @@ -23,9 +24,11 @@ import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; +import java.net.URL; import java.text.SimpleDateFormat; import java.util.*; @@ -45,6 +48,12 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl query = Wrappers.lambdaQuery(); - query.eq(CrypConfigure::getState,"1") - .eq(CrypConfigure::getDeleteFlag, CommonConstants.STATUS_NORMAL) - .eq(CrypConfigure::getType,"1") - .eq(CrypConfigure::getCCode,"pem_key"); - - List list = this.list(query); - - CrypConfigure crypConfigure = list.get(0); - log.debug("秘钥:"+crypConfigure.getCValue()); log.debug("加密参数:"+JSONArray.toJSONString(object)); - String signValue = CrypServiceImpl.signObject2(object,crypConfigure.getCValue()); + URL pem = CrypConfigureServiceImpl.class.getClassLoader().getResource(PEM_PATH); + String signValue = CrypServiceImpl.signObject(object,pem.getPath()); log.debug("加密结果:"+signValue); return signValue; } @@ -178,7 +177,11 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl query = Wrappers.lambdaQuery(); - query.eq(CrypConfigure::getState,"1") - .eq(CrypConfigure::getDeleteFlag, CommonConstants.STATUS_NORMAL) - .eq(CrypConfigure::getType,"1") - .eq(CrypConfigure::getCCode,"crt_key"); - - List list = this.list(query); - CrypConfigure crypConfigure = list.get(0); - log.debug("解密秘钥:"+crypConfigure.getCValue()); log.debug("解密参数:"+JSONArray.toJSONString(bean.getObject())); - Boolean b = CrypServiceImpl.verifyValue(bean.getSign(), - bean.getObject(), - crypConfigure.getCValue()); + URL crt = CrypConfigureServiceImpl.class.getClassLoader().getResource(CRT_PATH); + + Boolean b = CrypServiceImpl.verifyObject(bean.getSign(),bean.getObject(),crt.getPath()); return b; }catch (Exception e){ @@ -224,37 +217,41 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl mapb= new HashMap<>(); +// Map mapb= new HashMap<>(); +// +// Map map = new HashMap<>(1); +// map.put("TENDERER_ID","8533"); +// map.put("SHOPPINGCART_ID","L3307"); +// map.put("AMOUNT","1000"); +// map.put("TP_ID","L3307A"); +// map.put("SECTION_ID","1111"); +// +// List list = new ArrayList(); +// list.add(map); +// //mapb.put("BODY_LIST",list); +// +// CrypConfigureServiceImpl crypService = new CrypConfigureServiceImpl(); +// CrypBean bean = crypService.signObject(list); +// System.out.println(bean); - Map map = new HashMap<>(1); - map.put("TENDERER_ID","8533"); - map.put("SHOPPINGCART_ID","L3307"); - map.put("AMOUNT","1000"); - map.put("TP_ID","L3307A"); - map.put("SECTION_ID","1111"); - - List list = new ArrayList(); - list.add(map); - //mapb.put("BODY_LIST",list); - - System.out.println(mapb); - - String pkey = "-----BEGIN PRIVATE KEY-----\n" + - "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfb0OcgWWFJGaOmVI\n" + - "LxEpIRTsICs0ssgJZqpuZQUhTIGhRANCAAQ8dPtVEfZfm2wXdqoqYpColaJ4MxiJ\n" + - "rFoUUMepAwuIQLaSZIH1+YbUkr/P+ybC1cbiBMrZjCxiAimk7dLxmUkx\n" + - "-----END PRIVATE KEY-----"; - //"MEUCIQC0TNG+JlFa2kCwQOdYer69cA4psgDoK9ulqdKyK5BEwQIgFOlVofB+xDVOCSuj7t2Pp3z0fyyiuXPy5dRMsOMoh3U="; - String signature = CrypServiceImpl.signObject2(list,pkey); - System.out.println("signature of Map: "+signature); - boolean isOk = CrypServiceImpl.verifyObject(signature,list,CRT_PATH); - System.out.println("verify result of Map: "+ isOk); +// System.out.println(mapb); +// +// String pkey = "-----BEGIN PRIVATE KEY-----\n" + +// "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfb0OcgWWFJGaOmVI\n" + +// "LxEpIRTsICs0ssgJZqpuZQUhTIGhRANCAAQ8dPtVEfZfm2wXdqoqYpColaJ4MxiJ\n" + +// "rFoUUMepAwuIQLaSZIH1+YbUkr/P+ybC1cbiBMrZjCxiAimk7dLxmUkx\n" + +// "-----END PRIVATE KEY-----"; +// //"MEUCIQC0TNG+JlFa2kCwQOdYer69cA4psgDoK9ulqdKyK5BEwQIgFOlVofB+xDVOCSuj7t2Pp3z0fyyiuXPy5dRMsOMoh3U="; +// String signature = CrypServiceImpl.signObject2(list,pkey); +// System.out.println("signature of Map: "+signature); +// boolean isOk = CrypServiceImpl.verifyObject(signature,list,CRT_PATH); +// System.out.println("verify result of Map: "+ isOk); } } diff --git a/src/main/resources/adminNew.crt b/src/main/resources/adminNew.crt new file mode 100644 index 0000000..08ff361 --- /dev/null +++ b/src/main/resources/adminNew.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICgjCCAimgAwIBAgIUYP62P06sD2LqFyrCW8gDB4EvOmowCgYIKoZIzj0EAwIw +ZzELMAkGA1UEBhMCQ04xETAPBgNVBAgTCFNoYW5Eb25nMQ4wDAYDVQQHEwVKaU5h +bjEYMBYGA1UEChMPYWRtaW50MDgxMmFvcmczMRswGQYDVQQDExJjYS5hZG1pbnQw +ODEyYW9yZzMwHhcNMjEwODMxMDYzMDAwWhcNMjIwODMxMDYzNTAwWjAzMRwwDQYD +VQQLEwZjbGllbnQwCwYDVQQLEwRvcmczMRMwEQYDVQQDDAphZG1pbkBvcmczMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPHT7VRH2X5tsF3aqKmKQqJWieDMYiaxa +FFDHqQMLiEC2kmSB9fmG1JK/z/smwtXG4gTK2YwsYgIppO3S8ZlJMaOB5jCB4zAO +BgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUxhcLh6TJkZkr +4aj4/P9YvfuSWGwwKwYDVR0jBCQwIoAg39Z8xQV3+pq1DBYm7uNMvAqFNpkbsvGe +LZX537X16UEwFAYDVR0RBA0wC4IJSlpaSEpTLTcyMGEGCCoDBAUGBwgBBFV7ImF0 +dHJzIjp7ImhmLkFmZmlsaWF0aW9uIjoib3JnMyIsImhmLkVucm9sbG1lbnRJRCI6 +ImFkbWluQG9yZzMiLCJoZi5UeXBlIjoiY2xpZW50In19MAoGCCqGSM49BAMCA0cA +MEQCIHqfq7vUlpdZUzV/qOeIvmLpom4qKzVuBmp2Bkl5M0LNAiAl7Y9a6TiCMx9/ +0XMXsg5XS07GeLH9e94vY2y5GN/QZA== +-----END CERTIFICATE----- diff --git a/src/main/resources/admin_certPrivateNew.pem b/src/main/resources/admin_certPrivateNew.pem new file mode 100644 index 0000000..d364d17 --- /dev/null +++ b/src/main/resources/admin_certPrivateNew.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfb0OcgWWFJGaOmVI +LxEpIRTsICs0ssgJZqpuZQUhTIGhRANCAAQ8dPtVEfZfm2wXdqoqYpColaJ4MxiJ +rFoUUMepAwuIQLaSZIH1+YbUkr/P+ybC1cbiBMrZjCxiAimk7dLxmUkx +-----END PRIVATE KEY----- From b24c56993567beda0503d1fd4a60b0a66b92bc12 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Sep 2021 15:55:37 +0800 Subject: [PATCH 27/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 369500a..a12d172 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 @@ -72,10 +72,17 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), LinkedHashMap.class); + Object signObject = new Object(); + + if(map.get("BODY_LIST")!=null){ + signObject = map.get("BODY_LIST"); + }else{ + signObject =map; + } + //传入数据解密 + String sign = getSignValue(signObject); + map.put("SIGN", sign); String json = getUniBss(bean.getReqName(),map); From b240cd0542e38dbeefb446574d93bff0167a82fa Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Sep 2021 16:23:23 +0800 Subject: [PATCH 28/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CrypConfigureServiceImpl.java | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 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 a12d172..4746bf2 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 @@ -22,11 +22,13 @@ import com.chinaunicom.mall.ebtp.extend.crypconfigure.dao.CrypConfigureMapper; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +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.stereotype.Service; +import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URL; import java.text.SimpleDateFormat; @@ -147,10 +149,15 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl mapb= new HashMap<>(); // -// Map map = new HashMap<>(1); -// map.put("TENDERER_ID","8533"); -// map.put("SHOPPINGCART_ID","L3307"); -// map.put("AMOUNT","1000"); -// map.put("TP_ID","L3307A"); -// map.put("SECTION_ID","1111"); -// -// List list = new ArrayList(); -// list.add(map); -// //mapb.put("BODY_LIST",list); -// -// CrypConfigureServiceImpl crypService = new CrypConfigureServiceImpl(); -// CrypBean bean = crypService.signObject(list); -// System.out.println(bean); + Map map = new HashMap<>(1); + map.put("TENDERER_ID","8533"); + map.put("SHOPPINGCART_ID","L3307"); + map.put("AMOUNT","1000"); + map.put("TP_ID","L3307A"); + map.put("SECTION_ID","1111"); + + List list = new ArrayList(); + list.add(map); + //mapb.put("BODY_LIST",list); + + CrypConfigureServiceImpl crypService = new CrypConfigureServiceImpl(); + CrypBean bean = crypService.signObject(list); + System.out.println(bean); -// System.out.println(mapb); -// // String pkey = "-----BEGIN PRIVATE KEY-----\n" + // "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfb0OcgWWFJGaOmVI\n" + // "LxEpIRTsICs0ssgJZqpuZQUhTIGhRANCAAQ8dPtVEfZfm2wXdqoqYpColaJ4MxiJ\n" + // "rFoUUMepAwuIQLaSZIH1+YbUkr/P+ybC1cbiBMrZjCxiAimk7dLxmUkx\n" + // "-----END PRIVATE KEY-----"; -// //"MEUCIQC0TNG+JlFa2kCwQOdYer69cA4psgDoK9ulqdKyK5BEwQIgFOlVofB+xDVOCSuj7t2Pp3z0fyyiuXPy5dRMsOMoh3U="; + //"MEUCIQC0TNG+JlFa2kCwQOdYer69cA4psgDoK9ulqdKyK5BEwQIgFOlVofB+xDVOCSuj7t2Pp3z0fyyiuXPy5dRMsOMoh3U="; // String signature = CrypServiceImpl.signObject2(list,pkey); // System.out.println("signature of Map: "+signature); // boolean isOk = CrypServiceImpl.verifyObject(signature,list,CRT_PATH); From f67f010eebb10d5097fc54146bcf042b6a1d7e82 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Sep 2021 16:43:13 +0800 Subject: [PATCH 29/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blockchain/entity/BlockChainLog.java | 12 ++++++++ .../impl/CrypConfigureServiceImpl.java | 30 +++++++++++-------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java index 2da0cae..c099bbd 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java @@ -1,15 +1,22 @@ package com.chinaunicom.mall.ebtp.extend.blockchain.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 实体类 BlockChainLog @@ -77,5 +84,10 @@ public class BlockChainLog implements Serializable { */ @ApiModelProperty(value = "0-成功 1-失败") private Integer status; + @TableField(fill = FieldFill.INSERT,typeHandler = CustomLocalDateTimeTypeHandler.class) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") + private LocalDateTime createDate; } 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 4746bf2..4975969 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 @@ -22,6 +22,7 @@ import com.chinaunicom.mall.ebtp.extend.crypconfigure.dao.CrypConfigureMapper; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +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; @@ -41,6 +42,7 @@ import static com.chinaunicom.mall.ebtp.common.uniBss.service.UniBssServiceImpl. * @author yss * */ +@Slf4j @Service public class CrypConfigureServiceImpl extends BaseServiceImpl implements ICrypConfigureService { @@ -68,10 +70,10 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), LinkedHashMap.class); @@ -89,34 +91,36 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl rspMap = JSONArray.parseObject(JSONArray.toJSONString(rspObject), LinkedHashMap.class); + if(rspMap.get("Code")!=null&&"200".equals(rspMap.get("Code").toString())){ - log.setStatus(0);//成功 - this.iBlockChainLogService.save(log); + log.debug("请求成功："+rspMap); + blockChainLog.setStatus(0);//成功 + this.iBlockChainLogService.save(blockChainLog); return true; }else{ - log.setStatus(1);//失败 + blockChainLog.setStatus(1);//失败 } } else { - log.setStatus(1);//失败 + blockChainLog.setStatus(1);//失败 CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.assertStringNotNullByKey("天擎接口调用错误，" + "RESP_CODE:" + uniBssRsp.getUniBssHead().getRespCode() + "" + "(" + UniBssConstant.getRESP_CODE_Map(uniBssRsp.getUniBssHead().getRespCode()) + ")。" + "RESP_DESC:" + uniBssRsp.getUniBssHead().getRespDesc(), bean); } }catch (Exception e){ - log.setStatus(1); - log.setResult(e.getMessage()); + blockChainLog.setStatus(1); + blockChainLog.setResult(e.getMessage()); } - this.iBlockChainLogService.save(log); + this.iBlockChainLogService.save(blockChainLog); return false; } From eef573f4f9deda187212e6e0839820a6593d1ac9 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Sep 2021 17:03:12 +0800 Subject: [PATCH 30/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 4975969..e3978bd 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 @@ -96,12 +96,12 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl rspMap = JSONArray.parseObject(JSONArray.toJSONString(rspObject), LinkedHashMap.class); - if(rspMap.get("Code")!=null&&"200".equals(rspMap.get("Code").toString())){ - log.debug("请求成功："+rspMap); + if(rspMap!=null&&rspMap.get("Code")!=null&&"200".equals(rspMap.get("Code").toString())){ + System.out.println("请求成功："+rspMap); blockChainLog.setStatus(0);//成功 this.iBlockChainLogService.save(blockChainLog); return true; From 0fca6f592bd62a90df2dad8fa58185abb9e0844c Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Sep 2021 17:38:37 +0800 Subject: [PATCH 31/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 e3978bd..a4ba736 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 @@ -97,11 +97,10 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl rspMap = JSONArray.parseObject(JSONArray.toJSONString(rspObject), LinkedHashMap.class); - if(rspMap!=null&&rspMap.get("Code")!=null&&"200".equals(rspMap.get("Code").toString())){ - System.out.println("请求成功："+rspMap); + String retJson = JSONArray.toJSONString(uniBssRsp.getUniBssBody()); + + if(retJson!=null&&!"".equals(retJson)&&retJson.indexOf("{\"Code\":200,")>=0){ blockChainLog.setStatus(0);//成功 this.iBlockChainLogService.save(blockChainLog); return true; From 94ffa556a86591ebdf8fb8d9dfe5b3179fd9bdd3 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 2 Sep 2021 17:52:26 +0800 Subject: [PATCH 32/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 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 a4ba736..55ee5ae 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 @@ -98,9 +98,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl=0){ + if(str!=null&&!"".equals(str)&&str.indexOf("_RSP\":{\"Code\":200,")>=0){ blockChainLog.setStatus(0);//成功 this.iBlockChainLogService.save(blockChainLog); return true; From 9c22f3ee0f706c5c27d049df0bd724aa0957961e Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 3 Sep 2021 08:56:21 +0800 Subject: [PATCH 33/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 31f7e66..1474efd 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,6 @@ 0.0.1-SNAPSHOT - - com.chinaunicom.mall.ebtp - uboot-common - 0.0.19-SNAPSHOT - - com.chinaunicom.ebtp mall-ebtp-cloud-attachment-sdk From aa9409284b94b06279e1e02d749ce145e9e3855f Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 3 Sep 2021 13:46:34 +0800 Subject: [PATCH 34/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 55ee5ae..29782e9 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 @@ -191,7 +191,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Fri, 3 Sep 2021 13:48:11 +0800 Subject: [PATCH 35/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 55ee5ae..29782e9 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 @@ -191,7 +191,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Fri, 3 Sep 2021 15:06:30 +0800 Subject: [PATCH 36/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 29782e9..867ac41 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 @@ -70,6 +70,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Mon, 6 Sep 2021 09:55:58 +0800 Subject: [PATCH 37/44] =?UTF-8?q?=E4=BC=A0=E5=85=A5=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=9D=E7=95=99null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 29782e9..598414a 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,6 +3,7 @@ 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; @@ -76,7 +77,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), LinkedHashMap.class); + LinkedHashMap map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject(),SerializerFeature.WriteMapNullValue), LinkedHashMap.class); Object signObject = new Object(); if(map.get("BODY_LIST")!=null){ From 21568b7a4e8318170fed39ef1f18d28ad86c0544 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 6 Sep 2021 14:57:07 +0800 Subject: [PATCH 38/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/BizServiceEbtpExtendApplication.java | 2 ++ .../service/impl/CrypConfigureServiceImpl.java | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java index 58a2b47..05651ce 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java @@ -16,6 +16,7 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.scheduling.annotation.EnableAsync; @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class}) @EnableFeignClients @@ -23,6 +24,7 @@ import org.springframework.context.annotation.ComponentScan; @MapperScan({"com.chinaunicom.mall.ebtp.extend.**.dao"}) @ComponentScan("com.chinaunicom.mall.ebtp.*") @EnableApolloConfig +@EnableAsync public class BizServiceEbtpExtendApplication { public static void main(String[] args) { 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 24934fe..a9c1117 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 @@ -28,6 +28,7 @@ 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; @@ -70,6 +71,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject(),SerializerFeature.WriteMapNullValue), LinkedHashMap.class); + Map map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject(),SerializerFeature.WriteMapNullValue), Map.class); Object signObject = new Object(); if(map.get("BODY_LIST")!=null){ signObject = map.get("BODY_LIST"); }else{ - signObject =map; + signObject = map; } //传入数据解密 String sign = getSignValue(signObject); @@ -169,7 +171,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"); From 5af0522e467eecd1800f9f163220b915a07606fc Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 6 Sep 2021 15:14:22 +0800 Subject: [PATCH 39/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a9c1117..4260376 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 @@ -80,7 +80,7 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject(),SerializerFeature.WriteMapNullValue), Map.class); + Map map = JSONArray.parseObject(JSONArray.toJSONString(bean.getObject()), Map.class); Object signObject = new Object(); if(map.get("BODY_LIST")!=null){ From d3d1749d5ec7573bd22f654cbc5cc99ecc50e5f5 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 6 Sep 2021 15:48:29 +0800 Subject: [PATCH 40/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CrypConfigureServiceImpl.java | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 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 4260376..9a5747c 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 @@ -156,10 +156,10 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl mapb= new HashMap<>(); // - Map map = new HashMap<>(1); - map.put("TENDERER_ID","8533"); - map.put("SHOPPINGCART_ID","L3307"); - map.put("AMOUNT","1000"); - map.put("TP_ID","L3307A"); - map.put("SECTION_ID","1111"); +// Map map = new HashMap<>(1); +// map.put("TENDERER_ID","8533"); +// map.put("SHOPPINGCART_ID","L3307"); +// map.put("AMOUNT","1000"); +// map.put("TP_ID","L3307A"); +// map.put("SECTION_ID","1111"); - List list = new ArrayList(); - list.add(map); +// List list = new ArrayList(); +// list.add(map); //mapb.put("BODY_LIST",list); + 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(); - CrypBean bean = crypService.signObject(list); - System.out.println(bean); + CrypBean bean = crypService.signObject(jsonMap); + bean.setSign("MEUCIQCqbcS4d8je+XvTwlSJ1/5IEgiZBYgJlQ+nU/oi2ZeLAgIgd+SZ72Hk8xdKhcVnxwrFsIL6gHMKOFDIbo4nLzmYroM="); + System.out.println("signature of Map: "+bean.getSign()); + boolean isOk = crypService.verifyObject(bean); + System.out.println("verify result of Map: "+ isOk); + -// String pkey = "-----BEGIN PRIVATE KEY-----\n" + -// "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfb0OcgWWFJGaOmVI\n" + -// "LxEpIRTsICs0ssgJZqpuZQUhTIGhRANCAAQ8dPtVEfZfm2wXdqoqYpColaJ4MxiJ\n" + -// "rFoUUMepAwuIQLaSZIH1+YbUkr/P+ybC1cbiBMrZjCxiAimk7dLxmUkx\n" + -// "-----END PRIVATE KEY-----"; - //"MEUCIQC0TNG+JlFa2kCwQOdYer69cA4psgDoK9ulqdKyK5BEwQIgFOlVofB+xDVOCSuj7t2Pp3z0fyyiuXPy5dRMsOMoh3U="; -// String signature = CrypServiceImpl.signObject2(list,pkey); -// System.out.println("signature of Map: "+signature); -// boolean isOk = CrypServiceImpl.verifyObject(signature,list,CRT_PATH); -// System.out.println("verify result of Map: "+ isOk); } } 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 41/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=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 Date: Mon, 6 Sep 2021 16:36:44 +0800 Subject: [PATCH 42/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CrypConfigureServiceImpl.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 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 beb6040..1be218d 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 @@ -224,9 +224,13 @@ 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(),bean.getObject(),IOUtils.toString(is)); + Boolean b = CrypServiceImpl.verifyValue(bean.getSign(),jsonMap,IOUtils.toString(is)); return b; }catch (Exception e){ @@ -260,13 +264,16 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Mon, 6 Sep 2021 16:44:44 +0800 Subject: [PATCH 43/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 8 ++++++-- 1 file changed, 6 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 1be218d..596401d 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 @@ -156,9 +156,13 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl jsonMap = JSONArray.parseObject(json,Map.class); + + log.info("加密参数2:"+jsonMap); InputStream is = CrypConfigureServiceImpl.class.getClassLoader().getResourceAsStream(PEM_PATH); - signValue = CrypServiceImpl.signObject2(object,IOUtils.toString(is)); + signValue = CrypServiceImpl.signObject2(jsonMap,IOUtils.toString(is)); log.info("加密结果:"+signValue); }catch (Exception e){ From db24820fe1555d2f111f3ff06f2ae9dc292d2f20 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 7 Sep 2021 14:06:03 +0800 Subject: [PATCH 44/44] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CrypConfigureServiceImpl.java | 62 ++++++++++++------- 1 file changed, 38 insertions(+), 24 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 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