manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:编辑器图片上传问题

Browse Source
This commit is contained in:
暮光：城中城
2020-08-23 13:13:57 +08:00
parent 96079c8fa1
commit da5188d840
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/DocResponseJson.java
View File

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
import java.util.Objects;
/**
* 文档返回数据格式
@@ -214,6 +215,10 @@ public class DocResponseJson<T> implements ResponseJson<T> {
}
}
public boolean isOk() {
return Objects.equals(this.errCode, 200);
}
@Override
public String toString() {
return "DefaultResponseJson [errCode=" + errCode + ", errMsg=" + errMsg + ", data=" + data + "]";

41
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.wiki.controller;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSON;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
@@ -102,15 +103,20 @@ public class WikiPageFileController {
@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()});
DocResponseJson docResponseJson = this.uploadFile(wikiPageFile, file);
if (!docResponseJson.isOk()) {
resultMap.put("errno", "1");
resultMap.put("err", docResponseJson.getErrMsg());
} else {
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) {
public ResponseJson upload(WikiPageFile wikiPageFile, @RequestParam("files") MultipartFile file) {
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
Long pageId = wikiPageFile.getPageId();
if (pageId == null || pageId <= 0) {
@@ -123,6 +129,26 @@ public class WikiPageFileController {
if (canUploadFile != null) {
return DocResponseJson.warn(canUploadFile);
}
DocResponseJson docResponseJson = this.uploadFile(wikiPageFile, file);
if (!docResponseJson.isOk()) {
return docResponseJson;
}
// 给相关人发送消息
UserMessage userMessage = userMessageService.createUserMessage(currentUser, pageId, wikiPageSel.getName(), UserMsgSysType.WIKI, UserMsgType.WIKI_PAGE_UPLOAD);
userMessage.setAffectUserId(wikiPageSel.getCreateUserId());
userMessage.setAffectUserName(wikiPageSel.getCreateUserName());
userMessageService.addWikiMessage(userMessage);
return DocResponseJson.ok(wikiPageFile);
}
/**
* 单纯的文件上传方法
* @param wikiPageFile
* @param file
* @return
*/
private DocResponseJson uploadFile(WikiPageFile wikiPageFile, MultipartFile file) {
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
String fileName = file.getOriginalFilename();
String fileSuffix = "";
if (fileName != null && fileName.lastIndexOf(".") >= 0) {
@@ -151,12 +177,7 @@ public class WikiPageFileController {
wikiPageFile.setDelFlag(0);
wikiPageFileService.save(wikiPageFile);
wikiPageFile.setFileUrl("zyplayer-doc-wiki/common/file?uuid=" + wikiPageFile.getUuid());
// 给相关人发送消息
UserMessage userMessage = userMessageService.createUserMessage(currentUser, pageId, wikiPageSel.getName(), UserMsgSysType.WIKI, UserMsgType.WIKI_PAGE_UPLOAD);
userMessage.setAffectUserId(wikiPageSel.getCreateUserId());
userMessage.setAffectUserName(wikiPageSel.getCreateUserName());
userMessageService.addWikiMessage(userMessage);
return DocResponseJson.ok(wikiPageFile);
return DocResponseJson.ok();
}
}