Merge pull request #227 from MoienTajik/moien/redis-acl-support

catcherwong · web-flow · commit 6908fec0bf4c · 2020-07-19T21:27:39.000+08:00
Redis acl support
diff --git a/src/EasyCaching.Bus.Redis/Configurations/EasyCachingOptionsExtensions.cs b/src/EasyCaching.Bus.Redis/Configurations/EasyCachingOptionsExtensions.cs
@@ -51,6 +51,7 @@ void configure(RedisBusOptions x)
                 x.ConnectionTimeout = redisOptions.ConnectionTimeout;
                 x.Database = redisOptions.Database;
                 x.IsSsl = redisOptions.IsSsl;
+                x.Username = redisOptions.Username;
                 x.Password = redisOptions.Password;
                 x.SslHost = redisOptions.SslHost;
 
diff --git a/src/EasyCaching.Bus.Redis/Configurations/RedisSubscriberProvider.cs b/src/EasyCaching.Bus.Redis/Configurations/RedisSubscriberProvider.cs
@@ -48,6 +48,7 @@ private ConnectionMultiplexer CreateConnectionMultiplexer()
                 var configurationOptions = new ConfigurationOptions
                 {
                     ConnectTimeout = _options.ConnectionTimeout,
+                    User = _options.Username,
                     Password = _options.Password,
                     Ssl = _options.IsSsl,
                     SslHost = _options.SslHost,
diff --git a/src/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj b/src/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj
@@ -30,7 +30,7 @@
     <None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.1.28" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />
diff --git a/src/EasyCaching.Core/Configurations/BaseRedisOptions.cs b/src/EasyCaching.Core/Configurations/BaseRedisOptions.cs
@@ -7,6 +7,14 @@
     /// </summary>
     public class BaseRedisOptions
     {
+        /// <summary>
+        /// Gets or sets the username to be used to connect to the Redis server.
+        /// </summary>
+        /// <value>
+        /// The username.
+        /// </value>
+        public string Username { get; set; } = null;
+
         /// <summary>
         /// Gets or sets the password to be used to connect to the Redis server.
         /// </summary>
diff --git a/src/EasyCaching.Redis/Configurations/RedisDatabaseProvider.cs b/src/EasyCaching.Redis/Configurations/RedisDatabaseProvider.cs
@@ -65,6 +65,7 @@ private ConnectionMultiplexer CreateConnectionMultiplexer()
                 var configurationOptions = new ConfigurationOptions
                 {
                     ConnectTimeout = _options.ConnectionTimeout,
+                    User = _options.Username,
                     Password = _options.Password,
                     Ssl = _options.IsSsl,
                     SslHost = _options.SslHost,
diff --git a/src/EasyCaching.Redis/EasyCaching.Redis.csproj b/src/EasyCaching.Redis/EasyCaching.Redis.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.1.28" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ private ConnectionMultiplexer CreateConnectionMultiplexer()`
`48`	`48`	`var configurationOptions = new ConfigurationOptions`
`49`	`49`	`{`
`50`	`50`	`ConnectTimeout = _options.ConnectionTimeout,`
	`51`	`+ User = _options.Username,`
`51`	`52`	`Password = _options.Password,`
`52`	`53`	`Ssl = _options.IsSsl,`
`53`	`54`	`SslHost = _options.SslHost,`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ private ConnectionMultiplexer CreateConnectionMultiplexer()`
`65`	`65`	`var configurationOptions = new ConfigurationOptions`
`66`	`66`	`{`
`67`	`67`	`ConnectTimeout = _options.ConnectionTimeout,`
	`68`	`+ User = _options.Username,`
`68`	`69`	`Password = _options.Password,`
`69`	`70`	`Ssl = _options.IsSsl,`
`70`	`71`	`SslHost = _options.SslHost,`