Skip to content

Commit 993aa02

Browse files
author
Wayne
committed
Standard
1 parent 5be0313 commit 993aa02

File tree

7 files changed

+22
-11
lines changed

7 files changed

+22
-11
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ obj
1010
/Easy.CMS.Web/Modules/Statistics
1111
/Easy.CMS.Web/Modules/SelfService_Provider
1212
/Easy.CMS.Web/Modules/SelfService_Register
13+
/Easy.CMS.Web/Modules/StaticCache
1314
/Easy.CMS.Web/Modules/Chart
1415
/Easy.CMS.Web/Modules/.svn
1516
/ZKEASOFT.Privite.CMS.Web.sln

Easy.CMS.Web/Modules/Standard/Easy.CMS.Standard.csproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ProductVersion>
88
</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
10-
<ProjectGuid>{D1E0BEA0-D9BB-4330-9813-235FB8A447AF}</ProjectGuid>
10+
<ProjectGuid>{FB132700-B44D-4E55-806F-08A92235EA68}</ProjectGuid>
1111
<ProjectTypeGuids>{E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,14 +45,6 @@
4545
<HintPath>..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="Easy, Version=1.0.7.2, Culture=neutral, PublicKeyToken=2b89634455a72a39, processorArchitecture=MSIL">
49-
<HintPath>..\..\..\packages\EasyFrameWork.1.0.7.2\lib\net40\Easy.dll</HintPath>
50-
<Private>True</Private>
51-
</Reference>
52-
<Reference Include="Easy.Web, Version=1.0.9.1, Culture=neutral, PublicKeyToken=48e55983b3ecaefe, processorArchitecture=MSIL">
53-
<HintPath>..\..\..\packages\EasyFrameWork.Web.1.0.9.1\lib\net40\Easy.Web.dll</HintPath>
54-
<Private>True</Private>
55-
</Reference>
5648
<Reference Include="Microsoft.CSharp" />
5749
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5850
<HintPath>..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
@@ -130,6 +122,14 @@
130122
<Project>{2e8362ae-80d6-43e0-b3bf-cab6d888d154}</Project>
131123
<Name>Easy.Web.CMS</Name>
132124
</ProjectReference>
125+
<ProjectReference Include="..\..\..\EasyFrameWork.Web\Easy.Web.csproj">
126+
<Project>{a1228125-f5c4-4001-ac7d-1accf1679828}</Project>
127+
<Name>Easy.Web</Name>
128+
</ProjectReference>
129+
<ProjectReference Include="..\..\..\EasyFrameWork\Easy.csproj">
130+
<Project>{edb1baa7-ec61-4292-bbe5-3bc39eb171e4}</Project>
131+
<Name>Easy</Name>
132+
</ProjectReference>
133133
</ItemGroup>
134134
<ItemGroup>
135135
<Content Include="packages.config" />

Easy.CMS.Web/Modules/Standard/packages.config

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<package id="AspNetMvc" version="4.0.20710.0" targetFramework="net40" />
44
<package id="Autofac" version="3.5.2" targetFramework="net40" />
55
<package id="CommonServiceLocator" version="1.3" targetFramework="net40" />
6-
<package id="EasyFrameWork" version="1.0.7.2" targetFramework="net40" />
7-
<package id="EasyFrameWork.Web" version="1.0.9.1" targetFramework="net40" />
86
<package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net40" />
97
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
108
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />

EasyFrameWork.CMS/Page/DataBasePageCache.cs

+5
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,10 @@ public void SaveSetting(StaticPageCacheSetting setting)
8989
{
9090
_dataArchivedService.Add(new DataArchived.DataArchived { ID = SettingKey, Data = JsonConvert.SerializeObject(setting) });
9191
}
92+
93+
public long Count()
94+
{
95+
return _dataArchivedService.Count(new Data.DataFilter().Where("ID", Data.OperatorType.StartWith, "PageHtmlContent:"));
96+
}
9297
}
9398
}

EasyFrameWork.CMS/Page/FileStaticPageCache.cs

+6
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,11 @@ public void SaveSetting(StaticPageCacheSetting setting)
100100
var file = Path.Combine(GetFolder(), SettingFile);
101101
File.WriteAllText(file, JsonConvert.SerializeObject(setting));
102102
}
103+
104+
public long Count()
105+
{
106+
var dir = new DirectoryInfo(HttpContext.Current.Request.MapPath(CacheFolder.FormatWith(HttpContext.Current.Request.Url.Host)));
107+
return dir.GetFiles(NameFormat.FormatWith("*")).Count();
108+
}
103109
}
104110
}

EasyFrameWork.CMS/Page/IStaticPageCache.cs

+1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ public interface IStaticPageCache : IOnPageFinished
1515
void Delete(string searchPattern);
1616
StaticPageCacheSetting GetSetting();
1717
void SaveSetting(StaticPageCacheSetting setting);
18+
long Count();
1819
}
1920
}
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)