Merge pull request #111 from nacos-group/dev

Update sample and readme
nacos-group · Jun 13, 2021 · 9577a69 · 9577a69
2 parents 3db7938 + eae5fe8
commit 9577a69
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# nacos-sdk-csharp 　　　　　   　　   　　　[中文](./README.zh-cn.md)
+# nacos-sdk-csharp 　　　　　   　　   　　　[中文](./README.zh-cn.md)
 
 csharp(dotnet core) implementation of [nacos](https://nacos.io/) OpenAPI.
 
@@ -71,7 +71,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
         "Group": "DEFAULT_GROUP"
       }
     ],    
-    "Tenant": "csharp-demo",
+    "Namespace": "csharp-demo",
     "ServerAddresses": [ "http://localhost:8848/" ],
     "UserName": "test2",
     "Password": "123456",

diff --git a/README.zh-cn.md b/README.zh-cn.md
@@ -1,4 +1,4 @@
-# nacos-sdk-csharp 　　　　   　　　　   　　[English](./README.md)
+# nacos-sdk-csharp 　　　　   　　　　   　　[English](./README.md)
 
 基于C#(dotnet core)实现 [nacos](https://nacos.io/) OpenAPI 的官方版本
 
@@ -72,7 +72,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
         "Group": "DEFAULT_GROUP"
       }
     ],    
-    "Tenant": "csharp-demo",
+    "Namespace": "csharp-demo",
     "ServerAddresses": [ "http://localhost:8848/" ],
     "UserName": "test2",
     "Password": "123456",

diff --git a/samples/MsConfigApp/Program.cs b/samples/MsConfigApp/Program.cs
@@ -1,4 +1,4 @@
-namespace MsConfigApp
+namespace MsConfigApp
 {
     using System.Collections.Generic;
     using Microsoft.AspNetCore.Hosting;
@@ -53,7 +53,7 @@ public static IHostBuilder CreateHostBuilder(string[] args, Serilog.ILogger logg
 
                      var dataId = c.GetValue<string>("NacosConfig:DataId");
                      var group = c.GetValue<string>("NacosConfig:Group");
-                     var tenant = c.GetValue<string>("NacosConfig:Tenant");
+                     var @namespace = c.GetValue<string>("NacosConfig:Namespace");
                      var optional = c.GetValue<bool>("NacosConfig:Optional");
                      var serverAddresses = c.GetSection("NacosConfig:ServerAddresses").Get<List<string>>();
 
@@ -71,7 +71,7 @@ public static IHostBuilder CreateHostBuilder(string[] args, Serilog.ILogger logg
                      {
                          x.DataId = dataId;
                          x.Group = group;
-                         x.Tenant = tenant;
+                         x.Namespace = @namespace;
                          x.Optional = optional;
                          x.ServerAddresses = serverAddresses;
                      });*/
@@ -82,4 +82,4 @@ public static IHostBuilder CreateHostBuilder(string[] args, Serilog.ILogger logg
                 })
             .UseSerilog();
     }
-}
+}
diff --git a/samples/MsConfigApp/appsettings.json b/samples/MsConfigApp/appsettings.json
@@ -15,7 +15,7 @@
     "Optional": false,
     "DataId": "demo",
     "Group": "DEFAULT_GROUP",
-    "Tenant": "cs",
+    "Namespace": "cs",
     "ServerAddresses": [ "http://localhost:8848/" ],
     "UserName": "",
     "Password": "",

diff --git a/src/Nacos.Microsoft.Extensions.Configuration/NacosV2ConfigurationProvider.cs b/src/Nacos.Microsoft.Extensions.Configuration/NacosV2ConfigurationProvider.cs
@@ -36,7 +36,7 @@ public NacosV2ConfigurationProvider(NacosV2ConfigurationSource configurationSour
             var options = Options.Create(new NacosSdkOptions()
             {
                 ServerAddresses = configurationSource.ServerAddresses,
-                Namespace = configurationSource.Tenant,
+                Namespace = configurationSource.GetNamespace(),
                 AccessKey = configurationSource.AccessKey,
                 ContextPath = configurationSource.ContextPath,
                 EndPoint = configurationSource.EndPoint,
@@ -111,7 +111,7 @@ public override void Load()
                             var config = _client.GetConfig(listener.DataId, listener.Group, 3000)
                                 .ConfigureAwait(false).GetAwaiter().GetResult();
 
-                            _configDict.AddOrUpdate($"{_configurationSource.Tenant}#{listener.Group}#{listener.DataId}", config, (x, y) => config);
+                            _configDict.AddOrUpdate($"{_configurationSource.GetNamespace()}#{listener.Group}#{listener.DataId}", config, (x, y) => config);
 
                             var data = _parser.Parse(config);
 
@@ -140,7 +140,7 @@ public override void Load()
                         var config = _client.GetConfig(_configurationSource.DataId, _configurationSource.Group, 3000)
                             .ConfigureAwait(false).GetAwaiter().GetResult();
 
-                        _configDict.AddOrUpdate($"{_configurationSource.Tenant}#{_configurationSource.Group}#{_configurationSource.DataId}", config, (x, y) => config);
+                        _configDict.AddOrUpdate($"{_configurationSource.GetNamespace()}#{_configurationSource.Group}#{_configurationSource.DataId}", config, (x, y) => config);
 
                         var data = _parser.Parse(config);
 
@@ -179,7 +179,7 @@ internal MsConfigListener(string dataId, string group, bool optional, NacosV2Con
                 this._optional = optional;
                 this._provider = provider;
                 this._logger = logger;
-                _key = $"{provider._configurationSource.Tenant}#{_group}#{_dataId}";
+                _key = $"{provider._configurationSource.GetNamespace()}#{_group}#{_dataId}";
             }
 
 

diff --git a/src/Nacos.Microsoft.Extensions.Configuration/NacosV2ConfigurationSource.cs b/src/Nacos.Microsoft.Extensions.Configuration/NacosV2ConfigurationSource.cs
@@ -3,6 +3,7 @@
     using global::Microsoft.Extensions.Configuration;
     using global::Microsoft.Extensions.Logging;
     using Nacos.Config;
+    using Nacos.V2.Utils;
     using System;
     using System.Collections.Generic;
 
@@ -34,6 +35,7 @@ public class NacosV2ConfigurationSource : Nacos.V2.NacosSdkOptions, IConfigurati
         /// <summary>
         /// Tenant information. It corresponds to the Namespace field in Nacos.
         /// </summary>
+        [Obsolete("please use Namespace to configure")]
         public string Tenant { get; set; }
 
         /// <summary>
@@ -55,5 +57,23 @@ public IConfigurationProvider Build(IConfigurationBuilder builder)
         {
             return new NacosV2ConfigurationProvider(this);
         }
+
+        public string GetNamespace()
+        {
+            if (Namespace.IsNotNullOrWhiteSpace())
+            {
+                return Namespace;
+            }
+#pragma warning disable CS0618
+            else if (Tenant.IsNotNullOrWhiteSpace())
+            {
+                return Tenant;
+            }
+#pragma warning restore CS0618
+            else
+            {
+                return string.Empty;
+            }
+        }
     }
 }