From bdc56ebc9534620766d787a1dacb4c962ea10797 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 10:36:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/util/FileUtil.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/util/FileUtil.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/util/FileUtil.java
index 0e9d05e..3cac468 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/util/FileUtil.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/util/FileUtil.java
@@ -32,7 +32,21 @@
         fileInfo.setId(IdUtil.fastSimpleUUID());
         fileInfo.setName(file.getOriginalFilename());
         fileInfo.setContentType(file.getContentType());
-        fileInfo.setIsImg(fileInfo.getContentType().startsWith("image/"));
+        if (fileInfo.getContentType().startsWith("image/")) {
+            fileInfo.setIsImg(true);
+        }
+        else if (fileInfo.getContentType().startsWith("multipart")){
+            String extendName = file.getOriginalFilename().substring(file.getOriginalFilename().indexOf(".")+1,file.getOriginalFilename().length()).toLowerCase();
+            if (extendName.equals("png") || extendName.equals("bmp") || extendName.equals("jpg") || extendName.equals("jpeg") || extendName.equals("gif")) {
+                fileInfo.setIsImg(true);
+            } else  {
+                fileInfo.setIsImg(false);
+            }
+
+        } else  {
+            fileInfo.setIsImg(false);
+        }
+
         fileInfo.setSize(file.getSize());
         fileInfo.setCreateTime(new Date());
         return fileInfo;

--
Gitblit v1.8.0