Merge pull request apache#52 from robberphex/ci

add ci for example

Author: AlbumenJ

.github/workflows/github-actions.yml

@@ -4,14 +4,14 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: ["*"]
   pull_request:
-    branches: [ main ]
+    branches: ["*"]
 
   workflow_dispatch:
 
 jobs:
- check:
+  check:
     name: check dubbo-rust project
     runs-on: ${{ matrix.os }}
     strategy:
@@ -21,28 +21,63 @@ jobs:
 
     env:
       RUSTFLAGS: "-D warnings"
-      
+
     steps:
-    - uses: actions/checkout@main
-    - uses: actions-rs/toolchain@v1
-      with:
+      - uses: actions/checkout@main
+      - uses: actions-rs/toolchain@v1
+        with:
           toolchain: ${{ matrix.rust }}
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-    - run: cargo check
-    
- fmt:
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: cargo check
+
+  fmt:
     name: Rustfmt
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
         rust: [stable]
-        
+
     steps:
       - uses: actions/checkout@main
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ matrix.rust }}
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
+
+  example-greeter:
+    name: example/greeter
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+      - run: cargo build
+        working-directory: examples/greeter
+      - name: example greeter
+        run: |
+          ../../target/debug/greeter-server &
+          sleep 1s ;
+          ../../target/debug/greeter-client
+        working-directory: examples/greeter

config/src/config.rs

@@ -37,11 +37,14 @@ lazy_static! {
 pub struct RootConfig {
     pub name: String,
 
-    #[serde(skip_serializing, skip_deserializing)]
+    #[serde(default)]
     pub service: HashMap<String, ServiceConfig>,
     pub protocols: HashMap<String, ProtocolConfig>,
+
+    #[serde(default)]
     pub registries: HashMap<String, String>,
 
+    #[serde(default)]
     pub provider: ProviderConfig,
 
     #[serde(skip_serializing, skip_deserializing)]

config/src/provider.rs

@@ -23,8 +23,10 @@ use super::service::ServiceConfig;
 
 #[derive(Debug, Default, Serialize, Deserialize, Clone)]
 pub struct ProviderConfig {
+    #[serde(default)]
     pub registry_ids: Vec<String>,
 
+    #[serde(default)]
     pub protocol_ids: Vec<String>,
 
     pub services: HashMap<String, ServiceConfig>,

config/src/service.rs

@@ -32,7 +32,7 @@ pub struct ServiceConfig {
     pub registry: String,
     pub serializer: String,
 
-    // #[serde(skip_serializing, skip_deserializing)]
+    #[serde(default)]
     pub protocol_configs: HashMap<String, ProtocolConfig>,
 }
 

dubbo/src/framework.rs

@@ -65,7 +65,7 @@ impl Dubbo {
                 .insert(name.to_string(), Url::from_url(url).unwrap());
         }
 
-        for (_, c) in conf.provider.services.iter() {
+        for (service_name, c) in conf.provider.services.iter() {
             let u = if c.protocol_configs.is_empty() {
                 let protocol = match conf.protocols.get(&c.protocol) {
                     Some(v) => v.to_owned(),
@@ -74,7 +74,8 @@ impl Dubbo {
                         continue;
                     }
                 };
-                let protocol_url = format!("{}/{}", protocol.to_url(), c.name.clone(),);
+                let protocol_url =
+                    format!("{}/{}/{}", protocol.to_url(), c.name.clone(), service_name);
                 Url::from_url(&protocol_url)
             } else {
                 let protocol = match c.protocol_configs.get(&c.protocol) {
@@ -84,7 +85,8 @@ impl Dubbo {
                         continue;
                     }
                 };
-                let protocol_url = format!("{}/{}", protocol.to_url(), c.name.clone(),);
+                let protocol_url =
+                    format!("{}/{}/{}", protocol.to_url(), c.name.clone(), service_name);
                 Url::from_url(&protocol_url)
             };
             tracing::info!("url: {:?}", u);