Skip to content

Commit 63f708c

Browse files
starlyingstarlying
committed
6.15
1 parent c87ac90 commit 63f708c

File tree

347 files changed

+1627
-36760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

347 files changed

+1627
-36760
lines changed

‎README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
SiteServer CMS 基于.NET 平台，能够以最低的成本、最少的人力投入在最短的时间内架设一个功能齐全、性能优异、规模庞大并易于维护的网站平台。
44

5-
![SiteServer CMS](https://www.siteserver.cn/assets/images/github-banner.png)
5+
![SiteServer CMS](https://sscms.com/assets/images/github-banner.png)
66

77
## 版本
88

@@ -45,17 +45,17 @@ SiteServer CMS 基于.NET 平台，能够以最低的成本、最少的人力投
4545

4646
## 开发文档
4747

48-
[《STL 语言参考手册》](https://www.siteserver.cn/docs/stl/)
48+
[《STL 语言参考手册》](https://sscms.com/docs/v6/stl/)
4949

50-
[《插件开发参考手册》](https://www.siteserver.cn/docs/plugins/)
50+
[《插件开发参考手册》](https://sscms.com/docs/v6/plugins/)
5151

52-
[《CLI 命令行参考手册》](https://www.siteserver.cn/docs/cli/)
52+
[《CLI 命令行参考手册》](https://sscms.com/docs/v6/cli/)
5353

54-
[《REST API 参考手册》](https://www.siteserver.cn/docs/api/)
54+
[《REST API 参考手册》](https://sscms.com/docs/v6/api/)
5555

56-
[《数据结构参考手册》](https://www.siteserver.cn/docs/model/)
56+
[《数据结构参考手册》](https://sscms.com/docs/v6/model/)
5757

58-
系统使用文档请点击 [SiteServer CMS 文档中心](https://www.siteserver.cn/docs/)
58+
系统使用文档请点击 [SiteServer CMS 文档中心](https://sscms.com/docs/)
5959

6060
## SiteServer CMS 源码结构
6161

@@ -110,7 +110,7 @@ SiteServer CMS 产品将每隔两月发布新的正式版本，我们将在每
110110

111111
## 关注最新动态
112112

113-
[![qrcode](https://www.siteserver.cn/assets/images/qrcode_for_wx.jpg)](https://www.siteserver.cn/)
113+
[![qrcode](https://sscms.com/assets/images/qrcode_for_wx.jpg)](https://sscms.com/)
114114

115115
## License
116116

‎SS.CMS.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<copyright>Copyright © SiteServer CMS</copyright>
1313
<tags>SiteServer CMS</tags>
1414
<releaseNotes>
15-
SiteServer CMS V6.14正式版
15+
SiteServer CMS V6.15正式版
1616
</releaseNotes>
1717
</metadata>
1818
</package>

‎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 = OnlineTemplateManager.GetDownloadUrl(onlineTemplateName);
170+
var downloadUrl = CloudUtils.Dl.GetTemplatesUrl(fileName);
170171
WebClientUtils.SaveRemoteFileToLocal(downloadUrl, filePath);
171172

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

‎SiteServer.BackgroundPages/Cms/ModalCrossSiteTransEdit.cs

+2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ protected void DdlTransType_OnSelectedIndexChanged(object sender, EventArgs e)
115115
foreach (var psId in siteIdList)
116116
{
117117
var psInfo = SiteManager.GetSiteInfo(psId);
118+
if(psInfo == null) continue;
119+
118120
var show = false;
119121
if (contributeType == ECrossSiteTransType.SpecifiedSite)
120122
{

‎SiteServer.BackgroundPages/Cms/PageContentAddHandler.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ protected override object Process()
7979
}
8080
}
8181

82-
contentInfo.Id = DataProvider.ContentDao.InsertPreview(tableName, siteInfo, channelInfo, contentInfo);
82+
contentInfo.SourceId = SourceManager.Preview;
83+
contentInfo.Id = DataProvider.ContentDao.Insert(tableName, siteInfo, channelInfo, contentInfo);
8384

8485
return new
8586
{

‎SiteServer.BackgroundPages/Cms/PageTemplateReference.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public void Page_Load(object sender, EventArgs e)
4545

4646
var tagName = elementName.Substring(4);
4747
var stlAttribute = (StlElementAttribute)Attribute.GetCustomAttribute(elementType, typeof(StlElementAttribute));
48+
var tagNameUrl = CloudUtils.Root.GetDocsStlUrl(tagName);
4849

4950
allBuilder.Append($@"
5051
<tr class=""{(elementName == _elementName ? "bg-secondary text-white" : string.Empty)}"">
@@ -54,7 +55,7 @@ public void Page_Load(object sender, EventArgs e)
5455
</a>
5556
</td>
5657
<td>{stlAttribute.Title}</td>
57-
<td><a href=""https://www.siteserver.cn/docs/stl/{tagName}/"" target=""_blank"" class=""{(elementName == _elementName ? "text-white" : string.Empty)}"">https://www.siteserver.cn/docs/stl/{tagName}/</a></td>
58+
<td><a href=""{tagNameUrl}"" target=""_blank"" class=""{(elementName == _elementName ? "text-white" : string.Empty)}"">{tagNameUrl}</a></td>
5859
</tr>");
5960
}
6061

@@ -96,8 +97,7 @@ public void Page_Load(object sender, EventArgs e)
9697

9798
if (attr != null)
9899
{
99-
var attrUrl =
100-
$"https://www.siteserver.cn/docs/stl/{tagName}/#{fieldName.ToLower()}-{attr.Title.ToLower()}";
100+
var attrUrl = CloudUtils.Root.GetDocsStlUrl(tagName, fieldName, attr.Title);
101101
attrBuilder.Append($@"
102102
<tr>
103103
<td>{fieldName}</td>
@@ -107,7 +107,7 @@ public void Page_Load(object sender, EventArgs e)
107107
}
108108
}
109109

110-
var helpUrl = $"https://www.siteserver.cn/docs/stl/{tagName}/";
110+
var tagNameUrl = CloudUtils.Root.GetDocsStlUrl(tagName);
111111

112112
var stlAttribute = (StlElementAttribute)Attribute.GetCustomAttribute(elementType, typeof(StlElementAttribute));
113113

@@ -118,7 +118,7 @@ public void Page_Load(object sender, EventArgs e)
118118
</h4>
119119
<p>
120120
{stlAttribute.Description}
121-
<a href=""{helpUrl}"" target=""_blank"">详细使用说明</a>
121+
<a href=""{tagNameUrl}"" target=""_blank"">详细使用说明</a>
122122
</p>
123123
<div class=""panel panel-default m-t-10"">
124124
<div class=""panel-body p-0"">

‎SiteServer.CMS/Api/Sys/Stl/ApiRouteActionsSearch.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static string GetUrl(string apiUrl)
1313
return PageUtils.Combine(apiUrl, Route);
1414
}
1515

16-
public static string GetParameters(bool isAllSites, string siteName, string siteDir, string siteIds, string channelIndex, string channelName, string channelIds, string type, string word, string dateAttribute, string dateFrom, string dateTo, string since, int pageNum, bool isHighlight, int siteId, string ajaxDivId, string template)
16+
public static string GetParameters(bool isAllSites, string siteName, string siteDir, string siteIds, string channelIndex, string channelName, string channelIds, string type, string word, string dateAttribute, string dateFrom, string dateTo, string since, int pageNum, bool isHighlight, bool isDefaultDisplay, int siteId, string ajaxDivId, string template)
1717
{
1818
return $@"
1919
{{
@@ -55,6 +55,7 @@ public static string GetParameters(bool isAllSites, string siteName, string site
5555
StlSearch.Since.ToLower(),
5656
StlSearch.PageNum.ToLower(),
5757
StlSearch.IsHighlight.ToLower(),
58+
StlSearch.IsDefaultDisplay.ToLower(),
5859
"siteid",
5960
"ajaxdivid",
6061
"template",

‎SiteServer.CMS/Core/Caching.cs

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
namespace SiteServer.CMS.Core
2+
{
3+
public static class Caching
4+
{
5+
public static string GetAllKey(string tableName)
6+
{
7+
return $"ss:{tableName}:all";
8+
}
9+
10+
public static string GetAllKey(string tableName, int siteId)
11+
{
12+
return $"ss:{tableName}:all:{siteId}";
13+
}
14+
15+
public static string GetAllKey(string tableName, string type, string identity)
16+
{
17+
return $"ss:{tableName}:all:{type}:{identity}";
18+
}
19+
20+
public static string GetEntityKey(string tableName)
21+
{
22+
return $"ss:{tableName}:entity:only";
23+
}
24+
25+
public static string GetEntityKey(string tableName, int id)
26+
{
27+
return $"ss:{tableName}:entity:{id}";
28+
}
29+
30+
public static string GetEntityKey(string tableName, string type, string identity)
31+
{
32+
return $"ss:{tableName}:entity:{type}:{identity}";
33+
}
34+
35+
public static string GetListKey(string tableName)
36+
{
37+
return $"ss:{tableName}:list";
38+
}
39+
40+
public static string GetListKey(string tableName, int siteId)
41+
{
42+
return $"ss:{tableName}:list:{siteId}";
43+
}
44+
45+
public static string GetListKey(string tableName, string type)
46+
{
47+
return $"ss:{tableName}:list:{type}";
48+
}
49+
50+
public static string GetCountKey(string tableName, int siteId)
51+
{
52+
return $"ss:{tableName}:count:{siteId}";
53+
}
54+
55+
public static string GetCountKey(string tableName, int siteId, int channelId)
56+
{
57+
return $"ss:{tableName}:count:{siteId}:{channelId}";
58+
}
59+
60+
public static string GetCountKey(string tableName, int siteId, int channelId, int adminId)
61+
{
62+
return $"ss:{tableName}:count:{siteId}:{channelId}:{adminId}";
63+
}
64+
}
65+
}

0 commit comments

Comments
 (0)