From aaa267a6c4b8f266d69814bef9ae85f1e0d6666c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
 <806783409@qq.com>
Date: Sun, 21 Apr 2019 18:13:33 +0800
Subject: [PATCH] =?UTF-8?q?wiki=E6=94=AF=E6=8C=81=E7=B2=98=E8=B4=B4?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doc/wiki/controller/WikiCommonController.java     | 11 +++++++++++
 zyplayer-doc-wiki/src/main/resources/doc-wiki.html    |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

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<String, Object> wangEditorUpload(WikiPageFile wikiPageFile, @RequestParam("files") MultipartFile file) {
+		this.upload(wikiPageFile, file);
+		Map<String, Object> resultMap = new HashMap<>();
+		resultMap.put("errno", "0");
+		resultMap.put("data", new String[]{wikiPageFile.getFileUrl()});
+		return resultMap;
+	}
+	
 	@PostMapping("/upload")
 	public ResponseJson<Object> 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();