From 12022593715d6782a424984ca51b33fba1e2f818 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Aug 2020 14:34:25 +0800 Subject: [PATCH] heart+1=>34 --- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 2 +- .../service/impl/WorkActServiceImpl.java | 28 +++++++++++++------ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 3c8a292991..361df3c0cb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.33 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.34 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 252207487f..5acb62bf73 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.33 + 0.0.34 com.epmet epmet-heart diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index a627207faa..02e047bf58 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -413,8 +413,10 @@ public class WorkActServiceImpl implements WorkActService { textScanParamDTO.getTasks().add(taskDTO); }); Result contentSyncScanRes = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + logger.info("内容审核入参:"+JSON.toJSONString(textScanParamDTO)); + logger.info("内容审核返参:"+JSON.toJSONString(contentSyncScanRes)); if (!contentSyncScanRes.success()) { - logger.error("活动详情内容审核接口失败,返参:", JSON.toJSONString(contentSyncScanRes)); + logger.warn("活动详情内容审核接口失败,返参:", JSON.toJSONString(contentSyncScanRes)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!contentSyncScanRes.getData().isAllPass()) { @@ -433,8 +435,10 @@ public class WorkActServiceImpl implements WorkActService { imgScanParamDTO.getTasks().add(task); }); Result imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO); + logger.info("图片审核入参:"+JSON.toJSONString(imgScanParamDTO)); + logger.info("图片审核返参:"+JSON.toJSONString(imgScanResult)); if (!imgScanResult.success()){ - logger.error("活动详情图片审核接口失败,返参:", JSON.toJSONString(imgScanResult)); + logger.warn("活动详情图片审核接口失败,返参:", JSON.toJSONString(imgScanResult)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!imgScanResult.getData().isAllPass()) { @@ -459,12 +463,14 @@ public class WorkActServiceImpl implements WorkActService { taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); textScanParamDTO.getTasks().add(taskDTO); Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + logger.info("活动报名条件审核入参:"+JSON.toJSONString(textScanParamDTO)); + logger.info("活动报名条件审核返参:"+JSON.toJSONString(textSyncScanResult)); if (!textSyncScanResult.success()) { - logger.error("活动报名条件审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); + logger.warn("活动报名条件审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!textSyncScanResult.getData().isAllPass()) { - logger.error("活动报名条件审核失败,报名条件:",requirement); + logger.warn("活动报名条件审核失败,报名条件:",requirement); throw new RenException(EpmetErrorCode.ACT_REQ_SCAN_FAILED.getCode()); } } @@ -485,16 +491,18 @@ public class WorkActServiceImpl implements WorkActService { coverImgtask.setUrl(coverPic); coverPicScanParamDTO.getTasks().add(coverImgtask); Result coverPicScanRes = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), coverPicScanParamDTO); + logger.info("活动封面图审核入参:"+JSON.toJSONString(coverPicScanParamDTO)); + logger.info("活动封面图审核返参:"+JSON.toJSONString(coverPicScanRes)); if (!coverPicScanRes.success()){ - logger.error("活动封面审核失败接口返回失败,返参:", JSON.toJSONString(coverPicScanRes)); + logger.warn("活动封面审核失败接口返回失败,返参:", JSON.toJSONString(coverPicScanRes)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!coverPicScanRes.getData().isAllPass()) { - logger.error("活动封面审核失败,封面图片地址:",coverPic); + logger.warn("活动封面审核失败,封面图片地址:",coverPic); throw new RenException(EpmetErrorCode.ACT_COVER_PIC_SCAN_FAILED.getCode()); } } - logger.info("活动封面审核成功"); + logger.info("活动封面图审核成功"); } /** @@ -511,12 +519,14 @@ public class WorkActServiceImpl implements WorkActService { taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); textScanParamDTO.getTasks().add(taskDTO); Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + logger.info("活动标题审核入参:"+JSON.toJSONString(textScanParamDTO)); + logger.info("活动标题审核返参:"+JSON.toJSONString(textSyncScanResult)); if (!textSyncScanResult.success()) { - logger.error("活动标题审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); + logger.warn("活动标题审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!textSyncScanResult.getData().isAllPass()) { - logger.error("活动标题审核失败,标题内容:",title); + logger.warn("活动标题审核失败,标题内容:",title); throw new RenException(EpmetErrorCode.ACT_TITLE_SCAN_FAILED.getCode()); } }