Przeglądaj źródła

🤓1、优化自定义事件源 2、升级所有依赖

zuohuaijun 2 lat temu
rodzic
commit
2ae8a200c1

+ 1 - 1
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -30,7 +30,7 @@
     <PackageReference Include="NEST" Version="7.17.5" />
     <PackageReference Include="NewLife.Redis" Version="5.4.2023.601" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.29.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.30.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.19.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.84" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.2" />

+ 1 - 2
Admin.NET/Admin.NET.Core/Cache/CacheSetup.cs

@@ -6,7 +6,7 @@ public static class CacheSetup
     /// 缓存注册(新生命Redis组件)
     /// </summary>
     /// <param name="services"></param>
-    public static ICache AddCache(this IServiceCollection services)
+    public static void AddCache(this IServiceCollection services)
     {
         ICache cache = Cache.Default;
 
@@ -19,6 +19,5 @@ public static class CacheSetup
         }
 
         services.AddSingleton(cache);
-        return cache;
     }
 }

+ 1 - 1
Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.13" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.1" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>

+ 4 - 10
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -13,7 +13,6 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NewLife.Caching;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using OnceMi.AspNetCore.OSS;
 using System;
 using System.IO;
@@ -30,7 +29,7 @@ public class Startup : AppStartup
         // 配置选项
         services.AddProjectOptions();
         // 缓存注册
-        var cache = services.AddCache();
+        services.AddCache();
         // SqlSugar
         services.AddSqlSugar();
         // JWT
@@ -115,16 +114,11 @@ public class Startup : AppStartup
             //// 替换事件源存储器
             //options.ReplaceStorer(serviceProvider =>
             //{
-            //    var redisClient = serviceProvider.GetService<ICache>();
-            //    return new RedisEventSourceStorer(redisClient);
+            //    var redisCache = serviceProvider.GetService<ICache>();
+            //    // 创建默认内存通道事件源对象,可自定义队列路由key,比如这里是 eventbus
+            //    return new RedisEventSourceStorer(redisCache, "eventbus", 3000);
             //});
             options.AddSubscriber<AppEventSubscriber>();
-
-            // 创建默认内存通道事件源对象,可自定义队列路由key,比如这里是 eventbus
-            var redisEventSourceStorer = new RedisEventSourceStorer(cache, "eventbus", 3000);
-            
-            // 替换默认事件总线存储器
-            options.ReplaceStorerOrFallback(() => redisEventSourceStorer);
         });
 
         // OSS对象存储(必须一个个赋值)