plugins

ThinkComb · Jun 19, 2017 · 349e0c1 · 349e0c1
1 parent bfeda5a
commit 349e0c1
Show file tree

Hide file tree

Showing 357 changed files with 36,554 additions and 37,031 deletions.
diff --git a/source/BaiRong.Core/AppManager.cs b/source/BaiRong.Core/AppManager.cs
@@ -62,12 +62,14 @@ public class Sys
             public class LeftMenu
             {
                 public const string Site = "Site";
+                public const string Plugin = "Plugin";
                 public const string Auxiliary = "Auxiliary";
             }
 
             public class Permission
             {
                 public const string SysSite = "sys_site";
+                public const string SysPlugin = "sys_plugin";
                 public const string SysAuxiliary = "sys_auxiliary";
             }
         }
@@ -268,6 +270,10 @@ public static string GetLeftMenuName(string menuId)
             {
                 retval = "系统站点管理";
             }
+            else if (menuId == Sys.LeftMenu.Plugin)
+            {
+                retval = "插件管理";
+            }
             else if (menuId == Sys.LeftMenu.Auxiliary)
             {
                 retval = "辅助表管理";

diff --git a/source/BaiRong.Core/BaiRong.Core.csproj b/source/BaiRong.Core/BaiRong.Core.csproj
@@ -32,7 +32,7 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -235,7 +235,6 @@
     <Compile Include="Model\Enumerations\ESubscribePushType.cs" />
     <Compile Include="Model\Enumerations\EUserActionType.cs" />
     <Compile Include="Model\Enumerations\ELevelPeriodType.cs" />
-    <Compile Include="Model\Enumerations\EPublishmentSystemType.cs" />
     <Compile Include="Model\Enumerations\EUploadType.cs" />
     <Compile Include="Model\Enumerations\EUserLockType.cs" />
     <Compile Include="Model\Enumerations\ESmsProviderType.cs" />

diff --git a/source/BaiRong.Core/DirectoryUtils.cs b/source/BaiRong.Core/DirectoryUtils.cs
@@ -39,6 +39,7 @@ public class SiteFiles
             public const string BackupFiles = "BackupFiles";
             public const string TemporaryFiles = "TemporaryFiles";
             public const string Configuration = "Configuration";
+            public const string Plugins = "Plugins";
         }
 
         public class SiteTemplates

diff --git a/source/BaiRong.Core/Model/Enumerations/EContentModelType.cs b/source/BaiRong.Core/Model/Enumerations/EContentModelType.cs
@@ -162,14 +162,16 @@ public static void AddListItemsForContentCheck(ListControl listControl)
             }
         }
 
-        public static ContentModelInfo GetContentModelInfo(EPublishmentSystemType publishmentSystemType, int siteID, string tableName, EContentModelType modelType)
+        public static ContentModelInfo GetContentModelInfo(int siteId, string tableName, EContentModelType modelType)
         {
-            var modelInfo = new ContentModelInfo();
-            modelInfo.ModelId = GetValue(modelType);
-            modelInfo.ModelName = GetText(modelType);
-            modelInfo.SiteId = siteID;
-            modelInfo.IsSystem = true;
-            modelInfo.TableName = tableName;
+            var modelInfo = new ContentModelInfo
+            {
+                ModelId = GetValue(modelType),
+                ModelName = GetText(modelType),
+                SiteId = siteId,
+                IsSystem = true,
+                TableName = tableName
+            };
             if (modelType == EContentModelType.Content)
             {
                 modelInfo.TableType = EAuxiliaryTableType.BackgroundContent;
@@ -202,14 +204,9 @@ public static ContentModelInfo GetContentModelInfo(EPublishmentSystemType publis
             return modelInfo;
         }
 
-        public static EContentModelType GetEnumTypeByPublishmentSystemType(EPublishmentSystemType publishmentSystemType)
+        public static bool IsPhoto(string contentModelId)
         {
-            return EContentModelType.Content;
-        }
-
-        public static bool IsPhoto(string contentModelID)
-        {
-            var modelType = GetEnumType(contentModelID);
+            var modelType = GetEnumType(contentModelId);
 
             if (modelType == EContentModelType.Photo)
             {

diff --git a/source/BaiRong.Core/Model/Enumerations/EPublishmentSystemType.cs b/source/BaiRong.Core/Model/Enumerations/EPublishmentSystemType.cs
diff --git a/source/BaiRong.Core/PageUtils.cs b/source/BaiRong.Core/PageUtils.cs
@@ -790,6 +790,16 @@ public static string GetAdminDirectoryUrl(string relatedUrl)
             return Combine(WebConfigUtils.ApplicationPath, FileConfigManager.Instance.AdminDirectoryName, relatedUrl);
         }
 
+        public static string GetSiteFilesUrl(string relatedUrl)
+        {
+            return Combine(WebConfigUtils.ApplicationPath, DirectoryUtils.SiteFiles.DirectoryName, relatedUrl);
+        }
+
+        public static string GetPluginUrl(string pluginId, string relatedUrl)
+        {
+            return GetSiteFilesUrl(Combine(DirectoryUtils.SiteFiles.Plugins, pluginId, relatedUrl));
+        }
+
         public static string GetSiteServerUrl(string className, NameValueCollection queryString)
         {
             return AddQueryString(GetAdminDirectoryUrl(className.ToLower() + ".aspx"), queryString);

diff --git a/source/BaiRong.Core/PathUtils.cs b/source/BaiRong.Core/PathUtils.cs
@@ -177,7 +177,12 @@ public static string GetCurrentPagePath()
 
         public static string GetSiteFilesPath(params string[] paths)
         {
-            return MapPath(Combine("~/sitefiles", Combine(paths)));
+            return MapPath(Combine("~/" + DirectoryUtils.SiteFiles.DirectoryName, Combine(paths)));
+        }
+
+        public static string GetPluginsPath(params string[] paths)
+        {
+            return GetSiteFilesPath(DirectoryUtils.SiteFiles.Plugins, Combine(paths));
         }
 
         public static string RemovePathInvalidChar(string filePath)