From c7a50c77642caf2827f9a3b69a29ce6786b2e217 Mon Sep 17 00:00:00 2001
From: Catcher Wong <catcher_hwq@outlook.com>
Date: Thu, 11 Jul 2024 09:19:04 +0800
Subject: [PATCH 1/4] Fix naming http signature (#297)

* fix namint http signature error

Signed-off-by: catcherwong <catcher_hwq@outlook.com>

* update version to 1.3.7

Signed-off-by: catcherwong <catcher_hwq@outlook.com>

---------

Signed-off-by: catcherwong <catcher_hwq@outlook.com>
---
 build/version.props                                      | 2 +-
 src/Nacos/V2/Common/Constants.cs                         | 2 +-
 src/Nacos/V2/Naming/Remote/Http/NamingHttpClientProxy.cs | 4 ++--
 src/Nacos/V2/Utils/StringUtil.cs                         | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/version.props b/build/version.props
index 38f02c7..843d724 100644
--- a/build/version.props
+++ b/build/version.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <NugetVersion>1.3.6</NugetVersion>
+        <NugetVersion>1.3.7</NugetVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/Nacos/V2/Common/Constants.cs b/src/Nacos/V2/Common/Constants.cs
index 6613b81..1e5524a 100644
--- a/src/Nacos/V2/Common/Constants.cs
+++ b/src/Nacos/V2/Common/Constants.cs
@@ -2,7 +2,7 @@
 {
     public class Constants
     {
-        public static string CLIENT_VERSION = "Nacos-CSharp-Client:v1.3.5";
+        public static string CLIENT_VERSION = "Nacos-CSharp-Client:v1.3.7";
 
         public const string ClientName = "NacosClient";
 
diff --git a/src/Nacos/V2/Naming/Remote/Http/NamingHttpClientProxy.cs b/src/Nacos/V2/Naming/Remote/Http/NamingHttpClientProxy.cs
index e0be324..27c93b2 100644
--- a/src/Nacos/V2/Naming/Remote/Http/NamingHttpClientProxy.cs
+++ b/src/Nacos/V2/Naming/Remote/Http/NamingHttpClientProxy.cs
@@ -493,7 +493,7 @@ private string InitParams(Dictionary<string, string> dict, Dictionary<string, st
             {
                 foreach (var item in dict)
                 {
-                    builder.Append($"{item.Key}={item.Value}&");
+                    builder.Append($"{item.Key}={item.Value.UrlEncode()}&");
                 }
             }
 
@@ -501,7 +501,7 @@ private string InitParams(Dictionary<string, string> dict, Dictionary<string, st
             {
                 foreach (var item in body)
                 {
-                    builder.Append($"{item.Key}={item.Value}&");
+                    builder.Append($"{item.Key}={item.Value.UrlEncode()}&");
                 }
             }
 
diff --git a/src/Nacos/V2/Utils/StringUtil.cs b/src/Nacos/V2/Utils/StringUtil.cs
index feb02dd..88e1ca3 100644
--- a/src/Nacos/V2/Utils/StringUtil.cs
+++ b/src/Nacos/V2/Utils/StringUtil.cs
@@ -12,5 +12,8 @@ public static bool IsNullOrWhiteSpace(this string str)
 
         public static bool IsNotNullOrWhiteSpace(this string str)
             => !string.IsNullOrWhiteSpace(str);
+
+        public static string UrlEncode(this string str)
+            => System.Net.WebUtility.UrlEncode(str);
     }
 }

From e6cf34bbfedcea35c952925ddd825a3d37bc667c Mon Sep 17 00:00:00 2001
From: memoyu <mmy6076@outlook.com>
Date: Thu, 25 Jul 2024 09:06:35 +0800
Subject: [PATCH 2/4] upgrade deps packages #302 (#304)

---
 src/Nacos/Nacos.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Nacos/Nacos.csproj b/src/Nacos/Nacos.csproj
index 31177b5..a28a387 100644
--- a/src/Nacos/Nacos.csproj
+++ b/src/Nacos/Nacos.csproj
@@ -48,8 +48,8 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.21.2" />
-    <PackageReference Include="Grpc.Core" Version="2.46.3" />
+    <PackageReference Include="Google.Protobuf" Version="3.27.2" />
+    <PackageReference Include="Grpc.Core" Version="2.46.6" />
     <!--<PackageReference Include="Grpc.Net.Client" Version="2.33.1" />-->
     <!--<Protobuf Include="V2\protos\nacos_grpc_service.proto" GrpcServices="Client" />-->
     <!--<PackageReference Include="Grpc.Tools" Version="2.36.1" PrivateAssets="All" />-->

From 5f14c1d7d4ee99f49ccbbbce6d9d11ba15e8cb98 Mon Sep 17 00:00:00 2001
From: memoyu <mmy6076@outlook.com>
Date: Sun, 11 Aug 2024 23:07:16 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9Ablock=20under=20multiple=20list?=
 =?UTF-8?q?eners=20to=20re-listen=20#300=20#306=20#307=20(#308)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Nacos/V2/Config/Impl/ConfigRpcTransportClient.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Nacos/V2/Config/Impl/ConfigRpcTransportClient.cs b/src/Nacos/V2/Config/Impl/ConfigRpcTransportClient.cs
index 8d14133..a965e83 100644
--- a/src/Nacos/V2/Config/Impl/ConfigRpcTransportClient.cs
+++ b/src/Nacos/V2/Config/Impl/ConfigRpcTransportClient.cs
@@ -454,7 +454,7 @@ protected async override Task ExecuteConfigListen()
             }
 
             if (hasChangedKeys)
-               await NotifyListenConfig().ConfigureAwait(false);
+                await NotifyListenConfig().ConfigureAwait(false);
         }
 
         private async Task RefreshContentAndCheck(string groupKey, bool notify)
@@ -501,8 +501,13 @@ private void RemoveCache(string dataId, string group, string tenant)
 
         protected override Task NotifyListenConfig()
         {
-            _listenExecutebell.Add(_bellItem);
-            return Task.CompletedTask;
+            return Task.Factory.StartNew(async () =>
+            {
+                while (!_listenExecutebell.TryAdd(_bellItem))
+                {
+                    await Task.Delay(500).ConfigureAwait(false);
+                }
+            });
         }
     }
 }

From 3ea0fdef4650988b5760cd396bb5660f41807a40 Mon Sep 17 00:00:00 2001
From: Catcher Wong <catcher_hwq@outlook.com>
Date: Tue, 20 Aug 2024 10:00:45 +0800
Subject: [PATCH 4/4] update version to 1.3.8 (#311)

Signed-off-by: catcherwong <catcher_hwq@outlook.com>
---
 build/version.props              | 2 +-
 src/Nacos/V2/Common/Constants.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/version.props b/build/version.props
index 843d724..841fa6d 100644
--- a/build/version.props
+++ b/build/version.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <NugetVersion>1.3.7</NugetVersion>
+        <NugetVersion>1.3.8</NugetVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/Nacos/V2/Common/Constants.cs b/src/Nacos/V2/Common/Constants.cs
index 1e5524a..d1fb1b6 100644
--- a/src/Nacos/V2/Common/Constants.cs
+++ b/src/Nacos/V2/Common/Constants.cs
@@ -2,7 +2,7 @@
 {
     public class Constants
     {
-        public static string CLIENT_VERSION = "Nacos-CSharp-Client:v1.3.7";
+        public static string CLIENT_VERSION = "Nacos-CSharp-Client:v1.3.8";
 
         public const string ClientName = "NacosClient";