Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

2023-06-30 09:27:21 +08:00
parent 2e2bcb02d8 01b0284dc0
commit 35d3a93515
15 changed files with 56 additions and 35 deletions
--- a/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java
@@ -155,7 +155,7 @@ public class PDFUtils {
                document.dispose();
                return outputStream;
            }
-        } catch (PDFException | IOException | PDFSecurityException e) {
+        } catch (PDFException | IOException | InterruptedException | PDFSecurityException e) {
            log.error("PDF转图片异常, e{}", e.getMessage());
        } finally {
            try {