图片后缀

Ys.Scada.Backend/Controllers/DataSourceController.cs

@@ -195,33 +195,7 @@ namespace Ys.Scada.Backend.Controllers
             var dataSource = await _fsql.Select<DataSource>().Where(o => o.Id == id).ToOneAsync();
             Check.NotNull(dataSource);
             await _manager.Cancel(dataSource.Id.ToString());
-            //await _fsql.Update<DataSource>(dataSource.Id).Set(o => o.Status, 0).ExecuteAffrowsAsync();
             return OK();
         }
-        //[HttpGet("test")]
-        //public async Task<JsonResult> test()
-        //{
-
-        //    var d = new DataSourceModel()
-        //    {
-        //        Data = JsonConvert.SerializeObject(new RabbitMQOptions()
-        //        {
-        //            ExchangeName = "exchang",
-        //            HostName = "192.168.2.221",
-        //            Port = 5672,
-        //            UserName = "ys",
-        //            Password = "ys123456",
-        //            Topic = "cnm",
-        //            QueueName = "exchang"
-        //        }),
-        //        Name = "test",
-        //        DocId = 1,
-        //        Host = "192.168.2.221",
-        //        Port = 5672,
-        //        Type = "rabbitmq",
-        //        RWType = "读",
-        //    };
-        //    return OK(d);
-        //}
     }
 }

Ys.Scada.Backend/Controllers/ResourcesController.cs

@@ -32,8 +32,8 @@ namespace Ys.Scada.Backend.Controllers
             }
             else
             {
-                Check.NullEmpty(resourcesModel.Base64);
-                var match = Regex.Match(resourcesModel.Base64, "data:image/(?'ext'.*);");
+                Check.NullEmpty(resourcesModel.Name);
+                var match = Regex.Match(resourcesModel.Name, "\\.(?'ext'.*)");
                 if (!match.Success)
                 {
                     throw new CustomException("图片内容错误");

Ys.Scada.Kafka/KafkaConsumerClient.cs

@@ -44,12 +44,6 @@ namespace Ys.Scada.Kafka
                 }
                 catch (ConsumeException e) when (_kafkaOptions.RetriableErrorCodes.Contains(e.Error.Code))
                 {
-                    var logArgs = new LogMessageEventArgs
-                    {
-                        LogType = MqLogType.ConsumeRetries,
-                        Reason = e.Error.ToString()
-                    };
-                    OnLogCallback!(logArgs);
                     continue;
                 }
                 if (consumerResult.IsPartitionEOF || consumerResult.Message.Value == null) continue;
@@ -67,9 +61,7 @@ namespace Ys.Scada.Kafka
         public void Connect()
         {
             if (_consumerClient != null) return;
-
             ConnectionLock.Wait();
-
             try
             {
                 if (_consumerClient == null)
@@ -98,12 +90,6 @@ namespace Ys.Scada.Kafka
         }
         private void ConsumerClient_OnConsumeError(IConsumer<string, byte[]> consumer, Error e)
         {
-            var logArgs = new LogMessageEventArgs
-            {
-                LogType = MqLogType.ServerConnError,
-                Reason = $"An error occurred during connect kafka --> {e.Reason}"
-            };
-            OnLogCallback!(logArgs);
         }
         public void Dispose()
         {

Ys.Scada.Manager/DataSourceManager.cs

@@ -48,10 +48,8 @@ namespace Ys.Scada.Manager
         List<Tag> Tags { get; }
 
         private readonly ConcurrentDictionary<string, ClientManager> _clients;
-        private readonly ConcurrentDictionary<string, CancellationTokenSource> _ctsTokens;
         public DataSourceManager(MemoryChannel<TransportMessage> memoryChannel, IFreeSql freeSql)
         {
-            _ctsTokens = new ConcurrentDictionary<string, CancellationTokenSource>();
             _clients = new ConcurrentDictionary<string, ClientManager>();
             _memoryChannel = memoryChannel;
             _scheduler = new DedicatedThreadTaskScheduler(100);
@@ -71,12 +69,10 @@ namespace Ys.Scada.Manager
         }
         public void Dispose()
         {
+            foreach (var client in _clients.Values) 
+                client.CTS.Cancel();
             _clients.Clear();
         }
-        public Task InvokeMessage(string message)
-        {
-            return Task.CompletedTask;
-        }
         public Task Cancel(string key)
         {
             if (_clients.TryGetValue(key, out ClientManager client))

Ys.Scada.RabbitMQ/RabbitMQConsumerClient.cs

@@ -135,11 +135,6 @@ namespace Ys.Scada.RabbitMQ
         }
         private async Task OnConsumerConsumerCancelled(object? sender, ConsumerEventArgs e)
         {
-            var args = new LogMessageEventArgs
-            {
-                LogType = MqLogType.ConsumerCancelled,
-                Reason = string.Join(",", e.ConsumerTags)
-            };
             await OnStopCallback(_id);
             //OnLogCallback!(args);
         }
@@ -158,11 +153,6 @@ namespace Ys.Scada.RabbitMQ
         }
         private async Task OnConsumerShutdown(object? sender, ShutdownEventArgs e)
         {
-            var args = new LogMessageEventArgs
-            {
-                LogType = MqLogType.ConsumerShutdown,
-                Reason = e.ReplyText
-            };
             await OnStopCallback(_id);
         }
     }