diff --git a/SiteServer.CMS/Core/OnlineTemplateManager.cs b/SiteServer.CMS/Core/OnlineTemplateManager.cs index 59f8b5c03..0dc7d6113 100644 --- a/SiteServer.CMS/Core/OnlineTemplateManager.cs +++ b/SiteServer.CMS/Core/OnlineTemplateManager.cs @@ -7,9 +7,9 @@ namespace SiteServer.CMS.Core { public static class OnlineTemplateManager { - private const string UrlTemplatesXml = "http://templates.siteserver.cn/templates.xml"; + private const string UrlTemplatesXml = "https://www.siteserver.cn/templates/templates.xml"; - public const string UrlHome = "http://templates.siteserver.cn"; + public const string UrlHome = "https://www.siteserver.cn/templates/"; public static bool TryGetOnlineTemplates(out List> list) { @@ -34,7 +34,7 @@ public static bool TryGetOnlineTemplates(out List> li while (ie.MoveNext()) { - var childNode = (XmlNode) ie.Current; + var childNode = (XmlNode)ie.Current; if (childNode == null) continue; var nodeName = childNode.Name; @@ -84,7 +84,7 @@ public static bool TryGetOnlineTemplates(out List> li public static string GetTemplateUrl(string name) { - return $"http://templates.siteserver.cn/t-{name.ToLower()}/index.html"; + return $"https://www.siteserver.cn/templates/t-{name.ToLower()}/index.html"; } public static string GetDownloadUrl(string name) diff --git a/SiteServer.CMS/ImportExport/AtomUtility.cs b/SiteServer.CMS/ImportExport/AtomUtility.cs index 9b5597623..774ba829e 100644 --- a/SiteServer.CMS/ImportExport/AtomUtility.cs +++ b/SiteServer.CMS/ImportExport/AtomUtility.cs @@ -76,7 +76,7 @@ public static AtomFeed GetEmptyFeed() { Title = new AtomContentConstruct("title", "siteserver channel"), Author = new AtomPersonConstruct("author", - "siteserver", new Uri("http://www.siteserver.cn")), + "siteserver", new Uri("https://www.siteserver.cn")), Modified = new AtomDateConstruct("modified", DateTime.Now, TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now)) }; @@ -88,7 +88,7 @@ public static AtomEntry GetEmptyEntry() { var entry = new AtomEntry { - Id = new Uri("http://www.siteserver.cn/"), + Id = new Uri("https://www.siteserver.cn/"), Title = new AtomContentConstruct("title", "title"), Modified = new AtomDateConstruct("modified", DateTime.Now, TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now)), diff --git a/SiteServer.CMS/StlParser/StlEntity/StlStlEntities.cs b/SiteServer.CMS/StlParser/StlEntity/StlStlEntities.cs index 5996b39d4..d93062705 100644 --- a/SiteServer.CMS/StlParser/StlEntity/StlStlEntities.cs +++ b/SiteServer.CMS/StlParser/StlEntity/StlStlEntities.cs @@ -10,10 +10,10 @@ namespace SiteServer.CMS.StlParser.StlEntity { [StlElement(Title = "通用实体", Description = "通过 {stl.} 实体在模板中显示对应数据")] public class StlStlEntities - { - private StlStlEntities() - { - } + { + private StlStlEntities() + { + } public const string EntityName = "stl"; @@ -22,30 +22,30 @@ private StlStlEntities() public static string SiteId = "SiteId"; public static string SiteDir = "SiteDir"; public static string SiteUrl = "SiteUrl"; - public static string RootUrl = "RootUrl"; + public static string RootUrl = "RootUrl"; public static string ApiUrl = "ApiUrl"; public static string CurrentUrl = "CurrentUrl"; public static string ChannelUrl = "ChannelUrl"; - public static string HomeUrl = "HomeUrl"; + public static string HomeUrl = "HomeUrl"; public static string LoginUrl = "LoginUrl"; - public static string RegisterUrl = "RegisterUrl"; - public static string LogoutUrl = "LogoutUrl"; + public static string RegisterUrl = "RegisterUrl"; + public static string LogoutUrl = "LogoutUrl"; public static SortedList AttributeList => new SortedList - { - {PoweredBy, "PoweredBy 链接"}, - {SiteName, "站点名称"}, - {SiteId, "站点ID"}, - {SiteDir, "站点文件夹"}, - {SiteUrl, "站点根目录地址"}, - {RootUrl, "系统根目录地址"}, + { + {PoweredBy, "PoweredBy 链接"}, + {SiteName, "站点名称"}, + {SiteId, "站点ID"}, + {SiteDir, "站点文件夹"}, + {SiteUrl, "站点根目录地址"}, + {RootUrl, "系统根目录地址"}, {ApiUrl, "Api地址"}, {CurrentUrl, "当前页地址"}, - {ChannelUrl, "栏目页地址"}, - {HomeUrl, "用户中心地址"}, + {ChannelUrl, "栏目页地址"}, + {HomeUrl, "用户中心地址"}, {LoginUrl, "用户中心登录页地址"}, - {RegisterUrl, "用户中心注册页地址"}, - {LogoutUrl, "退出登录页地址"} + {RegisterUrl, "用户中心注册页地址"}, + {LogoutUrl, "退出登录页地址"} }; internal static string Parse(string stlEntity, PageInfo pageInfo, ContextInfo contextInfo) @@ -58,7 +58,7 @@ internal static string Parse(string stlEntity, PageInfo pageInfo, ContextInfo co if (StringUtils.EqualsIgnoreCase(PoweredBy, attributeName))//支持信息 { - parsedContent = @"Powered by SiteServer CMS"; + parsedContent = @"Powered by SiteServer CMS"; } else if (StringUtils.EqualsIgnoreCase(RootUrl, attributeName))//系统根目录地址 { @@ -135,11 +135,11 @@ internal static string Parse(string stlEntity, PageInfo pageInfo, ContextInfo co if (pageInfo.SiteInfo.Additional.ContainsKey(attributeName)) { parsedContent = pageInfo.SiteInfo.Additional.GetString(attributeName); - + if (!string.IsNullOrEmpty(parsedContent)) { var styleInfo = TableStyleManager.GetTableStyleInfo(DataProvider.SiteDao.TableName, attributeName, TableStyleManager.GetRelatedIdentities(pageInfo.SiteId)); - + // 如果 styleInfo.TableStyleId <= 0，表示此字段已经被删除了，不需要再显示值了 ekun008 if (styleInfo.Id > 0) { @@ -166,5 +166,5 @@ internal static string Parse(string stlEntity, PageInfo pageInfo, ContextInfo co return parsedContent; } - } + } } diff --git a/SiteServer.Utils/ThirdParty/Atom/Atom.Utils/DefaultValues.cs b/SiteServer.Utils/ThirdParty/Atom/Atom.Utils/DefaultValues.cs index 651de3d5d..e99e68690 100644 --- a/SiteServer.Utils/ThirdParty/Atom/Atom.Utils/DefaultValues.cs +++ b/SiteServer.Utils/ThirdParty/Atom/Atom.Utils/DefaultValues.cs @@ -37,126 +37,126 @@ POSSIBILITY OF SUCH DAMAGE. namespace Atom.Utils { - /// - /// Contains default values for Atom feeds. - /// - [Serializable] - public sealed class DefaultValues - { - private DefaultValues() {} - - internal const string GeneratorName = "Atom.NET"; - internal static readonly Uri GeneratorUri = new Uri("http://www.siteserver.cn"); - internal const string GeneratorMessage = "Generated by SiteServer CMS"; - internal static readonly string GeneratorVersion = Utils.GetVersion(); - - internal const string AtomVersion = "0.3"; - internal const string AtomNSPrefix = "atom"; - internal static readonly Uri AtomNSUri = new Uri("http://purl.org/atom/ns#"); - - internal const string DCNSPrefix = "dc"; - internal static readonly Uri DCNSUri = new Uri("http://purl.org/dc/elements/1.1/"); - - /// - /// The media type of Atom xml format. - /// - public static readonly MediaType AtomMediaType = MediaType.ApplicationAtomXml; - - /// - /// The default language of the feed. - /// - public static readonly Language Language = Language.UnknownLanguage; - - /// - /// The default value for int values. - /// - public const int Int = -1; - - /// - /// The default media type. - /// It defaults to "text/plain". - /// - public static readonly MediaType MediaType = MediaType.TextPlain; - - /// - /// The default encoding mode for the contents. - /// - /// - /// - /// xml - /// The content is inline xml. - /// - /// - /// escaped - /// The content is an escaped string. - /// - /// - /// base64 - /// The content is base64 encoded. - /// - /// - /// - /// Processors must decode the element's content before considering it as content of the the indicated media type. - /// It defaults to "xml". - /// - public static readonly Mode Mode = Mode.Xml; - - /// - /// The default relationship for the links. - /// - /// - /// - /// alternate - /// The URI in the href attribute points to an alternate representation of the containing resource. - /// - /// - /// start - /// The Atom feed at the URI supplied in the href attribute contains the first feed in a linear sequence of entries. - /// - /// - /// next - /// The Atom feed at the URI supplied in the href attribute contains the next N entries in a linear sequence of entries. - /// - /// - /// prev - /// The Atom feed at the URI supplied in the href attribute contains the previous N entries in a linear sequence of entries. - /// - /// - /// service.edit - /// The URI given in the href attribute is used to edit a representation of the referred resource. - /// - /// - /// service.post - /// The URI in the href attribute is used to create new resources. - /// - /// - /// service.feed - /// The URI given in the href attribute is a starting point for navigating content and services. - /// - /// - /// - /// It defaults to "alternate". - /// - public const Relationship Rel = Relationship.Alternate; - - /// - /// The default uri for Uri fields. - /// - public static readonly Uri Uri = new Uri("http://www.intertwingly.net/wiki/pie/FrontPage"); - - /// - /// The default date/time. - /// - public static readonly DateTime DateTime = DateTime.MinValue; - - /// - /// The default UTC offset. - /// - public static readonly TimeSpan UtcOffset = TimeSpan.MinValue; - - /// - /// The default encoding. - /// - public static readonly Encoding Encoding = Encoding.UTF8; - } + /// + /// Contains default values for Atom feeds. + /// + [Serializable] + public sealed class DefaultValues + { + private DefaultValues() { } + + internal const string GeneratorName = "Atom.NET"; + internal static readonly Uri GeneratorUri = new Uri("https://www.siteserver.cn"); + internal const string GeneratorMessage = "Generated by SiteServer CMS"; + internal static readonly string GeneratorVersion = Utils.GetVersion(); + + internal const string AtomVersion = "0.3"; + internal const string AtomNSPrefix = "atom"; + internal static readonly Uri AtomNSUri = new Uri("http://purl.org/atom/ns#"); + + internal const string DCNSPrefix = "dc"; + internal static readonly Uri DCNSUri = new Uri("http://purl.org/dc/elements/1.1/"); + + /// + /// The media type of Atom xml format. + /// + public static readonly MediaType AtomMediaType = MediaType.ApplicationAtomXml; + + /// + /// The default language of the feed. + /// + public static readonly Language Language = Language.UnknownLanguage; + + /// + /// The default value for int values. + /// + public const int Int = -1; + + /// + /// The default media type. + /// It defaults to "text/plain". + /// + public static readonly MediaType MediaType = MediaType.TextPlain; + + /// + /// The default encoding mode for the contents. + /// + /// + /// + /// xml + /// The content is inline xml. + /// + /// + /// escaped + /// The content is an escaped string. + /// + /// + /// base64 + /// The content is base64 encoded. + /// + /// + /// + /// Processors must decode the element's content before considering it as content of the the indicated media type. + /// It defaults to "xml". + /// + public static readonly Mode Mode = Mode.Xml; + + /// + /// The default relationship for the links. + /// + /// + /// + /// alternate + /// The URI in the href attribute points to an alternate representation of the containing resource. + /// + /// + /// start + /// The Atom feed at the URI supplied in the href attribute contains the first feed in a linear sequence of entries. + /// + /// + /// next + /// The Atom feed at the URI supplied in the href attribute contains the next N entries in a linear sequence of entries. + /// + /// + /// prev + /// The Atom feed at the URI supplied in the href attribute contains the previous N entries in a linear sequence of entries. + /// + /// + /// service.edit + /// The URI given in the href attribute is used to edit a representation of the referred resource. + /// + /// + /// service.post + /// The URI in the href attribute is used to create new resources. + /// + /// + /// service.feed + /// The URI given in the href attribute is a starting point for navigating content and services. + /// + /// + /// + /// It defaults to "alternate". + /// + public const Relationship Rel = Relationship.Alternate; + + /// + /// The default uri for Uri fields. + /// + public static readonly Uri Uri = new Uri("http://www.intertwingly.net/wiki/pie/FrontPage"); + + /// + /// The default date/time. + /// + public static readonly DateTime DateTime = DateTime.MinValue; + + /// + /// The default UTC offset. + /// + public static readonly TimeSpan UtcOffset = TimeSpan.MinValue; + + /// + /// The default encoding. + /// + public static readonly Encoding Encoding = Encoding.UTF8; + } } diff --git a/SiteServer.Web/.gitignore b/SiteServer.Web/.gitignore index 9d0ea28d5..6d40f1e03 100644 --- a/SiteServer.Web/.gitignore +++ b/SiteServer.Web/.gitignore @@ -14,6 +14,7 @@ Template /Mullen/ /Matthew/ Web.config +.vscode/ test/ ## sqlserver diff --git a/SiteServer.Web/SiteServer/Cms/pageTemplateReference.aspx b/SiteServer.Web/SiteServer/Cms/pageTemplateReference.aspx index c6e13343a..ebabc4893 100644 --- a/SiteServer.Web/SiteServer/Cms/pageTemplateReference.aspx +++ b/SiteServer.Web/SiteServer/Cms/pageTemplateReference.aspx @@ -27,7 +27,7 @@

STL语言为SiteServer模板语言(SiteServer Template Language)的缩写，是一种和HTML语言类似的服务器端语言。 - STL 语言参考手册 + STL 语言参考手册

diff --git a/SiteServer.Web/SiteServer/Installer/default.aspx b/SiteServer.Web/SiteServer/Installer/default.aspx index 463131706..30329fe9f 100644 --- a/SiteServer.Web/SiteServer/Installer/default.aspx +++ b/SiteServer.Web/SiteServer/Installer/default.aspx @@ -421,7 +421,7 @@

获取更多使用帮助请访问 - SiteServer CMS 文档中心 + SiteServer CMS 文档中心

diff --git a/SiteServer.Web/SiteServer/Plugins/add.js b/SiteServer.Web/SiteServer/Plugins/add.js index b59ad7307..36cfd760d 100644 --- a/SiteServer.Web/SiteServer/Plugins/add.js +++ b/SiteServer.Web/SiteServer/Plugins/add.js @@ -13,7 +13,7 @@ var data = { var methods = { getIconUrl: function (url) { - return 'http://plugins.siteserver.cn/' + url; + return 'https://www.siteserver.cn/plugins/' + url; }, getTagNames: function (pluginInfo) { diff --git a/SiteServer.Web/SiteServer/Plugins/manage.js b/SiteServer.Web/SiteServer/Plugins/manage.js index 696ddfac5..9d13d5a1c 100644 --- a/SiteServer.Web/SiteServer/Plugins/manage.js +++ b/SiteServer.Web/SiteServer/Plugins/manage.js @@ -19,7 +19,7 @@ var data = { var methods = { getIconUrl: function (url) { - return 'https://plugins.siteserver.cn/' + url; + return 'https://www.siteserver.cn/plugins/' + url; }, load: function () { diff --git a/SiteServer.Web/SiteServer/Plugins/view.js b/SiteServer.Web/SiteServer/Plugins/view.js index 0dcb7d63c..2f716244b 100644 --- a/SiteServer.Web/SiteServer/Plugins/view.js +++ b/SiteServer.Web/SiteServer/Plugins/view.js @@ -19,7 +19,7 @@ var data = { var methods = { getIconUrl: function (url) { if (url && url.indexOf('://') !== -1) return url; - return 'http://plugins.siteserver.cn/' + url; + return 'https://www.siteserver.cn/plugins/' + url; }, getTagNames: function (pluginInfo) { diff --git a/SiteServer.Web/SiteServer/Settings/adminAccessTokens.cshtml b/SiteServer.Web/SiteServer/Settings/adminAccessTokens.cshtml index 3fe05b9ed..5a6716d62 100644 --- a/SiteServer.Web/SiteServer/Settings/adminAccessTokens.cshtml +++ b/SiteServer.Web/SiteServer/Settings/adminAccessTokens.cshtml @@ -42,7 +42,7 @@ 关联管理员定义API密钥的访问权限，API密钥的访问权限将被限制在此管理员的权限范围内 - 阅读更多 + 阅读更多 @@ -60,7 +60,7 @@ 授权范围定义API密钥可访问的API地址，API密钥能够访问的API地址将被限制在授权范围内 - 阅读更多 + 阅读更多 diff --git a/SiteServer.Web/SiteServer/Settings/adminAccessTokens.js b/SiteServer.Web/SiteServer/Settings/adminAccessTokens.js index 40ae7feea..a7fee5ff0 100644 --- a/SiteServer.Web/SiteServer/Settings/adminAccessTokens.js +++ b/SiteServer.Web/SiteServer/Settings/adminAccessTokens.js @@ -4,7 +4,7 @@ var data = { pageLoad: false, pageAlert: { type: 'warning', - html: 'API密钥可以用于访问 SiteServer REST API 阅读更多' + html: 'API密钥可以用于访问 SiteServer REST API 阅读更多' }, pageType: null, items: null, diff --git a/SiteServer.Web/SiteServer/Settings/pageSiteAdd.aspx b/SiteServer.Web/SiteServer/Settings/pageSiteAdd.aspx index dfa609e0a..c0f354b28 100644 --- a/SiteServer.Web/SiteServer/Settings/pageSiteAdd.aspx +++ b/SiteServer.Web/SiteServer/Settings/pageSiteAdd.aspx @@ -81,7 +81,7 @@

请选择在线模板，本页面只显示部分免费模板，更多站点模板请访问官网： - http://templates.siteserver.cn + https://www.siteserver.cn/templates/

diff --git a/SiteServer.Web/SiteServer/Settings/siteAdd.js b/SiteServer.Web/SiteServer/Settings/siteAdd.js index 4687f17a9..8942aab1f 100644 --- a/SiteServer.Web/SiteServer/Settings/siteAdd.js +++ b/SiteServer.Web/SiteServer/Settings/siteAdd.js @@ -59,7 +59,7 @@ var methods = { }, getTemplateUrl: function (relatedUrl) { - return 'https://templates.siteserver.cn/' + relatedUrl; + return 'https://www.siteserver.cn/templates/' + relatedUrl; }, getPreviewUrl: function (templateId) { diff --git a/SiteServer.Web/SiteServer/Settings/siteTemplateOnline.js b/SiteServer.Web/SiteServer/Settings/siteTemplateOnline.js index cc6c8af1e..8b51faf68 100644 --- a/SiteServer.Web/SiteServer/Settings/siteTemplateOnline.js +++ b/SiteServer.Web/SiteServer/Settings/siteTemplateOnline.js @@ -19,7 +19,7 @@ var methods = { }, getTemplateUrl: function (relatedUrl) { - return 'https://templates.siteserver.cn/' + relatedUrl; + return 'https://www.siteserver.cn/templates/' + relatedUrl; }, getPreviewUrl: function (templateId) { diff --git a/SiteServer.Web/SiteServer/main.js b/SiteServer.Web/SiteServer/main.js index ff339a26a..7499ecdc5 100644 --- a/SiteServer.Web/SiteServer/main.js +++ b/SiteServer.Web/SiteServer/main.js @@ -148,7 +148,7 @@ var methods = { if (res.value) { $this.newVersion = { - updatesUrl: 'http://www.siteserver.cn/updates/v' + major + '_' + minor + '/index.html', + updatesUrl: 'https://www.siteserver.cn/updates/v' + major + '_' + minor + '/index.html', version: releaseInfo.version, published: releaseInfo.published, releaseNotes: releaseInfo.releaseNotes diff --git a/SiteServer.Web/SiteServer/pageSyncDatabase.aspx b/SiteServer.Web/SiteServer/pageSyncDatabase.aspx index 169319086..12a4cb554 100644 --- a/SiteServer.Web/SiteServer/pageSyncDatabase.aspx +++ b/SiteServer.Web/SiteServer/pageSyncDatabase.aspx @@ -110,7 +110,7 @@

获取更多使用帮助请访问 - SiteServer CMS 文档中心 + SiteServer CMS 文档中心

diff --git a/SiteServer.Web/SiteServer/pageUpdateSystem.aspx b/SiteServer.Web/SiteServer/pageUpdateSystem.aspx index 9c307c430..0a4bfe75a 100644 --- a/SiteServer.Web/SiteServer/pageUpdateSystem.aspx +++ b/SiteServer.Web/SiteServer/pageUpdateSystem.aspx @@ -159,7 +159,7 @@

获取更多使用帮助请访问 - SiteServer CMS 文档中心 + SiteServer CMS 文档中心

@@ -214,7 +214,7 @@ $this.isShouldUpdate = compareversion($this.installedVersion, $this.package.version) == -1; var major = $this.package.version.split('.')[0]; var minor = $this.package.version.split('.')[1]; - $this.updatesUrl = 'http://www.siteserver.cn/updates/v' + major + '_' + minor + '/index.html'; + $this.updatesUrl = 'https://www.siteserver.cn/updates/v' + major + '_' + minor + '/index.html'; }).catch(function (error) { $this.pageAlert = utils.getPageAlert(error); @@ -232,7 +232,7 @@ // $this.isShouldUpdate = compareversion($this.installedVersion, $this.package.version) == -1; // var major = $this.package.version.split('.')[0]; // var minor = $this.package.version.split('.')[1]; - // $this.updatesUrl = 'http://www.siteserver.cn/updates/v' + major + '_' + minor + '/index.html'; + // $this.updatesUrl = 'https://www.siteserver.cn/updates/v' + major + '_' + minor + '/index.html'; // }, 'packages', packageId); }, check: function () { diff --git a/SiteServer.Web/Web.config b/SiteServer.Web/Web.config index 141bc1d19..408e4041e 100644 --- a/SiteServer.Web/Web.config +++ b/SiteServer.Web/Web.config @@ -13,8 +13,7 @@ - - +