diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java index 1bbf5934..8703bd55 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java @@ -25,6 +25,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URLEncoder; import java.util.Date; +import java.util.HashMap; +import java.util.Map; import java.util.Optional; /** @@ -44,6 +46,15 @@ public class WikiCommonController { @Resource WikiPageFileService wikiPageFileService; + @PostMapping("/wangEditor/upload") + public Map wangEditorUpload(WikiPageFile wikiPageFile, @RequestParam("files") MultipartFile file) { + this.upload(wikiPageFile, file); + Map resultMap = new HashMap<>(); + resultMap.put("errno", "0"); + resultMap.put("data", new String[]{wikiPageFile.getFileUrl()}); + return resultMap; + } + @PostMapping("/upload") public ResponseJson upload(WikiPageFile wikiPageFile, @RequestParam("files") MultipartFile file) { String fileName = file.getOriginalFilename(); diff --git a/zyplayer-doc-wiki/src/main/resources/doc-wiki.html b/zyplayer-doc-wiki/src/main/resources/doc-wiki.html index 4526ebee..b4f1481f 100644 --- a/zyplayer-doc-wiki/src/main/resources/doc-wiki.html +++ b/zyplayer-doc-wiki/src/main/resources/doc-wiki.html @@ -784,8 +784,10 @@ }, init(){ page.newPageContentEditor = new window.wangEditor('#newPageContentDiv'); - page.newPageContentEditor.customConfig.uploadImgServer = 'zyplayer-doc-wiki/common/upload'; + page.newPageContentEditor.customConfig.uploadImgServer = 'zyplayer-doc-wiki/common/wangEditor/upload'; page.newPageContentEditor.customConfig.zIndex = 100; + page.newPageContentEditor.customConfig.uploadFileName = 'files'; + page.newPageContentEditor.customConfig.uploadImgMaxLength = 1; page.newPageContentEditor.customConfig.pasteFilterStyle = false; page.newPageContentEditor.create(); this.createUrlParam();