add zookeeper config.

dromara · Aug 20, 2020 · 445cae9 · 445cae9
1 parent 8d2e7bd
commit 445cae9
Show file tree

Hide file tree

Showing 19 changed files with 1,166 additions and 18 deletions.
diff --git a/hmily-bom/pom.xml b/hmily-bom/pom.xml
@@ -44,18 +44,19 @@
         <objenesis.version>3.1</objenesis.version>
         <jedis.version>3.1.0</jedis.version>
         <kryo.version>4.0.0</kryo.version>
-        <curator.version>4.0.1</curator.version>
         <gson.verions>2.8.0</gson.verions>
         <lombok.version>1.16.14</lombok.version>
         <motan.version>1.0.0</motan.version>
         <disruptor.version>3.4.0</disruptor.version>
         <hikaricp.version>3.2.0</hikaricp.version>
         <prometheus-java-client.version>0.6.0</prometheus-java-client.version>
-        <zookeeper.version>3.4.6</zookeeper.version>
+        <zookeeper.version>3.6.0</zookeeper.version>
         <zkClient.version>0.4</zkClient.version>
         <aspectj.version>1.8.9</aspectj.version>
         <aspectjrt.version>1.6.11</aspectjrt.version>
         <commons-beanutils.verison>1.9.4</commons-beanutils.verison>
+        <curator.version>5.1.0</curator.version>
+        <yml.version>1.23</yml.version>
     </properties>
 
     <dependencyManagement>
@@ -235,17 +236,6 @@
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.curator</groupId>
-                <artifactId>curator-client</artifactId>
-                <version>${curator.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.curator</groupId>
-                <artifactId>curator-framework</artifactId>
-                <version>${curator.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.aspectj</groupId>
@@ -259,6 +249,12 @@
                 <version>${aspectjrt.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${yml.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
@@ -299,6 +295,33 @@
                 <version>${objenesis.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-framework</artifactId>
+                <version>${curator.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-client</artifactId>
+                <version>${curator.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>netty</artifactId>
+                        <groupId>io.netty</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-recipes</artifactId>
+                <version>${curator.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-test</artifactId>
+                <version>${curator.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>

diff --git a/...hmily-config-api/src/main/java/org/dromara/hmily/config/api/constant/PrefixConstants.java b/...hmily-config-api/src/main/java/org/dromara/hmily/config/api/constant/PrefixConstants.java
@@ -69,11 +69,14 @@ public interface PrefixConstants {
     /**
      * The constant APOLLO_PREFIX.
      */
-    String APOLLO_PREFIX = "hmily.apollo";
+    String REMOTE_APOLLO = "remote.apollo";
 
     /**
      * The constant NACOS_PREFIX.
      */
-    String NACOS_PREFIX = "hmily.nacos";
+    String remote_NACOS = "remote.nacos";
+
+
+    String REMOTE_ZOOKEEPER = "remote.zookeeper";
 
 }
diff --git a/hmily-config/hmily-config-loader/pom.xml b/hmily-config/hmily-config-loader/pom.xml
@@ -37,12 +37,10 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.23</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.3</version>
         </dependency>
     </dependencies>
 </project>