Merge remote-tracking branch 'origin/master'

Author: xwintop

src/main/java/com/xwintop/xTransfer/receiver/service/impl/ReceiverEmailImpl.java

@@ -102,7 +102,7 @@ public void receive(Map params) throws Exception {
                 log.error("send msg to queue:", exc);
             } finally {
                 // set delete mail
-//                message.setFlag(Flags.Flag.DELETED, true);
+                message.setFlag(Flags.Flag.DELETED, true);
             }
         }
         folder.close(true);

src/main/java/com/xwintop/xTransfer/sender/bean/SenderConfigEmail.java

@@ -30,8 +30,9 @@ public class SenderConfigEmail implements SenderConfig {
 
     private String from;//发件人。发送邮件方地址,支持变量替换。
     private String to;//收件人。接收方邮件地址,支持变量替换。
+    private String cc;//抄送人。抄送方邮件地址,支持变量替换。
     private String subject;//主题,邮件主题,支持变量替换。
-    private String protocol;//协议。发送邮件协议。目前只有smtp可以选择。
+    private String protocol = "smtp";//协议。发送邮件协议。目前只有smtp可以选择。
     private String method = EmailMethod.attachment.name();//发送类型
     private String fileName;//文件名,发送方式为附件时的文件名。支持变量替换。
     private String encoding = "utf-8";//编码。详细说明请参考[wiki:EpmsBook/SenderFs 文件发送器]的配置中的Encoding说明。

src/main/java/com/xwintop/xTransfer/sender/service/impl/SenderEmailImpl.java

@@ -22,6 +22,7 @@
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
 
+import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import java.util.Map;
 
@@ -57,7 +58,10 @@ public Boolean send(IMessage msg, Map params) throws Exception {
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(message, true);
         helper.setFrom(ParseVariableCommon.parseVariable(senderConfigEmail.getFrom(), msg, params));
-        helper.setTo(ParseVariableCommon.parseVariable(senderConfigEmail.getTo(), msg, params));
+        helper.setTo(InternetAddress.parse(ParseVariableCommon.parseVariable(senderConfigEmail.getTo(), msg, params)));
+        if (StringUtils.isNotEmpty(senderConfigEmail.getCc())) {
+            helper.setCc(InternetAddress.parse(ParseVariableCommon.parseVariable(senderConfigEmail.getCc(), msg, params)));
+        }
         helper.setSubject(ParseVariableCommon.parseVariable(senderConfigEmail.getSubject(), msg, params));
 
         String fileName = msg.getFileName();

src/main/java/com/xwintop/xTransfer/sender/service/impl/SenderKafkaImpl.java

@@ -16,8 +16,8 @@
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.serialization.ByteArrayDeserializer;
-import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.ByteArraySerializer;
+import org.apache.kafka.common.serialization.StringSerializer;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
@@ -51,9 +51,9 @@ public Boolean send(IMessage msg, Map params) throws Exception {
             props.put(ProducerConfig.BATCH_SIZE_CONFIG, senderConfigKafka.getBatchSize());
             props.put(ProducerConfig.LINGER_MS_CONFIG, senderConfigKafka.getLinger());
             props.put(ProducerConfig.BUFFER_MEMORY_CONFIG, senderConfigKafka.getBufferMemory());
-            props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+            props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
 //            props.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-            props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArrayDeserializer.class);
+            props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
             producer = new KafkaProducer<>(props);
         }
         try {