From 7c94bc482670ddf39deb53e76c42dedcf88a8ce5 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Thu, 4 Jan 2024 10:15:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/service/impl/ChatRobotServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
index 7dabcb3c..b1dc0481 100644
--- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
@@ -323,9 +323,9 @@ public class ChatRobotServiceImpl implements ChatRobotService {
             String folder = minioPath.substring(0,minioPath.lastIndexOf("/"));
             if ("mens_test".equals(substring)){
                 switch (folder){
-                    case "bottom":
-                        minioPath = minioPath.replace("bottom","bottoms");
-                        break;
+//                    case "bottom":
+//                        minioPath = minioPath.replace("bottom","bottoms");
+//                        break;
                     case "top":
                         minioPath = minioPath.replace("top","tops");
                         break;

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 2/3] =?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()));

From 7a309bcb17769a268b3c7267fd54f5e2679d072a Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Thu, 4 Jan 2024 11:47:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=9B=BE=E7=89=87=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/service/impl/ChatRobotServiceImpl.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
index b1dc0481..0adca4d0 100644
--- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
@@ -190,10 +190,11 @@ public class ChatRobotServiceImpl implements ChatRobotService {
                             } else {
                                 chatRobot.setSuccessful(1);
                                 chatRobotMapper.insert(chatRobot);
-                                for (int i = 0; i < array.size(); i++) {
-                                    if (i >= 3) {
-                                        continue;
-                                    }
+                                int size = Math.min(array.size(), 4);
+                                for (int i = 0; i < size; i++) {
+//                                    if (i >= 3) {
+//                                        continue;
+//                                    }
                                     ChatRobotLibraryVO chatRobotLibraryVO = new ChatRobotLibraryVO();
                                     String bucketName = sysImage;
                                     String prefix = getPrefix(array.getString(i),chatSendDTO.getGender());