From e635f643a36ba6023b1d2bcbe4ce012c3e256e37 Mon Sep 17 00:00:00 2001
From: wq1234wq <wq1234wq@163.com>
Date: Tue, 14 Jun 2022 19:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IoTSharp/Controllers/DevicesController.cs    | 3 ++-
 IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs | 4 +++-
 IoTSharp/Gateways/RawDataGateway.cs          | 3 ++-
 IoTSharp/Handlers/EventBusHandler.cs         | 3 ++-
 IoTSharp/Handlers/MQTTServerHandler.cs       | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/IoTSharp/Controllers/DevicesController.cs b/IoTSharp/Controllers/DevicesController.cs
index 2a89d8c1..8a64b823 100644
--- a/IoTSharp/Controllers/DevicesController.cs
+++ b/IoTSharp/Controllers/DevicesController.cs
@@ -62,6 +62,7 @@ namespace IoTSharp.Controllers
             SignInManager<IdentityUser> signInManager, ILogger<DevicesController> logger, MqttServer serverEx, ApplicationDbContext context, MqttClientOptions mqtt, IStorage storage, IOptions<AppSettings> options, ICapPublisher queue
             , IEasyCachingProviderFactory factory, FlowRuleProcessor flowRuleProcessor, IServiceScopeFactory scopeFactor)
         {
+            string _hc_Caching = $"{nameof(CachingUseIn)}-{Enum.GetName(options.Value.CachingUseIn)}";
             _context = context;
             _mqtt = mqtt;
             _userManager = userManager;
@@ -72,7 +73,7 @@ namespace IoTSharp.Controllers
             _setting = options.Value;
             _queue = queue;
             _flowRuleProcessor = flowRuleProcessor;
-            _caching = factory.GetCachingProvider("iotsharp");
+            _caching = factory.GetCachingProvider(_hc_Caching);
             _scopeFactor = scopeFactor;
         }
 
diff --git a/IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs b/IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
index 5661ffab..2d42f1ab 100644
--- a/IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
+++ b/IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
@@ -32,13 +32,15 @@ namespace IoTSharp.FlowRuleEngine
 
         public FlowRuleProcessor(ILogger<FlowRuleProcessor> logger, IServiceScopeFactory scopeFactor, IOptions<AppSettings> options, TaskExecutorHelper helper, IEasyCachingProviderFactory factory)
         {
+           
+            string _hc_Caching = $"{nameof(CachingUseIn)}-{Enum.GetName(options.Value.CachingUseIn)}";
             _scopeFactor = scopeFactor;
             _logger = logger;
             _setting = options.Value;
             _allFlows = new List<Flow>();
             _allflowoperation = new List<FlowOperation>();
             _helper = helper;
-            _caching = factory.GetCachingProvider("iotsharp");
+            _caching = factory.GetCachingProvider(_hc_Caching);
             _sp = _scopeFactor.CreateScope().ServiceProvider;
         }
 
diff --git a/IoTSharp/Gateways/RawDataGateway.cs b/IoTSharp/Gateways/RawDataGateway.cs
index fb7445e4..01928416 100644
--- a/IoTSharp/Gateways/RawDataGateway.cs
+++ b/IoTSharp/Gateways/RawDataGateway.cs
@@ -43,11 +43,12 @@ namespace IoTSharp.Gateways
             , ApplicationDbContext context
             )
         {
+            string _hc_Caching = $"{nameof(CachingUseIn)}-{Enum.GetName(options.Value.CachingUseIn)}";
             _setting = options.Value;
             _logger = logger;
             _queue = queue;
             _scopeFactor = scopeFactor;
-            _caching = factory.GetCachingProvider("iotsharp");
+            _caching = factory.GetCachingProvider(_hc_Caching);
             _context = context;
 
         }
diff --git a/IoTSharp/Handlers/EventBusHandler.cs b/IoTSharp/Handlers/EventBusHandler.cs
index a47a9081..09fcbbed 100644
--- a/IoTSharp/Handlers/EventBusHandler.cs
+++ b/IoTSharp/Handlers/EventBusHandler.cs
@@ -36,12 +36,13 @@ namespace IoTSharp.Handlers
            , IOptions<AppSettings> options, IStorage storage, FlowRuleProcessor flowRuleProcessor, IEasyCachingProviderFactory factory
             )
         {
+            string _hc_Caching = $"{nameof(CachingUseIn)}-{Enum.GetName(options.Value.CachingUseIn)}";
             _appSettings = options.Value;
             _logger = logger;
             _scopeFactor = scopeFactor;
             _storage = storage;
             _flowRuleProcessor = flowRuleProcessor;
-            _caching = factory.GetCachingProvider("iotsharp");
+            _caching = factory.GetCachingProvider(_hc_Caching);
         }
 
         [CapSubscribe("iotsharp.services.datastream.attributedata")]
diff --git a/IoTSharp/Handlers/MQTTServerHandler.cs b/IoTSharp/Handlers/MQTTServerHandler.cs
index b06abb52..73c97909 100644
--- a/IoTSharp/Handlers/MQTTServerHandler.cs
+++ b/IoTSharp/Handlers/MQTTServerHandler.cs
@@ -40,6 +40,7 @@ namespace IoTSharp.Handlers
            , IOptions<AppSettings> options, ICapPublisher queue, IEasyCachingProviderFactory factory, FlowRuleProcessor flowRuleProcessor
             )
         {
+            string _hc_Caching = $"{nameof(CachingUseIn)}-{Enum.GetName(options.Value.CachingUseIn)}";
             _mcsetting = options.Value.MqttClient;
             _settings = options.Value;
             _logger = logger;
@@ -48,7 +49,7 @@ namespace IoTSharp.Handlers
             _serverEx = serverEx;
             _queue = queue;
             _flowRuleProcessor = flowRuleProcessor;
-            _caching = factory.GetCachingProvider("iotsharp");
+            _caching = factory.GetCachingProvider(_hc_Caching);
         }
 
         static long clients = 0;
-- 
GitLab