apache · yang20150702 · Feb 28, 2023 · Feb 28, 2023 · Feb 28, 2023 · Feb 28, 2023
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,8 @@
 [workspace]
 members = [
   "xds",
-  "registry",
-  "registry-zookeeper",
-  "registry-nacos",
+  "registry/zookeeper",
+  "registry/nacos",
   "metadata",
   "config",
   "dubbo",
@@ -27,4 +26,10 @@ lazy_static = "1"
 futures = "0.3"
 tracing = "0.1"
 tracing-subscriber = "0.3.15"
+serde = "1"
+serde_json = "1"
+urlencoding = "2.1.2"
+logger = {path="./common/logger"}
+anyhow = "1.0.66"
+dubbo = { path = "./dubbo/" }
 
diff --git a/examples/echo/Cargo.toml b/examples/echo/Cargo.toml
@@ -34,7 +34,7 @@ hyper = { version = "0.14.19", features = ["full"]}
 
 dubbo = {path = "../../dubbo", version = "0.3.0" }
 dubbo-config = {path = "../../config", version = "0.3.0" }
-dubbo-registry-zookeeper = {path = "../../registry-zookeeper", version = "0.3.0" }
+dubbo-registry-zookeeper = {path = "../../registry/zookeeper", version = "0.3.0" }
 
 [build-dependencies]
 dubbo-build = {path = "../../dubbo-build", version = "0.3.0" }
diff --git a/examples/echo/src/generated/grpc.examples.echo.rs b/examples/echo/src/generated/grpc.examples.echo.rs
diff --git a/examples/greeter/Cargo.toml b/examples/greeter/Cargo.toml
@@ -31,7 +31,7 @@ tokio-stream = "0.1"
 logger = {path="../../common/logger"}
 dubbo = {path = "../../dubbo", version = "0.3.0" }
 dubbo-config = {path = "../../config", version = "0.3.0" }
-dubbo-registry-zookeeper = {path = "../../registry-zookeeper", version = "0.3.0" }
+dubbo-registry-zookeeper = {path = "../../registry/zookeeper", version = "0.3.0" }
 
 [build-dependencies]
 dubbo-build = {path = "../../dubbo-build", version = "0.3.0" }
diff --git a/registry/Cargo.toml b/registry/Cargo.toml
diff --git a/registry/LICENSE b/registry/LICENSE
diff --git a/registry-nacos/Cargo.toml → registry/nacos/Cargo.toml b/registry-nacos/Cargo.toml → registry/nacos/Cargo.toml
@@ -10,11 +10,10 @@ repository = "https://github.com/apache/dubbo-rust.git"
 
 [dependencies]
 nacos-sdk = { version = "0.2", features = ["naming", "auth-by-http"] }
-dubbo = {path = "../dubbo/", version = "0.3.0" }
-serde_json = "1.0"
-serde = {version = "1.0.145",features = ["derive"]}
-tracing = "0.1"
-anyhow = "1.0.66"
-
+dubbo.workspace = true
+serde_json.workspace = true
+serde = { workspace = true, features = ["derive"] }
+anyhow.workspace = true
+logger.workspace = true
 [dev-dependencies]
 tracing-subscriber = "0.3.16"
diff --git a/registry-nacos/LICENSE → registry/nacos/LICENSE b/registry-nacos/LICENSE → registry/nacos/LICENSE
diff --git a/registry-nacos/src/lib.rs → registry/nacos/src/lib.rs b/registry-nacos/src/lib.rs → registry/nacos/src/lib.rs
diff --git a/registry-nacos/src/nacos_registry.rs → registry/nacos/src/nacos_registry.rs b/registry-nacos/src/nacos_registry.rs → registry/nacos/src/nacos_registry.rs
@@ -25,8 +25,8 @@ use dubbo::{
     common::url::Url,
     registry::{NotifyListener, Registry, RegistryNotifyListener, ServiceEvent},
 };
+use logger::tracing::{error, info, warn};
 use nacos_sdk::api::naming::{NamingService, NamingServiceBuilder, ServiceInstance};
-use tracing::{error, info, warn};
 
 use crate::utils::{build_nacos_client_props, is_concrete_str, is_wildcard_str, match_range};
 

diff --git a/registry-nacos/src/utils/mod.rs → registry/nacos/src/utils/mod.rs b/registry-nacos/src/utils/mod.rs → registry/nacos/src/utils/mod.rs
diff --git a/registry/src/lib.rs b/registry/src/lib.rs
diff --git a/registry-zookeeper/Cargo.toml → registry/zookeeper/Cargo.toml b/registry-zookeeper/Cargo.toml → registry/zookeeper/Cargo.toml
@@ -10,8 +10,8 @@ repository = "https://github.com/apache/dubbo-rust.git"
 
 [dependencies]
 zookeeper = "0.7.0"
-dubbo = {path = "../dubbo/", version = "0.3.0" }
-serde_json = "1.0"
-serde = {version = "1.0.145",features = ["derive"]}
-tracing = "0.1"
-urlencoding = "2.1.2"
+dubbo.workspace = true
+serde_json.workspace = true
+serde = { workspace = true, features = ["derive"] }
+urlencoding.workspace = true
+logger.workspace = true
diff --git a/registry-zookeeper/LICENSE → registry/zookeeper/LICENSE b/registry-zookeeper/LICENSE → registry/zookeeper/LICENSE
diff --git a/registry-zookeeper/src/lib.rs → registry/zookeeper/src/lib.rs b/registry-zookeeper/src/lib.rs → registry/zookeeper/src/lib.rs
diff --git a/registry-zookeeper/src/zookeeper_registry.rs → registry/zookeeper/src/zookeeper_registry.rs b/registry-zookeeper/src/zookeeper_registry.rs → registry/zookeeper/src/zookeeper_registry.rs
@@ -24,8 +24,8 @@ use std::{
     time::Duration,
 };
 
+use logger::tracing::{debug, error, info};
 use serde::{Deserialize, Serialize};
-use tracing::{error, info};
 #[allow(unused_imports)]
 use zookeeper::{Acl, CreateMode, WatchedEvent, WatchedEventType, Watcher, ZooKeeper};
 
@@ -52,7 +52,7 @@ pub const REGISTRY_GROUP_KEY: &str = "registry.group";
 struct LoggingWatcher;
 impl Watcher for LoggingWatcher {
     fn handle(&self, e: WatchedEvent) {
-        println!("{:?}", e)
+        info!("{:?}", e)
     }
 }
 
@@ -240,7 +240,7 @@ impl Default for ZookeeperRegistry {
 
 impl Registry for ZookeeperRegistry {
     fn register(&mut self, url: Url) -> Result<(), StdError> {
-        println!("register url: {}", url);
+        debug!("register url: {}", url);
         let zk_path = format!(
             "/{}/{}/{}/{}",
             DUBBO_KEY,