修复导包错误以及图片预览bug

klboke · klboke · commit 7a7e1a185592 · 2020-12-27T19:18:52.000+08:00
diff --git a/server/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java
@@ -5,7 +5,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 
-import static com.sun.glass.ui.Clipboard.TEXT_TYPE;
+import static cn.keking.service.impl.SimTextFilePreviewImpl.TEXT_TYPE;
 
 /**
  * @author kl (http://kailing.pub)
diff --git a/server/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
@@ -44,11 +44,11 @@ public String filePreviewHandle(String url, Model model, FileAttribute fileAttri
                 String file = fileHandlerService.getRelativePath(response.getContent());
                 imgUrls.clear();
                 imgUrls.add(file);
-                model.addAttribute("imgurls", imgUrls);
+                model.addAttribute("imgUrls", imgUrls);
                 model.addAttribute("currentUrl", file);
             }
         } else {
-            model.addAttribute("imgurls", imgUrls);
+            model.addAttribute("imgUrls", imgUrls);
             model.addAttribute("currentUrl", url);
         }
         return PICTURE_FILE_PREVIEW_PAGE;
diff --git a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
@@ -39,7 +39,7 @@ public String filePreviewHandle(String url, Model model, FileAttribute fileAttri
         try {
             File originFile = new File(response.getContent());
             String xmlString = FileUtils.readFileToString(originFile, StandardCharsets.UTF_8);
-            model.addAttribute("textData", Base64Utils.encodeToString(xmlString.getBytes()));
+            model.addAttribute("textData", Base64Utils.encodeToString(xmlString.getBytes(StandardCharsets.UTF_8)));
         } catch (IOException e) {
             return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage());
         }
diff --git a/server/src/main/java/cn/keking/service/impl/XmlFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/XmlFilePreviewImpl.java
@@ -5,7 +5,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 
-import static com.sun.glass.ui.Clipboard.TEXT_TYPE;
+import static cn.keking.service.impl.SimTextFilePreviewImpl.TEXT_TYPE;
 
 /**
  * @author kl (http://kailing.pub)
diff --git a/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java b/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
@@ -65,6 +65,8 @@ public String picturesPreview(String urls, Model model, HttpServletRequest req)
         if(StringUtils.hasText(currentUrl)){
             String decodedCurrentUrl = new String(Base64Utils.decodeFromString(currentUrl));
             model.addAttribute("currentUrl", decodedCurrentUrl);
+        }else {
+            model.addAttribute("currentUrl", imgUrls.get(0));
         }
         return PICTURE_FILE_PREVIEW_PAGE;
     }

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,11 @@ public String filePreviewHandle(String url, Model model, FileAttribute fileAttri`
`44`	`44`	`String file = fileHandlerService.getRelativePath(response.getContent());`
`45`	`45`	`imgUrls.clear();`
`46`	`46`	`imgUrls.add(file);`
`47`		`- model.addAttribute("imgurls", imgUrls);`
	`47`	`+ model.addAttribute("imgUrls", imgUrls);`
`48`	`48`	`model.addAttribute("currentUrl", file);`
`49`	`49`	`}`
`50`	`50`	`} else {`
`51`		`- model.addAttribute("imgurls", imgUrls);`
	`51`	`+ model.addAttribute("imgUrls", imgUrls);`
`52`	`52`	`model.addAttribute("currentUrl", url);`
`53`	`53`	`}`
`54`	`54`	`return PICTURE_FILE_PREVIEW_PAGE;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public String filePreviewHandle(String url, Model model, FileAttribute fileAttri`
`39`	`39`	`try {`
`40`	`40`	`File originFile = new File(response.getContent());`
`41`	`41`	`String xmlString = FileUtils.readFileToString(originFile, StandardCharsets.UTF_8);`
`42`		`- model.addAttribute("textData", Base64Utils.encodeToString(xmlString.getBytes()));`
	`42`	`+ model.addAttribute("textData", Base64Utils.encodeToString(xmlString.getBytes(StandardCharsets.UTF_8)));`
`43`	`43`	`} catch (IOException e) {`
`44`	`44`	`return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage());`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ public String picturesPreview(String urls, Model model, HttpServletRequest req)`
`65`	`65`	`if(StringUtils.hasText(currentUrl)){`
`66`	`66`	`String decodedCurrentUrl = new String(Base64Utils.decodeFromString(currentUrl));`
`67`	`67`	`model.addAttribute("currentUrl", decodedCurrentUrl);`
	`68`	`+ }else {`
	`69`	`+ model.addAttribute("currentUrl", imgUrls.get(0));`
`68`	`70`	`}`
`69`	`71`	`return PICTURE_FILE_PREVIEW_PAGE;`
`70`	`72`	`}`