From d8738ff489b607c0ef3cdbae1e3ca5360c3bd0be Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 21 十月 2023 18:38:47 +0800
Subject: [PATCH] 升级，缓存关联删除测试
---
IStation.Application.SqiAirp/01-tenant/1-tenant/2-std/Tenant_StdController.cs | 8 ++++++--
IStation.Application.SqiAirp/IStation.Application.SqiAirp.csproj | 2 +-
IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +-
IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Cache/TenantCacheHelper.cs | 11 ++++++++++-
IStation.Entry.SqiAirp/IStation.Entry.SqiAirp.csproj | 10 +++++-----
IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Tenant.cs | 12 +++++++++++-
IStation.Service.SqiAirp/IStation.Service.SqiAirp.csproj | 8 ++++----
7 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/IStation.Application.SqiAirp/01-tenant/1-tenant/2-std/Tenant_StdController.cs b/IStation.Application.SqiAirp/01-tenant/1-tenant/2-std/Tenant_StdController.cs
index 20b11fb..76c98f6 100644
--- a/IStation.Application.SqiAirp/01-tenant/1-tenant/2-std/Tenant_StdController.cs
+++ b/IStation.Application.SqiAirp/01-tenant/1-tenant/2-std/Tenant_StdController.cs
@@ -19,8 +19,10 @@
var vm_list = MemoryCacheHelper.GetSet(cacheKey, () =>
{
- var allList = new Service.Tenant().GetAll();
+ var service = new Service.Tenant();
+ var allList = service.GetAll();
var vmList = allList?.Select(x => new TenantStdDto(x)).ToList();
+ MemoryCacheWipeRelationHelper.Set(cacheKey, new List<string>() { service.GetCacheKey() });
return vmList;
}, CacheHelper.CacheLevel5);
return vm_list;
@@ -38,9 +40,11 @@
var vm_list = MemoryCacheHelper.GetSet(cacheKey, () =>
{
- var allList = new Service.Tenant().GetAll();
+ var service = new Service.Tenant();
+ var allList = service.GetAll();
allList = allList?.Where(x => x.UseStatus == Yw.Model.eUseStatus.Enable).ToList();
var vmList = allList?.Select(x => new TenantSelectDto(x)).ToList();
+ MemoryCacheWipeRelationHelper.Set(cacheKey, new List<string>() { service.GetCacheKey() });
return vmList;
}, CacheHelper.CacheLevel5);
return vm_list;
diff --git a/IStation.Application.SqiAirp/IStation.Application.SqiAirp.csproj b/IStation.Application.SqiAirp/IStation.Application.SqiAirp.csproj
index 24199d0..a67621c 100644
--- a/IStation.Application.SqiAirp/IStation.Application.SqiAirp.csproj
+++ b/IStation.Application.SqiAirp/IStation.Application.SqiAirp.csproj
@@ -25,7 +25,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Application.Core" Version="1.2.2" />
+ <PackageReference Include="Yw.Application.Core" Version="1.2.3" />
</ItemGroup>
<ItemGroup>
diff --git a/IStation.Entry.SqiAirp/IStation.Entry.SqiAirp.csproj b/IStation.Entry.SqiAirp/IStation.Entry.SqiAirp.csproj
index 627bc8a..c4d05f2 100644
--- a/IStation.Entry.SqiAirp/IStation.Entry.SqiAirp.csproj
+++ b/IStation.Entry.SqiAirp/IStation.Entry.SqiAirp.csproj
@@ -18,11 +18,11 @@
<ItemGroup>
<PackageReference Include="Yw.Application.ArtImage.Core" Version="1.0.6" />
- <PackageReference Include="Yw.Application.Assets.Core" Version="1.1.5" />
- <PackageReference Include="Yw.Application.Basic.Core" Version="1.1.4" />
- <PackageReference Include="Yw.Application.Dict.Core" Version="1.0.4" />
- <PackageReference Include="Yw.Application.Monitor.Core" Version="1.4.6" />
- <PackageReference Include="Yw.Application.Unit.Core" Version="1.0.5" />
+ <PackageReference Include="Yw.Application.Assets.Core" Version="1.1.7" />
+ <PackageReference Include="Yw.Application.Basic.Core" Version="1.1.5" />
+ <PackageReference Include="Yw.Application.Dict.Core" Version="1.0.5" />
+ <PackageReference Include="Yw.Application.Monitor.Core" Version="1.4.7" />
+ <PackageReference Include="Yw.Application.Unit.Core" Version="1.0.6" />
</ItemGroup>
<ItemGroup>
diff --git a/IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user b/IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user
index 47b3d75..b20d8e0 100644
--- a/IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/IStation.Entry.SqiAirp/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,6 +5,6 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\WorkData\git\istation\SqiAirp\IStation.Entry.SqiAirp\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2023-10-21T02:11:24.4036360Z;False|2023-10-21T10:06:43.5864769+08:00;True|2023-10-20T19:00:14.6068195+08:00;True|2023-10-20T18:36:10.4611497+08:00;True|2023-10-19T09:56:48.5150728+08:00;True|2023-10-18T14:59:01.0684811+08:00;True|2023-10-17T16:12:58.7322358+08:00;True|2023-10-07T12:25:54.8757007+08:00;True|2023-10-07T12:13:15.0880517+08:00;True|2023-10-07T12:12:39.1803333+08:00;True|2023-10-07T12:02:22.4047422+08:00;True|2023-09-26T15:07:05.5606369+08:00;True|2023-09-25T16:53:00.5107971+08:00;True|2023-09-25T16:49:56.9145285+08:00;True|2023-09-25T14:28:29.4414039+08:00;True|2023-09-25T11:19:00.8735501+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
+ <History>True|2023-10-21T10:34:49.7814859Z;True|2023-10-21T10:11:24.4036360+08:00;False|2023-10-21T10:06:43.5864769+08:00;True|2023-10-20T19:00:14.6068195+08:00;True|2023-10-20T18:36:10.4611497+08:00;True|2023-10-19T09:56:48.5150728+08:00;True|2023-10-18T14:59:01.0684811+08:00;True|2023-10-17T16:12:58.7322358+08:00;True|2023-10-07T12:25:54.8757007+08:00;True|2023-10-07T12:13:15.0880517+08:00;True|2023-10-07T12:12:39.1803333+08:00;True|2023-10-07T12:02:22.4047422+08:00;True|2023-09-26T15:07:05.5606369+08:00;True|2023-09-25T16:53:00.5107971+08:00;True|2023-09-25T16:49:56.9145285+08:00;True|2023-09-25T14:28:29.4414039+08:00;True|2023-09-25T11:19:00.8735501+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Cache/TenantCacheHelper.cs b/IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Cache/TenantCacheHelper.cs
index 0b4ace9..e8b43fc 100644
--- a/IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Cache/TenantCacheHelper.cs
+++ b/IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Cache/TenantCacheHelper.cs
@@ -8,7 +8,7 @@
{
private const string _contentKey = "TenantList";
- private static string GetCacheKey()
+ public static string GetCacheKey()
{
return CacheHelper.GetCacheKey(_contentKey);
}
@@ -50,6 +50,15 @@
MemoryCacheHelper.Remove(cacheKey);
}
+ /// <summary>
+ /// 瑙﹀彂
+ /// </summary>
+ public static void Trigger()
+ {
+ var cacheKey = GetCacheKey();
+ MemoryCacheWipeRelationHelper.Trigger(cacheKey);
+ }
+
}
}
diff --git a/IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Tenant.cs b/IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Tenant.cs
index af5a45b..b69713e 100644
--- a/IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Tenant.cs
+++ b/IStation.Service.SqiAirp/5-service/01-tenant/1-tenant/Tenant.cs
@@ -40,6 +40,7 @@
{
model.Reset(model_ds);
}
+ TenantCacheHelper.Trigger();
}
//閫氳繃 Ids 鏇存柊缂撳瓨
@@ -56,6 +57,7 @@
{
all.AddRange(model_list);
}
+ TenantCacheHelper.Trigger();
}
//绉婚櫎缂撳瓨
@@ -63,7 +65,7 @@
{
var all = GetCache();
all.RemoveAll(x => x.ID == ID);
-
+ TenantCacheHelper.Trigger();
}
#endregion
@@ -113,6 +115,14 @@
return all.Max(x => x.SortCode);
}
+ /// <summary>
+ /// 鑾峰彇缂撳瓨閿�
+ /// </summary>
+ public string GetCacheKey()
+ {
+ return TenantCacheHelper.GetCacheKey();
+ }
+
#endregion
#region Insert
diff --git a/IStation.Service.SqiAirp/IStation.Service.SqiAirp.csproj b/IStation.Service.SqiAirp/IStation.Service.SqiAirp.csproj
index 0a70ab1..c12c40f 100644
--- a/IStation.Service.SqiAirp/IStation.Service.SqiAirp.csproj
+++ b/IStation.Service.SqiAirp/IStation.Service.SqiAirp.csproj
@@ -17,10 +17,10 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Yw.Service.Assets.Core" Version="1.1.0" />
- <PackageReference Include="Yw.Service.Dict.Core" Version="1.0.4" />
- <PackageReference Include="Yw.Service.Monitor.Core" Version="1.2.8" />
- <PackageReference Include="Yw.Service.Unit.Core" Version="1.0.4" />
+ <PackageReference Include="Yw.Service.Assets.Core" Version="1.1.1" />
+ <PackageReference Include="Yw.Service.Dict.Core" Version="1.0.5" />
+ <PackageReference Include="Yw.Service.Monitor.Core" Version="1.2.9" />
+ <PackageReference Include="Yw.Service.Unit.Core" Version="1.0.5" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3