diff --git a/server/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java
index 4f3d67713..b1a4fbcf4 100644
--- 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
index d8361f59b..55fee06f9 100644
--- 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
index 06cdb896a..a89232f54 100644
--- 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
index 7b7092aef..068849fda 100644
--- 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
index 52bd4d914..3198ac1fe 100644
--- 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;
     }