Skip to content

Commit 9c81006

Browse files
authored
Merge pull request #33 from softlgl/dev
优化代码
2 parents 2724572 + 70b65da commit 9c81006

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

demo/Test.Server/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void ConfigureServices(IServiceCollection services)
4242
options.AddNameSpace("Test.IService");
4343
options.AddFilter<CacheFilter>();
4444
});
45-
services.AddNacosAspNet(Configuration);
45+
//services.AddNacosAspNet(Configuration);
4646
}
4747

4848
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

src/DotNetCoreRpc.Client/RequestHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private async Task<T> TaskResultHandle<T>(MethodInfo methodInfo, params object[]
7575
}
7676

7777
TypeInfo methodReturnType = methodInfo.ReturnType.GetTypeInfo();
78-
if (methodReturnType.IsAsync() && !methodReturnType.IsTask() && !methodReturnType.IsValueTask())
78+
if (methodReturnType.IsAsync() && (methodReturnType.IsTaskWithResult() || methodReturnType.IsValueTaskWithResult()))
7979
{
8080
methodReturnType = methodReturnType.GetGenericArguments()[0].GetTypeInfo();
8181
}

src/DotNetCoreRpc.Server/DotNetCoreRpcMiddleware.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,7 @@ private static RpcRequestDelegate PiplineEndPoint(object instance, RpcContext as
140140
var returnValueType = returnValue.GetType().GetTypeInfo();
141141
if (returnValueType.IsAsync())
142142
{
143-
if (returnValueType.IsTask() || returnValueType.IsValueTask())
144-
{
145-
return;
146-
}
147-
148-
if (returnValueType.IsTaskWithVoidTaskResult())
143+
if (returnValueType.IsTask() || returnValueType.IsValueTask() || returnValueType.IsTaskWithVoidTaskResult())
149144
{
150145
return;
151146
}

0 commit comments

Comments
 (0)