Skip to content

Commit

Permalink
6.15
Browse files Browse the repository at this point in the history
  • Loading branch information
starlying committed May 31, 2020
1 parent c87ac90 commit 63f708c
Show file tree
Hide file tree
Showing 347 changed files with 1,627 additions and 36,760 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

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

## 版本

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

## 开发文档

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

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

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

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

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

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

## SiteServer CMS 源码结构

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

## 关注最新动态

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

## License

Expand Down
2 changes: 1 addition & 1 deletion SS.CMS.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<copyright>Copyright © SiteServer CMS</copyright>
<tags>SiteServer CMS</tags>
<releaseNotes>
SiteServer CMS V6.14正式版
SiteServer CMS V6.15正式版
</releaseNotes>
</metadata>
</package>
5 changes: 3 additions & 2 deletions SiteServer.BackgroundPages/Ajax/AjaxCreateService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 = OnlineTemplateManager.GetDownloadUrl(onlineTemplateName);
var downloadUrl = CloudUtils.Dl.GetTemplatesUrl(fileName);
WebClientUtils.SaveRemoteFileToLocal(downloadUrl, filePath);

CacheUtils.Insert(cacheCurrentCountKey, "2");
Expand Down
2 changes: 2 additions & 0 deletions SiteServer.BackgroundPages/Cms/ModalCrossSiteTransEdit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ protected void DdlTransType_OnSelectedIndexChanged(object sender, EventArgs e)
foreach (var psId in siteIdList)
{
var psInfo = SiteManager.GetSiteInfo(psId);
if(psInfo == null) continue;

var show = false;
if (contributeType == ECrossSiteTransType.SpecifiedSite)
{
Expand Down
3 changes: 2 additions & 1 deletion SiteServer.BackgroundPages/Cms/PageContentAddHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ protected override object Process()
}
}

contentInfo.Id = DataProvider.ContentDao.InsertPreview(tableName, siteInfo, channelInfo, contentInfo);
contentInfo.SourceId = SourceManager.Preview;
contentInfo.Id = DataProvider.ContentDao.Insert(tableName, siteInfo, channelInfo, contentInfo);

return new
{
Expand Down
10 changes: 5 additions & 5 deletions SiteServer.BackgroundPages/Cms/PageTemplateReference.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public void Page_Load(object sender, EventArgs e)

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

allBuilder.Append($@"
<tr class=""{(elementName == _elementName ? "bg-secondary text-white" : string.Empty)}"">
Expand All @@ -54,7 +55,7 @@ public void Page_Load(object sender, EventArgs e)
</a>
</td>
<td>{stlAttribute.Title}</td>
<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>
<td><a href=""{tagNameUrl}"" target=""_blank"" class=""{(elementName == _elementName ? "text-white" : string.Empty)}"">{tagNameUrl}</a></td>
</tr>");
}

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

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

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

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

Expand All @@ -118,7 +118,7 @@ public void Page_Load(object sender, EventArgs e)
</h4>
<p>
{stlAttribute.Description}
<a href=""{helpUrl}"" target=""_blank"">详细使用说明</a>
<a href=""{tagNameUrl}"" target=""_blank"">详细使用说明</a>
</p>
<div class=""panel panel-default m-t-10"">
<div class=""panel-body p-0"">
Expand Down
3 changes: 2 additions & 1 deletion SiteServer.CMS/Api/Sys/Stl/ApiRouteActionsSearch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static string GetUrl(string apiUrl)
return PageUtils.Combine(apiUrl, Route);
}

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)
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)
{
return $@"
{{
Expand Down Expand Up @@ -55,6 +55,7 @@ public static string GetParameters(bool isAllSites, string siteName, string site
StlSearch.Since.ToLower(),
StlSearch.PageNum.ToLower(),
StlSearch.IsHighlight.ToLower(),
StlSearch.IsDefaultDisplay.ToLower(),
"siteid",
"ajaxdivid",
"template",
Expand Down
65 changes: 65 additions & 0 deletions SiteServer.CMS/Core/Caching.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
namespace SiteServer.CMS.Core
{
public static class Caching
{
public static string GetAllKey(string tableName)
{
return $"ss:{tableName}:all";
}

public static string GetAllKey(string tableName, int siteId)
{
return $"ss:{tableName}:all:{siteId}";
}

public static string GetAllKey(string tableName, string type, string identity)
{
return $"ss:{tableName}:all:{type}:{identity}";
}

public static string GetEntityKey(string tableName)
{
return $"ss:{tableName}:entity:only";
}

public static string GetEntityKey(string tableName, int id)
{
return $"ss:{tableName}:entity:{id}";
}

public static string GetEntityKey(string tableName, string type, string identity)
{
return $"ss:{tableName}:entity:{type}:{identity}";
}

public static string GetListKey(string tableName)
{
return $"ss:{tableName}:list";
}

public static string GetListKey(string tableName, int siteId)
{
return $"ss:{tableName}:list:{siteId}";
}

public static string GetListKey(string tableName, string type)
{
return $"ss:{tableName}:list:{type}";
}

public static string GetCountKey(string tableName, int siteId)
{
return $"ss:{tableName}:count:{siteId}";
}

public static string GetCountKey(string tableName, int siteId, int channelId)
{
return $"ss:{tableName}:count:{siteId}:{channelId}";
}

public static string GetCountKey(string tableName, int siteId, int channelId, int adminId)
{
return $"ss:{tableName}:count:{siteId}:{channelId}:{adminId}";
}
}
}
Loading

0 comments on commit 63f708c

Please sign in to comment.