From 498bfccfe8b9f164fcc18c5006ebd47e0f1712eb Mon Sep 17 00:00:00 2001
From: "heavyrain.lee" <heavyrain.lee@gmail.com>
Date: Wed, 26 Feb 2020 12:45:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=86=85=E7=BD=AE=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xiaoleilu/loServer/action/UploadFileAction.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
index 7a631a24..87a812f7 100755
--- a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
+++ b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java
@@ -279,7 +279,7 @@ public class UploadFileAction extends Action {
                             fileUpload.release();
 
                             response.setStatus(HttpResponseStatus.OK);
-                            String relativePath = datePath + "/" +  requestId;
+                            String relativePath = datePath + "/" +  (StringUtil.isNullOrEmpty(remoteFileName) ? requestId : remoteFileName);
                             response.setContent("{\"key\":\"" + relativePath + "\"}");
                             break;
                         }