This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new f60edc8 fix:mail send fail #2345 (#2346)
f60edc8 is described below
commit f60edc8e615d7e0b02b8ceb7504d38252c8f51b1
Author: Rubik-W <[email protected]>
AuthorDate: Tue Mar 31 21:58:15 2020 +0800
fix:mail send fail #2345 (#2346)
Co-authored-by: dailidong <[email protected]>
---
.../org/apache/dolphinscheduler/alert/utils/ExcelUtils.java | 5 +++++
.../apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java | 10 ++++++++++
2 files changed, 15 insertions(+)
diff --git
a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
index b2e71a8..366e282 100644
---
a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
+++
b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
@@ -26,6 +26,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.*;
@@ -102,7 +103,11 @@ public class ExcelUtils {
for (int i = 0; i < headerList.size(); i++) {
sheet.setColumnWidth(i, headerList.get(i).length() * 800);
+ }
+ File file = new File(xlsFilePath);
+ if (!file.exists()) {
+ file.mkdirs();
}
//setting file output
diff --git
a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
index 3ef43ae..8ee6235 100644
---
a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
+++
b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
@@ -89,4 +89,14 @@ public class ExcelUtilsTest {
ExcelUtils.genExcelFile(incorrectContent1, title, xlsFilePath);
}
+
+ /**
+ * Test GenExcelFile (check directory)
+ */
+ @Test
+ public void testGenExcelFileByCheckDir() {
+ ExcelUtils.genExcelFile("[{\"a\": \"a\"},{\"a\": \"a\"}]", "t",
"/tmp/xls");
+ File file = new File("/tmp/xls" + Constants.SINGLE_SLASH + "t" +
Constants.EXCEL_SUFFIX_XLS);
+ file.delete();
+ }
}
\ No newline at end of file