fix(文档拆分):图片上传问题
This commit is contained in:
+1
-1
@@ -32,7 +32,7 @@ public class SplitFileController {
|
|||||||
@ResponseBody
|
@ResponseBody
|
||||||
@GetMapping("/getImage")
|
@GetMapping("/getImage")
|
||||||
public void queryPageList(@RequestParam("fileName") String fileName, HttpServletResponse response, HttpServletRequest request) {
|
public void queryPageList(@RequestParam("fileName") String fileName, HttpServletResponse response, HttpServletRequest request) {
|
||||||
String fileUrl = filePathCos + "/" + fileName;
|
String fileUrl = "/" + filePathCos + "\\" + fileName;
|
||||||
response.setHeader("Content-Disposition",
|
response.setHeader("Content-Disposition",
|
||||||
"attachment; filename=\"" + SplitFileUtils.encodeFileName(fileName, request) + "\"");
|
"attachment; filename=\"" + SplitFileUtils.encodeFileName(fileName, request) + "\"");
|
||||||
response.setContentType("application/force-download");
|
response.setContentType("application/force-download");
|
||||||
|
|||||||
+4
-3
@@ -7,6 +7,7 @@ import com.jero.common.exception.JeroBootException;
|
|||||||
import com.jero.common.system.vo.LoginUser;
|
import com.jero.common.system.vo.LoginUser;
|
||||||
import com.jero.common.util.CommonUtils;
|
import com.jero.common.util.CommonUtils;
|
||||||
import com.jero.common.util.MinioUtil;
|
import com.jero.common.util.MinioUtil;
|
||||||
|
import com.jero.common.util.obs.ObsBootUtil;
|
||||||
import com.jero.common.util.oss.OssBootUtil;
|
import com.jero.common.util.oss.OssBootUtil;
|
||||||
import com.jero.modules.oss.entity.OSSFile;
|
import com.jero.modules.oss.entity.OSSFile;
|
||||||
import com.jero.modules.oss.mapper.OSSFileMapper;
|
import com.jero.modules.oss.mapper.OSSFileMapper;
|
||||||
@@ -167,7 +168,8 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
|
|||||||
|
|
||||||
|
|
||||||
// 将文件上传至腾讯云 cos
|
// 将文件上传至腾讯云 cos
|
||||||
String upload = MinioUtil.upload(mf, "/" + uploadCospath);
|
// String upload = MinioUtil.upload(mf, "/" + uploadCospath);
|
||||||
|
String upload = ObsBootUtil.upload(mf, "/" + uploadCospath);
|
||||||
|
|
||||||
LoginUser loginUser = null;
|
LoginUser loginUser = null;
|
||||||
try {
|
try {
|
||||||
@@ -184,8 +186,7 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
|
|||||||
// 文件路径做特殊处理
|
// 文件路径做特殊处理
|
||||||
// BASE64Encoder base64Encoder = new BASE64Encoder();
|
// BASE64Encoder base64Encoder = new BASE64Encoder();
|
||||||
// String encode = base64Encoder.encode(filePath.getBytes(StandardCharsets.UTF_8));
|
// String encode = base64Encoder.encode(filePath.getBytes(StandardCharsets.UTF_8));
|
||||||
String imgUrl = upload.split("/")[1];
|
oSSFile.setUrl(splitUrl + upload.split("\\\\")[1]);
|
||||||
oSSFile.setUrl(splitUrl + imgUrl);
|
|
||||||
return oSSFile;
|
return oSSFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user