Skip to content

Commit 82dd4e1

Browse files
catcherwongcatcherwong
authored
Merge pull request #182 from dotnetcore/dev
Upgrading dependencies and fixed some bug
2 parents 638c6f9 + 58d9136 commit 82dd4e1

File tree

18 files changed

+551
-117
lines changed

18 files changed

+551
-117
lines changed

‎build/releasenotes.props‎

Lines changed: 18 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,56 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4-
1. Make Interceptors and response caching Support .netcore3.0.
5-
2. Remove WithServices method to support console apps.
6-
3. Improve RabbitMQ bus.
7-
4. Add deep clone for memory cache provider.
8-
5. Support multi instances of hybrid provider.
9-
6. Upgrading dependencies.
10-
7. Modify some extension methods' namespace.
4+
1. Redis provider support some geo methods.
115
</EasyCachingCorePackageNotes>
126
<EasyCachingMemcachedPackageNotes>
13-
1. Make Interceptors and response caching Support .netcore3.0.
14-
2. Remove WithServices method to support console apps.
15-
3. Improve RabbitMQ bus.
16-
4. Add deep clone for memory cache provider.
17-
5. Support multi instances of hybrid provider.
18-
6. Upgrading dependencies.
19-
7. Modify some extension methods' namespace.
7+
1. Upgrading dependencies.
208
</EasyCachingMemcachedPackageNotes>
219
<EasyCachingRedisPackageNotes>
22-
1. Support Hyperloglog.
10+
1. Support some geo methods.
2311
</EasyCachingRedisPackageNotes>
2412
<EasyCachingSQLitePackageNotes>
25-
1. Make Interceptors and response caching Support .netcore3.0.
26-
2. Remove WithServices method to support console apps.
27-
3. Improve RabbitMQ bus.
28-
4. Add deep clone for memory cache provider.
29-
5. Support multi instances of hybrid provider.
30-
6. Upgrading dependencies.
31-
7. Modify some extension methods' namespace.
13+
1. Upgrading dependencies.
3214
</EasyCachingSQLitePackageNotes>
3315
<EasyCachingInMemoryPackageNotes>
34-
1. Make Interceptors and response caching Support .netcore3.0.
35-
2. Remove WithServices method to support console apps.
36-
3. Improve RabbitMQ bus.
37-
4. Add deep clone for memory cache provider.
38-
5. Support multi instances of hybrid provider.
39-
6. Upgrading dependencies.
40-
7. Modify some extension methods' namespace.
16+
1. Fix datetime exception.
17+
2. Upgrading dependencies.
4118
</EasyCachingInMemoryPackageNotes>
4219
<EasyCachingHybridPackageNotes>
43-
1. improve hybrid get with data retriever.
20+
1. Upgrading dependencies.
4421
</EasyCachingHybridPackageNotes>
4522
<EasyCachingAspectCorePackageNotes>
46-
1. Make Interceptors and response caching Support .netcore3.0.
47-
2. Remove WithServices method to support console apps.
48-
3. Improve RabbitMQ bus.
49-
4. Add deep clone for memory cache provider.
50-
5. Support multi instances of hybrid provider.
51-
6. Upgrading dependencies.
52-
7. Modify some extension methods' namespace.
23+
1. Upgrading dependencies.
5324
</EasyCachingAspectCorePackageNotes>
5425
<EasyCachingCastlePackageNotes>
55-
1. Make Interceptors and response caching Support .netcore3.0.
56-
2. Remove WithServices method to support console apps.
57-
3. Improve RabbitMQ bus.
58-
4. Add deep clone for memory cache provider.
59-
5. Support multi instances of hybrid provider.
60-
6. Upgrading dependencies.
61-
7. Modify some extension methods' namespace.
26+
1. Upgrading dependencies.
6227
</EasyCachingCastlePackageNotes>
6328
<EasyCachingResponseCachingPackageNotes>
64-
1. Make Interceptors and response caching Support .netcore3.0.
65-
2. Remove WithServices method to support console apps.
66-
3. Improve RabbitMQ bus.
67-
4. Add deep clone for memory cache provider.
68-
5. Support multi instances of hybrid provider.
69-
6. Upgrading dependencies.
70-
7. Modify some extension methods' namespace.
29+
1. Upgrading dependencies.
7130
</EasyCachingResponseCachingPackageNotes>
7231
<EasyCachingJsonPackageNotes>
73-
1. Support JsonSerializerSettings.
32+
1. Upgrading dependencies.
7433
</EasyCachingJsonPackageNotes>
7534
<EasyCachingMessagePackPackageNotes>
76-
1. Support custom resolver.
35+
1. Upgrading dependencies.
7736
</EasyCachingMessagePackPackageNotes>
7837
<EasyCachingProtobufPackageNotes>
79-
1. Make Interceptors and response caching Support .netcore3.0.
80-
2. Remove WithServices method to support console apps.
81-
3. Improve RabbitMQ bus.
82-
4. Add deep clone for memory cache provider.
83-
5. Support multi instances of hybrid provider.
84-
6. Upgrading dependencies.
85-
7. Modify some extension methods' namespace.
38+
1. Upgrading dependencies.
8639
</EasyCachingProtobufPackageNotes>
8740
<EasyCachingCSRedisPackageNotes>
88-
1. Support Hyperloglog.
41+
1. Support some geo methods.
8942
</EasyCachingCSRedisPackageNotes>
9043
<EasyCachingCSRedisBusPackageNotes>
91-
1. Support sentinel mode.
44+
1. Upgrading dependencies.
9245
</EasyCachingCSRedisBusPackageNotes>
9346
<EasyCachingRedisBusPackageNotes>
94-
1. Make Interceptors and response caching Support .netcore3.0.
95-
2. Remove WithServices method to support console apps.
96-
3. Improve RabbitMQ bus.
97-
4. Add deep clone for memory cache provider.
98-
5. Support multi instances of hybrid provider.
99-
6. Upgrading dependencies.
100-
7. Modify some extension methods' namespace.
47+
1. Upgrading dependencies.
10148
</EasyCachingRedisBusPackageNotes>
10249
<EasyCachingRabbitBusPackageNotes>
103-
1. Make Interceptors and response caching Support .netcore3.0.
104-
2. Remove WithServices method to support console apps.
105-
3. Improve RabbitMQ bus.
106-
4. Add deep clone for memory cache provider.
107-
5. Support multi instances of hybrid provider.
108-
6. Upgrading dependencies.
109-
7. Modify some extension methods' namespace.
50+
1. Upgrading dependencies.
11051
</EasyCachingRabbitBusPackageNotes>
11152
<EasyCachingDiskPackageNotes>
112-
1. Make Interceptors and response caching Support .netcore3.0.
113-
2. Remove WithServices method to support console apps.
114-
3. Improve RabbitMQ bus.
115-
4. Add deep clone for memory cache provider.
116-
5. Support multi instances of hybrid provider.
117-
6. Upgrading dependencies.
118-
7. Modify some extension methods' namespace.
53+
1. Upgrading dependencies.
11954
</EasyCachingDiskPackageNotes>
12055
</PropertyGroup>
12156
</Project>

‎build/version.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project>
22
<PropertyGroup>
3-
<EasyCachingCorePackageVersion>0.8.0</EasyCachingCorePackageVersion>
4-
<EasyCachingMemcachedPackageVersion>0.8.0</EasyCachingMemcachedPackageVersion>
5-
<EasyCachingRedisPackageVersion>0.8.2</EasyCachingRedisPackageVersion>
6-
<EasyCachingSQLitePackageVersion>0.8.0</EasyCachingSQLitePackageVersion>
7-
<EasyCachingInMemoryPackageVersion>0.8.0</EasyCachingInMemoryPackageVersion>
8-
<EasyCachingHybridPackageVersion>0.8.1</EasyCachingHybridPackageVersion>
9-
<EasyCachingAspectCorePackageVersion>0.8.0</EasyCachingAspectCorePackageVersion>
10-
<EasyCachingCastlePackageVersion>0.8.0</EasyCachingCastlePackageVersion>
11-
<EasyCachingResponseCachingPackageVersion>0.8.0</EasyCachingResponseCachingPackageVersion>
12-
<EasyCachingJsonPackageVersion>0.8.1</EasyCachingJsonPackageVersion>
13-
<EasyCachingMessagePackPackageVersion>0.8.1</EasyCachingMessagePackPackageVersion>
14-
<EasyCachingProtobufPackageVersion>0.8.0</EasyCachingProtobufPackageVersion>
15-
<EasyCachingCSRedisPackageVersion>0.8.2</EasyCachingCSRedisPackageVersion>
16-
<EasyCachingRedisBusPackageVersion>0.8.0</EasyCachingRedisBusPackageVersion>
17-
<EasyCachingCSRedisBusPackageVersion>0.8.1</EasyCachingCSRedisBusPackageVersion>
18-
<EasyCachingRabbitBusPackageVersion>0.8.0</EasyCachingRabbitBusPackageVersion>
19-
<EasyCachingDiskPackageVersion>0.8.0</EasyCachingDiskPackageVersion>
3+
<EasyCachingCorePackageVersion>0.8.3</EasyCachingCorePackageVersion>
4+
<EasyCachingMemcachedPackageVersion>0.8.3</EasyCachingMemcachedPackageVersion>
5+
<EasyCachingRedisPackageVersion>0.8.3</EasyCachingRedisPackageVersion>
6+
<EasyCachingSQLitePackageVersion>0.8.3</EasyCachingSQLitePackageVersion>
7+
<EasyCachingInMemoryPackageVersion>0.8.3</EasyCachingInMemoryPackageVersion>
8+
<EasyCachingHybridPackageVersion>0.8.3</EasyCachingHybridPackageVersion>
9+
<EasyCachingAspectCorePackageVersion>0.8.3</EasyCachingAspectCorePackageVersion>
10+
<EasyCachingCastlePackageVersion>0.8.3</EasyCachingCastlePackageVersion>
11+
<EasyCachingResponseCachingPackageVersion>0.8.3</EasyCachingResponseCachingPackageVersion>
12+
<EasyCachingJsonPackageVersion>0.8.3</EasyCachingJsonPackageVersion>
13+
<EasyCachingMessagePackPackageVersion>0.8.3</EasyCachingMessagePackPackageVersion>
14+
<EasyCachingProtobufPackageVersion>0.8.3</EasyCachingProtobufPackageVersion>
15+
<EasyCachingCSRedisPackageVersion>0.8.3</EasyCachingCSRedisPackageVersion>
16+
<EasyCachingRedisBusPackageVersion>0.8.3</EasyCachingRedisBusPackageVersion>
17+
<EasyCachingCSRedisBusPackageVersion>0.8.3</EasyCachingCSRedisBusPackageVersion>
18+
<EasyCachingRabbitBusPackageVersion>0.8.3</EasyCachingRabbitBusPackageVersion>
19+
<EasyCachingDiskPackageVersion>0.8.3</EasyCachingDiskPackageVersion>
2020
</PropertyGroup>
2121
</Project>

‎src/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="CSRedisCore" Version="3.1.8" />
34+
<PackageReference Include="CSRedisCore" Version="3.1.17" />
3535
</ItemGroup>
3636
<ItemGroup>
3737
<ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

‎src/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="RabbitMQ.Client" Version="5.1.1" />
38+
<PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
3939
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.0.0" />
4040
</ItemGroup>
4141
</Project>

‎src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.Geo.cs‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
namespace EasyCaching.CSRedis
2+
{
3+
using EasyCaching.Core;
4+
using System.Collections.Generic;
5+
using System.Linq;
6+
using System.Threading.Tasks;
7+
using GeoUnit = global::CSRedis.GeoUnit;
8+
9+
public partial class DefaultCSRedisCachingProvider : IRedisCachingProvider
10+
{
11+
public long GeoAdd(string cacheKey, List<(double longitude, double latitude, string member)> values)
12+
{
13+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
14+
ArgumentCheck.NotNullAndCountGTZero(values, nameof(values));
15+
16+
var list = new List<(double longitude, double latitude, object member)>();
17+
18+
foreach (var item in values)
19+
{
20+
list.Add((item.longitude, item.latitude, item.member));
21+
}
22+
23+
var res = _cache.GeoAdd(cacheKey, list.ToArray());
24+
return res;
25+
}
26+
27+
public async Task<long> GeoAddAsync(string cacheKey, List<(double longitude, double latitude, string member)> values)
28+
{
29+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
30+
ArgumentCheck.NotNullAndCountGTZero(values, nameof(values));
31+
32+
var list = new List<(double longitude, double latitude, object member)>();
33+
34+
foreach (var item in values)
35+
{
36+
list.Add((item.longitude, item.latitude, item.member));
37+
}
38+
39+
var res = await _cache.GeoAddAsync(cacheKey, list.ToArray());
40+
return res;
41+
}
42+
43+
public double? GeoDist(string cacheKey, string member1, string member2, string unit = "m")
44+
{
45+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
46+
ArgumentCheck.NotNullOrWhiteSpace(member1, nameof(member1));
47+
ArgumentCheck.NotNullOrWhiteSpace(member2, nameof(member2));
48+
ArgumentCheck.NotNullOrWhiteSpace(unit, nameof(unit));
49+
50+
var res = _cache.GeoDist(cacheKey, member1, member2, GetGeoUnit(unit));
51+
return res;
52+
}
53+
54+
public async Task<double?> GeoDistAsync(string cacheKey, string member1, string member2, string unit = "m")
55+
{
56+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
57+
ArgumentCheck.NotNullOrWhiteSpace(member1, nameof(member1));
58+
ArgumentCheck.NotNullOrWhiteSpace(member2, nameof(member2));
59+
ArgumentCheck.NotNullOrWhiteSpace(unit, nameof(unit));
60+
61+
var res = await _cache.GeoDistAsync(cacheKey, member1, member2, GetGeoUnit(unit));
62+
return res;
63+
}
64+
65+
public List<string> GeoHash(string cacheKey, List<string> members)
66+
{
67+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
68+
ArgumentCheck.NotNullAndCountGTZero(members, nameof(members));
69+
70+
var list = new List<object>();
71+
foreach (var item in members)
72+
{
73+
list.Add(item);
74+
}
75+
76+
var res = _cache.GeoHash(cacheKey, list.ToArray());
77+
return res.ToList() ;
78+
}
79+
80+
public async Task<List<string>> GeoHashAsync(string cacheKey, List<string> members)
81+
{
82+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
83+
ArgumentCheck.NotNullAndCountGTZero(members, nameof(members));
84+
85+
var list = new List<object>();
86+
foreach (var item in members)
87+
{
88+
list.Add(item);
89+
}
90+
91+
var res = await _cache.GeoHashAsync(cacheKey, list.ToArray());
92+
return res.ToList();
93+
}
94+
95+
public List<(double longitude, double latitude)?> GeoPos(string cacheKey, List<string> members)
96+
{
97+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
98+
ArgumentCheck.NotNullAndCountGTZero(members, nameof(members));
99+
100+
var list = new List<object>();
101+
foreach (var item in members)
102+
{
103+
list.Add(item);
104+
}
105+
106+
var res = _cache.GeoPos(cacheKey, list.ToArray());
107+
return res.ToList();
108+
}
109+
110+
public async Task<List<(double longitude, double latitude)?>> GeoPosAsync(string cacheKey, List<string> members)
111+
{
112+
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
113+
ArgumentCheck.NotNullAndCountGTZero(members, nameof(members));
114+
115+
var list = new List<object>();
116+
foreach (var item in members)
117+
{
118+
list.Add(item);
119+
}
120+
121+
var res = await _cache.GeoPosAsync(cacheKey, list.ToArray());
122+
return res.ToList();
123+
}
124+
125+
private GeoUnit GetGeoUnit(string unit)
126+
{
127+
GeoUnit geoUnit;
128+
switch (unit)
129+
{
130+
case "km":
131+
geoUnit = GeoUnit.km;
132+
break;
133+
case "ft":
134+
geoUnit = GeoUnit.ft;
135+
break;
136+
case "mi":
137+
geoUnit = GeoUnit.mi;
138+
break;
139+
default:
140+
geoUnit = GeoUnit.m;
141+
break;
142+
}
143+
return geoUnit;
144+
}
145+
}
146+
}

‎src/EasyCaching.CSRedis/EasyCaching.CSRedis.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="CSRedisCore" Version="3.1.8" />
34+
<PackageReference Include="CSRedisCore" Version="3.1.17" />
3535
</ItemGroup>
3636
<ItemGroup>
3737
<ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

0 commit comments

Comments
 (0)