QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(87346): 文档拆分--编辑--条款内容上传图片阻塞

Browse Source
This commit is contained in:
yjz
2024-07-29 14:12:08 +08:00
parent 266db54f4b
commit 51221bbef8
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/oss/controller/SplitFileController.java
+4 -1
View File
@@ -32,7 +32,10 @@ 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 = ("temp\\" + fileName).replace("\\\\", "\\"); if (!fileName.contains("temp")){
fileName = "temp\\" + fileName;
}
String fileUrl = fileName.replace("\\\\", "\\");
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");
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+10 -3
View File
@@ -4478,9 +4478,16 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// bizPath = ""; // bizPath = "";
// } // }
} }
OSSFile oSSFile = ossFileService.uploadLocalForSplit(file, bizPath,state,cut); // OSSFile oSSFile = ossFileService.uploadLocalForSplit(file, bizPath,state,cut);
if (oConvertUtils.isNotEmpty(oSSFile)) { String upload = ObsBootUtil.upload(file, "temp");
result.setResult(oSSFile); if (oConvertUtils.isNotEmpty(upload)) {
OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
ossFile.setUrl(upload);
ossFile.setFileName(file.getOriginalFilename());
ossFileService.save(ossFile);
ossFile.setFileName(upload);
result.setResult(ossFile);
result.setSuccess(true); result.setSuccess(true);
} else { } else {
if("cut".equals(LanguageEnum.CN.getValue())){ if("cut".equals(LanguageEnum.CN.getValue())){