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

新增富文本和头像的对象存储调用

Browse Source
This commit is contained in:
thinkgem
2023-10-23 10:57:27 +08:00
parent 9a13b33dd8
commit bc8a6d2db7
5 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/core/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java
View File

@@ -1,5 +1,14 @@
package com.jeesite.common.ueditor.upload;
import com.jeesite.common.image.ImageUtils;
import com.jeesite.common.io.FileUtils;
import com.jeesite.common.media.VideoUtils;
import com.jeesite.common.ueditor.PathFormat;
import com.jeesite.common.ueditor.define.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -8,21 +17,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import com.jeesite.common.image.ImageUtils;
import com.jeesite.common.io.FileUtils;
import com.jeesite.common.media.VideoUtils;
import com.jeesite.common.ueditor.PathFormat;
import com.jeesite.common.ueditor.define.ActionMap;
import com.jeesite.common.ueditor.define.AppInfo;
import com.jeesite.common.ueditor.define.BaseState;
import com.jeesite.common.ueditor.define.FileType;
import com.jeesite.common.ueditor.define.State;
public class BinaryUploader {
public static final State save(HttpServletRequest request, Map<String, Object> conf) {
@@ -64,7 +58,7 @@ public class BinaryUploader {
savePath = PathFormat.parse(savePath, originFileName);
String physicalPath = FileUtils.path((String) conf.get("rootPath") + savePath);
String physicalPath = FileUtils.path(conf.get("rootPath") + savePath);
InputStream is = null;
State storageState = null;

26
modules/core/src/main/java/com/jeesite/common/ueditor/upload/StorageManager.java
View File

@@ -1,12 +1,6 @@
package com.jeesite.common.ueditor.upload;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import com.jeesite.common.config.Global;
import com.jeesite.common.idgen.IdGen;
import com.jeesite.common.io.FileUtils;
import com.jeesite.common.io.PropertiesUtils;
@@ -14,6 +8,11 @@ import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.ueditor.define.AppInfo;
import com.jeesite.common.ueditor.define.BaseState;
import com.jeesite.common.ueditor.define.State;
import com.jeesite.common.web.http.ServletUtils;
import com.jeesite.modules.file.utils.FileUploadUtils;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
public class StorageManager {
@@ -194,12 +193,21 @@ public class StorageManager {
/**
* UEditor上传文件成功后调用事件
*
* @param physicalPath 上传文件实际路径
* @param storageState url 返回到客户端的文件访问地址
*/
public static void uploadFileSuccess(String physicalPath, State storageState) {
if (!Global.getPropertyToBoolean("file.enabled", "true")) {
return;
}
File file = new File(physicalPath);
String url = FileUploadUtils.ossFileUpload(file, StringUtils.substringAfter(
FileUtils.path(file.getAbsolutePath()), Global.USERFILES_BASE_URL));
if (!StringUtils.contains(url, "://")) {
HttpServletRequest request = ServletUtils.getRequest();
url = FileUtils.path((request != null ? request.getContextPath() : StringUtils.EMPTY) + url);
}
storageState.putInfo("url", url);
}
}