From 88fa5eb9d5323a5c26ba6685e6fe194b4cddbb5a Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Fri, 9 Apr 2021 17:53:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/attachment/sdk/api/DefaultAttachmentClient.java | 6 +++--- .../security/starter/filter/TokenAuthenticationFilter.java | 3 +-- 2 files changed, 4 insertions(+), 5 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 06c783c..734fbf3 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 @@ -128,7 +128,7 @@ public class DefaultAttachmentClient implements AttachmentClient { // 创建压缩文件流 createCompressionStream(list, out); - return Optional.ofNullable(out.toByteArray()); + return Optional.of(out.toByteArray()); } catch (IOException e) { log.error(e.getMessage()); } @@ -177,8 +177,8 @@ public class DefaultAttachmentClient implements AttachmentClient { // 创建压缩文件流 createCompressionStream(list, out); - return Optional.ofNullable(new DownloadEntity() - .setFilename(String.format("%s.zip", UUID.randomUUID())).setStream(out.toByteArray())); + return Optional.of(new DownloadEntity().setFilename(String.format("%s.zip", UUID.randomUUID())) + .setStream(out.toByteArray())); } catch (IOException e) { log.error(e.getMessage()); } diff --git a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java index aa921ff..39e3cc9 100644 --- a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java +++ b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java @@ -3,7 +3,6 @@ package com.chinaunicom.mall.ebtp.cloud.security.starter.filter; import java.io.IOException; import java.util.Collections; import java.util.List; -import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; @@ -79,7 +78,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { // 根据当前角色设定权限列表 List authorities = Optional.ofNullable(securityUser.getAuthorityList()).map(list -> { - return list.stream().filter(auth -> Objects.equals(auth.getRoleCode(), currentRoleCode)) + return list.stream().filter(auth -> StringUtils.equals(auth.getRoleCode(), currentRoleCode)) .map(auth -> new RoleCodeAuthority(auth.getRoleCode())).collect(Collectors.toList()); }).orElseGet(() -> Collections.emptyList());