优化：修改历史遗留容易造成误解的方法名

gitchenjh · klboke · commit 44165d655dfd · 2020-05-12T11:08:02.000+08:00
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
@@ -27,7 +27,7 @@ public String filePreviewHandle(String url, Model model, FileAttribute fileAttri
         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
@@ -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 void addConvertedPdfImage(String pdfFilePath, int num){
      * @param fileKey
      * @return
      */
-    public List getRedisImgUrls(String fileKey){
+    public List getImgCache(String fileKey){
         return cacheService.getImgCache(fileKey);
     }
 
@@ -204,7 +204,7 @@ public List getRedisImgUrls(String fileKey){
      * @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
@@ -94,7 +94,7 @@ public String readZipFile(String filePath,String fileKey) {
             }
             // 开启新的线程处理文件解压
             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 String unRar(String filePath,String fileKey){
                 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 String read7zFile(String filePath,String fileKey) {
             }
             // 开启新的线程处理文件解压
             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();

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public String filePreviewHandle(String url, Model model, FileAttribute fileAttri`
`27`	`27`	`List imgUrls = Lists.newArrayList(url);`
`28`	`28`	`try{`
`29`	`29`	`imgUrls.clear();`
`30`		`- imgUrls.addAll(fileUtils.getRedisImgUrls(fileKey));`
	`30`	`+ imgUrls.addAll(fileUtils.getImgCache(fileKey));`
`31`	`31`	`}catch (Exception e){`
`32`	`32`	`imgUrls = Lists.newArrayList(url);`
`33`	`33`	`}`