From 896d0bf86a4a694123c98715d8c4c0c71e4ab271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Fri, 15 Jun 2018 23:37:49 +0800 Subject: [PATCH] :bug: Fixing a bug. when file empty ,show NPL --- .../java/com/xiaominfo/oss/api/OSSApplication.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/oss-server/src/main/java/com/xiaominfo/oss/api/OSSApplication.java b/oss-server/src/main/java/com/xiaominfo/oss/api/OSSApplication.java index 21e3acf..d4e19d5 100644 --- a/oss-server/src/main/java/com/xiaominfo/oss/api/OSSApplication.java +++ b/oss-server/src/main/java/com/xiaominfo/oss/api/OSSApplication.java @@ -7,6 +7,9 @@ package com.xiaominfo.oss.api; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.log.Log; @@ -26,7 +29,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import java.io.File; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.List; import java.util.regex.Pattern; @@ -125,12 +127,14 @@ public class OSSApplication { private List getFileInfos(File dirFile,File root){ int start=root.getAbsolutePath().length(); List fileInfos= Lists.newArrayList(); - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); File[] files=dirFile.listFiles(); + if (ArrayUtil.isEmpty(files)){ + return fileInfos; + } for (File file:files){ - Calendar calendar=Calendar.getInstance(); - calendar.setTimeInMillis(file.lastModified()); - FileInfo fileInfo=new FileInfo(invokeUri+file.getName(),file.getName(),sdf.format(calendar.getTime()), FileUtils.byteToString(FileUtils.getFileSize(file))); + FileInfo fileInfo=new FileInfo(invokeUri+file.getName(),file.getName() + ,DateUtil.date(file.lastModified()).toString(DatePattern.NORM_DATETIME_PATTERN) + , FileUtils.byteToString(FileUtils.getFileSize(file))); fileInfo.setType(FileUtils.getFileType(file)); fileInfo.setMediaType(FileUtils.getMediaType(file)); if (file.isDirectory()){ -- Gitee