版本升级and代码升级

Author: liguoliang

demo/ApiGatewayDemo/appsettings.json

@@ -8,11 +8,11 @@
   },
   "AllowedHosts": "*",
   "nacos": {
-    "ServerAddresses": [ "http://192.168.219.1:8848" ],
+    "ServerAddresses": [ "http://127.0.0.1:8848" ],
     "ServiceName": "apigateway",
     "DefaultTimeOut": 15000,
     //×Ô¶¨ÒåNamespaceµÄId
-    "Namespace": "2ae308e2-7e8a-4602-9d1c-56508a3e263c",
+    "Namespace": "01761089-727d-49cb-9abe-fbe647f83927",
     "GroupName": "DEFAULT_GROUP",
     "ClusterName": "DEFAULT",
     "ListenInterval": 1000,

demo/ProductApi/ProductApi.csproj

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
-    <PackageReference Include="nacos-sdk-csharp.AspNetCore" Version="1.1.0-alpha20210426120755" />
+    <PackageReference Include="nacos-sdk-csharp.AspNetCore" Version="1.2.2" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
   </ItemGroup>
   <ItemGroup>

demo/ProductApi/appsettings.json

@@ -8,11 +8,11 @@
   },
   "AllowedHosts": "*",
   "nacos": {
-    "ServerAddresses": [ "http://192.168.219.1:8848" ],
+    "ServerAddresses": [ "http://127.0.0.1:8848" ],
     "ServiceName": "productservice",
     "DefaultTimeOut": 15000,
     //×Ô¶¨ÒåNamespaceµÄId
-    "Namespace": "2ae308e2-7e8a-4602-9d1c-56508a3e263c",
+    "Namespace": "01761089-727d-49cb-9abe-fbe647f83927",
     "GroupName": "DEFAULT_GROUP",
     "ClusterName": "DEFAULT",
     "ListenInterval": 1000,

src/Ocelot.Provider.Nacos/NacosClient/LoadBalance/ILBStrategy.cs

@@ -68,28 +68,23 @@ public class NacosAspNetOptions : NacosSdkOptions
         /// </summary>
         public bool Secure { get; set; } = false;
 
-        /// <summary>
-        /// Load Balance Strategy
-        /// </summary>
-        public string LBStrategy { get; set; } = LBStrategyName.WeightRandom.ToString();
-
-        public NacosSdkOptions BuildSdkOptions()
+        public System.Action<NacosSdkOptions> BuildSdkOptions()
         {
-            return new NacosSdkOptions
+            return x =>
             {
-                AccessKey = this.AccessKey,
-                ConfigUseRpc = this.ConfigUseRpc,
-                ContextPath = this.ContextPath,
-                DefaultTimeOut = this.DefaultTimeOut,
-                EndPoint = this.EndPoint,
-                ListenInterval = this.ListenInterval,
-                Namespace = this.Namespace,
-                NamingLoadCacheAtStart = this.NamingLoadCacheAtStart,
-                NamingUseRpc = this.NamingUseRpc,
-                Password = this.Password,
-                SecretKey = this.SecretKey,
-                ServerAddresses = this.ServerAddresses,
-                UserName = this.UserName,
+                x.AccessKey = this.AccessKey;
+                x.ConfigUseRpc = this.ConfigUseRpc;
+                x.ContextPath = this.ContextPath;
+                x.DefaultTimeOut = this.DefaultTimeOut;
+                x.EndPoint = this.EndPoint;
+                x.ListenInterval = this.ListenInterval;
+                x.Namespace = this.Namespace;
+                x.NamingLoadCacheAtStart = this.NamingLoadCacheAtStart;
+                x.NamingUseRpc = this.NamingUseRpc;
+                x.Password = this.Password;
+                x.SecretKey = this.SecretKey;
+                x.ServerAddresses = this.ServerAddresses;
+                x.UserName = this.UserName;
             };
         }
     }

src/Ocelot.Provider.Nacos/NacosClient/LoadBalance/LBStrategyName.cs

@@ -16,10 +16,11 @@ public static class ServiceCollectionExtensions
         /// </summary>
         /// <param name="services">services.</param>
         /// <param name="configuration">configuration</param>
+        /// <param name="section">section, default is nacos</param>
         /// <returns>IServiceCollection</returns>
-        public static IServiceCollection AddNacosAspNet(this IServiceCollection services, IConfiguration configuration)
+        public static IServiceCollection AddNacosAspNet(this IServiceCollection services, IConfiguration configuration, string section = "nacos")
         {
-            services.Configure<NacosAspNetOptions>(configuration.GetSection("nacos"));
+            services.Configure<NacosAspNetOptions>(configuration.GetSection(section));
             services.AddNacosV2Naming(configuration);
             services.AddSingleton<RegSvcBgTask>();
 
@@ -39,7 +40,9 @@ public static IServiceCollection AddNacosAspNet(this IServiceCollection services
 
             var options = new NacosAspNetOptions();
             optionsAccs.Invoke(options);
-            services.AddNacosV2Naming(x => options.BuildSdkOptions());
+
+            services.AddNacosV2Naming(options.BuildSdkOptions());
+
             services.AddSingleton<RegSvcBgTask>();
 
             return services;