Skip to content

Commit a0d76d4

Browse files
committed
fix example
1 parent bffd780 commit a0d76d4

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

config/src/config.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@ lazy_static! {
3737
pub struct RootConfig {
3838
pub name: String,
3939

40-
#[serde(skip_serializing, skip_deserializing)]
40+
#[serde(default)]
4141
pub service: HashMap<String, ServiceConfig>,
4242
pub protocols: HashMap<String, ProtocolConfig>,
43+
44+
#[serde(default)]
4345
pub registries: HashMap<String, String>,
4446

47+
#[serde(default)]
4548
pub provider: ProviderConfig,
4649

4750
#[serde(skip_serializing, skip_deserializing)]

config/src/provider.rs

+2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ use super::service::ServiceConfig;
2323

2424
#[derive(Debug, Default, Serialize, Deserialize, Clone)]
2525
pub struct ProviderConfig {
26+
#[serde(default)]
2627
pub registry_ids: Vec<String>,
2728

29+
#[serde(default)]
2830
pub protocol_ids: Vec<String>,
2931

3032
pub services: HashMap<String, ServiceConfig>,

config/src/service.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub struct ServiceConfig {
3232
pub registry: String,
3333
pub serializer: String,
3434

35-
// #[serde(skip_serializing, skip_deserializing)]
35+
#[serde(default)]
3636
pub protocol_configs: HashMap<String, ProtocolConfig>,
3737
}
3838

dubbo/src/framework.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl Dubbo {
6565
.insert(name.to_string(), Url::from_url(url).unwrap());
6666
}
6767

68-
for (_, c) in conf.provider.services.iter() {
68+
for (service_name, c) in conf.provider.services.iter() {
6969
let u = if c.protocol_configs.is_empty() {
7070
let protocol = match conf.protocols.get(&c.protocol) {
7171
Some(v) => v.to_owned(),
@@ -74,7 +74,8 @@ impl Dubbo {
7474
continue;
7575
}
7676
};
77-
let protocol_url = format!("{}/{}", protocol.to_url(), c.name.clone(),);
77+
let protocol_url =
78+
format!("{}/{}/{}", protocol.to_url(), c.name.clone(), service_name);
7879
Url::from_url(&protocol_url)
7980
} else {
8081
let protocol = match c.protocol_configs.get(&c.protocol) {
@@ -84,7 +85,8 @@ impl Dubbo {
8485
continue;
8586
}
8687
};
87-
let protocol_url = format!("{}/{}", protocol.to_url(), c.name.clone(),);
88+
let protocol_url =
89+
format!("{}/{}/{}", protocol.to_url(), c.name.clone(), service_name);
8890
Url::from_url(&protocol_url)
8991
};
9092
tracing::info!("url: {:?}", u);

examples/greeter/dubbo.yaml

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
name: dubbo
2-
service:
3-
org.apache.dubbo.sample.tri.Greeter:
4-
version: 1.0.0
5-
group: test
6-
protocol: triple
7-
registry: ''
8-
serializer: json
9-
protocol_configs:
10-
triple:
11-
ip: 0.0.0.0
12-
port: '8888'
13-
name: triple
2+
provider:
3+
services:
4+
org.apache.dubbo.sample.tri.Greeter:
5+
version: 1.0.0
6+
group: test
7+
protocol: triple
8+
registry: 'zookeeper'
9+
serializer: json
10+
registries:
11+
zookeeper: zookeeper://localhost:2181/
1412
protocols:
1513
triple:
1614
ip: 0.0.0.0

0 commit comments

Comments
 (0)