拆分，重构GrpcExtension

yileicn · Aug 31, 2019 · 8eb4bdc · 8eb4bdc
1 parent a2fca33
commit 8eb4bdc
Show file tree

Hide file tree

Showing 95 changed files with 1,926 additions and 1,303 deletions.
diff --git a/Grpc.Extensions.sln b/Grpc.Extensions.sln
@@ -27,6 +27,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Math", "examples\CodeFirst\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathClient", "examples\CodeFirst\MathClient\MathClient.csproj", "{EE3555D8-A6BA-4340-9F56-121B24C48E0C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.Extension.Client", "src\Grpc.Extension.Client\Grpc.Extension.Client.csproj", "{0F3671E3-7843-48D5-ABF0-B5237CC56B45}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.Extension.Common", "src\Grpc.Extension.Common\Grpc.Extension.Common.csproj", "{BE4E2E14-F62A-42D7-A2A4-A6629BAC6E73}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.Extension.Discovery", "src\Grpc.Extension.Discovery\Grpc.Extension.Discovery.csproj", "{89C1E590-1AC9-4107-A5EF-CB66410DCF32}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.Extension.Abstract", "src\Grpc.Extension.Abstract\Grpc.Extension.Abstract.csproj", "{ABCD8408-7BED-431F-BBC2-E880DC597EB5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,6 +73,22 @@ Global
 		{EE3555D8-A6BA-4340-9F56-121B24C48E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EE3555D8-A6BA-4340-9F56-121B24C48E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE3555D8-A6BA-4340-9F56-121B24C48E0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F3671E3-7843-48D5-ABF0-B5237CC56B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F3671E3-7843-48D5-ABF0-B5237CC56B45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F3671E3-7843-48D5-ABF0-B5237CC56B45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F3671E3-7843-48D5-ABF0-B5237CC56B45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE4E2E14-F62A-42D7-A2A4-A6629BAC6E73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE4E2E14-F62A-42D7-A2A4-A6629BAC6E73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE4E2E14-F62A-42D7-A2A4-A6629BAC6E73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE4E2E14-F62A-42D7-A2A4-A6629BAC6E73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89C1E590-1AC9-4107-A5EF-CB66410DCF32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89C1E590-1AC9-4107-A5EF-CB66410DCF32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89C1E590-1AC9-4107-A5EF-CB66410DCF32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89C1E590-1AC9-4107-A5EF-CB66410DCF32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABCD8408-7BED-431F-BBC2-E880DC597EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABCD8408-7BED-431F-BBC2-E880DC597EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABCD8408-7BED-431F-BBC2-E880DC597EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABCD8408-7BED-431F-BBC2-E880DC597EB5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Makefile b/Makefile
@@ -0,0 +1,27 @@
+NUGET_ADDR = http://192.168.8.11:16969
+NUGET_FILES=`ls ./nupkgs/*.nupkg`
+
+build:clean 
+	-dotnet pack ./src/Grpc.Extension.Abstract/Grpc.Extension.Abstract.csproj -c Release -o ./../../nupkgs
+	-dotnet pack ./src/Grpc.Extension.Discovery/Grpc.Extension.Discovery.csproj -c Release -o ./../../nupkgs
+	-dotnet pack ./src/Grpc.Extension.Common/Grpc.Extension.Common.csproj -c Release -o ./../../nupkgs
+	-dotnet pack ./src/Grpc.Extension.Client/Grpc.Extension.Client.csproj -c Release -o ./../../nupkgs
+	-dotnet pack ./src/Grpc.Extension/Grpc.Extension.csproj -c Release -o ./../../nupkgs
+
+push:build
+	#method one
+	#-dotnet nuget push ./nupkgs/*.nupkg -k ${NUGET_KEY} -s ${NUGET_ADDR}
+	#-dotnet nuget push ./nupkgs/**/*.nupkg -k ${NUGET_KEY} -s ${NUGET_ADDR}
+
+	#method two
+	for file in $(NUGET_FILES);\
+	do \
+	    echo $$file;\
+	    dotnet nuget push $$file -k ${NUGET_KEY} -s ${NUGET_ADDR};\
+    done;
+
+clean:
+	-rm -rf nupkgs
+
+test:
+	echo ${HOME_PATA}
diff --git a/examples/CodeFirst/Math/MathGrpc.cs b/examples/CodeFirst/Math/MathGrpc.cs
@@ -1,10 +1,7 @@
 using Grpc.Core;
 using Grpc.Core.Utils;
-using Grpc.Extension.BaseService;
+using Grpc.Extension.Abstract;
 using Math.Model;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Math

diff --git a/examples/CodeFirst/MathServer/GrpcHostServiceV2.cs b/examples/CodeFirst/MathServer/GrpcHostServiceV2.cs
@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Grpc.Core;
 using Grpc.Extension;
-using Grpc.Extension.Internal;
-using Grpc.Extension.Model;
+using Grpc.Extension.Abstract.Model;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 

diff --git a/examples/CodeFirst/MathServer/MathServer.csproj b/examples/CodeFirst/MathServer/MathServer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/examples/CodeFirst/MathServer/Middlewares/JaegerTracingMiddleware.cs b/examples/CodeFirst/MathServer/Middlewares/JaegerTracingMiddleware.cs
@@ -1,13 +1,14 @@
 using Grpc.Core;
 using Grpc.Core.Interceptors;
-using Grpc.Extension.Interceptors;
 using Grpc.Extension.Common;
 using OpenTracing.Util;
 using System;
 using System.Threading.Tasks;
 using System.Linq;
 using Jaeger;
 using OpenTracing;
+using Grpc.Extension.Client.Interceptors;
+using Grpc.Extension.Interceptors;
 
 namespace MathServer.Middlewares
 {

diff --git a/examples/CodeFirst/MathServer/Program.cs b/examples/CodeFirst/MathServer/Program.cs
@@ -1,10 +1,7 @@
 using System;
 using System.IO;
 using Grpc.Extension;
-using Grpc.Extension.BaseService;
-using Math;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 

diff --git a/examples/CodeFirst/MathServer/ServiceCollectionExtension.cs b/examples/CodeFirst/MathServer/ServiceCollectionExtension.cs
@@ -1,20 +1,8 @@
 using Grpc.Extension;
-using Grpc.Extension.BaseService;
-using Grpc.Extension.Interceptors;
-using Jaeger;
-using Jaeger.Reporters;
-using Jaeger.Samplers;
-using Jaeger.Senders;
+using Grpc.Extension.Abstract;
 using Math;
-using MathServer.Middlewares;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using OpenTracing;
-using OpenTracing.Util;
-using System;
-using System.Collections.Generic;
-using System.Text;
+
 
 namespace MathServer
 {

diff --git a/examples/CodeFirst/MathServer/config/appsettings.json b/examples/CodeFirst/MathServer/config/appsettings.json
@@ -1,10 +1,10 @@
 {
   "GrpcServer": {
     "ServiceAddress": "192.168.*.*:",
-    "ConsulUrl": "http://192.168.8.6:8500",
-    "ConsulServiceName": "Math.Test",
-    "ConsulTTLInterval": 10,
-    "ConsulTags": "v-1.0.0.1",
+    "DiscoveryUrl": "http://192.168.8.6:8500",
+    "DiscoveryServiceName": "Math.Test",
+    "DiscoveryTTLInterval": 10,
+    "DiscoveryServiceTags": "v-1.0.0.1",
     "DefaultErrorCode": 4300000,
     "Jaeger": {
       "AgentIp": "192.168.8.11",

diff --git a/examples/Greeter/GreeterClient/GreeterClient.csproj b/examples/Greeter/GreeterClient/GreeterClient.csproj
@@ -33,8 +33,8 @@
     <Externalconsole>true</Externalconsole>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AspectCore.Extensions.Reflection, Version=1.0.1.0, Culture=neutral, PublicKeyToken=2ab7daa5defcf11f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\AspectCore.Extensions.Reflection.1.0.1\lib\net45\AspectCore.Extensions.Reflection.dll</HintPath>
+    <Reference Include="AspectCore.Extensions.Reflection, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2ab7daa5defcf11f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\AspectCore.Extensions.Reflection.1.1.0\lib\net45\AspectCore.Extensions.Reflection.dll</HintPath>
     </Reference>
     <Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath>
@@ -61,6 +61,9 @@
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll</HintPath>
     </Reference>
@@ -120,9 +123,13 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Grpc.Extension\Grpc.Extension.csproj">
-      <Project>{3340E08A-22AA-4024-8D77-03B7CB5DC341}</Project>
-      <Name>Grpc.Extension</Name>
+    <ProjectReference Include="..\..\..\src\Grpc.Extension.Abstract\Grpc.Extension.Abstract.csproj">
+      <Project>{abcd8408-7bed-431f-bbc2-e880dc597eb5}</Project>
+      <Name>Grpc.Extension.Abstract</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Grpc.Extension.Client\Grpc.Extension.Client.csproj">
+      <Project>{0f3671e3-7843-48d5-abf0-b5237cc56b45}</Project>
+      <Name>Grpc.Extension.Client</Name>
     </ProjectReference>
     <ProjectReference Include="..\Greeter\Greeter.csproj">
       <Project>{724DFC8C-4B57-4C3F-811C-0463BE2A2829}</Project>
@@ -134,9 +141,6 @@
     <None Include="config\appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="config\hostsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="..\..\..\packages\Grpc.Core.1.19.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\packages\Grpc.Core.1.19.0\build\net45\Grpc.Core.targets')" />

diff --git a/examples/Greeter/GreeterClient/Program.cs b/examples/Greeter/GreeterClient/Program.cs
@@ -15,9 +15,8 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Grpc.Extension;
-using Grpc.Extension.Interceptors;
-using Grpc.Extension.Model;
+using Grpc.Extension.Abstract.Model;
+using Grpc.Extension.Client;
 using Helloworld;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -34,14 +33,20 @@ public static void Main(string[] args)
             var config = configBuilder.SetBasePath(configPath).AddJsonFile("appsettings.json", false, true).Build();
             //使用依赖注入
             var services = new ServiceCollection()
-                .AddGrpcClientExtensions((log)=> {
-                    log.LoggerMonitor = (msg,type) => Console.WriteLine(GetLogTypeName(type) + ":"+ msg);
-                    log.LoggerError = (ex,type) => Console.WriteLine(GetLogTypeName(type) + ":" + ex);
-                })//注入GrpcClientExtensions
+                .AddGrpcClientExtensions()//注入GrpcClientExtensions
                 .AddClientCallTimeout(10)//注入客户端中间件
-                .AddGrpcClient<Greeter.GreeterClient>(config["ConsulUrl"], "Greeter.Test");//注入grpc client
+                .AddGrpcClient<Greeter.GreeterClient>("Greeter.Test");//注入grpc client
+            //注入配制
+            services.AddSingleton<IConfiguration>(config);
             var provider = services.BuildServiceProvider();
-
+            //配制GrpcClientApp
+            var clientApp = provider.GetService<GrpcClientApp>();
+            clientApp.UseLogger((log) =>
+                {
+                    log.LoggerMonitor = (msg, type) => Console.WriteLine(GetLogTypeName(type) + ":" + msg);
+                    log.LoggerError = (ex, type) => Console.WriteLine(GetLogTypeName(type) + ":" + ex);
+                }).Run();
+
             //从容器获取client
             var client = provider.GetService<Greeter.GreeterClient>();
             //StreamTest(client).Wait();

diff --git a/examples/Greeter/GreeterClient/config/appsettings.json b/examples/Greeter/GreeterClient/config/appsettings.json
@@ -1,3 +1,7 @@
 {
-  "ConsulUrl": "http://192.168.8.6:8500"
+  "GrpcClient": {
+    "DiscoveryUrl": "http://192.168.8.6:8500",
+    "ServiceAddressCacheTime": 10,
+    "DefaultErrorCode": 4200000
+  }  
 }
diff --git a/examples/Greeter/GreeterClient/packages.config b/examples/Greeter/GreeterClient/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AspectCore.Extensions.Reflection" version="1.0.1" targetFramework="net461" />
+  <package id="AspectCore.Extensions.Reflection" version="1.1.0" targetFramework="net461" />
   <package id="Consul" version="0.7.2.6" targetFramework="net461" />
   <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
   <package id="Grpc" version="1.19.0" targetFramework="net461" />
@@ -10,6 +10,7 @@
   <package id="Microsoft.Extensions.Caching.Memory" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.Extensions.Configuration.FileExtensions" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.Extensions.Configuration.Json" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net461" />

diff --git a/examples/Greeter/GreeterServer/GreeterImpl.cs b/examples/Greeter/GreeterServer/GreeterImpl.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using GreeterServer.Common;

diff --git a/examples/Greeter/GreeterServer/GreeterServer.csproj b/examples/Greeter/GreeterServer/GreeterServer.csproj
@@ -33,8 +33,8 @@
     <Externalconsole>true</Externalconsole>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AspectCore.Extensions.Reflection, Version=1.0.1.0, Culture=neutral, PublicKeyToken=2ab7daa5defcf11f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\AspectCore.Extensions.Reflection.1.0.1\lib\net45\AspectCore.Extensions.Reflection.dll</HintPath>
+    <Reference Include="AspectCore.Extensions.Reflection, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2ab7daa5defcf11f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\AspectCore.Extensions.Reflection.1.1.0\lib\net45\AspectCore.Extensions.Reflection.dll</HintPath>
     </Reference>
     <Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath>
@@ -157,6 +157,14 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Grpc.Extension.Abstract\Grpc.Extension.Abstract.csproj">
+      <Project>{abcd8408-7bed-431f-bbc2-e880dc597eb5}</Project>
+      <Name>Grpc.Extension.Abstract</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Grpc.Extension.Client\Grpc.Extension.Client.csproj">
+      <Project>{0f3671e3-7843-48d5-abf0-b5237cc56b45}</Project>
+      <Name>Grpc.Extension.Client</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\src\Grpc.Extension\Grpc.Extension.csproj">
       <Project>{3340e08a-22aa-4024-8d77-03b7cb5dc341}</Project>
       <Name>Grpc.Extension</Name>

diff --git a/examples/Greeter/GreeterServer/GrpcHostServiceV2.cs b/examples/Greeter/GreeterServer/GrpcHostServiceV2.cs
@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Grpc.Core;
 using Grpc.Extension;
-using Grpc.Extension.Interceptors;
-using Grpc.Extension.Internal;
 using Helloworld;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;

diff --git a/examples/Greeter/GreeterServer/Middlewares/RequestServicesMiddleware.cs b/examples/Greeter/GreeterServer/Middlewares/RequestServicesMiddleware.cs
@@ -1,7 +1,6 @@
 using Grpc.Core;
 using Microsoft.Extensions.DependencyInjection;
 using System.Threading.Tasks;
-using Grpc.Core.Interceptors;
 using Grpc.Extension.Interceptors;
 using GreeterServer.Common;
 

diff --git a/examples/Greeter/GreeterServer/Program.cs b/examples/Greeter/GreeterServer/Program.cs
@@ -17,7 +17,7 @@
 using GreeterServer.Common;
 using GreeterServer.Middlewares;
 using Grpc.Extension;
-using Grpc.Extension.Interceptors;
+using Grpc.Extension.Client;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -55,7 +55,7 @@ public static IHost BuildHost(string[] args)
                     services.AddGrpcExtensions(); //×¢ÈëGrpcExtensions
                     services.AddServerInterceptor<RequestServicesMiddleware>();
                     services.AddClientMonitor();
-                    services.AddGrpcClient<MathGrpc.MathGrpc.MathGrpcClient>(ctx.Configuration["GrpcServer:ConsulUrl"], "Math.Test");
+                    services.AddGrpcClient<MathGrpc.MathGrpc.MathGrpcClient>("Math.Test");
                     services.AddHostedService<GrpcHostServiceV2>();
                 });
             return host.Build();

diff --git a/examples/Greeter/GreeterServer/config/appsettings.json b/examples/Greeter/GreeterServer/config/appsettings.json
@@ -1,10 +1,10 @@
 {
   "GrpcServer": {
     "ServiceAddress": "192.168.*.*:",
-    "ConsulUrl": "http://192.168.8.6:8500",
-    "ConsulServiceName": "Greeter.Test",
-    "ConsulTTLInterval": 10,
-    "ConsulTags": "v-1.0.0.1",
+    "DiscoveryUrl": "http://192.168.8.6:8500",
+    "DiscoveryServiceName": "Greeter.Test",
+    "DiscoveryTTLInterval": 10,
+    "DiscoveryServiceTags": "v-1.0.0.1",
     "DefaultErrorCode": 4200000
   }
 }
diff --git a/examples/Greeter/GreeterServer/packages.config b/examples/Greeter/GreeterServer/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AspectCore.Extensions.Reflection" version="1.0.1" targetFramework="net461" />
+  <package id="AspectCore.Extensions.Reflection" version="1.1.0" targetFramework="net461" />
   <package id="Consul" version="0.7.2.6" targetFramework="net461" />
   <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
   <package id="Grpc.Core" version="1.19.0" targetFramework="net461" />

diff --git a/....Extension/Discovery/IServiceDiscovery.cs → ...n.Abstract/Discovery/IServiceDiscovery.cs b/....Extension/Discovery/IServiceDiscovery.cs → ...n.Abstract/Discovery/IServiceDiscovery.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Grpc.Extension.Discovery
+namespace Grpc.Extension.Abstract.Discovery
 {
     /// <summary>
     /// 服务发现
@@ -12,7 +12,8 @@ public interface IServiceDiscovery
         /// </summary>
         /// <param name="serviceName"></param>
         /// <param name="discoveryUrl"></param>
+        /// <param name="serviceTag"></param>
         /// <returns></returns>
-        List<string> GetEndpoints(string serviceName, string discoveryUrl);
+        List<string> GetEndpoints(string serviceName, string discoveryUrl, string serviceTag);
     }
 }