modify hmily config

dromara · Aug 19, 2020 · fa32c59 · fa32c59
1 parent 1563275
commit fa32c59
Show file tree

Hide file tree

Showing 42 changed files with 237 additions and 862 deletions.
diff --git a/hmily-config/hmily-config-all/pom.xml b/hmily-config/hmily-config-all/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hmily-config</artifactId>
+        <groupId>org.dromara</groupId>
+        <version>2.1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hmily-config-all</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hmily-config-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hmily-config-apollo</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hmily-config-loader</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hmily-config-local</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hmily-config-nacos</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hmily-config-zookeeper</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/hmily-config/hmily-config-api/src/main/java/org/dromara/hmily/config/api/ConfigEnv.java b/hmily-config/hmily-config-api/src/main/java/org/dromara/hmily/config/api/ConfigEnv.java
@@ -22,8 +22,6 @@
 import java.util.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.hmily.config.api.exception.ConfigException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The type Config env.
@@ -32,8 +30,6 @@
  */
 public final class ConfigEnv {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConfigEnv.class);
-
     private final Map<Class<?>, Config> configBeans = new ConcurrentHashMap<>();
 
     private static final ConfigEnv INST = new ConfigEnv();

diff --git a/hmily-config/hmily-config-local/src/test/resources/hmily.yml b/hmily-config/hmily-config-local/src/test/resources/hmily.yml
@@ -4,6 +4,7 @@ hmily:
     appName: xiaoyu
   #  如果server.configMode eq local 的时候才会读取到这里的配置信息.
   config:
+    appName: xiaoyu
     serializer: kryo
     contextTransmittalMode: threadLocal
     scheduledThreadMax: 16

diff --git a/hmily-config/pom.xml b/hmily-config/pom.xml
@@ -35,6 +35,7 @@
         <module>hmily-config-nacos</module>
         <module>hmily-config-apollo</module>
         <module>hmily-config-zookeeper</module>
+        <module>hmily-config-all</module>
     </modules>
 
 

diff --git a/hmily-config/src/main/java/org/dromara/hmily/config/HmilyConfig.java b/hmily-config/src/main/java/org/dromara/hmily/config/HmilyConfig.java
diff --git a/hmily-config/src/main/java/org/dromara/hmily/config/HmilyDbConfig.java b/hmily-config/src/main/java/org/dromara/hmily/config/HmilyDbConfig.java