Merge pull request #942 from LMQ0023/master

修复发送邮件截图在正文中不显示的问题

Author: zqburde

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/java/com/webank/wedatasphere/dss/appconn/sendemail/email/sender/SpringJavaEmailSender.java

@@ -98,10 +98,12 @@ private MimeMessage parseToMimeMessage(Email email) {
             if (StringUtils.isNotBlank(email.getBcc())) {
                 messageHelper.setBcc(email.getBcc());
             }
+            messageHelper.setText(email.getContent(), true);
             for (Attachment attachment : email.getAttachments()) {
+                messageHelper.addInline(attachment.getName(), new ByteArrayDataSource(Base64.getMimeDecoder().decode(attachment.getBase64Str()), attachment.getMediaType()));
                 messageHelper.addAttachment(attachment.getName(), new ByteArrayDataSource(Base64.getMimeDecoder().decode(attachment.getBase64Str()), attachment.getMediaType()));
             }
-            messageHelper.setText(email.getContent(), true);
+
         } catch (Exception e) {
             logger.error("Send mail failed", e);
         }