添加自定义请求path

Author: liguoliang

demo/Test.Client/Program.cs

@@ -27,12 +27,13 @@ static async Task Main(string[] args)
             IServiceCollection services = new ServiceCollection();
             services.AddLogging().AddDotNetCoreRpcClient()
             //单机版Httpclient配置
-            .AddHttpClient(TestServerName, client => { client.BaseAddress = new Uri("http://localhost:34047/"); });
+            .AddHttpClient(TestServerName, client => { client.BaseAddress = new Uri("http://localhost:34047/Test.Server6"); });
             //基于Nacos注册中心
             //.AddNacosV2Naming(configuration)
             //.AddScoped<NacosDiscoveryDelegatingHandler>()
-            //.AddHttpClient(TestServerName, client => {
-            //    client.BaseAddress = new Uri($"http://{TestServerName}");
+            //.AddHttpClient(TestServerName, client =>
+            //{
+            //    client.BaseAddress = new Uri($"http://{TestServerName}/Test.Server6");
             //}).AddHttpMessageHandler<NacosDiscoveryDelegatingHandler>();
 
             IServiceProvider serviceProvider = services.BuildServiceProvider();

demo/Test.Client/appsettings.json

@@ -7,11 +7,11 @@
     }
   },
   "nacos": {
-    "ServerAddresses": [ "http://192.168.219.1:8848" ],
+    "ServerAddresses": [ "http://localhost: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/Test.Server/Startup.cs

@@ -42,7 +42,7 @@ public void ConfigureServices(IServiceCollection services)
                     options.AddNameSpace("Test.IService");
                     options.AddFilter<CacheFilter>();
                  });
-            //services.AddNacosAspNet(Configuration);
+            services.AddNacosAspNet(Configuration);
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
@@ -53,7 +53,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseEndpoints(endpoint => {
                 endpoint.Map("/", async context=>await context.Response.WriteAsync("server start!"));
                 //通过endpoint的方式引入
-                endpoint.MapDotNetCoreRpc();
+                endpoint.MapDotNetCoreRpc("/Test.Server6");
             });
         }
     }

demo/Test.Server/appsettings.json

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

demo/Test.Server6/Program.cs

@@ -24,7 +24,7 @@
 
 var app = builder.Build();
 
-app.UseDotNetCoreRpc();
+app.UseDotNetCoreRpc("/Test.Server6");
 app.MapGet("/", () => "Hello World!");
 
 app.Run();

src/DotNetCoreRpc.Client/RequestHandler.cs

@@ -102,7 +102,11 @@ private async Task<byte[]> SendRequest(MethodInfo methodInfo, params object[] ar
 
             HttpContent httpContent = new StringContent(requestModel.ToJson());
             httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-            var responseMessage = await _httpClient.PostAsync("/DotNetCoreRpc/ServerRequest", httpContent);
+
+            string path = string.IsNullOrWhiteSpace(_httpClient.BaseAddress.PathAndQuery) || _httpClient.BaseAddress.PathAndQuery == "/" 
+                ? "/DotNetCoreRpc/ServerRequest" : "";
+
+            var responseMessage = await _httpClient.PostAsync(path, httpContent);
             byte[] result = await responseMessage.Content.ReadAsByteArrayAsync();
             //判断http请求状态
             responseMessage.EnsureSuccessStatusCode();

src/DotNetCoreRpc.Server/DncRpcEndpointRouteBuilderExtensions.cs

@@ -12,14 +12,16 @@ namespace DotNetCoreRpc.Server
     /// </summary>
     public static class DncRpcEndpointRouteBuilderExtensions
     {
-        public static IEndpointConventionBuilder MapDotNetCoreRpc(this IEndpointRouteBuilder endpoints)
+        public static IEndpointConventionBuilder MapDotNetCoreRpc(this IEndpointRouteBuilder endpoints, string path = default)
         {
             if (endpoints == null)
             {
                 throw new ArgumentNullException(nameof(endpoints));
             }
-            RequestDelegate requestDelegate = endpoints.CreateApplicationBuilder().UseDotNetCoreRpc().Build();
-            return endpoints.MapPost("/DotNetCoreRpc/ServerRequest", requestDelegate);
+
+            path = string.IsNullOrWhiteSpace(path) ? "/DotNetCoreRpc/ServerRequest" : path;
+            RequestDelegate requestDelegate = endpoints.CreateApplicationBuilder().UseDotNetCoreRpc(path).Build();
+            return endpoints.MapPost(path, requestDelegate);
         }
     }
 }

src/DotNetCoreRpc.Server/DncRpcIApplicationBuilderExtensions.cs

@@ -1,13 +1,15 @@
 using System;
+using System.Linq;
 using Microsoft.AspNetCore.Builder;
 
 namespace DotNetCoreRpc.Server
 {
     public static class DncRpcIApplicationBuilderExtensions
     {
-        public static IApplicationBuilder UseDotNetCoreRpc(this IApplicationBuilder applicationBuilder)
+        public static IApplicationBuilder UseDotNetCoreRpc(this IApplicationBuilder applicationBuilder, string path = default)
         {
-            return applicationBuilder.UseWhen(context => context.Request.Path.Value.Contains("/DotNetCoreRpc/ServerRequest")
+            path = string.IsNullOrWhiteSpace(path) ? "/DotNetCoreRpc/ServerRequest" : path;
+            return applicationBuilder.UseWhen(context => context.Request.Path.Value.Contains(path)
                 && context.Request.Headers.ContainsKey("req-source")
                 && context.Request.Headers["req-source"] == "dncrpc"
                 && string.Equals(context.Request.Method, "post", StringComparison.OrdinalIgnoreCase), 

src/DotNetCoreRpc.Server/ServerServiceCollectionExtensions.cs

@@ -6,7 +6,7 @@ namespace DotNetCoreRpc.Server
 {
     public static class ServiceCollectionExtensions
     {
-        public static IServiceCollection AddDotNetCoreRpcServer(this IServiceCollection services,Action<RpcServerOptions> options)
+        public static IServiceCollection AddDotNetCoreRpcServer(this IServiceCollection services, Action<RpcServerOptions> options)
         {
             RpcServerOptions rpcServerOptions = new RpcServerOptions(services);
             options.Invoke(rpcServerOptions);