ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分): 图片上传问题修复

Browse Source
This commit is contained in:
yjz
2023-10-19 20:07:55 +08:00
parent 396a6c1567
commit c316029899
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-base/laws-base-core/src/main/java/com/jero/common/util/MinioUtil.java
+1 -3
View File
@@ -11,12 +11,10 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.*; import java.io.*;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.ProtocolException;
import java.net.URL; import java.net.URL;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -94,7 +92,7 @@ public class MinioUtil {
orgName=file.getName(); orgName=file.getName();
} }
orgName = CommonUtils.getFileName(orgName); orgName = CommonUtils.getFileName(orgName);
String objectName = bizPath+File.separator String objectName = bizPath+"/"
+(!orgName.contains(".") +(!orgName.contains(".")
?orgName + "_" + System.currentTimeMillis() ?orgName + "_" + System.currentTimeMillis()
:orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf(".")) :orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."))
laws-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
+4 -6
View File
@@ -19,9 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@@ -169,22 +167,22 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
} }
} }
// 将文件上传至腾讯云 cos // 将文件上传至腾讯云 cos
MinioUtil.upload(mf, filePath); String upload = MinioUtil.upload(mf, "/" + uploadCospath);
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//存入文件表 //存入文件表
oSSFile.setFileName(orgName); oSSFile.setFileName(orgName);
oSSFile.setId(UuidUtils.getUUID()); oSSFile.setId(UuidUtils.getUUID());
oSSFile.setUrl(filePath);
oSSFile.setCreateBy(loginUser.getUsername()); oSSFile.setCreateBy(loginUser.getUsername());
oSSFile.setCreateTime(new Date()); oSSFile.setCreateTime(new Date());
this.save(oSSFile); this.save(oSSFile);
// 文件路径做特殊处理 // 文件路径做特殊处理
// 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 = splitUrl + filePath; String imgUrl = upload.split("/")[1];
oSSFile.setUrl(imgUrl); oSSFile.setUrl(splitUrl + imgUrl);
return oSSFile; return oSSFile;
} }
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+1 -1
View File
@@ -808,7 +808,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
@Override @Override
public void revocation(Map<String, Object> parameter) { public void revocation(Map<String, Object> parameter) {
String id = (String) parameter.get(ID); String id = (String) parameter.get(ID);
// 文档拆分信息(旧) // 文档拆分信息
DocumentSplitInfo oldInfo = documentSplitMapper.queryDocumentSplitInfoById(id); DocumentSplitInfo oldInfo = documentSplitMapper.queryDocumentSplitInfoById(id);
// 修改发布状态 // 修改发布状态
LambdaUpdateWrapper<SarFileSplitInfoEO> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<SarFileSplitInfoEO> updateWrapper = new LambdaUpdateWrapper<>();