github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-06-16 18:30:03 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/issue-848' into develop

Browse Source
This commit is contained in:
Hai Liang Wang 2023-07-05 15:30:53 +08:00
commit 97c4d9fbc5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java
View File

@ -1333,9 +1333,9 @@ public class IMController extends Handler {
File imageFile = new File(path, fileName); File imageFile = new File(path, fileName);
FileCopyUtils.copy(multipart.getBytes(), imageFile); FileCopyUtils.copy(multipart.getBytes(), imageFile);
String thumbnailsFileName = "upload/" + fileid; 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); MainUtils.processImage(thumbnail, imageFile);
// 存储数据库 // 存储数据库
sf.setData(jpaBlobHelper.createBlob(multipart.getInputStream(), multipart.getSize())); sf.setData(jpaBlobHelper.createBlob(multipart.getInputStream(), multipart.getSize()));
sf.setThumbnail(jpaBlobHelper.createBlobWithFile(thumbnail)); sf.setThumbnail(jpaBlobHelper.createBlobWithFile(thumbnail));

3
contact-center/app/src/main/java/com/cskefu/cc/proxy/AgentProxy.java
View File

@ -270,7 +270,8 @@ public class AgentProxy {
// 图片 // 图片
// process thumbnail // process thumbnail
File original = new File(webUploadPath, "upload/" + fileid + "_original"); 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); FileCopyUtils.copy(multipart.getBytes(), original);
MainUtils.processImage(thumbnail, original); MainUtils.processImage(thumbnail, original);
sf.setThumbnail(jpaBlobHelper.createBlobWithFile(thumbnail)); sf.setThumbnail(jpaBlobHelper.createBlobWithFile(thumbnail));

4
contact-center/app/src/main/resources/templates/apps/agent/media/message.pug
View File

@ -16,10 +16,10 @@ if chatmessage.expmsg && chatmessage.expmsg.contains("hyperlink\":\"http")
= expmsg.summary = expmsg.summary
br br
a(href="#{expmsg.hyperlink}", target="_blank") 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" 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="图片") 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" 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="图片") a(href="/agent/message/image.html?t=review&id=" + chatmessage.message, data-toggle="ajax", data-width="950", data-height="600", title="图片")
| 系统发送了一个协作邀请 | 系统发送了一个协作邀请