8000 dynamic · githubsunyf/cms@644b410 · GitHub
[go: up one dir, main page]
Skip to content

Commit 644b410

Browse files
starlyingstarlying
committed
dynamic
1 parent 20c3c3a commit 644b410

File tree

518 files changed

+10751
-8485
lines changed

Some content is hidden

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

518 files changed

+10751
-8485
lines changed

‎SiteServer.API.Tests/SiteServer.API.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
6262
</Reference>
63+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
64+
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
65+
</Reference>
6366
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6467
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
6568
</Reference>

‎SiteServer.API.Tests/Utils/AdminUtils.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System;
2-
using SiteServer.CMS.Database.Caches;
2+
using SiteServer.CMS.Caches;
33
using SiteServer.CMS.Database.Core;
44
using SiteServer.CMS.Database.Models;
55
using SiteServer.Utils.Enumerations;
@@ -44,7 +44,7 @@ public static AdministratorInfo CreateSuperAdminIfNotExists()
4444

4545
public static string GetAccessToken(AdministratorInfo adminInfo)
4646
{
47-
var expiresAt = DateTime.Now.AddDays(7);
47+
var expiresAt = TimeSpan.FromDays(7);
4848
return Rest.GetAccessToken(adminInfo.Id, adminInfo.UserName, expiresAt);
4949
}
5050
}

‎SiteServer.API.Tests/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<package id="MSTest.TestFramework" version="1.3.2" targetFramework="net452" />
77
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
88
<package id="SqlKata" version="1.1.7" targetFramework="net452" />
9+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
910
<package id="Validation" version="2.4.18" targetFramework="net452" />
1011
<package id="xunit" version="2.4.1" targetFramework="net452" />
1112
<package id="xunit.abstractions" version="2.0.3" targetFramework="net452" />

‎SiteServer.BackgroundPages/Account/PagePassword.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Web.UI.WebControls;
3-
using SiteServer.CMS.Database.Caches;
3+
using SiteServer.CMS.Caches;
44
using SiteServer.CMS.Database.Core;
55
using SiteServer.Utils.Enumerations;
66

‎SiteServer.BackgroundPages/Account/PageProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Web.UI.WebControls;
3-
using SiteServer.CMS.Database.Caches;
3+
using SiteServer.CMS.Caches;
44
using SiteServer.CMS.Database.Core;
55

66
namespace SiteServer.BackgroundPages.Account

‎SiteServer.BackgroundPages/Ajax/AjaxBackupService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using System.Web.UI;
44
using SiteServer.Utils;
55
using SiteServer.BackgroundPages.Core;
6+
using SiteServer.CMS.Caches;
67
using SiteServer.CMS.Core;
78
using SiteServer.CMS.Core.Enumerations;
89
using SiteServer.CMS.Core.RestRoutes;
910
using SiteServer.CMS.Core.RestRoutes.Sys.Stl;
10-
using SiteServer.CMS.Database.Caches;
1111
using SiteServer.CMS.ImportExport;
1212
using SiteServer.CMS.Plugin.Impl;
1313

‎SiteServer.BackgroundPages/Ajax/AjaxCmsService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
using System.Collections.Specialized;
33
using System.Text;
44
using System.Web.UI;
5+
using SiteServer.CMS.Caches;
56
using SiteServer.Utils;
67
using SiteServer.CMS.Core;
78
using SiteServer.CMS.Database.Attributes;
8-
using SiteServer.CMS.Database.Caches;
99
using SiteServer.CMS.Database.Core;
1010

1111
namespace SiteServer.BackgroundPages.Ajax

‎SiteServer.BackgroundPages/Ajax/AjaxCreateService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using System.Web.UI;
44
using SiteServer.Utils;
55
using SiteServer.BackgroundPages.Core;
6+
using SiteServer.CMS.Caches;
67
using SiteServer.CMS.Core;
78
using SiteServer.CMS.Core.Create;
8-
using SiteServer.CMS.Database.Caches;
99
using SiteServer.CMS.Plugin.Impl;
1010

1111
namespace SiteServer.BackgroundPages.Ajax

‎SiteServer.BackgroundPages/Ajax/AjaxOtherService.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using System.Web.UI;
66
using SiteServer.Utils;
77
using SiteServer.BackgroundPages.Core;
8+
using SiteServer.CMS.Caches;
89
using SiteServer.CMS.Core;
910
using SiteServer.CMS.Core.Enumerations;
10-
using SiteServer.CMS.Database.Caches;
1111
using SiteServer.CMS.Database.Models;
1212
using SiteServer.CMS.Plugin.Impl;
1313
using SiteServer.Utils.Enumerations;
@@ -404,19 +404,15 @@ public string GetLoadingChannels(int siteId, string contentModelPluginId, int pa
404404

405405
var eLoadingType = ELoadingTypeUtils.GetEnumType(loadingType);
406406

407-
var channelIdList =
408-
ChannelManager.GetChannelIdList(
409-
ChannelManager.GetChannelInfo(siteId, parentId == 0 ? siteId : parentId), EScopeType.Children,
410-
string.Empty, string.Empty, string.Empty);
411-
412407
var siteInfo = SiteManager.GetSiteInfo(siteId);
413-
408+
var parentChannelInfo = ChannelManager.GetChannelInfo(siteId, parentId == 0 ? siteId : parentId);
409+
var channelIdList =
410+
ChannelManager.GetChannelIdList(parentChannelInfo, EScopeType.Children, string.Empty, string.Empty, string.Empty);
414411
var nameValueCollection = TranslateUtils.ToNameValueCollection(TranslateUtils.DecryptStringBySecretKey(additional));
415412

416413
foreach (var channelId in channelIdList)
417414
{
418415
var channelInfo = ChannelManager.GetChannelInfo(siteId, channelId);
419-
420416
var enabled = request.AdminPermissionsImpl.IsOwningChannelId(channelId);
421417
if (!string.IsNullOrEmpty(contentModelPluginId) &&
422418
!StringUtils.EqualsIgnoreCase(channelInfo.ContentModelPluginId, contentModelPluginId))

‎SiteServer.BackgroundPages/Ajax/AjaxSystemService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using SiteServer.Utils;
77
using SiteServer.BackgroundPages.Core;
88
using SiteServer.BackgroundPages.Settings;
9-
using SiteServer.CMS.Database.Caches;
9+
using SiteServer.CMS.Caches;
1010
using SiteServer.CMS.Database.Core;
1111

1212
namespace SiteServer.BackgroundPages.Ajax

0 commit comments

Comments
 (0)
0