1. 优化代码

jinan_dev
xueqingkun 6 months ago
parent d24bf731e0
commit 7ce757592d

@ -91,7 +91,7 @@ public class MinioServiceImpl implements MinioService {
response.setContentType(statObjectResponse.contentType()); response.setContentType(statObjectResponse.contentType());
response.getOutputStream().write(baos.toByteArray()); response.getOutputStream().write(baos.toByteArray());
}else if (StrUtil.equalsAnyIgnoreCase(fileType,"jpg", "jpeg", "png","bmp")){ }else if (StrUtil.equalsAnyIgnoreCase(fileType,"jpg", "jpeg", "png","bmp")){
WatermarkUtil.ImageByText(waterMarkName, inputStream, baos, Map.of("formatName", fileType)); WatermarkUtil.imageByText(waterMarkName, inputStream, baos, Map.of("formatName", fileType));
response.setContentType(statObjectResponse.contentType()); response.setContentType(statObjectResponse.contentType());
response.setContentLengthLong(baos.size()); response.setContentLengthLong(baos.size());
response.getOutputStream().write(baos.toByteArray()); response.getOutputStream().write(baos.toByteArray());

@ -973,7 +973,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
fileInputStreamMap.put(minioFile.getFilename(), new ByteArrayInputStream(bos.toByteArray())); fileInputStreamMap.put(minioFile.getFilename(), new ByteArrayInputStream(bos.toByteArray()));
} else if (StrUtil.equalsAnyIgnoreCase(minioFile.getFileType(), "jpg", "png", "jpeg", "bmp")) { } else if (StrUtil.equalsAnyIgnoreCase(minioFile.getFileType(), "jpg", "png", "jpeg", "bmp")) {
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
WatermarkUtil.ImageByText(UserUtil.getUser().getUserName(), minioService.getObjectInputStream(minioFile), bos, Map.of("formatName", minioFile.getFileType())); WatermarkUtil.imageByText(UserUtil.getUser().getUserName(), minioService.getObjectInputStream(minioFile), bos, Map.of("formatName", minioFile.getFileType()));
fileInputStreamMap.put(minioFile.getFilename(), new ByteArrayInputStream(bos.toByteArray())); fileInputStreamMap.put(minioFile.getFilename(), new ByteArrayInputStream(bos.toByteArray()));
} else { } else {
fileInputStreamMap.put(minioFile.getFilename(), minioService.getObjectInputStream(minioFile)); fileInputStreamMap.put(minioFile.getFilename(), minioService.getObjectInputStream(minioFile));

@ -122,7 +122,7 @@ public class WatermarkUtil {
* @param inputStream * @param inputStream
* @param outputStream * @param outputStream
*/ */
public static void ImageByText(String logoText, InputStream inputStream, OutputStream outputStream, Map<String, Object> config) throws IOException { public static void imageByText(String logoText, InputStream inputStream, OutputStream outputStream, Map<String, Object> config) throws IOException {
// 源图片 // 源图片
Image srcImg = ImageIO.read(inputStream); Image srcImg = ImageIO.read(inputStream);

Loading…
Cancel
Save