From 8db1d48e26f0404bb8f9f5d994ce71a2346604d1 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Mon, 24 Jul 2023 23:01:50 +0800
Subject: [PATCH] no messages

---
 .../dubbo/properties/DubboProperties.java     | 11 ++--------
 ...ultPropertiesEnvironmentPostProcessor.java | 20 +++++++++----------
 2 files changed, 12 insertions(+), 19 deletions(-)

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 d2a750b..676b694 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<String> basePackages = new LinkedHashSet<>();
 
-        public Set<String> getBasePackages() {
-            return basePackages;
-        }
-
-        public void setBasePackages(Set<String> 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 8b1fd7f..5a5fdab 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<String, Object> defaultProperties = new HashMap<>();
+        Map<String, Object> 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);
-- 
GitLab