|
@@ -103,15 +103,16 @@ public class OSSService {
|
|
|
|
|
|
ByteArrayInputStream inputStream = new ByteArrayInputStream(IoUtil.readBytes(file.getInputStream()));
|
|
ByteArrayInputStream inputStream = new ByteArrayInputStream(IoUtil.readBytes(file.getInputStream()));
|
|
String fileUrl = dir + file.getOriginalFilename();
|
|
String fileUrl = dir + file.getOriginalFilename();
|
|
|
|
+ String encodeUrl = dir + URLEncoder.encode(Objects.requireNonNull(file.getOriginalFilename()), StandardCharsets.UTF_8);
|
|
|
|
|
|
if (FileMagic.valueOf(new BufferedInputStream(file.getInputStream())) == FileMagic.OOXML && Objects.requireNonNull(file.getOriginalFilename()).endsWith(".doc")){
|
|
if (FileMagic.valueOf(new BufferedInputStream(file.getInputStream())) == FileMagic.OOXML && Objects.requireNonNull(file.getOriginalFilename()).endsWith(".doc")){
|
|
fileUrl += "x";
|
|
fileUrl += "x";
|
|
|
|
+ encodeUrl += "x";
|
|
}
|
|
}
|
|
ossClient.putObject(bucket, fileUrl , inputStream);
|
|
ossClient.putObject(bucket, fileUrl , inputStream);
|
|
inputStream.reset();
|
|
inputStream.reset();
|
|
|
|
|
|
- String encodedString = URLEncoder.encode(fileUrl, StandardCharsets.UTF_8);
|
|
|
|
- return "https://cxzx.smcic.net/" + encodedString;
|
|
|
|
|
|
+ return "https://cxzx.smcic.net/" + encodeUrl;
|
|
}
|
|
}
|
|
|
|
|
|
public void bidDel(Long id){
|
|
public void bidDel(Long id){
|
|
@@ -192,11 +193,11 @@ public class OSSService {
|
|
}
|
|
}
|
|
|
|
|
|
String fileUrl = dir + oname;
|
|
String fileUrl = dir + oname;
|
|
|
|
+ String encodedString = dir + URLEncoder.encode(oname, StandardCharsets.UTF_8);
|
|
ossClient.putObject(bucket, fileUrl , new ByteArrayInputStream(fos.toByteArray()));
|
|
ossClient.putObject(bucket, fileUrl , new ByteArrayInputStream(fos.toByteArray()));
|
|
fos.close();
|
|
fos.close();
|
|
fis.reset();
|
|
fis.reset();
|
|
|
|
|
|
- String encodedString = URLEncoder.encode(fileUrl, StandardCharsets.UTF_8);
|
|
|
|
document.close();
|
|
document.close();
|
|
xwpfDocument.close();
|
|
xwpfDocument.close();
|
|
|
|
|