DotNetExample
diff --git a/‎source/.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎source/.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎source/Plugins/GovInteract/GovInteract.dll‎
-3.5 KB b/‎source/Plugins/GovInteract/GovInteract.dll‎
-3.5 KB
diff --git a/‎source/Plugins/GovPublic/GovPublic.dll‎
-3.5 KB b/‎source/Plugins/GovPublic/GovPublic.dll‎
-3.5 KB
diff --git a/‎source/Plugins/ImagePoll/ImagePoll.dll‎
-3.5 KB b/‎source/Plugins/ImagePoll/ImagePoll.dll‎
-3.5 KB
diff --git a/‎source/Plugins/Oss/Aliyun.OSS.dll‎
-212 KB b/‎source/Plugins/Oss/Aliyun.OSS.dll‎
-212 KB
diff --git a/‎source/Plugins/Oss/Oss.dll‎
-10 KB b/‎source/Plugins/Oss/Oss.dll‎
-10 KB
diff --git a/‎source/Plugins/WeiXin/WeiXin.dll‎
-3.5 KB b/‎source/Plugins/WeiXin/WeiXin.dll‎
-3.5 KB
diff --git a/‎source/SiteServer.CMS/Core/Plugin/PluginsLoader.cs‎
Lines changed: 3 additions & 9 deletions b/‎source/SiteServer.CMS/Core/Plugin/PluginsLoader.cs‎
Lines changed: 3 additions & 9 deletions
@@ -1,4 +1,5 @@
 .vs/
 packages/
 **/bin/
-**/obj/
+**/obj/
+Plugins/**/*.dll
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using BaiRong.Core;
 using SiteServer.Plugin;
 
 namespace SiteServer.CMS.Core.Plugin
@@ -24,13 +25,6 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat
             {
                 var s = Stopwatch.StartNew();
 
-
-#if DEBUG
-                var assembly = Assembly.Load(AssemblyName.GetAssemblyName(metadata.ExecuteFilePath));
-                var types = assembly.GetTypes();
-                var type = types.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(typeof(IPlugin)));
-                var plugin = (IPlugin)Activator.CreateInstance(type);
-#else
                 Assembly assembly;
                 try
                 {
@@ -47,7 +41,7 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat
                 {
                     type = types.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(typeof(IPlugin)));
                 }
-                catch (InvalidOperationException e)
+                catch (Exception e)
                 {
                     LogUtils.AddErrorLog(e, $"Can't find class implement IPlugin for <{metadata.Name}>");
                     continue;
@@ -62,7 +56,7 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat
                     LogUtils.AddErrorLog(e, $"Can't create instance for <{metadata.Name}>");
                     continue;
                 }
-#endif
+
                 plugins.Add(new PluginPair(metadata, plugin));
 
                 var milliseconds = s.ElapsedMilliseconds;
-Original file line number
+Diff line change
@@ @@ -1,4 +1,5 @@ @@
 .vs/
 packages/
 **/bin/
 -**/obj/
 +**/obj/
 +Plugins/**/*.dll
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Diagnostics;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Reflection;`
	`6`	`+using BaiRong.Core;`
`6`	`7`	`using SiteServer.Plugin;`
`7`	`8`
`8`	`9`	`namespace SiteServer.CMS.Core.Plugin`
`@@ -24,13 +25,6 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat`
`24`	`25`	`{`
`25`	`26`	`var s = Stopwatch.StartNew();`
`26`	`27`
`27`		`-`
`28`		`-#if DEBUG`
`29`		`- var assembly = Assembly.Load(AssemblyName.GetAssemblyName(metadata.ExecuteFilePath));`
`30`		`- var types = assembly.GetTypes();`
`31`		`- var type = types.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(typeof(IPlugin)));`
`32`		`- var plugin = (IPlugin)Activator.CreateInstance(type);`
`33`		`-#else`
`34`	`28`	`Assembly assembly;`
`35`	`29`	`try`
`36`	`30`	`{`
`@@ -47,7 +41,7 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat`
`47`	`41`	`{`
`48`	`42`	`type = types.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(typeof(IPlugin)));`
`49`	`43`	`}`
`50`		`- catch (InvalidOperationException e)`
	`44`	`+ catch (Exception e)`
`51`	`45`	`{`
`52`	`46`	`LogUtils.AddErrorLog(e, $"Can't find class implement IPlugin for <{metadata.Name}>");`
`53`	`47`	`continue;`
`@@ -62,7 +56,7 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat`
`62`	`56`	`LogUtils.AddErrorLog(e, $"Can't create instance for <{metadata.Name}>");`
`63`	`57`	`continue;`
`64`	`58`	`}`
`65`		`-#endif`
	`59`	`+`
`66`	`60`	`plugins.Add(new PluginPair(metadata, plugin));`
`67`	`61`
`68`	`62`	`var milliseconds = s.ElapsedMilliseconds;`