From 7110ad3c3188c7521b96b4b778b3cca9aff99e2d Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Wed, 20 Jul 2022 19:38:29 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEmconfig.bss.app-secret=20=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/riskmanage/service/impl/RiskManageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 7e3c52e..41177a9 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 @@ -43,7 +43,7 @@ public class RiskManageServiceImpl implements IRiskManageService { //查询模型信息 BaseResponse> regulationParams = regulationService.findRegulationParams(regulation); - + log.info("调用山分风控接口参数：regulationParams={}", JsonUtils.objectToJson(regulationParams)); RiskManageRegulationGroupApply regulationGroupApply = new RiskManageRegulationGroupApply(); regulationGroupApply.setBusinessId(params.get("id").toString()); //模块分类 From 41eeb0d31d600869946b1605149545988b91131e Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Fri, 23 Sep 2022 09:06:03 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8A=A0=E9=A3=8E=E6=8E=A7=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/RiskManageRegulationGroupApply.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java index c6051ab..40e88b3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java @@ -17,7 +17,7 @@ import java.util.List; @ApiModel("风控规则对象") public class RiskManageRegulationGroupApply implements Serializable { - @ApiModelProperty("业务id") + @ApiModelProperty("业务单据号（例如：询价单号）") private String businessId; @ApiModelProperty("调用模块类别编号") @@ -37,6 +37,18 @@ public class RiskManageRegulationGroupApply implements Serializable { @ApiModelProperty("调用节点名称") private String callPointName; + @ApiModelProperty("业务单据主键（例如：询价单id）") + private String businessPrikey; + @ApiModelProperty("业务标题（例如：询价单标题）") + private String businessTitle; + @ApiModelProperty("省ou") + private String provinceOu; + @ApiModelProperty("省名") + private String provinceName; + @ApiModelProperty("市ou") + private String cityOu; + @ApiModelProperty("市名") + private String cityName; @ApiModelProperty("应用规则所需的参数") private List outerVoList; From fd0db1f111284257ad69375b191adeba4e739552 Mon Sep 17 00:00:00 2001 From: fuqingji <51312040@qq.com> Date: Fri, 23 Sep 2022 09:28:29 +0800 Subject: [PATCH 3/9] jasypt --- src/main/resources/application.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 89394d5..3e5b391 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,4 +6,8 @@ app: apollo: bootstrap: enabled: true - namespace: application \ No newline at end of file + namespace: application + +jasypt: + encryptor: + bean: stringEncryptor \ No newline at end of file From fd5f4ac726c57af651e8d6807089c1aa5060934b Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Fri, 23 Sep 2022 09:34:05 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8A=A0=E9=A3=8E=E6=8E=A7=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RiskManageServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 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 7e3c52e..00ca324 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 @@ -45,7 +45,18 @@ public class RiskManageServiceImpl implements IRiskManageService { BaseResponse> regulationParams = regulationService.findRegulationParams(regulation); RiskManageRegulationGroupApply regulationGroupApply = new RiskManageRegulationGroupApply(); - regulationGroupApply.setBusinessId(params.get("id").toString()); + //项目id + regulationGroupApply.setBusinessPrikey(params.get("id").toString()); + //项目编号 + regulationGroupApply.setBusinessId(params.get("businessId").toString()); + //项目名称（标段名称） + regulationGroupApply.setBusinessTitle(params.get("businessTitle").toString()); + //项目所属省分 + regulationGroupApply.setProvinceOu(params.get("provinceOu").toString()); + regulationGroupApply.setProvinceName(params.get("provinceName").toString()); + //项目所属市 + regulationGroupApply.setCityOu(params.get("cityOu").toString()); + regulationGroupApply.setCityName(params.get("cityName").toString()); //模块分类 regulationGroupApply.setCallCategoryCode(regulation.getCallCategory()); regulationGroupApply.setCallCategoryName(regulation.getCallCategoryName()); From 05bc20591b6736828a3f0c806a30d9f16275ab83 Mon Sep 17 00:00:00 2001 From: jlfuqj Date: Fri, 23 Sep 2022 14:55:53 +0000 Subject: [PATCH 5/9] jasypt --- src/main/resources/application.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 89394d5..75cafd4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,4 +6,7 @@ app: apollo: bootstrap: enabled: true - namespace: application \ No newline at end of file + namespace: application +jasypt: + encryptor: + bean: stringEncryptor \ No newline at end of file From d15ac34e0bab6e47e791f1b2549cec0cf815f4c1 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Tue, 27 Sep 2022 11:02:29 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8A=A0=E9=A3=8E=E6=8E=A7=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/riskmanage/controller/RiskManageController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 b851321..f3f6e37 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 @@ -1,6 +1,9 @@ package com.chinaunicom.mall.ebtp.extend.riskmanage.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.log.OperationLogDetail; +import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogBusinessModule; +import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogType; 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.riskmanage.entity.RiskManageRegulation; @@ -58,6 +61,7 @@ public class RiskManageController { * @return 返回结果 */ @PostMapping({"/findApplyRegulation"}) + @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.INSERT,detail = "风控中心-风险管控规则调用") public BaseResponse findApplyRegulation(@RequestBody RiskManageRegulationVO riskManageRegulation){ return riskManageService.findApplyRegulation(riskManageRegulation); } From 18554ad6c2781ffd172a371f46a1561f2159d04a Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Tue, 27 Sep 2022 14:26:09 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8A=A0=E9=A3=8E=E6=8E=A7=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/riskmanage/controller/RiskManageController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f3f6e37..e18cda2 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 @@ -61,7 +61,7 @@ public class RiskManageController { * @return 返回结果 */ @PostMapping({"/findApplyRegulation"}) - @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.INSERT,detail = "风控中心-风险管控规则调用") + @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "风控中心-风险管控规则调用") public BaseResponse findApplyRegulation(@RequestBody RiskManageRegulationVO riskManageRegulation){ return riskManageService.findApplyRegulation(riskManageRegulation); } From d334ef014d9292740f06aac1bdef39ac096aaef3 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Thu, 29 Sep 2022 14:33:04 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/feign/client/RiskManageRegulationService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java index d1ff15b..00c980d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java @@ -6,6 +6,9 @@ package com.chinaunicom.mall.ebtp.extend.feign.client; * @date 2021/08/18 */ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.log.OperationLogDetail; +import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogBusinessModule; +import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogType; import com.chinaunicom.mall.ebtp.extend.feign.client.factory.RiskManageRegulationServiceFallbackFactory; import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulation; import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationGroupApply; @@ -26,6 +29,7 @@ public interface RiskManageRegulationService { * @return 返回结果 */ @PostMapping({"/findRegulationParams"}) + @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "风控中心- 查询规则模型列表接口") BaseResponse> findRegulationParams(@RequestBody RiskManageRegulation riskManageRegulation); /** @@ -34,5 +38,6 @@ public interface RiskManageRegulationService { * @return 返回结果 */ @PostMapping({"/applyRegulation"}) + @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "风控中心- 执行风控规则") BaseResponse applyRegulation(@RequestBody RiskManageRegulationGroupApply regulationGroupApply); } From c096968642330f5860f3b45de73c1bf4e95ba235 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Sat, 8 Oct 2022 10:37:04 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8A=A0=E9=A3=8E=E6=8E=A7=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RiskManageServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 00ca324..239abfd 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 @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 风险管控接口实现 @@ -45,18 +46,18 @@ public class RiskManageServiceImpl implements IRiskManageService { BaseResponse> regulationParams = regulationService.findRegulationParams(regulation); RiskManageRegulationGroupApply regulationGroupApply = new RiskManageRegulationGroupApply(); - //项目id - regulationGroupApply.setBusinessPrikey(params.get("id").toString()); + //id + regulationGroupApply.setBusinessPrikey(Objects.isNull(params.get("id"))?"":params.get("id").toString()); //项目编号 regulationGroupApply.setBusinessId(params.get("businessId").toString()); //项目名称（标段名称） regulationGroupApply.setBusinessTitle(params.get("businessTitle").toString()); //项目所属省分 - regulationGroupApply.setProvinceOu(params.get("provinceOu").toString()); - regulationGroupApply.setProvinceName(params.get("provinceName").toString()); + regulationGroupApply.setProvinceOu(Objects.isNull(params.get("provinceOu"))?"":params.get("provinceOu").toString()); + regulationGroupApply.setProvinceName(Objects.isNull(params.get("provinceName"))?"":params.get("provinceName").toString()); //项目所属市 - regulationGroupApply.setCityOu(params.get("cityOu").toString()); - regulationGroupApply.setCityName(params.get("cityName").toString()); + regulationGroupApply.setCityOu(Objects.isNull(params.get("cityOu"))?"":params.get("cityOu").toString()); + regulationGroupApply.setCityName(Objects.isNull(params.get("cityName"))?"":params.get("cityName").toString()); //模块分类 regulationGroupApply.setCallCategoryCode(regulation.getCallCategory()); regulationGroupApply.setCallCategoryName(regulation.getCallCategoryName());