From 4752756ab20a9cb9209c01cd18583dc4ab6e2543 Mon Sep 17 00:00:00 2001 From: "dengchao@xgtl" <2325690622@qq.com> Date: Wed, 15 Apr 2020 17:18:42 +0800 Subject: [PATCH] Fix member fields' type --- .../main/java/com/chatopera/cc/Application.java | 5 +++-- .../springframework/util/unit/DataSizeTest.java | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 contact-center/app/src/test/java/org/springframework/util/unit/DataSizeTest.java diff --git a/contact-center/app/src/main/java/com/chatopera/cc/Application.java b/contact-center/app/src/main/java/com/chatopera/cc/Application.java index b9b5d76b..e62f6889 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/Application.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/Application.java @@ -37,6 +37,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.util.unit.DataSize; import javax.servlet.MultipartConfigElement; import java.io.IOException; @@ -86,9 +87,9 @@ public class Application { @Value("${web.upload-path}") private String uploaddir; @Value("${spring.servlet.multipart.max-file-size}") - private String multipartMaxUpload; + private DataSize multipartMaxUpload; @Value("${spring.servlet.multipart.max-request-size}") - private String multipartMaxRequest; + private DataSize multipartMaxRequest; /** * Init local resources diff --git a/contact-center/app/src/test/java/org/springframework/util/unit/DataSizeTest.java b/contact-center/app/src/test/java/org/springframework/util/unit/DataSizeTest.java new file mode 100644 index 00000000..acc2cb4d --- /dev/null +++ b/contact-center/app/src/test/java/org/springframework/util/unit/DataSizeTest.java @@ -0,0 +1,14 @@ +package org.springframework.util.unit; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class DataSizeTest { + + @Test + void test() { + DataSize parsed = DataSize.parse("15MB"); + assertEquals(15, parsed.toMegabytes()); + } +}