From 44165d655dfd84310bb8be3bc767be94998248d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Tue, 12 May 2020 11:00:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=81=97=E7=95=99=E5=AE=B9=E6=98=93=E9=80=A0?=
 =?UTF-8?q?=E6=88=90=E8=AF=AF=E8=A7=A3=E7=9A=84=E6=96=B9=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/keking/service/impl/PictureFilePreviewImpl.java | 2 +-
 .../src/main/java/cn/keking/utils/FileUtils.java            | 6 +++---
 .../src/main/java/cn/keking/utils/ZipReader.java            | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jodconverter-web/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java b/jodconverter-web/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
index c0353e0d..56ee1f96 100644
--- a/jodconverter-web/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
@@ -27,7 +27,7 @@ public class PictureFilePreviewImpl implements FilePreview {
         List imgUrls = Lists.newArrayList(url);
         try{
             imgUrls.clear();
-            imgUrls.addAll(fileUtils.getRedisImgUrls(fileKey));
+            imgUrls.addAll(fileUtils.getImgCache(fileKey));
         }catch (Exception e){
             imgUrls = Lists.newArrayList(url);
         }
diff --git a/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java b/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
index e0f205bc..03472d41 100644
--- a/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
@@ -31,7 +31,7 @@ public class FileUtils {
     Logger log= LoggerFactory.getLogger(getClass());
 
     @Autowired
-    CacheService cacheService;
+    private CacheService cacheService;
 
     String fileDir = ConfigConstants.getFileDir();
 
@@ -195,7 +195,7 @@ public class FileUtils {
      * @param fileKey
      * @return
      */
-    public List getRedisImgUrls(String fileKey){
+    public List getImgCache(String fileKey){
         return cacheService.getImgCache(fileKey);
     }
 
@@ -204,7 +204,7 @@ public class FileUtils {
      * @param fileKey
      * @param imgs
      */
-    public void setRedisImgUrls(String fileKey,List imgs){
+    public void putImgCache(String fileKey,List imgs){
         cacheService.putImgCache(fileKey, imgs);
     }
     /**
diff --git a/jodconverter-web/src/main/java/cn/keking/utils/ZipReader.java b/jodconverter-web/src/main/java/cn/keking/utils/ZipReader.java
index 96d57499..d250f3f5 100644
--- a/jodconverter-web/src/main/java/cn/keking/utils/ZipReader.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/ZipReader.java
@@ -94,7 +94,7 @@ public class ZipReader {
             }
             // 开启新的线程处理文件解压
             executors.submit(new ZipExtractorWorker(entriesToBeExtracted, zipFile, filePath));
-            fileUtils.setRedisImgUrls(fileKey,imgUrls);
+            fileUtils.putImgCache(fileKey,imgUrls);
             return new ObjectMapper().writeValueAsString(appender.get(""));
         } catch (IOException e) {
             e.printStackTrace();
@@ -152,7 +152,7 @@ public class ZipReader {
                 appender.put(childName, node);
             }
             executors.submit(new RarExtractorWorker(headersToBeExtracted, archive, filePath));
-            fileUtils.setRedisImgUrls(fileKey,imgUrls);
+            fileUtils.putImgCache(fileKey,imgUrls);
             return new ObjectMapper().writeValueAsString(appender.get(""));
         } catch (RarException e) {
             e.printStackTrace();
@@ -204,7 +204,7 @@ public class ZipReader {
             }
             // 开启新的线程处理文件解压
             executors.submit(new SevenZExtractorWorker(entriesToBeExtracted, filePath));
-            fileUtils.setRedisImgUrls(fileKey,imgUrls);
+            fileUtils.putImgCache(fileKey,imgUrls);
             return new ObjectMapper().writeValueAsString(appender.get(""));
         } catch (IOException e) {
             e.printStackTrace();