From d6d3aabd7a91320e62cf3f571115620c4a62dae7 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Fri, 16 Apr 2021 14:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk/api/DefaultAttachmentClient.java | 15 +++++++++------ .../fallback/DocumentCenterServiceFallback.java | 2 +- .../attachment-sdk-cofiguration.properties | 2 +- .../fallback/UserCenterClientFallback.java | 4 ---- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java index 734fbf3..37e7097 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java @@ -23,6 +23,7 @@ import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.DownloadEntity; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.UploadObject; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.service.DocumentCenterService; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.query.QueryResult; import cn.hutool.core.util.IdUtil; import lombok.extern.slf4j.Slf4j; @@ -79,18 +80,20 @@ public class DefaultAttachmentClient implements AttachmentClient { String json = documentCenterService.fetchDetails(businessIdList); log.debug("document center return: {}", json); - AttachmentDetail detail = new AttachmentDetail(); + Optional op = modelConvertor.toQueryResult(json); - // 组织数据存储 - modelConvertor.toQueryResult(json).ifPresent(result -> { - Optional.ofNullable(result.getData()).ifPresent(data -> { + if (op.isPresent()) { + AttachmentDetail detail = new AttachmentDetail(); + + Optional.ofNullable(op.get().getData()).ifPresent(data -> { data.forEach(item -> { detail.add(new AttachmentEntity().setBid(item.getObjectId()).setId(item.getFileId()) .setFilename(item.getOriginalName()).setKey(item.getFileName())); }); }); - }); - return Optional.of(detail); + return Optional.of(detail); + } + return Optional.empty(); } /** diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java index ee0139d..f387b57 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/fallback/DocumentCenterServiceFallback.java @@ -32,7 +32,7 @@ public class DocumentCenterServiceFallback implements DocumentCenterService { @Override public byte[] download(String fileId) { - return null; + return new byte[0]; } } diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/resources/attachment-sdk-cofiguration.properties b/mall-ebtp-cloud-attachment-sdk/src/main/resources/attachment-sdk-cofiguration.properties index 149515d..9aec7c2 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/resources/attachment-sdk-cofiguration.properties +++ b/mall-ebtp-cloud-attachment-sdk/src/main/resources/attachment-sdk-cofiguration.properties @@ -6,4 +6,4 @@ server.max-http-header-size=2048576 # document center id document.center.service.id=core-service-document-center -document.center.ip-address=http://10.238.25.112:8100/doc/ \ No newline at end of file +document.center.ip-address=http://10.242.31.158:8806/doc/ \ No newline at end of file diff --git a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/fallback/UserCenterClientFallback.java b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/fallback/UserCenterClientFallback.java index e183ae5..ce11a25 100644 --- a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/fallback/UserCenterClientFallback.java +++ b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/fallback/UserCenterClientFallback.java @@ -5,15 +5,11 @@ import org.springframework.stereotype.Component; import com.chinaunicom.mall.ebtp.cloud.security.starter.client.UserCenterClient; import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.SecurityUser; -import lombok.extern.slf4j.Slf4j; - -@Slf4j @Component public class UserCenterClientFallback implements UserCenterClient { @Override public SecurityUser getUserInfo() { - log.error("Feign Fallback."); return new SecurityUser(); }