修复非默认命名空间无法发现的问题

Author: liguoliang

demo/ApiGatewayDemo/ApiGatewayDemo.csproj

@@ -7,7 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Ocelot" Version="17.0.0" />
-    <PackageReference Include="Ocelot.Provider.Nacos" Version="1.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Ocelot.Provider.Nacos\Ocelot.Provider.Nacos.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Update="ocelotconfig.json">

demo/ApiGatewayDemo/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "ApiGatewayDemo": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://*:5001",
+      "applicationUrl": "http://0.0.0.0:5001",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

demo/ProductApi/Properties/launchSettings.json

@@ -18,7 +18,7 @@
     "ProductApi": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://*:5002",
+      "applicationUrl": "http://0.0.0.0:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/Ocelot.Provider.Nacos/Nacos.cs

@@ -5,29 +5,44 @@
 using Ocelot.Provider.Nacos.NacosClient;
 using Ocelot.ServiceDiscovery.Providers;
 using Ocelot.Values;
+using Nacos;
+using Microsoft.Extensions.Options;
 
 namespace Ocelot.Provider.Nacos
 {
     public class Nacos : IServiceDiscoveryProvider
     {
-        private readonly INacosServerManager _client;
+        private readonly INacosNamingClient _client;
         private readonly string _serviceName;
+        private readonly string _groupName;
+        private readonly string _clusters;
+        private readonly string _namespaceId;
 
-        public Nacos(string serviceName, INacosServerManager client)
+        public Nacos(string serviceName, INacosNamingClient client, IOptions<NacosAspNetCoreOptions> options)
         {
-            _client = client;
             _serviceName = serviceName;
+            _client = client;
+            _groupName = string.IsNullOrWhiteSpace(options.Value.GroupName) ?
+                "DEFAULT_GROUP" : options.Value.GroupName;
+            _clusters = string.IsNullOrWhiteSpace(options.Value.ClusterName) ? "DEFAULT" : options.Value.ClusterName;
+            _namespaceId = string.IsNullOrWhiteSpace(options.Value.Namespace) ? "public" : options.Value.Namespace;
         }
 
         public async Task<List<Service>> Get()
         {
             var services = new List<Service>();
 
-            var instances = await _client.GetServerAsync(_serviceName);
+            var instances = await _client.ListInstancesAsync(new ListInstancesRequest
+            {
+                ServiceName = _serviceName,
+                GroupName = _groupName,
+                NamespaceId = _namespaceId,
+                HealthyOnly = true,
+            });
 
-            if (instances != null && instances.Any())
+            if (instances != null && instances.Hosts!=null && instances.Hosts.Any())
             {
-                services.AddRange(instances.Select(i => new Service(i.InstanceId, new ServiceHostAndPort(i.Ip, i.Port), "", "", new List<string>())));
+                services.AddRange(instances.Hosts.Select(i => new Service(i.InstanceId, new ServiceHostAndPort(i.Ip, i.Port), "", "", new List<string>())));
             }
 
             return await Task.FromResult(services);

src/Ocelot.Provider.Nacos/NacosProviderFactory.cs

@@ -2,17 +2,21 @@
 using Ocelot.Provider.Nacos.NacosClient;
 using Ocelot.ServiceDiscovery;
 using Microsoft.Extensions.DependencyInjection;
+using Nacos.V2;
+using Microsoft.Extensions.Options;
+using Nacos;
 
 namespace Ocelot.Provider.Nacos
 {
     public static class NacosProviderFactory
     {
         public static ServiceDiscoveryFinderDelegate Get = (provider, config, route) =>
         {
-            var client = provider.GetService<INacosServerManager>();
+            var client = provider.GetService<INacosNamingClient>();
             if (config.Type?.ToLower() == "nacos" && client != null)
             {
-                return new Nacos(route.ServiceName, client);
+                var option = provider.GetService<IOptions<NacosAspNetCoreOptions>>();
+                return new Nacos(route.ServiceName, client, option);
             }
             return null;
         };

src/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Ocelot" Version="17.0.0" />   
-    <PackageReference Include="nacos-sdk-csharp-unofficial" Version="0.8.0" />
+    <PackageReference Include="nacos-sdk-csharp" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
     <PackageReference Include="EasyCaching.InMemory" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />