lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-08 08:54:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决文件名乱码问题

Browse Source
This commit is contained in:
zhou-hao
2017-12-01 12:00:19 +08:00
parent 9d969214d1
commit 091aa4b656
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hsweb-thirdparty/hsweb-thirdparty-ueditor/src/main/java/com/baidu/ueditor/ConfigManager.java vendored
View File

@@ -4,7 +4,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baidu.ueditor.define.ActionMap;
import org.hsweb.commons.file.FileUtils;
import lombok.extern.slf4j.Slf4j;
import org.hswebframework.utils.file.FileUtils;
import java.io.*;
import java.util.*;
@@ -14,6 +15,7 @@ import java.util.*;
*
* @author hancong03@baidu.com
*/
@Slf4j
public final class ConfigManager {
private final String rootPath;
@@ -147,9 +149,9 @@ public final class ConfigManager {
private void initEnv() throws IOException {
try {
JSONObject jsonConfig = JSON.parseObject(FileUtils.reader2String("config/ueditor.json"));
this.jsonConfig = jsonConfig;
this.jsonConfig = JSON.parseObject(FileUtils.reader2String("ueditor-config.json"));
} catch (Exception e) {
log.warn("read ueditor config file error", e);
this.jsonConfig = null;
}

18
hsweb-thirdparty/hsweb-thirdparty-ueditor/src/main/java/org/hswebframework/web/thirdpart/ueditor/UeditorController.java vendored
View File

@@ -7,6 +7,8 @@ import com.baidu.ueditor.define.FileType;
import com.baidu.ueditor.define.State;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.fileupload.ParameterParser;
import org.hswebframework.web.WebUtil;
import org.hswebframework.web.service.file.FileInfoService;
import org.hswebframework.web.service.file.FileService;
import org.springframework.beans.factory.annotation.Value;
@@ -20,6 +22,9 @@ import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Map;
import java.util.Optional;
/**
* ueditor 服务端实现
@@ -62,8 +67,19 @@ public class UeditorController {
*/
@RequestMapping(method = RequestMethod.POST, consumes = "multipart/form-data")
@ApiOperation("上传文件")
public String upload(@RequestParam(value = "upfile", required = false) MultipartFile file) throws IOException {
public String upload(@RequestParam(value = "upfile", required = false) MultipartFile file,HttpServletRequest request) throws IOException {
String fileName = file.getOriginalFilename();
String contentType = Optional.ofNullable(request)
.orElseThrow(UnsupportedOperationException::new)
.getContentType();
ParameterParser parser = new ParameterParser();
Map<String, String> params = parser.parse(contentType, ';');
if (params.get("charset") == null) {
try {
fileName = new String(file.getOriginalFilename().getBytes("ISO-8859-1"), "utf-8");
} catch (@SuppressWarnings("all") UnsupportedEncodingException ignore) {
}
}
String suffix = FileType.getSuffixByFilename(fileName);
String path = fileService.saveStaticFile(file.getInputStream(), System.currentTimeMillis() + suffix);