Browse Source

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

log
chenkailing 4 years ago committed by kl
parent
commit
7a7e1a1855
  1. 2
      server/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java
  2. 4
      server/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
  3. 2
      server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
  4. 2
      server/src/main/java/cn/keking/service/impl/XmlFilePreviewImpl.java
  5. 2
      server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java

2
server/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java

@ -5,7 +5,7 @@ import cn.keking.service.FilePreview;
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)

4
server/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java

@ -44,11 +44,11 @@ public class PictureFilePreviewImpl implements FilePreview {
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;

2
server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java

@ -39,7 +39,7 @@ public class SimTextFilePreviewImpl implements FilePreview {
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());
}

2
server/src/main/java/cn/keking/service/impl/XmlFilePreviewImpl.java

@ -5,7 +5,7 @@ import cn.keking.service.FilePreview;
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)

2
server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java

@ -65,6 +65,8 @@ public class OnlinePreviewController {
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;
}

Loading…
Cancel
Save