Browse Source

Change public to protected in ClientProxyBase.

pull/10040/head
maliming 5 years ago
parent
commit
f48cafb4cc
  1. 4
      framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs
  2. 4
      framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
  3. 12
      framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptorClientProxy.cs

4
framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs

@ -68,7 +68,7 @@ namespace Volo.Abp.Http.Client.ClientProxying
return dict; return dict;
} }
public virtual async Task<T> RequestAsync<T>(ClientProxyRequestContext requestContext) protected virtual async Task<T> RequestAsync<T>(ClientProxyRequestContext requestContext)
{ {
var responseContent = await RequestAsync(requestContext); var responseContent = await RequestAsync(requestContext);
@ -100,7 +100,7 @@ namespace Volo.Abp.Http.Client.ClientProxying
return JsonSerializer.Deserialize<T>(stringContent); return JsonSerializer.Deserialize<T>(stringContent);
} }
public virtual async Task<HttpContent> RequestAsync(ClientProxyRequestContext requestContext) protected virtual async Task<HttpContent> RequestAsync(ClientProxyRequestContext requestContext)
{ {
var clientConfig = ClientOptions.Value.HttpClientProxies.GetOrDefault(requestContext.ServiceType) ?? throw new AbpException($"Could not get HttpClientProxyConfig for {requestContext.ServiceType.FullName}."); var clientConfig = ClientOptions.Value.HttpClientProxies.GetOrDefault(requestContext.ServiceType) ?? throw new AbpException($"Could not get HttpClientProxyConfig for {requestContext.ServiceType.FullName}.");
var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultAsync(clientConfig.RemoteServiceName); var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultAsync(clientConfig.RemoteServiceName);

4
framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs

@ -48,14 +48,14 @@ namespace Volo.Abp.Http.Client.DynamicProxying
if (invocation.Method.ReturnType.GenericTypeArguments.IsNullOrEmpty()) if (invocation.Method.ReturnType.GenericTypeArguments.IsNullOrEmpty())
{ {
await InterceptorClientProxy.RequestAsync(context); await InterceptorClientProxy.CallRequestAsync(context);
} }
else else
{ {
var result = (Task)InterceptorClientProxy var result = (Task)InterceptorClientProxy
.GetType() .GetType()
.GetMethods() .GetMethods()
.Single(m => m.Name == nameof(InterceptorClientProxy.RequestAsync) && .Single(m => m.Name == nameof(InterceptorClientProxy.CallRequestAsync) &&
m.IsGenericMethod && m.IsGenericMethod &&
m.GetParameters().Any(x => x.ParameterType == typeof(ClientProxyRequestContext))) m.GetParameters().Any(x => x.ParameterType == typeof(ClientProxyRequestContext)))
.MakeGenericMethod(invocation.Method.ReturnType.GenericTypeArguments[0]) .MakeGenericMethod(invocation.Method.ReturnType.GenericTypeArguments[0])

12
framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptorClientProxy.cs

@ -1,9 +1,19 @@
using Volo.Abp.Http.Client.ClientProxying; using System.Net.Http;
using System.Threading.Tasks;
using Volo.Abp.Http.Client.ClientProxying;
namespace Volo.Abp.Http.Client.DynamicProxying namespace Volo.Abp.Http.Client.DynamicProxying
{ {
public class DynamicHttpProxyInterceptorClientProxy<TService> : ClientProxyBase<TService> public class DynamicHttpProxyInterceptorClientProxy<TService> : ClientProxyBase<TService>
{ {
public virtual async Task<T> CallRequestAsync<T>(ClientProxyRequestContext requestContext)
{
return await base.RequestAsync<T>(requestContext);
}
public virtual async Task<HttpContent> CallRequestAsync(ClientProxyRequestContext requestContext)
{
return await base.RequestAsync(requestContext);
}
} }
} }

Loading…
Cancel
Save