diff --git a/community-api/src/main/java/com/tanpu/community/api/enums/FileChechStatusEnum.java b/community-api/src/main/java/com/tanpu/community/api/enums/FileChechStatusEnum.java index 947e5fd7c8c0061ecf13507f0f78b034f361c2cb..9690c647091a9117975e0698184dd31f4d252f69 100644 --- a/community-api/src/main/java/com/tanpu/community/api/enums/FileChechStatusEnum.java +++ b/community-api/src/main/java/com/tanpu/community/api/enums/FileChechStatusEnum.java @@ -8,7 +8,7 @@ public enum FileChechStatusEnum { INIT(0,"åˆå§‹åŒ–"), PASS(1,"å®¡æ ¸é€šè¿‡"), - FAILED(2,"å®¡æ ¸ä¸é€šè¿‡"), + BLOCK(2,"å®¡æ ¸ä¸é€šè¿‡"), REVIEW(3,"å»ºè®®äººå·¥å®¡æ ¸"); diff --git a/community-service/src/main/java/com/tanpu/community/controller/CallBackController.java b/community-service/src/main/java/com/tanpu/community/controller/CallBackController.java index df21644ce8b2ed8c33610e18a6a89308f275ffab..af10ed6959f9d4f8774cfc6606e19cc27f4ca925 100644 --- a/community-service/src/main/java/com/tanpu/community/controller/CallBackController.java +++ b/community-service/src/main/java/com/tanpu/community/controller/CallBackController.java @@ -31,7 +31,7 @@ public class CallBackController { * é˜¿é‡Œäº‘å›¾ç‰‡å®¡æ ¸å›žè°ƒæŽ¥å£ * 回调时间:6秒以内 * 文档地å€ï¼šhttps://help.aliyun.com/document_detail/129946.html?spm=a2c4g.11186623.6.562.19a05f3aNkd2Oo#table-s9e-grd-408 - * + * https://help.aliyun.com/document_detail/70292.htm?spm=a2c4g.11186623.2.12.26573ac7EEunMN#reference-fzy-ztm-v2b * @param checksum * @param content * @return @@ -44,12 +44,19 @@ public class CallBackController { Map<String, Object> response = JsonUtil.toMap(content); String fileKey = (String) response.get("object"); boolean freezed = (boolean) response.get("freezed"); - FileChechStatusEnum type = freezed ? FileChechStatusEnum.FAILED : FileChechStatusEnum.PASS; + FileChechStatusEnum type = freezed ? FileChechStatusEnum.BLOCK : FileChechStatusEnum.PASS; HashMap<String, Object> scanResult = (HashMap<String, Object>) response.get("scanResult"); String taskId = (String) scanResult.get("taskId"); List<HashMap<String, Object>> scenes = (List<HashMap<String, Object>>) scanResult.get("results"); for (HashMap<String, Object> scene : scenes) { - if (!"pass".equals(scene.get("suggestion"))) { + // pass:结果æ£å¸¸ï¼Œæ— 需进行其余æ“作。 + // review:结果ä¸ç¡®å®šï¼Œéœ€è¦è¿›è¡Œäººå·¥å®¡æ ¸ã€‚ + // block:结果è¿è§„ï¼Œå»ºè®®ç›´æŽ¥åˆ é™¤æˆ–è€…é™åˆ¶å…¬å¼€ã€‚ + if ("block".equals(scene.get("suggestion"))) { + type=FileChechStatusEnum.BLOCK; + break; + } + if ("review".equals(scene.get("suggestion"))) { type=FileChechStatusEnum.REVIEW; } } diff --git a/community-service/src/main/java/com/tanpu/community/service/BatchFeignCallService.java b/community-service/src/main/java/com/tanpu/community/service/BatchFeignCallService.java index 51141abc61487cc8379e5bd86686b64c8718e33f..3d2106f7690f7a1f3aacd1806eda21cdbe69e5d5 100644 --- a/community-service/src/main/java/com/tanpu/community/service/BatchFeignCallService.java +++ b/community-service/src/main/java/com/tanpu/community/service/BatchFeignCallService.java @@ -441,7 +441,7 @@ public class BatchFeignCallService { .resizeUrl(imgEntity.getUrl() + CommunityConstant.OSS_RESIZE_RATIO) .build(); // å›¾ç‰‡å®¡æ ¸å±è”½ - if (FileChechStatusEnum.FAILED.getCode().equals(imgEntity.getCheckStatus())){ + if (FileChechStatusEnum.BLOCK.getCode().equals(imgEntity.getCheckStatus())){ imagesDTO.setRemark(CommunityConstant.OSS_CHECK_FAIL_DEFAULT); imagesDTO.setResizeUrl(CommunityConstant.OSS_CHECK_FAIL_DEFAULT+ CommunityConstant.OSS_RESIZE_RATIO); imagesDTO.setImgWidth(CommunityConstant.OSS_CHECK_FAIL_DEFAULT_WIDTH); @@ -458,7 +458,7 @@ public class BatchFeignCallService { if (imgUrlMap.containsKey(imagesDTO.getRelId())) { FileRecordEntity imgEntity = imgUrlMap.get(imagesDTO.getRelId()); // å›¾ç‰‡å®¡æ ¸ä¸é€šè¿‡ï¼Œæ›¿æ¢ä¸ºé»˜è®¤å›¾ç‰‡ todo é…置移除 - if (FileChechStatusEnum.FAILED.getCode().equals(imgEntity.getCheckStatus())){ + if (FileChechStatusEnum.BLOCK.getCode().equals(imgEntity.getCheckStatus())){ imagesDTO.setRemark(CommunityConstant.OSS_CHECK_FAIL_DEFAULT); imagesDTO.setResizeUrl(CommunityConstant.OSS_CHECK_FAIL_DEFAULT+ CommunityConstant.OSS_RESIZE_RATIO); imagesDTO.setImgWidth(CommunityConstant.OSS_CHECK_FAIL_DEFAULT_WIDTH);