Merge branch 'uat' into 'master'

还原代码

See merge request eshop/biz_service_ebtp_extend!83
This commit is contained in:
张芹彬
2022-04-22 17:35:10 +08:00

View File

@ -124,20 +124,16 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService {
} }
File f = new File(path + "merged.pdf"); File f = new File(path + "merged.pdf");
FileOutputStream fos = null;
try { FontSettings.getDefaultInstance().setFontsFolder(fontAddress, true);
FontSettings.getDefaultInstance().setFontsFolder(fontAddress, true); try (FileOutputStream fos = new FileOutputStream(f);) {
fos = new FileOutputStream(f);
com.aspose.words.Document doc = new com.aspose.words.Document(path + "merged.docx"); com.aspose.words.Document doc = new com.aspose.words.Document(path + "merged.docx");
doc.save(fos, SaveFormat.PDF); doc.save(fos, SaveFormat.PDF);
fos.flush();
} catch (Exception e) { } catch (Exception e) {
log.info(ExceptionUtil.stacktraceToString(e)); log.info(ExceptionUtil.stacktraceToString(e));
} finally { } finally {
IOUtils.closeQuietly(source); source.close();
IOUtils.closeQuietly(addObj); addObj.close();
IOUtils.closeQuietly(fos);
} }
long l1 = System.currentTimeMillis(); long l1 = System.currentTimeMillis();