Merge pull request #3 from nekolr/dev

修复输出 csv 文件被锁定的问题
This commit is contained in:
javamxd 2020-04-12 03:55:26 -05:00 committed by GitHub
commit 1404f03cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -171,23 +171,28 @@ public class OutputExecutor implements ShapeExecutor, SpiderListener {
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) {