✨ 修改缓存

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application/NotificationManagementApplicationModule.cs

@@ -1,8 +1,10 @@
+using System;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.Application;
 using Microsoft.Extensions.Configuration;
+using Volo.Abp;
 using Volo.Abp.AspNetCore.SignalR;
 
 namespace CompanyName.ProjectName.NotificationManagement
@@ -13,33 +15,46 @@ namespace CompanyName.ProjectName.NotificationManagement
         typeof(AbpDddApplicationModule),
         typeof(AbpAutoMapperModule),
         typeof(AbpAspNetCoreSignalRModule)
-        )]
+    )]
     public class NotificationManagementApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAutoMapperObjectMapper<NotificationManagementApplicationModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddMaps<NotificationManagementApplicationModule>(validate: true);
-            });
+            Configure<AbpAutoMapperOptions>(options => { options.AddMaps<NotificationManagementApplicationModule>(validate: true); });
 
             ConfigurationSignalR(context);
         }
-        
+
         private void ConfigurationSignalR(ServiceConfigurationContext context)
         {
-            var redisConnectionString =
-                context.Services.GetConfiguration().GetSection("Cache:Redis:ConnectionString").Value;
-            var redisDatabaseId = context.Services.GetConfiguration().GetValue<int>("Cache:Redis:DatabaseId");
-            var password = context.Services.GetConfiguration().GetValue<string>("Cache:Redis:Password");
+            var redisConnection = context.Services.GetConfiguration()["Redis:Configuration"];
+            var redisConnectionStringList = redisConnection.Split(',', StringSplitOptions.RemoveEmptyEntries);
+            if (redisConnectionStringList == null || redisConnectionStringList.Length == 0)
+            {
+                throw new UserFriendlyException(message: "Redis连接字符串配置异常");
+            }
+
+            var password = string.Empty;
+            if (redisConnection.Contains("password"))
+            {
+                password = redisConnectionStringList[1].Split('=')[1];
+            }
+
+            var redisDatabaseId = 0;
+            if (redisConnection.Contains("defaultdatabase"))
+            {
+                redisDatabaseId = Convert.ToInt32(redisConnectionStringList[2].Split('=')[1]);
+            }
+
+
             context.Services.AddSignalR().AddStackExchangeRedis(options =>
             {
                 options.Configuration.ChannelPrefix = "CompanyName.ProjectName";
                 options.Configuration.DefaultDatabase = redisDatabaseId;
                 options.Configuration.Password = password;
-                options.Configuration.EndPoints.Add(redisConnectionString);
+                options.Configuration.EndPoints.Add(redisConnectionStringList[0]);
             });
         }
     }
-}
+}

aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs

@@ -42,6 +42,7 @@ using Serilog;
 using Swashbuckle.AspNetCore.SwaggerUI;
 using Volo.Abp.AspNetCore.ExceptionHandling;
 using Volo.Abp.AspNetCore.MultiTenancy;
+using Volo.Abp.Caching;
 
 namespace CompanyName.ProjectName
 {
@@ -236,13 +237,9 @@ namespace CompanyName.ProjectName
         /// </summary>
         private void ConfigureCache(ServiceConfigurationContext context)
         {
-            var redisConnectionString =
-                context.Services.GetConfiguration().GetValue<string>("Cache:Redis:ConnectionString");
-            var redisDatabaseId = context.Services.GetConfiguration().GetValue<int>("Cache:Redis:DatabaseId");
-            var password = context.Services.GetConfiguration().GetValue<string>("Cache:Redis:Password");
-            var connectString = $"{redisConnectionString},password={password},defaultdatabase={redisDatabaseId}";
-            var redis = ConnectionMultiplexer.Connect(connectString);
-            context.Services.AddStackExchangeRedisCache(options => { options.Configuration = connectString; });
+            Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "ProjectName:"; });
+            var configuration = context.Services.GetConfiguration();
+            var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
             context.Services
                 .AddDataProtection()
                 .PersistKeysToStackExchangeRedis(redis, "ProjectName-Protection-Keys");

aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json

@@ -17,12 +17,8 @@
   "ConnectionStrings": {
     "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
   },
-  "Cache": {
-    "Redis": {
-      "ConnectionString": "localhost",
-      "Password": "mypassword",
-      "DatabaseId": 0
-    }
+  "Redis": {
+    "Configuration": "localhost,password=mypassword,defaultdatabase=1"
   },
   "Jwt": {
     "Audience": "CompanyNameProjectName",

aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/ProjectNameIdentityServerModule.cs

@@ -173,13 +173,9 @@ namespace CompanyName.ProjectName
         /// </summary>
         private void ConfigureCache(ServiceConfigurationContext context)
         {
-            var redisConnectionString =
-                context.Services.GetConfiguration().GetValue<string>("Cache:Redis:ConnectionString");
-            var redisDatabaseId = context.Services.GetConfiguration().GetValue<int>("Cache:Redis:DatabaseId");
-            var password = context.Services.GetConfiguration().GetValue<string>("Cache:Redis:Password");
-            var connectString = $"{redisConnectionString},password={password},defaultdatabase={redisDatabaseId}";
-            var redis = ConnectionMultiplexer.Connect(connectString);
-            context.Services.AddStackExchangeRedisCache(options => { options.Configuration = connectString; });
+            Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "ProjectName:"; });
+            var configuration = context.Services.GetConfiguration();
+            var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
             context.Services
                 .AddDataProtection()
                 .PersistKeysToStackExchangeRedis(redis, "ProjectName-Protection-Keys");

aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json

@@ -8,12 +8,8 @@
   "ConnectionStrings": {
     "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
   },
-  "Cache": {
-    "Redis": {
-      "ConnectionString": "localhost",
-      "Password": "mypassword",
-      "DatabaseId": 0
-    }
+  "Redis": {
+    "Configuration": "localhost,password=mypassword,defaultdatabase=1"
   }
 }
 

vben271/package.json

@@ -118,7 +118,7 @@
     "ts-jest": "^27.0.4",
     "ts-node": "^10.2.0",
     "typescript": "4.3.5",
-    "vite": "2.5.0",
+    "vite": "2.5.9",
     "vite-plugin-compression": "^0.3.3",
     "vite-plugin-html": "^2.0.7",
     "vite-plugin-imagemin": "^0.4.3",
@@ -149,4 +149,4 @@
   "engines": {
     "node": "^12 || >=14"
   }
-}
+}