From e98b9ac6064bc0c6369576241342e3d35dd28fb5 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Fri, 9 Feb 2018 09:29:04 +0800 Subject: [PATCH] --- course02_rest.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/course02_rest.html b/course02_rest.html index d1770f3f5..40e77f578 100644 --- a/course02_rest.html +++ b/course02_rest.html @@ -168,15 +168,16 @@ 
@RestService(name = "file", comment = "文件服务")
 public class FileService extends AbstractService {
 
+    private static final Logger logger = Logger.getLogger(FileService.class.getSimpleName());
+
     private static final String format = "%1$tY%1$tm%1$td%1$tH%1$tM%1$tS";
 
     @RestMapping(name = "upload", auth = false, comment = "文件上传，不鉴权")
     public RetResult upload(@RestUploadFile(maxLength = 1 * 1024 * 1024, fileNameReg = ".*\\.doc$") File tmpFile) throws IOException {
-        if (tmpFile == null) {
-            return new RetResult(1001, "没有上传文件或文件大小超过1M或文件不是.doc后缀");
-        }
+        if (tmpFile == null) return new RetResult(1001, "没有上传文件或文件大小超过1M或文件不是.doc后缀");
         //按日期命名 如 file-20170601133520.doc
         try {
+            logger.finest("用户上传的文件名为: " + MultiContext.getFileName(tmpFile));
             File destFile = new File("D:/docs/file-" + String.format(format, System.currentTimeMillis()) + ".doc");
             destFile.getParentFile().mkdirs();
             if (!tmpFile.renameTo(destFile)) { //tmpFile与destFile不在同一盘符下会导致renameTo失败
@@ -184,7 +185,6 @@
             }
         } finally { //如果发生异常，将临时文件从{APP_HOME}/tmp 目录下删除
             tmpFile.delete();
-            tmpFile.getParentFile().delete();
         }
         return RetResult.success();
     }