diff --git a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java index d2a750b4a1c19483cd54131fd3e4fe3aeb5675b9..676b6945a00184d8b2085a7d679d37675ee14bd5 100644 --- a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java +++ b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java @@ -64,6 +64,7 @@ public class DubboProperties implements ConfigurableProperties { return "dubbo-common"; } + @Data static class Scan { /** @@ -73,14 +74,6 @@ public class DubboProperties implements ConfigurableProperties { */ private Set basePackages = new LinkedHashSet<>(); - public Set getBasePackages() { - return basePackages; - } - - public void setBasePackages(Set basePackages) { - this.basePackages = basePackages; - } - } -} \ No newline at end of file +} diff --git a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/env/DefaultPropertiesEnvironmentPostProcessor.java b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/env/DefaultPropertiesEnvironmentPostProcessor.java index 8b1fd7f33956c634beb75cff3e2b9efd527ef408..5a5fdab5927c741dedd88f569dd39f1c46a2da74 100644 --- a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/env/DefaultPropertiesEnvironmentPostProcessor.java +++ b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/env/DefaultPropertiesEnvironmentPostProcessor.java @@ -20,7 +20,7 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.unit.DataSize; import java.nio.charset.StandardCharsets; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.TimeZone; @@ -43,18 +43,18 @@ public class DefaultPropertiesEnvironmentPostProcessor extends LoggerAwareEnviro @Override public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { - Map defaultProperties = new HashMap<>(); + Map defaultProperties = new LinkedHashMap<>(); // management defaultProperties.put("management.trace.http.enabled", false); defaultProperties.put("management.endpoints.web.exposure.include", "*"); defaultProperties.put("management.endpoints.enabled-by-default", true); - defaultProperties.put("management.endpoint.health.show-details", Show.ALWAYS); - defaultProperties.put("management.endpoint.health.show-components", Show.ALWAYS); - defaultProperties.put("management.info.git.mode", Mode.FULL); + defaultProperties.put("management.endpoint.health.show-details", Show.ALWAYS.name()); + defaultProperties.put("management.endpoint.health.show-components", Show.ALWAYS.name()); + defaultProperties.put("management.info.git.mode", Mode.FULL.name()); defaultProperties.put("management.server.port", PortUtils.findAvailablePort(1024)); // servlet - defaultProperties.put("spring.servlet.multipart.max-file-size", DataSize.ofBytes(-1)); - defaultProperties.put("spring.servlet.multipart.max-request-size", DataSize.ofBytes(-1)); + defaultProperties.put("spring.servlet.multipart.max-file-size", DataSize.ofBytes(-1).toString()); + defaultProperties.put("spring.servlet.multipart.max-request-size", DataSize.ofBytes(-1).toString()); // mvc defaultProperties.put("spring.mvc.throw-exception-if-no-handler-found", true); // datetime @@ -62,13 +62,13 @@ public class DefaultPropertiesEnvironmentPostProcessor extends LoggerAwareEnviro defaultProperties.put("spring.mvc.format.time", DatePattern.NORM_TIME_PATTERN); defaultProperties.put("spring.mvc.format.date-time", DatePattern.NORM_DATETIME_PATTERN); defaultProperties.put("spring.jackson.date-format", DatePattern.NORM_DATETIME_PATTERN); - defaultProperties.put("spring.jackson.time-zone", TimeZone.getDefault()); + defaultProperties.put("spring.jackson.time-zone", TimeZone.getDefault().getID()); // others defaultProperties.put("spring.mandatory-file-encoding", StandardCharsets.UTF_8.name()); defaultProperties.put("spring.web.resources.add-mappings", false); defaultProperties.put("spring.main.allow-circular-references", true); - defaultProperties.put("spring.main.banner-mode", Banner.Mode.OFF); - defaultProperties.put("server.shutdown", Shutdown.GRACEFUL); + defaultProperties.put("spring.main.banner-mode", Banner.Mode.OFF.name()); + defaultProperties.put("server.shutdown", Shutdown.GRACEFUL.name()); // active profile configureActiveProfileIfPresent(environment, defaultProperties); environment.setDefaultProfiles(EnvUtils.DEVELOPMENT);