From 5103c26d0cf01d3e5596c49bb10d5c0275ec6e76 Mon Sep 17 00:00:00 2001
From: vicanso <tree.xie@outlook.com>
Date: Sat, 23 Nov 2024 19:51:03 +0800
Subject: [PATCH] refactor: adjust get query from etcd connection uri

---
 src/config/etcd.rs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/config/etcd.rs b/src/config/etcd.rs
index 17ff297..981521d 100644
--- a/src/config/etcd.rs
+++ b/src/config/etcd.rs
@@ -14,6 +14,7 @@
 
 use super::{ConfigStorage, Error, LoadConfigOptions, Result};
 use super::{Observer, PingapConf};
+use crate::util;
 use async_trait::async_trait;
 use etcd_client::{Client, ConnectOptions, GetOptions, WatchOptions};
 use humantime::parse_duration;
@@ -53,28 +54,27 @@ impl EtcdStorage {
         let mut password = "".to_string();
         let mut options = ConnectOptions::default();
         let mut separation = false;
-        for item in query.split('&') {
-            if let Some((key, value)) = item.split_once('=') {
-                match key {
-                    "user" => user = value.to_string(),
-                    "password" => password = value.to_string(),
-                    "timeout" => {
-                        if let Ok(d) = parse_duration(value) {
-                            options = options.with_timeout(d);
-                        }
-                    },
-                    "connect_timeout" => {
-                        if let Ok(d) = parse_duration(value) {
-                            options = options.with_connect_timeout(d);
-                        }
-                    },
-                    "separation" => {
-                        separation = true;
-                    },
-                    _ => {},
-                }
+        for (key, value) in util::convert_query_map(&query) {
+            match key.as_str() {
+                "user" => user = value,
+                "password" => password = value,
+                "timeout" => {
+                    if let Ok(d) = parse_duration(&value) {
+                        options = options.with_timeout(d);
+                    }
+                },
+                "connect_timeout" => {
+                    if let Ok(d) = parse_duration(&value) {
+                        options = options.with_connect_timeout(d);
+                    }
+                },
+                "separation" => {
+                    separation = true;
+                },
+                _ => {},
             }
         }
+
         if !user.is_empty() && !password.is_empty() {
             options = options.with_user(user, password);
         };