From 11f94ebcb4219f53e07e9adfb1f121dba8ccf778 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Thu, 4 Jan 2024 11:04:15 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:element=E4=B8=8A=E4=BC=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/common/utils/MinioUtil.java    |  2 +-
 .../da/service/impl/CollectionElementServiceImpl.java  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/common/utils/MinioUtil.java b/src/main/java/com/ai/da/common/utils/MinioUtil.java
index 601ce757..5a8f90a1 100644
--- a/src/main/java/com/ai/da/common/utils/MinioUtil.java
+++ b/src/main/java/com/ai/da/common/utils/MinioUtil.java
@@ -146,7 +146,7 @@ public class MinioUtil {
         String fileName = file.getOriginalFilename();
         String[] split = fileName.split("\\.");
         if (split.length > 1) {
-            fileName = path + "/" + UUID.randomUUID() + "." + split[1];
+            fileName = path + "/" + UUID.randomUUID() + "." + split[split.length - 1];
         } else {
             fileName = path + "/" + UUID.randomUUID();
         }
diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
index 241c6cb4..1c6307d9 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
@@ -144,7 +144,15 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
 //        String suffix = pictureCollectonName.substring(pictureCollectonName.lastIndexOf("."));
 //        //获取图片前缀
 //        String prefix = pictureCollectonName.substring(0,pictureCollectonName.lastIndexOf("."));
-        element.setName(uploadDTO.getFile().getName());
+        String originalFilename = uploadDTO.getFile().getOriginalFilename();
+        if (originalFilename != null && originalFilename.contains(".")) {
+            // 如果文件名包含点号，则去除最后一个点及其后面的内容
+            int lastDotIndex = originalFilename.lastIndexOf(".");
+            if (lastDotIndex != -1) {
+                originalFilename = originalFilename.substring(0, lastDotIndex);
+            }
+        }
+        element.setName(originalFilename);
         element.setUrl(path);
         //按时区计算
         element.setCreateDate(DateUtil.getByTimeZone(uploadDTO.getTimeZone()));