优化代码

liuhll · Aug 22, 2024 · cb31061 · cb31061
1 parent e6b6291
commit cb31061
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/framework/src/Silky.Core/IEngine.cs b/framework/src/Silky.Core/IEngine.cs
@@ -57,14 +57,14 @@ TOptions GetOptions<TOptions>(string optionName)
  where TOptions : class, new();
 
 
- T Resolve<T>(IServiceScope scope = null) where T : class;
+ T Resolve<T>() where T : class;
 
- object Resolve(Type type, IServiceScope scope = null);
- object ResolveNamed(string name, Type type, IServiceScope scope = null);
+ object Resolve(Type type);
+ object ResolveNamed(string name, Type type);
 
  object ResolveServiceInstance(string? serviceKey, Type serviceType);
 
- T ResolveNamed<T>(string name,IServiceScope scope = null);
+ T ResolveNamed<T>(string name);
 
  IEnumerable<T> ResolveAll<T>();
 

diff --git a/framework/src/Silky.Core/Runtime/Rpc/DefaultRpcContextAccessor.cs b/framework/src/Silky.Core/Runtime/Rpc/DefaultRpcContextAccessor.cs
@@ -4,7 +4,7 @@
 
 namespace Silky.Core.Runtime.Rpc
 {
- public class DefaultRpcContextAccessor : IRpcContextAccessor, IScopedDependency
+ public class DefaultRpcContextAccessor : IRpcContextAccessor, ISingletonDependency
  {
  private static AsyncLocal<RpcContextHolder> _rpcContextCurrent = new();
 

diff --git a/framework/src/Silky.Core/Runtime/Rpc/RpcContext.cs b/framework/src/Silky.Core/Runtime/Rpc/RpcContext.cs
@@ -260,10 +260,10 @@ public IDictionary<string, string> GetResponseHeaders()
 
  public void Reset()
  {
+ EngineContext.DisposeUnmanagedObjects();
  invokeAttachments.Clear();
  resultAttachments.Clear();
  transAttachments.Clear();
- rpcContextThreadLocal.Value = null;
  }
  }
 }
diff --git a/framework/src/Silky.Core/SilkyEngine.cs b/framework/src/Silky.Core/SilkyEngine.cs
@@ -156,20 +156,20 @@ void IEngine.ConfigureRequestPipeline(IApplicationBuilder application)
  }
  }
 
- public T Resolve<T>(IServiceScope scope = null) where T : class
+ public T Resolve<T>() where T : class
  {
- return (T)Resolve(typeof(T), scope);
+ return (T)Resolve(typeof(T));
  }
 
- public object Resolve(Type type, IServiceScope scope = null)
+ public object Resolve(Type type)
  {
- var sp = GetServiceProvider(scope);
+ var sp = GetServiceProvider();
  return sp?.GetService(type);
  }
 
- public object ResolveNamed(string name, Type type, IServiceScope scope = null)
+ public object ResolveNamed(string name, Type type)
  {
- var sp = GetServiceProvider(scope);
+ var sp = GetServiceProvider();
  return sp?.GetAutofacRoot().ResolveNamed(name, type);
  }
 
@@ -194,9 +194,9 @@ public object ResolveServiceInstance(string? serviceKey, Type serviceType)
  return instance;
  }
 
- public T ResolveNamed<T>(string name, IServiceScope scope = null)
+ public T ResolveNamed<T>(string name)
  {
- return (T)ResolveNamed(name, typeof(T), scope);
+ return (T)ResolveNamed(name, typeof(T));
  }
 
  public IEnumerable<T> ResolveAll<T>()

diff --git a/framework/src/Silky.RegistryCenter.Nacos/Silky.RegistryCenter.Nacos.csproj b/framework/src/Silky.RegistryCenter.Nacos/Silky.RegistryCenter.Nacos.csproj
@@ -11,7 +11,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="nacos-sdk-csharp" Version="1.3.*" />
+ <PackageReference Include="nacos-sdk-csharp" Version="1.3.8" />
  </ItemGroup>
 
 </Project>
diff --git a/framework/src/Silky.Rpc/RpcModule.cs b/framework/src/Silky.Rpc/RpcModule.cs
@@ -126,8 +126,6 @@ await messageReceivedHandler.Handle(remoteInvokeMessage, ct,
  await sender.SendMessageAsync(resultTransportMessage);
  serverDiagnosticListener.TracingAfter(tracingTimestamp, message.Id,
  remoteInvokeMessage.ServiceEntryId, result);
-
- EngineContext.DisposeUnmanagedObjects();
  }
  finally
  {