From 5f9ab39b66f2561e5a114c5fdee2709bbce77c82 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 9 Jun 2021 17:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E3=80=90file=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=BB=98=E8=AE=A4=E5=A4=B4=E5=83=8F=E7=9A=84?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/file/api/constants/FileConstants.java     |  5 +++++
 .../file/api/exception/enums/FileExceptionEnum.java  |  2 +-
 .../modular/service/impl/SysFileInfoServiceImpl.java | 12 +++++++++---
 kernel-s-customer/customer-business/pom.xml          |  8 ++++++++
 .../customer/modular/factory/CustomerFactory.java    |  5 +++--
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
index 762240a4b..8283239c8 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
@@ -82,6 +82,11 @@ public interface FileConstants {
      */
     Long DEFAULT_AVATAR_FILE_ID = 10000L;
 
+    /**
+     * 默认头像的文件文件名
+     */
+    String DEFAULT_AVATAR_FILE_OBJ_NAME = "defaultAvatar.png";
+
     /**
      * 系统默认的头像
      */
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/enums/FileExceptionEnum.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/enums/FileExceptionEnum.java
index bcec84a48..67b58a613 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/enums/FileExceptionEnum.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/enums/FileExceptionEnum.java
@@ -81,7 +81,7 @@ public enum FileExceptionEnum implements AbstractExceptionEnum {
     /**
      * 获取文件流错误
      */
-    FILE_STREAM_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + FileConstants.FILE_EXCEPTION_STEP_CODE + "09", "获取文件流错误"),
+    FILE_STREAM_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + FileConstants.FILE_EXCEPTION_STEP_CODE + "09", "获取文件流异常，具体信息为：{}"),
 
     /**
      * 下载文件错误
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
index 7229ac654..1d9e16197 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
@@ -107,7 +107,7 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
             fileBytes = fileOperatorApi.getFileBytes(DEFAULT_BUCKET_NAME, sysFileInfo.getFileObjectName());
         } catch (Exception e) {
             log.error("获取文件流异常，具体信息为：{}", e.getMessage());
-            throw new FileException(FileExceptionEnum.FILE_STREAM_ERROR);
+            throw new FileException(FileExceptionEnum.FILE_STREAM_ERROR, e.getMessage());
         }
 
         // 设置文件字节码
@@ -249,7 +249,7 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
             DownloadUtil.download(DateUtil.now() + "-打包下载" + FILE_POSTFIX_SEPARATOR + "zip", bos.toByteArray(), response);
         } catch (Exception e) {
             log.error("获取文件流异常，具体信息为：{}", e.getMessage());
-            throw new FileException(FileExceptionEnum.FILE_STREAM_ERROR);
+            throw new FileException(FileExceptionEnum.FILE_STREAM_ERROR, e.getMessage());
         } finally {
             try {
                 zip.closeEntry();
@@ -330,13 +330,19 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
     @Override
     public void previewByBucketAndObjName(SysFileInfoRequest sysFileInfoRequest, HttpServletResponse response) {
 
+        // 如果是默认头像
+        if (FileConstants.DEFAULT_AVATAR_FILE_OBJ_NAME.equals(sysFileInfoRequest.getFileObjectName())) {
+            DownloadUtil.renderPreviewFile(response, Base64.decode(FileConfigExpander.getDefaultAvatarBase64()));
+            return;
+        }
+
         // 获取文件字节码
         byte[] fileBytes;
         try {
             fileBytes = fileOperatorApi.getFileBytes(sysFileInfoRequest.getFileBucket(), sysFileInfoRequest.getFileObjectName());
         } catch (Exception e) {
             log.error("获取文件流异常，具体信息为：{}", e.getMessage());
-            throw new FileException(FileExceptionEnum.FILE_STREAM_ERROR);
+            throw new FileException(FileExceptionEnum.FILE_STREAM_ERROR, e.getMessage());
         }
 
         // 获取文件后缀
diff --git a/kernel-s-customer/customer-business/pom.xml b/kernel-s-customer/customer-business/pom.xml
index 296b879eb..6e1d7becc 100644
--- a/kernel-s-customer/customer-business/pom.xml
+++ b/kernel-s-customer/customer-business/pom.xml
@@ -40,6 +40,14 @@
             <version>${roses.version}</version>
         </dependency>
 
+        <!--文件api-->
+        <!--文件上传，头像上传-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>file-api</artifactId>
+            <version>${roses.version}</version>
+        </dependency>
+
         <!--资源api模块-->
         <!--用在资源控制器，资源扫描上-->
         <dependency>
diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
index 35eb546c4..0acf318cd 100644
--- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
+++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
@@ -10,6 +10,7 @@ import cn.stylefeng.roses.kernel.customer.api.expander.CustomerConfigExpander;
 import cn.stylefeng.roses.kernel.customer.modular.entity.Customer;
 import cn.stylefeng.roses.kernel.customer.modular.request.CustomerRequest;
 import cn.stylefeng.roses.kernel.email.api.pojo.SendMailParam;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 
@@ -53,8 +54,8 @@ public class CustomerFactory {
         customer.setVerifiedFlag(YesOrNotEnum.N.getCode());
 
         // 设置默认头像
-        customer.setAvatar(10000L);
-        customer.setAvatarObjectName("10000.png");
+        customer.setAvatar(FileConstants.DEFAULT_AVATAR_FILE_ID);
+        customer.setAvatarObjectName(FileConstants.DEFAULT_AVATAR_FILE_OBJ_NAME);
 
         // 设置默认积分0
         customer.setScore(0);