From 6e0987e3f0d9f5b36aaad22b80e0a92dca864e6b Mon Sep 17 00:00:00 2001
From: Le Zhou <2428499107@qq.com>
Date: Wed, 2 Nov 2022 18:08:40 +0800
Subject: [PATCH] fix file rename bug (#110)

---
 .../com/microsoft/hydralab/common/util/AttachmentService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/java/com/microsoft/hydralab/common/util/AttachmentService.java b/common/src/main/java/com/microsoft/hydralab/common/util/AttachmentService.java
index bdb6160fb..18cd46765 100644
--- a/common/src/main/java/com/microsoft/hydralab/common/util/AttachmentService.java
+++ b/common/src/main/java/com/microsoft/hydralab/common/util/AttachmentService.java
@@ -264,10 +264,10 @@ public File verifyAndSaveFile(@NotNull MultipartFile originFile, String parentDi
         }
 
         if (StringUtils.isEmpty(newFileName)) {
-            newFileName = FileUtil.getLegalFileName(newFileName);
             newFileName = filename.replace(fileSuffix, "") + "_" + System.currentTimeMillis() % 10000 + "_" + fileSuffix;
         }
 
+        newFileName = FileUtil.getLegalFileName(newFileName);
         File file = new File(parentDir, newFileName);// CodeQL [java/path-injection] False Positive: Has verified the string by regular expression
         InputStream inputStream = originFile.getInputStream();
         if (isBase64) {