6.15

Author: starlying

SiteServer.BackgroundPages/Ajax/AjaxCreateService.cs

@@ -164,9 +164,10 @@ public NameValueCollection CreateSiteByOnlineTemplateName(int siteId, bool isImp
                 CacheUtils.Insert(cacheCurrentCountKey, "1");
                 CacheUtils.Insert(cacheMessageKey, "开始下载模板压缩包，可能需要几分钟，请耐心等待...");
 
-                var filePath = PathUtility.GetSiteTemplatesPath($"T_{onlineTemplateName}.zip");
+                var fileName = $"T_{onlineTemplateName}.zip";
+                var filePath = PathUtility.GetSiteTemplatesPath(fileName);
                 FileUtils.DeleteFileIfExists(filePath);
-                var downloadUrl = CloudUtils.Dl.GetTemplatesUrl(onlineTemplateName);
+                var downloadUrl = CloudUtils.Dl.GetTemplatesUrl(fileName);
                 WebClientUtils.SaveRemoteFileToLocal(downloadUrl, filePath);
 
                 CacheUtils.Insert(cacheCurrentCountKey, "2");

SiteServer.Utils/CloudUtils.cs

@@ -8,16 +8,16 @@ public static class Root
 
             public static string IconUrl => $"{Host}/assets/images/favicon.png";
 
-            public static string DocsCliUrl => $"{Host}/docs/cli/";
+            public static string DocsCliUrl => $"{Host}/docs/v6/cli/";
 
             public static string GetDocsStlUrl(string tagName)
             {
-                return $"{Host}/docs/stl/{tagName}/";
+                return $"{Host}/docs/v6/stl/{tagName}/";
             }
 
             public static string GetDocsStlUrl(string tagName, string fieldName, string attrTitle)
             {
-                return $"{Host}/docs/stl/{tagName}/#{fieldName.ToLower()}-{attrTitle.ToLower()}";
+                return $"{Host}/docs/v6/stl/{tagName}/#{fieldName.ToLower()}-{attrTitle.ToLower()}";
             }
         }
 

SiteServer.Web/Controllers/Pages/Cms/PagesContentsLayerCopyController.cs

@@ -63,6 +63,8 @@ public IHttpActionResult GetConfig()
                 foreach (var permissionSiteId in siteIdList)
                 {
                     var permissionSiteInfo = SiteManager.GetSiteInfo(permissionSiteId);
+                    if (permissionSiteInfo == null) continue;
+
                     sites.Add(new
                     {
                         permissionSiteInfo.Id,

SiteServer.Web/Controllers/Pages/Cms/PagesEditorLayerImageController.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Web.Http;
+using NSwag.Annotations;
 using SiteServer.CMS.Core;
 using SiteServer.CMS.DataCache;
 using SiteServer.Utils;
@@ -9,6 +10,7 @@
 
 namespace SiteServer.API.Controllers.Pages.Cms
 {
+    [OpenApiIgnore]
     [RoutePrefix("pages/cms/editorLayerImage")]
     public partial class PagesEditorLayerImageController : ApiController
     {

SiteServer.Web/Controllers/Pages/Cms/PagesEditorLayerTextController.cs

@@ -1,11 +1,13 @@
 using System.Web.Http;
+using NSwag.Annotations;
 using SiteServer.CMS.Core;
 using SiteServer.CMS.DataCache;
 using SiteServer.CMS.Model;
 using SiteServer.CMS.Model.Enumerations;
 
 namespace SiteServer.API.Controllers.Pages.Cms
 {
+    [OpenApiIgnore]
     [RoutePrefix("pages/cms/editorLayerText")]
     public partial class PagesEditorLayerTextController : ApiController
     {

SiteServer.Web/Controllers/Pages/Cms/PagesLibraryEditorController.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using System.Web.Http;
+using NSwag.Annotations;
 using SiteServer.API.Results;
 using SiteServer.CMS.Core;
 using SiteServer.CMS.DataCache;
@@ -10,7 +11,7 @@
 
 namespace SiteServer.API.Controllers.Pages.Cms
 {
-    
+    [OpenApiIgnore]
     [RoutePrefix("pages/cms/libraryEditor")]
     public class PagesLibraryEditorController : ApiController
     {

SiteServer.Web/Controllers/Pages/Cms/PagesLibraryImageController.cs

@@ -1,6 +1,6 @@
 using System.IO;
-using System.Threading.Tasks;
 using System.Web.Http;
+using NSwag.Annotations;
 using SiteServer.API.Results;
 using SiteServer.CMS.Core;
 using SiteServer.CMS.DataCache;
@@ -11,7 +11,7 @@
 
 namespace SiteServer.API.Controllers.Pages.Cms
 {
-
+    [OpenApiIgnore]
     [RoutePrefix("pages/cms/libraryImage")]
     public partial class PagesLibraryImageController : ApiController
     {
@@ -83,16 +83,15 @@ public LibraryImageInfo Create()
             }
 
             var libraryFileName = PathUtils.GetLibraryFileName(fileName);
-            var virtualDirectoryPath = PathUtils.GetLibraryVirtualPath(EUploadType.Image, libraryFileName);
+            var virtualPath = PathUtils.GetLibraryVirtualPath(EUploadType.Image, libraryFileName);
 
-            var directoryPath = PathUtils.Combine(WebConfigUtils.PhysicalApplicationPath, virtualDirectoryPath);
-            var filePath = PathUtils.Combine(directoryPath, libraryFileName);
+            var filePath = PathUtils.Combine(WebConfigUtils.PhysicalApplicationPath, virtualPath);
 
             DirectoryUtils.CreateDirectoryIfNotExists(filePath);
             file.SaveAs(filePath);
 
             library.Title = fileName;
-            library.Url = PageUtils.Combine(virtualDirectoryPath, libraryFileName);
+            library.Url = virtualPath;
 
             library.Id = DataProvider.LibraryImageDao.Insert(library);
 
@@ -131,6 +130,10 @@ public DefaultResult Delete([FromUri]int id)
                 return Request.Unauthorized<DefaultResult>();
             }
 
+            var lib = DataProvider.LibraryImageDao.Get(id);
+            var filePath = PathUtils.Combine(WebConfigUtils.PhysicalApplicationPath, lib.Url);
+            FileUtils.DeleteFileIfExists(filePath);
+
             DataProvider.LibraryImageDao.Delete(id);
 
             return new DefaultResult

SiteServer.Web/Controllers/Pages/Cms/PagesLibraryLayerImageController.cs

@@ -1,12 +1,14 @@
 using System.IO;
 using System.Web.Http;
+using NSwag.Annotations;
 using SiteServer.CMS.Core;
 using SiteServer.CMS.DataCache;
 using SiteServer.Utils;
 using SiteServer.Utils.Enumerations;
 
 namespace SiteServer.API.Controllers.Pages.Cms
 {
+    [OpenApiIgnore]
     [RoutePrefix("pages/cms/libraryLayerImage")]
     public partial class PagesLibraryLayerImageController : ApiController
     {

SiteServer.Web/Controllers/Pages/Cms/PagesLibraryLayerVideoController.cs

@@ -1,13 +1,14 @@
 using System.IO;
-using System.Threading.Tasks;
 using System.Web.Http;
+using NSwag.Annotations;
 using SiteServer.CMS.Core;
 using SiteServer.CMS.DataCache;
 using SiteServer.Utils;
 using SiteServer.Utils.Enumerations;
 
 namespace SiteServer.API.Controllers.Pages.Cms
 {
+    [OpenApiIgnore]
     [RoutePrefix("pages/cms/libraryLayerVideo")]
     public partial class PagesLibraryLayerVideoController : ApiController
     {

SiteServer.Web/Controllers/Pages/Cms/PagesLibraryLayerWordController.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 using System.Web.Http;
+using NSwag.Annotations;
 using SiteServer.API.Results;
 using SiteServer.CMS.Core;
 using SiteServer.CMS.Core.Office;
@@ -10,6 +10,7 @@
 
 namespace SiteServer.API.Controllers.Pages.Cms
 {
+    [OpenApiIgnore]
     [RoutePrefix("pages/cms/libraryLayerWord")]
     public partial class PagesLibraryLayerWordController : ApiController
     {