Bladeren bron

修复ObjectLoader.CreateInstance 参数位置错误的bug

lith 4 jaren geleden
bovenliggende
commit
f6b4f6acaa

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/CL/CommunicationManage/CommunicationManageClient.cs

@@ -156,7 +156,7 @@ namespace Sers.Core.CL.CommunicationManage
                     var assemblyFile = config["assemblyFile"].ConvertToString();
 
                     #region (x.x.2) CreateInstance
-                    var builder = ObjectLoader.CreateInstance(assemblyFile, className) as IOrganizeClientBuilder;
+                    var builder = ObjectLoader.CreateInstance(className, assemblyFile: assemblyFile) as IOrganizeClientBuilder;
                     #endregion
 
                     //(x.x.3) build

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/CL/CommunicationManage/CommunicationManageServer.cs

@@ -164,7 +164,7 @@ namespace Sers.Core.CL.CommunicationManage
                     var assemblyFile = config["assemblyFile"].ConvertToString();
 
                     #region (x.x.2) CreateInstance
-                    var builder = ObjectLoader.CreateInstance(assemblyFile, className) as IOrganizeServerBuilder;
+                    var builder = ObjectLoader.CreateInstance(className, assemblyFile: assemblyFile) as IOrganizeServerBuilder;
                     #endregion
 
                     //(x.x.3) build

+ 2 - 2
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/ApiEvent/EventBuilder.cs

@@ -76,7 +76,7 @@ namespace Sers.Core.Module.Api.ApiEvent
                     return null;
                 }
 
-                return ObjectLoader.CreateInstance(assemblyFile, className) as IBeforeCallApi;                
+                return ObjectLoader.CreateInstance(className, assemblyFile: assemblyFile) as IBeforeCallApi;                
             }
             #endregion
         }
@@ -129,7 +129,7 @@ namespace Sers.Core.Module.Api.ApiEvent
                 if (string.IsNullOrEmpty(className)) return null;
 
                 //(x.2)CreateInstance
-                return ObjectLoader.CreateInstance(assemblyFile, className) as IApiScopeEvent; 
+                return ObjectLoader.CreateInstance(className, assemblyFile: assemblyFile) as IApiScopeEvent; 
             }
             #endregion
         }

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/ApiLoader/ApiLoaderMng.cs

@@ -56,7 +56,7 @@ namespace Sers.Core.Module.ApiLoader
             var assemblyFile = config["loader_assemblyFile"].ConvertToString();
              
             #region (x.2) CreateInstance
-            var apiLoader = ObjectLoader.CreateInstance(assemblyFile, className) as IApiLoader;
+            var apiLoader = ObjectLoader.CreateInstance(className, assemblyFile: assemblyFile) as IApiLoader;
             #endregion
 
             //(x.3) return

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/App/AppEvent/AppEventLoader.cs

@@ -52,7 +52,7 @@ namespace Sers.Core.Module.App.AppEvent
                 var assemblyFile = config["assemblyFile"].ConvertToString();
                 if (string.IsNullOrEmpty(assemblyFile)) return null;
 
-                return ObjectLoader.CreateInstance(assemblyFile, className) as IAppEvent;            
+                return ObjectLoader.CreateInstance(className, assemblyFile: assemblyFile) as IAppEvent;            
             }
             #endregion
         }

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/Util/StreamSecurity/SecurityManager.cs

@@ -27,7 +27,7 @@ namespace Sers.Core.Util.StreamSecurity
                 var assemblyFile = config["assemblyFile"].ConvertToString();
 
                 #region (x.x.2) CreateInstance
-                var security = ObjectLoader.CreateInstance(assemblyFile, className) as ISecurity;
+                var security = ObjectLoader.CreateInstance(className, assemblyFile: assemblyFile) as ISecurity;
                 if (security == null)
                 {
                     var msg = "[CL.SecurityManager] className not exists(" + className + ").";

+ 1 - 1
dotnet/Library/Vit/Vit.Core/Vit.Core/Util/Reflection/ObjectLoader.cs

@@ -187,7 +187,7 @@ namespace Vit.Core.Util.Reflection
         /// <param name="assemblyName">如: "Vit.Core"</param>
         public static object CreateInstance(string className, string assemblyFile = null, string assemblyName = null)
         {
-            var type = GetType(className, assemblyFile, assemblyName);
+            var type = GetType(className, assemblyFile: assemblyFile, assemblyName: assemblyName);
             if (type != null) return Activator.CreateInstance(type);
             return null;
         }

+ 1 - 1
dotnet/ServiceStation/Ioc/Vit.Ioc/Vit.Ioc/Entensions/IServiceCollection_Populate_Entensions.cs

@@ -223,7 +223,7 @@ namespace Vit.Extensions
 
                 invoke = item["Invoke"] as JArray;
             }
-            return ObjectLoader.GetType(className,assemblyFile, assemblyName);
+            return ObjectLoader.GetType(className, assemblyFile: assemblyFile, assemblyName: assemblyName);
         }