调整

Ys.Scada.Backend/Authorization/JwtTokoenAuthorizeHandler.cs

@@ -19,7 +19,6 @@ namespace Ys.Scada.Backend.Authorization
         {
             _fsql = freeSql;
         }
-
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {
             var endpoint = Context.GetEndpoint();
@@ -34,9 +33,7 @@ namespace Ys.Scada.Backend.Authorization
 
                 var jtiDb = await _fsql.Select<User>().Where(x => x.Id == uint.Parse(userId)).ToOneAsync(x => x.Jti);
                 if (int.TryParse(result.Principal.FindFirstValue(JwtRegisteredClaimNames.Jti) ?? "0", out var jti) && jti == jtiDb)
-                {
                     return result;
-                }
                 throw new UnauthorizedAccessException();
             }
             throw new UnauthorizedAccessException();

Ys.Scada.Backend/Controllers/ReleaseController.cs

@@ -11,30 +11,6 @@ namespace Ys.Scada.Backend.Controllers
         public ReleaseController(IFreeSql fsql, IMapper mapper) : base(fsql, mapper)
         {
         }
-        //[HttpPost("save")]
-        //public async Task<JsonResult> Save(ReleaseModel  releaseModel)
-        //{
-        //    Check.NotNull(releaseModel);
-        //    releaseModel.UserId = UserId;
-        //    if (releaseModel.Id > 0)
-        //    {
-        //        var oldModel = (await _fsql.Select<Release>().Where(o => o.Id == releaseModel.Id).FirstAsync());
-        //        if (oldModel == null)
-        //        {
-        //            throw new CustomException("数据不存在");
-        //        }
-
-        //        var model = _mapper.Map<Release>(releaseModel);
-        //        await _fsql.Update<Release>().SetSource(model).ExecuteAffrowsAsync();
-        //    }
-        //    else
-        //    {
-        //        var model = _mapper.Map<Release>(releaseModel);
-        //        model.CreatedBy = UserId;
-        //        releaseModel.Id = (int)(await _fsql.Insert<Release>(model).ExecuteIdentityAsync());
-        //    }
-        //    return OK(releaseModel);
-        //}
         [HttpPost("publish")]
         public async Task<JsonResult> Publish(int docId) 
         {

Ys.Scada.Backend/Controllers/ResourcesController.cs

@@ -101,9 +101,7 @@ namespace Ys.Scada.Backend.Controllers
         {
             var oldModel = (await _fsql.Select<Resources>().Where(o => o.Id == resourcesModel.Id).FirstAsync());
             if (oldModel == null)
-            {
                 throw new CustomException("数据不存在");
-            }
             var model = _mapper.Map<Resources>(resourcesModel);
             await _fsql.Update<Resources>().Set(o => o.Channel, model.Channel).Set(o => o.Description, model.Description).Set(o => o.Title, model.Title).Set(o => o.Keywords, model.Keywords).Where(o=>o.Id == resourcesModel.Id).ExecuteAffrowsAsync();
             return OK();

Ys.Scada.Backend/EventConsumers/TagDataConsumerData.cs

@@ -33,7 +33,7 @@ namespace Ys.Scada.Backend.EventConsumers
                         MaxDegreeOfParallelism = 10,
                         TaskScheduler = _scheduler
                     },
-                     (tag) =>
+                    (tag) =>
                     {
                         var key = Global.GetVariableKey(tag.Id);
                         ForgeCache.Instance.SetValue(key, tag.VL);

Ys.Scada.RabbitMQ/RabbitMQConsumerClient.cs

@@ -50,7 +50,8 @@ namespace Ys.Scada.RabbitMQ
             consumer.Received += OnConsumerReceived;
             consumer.Shutdown += OnConsumerShutdown;
             consumer.ConsumerCancelled += OnConsumerConsumerCancelled;
-            
+
+
             if (_rabbitMQOptions.BasicQosOptions != null)
                 _channel?.BasicQos(0, _rabbitMQOptions.BasicQosOptions.PrefetchCount, _rabbitMQOptions.BasicQosOptions.Global);
             try