From 254c20e99f704d3977c882659dce16a760ecf3ba Mon Sep 17 00:00:00 2001 From: op-lht Date: Wed, 7 Sep 2022 10:59:27 +0800 Subject: [PATCH 1/4] design and modify documents,DynamicThreadPoolAutoConfiguration (#671) --- ...nfiguration.java => DynamicThreadPoolAutoConfiguration.java} | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/{DynamicThreadPoolCoreAutoConfiguration.java => DynamicThreadPoolAutoConfiguration.java} (99%) diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java similarity index 99% rename from hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java rename to hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java index aa24eaeb..18cb3163 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java @@ -64,7 +64,7 @@ import org.springframework.core.annotation.Order; ConfigHandlerConfiguration.EmbeddedApollo.class, ConfigHandlerConfiguration.EmbeddedZookeeper.class, ConfigHandlerConfiguration.EmbeddedEtcd.class }) -public class DynamicThreadPoolCoreAutoConfiguration { +public class DynamicThreadPoolAutoConfiguration { private final BootstrapConfigProperties bootstrapConfigProperties; diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/resources/META-INF/spring.factories b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/resources/META-INF/spring.factories index 5f39cf76..89ccf301 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.config.springboot.starter.config.DynamicThreadPoolCoreAutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.config.springboot.starter.config.DynamicThreadPoolAutoConfiguration From 2d9191fa5b137d2917ac683bcee1886d6317f9a8 Mon Sep 17 00:00:00 2001 From: liulinfei121 <57127515+liulinfei121@users.noreply.github.com> Date: Wed, 7 Sep 2022 11:05:50 +0800 Subject: [PATCH 2/4] add FileUtilTest test case (#672) --- .../java/cn/hippo4j/common/toolkit/FileUtilTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java b/hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java index aa1c9ca8..75b5edf4 100644 --- a/hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java +++ b/hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java @@ -27,4 +27,15 @@ public class FileUtilTest { String contentByFileUtil = FileUtil.readUtf8String(testFilePath); Assert.notEmpty(contentByFileUtil); } + + @Test + public void assertReadUtf8String2() { + String linebreaks = System.getProperty("line.separator"); + String testText = "abcd简体繁体\uD83D\uDE04\uD83D\uDD25& *" + linebreaks + + "second line" + linebreaks + + "empty line next" + linebreaks; + String testFilePath = "test/test_utf8.txt"; + String contentByFileUtil = FileUtil.readUtf8String(testFilePath); + Assert.isTrue(testText.equals(contentByFileUtil)); + } } From 90a42e6a89ceaed694795340a94903f64eec887f Mon Sep 17 00:00:00 2001 From: shanjianq <49084314+shanjianq@users.noreply.github.com> Date: Wed, 7 Sep 2022 11:30:34 +0800 Subject: [PATCH 3/4] assign profilesActive default value in MybatisPlusConfig (#674) --- .../main/java/cn/hippo4j/config/config/MybatisPlusConfig.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java b/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java index f339efde..d762c2bb 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java @@ -30,8 +30,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration public class MybatisPlusConfig { - - @Value("${spring.profiles.active}") + @Value("${spring.profiles.active:mysql}") private String profilesActive; @Bean From 4924dc17447524855729aab8f7bdd9fd23b2f843 Mon Sep 17 00:00:00 2001 From: shanjianq <49084314+shanjianq@users.noreply.github.com> Date: Wed, 7 Sep 2022 11:42:53 +0800 Subject: [PATCH 4/4] assign profilesActive default value in MybatisPlusConfig (#675) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * assign profilesActive default value in MybatisPlusConfig * assign profilesActive default value in MybatisPlusConfig Co-authored-by: 李金来 <41976977+pirme@users.noreply.github.com> --- .../main/java/cn/hippo4j/config/config/MybatisPlusConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java b/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java index d762c2bb..6af649b8 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration public class MybatisPlusConfig { + @Value("${spring.profiles.active:mysql}") private String profilesActive;