Skip to content

Commit 56971ef

Browse files
ixreixre
committed
refactor index page cache
1 parent 0c64b8a commit 56971ef

31 files changed

+233
-52
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ src/JR.Cms.AspNet.App/install
4747
src/JR.Cms.AspNet.App/uploads
4848
*.blob
4949

50+
/src/JR.Cms.App/index.html

‎src/JR.Cms/Cms.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using JR.Cms.Core;
1515
using JR.Cms.Infrastructure;
1616
using JR.Cms.Library.CacheProvider;
17-
using JR.Cms.Library.CacheProvider.CacheCompoment;
17+
using JR.Cms.Library.CacheProvider.CacheComponent;
1818
using JR.Cms.Library.DataAccess.DB;
1919
using JR.Cms.ServiceDto;
2020
using JR.Stand.Core;

‎src/JR.Cms/Library/CacheProvider/CacheCompoment/BuiltCacheResultHandler.cs renamed to ‎src/JR.Cms/Library/CacheProvider/CacheComponent/BuiltCacheResultHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* To change this template use Tools | Options | Coding | Edit Standard Headers.
88
*/
99

10-
namespace JR.Cms.Library.CacheProvider.CacheCompoment
10+
namespace JR.Cms.Library.CacheProvider.CacheComponent
1111
{
1212
/// <summary>
1313
/// 创建缓存数据结果事件

‎src/JR.Cms/Library/CacheProvider/CacheCompoment/CacheSign.cs renamed to ‎src/JR.Cms/Library/CacheProvider/CacheComponent/CacheSign.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
using System;
1111

12-
namespace JR.Cms.Library.CacheProvider.CacheCompoment
12+
namespace JR.Cms.Library.CacheProvider.CacheComponent
1313
{
1414
/// <summary>
1515
/// 缓存符号

‎src/JR.Cms/Library/CacheProvider/CacheCompoment/CmsCache.cs renamed to ‎src/JR.Cms/Library/CacheProvider/CacheComponent/CmsCache.cs

+21-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using JR.Stand.Core.Framework.Web.Cache;
1818
using JR.Stand.Core.Utils;
1919

20-
namespace JR.Cms.Library.CacheProvider.CacheCompoment
20+
namespace JR.Cms.Library.CacheProvider.CacheComponent
2121
{
2222
/// <summary>
2323
/// Cms注入缓存
@@ -58,6 +58,12 @@ public override object Get(string key)
5858
return this.cache.Get(key);
5959
}
6060

61+
public override void Reset(CmsHandler handler)
62+
{
63+
this.cache.Reset();
64+
handler?.Invoke();
65+
}
66+
6167
public override void Insert(string key, object value)
6268
{
6369
cache.Set(key, value, TimeSpan.Zero);
@@ -87,6 +93,12 @@ public override string Rebuilt()
8793
//FileInfo file = new FileInfo(cacheDependFile);
8894
//file.LastWriteTimeUtc = DateTime.UtcNow;
8995
}
96+
97+
/// <inheritdoc />
98+
public override int GetInt(string key)
99+
{
100+
return this.cache.GetInt(key);
101+
}
90102
}
91103

92104

@@ -123,9 +135,8 @@ public T GetCachedResult<T>(string cacheKey, BuiltCacheResultHandler<T> func, Da
123135
public void Reset(CmsHandler handler)
124136
{
125137
//清除系统缓存
126-
_cacheSha1ETag = _dependCache.Rebuilt();
127-
128-
if (handler != null) handler();
138+
_cacheSha1ETag = this._dependCache.Rebuilt();
139+
this._dependCache.Reset(handler);
129140
}
130141

131142
public bool CheckClientCacheExpires(int seconds)
@@ -187,5 +198,11 @@ public string Rebuilt()
187198
}
188199

189200
#endregion
201+
202+
/// <inheritdoc />
203+
public int GetInt(string key)
204+
{
205+
return this._dependCache.GetInt(key);
206+
}
190207
}
191208
}

‎src/JR.Cms/Library/CacheProvider/CacheCompoment/CmsCacheBase.cs renamed to ‎src/JR.Cms/Library/CacheProvider/CacheComponent/CmsCacheBase.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System;
1111
using JR.Cms.Infrastructure;
1212

13-
namespace JR.Cms.Library.CacheProvider.CacheCompoment
13+
namespace JR.Cms.Library.CacheProvider.CacheComponent
1414
{
1515
/// <summary>
1616
/// 缓存基础类
@@ -53,6 +53,8 @@ public virtual string Rebuilt()
5353
return "";
5454
}
5555

56+
public abstract int GetInt(string key);
57+
5658

5759
/// <summary>
5860
/// 获取缓存结果
@@ -67,8 +69,6 @@ public T GetCachedResult<T>(string cacheKey, BuiltCacheResultHandler<T> func, Da
6769
}
6870

6971

70-
public virtual void Reset(CmsHandler handler)
71-
{
72-
}
72+
public abstract void Reset(CmsHandler handler);
7373
}
7474
}

‎src/JR.Cms/Library/CacheProvider/CacheCompoment/CmsCacheUtility.cs renamed to ‎src/JR.Cms/Library/CacheProvider/CacheComponent/CmsCacheUtility.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System;
1111
using System.Reflection;
1212

13-
namespace JR.Cms.Library.CacheProvider.CacheCompoment
13+
namespace JR.Cms.Library.CacheProvider.CacheComponent
1414
{
1515
/// <summary>
1616
/// Description of CmsCacheUtility.

‎src/JR.Cms/Library/CacheProvider/CacheCompoment/ICacheUpdatePolicy.cs renamed to ‎src/JR.Cms/Library/CacheProvider/CacheComponent/ICacheUpdatePolicy.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* To change this template use Tools | Options | Coding | Edit Standard Headers.
88
*/
99

10-
namespace JR.Cms.Library.CacheProvider.CacheCompoment
10+
namespace JR.Cms.Library.CacheProvider.CacheComponent
1111
{
1212
/// <summary>
1313
/// Description of ICacheUpdatePolicy.

‎src/JR.Cms/Library/CacheProvider/CacheCompoment/ICmsCache.cs renamed to ‎src/JR.Cms/Library/CacheProvider/CacheComponent/ICmsCache.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System;
1111
using JR.Cms.Infrastructure;
1212

13-
namespace JR.Cms.Library.CacheProvider.CacheCompoment
13+
namespace JR.Cms.Library.CacheProvider.CacheComponent
1414
{
1515
public interface ICmsCache
1616
{
@@ -41,5 +41,12 @@ public interface ICmsCache
4141

4242

4343
string Rebuilt();
44+
45+
/// <summary>
46+
/// 获取Int类型的缓存,如果缓存不存在或类型不匹配,返回-1
47+
/// </summary>
48+
/// <param name="key">键</param>
49+
/// <returns></returns>
50+
int GetInt(string key);
4451
}
4552
}

‎src/JR.Cms/Library/CacheProvider/CacheUpdateAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
using System;
11-
using JR.Cms.Library.CacheProvider.CacheCompoment;
11+
using JR.Cms.Library.CacheProvider.CacheComponent;
1212

1313
namespace JR.Cms.Library.CacheProvider
1414
{

‎src/JR.Cms/Library/CacheProvider/CmsCacheFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using JR.Cms.Library.CacheProvider.CacheCompoment;
1+
using JR.Cms.Library.CacheProvider.CacheComponent;
22
using JR.Stand.Core.Utils;
33

44
namespace JR.Cms.Library.CacheProvider

‎src/JR.Cms/Library/CacheService/SiteCacheManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using JR.Cms.Library.CacheProvider;
4-
using JR.Cms.Library.CacheProvider.CacheCompoment;
4+
using JR.Cms.Library.CacheProvider.CacheComponent;
55
using JR.Cms.ServiceDto;
66

77
namespace JR.Cms.Library.CacheService

‎src/JR.Cms/Web/Manager/Handle/CategoryHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using System.Text;
1818
using System.Text.RegularExpressions;
1919
using JR.Cms.Core;
20-
using JR.Cms.Library.CacheProvider.CacheCompoment;
20+
using JR.Cms.Library.CacheProvider.CacheComponent;
2121
using JR.Cms.Library.CacheService;
2222
using JR.Cms.ServiceDto;
2323
using JR.Cms.Web.Util;

‎src/JR.Cms/Web/Manager/Handle/LinkHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using System.Text;
1818
using System.Text.RegularExpressions;
1919
using JR.Cms.Domain.Interface.Site.Link;
20-
using JR.Cms.Library.CacheProvider.CacheCompoment;
20+
using JR.Cms.Library.CacheProvider.CacheComponent;
2121
using JR.Cms.Library.CacheService;
2222
using JR.Cms.ServiceDto;
2323
using JR.Cms.Web.Util;

‎src/JR.Cms/Web/Manager/Handle/SiteHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
using System;
1717
using System.Text.RegularExpressions;
18-
using JR.Cms.Library.CacheProvider.CacheCompoment;
18+
using JR.Cms.Library.CacheProvider.CacheComponent;
1919
using JR.Cms.Library.CacheService;
2020
using JR.Cms.ServiceDto;
2121
using JR.Stand.Core.Framework.Automation;

‎src/JR.Cms/Web/Manager/Handle/SystemHandler.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@
3131

3232
namespace JR.Cms.Web.Manager.Handle
3333
{
34+
/// <summary>
35+
///
36+
/// </summary>
3437
public class SystemHandler : BasePage
3538
{
3639
private static FontFamily font = null;
3740

38-
internal string GetPath()
41+
private string GetPath()
3942
{
4043
//如请求路径为/opsite/admin
4144
//取出admin供IE CSS使用

‎src/JR.Cms/Web/Manager/MCacheUpdateAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
using System;
1111
using JR.Cms.Library.CacheProvider;
12-
using JR.Cms.Library.CacheProvider.CacheCompoment;
12+
using JR.Cms.Library.CacheProvider.CacheComponent;
1313
using JR.Cms.Library.CacheService;
1414

1515
namespace JR.Cms.Web.Manager

‎src/JR.Cms/Web/Manager/ManagerLogic.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using System.Reflection;
1717
using System.Text.RegularExpressions;
1818
using System.Threading.Tasks;
19-
using JR.Cms.Library.CacheProvider.CacheCompoment;
19+
using JR.Cms.Library.CacheProvider.CacheComponent;
2020
using JR.Cms.Library.Utility;
2121
using JR.Cms.ServiceDto;
2222
using JR.Cms.Web.Manager.Handle;

0 commit comments

Comments
 (0)