java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: restore customer visit uploads and guard fee publication

Browse Source
This commit is contained in:
ouyangxq
2026-11-05 16:30:27 +08:00
parent 97c80574df
commit 497544e9fd
11 changed files with 369 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
file/src/main/java/com/baiyue/file/service/BusinessFileCategory.java
+3 -1
View File
@@ -49,6 +49,7 @@ enum BusinessFileCategory {
OVERSEAS_RELABEL_SKU_TOTAL_DOCUMENT(true, FormatPolicy.PDF, Limits.STANDARD, BusinessIdPolicy.POSITIVE_LONG),
OVERSEAS_RELABEL_ITEM_DOCUMENT(true, FormatPolicy.PDF, Limits.STANDARD, BusinessIdPolicy.POSITIVE_LONG),
OVERSEAS_EXCEPTION_EVIDENCE(true, FormatPolicy.STANDARD, Limits.STANDARD, BusinessIdPolicy.POSITIVE_LONG),
OVERSEAS_CUSTOMER_VISIT(true, FormatPolicy.CUSTOMER_VISIT, Limits.CUSTOMER_VISIT, BusinessIdPolicy.POSITIVE_LONG),
LOADING_LIST_CUSTOMS_SOURCE(true, FormatPolicy.ARBITRARY, Limits.CUSTOMS, BusinessIdPolicy.POSITIVE_LONG),
LOADING_LIST_CUSTOMS_RECEIPT(true, FormatPolicy.ARBITRARY, Limits.CUSTOMS, BusinessIdPolicy.POSITIVE_LONG),
LOADING_LIST_CUSTOMS_RESULT(true, FormatPolicy.ARBITRARY, Limits.CUSTOMS, BusinessIdPolicy.POSITIVE_LONG),
@@ -135,11 +136,12 @@ enum BusinessFileCategory {
return Long.toString(value);
}
enum FormatPolicy { STANDARD, ARBITRARY, XLSX, PDF, PDF_IMAGE, IMAGE }
enum FormatPolicy { STANDARD, ARBITRARY, XLSX, PDF, PDF_IMAGE, IMAGE, CUSTOMER_VISIT }
private enum BusinessIdPolicy { POSITIVE_LONG, ORDER_BATCH_NO }
private static final class Limits {
private static final long STANDARD = 10L * 1024 * 1024;
private static final long CUSTOMS = 50L * 1024 * 1024;
private static final long ORDER_IMPORT = 5L * 1024 * 1024;
private static final long CUSTOMER_VISIT = 20L * 1024 * 1024;
}
}
file/src/main/java/com/baiyue/file/service/BusinessFileStorage.java
+17
View File
@@ -18,6 +18,7 @@ import java.security.NoSuchAlgorithmException;
import java.util.HexFormat;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@Component
@@ -27,6 +28,8 @@ public class BusinessFileStorage {
private static final Map<String, String> TYPES = Map.of(
"text/plain", ".txt", "application/pdf", ".pdf",
"image/jpeg", ".jpg", "image/png", ".png");
private static final Set<String> CUSTOMER_VISIT_EXTENSIONS = Set.of(
"pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "jpg", "jpeg", "png", "webp");
@Value("${baiyue.file.storage-root}")
private Path configuredRoot;
@@ -46,6 +49,7 @@ public class BusinessFileStorage {
return store(tenantId, businessId, file, category.maxSizeBytes(), category.formatPolicy());
}
/** 按业务类别检查大小和格式，保存真实文件并返回存储结果。 */
private Stored store(long tenantId, String businessId, MultipartFile file, long maxSize,
BusinessFileCategory.FormatPolicy formatPolicy) {
if (file == null || file.isEmpty()) throw bad("附件不能为空");
@@ -55,6 +59,8 @@ public class BusinessFileStorage {
String extension;
if (formatPolicy == BusinessFileCategory.FormatPolicy.ARBITRARY) {
extension = "";
} else if (formatPolicy == BusinessFileCategory.FormatPolicy.CUSTOMER_VISIT) {
extension = customerVisitExtension(file);
} else if (formatPolicy == BusinessFileCategory.FormatPolicy.PDF) {
if (!"application/pdf".equals(type)) throw bad("附件仅支持PDF");
verifyContent(file, type);
@@ -85,6 +91,17 @@ public class BusinessFileStorage {
}
}
/** 与回访入口保持相同扩展名约束，接受浏览器未提供 MIME 的 Office 资料。 */
private static String customerVisitExtension(MultipartFile file) {
String name = safeName(file);
int dot = name.lastIndexOf('.');
String extension = dot < 0 ? "" : name.substring(dot + 1).toLowerCase(Locale.ROOT);
if (!CUSTOMER_VISIT_EXTENSIONS.contains(extension)) {
throw bad("仅支持PDF、Office、JPG、PNG和WEBP文件");
}
return "." + extension;
}
private static void verifyXlsx(MultipartFile file) {
try (InputStream input = file.getInputStream()) {
byte[] prefix = input.readNBytes(4);
file/src/test/java/com/baiyue/file/service/CustomerVisitBusinessFileTest.java
+161
View File
@@ -0,0 +1,161 @@
package com.baiyue.file.service;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baiyue.common.core.exception.BizException;
import com.baiyue.file.entity.FileObjectEntity;
import com.baiyue.file.mapper.FileObjectMapper;
import org.apache.ibatis.builder.MapperBuilderAssistant;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.ArgumentCaptor;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.multipart.MultipartFile;
import java.nio.file.Path;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
class CustomerVisitBusinessFileTest {
private static final String TYPE = "OVERSEAS_CUSTOMER_VISIT";
private static final long MAX_SIZE = 20L * 1024 * 1024;
@TempDir Path root;
private BusinessFileStorage storage;
private FileObjectMapper files;
private InternalBusinessFileService service;
/** 初始化文件元数据映射，供真实归属查询使用。 */
@BeforeAll
static void initializeMapping() {
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), "visit-files"),
FileObjectEntity.class);
}
/** 使用真实本地存储，隔离数据库写入。 */
@BeforeEach
void setUp() {
storage = new BusinessFileStorage();
ReflectionTestUtils.setField(storage, "configuredRoot", root);
storage.initializeRoot();
files = mock(FileObjectMapper.class);
service = new InternalBusinessFileService();
ReflectionTestUtils.setField(service, "files", files);
ReflectionTestUtils.setField(service, "storage", storage);
}
/** 页面允许的全部回访资料均可保存，并保持客户及回访记录的精确归属。 */
@ParameterizedTest
@CsvSource(delimiter = '|', value = {
"pdf|application/pdf", "doc|application/msword", "docx|application/octet-stream",
"xls|application/vnd.ms-excel", "xlsx|application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"ppt|application/vnd.ms-powerpoint", "pptx|application/vnd.openxmlformats-officedocument.presentationml.presentation",
"jpg|image/jpeg", "jpeg|image/jpeg", "png|image/png", "webp|image/webp"
})
void uploadsAllSupportedFormatsWithCustomerAndVisitOwnership(String extension, String contentType) {
var file = new MockMultipartFile("file", "回访资料." + extension, contentType, new byte[]{1, 2, 3});
when(files.insert(any(FileObjectEntity.class))).thenAnswer(call -> {
FileObjectEntity row = call.getArgument(0);
row.setId(801L);
return 1;
});
var metadata = service.upload(1001L, TYPE, "71", 9L, file);
assertThat(metadata.ownerScope()).isEqualTo("CUSTOMER");
assertThat(metadata.tenantId()).isEqualTo(1001L);
assertThat(metadata.businessType()).isEqualTo(TYPE);
assertThat(metadata.businessId()).isEqualTo("71");
assertThat(metadata.fileId()).isEqualTo(801L);
assertThat(metadata.fileName()).isEqualTo(file.getOriginalFilename());
assertThat(metadata.contentType()).isEqualTo(contentType);
assertThat(metadata.sizeBytes()).isEqualTo(3L);
var persisted = ArgumentCaptor.forClass(FileObjectEntity.class);
verify(files).insert(persisted.capture());
assertThat(storage.read(persisted.getValue().getObjectKey())).containsExactly(1, 2, 3);
}
/** MIME 缺失或扩展名大写不应阻断有效的 Office 回访资料。 */
@Test
void acceptsOfficeFileWithoutBrowserMimeType() {
var file = new MockMultipartFile("file", "回访记录.DOCX", null, new byte[]{1});
var stored = storage.store(1001L, "71", file, BusinessFileCategory.require(TYPE));
assertThat(stored.contentType()).isEqualTo("application/octet-stream");
assertThat(stored.objectKey()).endsWith(".docx");
}
/** 回访资料单独使用 20MiB 限制，不放宽其他业务附件的限制。 */
@Test
void enforcesNonemptyAndTwentyMibBoundary() {
var category = BusinessFileCategory.require(TYPE);
assertThatThrownBy(() -> storage.store(1001L, "71", new MockMultipartFile("file", new byte[0]), category))
.isInstanceOf(BizException.class).hasMessageContaining("不能为空");
var oversized = mock(MultipartFile.class);
when(oversized.isEmpty()).thenReturn(false);
when(oversized.getSize()).thenReturn(MAX_SIZE + 1);
assertThatThrownBy(() -> storage.store(1001L, "71", oversized, category))
.isInstanceOf(BizException.class).hasMessageContaining("20MB");
var boundary = new MockMultipartFile("file", "回访.doc", "application/msword", new byte[(int) MAX_SIZE]);
assertThat(storage.store(1001L, "71", boundary, category).size()).isEqualTo(MAX_SIZE);
assertThat(BusinessFileCategory.CUSTOMS_DOCUMENT.maxSizeBytes()).isEqualTo(10L * 1024 * 1024);
}
/** 不接受回访入口约定之外的文件或双扩展名可执行文件。 */
@ParameterizedTest
@ValueSource(strings = {"readme.txt", "archive.zip", "visit.pdf.exe", "visit"})
void rejectsUnsupportedFormatsBeforeMetadataIsWritten(String name) {
var file = new MockMultipartFile("file", name, "application/octet-stream", new byte[]{1});
assertThatThrownBy(() -> service.upload(1001L, TYPE, "71", 9L, file))
.isInstanceOf(BizException.class).hasMessageContaining("仅支持");
verifyNoInteractions(files);
}
/** 回访资料必须归属明确客户和有效回访记录。 */
@Test
void rejectsPlatformScopeAndInvalidVisitId() {
var file = new MockMultipartFile("file", "visit.pdf", "application/pdf", new byte[]{1});
assertThatThrownBy(() -> service.upload(0L, TYPE, "71", 9L, file))
.isInstanceOf(BizException.class).hasMessageContaining("必须归属明确客户");
assertThatThrownBy(() -> service.upload(1001L, TYPE, "0", 9L, file))
.isInstanceOf(BizException.class).hasMessageContaining("业务ID必须有效");
verifyNoInteractions(files);
}
/** 保存回访时按客户、类型、回访记录和文件 ID 校验，不能串用其他资料。 */
@Test
void metadataRequiresEveryOwnershipKey() {
var value = new FileObjectEntity();
value.setId(801L);
value.setTenantId(1001L);
value.setBusinessType(TYPE);
value.setBusinessId("71");
when(files.selectOne(any())).thenAnswer(call -> {
LambdaQueryWrapper<FileObjectEntity> query = call.getArgument(0);
assertThat(query.getSqlSegment()).contains("tenant_id", "business_type", "business_id", "id", "status", "deleted");
return query.getParamNameValuePairs().values().containsAll(
java.util.List.of(1001L, TYPE, "71", 801L, "ACTIVE", false)) ? value : null;
});
assertThat(service.metadata(1001L, TYPE, "71", 801L).fileId()).isEqualTo(801L);
assertThatThrownBy(() -> service.metadata(1002L, TYPE, "71", 801L))
.isInstanceOf(BizException.class).hasMessageContaining("归属不匹配");
assertThatThrownBy(() -> service.metadata(1001L, TYPE, "72", 801L))
.isInstanceOf(BizException.class).hasMessageContaining("归属不匹配");
assertThatThrownBy(() -> service.metadata(1001L, "OVERSEAS_EXCEPTION_EVIDENCE", "71", 801L))
.isInstanceOf(BizException.class).hasMessageContaining("归属不匹配");
assertThatThrownBy(() -> service.metadata(1001L, TYPE, "71", 802L))
.isInstanceOf(BizException.class).hasMessageContaining("归属不匹配");
}
}