cloud

siteserver · May 22, 2020 · 11e9f4c · 11e9f4c
1 parent bdee45e
commit 11e9f4c
Show file tree

Hide file tree

Showing 46 changed files with 211 additions and 456 deletions.
diff --git a/SiteServer.BackgroundPages/Ajax/AjaxCreateService.cs b/SiteServer.BackgroundPages/Ajax/AjaxCreateService.cs
@@ -166,7 +166,7 @@ public NameValueCollection CreateSiteByOnlineTemplateName(int siteId, bool isImp
 
                 var filePath = PathUtility.GetSiteTemplatesPath($"T_{onlineTemplateName}.zip");
                 FileUtils.DeleteFileIfExists(filePath);
-                var downloadUrl = OnlineTemplateManager.GetDownloadUrl(onlineTemplateName);
+                var downloadUrl = CloudUtils.Dl.GetTemplatesUrl(onlineTemplateName);
                 WebClientUtils.SaveRemoteFileToLocal(downloadUrl, filePath);
 
                 CacheUtils.Insert(cacheCurrentCountKey, "2");

diff --git a/SiteServer.BackgroundPages/Cms/ModalCrossSiteTransEdit.cs b/SiteServer.BackgroundPages/Cms/ModalCrossSiteTransEdit.cs
@@ -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)
                     {

diff --git a/SiteServer.BackgroundPages/Cms/PageTemplateReference.cs b/SiteServer.BackgroundPages/Cms/PageTemplateReference.cs
@@ -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)}"">
@@ -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>");
             }
 
@@ -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>
@@ -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));
 
@@ -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"">

diff --git a/SiteServer.CMS/Api/Sys/Stl/ApiRouteActionsSearch.cs b/SiteServer.CMS/Api/Sys/Stl/ApiRouteActionsSearch.cs
@@ -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 $@"
 {{
@@ -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",

diff --git a/SiteServer.CMS/Core/OnlineTemplateManager.cs b/SiteServer.CMS/Core/OnlineTemplateManager.cs
diff --git 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("https://www.siteserver.cn")),
+                    "siteserver", new Uri(CloudUtils.Root.Host)),
                 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("https://www.siteserver.cn/"),
+                Id = new Uri(CloudUtils.Root.Host),
                 Title = new AtomContentConstruct("title", "title"),
                 Modified = new AtomDateConstruct("modified", DateTime.Now,
                     TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now)),

diff --git a/SiteServer.CMS/Packaging/PackageMetadata.cs b/SiteServer.CMS/Packaging/PackageMetadata.cs
@@ -4,6 +4,7 @@
 using NuGet.Packaging;
 using NuGet.Versioning;
 using SiteServer.Plugin;
+using SiteServer.Utils;
 
 namespace SiteServer.CMS.Packaging
 {
@@ -18,7 +19,7 @@ public PackageMetadata(string directoryName)
         {
             Id = directoryName;
             Title = directoryName;
-            IconUrl = new Uri("https://www.siteserver.cn/assets/images/favicon.png");
+            IconUrl = new Uri(CloudUtils.Root.IconUrl);
             Version = "0.0.0";
         }
 

diff --git a/SiteServer.CMS/Packaging/PackageUtils.cs b/SiteServer.CMS/Packaging/PackageUtils.cs
@@ -84,8 +84,7 @@ public static void DownloadPackage(string packageId, string version)
                 }
 
                 var localFilePath = PathUtils.Combine(directoryPath, idWithVersion + ".nupkg");
-                WebClientUtils.SaveRemoteFileToLocal(
-                    $"https://api.siteserver.cn/downloads/update/{version}", localFilePath);
+                WebClientUtils.SaveRemoteFileToLocal(CloudUtils.Dl.GetPackagesUrl(PackageIdSsCms, version), localFilePath);
 
                 ZipUtils.ExtractZip(localFilePath, directoryPath);
             }
@@ -98,8 +97,7 @@ public static void DownloadPackage(string packageId, string version)
 
                 var localFilePath = PathUtils.Combine(directoryPath, idWithVersion + ".nupkg");
 
-                WebClientUtils.SaveRemoteFileToLocal(
-                    $"https://api.siteserver.cn/downloads/package/{packageId}/{version}", localFilePath);
+                WebClientUtils.SaveRemoteFileToLocal(CloudUtils.Dl.GetPackagesUrl(packageId, version), localFilePath);
 
                 ZipUtils.ExtractZip(localFilePath, directoryPath);