plugins

ThinkComb · Jun 19, 2017 · 6c23668 · 6c23668
1 parent 610e0db
commit 6c23668
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 17 deletions.
diff --git a/source/Plugins/SiteServer.Plugin.GovInteract/SiteServer.Plugin.GovInteract.dll b/source/Plugins/SiteServer.Plugin.GovInteract/SiteServer.Plugin.GovInteract.dll
diff --git a/source/Plugins/SiteServer.Plugin.GovPublic/SiteServer.Plugin.GovPublic.dll b/source/Plugins/SiteServer.Plugin.GovPublic/SiteServer.Plugin.GovPublic.dll
diff --git a/source/Plugins/SiteServer.Plugin.Oss/SiteServer.Plugin.Oss.dll b/source/Plugins/SiteServer.Plugin.Oss/SiteServer.Plugin.Oss.dll
diff --git a/source/Plugins/SiteServer.Plugin.Poll/SiteServer.Plugin.Poll.dll b/source/Plugins/SiteServer.Plugin.Poll/SiteServer.Plugin.Poll.dll
diff --git a/source/Plugins/SiteServer.Plugin.WeiXin/SiteServer.Plugin.WeiXin.dll b/source/Plugins/SiteServer.Plugin.WeiXin/SiteServer.Plugin.WeiXin.dll
diff --git a/source/SiteServer.CMS/Core/PageUtility.cs b/source/SiteServer.CMS/Core/PageUtility.cs
@@ -735,5 +735,17 @@ public static string GetUserAvatarUrl(string apiUrl, UserInfo userInfo)
 
             return SiteFilesAssets.GetUrl(apiUrl, "default_avatar.png");
         }
+
+        public static string GetApiUrl(PublishmentSystemInfo publishmentSystemInfo = null)
+        {
+            if (publishmentSystemInfo == null) return PageUtils.GetApiUrl();
+
+            var apiUrl = publishmentSystemInfo.Additional.ApiUrl;
+            if (publishmentSystemInfo.Additional.IsMultiDeployment)
+            {
+                apiUrl = publishmentSystemInfo.Additional.InnerApiUrl;
+            }
+            return apiUrl;
+        }
     }
 }
diff --git a/source/SiteServer.CMS/Core/PublishmentSystemManager.cs b/source/SiteServer.CMS/Core/PublishmentSystemManager.cs
@@ -28,6 +28,8 @@ private static void fileWatcher_OnFileChange(object sender, EventArgs e)
 
         public static PublishmentSystemInfo GetPublishmentSystemInfo(int publishmentSystemId)
         {
+            if (publishmentSystemId <= 0) return null;
+
             var list = GetPublishmentSystemInfoKeyValuePairList();
 
             foreach (var pair in list)

diff --git a/source/SiteServer.CMS/Plugin/PluginManager.cs b/source/SiteServer.CMS/Plugin/PluginManager.cs
@@ -134,12 +134,8 @@ public static List<PluginMenu> GetAllMenus(string topId, int siteId)
         {
             var plugins = AllPlugins.Where(o => !o.Metadata.Disabled && o.Metadata.Menus != null);
 
-            var apiUrl = PageUtils.GetApiUrl();
-            if (siteId > 0)
-            {
-                var publishmentSystemInfo = PublishmentSystemManager.GetPublishmentSystemInfo(siteId);
-                apiUrl = publishmentSystemInfo.Additional.ApiUrl;
-            }
+            var publishmentSystemInfo = PublishmentSystemManager.GetPublishmentSystemInfo(siteId);
+            var apiUrl = PageUtility.GetApiUrl(publishmentSystemInfo);
 
             var menus = new List<PluginMenu>();
             foreach (var pluginPair in plugins)

diff --git a/source/SiteServer.CMS/Plugin/PluginsLoader.cs b/source/SiteServer.CMS/Plugin/PluginsLoader.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using BaiRong.Core;
 using SiteServer.Plugin;
 
 namespace SiteServer.CMS.Plugin
@@ -38,8 +39,8 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat
                 }
                 catch (Exception e)
                 {
-                    Log.Exception($"|PluginsLoader.CSharpPlugins|Couldn't load assembly for {metadata.Name}", e);
-                    return;
+                    LogUtils.AddErrorLog(e, $"Couldn't load assembly for {metadata.Name}");
+                    continue;
                 }
                 var types = assembly.GetTypes();
                 Type type;
@@ -49,8 +50,8 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat
                 }
                 catch (InvalidOperationException e)
                 {
-                    Log.Exception($"|PluginsLoader.CSharpPlugins|Can't find class implement IPlugin for <{metadata.Name}>", e);
-                    return;
+                    LogUtils.AddErrorLog(e, $"Can't find class implement IPlugin for <{metadata.Name}>");
+                    continue;
                 }
                 IPlugin plugin;
                 try
@@ -59,8 +60,8 @@ public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> metadat
                 }
                 catch (Exception e)
                 {
-                    Log.Exception($"|PluginsLoader.CSharpPlugins|Can't create instance for <{metadata.Name}>", e);
-                    return;
+                    LogUtils.AddErrorLog(e, $"Can't create instance for <{metadata.Name}>");
+                    continue;
                 }
 #endif
                 plugins.Add(new PluginPair(metadata, plugin));

diff --git a/source/SiteServer.CMS/StlParser/Utility/StlUtility.cs b/source/SiteServer.CMS/StlParser/Utility/StlUtility.cs
@@ -203,11 +203,8 @@ public static void ParseStl(PublishmentSystemInfo publishmentSystemInfo, PageInf
                     {
                         fileTemplateId = pageInfo.TemplateInfo.TemplateId;
                     }
-                    var apiUrl = pageInfo.PublishmentSystemInfo.Additional.ApiUrl;
-                    if (pageInfo.PublishmentSystemInfo.Additional.IsMultiDeployment)
-                    {
-                        apiUrl = pageInfo.PublishmentSystemInfo.Additional.InnerApiUrl;
-                    }
+
+                    var apiUrl = PageUtility.GetApiUrl(pageInfo.PublishmentSystemInfo);
                     var ajaxUrl = ActionsTrigger.GetUrl(apiUrl, pageInfo.PublishmentSystemId, contextInfo.ChannelId, contextInfo.ContentId, fileTemplateId, true);
                     pageInfo.AddPageEndScriptsIfNotExists("CreateDoubleClick", $@"
 <script type=""text/javascript"" language=""javascript"">document.ondblclick=function(x){{location.href = '{ajaxUrl}';}}</script>");