|
@@ -24,14 +24,12 @@ public class MailUtils {
|
|
|
|
|
|
public String buildContent(String template, List<String> values) {
|
|
public String buildContent(String template, List<String> values) {
|
|
//加载邮件html模板
|
|
//加载邮件html模板
|
|
- ClassPathResource resource = new ClassPathResource(template);
|
|
|
|
- InputStream inputStream = null;
|
|
|
|
|
|
+ File file = FileUtils.getFile(template);
|
|
BufferedReader fileReader = null;
|
|
BufferedReader fileReader = null;
|
|
StringBuffer buffer = new StringBuffer();
|
|
StringBuffer buffer = new StringBuffer();
|
|
String line;
|
|
String line;
|
|
try {
|
|
try {
|
|
- inputStream = resource.getInputStream();
|
|
|
|
- fileReader = new BufferedReader(new InputStreamReader(inputStream));
|
|
|
|
|
|
+ fileReader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
|
|
while ((line = fileReader.readLine()) != null) {
|
|
while ((line = fileReader.readLine()) != null) {
|
|
buffer.append(line);
|
|
buffer.append(line);
|
|
}
|
|
}
|
|
@@ -46,13 +44,7 @@ public class MailUtils {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (inputStream != null) {
|
|
|
|
- try {
|
|
|
|
- inputStream.close();
|
|
|
|
- } catch (IOException e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
String[] arr = values.toArray(new String[values.size()]);
|
|
String[] arr = values.toArray(new String[values.size()]);
|
|
@@ -87,6 +79,11 @@ public class MailUtils {
|
|
}
|
|
}
|
|
helper.setText(buildContent(map.get("template").toString(), values), true);
|
|
helper.setText(buildContent(map.get("template").toString(), values), true);
|
|
helper.setTo(map.get("email").toString());
|
|
helper.setTo(map.get("email").toString());
|
|
|
|
+ if (map.get("cc") != null) {
|
|
|
|
+ String[] ccs =(String[])map.get("cc");
|
|
|
|
+ helper.setCc(ccs);
|
|
|
|
+ }
|
|
|
|
+
|
|
helper.addInline("logo", img);
|
|
helper.addInline("logo", img);
|
|
helper.setFrom(sendEmail);
|
|
helper.setFrom(sendEmail);
|
|
javaMailSender.send(message);
|
|
javaMailSender.send(message);
|