open-source/file-online-preview
1
0
Fork 0
mirror of https://gitee.com/kekingcn/file-online-preview.git synced 2026-03-14 05:03:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix FileHandlerService#pdf2jpg npe (github issue #455)

Browse Source
This commit is contained in:
陈精华
2023-05-12 23:09:57 +08:00
parent ad46dd8b5b
commit 5dbc8a4980
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/main/java/cn/keking/service/FileHandlerService.java
View File

@@ -47,11 +47,11 @@ import java.util.stream.IntStream;
@Component @Component
public class FileHandlerService { public class FileHandlerService {
private static final String PDF2JPG_IMAGE_FORMAT = ".jpg";
private static final String PDF_PASSWORD_MSG = "password";
private final Logger logger = LoggerFactory.getLogger(FileHandlerService.class); private final Logger logger = LoggerFactory.getLogger(FileHandlerService.class);
private final String fileDir = ConfigConstants.getFileDir(); private final String fileDir = ConfigConstants.getFileDir();
private final static String pdf2jpg_image_format = ".jpg";
private final CacheService cacheService; private final CacheService cacheService;
private static final String pdf_password_msg = "password";
@Value("${server.tomcat.uri-encoding:UTF-8}") @Value("${server.tomcat.uri-encoding:UTF-8}")
private String uriEncoding; private String uriEncoding;
@@ -193,7 +193,7 @@ public class FileHandlerService {
logger.error("UnsupportedEncodingException", e); logger.error("UnsupportedEncodingException", e);
urlPrefix = baseUrl + pdfFolder; urlPrefix = baseUrl + pdfFolder;
} }
return urlPrefix + "/" + index + pdf2jpg_image_format; return urlPrefix + "/" + index + PDF2JPG_IMAGE_FORMAT;
} }
/** /**
@@ -252,7 +252,7 @@ public class FileHandlerService {
} }
String imageFilePath; String imageFilePath;
for (int pageIndex = 0; pageIndex < pageCount; pageIndex++) { for (int pageIndex = 0; pageIndex < pageCount; pageIndex++) {
imageFilePath = folder + File.separator + pageIndex + pdf2jpg_image_format; imageFilePath = folder + File.separator + pageIndex + PDF2JPG_IMAGE_FORMAT;
BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, ConfigConstants.getPdf2JpgDpi(), ImageType.RGB); BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, ConfigConstants.getPdf2JpgDpi(), ImageType.RGB);
ImageIOUtil.writeImage(image, imageFilePath, ConfigConstants.getPdf2JpgDpi()); ImageIOUtil.writeImage(image, imageFilePath, ConfigConstants.getPdf2JpgDpi());
String imageUrl = this.getPdf2jpgUrl(pdfName, pageIndex); String imageUrl = this.getPdf2jpgUrl(pdfName, pageIndex);
@@ -264,8 +264,8 @@ public class FileHandlerService {
Throwable[] throwableArray = ExceptionUtils.getThrowables(e); Throwable[] throwableArray = ExceptionUtils.getThrowables(e);
for (Throwable throwable : throwableArray) { for (Throwable throwable : throwableArray) {
if (throwable instanceof IOException || throwable instanceof EncryptedDocumentException) { if (throwable instanceof IOException || throwable instanceof EncryptedDocumentException) {
if (e.getMessage().toLowerCase().contains(pdf_password_msg)) { if (e.getMessage().toLowerCase().contains(PDF_PASSWORD_MSG)) {
pdfPassword = pdf_password_msg; pdfPassword = PDF_PASSWORD_MSG;
} }
} }
} }
@@ -275,7 +275,8 @@ public class FileHandlerService {
pdfReader.close(); pdfReader.close();
} }
} }
if(!pdfPassword.equals(pdf_password_msg)){ //判断是否加密文件 加密文件不缓存 //判断是否加密文件 加密文件不缓存
if (PDF_PASSWORD_MSG.equals(pdfPassword)) {
this.addPdf2jpgCache(pdfFilePath, pageCount); this.addPdf2jpgCache(pdfFilePath, pageCount);
} }
} catch (IOException e) { } catch (IOException e) {