Skip to content

Commit 8afc5fc

Browse files
starlyingstarlying
committed
6.15
1 parent b2da999 commit 8afc5fc

25 files changed

+309
-239
lines changed

‎SiteServer.BackgroundPages/Ajax/AjaxCreateService.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,10 @@ public NameValueCollection CreateSiteByOnlineTemplateName(int siteId, bool isImp
164164
CacheUtils.Insert(cacheCurrentCountKey, "1");
165165
CacheUtils.Insert(cacheMessageKey, "开始下载模板压缩包，可能需要几分钟，请耐心等待...");
166166

167-
var filePath = PathUtility.GetSiteTemplatesPath($"T_{onlineTemplateName}.zip");
167+
var fileName = $"T_{onlineTemplateName}.zip";
168+
var filePath = PathUtility.GetSiteTemplatesPath(fileName);
168169
FileUtils.DeleteFileIfExists(filePath);
169-
var downloadUrl = CloudUtils.Dl.GetTemplatesUrl(onlineTemplateName);
170+
var downloadUrl = CloudUtils.Dl.GetTemplatesUrl(fileName);
170171
WebClientUtils.SaveRemoteFileToLocal(downloadUrl, filePath);
171172

172173
CacheUtils.Insert(cacheCurrentCountKey, "2");

‎SiteServer.Utils/CloudUtils.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ public static class Root
88

99
public static string IconUrl => $"{Host}/assets/images/favicon.png";
1010

11-
public static string DocsCliUrl => $"{Host}/docs/cli/";
11+
public static string DocsCliUrl => $"{Host}/docs/v6/cli/";
1212

1313
public static string GetDocsStlUrl(string tagName)
1414
{
15-
return $"{Host}/docs/stl/{tagName}/";
15+
return $"{Host}/docs/v6/stl/{tagName}/";
1616
}
1717

1818
public static string GetDocsStlUrl(string tagName, string fieldName, string attrTitle)
1919
{
20-
return $"{Host}/docs/stl/{tagName}/#{fieldName.ToLower()}-{attrTitle.ToLower()}";
20+
return $"{Host}/docs/v6/stl/{tagName}/#{fieldName.ToLower()}-{attrTitle.ToLower()}";
2121
}
2222
}
2323

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

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public IHttpActionResult GetConfig()
6363
foreach (var permissionSiteId in siteIdList)
6464
{
6565
var permissionSiteInfo = SiteManager.GetSiteInfo(permissionSiteId);
66+
if (permissionSiteInfo == null) continue;
67+
6668
sites.Add(new
6769
{
6870
permissionSiteInfo.Id,

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Generic;
22
using System.IO;
33
using System.Web.Http;
4+
using NSwag.Annotations;
45
using SiteServer.CMS.Core;
56
using SiteServer.CMS.DataCache;
67
using SiteServer.Utils;
@@ -9,6 +10,7 @@
910

1011
namespace SiteServer.API.Controllers.Pages.Cms
1112
{
13+
[OpenApiIgnore]
1214
[RoutePrefix("pages/cms/editorLayerImage")]
1315
public partial class PagesEditorLayerImageController : ApiController
1416
{

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System.Web.Http;
2+
using NSwag.Annotations;
23
using SiteServer.CMS.Core;
34
using SiteServer.CMS.DataCache;
45
using SiteServer.CMS.Model;
56
using SiteServer.CMS.Model.Enumerations;
67

78
namespace SiteServer.API.Controllers.Pages.Cms
89
{
10+
[OpenApiIgnore]
911
[RoutePrefix("pages/cms/editorLayerText")]
1012
public partial class PagesEditorLayerTextController : ApiController
1113
{

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.IO;
22
using System.Threading.Tasks;
33
using System.Web.Http;
4+
using NSwag.Annotations;
45
using SiteServer.API.Results;
56
using SiteServer.CMS.Core;
67
using SiteServer.CMS.DataCache;
@@ -10,7 +11,7 @@
1011

1112
namespace SiteServer.API.Controllers.Pages.Cms
1213
{
13-
14+
[OpenApiIgnore]
1415
[RoutePrefix("pages/cms/libraryEditor")]
1516
public class PagesLibraryEditorController : ApiController
1617
{

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

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.IO;
2-
using System.Threading.Tasks;
32
using System.Web.Http;
3+
using NSwag.Annotations;
44
using SiteServer.API.Results;
55
using SiteServer.CMS.Core;
66
using SiteServer.CMS.DataCache;
@@ -11,7 +11,7 @@
1111

1212
namespace SiteServer.API.Controllers.Pages.Cms
1313
{
14-
14+
[OpenApiIgnore]
1515
[RoutePrefix("pages/cms/libraryImage")]
1616
public partial class PagesLibraryImageController : ApiController
1717
{
@@ -83,16 +83,15 @@ public LibraryImageInfo Create()
8383
}
8484

8585
var libraryFileName = PathUtils.GetLibraryFileName(fileName);
86-
var virtualDirectoryPath = PathUtils.GetLibraryVirtualPath(EUploadType.Image, libraryFileName);
86+
var virtualPath = PathUtils.GetLibraryVirtualPath(EUploadType.Image, libraryFileName);
8787

88-
var directoryPath = PathUtils.Combine(WebConfigUtils.PhysicalApplicationPath, virtualDirectoryPath);
89-
var filePath = PathUtils.Combine(directoryPath, libraryFileName);
88+
var filePath = PathUtils.Combine(WebConfigUtils.PhysicalApplicationPath, virtualPath);
9089

9190
DirectoryUtils.CreateDirectoryIfNotExists(filePath);
9291
file.SaveAs(filePath);
9392

9493
library.Title = fileName;
95-
library.Url = PageUtils.Combine(virtualDirectoryPath, libraryFileName);
94+
library.Url = virtualPath;
9695

9796
library.Id = DataProvider.LibraryImageDao.Insert(library);
9897

@@ -131,6 +130,10 @@ public DefaultResult Delete([FromUri]int id)
131130
return Request.Unauthorized<DefaultResult>();
132131
}
133132

133+
var lib = DataProvider.LibraryImageDao.Get(id);
134+
var filePath = PathUtils.Combine(WebConfigUtils.PhysicalApplicationPath, lib.Url);
135+
FileUtils.DeleteFileIfExists(filePath);
136+
134137
DataProvider.LibraryImageDao.Delete(id);
135138

136139
return new DefaultResult

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using System.IO;
22
using System.Web.Http;
3+
using NSwag.Annotations;
34
using SiteServer.CMS.Core;
45
using SiteServer.CMS.DataCache;
56
using SiteServer.Utils;
67
using SiteServer.Utils.Enumerations;
78

89
namespace SiteServer.API.Controllers.Pages.Cms
910
{
11+
[OpenApiIgnore]
1012
[RoutePrefix("pages/cms/libraryLayerImage")]
1113
public partial class PagesLibraryLayerImageController : ApiController
1214
{

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
using System.IO;
2-
using System.Threading.Tasks;
32
using System.Web.Http;
3+
using NSwag.Annotations;
44
using SiteServer.CMS.Core;
55
using SiteServer.CMS.DataCache;
66
using SiteServer.Utils;
77
using SiteServer.Utils.Enumerations;
88

99
namespace SiteServer.API.Controllers.Pages.Cms
1010
{
11+
[OpenApiIgnore]
1112
[RoutePrefix("pages/cms/libraryLayerVideo")]
1213
public partial class PagesLibraryLayerVideoController : ApiController
1314
{

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.IO;
22
using System.Text;
3-
using System.Threading.Tasks;
43
using System.Web.Http;
4+
using NSwag.Annotations;
55
using SiteServer.API.Results;
66
using SiteServer.CMS.Core;
77
using SiteServer.CMS.Core.Office;
@@ -10,6 +10,7 @@
1010

1111
namespace SiteServer.API.Controllers.Pages.Cms
1212
{
13+
[OpenApiIgnore]
1314
[RoutePrefix("pages/cms/libraryLayerWord")]
1415
public partial class PagesLibraryLayerWordController : ApiController
1516
{

‎SiteServer.Web/Controllers/Pages/Cms/PagesLibraryTextController.cs

+21-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.IO;
2-
using System.Threading.Tasks;
32
using System.Web.Http;
3+
using NSwag.Annotations;
44
using SiteServer.API.Results;
55
using SiteServer.CMS.Core;
66
using SiteServer.CMS.Core.Office;
@@ -12,7 +12,7 @@
1212

1313
namespace SiteServer.API.Controllers.Pages.Cms
1414
{
15-
15+
[OpenApiIgnore]
1616
[RoutePrefix("pages/cms/libraryText")]
1717
public partial class PagesLibraryTextController : ApiController
1818
{
@@ -97,13 +97,31 @@ public LibraryTextInfo Create()
9797
FileUtils.DeleteFileIfExists(filePath);
9898

9999
library.Title = fileName;
100-
library.ImageUrl = PageUtils.Combine(virtualDirectoryPath, libraryFileName);
101100
library.Content = wordContent;
102101
library.Id = DataProvider.LibraryTextDao.Insert(library);
103102

104103
return library;
105104
}
106105

106+
[HttpPut, Route(RouteId)]
107+
public LibraryTextInfo Update([FromUri] int id, [FromBody] LibraryTextInfo library)
108+
{
109+
var auth = new AuthenticatedRequest();
110+
111+
if (!auth.IsAdminLoggin ||
112+
!auth.AdminPermissionsImpl.HasSitePermissions(auth.SiteId,
113+
ConfigManager.SitePermissions.Library))
114+
{
115+
return Request.Unauthorized<LibraryTextInfo>();
116+
}
117+
118+
var lib = DataProvider.LibraryTextDao.Get(id);
119+
lib.GroupId = library.GroupId;
120+
DataProvider.LibraryTextDao.Update(lib);
121+
122+
return library;
123+
}
124+
107125
[HttpDelete, Route(RouteId)]
108126
public DefaultResult Delete([FromUri]int id)
109127
{

‎SiteServer.Web/Controllers/Preview/PreviewController.cs

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Text.RegularExpressions;
77
using System.Web;
88
using System.Web.Http;
9+
using NSwag.Annotations;
910
using SiteServer.CMS.Api.Preview;
1011
using SiteServer.Utils;
1112
using SiteServer.CMS.Core;
@@ -20,6 +21,7 @@
2021

2122
namespace SiteServer.API.Controllers.Preview
2223
{
24+
[OpenApiIgnore]
2325
public class PreviewController : ApiController
2426
{
2527
[HttpGet, Route(ApiRoutePreview.Route)]

‎SiteServer.Web/Controllers/V1/AdministratorsController.cs

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Web.Http;
3+
using NSwag.Annotations;
34
using SiteServer.CMS.Api.V1;
45
using SiteServer.CMS.Core;
56
using SiteServer.CMS.DataCache;
@@ -8,9 +9,6 @@
89

910
namespace SiteServer.API.Controllers.V1
1011
{
11-
/// <summary>
12-
/// Administrators
13-
/// </summary>
1412
[RoutePrefix("v1/administrators")]
1513
public class AdministratorsController : ApiController
1614
{
@@ -20,6 +18,7 @@ public class AdministratorsController : ApiController
2018
private const string RouteActionsResetPassword = "actions/resetPassword";
2119
private const string RouteAdministrator = "{id:int}";
2220

21+
[OpenApiOperation("新增管理员 API", "https://sscms.com/docs/v6/api/guide/administrators/create.html")]
2322
[HttpPost, Route(Route)]
2423
public IHttpActionResult Create([FromBody] AdministratorInfoCreateUpdate adminInfo)
2524
{
@@ -47,6 +46,7 @@ public IHttpActionResult Create([FromBody] AdministratorInfoCreateUpdate adminIn
4746
}
4847
}
4948

49+
[OpenApiOperation("修改管理员 API", "https://sscms.com/docs/v6/api/guide/administrators/update.html")]
5050
[HttpPut, Route(RouteAdministrator)]
5151
public IHttpActionResult Update(int id, [FromBody] AdministratorInfoCreateUpdate adminInfo)
5252
{
@@ -78,6 +78,7 @@ public IHttpActionResult Update(int id, [FromBody] AdministratorInfoCreateUpdate
7878
}
7979
}
8080

81+
[OpenApiOperation("删除管理员 API", "https://sscms.com/docs/v6/api/guide/administrators/delete.html")]
8182
[HttpDelete, Route(RouteAdministrator)]
8283
public IHttpActionResult Delete(int id)
8384
{
@@ -103,6 +104,7 @@ public IHttpActionResult Delete(int id)
103104
}
104105
}
105106

107+
[OpenApiOperation("获取管理员 API", "https://sscms.com/docs/v6/api/guide/administrators/get.html")]
106108
[HttpGet, Route(RouteAdministrator)]
107109
public IHttpActionResult Get(int id)
108110
{
@@ -128,6 +130,7 @@ public IHttpActionResult Get(int id)
128130
}
129131
}
130132

133+
[OpenApiOperation("获取管理员列表 API", "https://sscms.com/docs/v6/api/guide/administrators/list.html")]
131134
[HttpGet, Route(Route)]
132135
public IHttpActionResult List()
133136
{
@@ -152,6 +155,7 @@ public IHttpActionResult List()
152155
}
153156
}
154157

158+
[OpenApiOperation("管理员登录 API", "https://sscms.com/docs/v6/api/guide/administrators/login.html")]
155159
[HttpPost, Route(RouteActionsLogin)]
156160
public IHttpActionResult Login()
157161
{
@@ -212,6 +216,7 @@ public IHttpActionResult Login()
212216
}
213217
}
214218

219+
[OpenApiOperation("管理员退出登录 API", "https://sscms.com/docs/v6/api/guide/administrators/logout.html")]
215220
[HttpPost, Route(RouteActionsLogout)]
216221
public IHttpActionResult Logout()
217222
{
@@ -233,6 +238,7 @@ public IHttpActionResult Logout()
233238
}
234239
}
235240

241+
[OpenApiOperation("修改管理员密码 API", "https://sscms.com/docs/v6/api/guide/administrators/resetPassword.html")]
236242
[HttpPost, Route(RouteActionsResetPassword)]
237243
public IHttpActionResult ResetPassword()
238244
{

‎SiteServer.Web/Controllers/V1/CaptchaController.cs

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.IO;
55
using System.Web;
66
using System.Web.Http;
7+
using NSwag.Annotations;
78
using SiteServer.BackgroundPages.Core;
89
using SiteServer.CMS.Core;
910
using SiteServer.Utils;
@@ -23,6 +24,7 @@ public class CaptchaInfo
2324
public string Captcha { get; set; }
2425
}
2526

27+
[OpenApiOperation("获取验证码图片 API", "https://sscms.com/docs/v6/api/guide/other/captchaGet.html")]
2628
[HttpGet, Route(ApiRoute)]
2729
public void Get(string name)
2830
{
@@ -89,6 +91,7 @@ public void Get(string name)
8991
response.End();
9092
}
9193

94+
[OpenApiOperation("验证验证码 API", "https://sscms.com/docs/v6/api/guide/other/captchaCheck.html")]
9295
[HttpPost, Route(ApiRouteActionsCheck)]
9396
public IHttpActionResult Check(string name, [FromBody] CaptchaInfo captchaInfo)
9497
{

0 commit comments

Comments
 (0)