版本更新

src/YSAI.Manage/Program.cs

@@ -1,3 +1,5 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.Authorization;
 using System.Reflection;
 using System.Text.Json.Serialization;
 using YSAI.DaqManage;
@@ -32,8 +34,11 @@ namespace YSAI.Manage
 
             var builder = WebApplication.CreateBuilder(args);
 
+            // 授权策略
+            var policy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build();
+
             // Add services to the container.
-            builder.Services.AddControllers().AddJsonOptions(options =>
+            builder.Services.AddControllers(options => options.Filters.Add(new AuthorizeFilter(policy))).AddJsonOptions(options =>
             {
                 //无驼峰,名称大小不变
                 options.JsonSerializerOptions.PropertyNamingPolicy = null;
@@ -58,6 +63,7 @@ namespace YSAI.Manage
 
             app.UseHttpsRedirection();
 
+            app.UseAuthentication();
             app.UseAuthorization();
 
             app.MapControllers();

src/YSAI.Model/tool/ParamTool.cs

@@ -268,7 +268,7 @@ namespace YSAI.Model.tool
                         }
 
                         //移除组
-                        if (subclass[i].RGroups != null && subclass[i].RGroups.Count > 0)
+                        if (subclass[i].RGroups != null && subclass[i]?.RGroups?.Count > 0)
                         {
                             //移除几组数据
                             foreach (var item in subclass[i].RGroups)
@@ -278,7 +278,7 @@ namespace YSAI.Model.tool
                         }
 
                         //子集中需要添加项
-                        if (subclass[i].Properties != null && subclass[i].Properties.Count > 0)
+                        if (subclass[i].Properties != null && subclass[i]?.Properties?.Count > 0)
                         {
                             paramStructure.Subset[i].Propertie.AddRange(subclass[i].Properties);
                         }

src/YSAI.Opc/YSAI.Opc.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.333.11250</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

src/YSAI.Opc/ua/client/OpcUaClientOperate.cs

@@ -467,6 +467,9 @@ namespace YSAI.Opc.ua.client
             int sleep = 60000;
             //订阅失败的地址
             List<AddressDetails> details = new List<AddressDetails>();
+            //日志名
+            string logName = $"{TAG}/SubscribeCheckStatus.log";
+            //异步处理
             return Task.Run(() =>
             {
                 while (true)
@@ -496,7 +499,9 @@ namespace YSAI.Opc.ua.client
 
                     if (details.Count > 0)
                     {
-                        LogHelper.Error($"存在 {details.Count} 个地址未能在服务器上创建订阅，正在执行重新订阅", $"{TAG}/SubscribeCheckStatus.log", consoleShow: false);
+                        LogHelper.Error($"存在 {details.Count} 个地址未能在服务器上创建订阅", logName, consoleShow: false);
+                        //LogHelper.Verbose(details.ToJson().JsonFormatting(), logName, consoleShow: false);
+                        LogHelper.Info($"正在执行重新订阅...", logName, consoleShow: false);
                         //移除这些点位成功后，在来进行订阅
                         OperateResult operateResult = RemoveSubscribe(new Address { AddressArray = details });
                         if (operateResult.State)
@@ -507,16 +512,16 @@ namespace YSAI.Opc.ua.client
                             });
                             if (operateResult.State)
                             {
-                                LogHelper.Info($"重新订阅成功", $"{TAG}/SubscribeCheckStatus.log", consoleShow: false);
+                                LogHelper.Info($"重新订阅成功", logName, consoleShow: false);
                             }
                             else
                             {
-                                LogHelper.Error($"重新订阅失败，{operateResult.Message}", $"{TAG}/SubscribeCheckStatus.log", consoleShow: false);
+                                LogHelper.Error($"重新订阅失败，{operateResult.Message}", logName, consoleShow: false);
                             }
                         }
                         else
                         {
-                            LogHelper.Error($"重新订阅失败，{operateResult.Message}", $"{TAG}/SubscribeCheckStatus.log", consoleShow: false);
+                            LogHelper.Error($"重新订阅失败，{operateResult.Message}", logName, consoleShow: false);
                         }
                         //清空
                         details.Clear();

src/YSAI.Rest/RestOperate.cs

@@ -1,6 +1,94 @@
-namespace YSAI.Rest
+using YSAI.Model.data;
+using YSAI.Model.@interface;
+
+namespace YSAI.Rest
 {
-    public class RestOperate
+
+    public class RestOperate : IBaseAbstract, IRelay
     {
+        public OperateResult CreateInstance<T>(T Basics)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<OperateResult> CreateInstanceAsync<T>(T Basics)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+        public OperateResult GetParam()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<OperateResult> GetParamAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public OperateResult GetStatus()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<OperateResult> GetStatusAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public OperateResult Off()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<OperateResult> OffAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public OperateResult On()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<OperateResult> OnAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public OperateResult Produce(string Topic, string Content)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<OperateResult> ProduceAsync(string Topic, string Content)
+        {
+            throw new NotImplementedException();
+        }
+
+        public OperateResult Subscribe(string Topic)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<OperateResult> SubscribeAsync(string Topic)
+        {
+            throw new NotImplementedException();
+        }
+
+        public OperateResult UnSubscribe(string Topic)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<OperateResult> UnSubscribeAsync(string Topic)
+        {
+            throw new NotImplementedException();
+        }
     }
 }