Merge pull request siteserver#86 from siteserverekun/master

starlying · web-flow · commit f451b2a4dbc5 · 2017-07-28T19:32:56.000+08:00
修复编辑器远程图片和附件无法管理bug
diff --git a/source/SiteServer.CMS/UEditor/ListFileHandler.cs b/source/SiteServer.CMS/UEditor/ListFileHandler.cs
@@ -4,6 +4,11 @@
 using System.Linq;
 using System.Web;
 
+using BaiRong.Core;
+using BaiRong.Core.Model.Enumerations;
+using SiteServer.CMS.Core;
+using SiteServer.CMS.Model;
+
 namespace SiteServer.CMS.UEditor
 {
     /// <summary>
@@ -28,11 +33,16 @@ enum ResultState
         private string[] FileList;
         private string[] SearchExtensions;
 
-        public ListFileManager(HttpContext context, string pathToList, string[] searchExtensions)
+        public int PublishmentSystemID { get; private set; }
+        public EUploadType UploadType { get; private set; }
+
+        public ListFileManager(HttpContext context, string pathToList, string[] searchExtensions, int publishmentSystemID, EUploadType uploadType)
             : base(context)
         {
             SearchExtensions = searchExtensions.Select(x => x.ToLower()).ToArray();
             PathToList = pathToList;
+            PublishmentSystemID = publishmentSystemID;
+            UploadType = uploadType;
         }
 
         public override void Process()
@@ -51,10 +61,24 @@ public override void Process()
             var buildingList = new List<String>();
             try
             {
-                var localPath = Server.MapPath(PathToList);
+                var publishmentSystemInfo = PublishmentSystemManager.GetPublishmentSystemInfo(PublishmentSystemID);
+                var publishmentSystemPath = PathUtility.GetPublishmentSystemPath(publishmentSystemInfo); // 本站点物理路径
+                var applicationPath = WebConfigUtils.PhysicalApplicationPath.ToLower().Trim(' ', '/', '\\'); // 系统物理路径
+                if (UploadType == EUploadType.Image)
+                {
+                    PathToList = publishmentSystemInfo.Additional.ImageUploadDirectoryName; 
+                }
+                else if(UploadType == EUploadType.File)
+                {
+                    PathToList = publishmentSystemInfo.Additional.FileUploadDirectoryName;
+                }
+
+                //var localPath = Server.MapPath(PathToList);
+                var localPath = PathUtils.Combine(publishmentSystemPath, PathToList);
+
                 buildingList.AddRange(Directory.GetFiles(localPath, "*", SearchOption.AllDirectories)
                     .Where(x => SearchExtensions.Contains(Path.GetExtension(x).ToLower()))
-                    .Select(x => PathToList + x.Substring(localPath.Length).Replace("\\", "/")));
+                    .Select(x => x.Substring(applicationPath.Length).Replace("\\", "/")));
                 Total = buildingList.Count;
                 FileList = buildingList.OrderBy(x => x).Skip(Start).Take(Size).ToArray();
             }
diff --git a/source/SiteServer.Web/Controllers/Files/FilesUEditorController.cs b/source/SiteServer.Web/Controllers/Files/FilesUEditorController.cs
@@ -70,10 +70,10 @@ public void Main(int publishmentSystemId)
                     }, publishmentSystemId, EUploadType.File);
                     break;
                 case "listimage":
-                    action = new ListFileManager(HttpContext.Current, Config.GetString("imageManagerListPath"), Config.GetStringList("imageManagerAllowFiles"));
+                    action = new ListFileManager(HttpContext.Current, Config.GetString("imageManagerListPath"), Config.GetStringList("imageManagerAllowFiles"), publishmentSystemId, EUploadType.Image);
                     break;
                 case "listfile":
-                    action = new ListFileManager(HttpContext.Current, Config.GetString("fileManagerListPath"), Config.GetStringList("fileManagerAllowFiles"));
+                    action = new ListFileManager(HttpContext.Current, Config.GetString("fileManagerListPath"), Config.GetStringList("fileManagerAllowFiles"), publishmentSystemId, EUploadType.File);
                     break;
                 case "catchimage":
                     action = new CrawlerHandler(HttpContext.Current, publishmentSystemId);
