From 8d1bc9ed8ad94519c74576b110148b58d7a4c85a Mon Sep 17 00:00:00 2001
From: lecjy <565572696@qq.com>
Date: Fri, 30 Jun 2023 18:24:05 +0800
Subject: [PATCH] #848 fix bug

---
 .../main/java/com/cskefu/cc/controller/apps/IMController.java | 4 ++--
 .../app/src/main/java/com/cskefu/cc/proxy/AgentProxy.java     | 3 ++-
 .../src/main/resources/templates/apps/agent/media/message.pug | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java
index f128a512..ec5c9cff 100644
--- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java
+++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java
@@ -1333,9 +1333,9 @@ public class IMController extends Handler {
                     File imageFile = new File(path, fileName);
                     FileCopyUtils.copy(multipart.getBytes(), imageFile);
                     String thumbnailsFileName = "upload/" + fileid;
-                    File thumbnail = new File(path, thumbnailsFileName);
+                    String originalFilename = multipart.getOriginalFilename();
+                    File thumbnail = new File(path, thumbnailsFileName + originalFilename.substring(originalFilename.lastIndexOf(".")));
                     MainUtils.processImage(thumbnail, imageFile);
-
                     // 存储数据库
                     sf.setData(jpaBlobHelper.createBlob(multipart.getInputStream(), multipart.getSize()));
                     sf.setThumbnail(jpaBlobHelper.createBlobWithFile(thumbnail));
diff --git a/contact-center/app/src/main/java/com/cskefu/cc/proxy/AgentProxy.java b/contact-center/app/src/main/java/com/cskefu/cc/proxy/AgentProxy.java
index 12774cc9..8a0ba0af 100644
--- a/contact-center/app/src/main/java/com/cskefu/cc/proxy/AgentProxy.java
+++ b/contact-center/app/src/main/java/com/cskefu/cc/proxy/AgentProxy.java
@@ -270,7 +270,8 @@ public class AgentProxy {
             // 图片
             // process thumbnail
             File original = new File(webUploadPath, "upload/" + fileid + "_original");
-            File thumbnail = new File(webUploadPath, "upload/" + fileid);
+            String originalFilename = multipart.getOriginalFilename();
+            File thumbnail = new File(webUploadPath, "upload/" + fileid + originalFilename.substring(originalFilename.lastIndexOf(".")));
             FileCopyUtils.copy(multipart.getBytes(), original);
             MainUtils.processImage(thumbnail, original);
             sf.setThumbnail(jpaBlobHelper.createBlobWithFile(thumbnail));
diff --git a/contact-center/app/src/main/resources/templates/apps/agent/media/message.pug b/contact-center/app/src/main/resources/templates/apps/agent/media/message.pug
index 7e30029c..0fec2164 100644
--- a/contact-center/app/src/main/resources/templates/apps/agent/media/message.pug
+++ b/contact-center/app/src/main/resources/templates/apps/agent/media/message.pug
@@ -16,10 +16,10 @@ if chatmessage.expmsg && chatmessage.expmsg.contains("hyperlink\":\"http")
     = expmsg.summary
     br
     a(href="#{expmsg.hyperlink}", target="_blank")
-        img.ukefu-media-image(src="!{chatmessage.message ? chatmessage.message : ''}", id="#{chatmessage.id}")
+        img.ukefu-media-image(src=chatmessage.message ? chatmessage.message : '', id=chatmessage.id)
 else if chatmessage.msgtype && chatmessage.msgtype == "image"
     a(href="/agent/message/image.html?id=" + chatmessage.id, data-toggle="ajax", data-width="950", data-height="600", title="图片")
-        img.ukefu-media-image(src="!{chatmessage.message ? chatmessage.message : ''}", id="#{chatmessage.id}")
+        img.ukefu-media-image(src=chatmessage.message ? chatmessage.message : '', id=chatmessage.id)
 else if chatmessage.msgtype && chatmessage.msgtype == "cooperation"
     a(href="/agent/message/image.html?t=review&id=" + chatmessage.message, data-toggle="ajax", data-width="950", data-height="600", title="图片")
         | 系统发送了一个协作邀请