From 1122f455db036d94d966255cf6afd7b3aa4d5aa8 Mon Sep 17 00:00:00 2001
From: purple7433 <743367900@qq.com>
Date: Mon, 17 Apr 2023 15:38:09 +0800
Subject: [PATCH] update
---
.../domain/aggregate/file/FileEntity.java | 14 ++++++++++----
.../interfaces/controller/RecognizeController.java | 2 ++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/file/FileEntity.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/file/FileEntity.java
index 62c2440f..a2ae751b 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/file/FileEntity.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/file/FileEntity.java
@@ -2,6 +2,7 @@ package com.seasky.seaskyocr.domain.aggregate.file;
import cn.hutool.core.util.ObjectUtil;
import com.seasky.core.util.ExceptionUtil;
+import com.seasky.core.util.RandomUtil;
import com.seasky.seaskyocr.application.command.utils.FileUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -18,7 +19,7 @@ import java.io.File;
@Getter
public class FileEntity {
- private int fileSource;
+ private int fileResource;
private File file;
@@ -32,6 +33,8 @@ public class FileEntity {
private String fileName;
+ private String random;
+
public FileEntity(MultipartFile multipartFile) {
if (ObjectUtil.isNull(multipartFile)) {
throw ExceptionUtil.getException(null, "鏂囦欢涓嶈兘涓虹┖锛�");
@@ -51,7 +54,7 @@ public class FileEntity {
} catch (Exception e) {
throw ExceptionUtil.getException(null, "hashId鑾峰彇澶辫触锛�");
}
- this.fileSource = 1;
+ this.fileResource = 1;
}
public FileEntity(String fileBytes, String fileName) {
@@ -61,7 +64,10 @@ public class FileEntity {
if (ObjectUtil.isEmpty(fileName)) {
throw ExceptionUtil.getException(null, "鏂囦欢鍚嶄笉鑳戒负绌猴紒");
}
- File file = FileUtil.base64ToFile(fileBytes, fileName);
+ this.random = RandomUtil.getRandomNumbers(10);
+ FileUtil.base64ToFile("/temp", fileBytes, this.random + fileName);
+ File file = new File("/temp/" + this.random + fileName);
+
try {
this.hashId = String.valueOf(file.hashCode());
} catch (Exception e) {
@@ -71,6 +77,6 @@ public class FileEntity {
this.fileName = fileName;
this.fileBytes = fileBytes;
this.fileSize = fileBytes.length() / 1024.0 / 1024.0;
- this.fileSource = 2;
+ this.fileResource = 2;
}
}
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/RecognizeController.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/RecognizeController.java
index 5124515f..ee2dfd4a 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/RecognizeController.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/RecognizeController.java
@@ -250,6 +250,8 @@ public class RecognizeController implements IRecognizeController {
.remark("" + cmd.isCache()) //remark瀛楁鐢ㄤ簬璁板綍鏄惁璋冪敤缂撳瓨
.build());
throw ExceptionUtil.getException(null, e.getMessage());
+ } finally {
+ fileEntity.getFile().delete();
}
//todo 鎵嬪姩gc
System.gc();
--
GitLab