Browse Source

6.6

pull/1840/head
starlying 7 years ago
parent
commit
26edf1fd34
  1. 5
      SiteServer.BackgroundPages/PageSyncDatabase.cs
  2. 3
      SiteServer.CMS/Packaging/PackageUtils.cs
  3. 7
      SiteServer.Web/Controllers/Sys/Packaging/PackagingDownloadController.cs
  4. 9
      SiteServer.Web/Controllers/Sys/Packaging/PackagingSyncDatabaseController.cs
  5. 6
      SiteServer.Web/Controllers/Sys/Packaging/PackagingUpdateSsCmsController.cs

5
SiteServer.BackgroundPages/PageSyncDatabase.cs

@ -9,11 +9,6 @@ namespace SiteServer.BackgroundPages
{
public class PageSyncDatabase : Page
{
public static string GetRedirectUrl()
{
return PageUtils.GetSiteServerUrl(nameof(PageSyncDatabase), null);
}
public string UpdateDatabaseApiUrl => ApiRouteSyncDatabase.GetUrl(ApiManager.InnerApiUrl);
public string AdminUrl => PageUtils.GetAdminDirectoryUrl(string.Empty);

3
SiteServer.CMS/Packaging/PackageUtils.cs

@ -16,6 +16,9 @@ namespace SiteServer.CMS.Packaging
public const string PackageIdSsCms = "SS.CMS";
public const string VersionDev = "0.0.0";
public const string CacheKeySsCmsIsDownload = nameof(CacheKeySsCmsIsDownload);
public const string CacheKeySsCmsIsCopyFiles = nameof(CacheKeySsCmsIsCopyFiles);
//private const string NuGetPackageSource = "https://packages.nuget.org/api/v2";
//private const string MyGetPackageSource = "https://www.myget.org/F/siteserver/api/v2";

7
SiteServer.Web/Controllers/Sys/Packaging/PackagingDownloadController.cs

@ -1,7 +1,9 @@
using System.Web.Http;
using SiteServer.CMS.Api.Sys.Packaging;
using SiteServer.CMS.Core;
using SiteServer.CMS.Packaging;
using SiteServer.CMS.Plugin;
using SiteServer.Utils;
namespace SiteServer.API.Controllers.Sys.Packaging
{
@ -30,6 +32,11 @@ namespace SiteServer.API.Controllers.Sys.Packaging
PackageUtils.DownloadPackage(packageId, version);
}
if (StringUtils.EqualsIgnoreCase(packageId, PackageUtils.PackageIdSsCms))
{
CacheDbUtils.RemoveAndInsert(PackageUtils.CacheKeySsCmsIsDownload, true.ToString());
}
return Ok();
}
}

9
SiteServer.Web/Controllers/Sys/Packaging/PackagingSyncDatabaseController.cs

@ -1,6 +1,8 @@
using System.Web.Http;
using SiteServer.CMS.Api.Sys.Packaging;
using SiteServer.CMS.Core;
using SiteServer.CMS.Packaging;
using SiteServer.Utils;
namespace SiteServer.API.Controllers.Sys.Packaging
{
@ -10,6 +12,13 @@ namespace SiteServer.API.Controllers.Sys.Packaging
[HttpPost, Route(ApiRouteSyncDatabase.Route)]
public IHttpActionResult Main()
{
var isCopyFiles = TranslateUtils.ToBool(CacheDbUtils.GetValueAndRemove(PackageUtils.CacheKeySsCmsIsCopyFiles));
if (!isCopyFiles)
{
return Unauthorized();
}
SystemManager.SyncDatabase();
return Ok(new

6
SiteServer.Web/Controllers/Sys/Packaging/PackagingUpdateSsCmsController.cs

@ -15,7 +15,9 @@ namespace SiteServer.API.Controllers.Sys.Packaging
{
var request = new AuthRequest();
if (!request.IsAdminLoggin)
var isDownload = TranslateUtils.ToBool(CacheDbUtils.GetValueAndRemove(PackageUtils.CacheKeySsCmsIsDownload));
if (!isDownload)
{
return Unauthorized();
}
@ -31,6 +33,8 @@ namespace SiteServer.API.Controllers.Sys.Packaging
DirectoryUtils.Copy(PathUtils.Combine(packagePath, DirectoryUtils.Bin.DirectoryName), PathUtils.GetBinDirectoryPath(string.Empty), true);
FileUtils.CopyFile(packageWebConfigPath, PathUtils.Combine(WebConfigUtils.PhysicalApplicationPath, WebConfigUtils.WebConfigFileName), true);
CacheDbUtils.RemoveAndInsert(PackageUtils.CacheKeySsCmsIsCopyFiles, true.ToString());
//SystemManager.SyncDatabase();
return Ok();

Loading…
Cancel
Save