Merge pull request ssssssss-team#3 from nekolr/dev

修复输出 csv 文件被锁定的问题
jerrytaotz · Apr 12, 2020 · 1404f03 · 1404f03
2 parents 7b42f4c + 0c0cdca
commit 1404f03
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/spider-flow-core/src/main/java/org/spiderflow/core/executor/shape/OutputExecutor.java b/spider-flow-core/src/main/java/org/spiderflow/core/executor/shape/OutputExecutor.java
@@ -171,23 +171,28 @@ private void outputCSV(SpiderNode node, SpiderContext context, String csvName, M
 		String[] headers = data.keySet().toArray(new String[data.size()]);
 		try {
 			if (printer == null) {
-				CSVFormat format = CSVFormat.DEFAULT.withHeader(headers);
-				FileOutputStream os = new FileOutputStream(csvName);
-				String csvEncoding = node.getStringJsonValue(CSV_ENCODING);
-				if ("UTF-8BOM".equals(csvEncoding)) {
-					csvEncoding = csvEncoding.substring(0, 5);
-					byte[] bom = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF};
-					os.write(bom);
-					os.flush();
+				synchronized (cachePrinter) {
+					printer = cachePrinter.get(key);
+					if (printer == null) {
+						CSVFormat format = CSVFormat.DEFAULT.withHeader(headers);
+						FileOutputStream os = new FileOutputStream(csvName);
+						String csvEncoding = node.getStringJsonValue(CSV_ENCODING);
+						if ("UTF-8BOM".equals(csvEncoding)) {
+							csvEncoding = csvEncoding.substring(0, 5);
+							byte[] bom = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF};
+							os.write(bom);
+							os.flush();
+						}
+						OutputStreamWriter osw = new OutputStreamWriter(os, csvEncoding);
+						printer = new CSVPrinter(osw, format);
+						cachePrinter.put(key, printer);
+					}
 				}
-				OutputStreamWriter osw = new OutputStreamWriter(os, csvEncoding);
-				printer = new CSVPrinter(osw, format);
-				cachePrinter.put(key, printer);
 			}
 			for (int i = 0; i < headers.length; i++) {
 				records.add(data.get(headers[i]).toString());
 			}
-			synchronized (printer) {
+			synchronized (cachePrinter) {
 				printer.printRecord(records);
 			}
 		} catch (IOException e) {