Shun 2 jaren geleden
bovenliggende
commit
afbc51f10f

+ 1 - 1
src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.7</Version>
+	  <Version>1.0.0.8</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>

+ 1 - 1
src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientData.cs

@@ -62,7 +62,7 @@ namespace YSAI.Opc.ua.client
             /// 自定义的名称空间
             /// </summary>
             [Description("自定义的名称空间")]
-            public string? CustomName { get; set; }
+            public string? CustomName { get; set; } = Guid.NewGuid().ToString().Replace("-", string.Empty).Trim().ToUpper();
 
             /// <summary>
             /// 取样时间间隔

+ 4 - 4
src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientOperate.cs

@@ -791,10 +791,10 @@ namespace YSAI.Opc.ua.client
                                 //添加订阅
                                 clientSession?.AddSubscription(allSubscriptions[Tag]);
                                 //在服务器端创建订阅
-                                if (allSubscriptions[Tag].CreateAsync().Wait(10000))
+                                if (allSubscriptions[Tag].CreateAsync().Wait(60000))
                                 {
                                     // 在服务器端创建监控项
-                                    if (allSubscriptions[Tag].ApplyChangesAsync().Wait(10000))
+                                    if (allSubscriptions[Tag].ApplyChangesAsync().Wait(60000))
                                     {
                                         return Break("AddSubscribe", true);
                                     }
@@ -844,10 +844,10 @@ namespace YSAI.Opc.ua.client
                             //添加订阅
                             clientSession?.AddSubscription(allSubscriptions[Tag]);
                             //在服务器端创建订阅
-                            if (allSubscriptions[Tag].CreateAsync().Wait(10000))
+                            if (allSubscriptions[Tag].CreateAsync().Wait(60000))
                             {
                                 // 在服务器端创建监控项
-                                if (allSubscriptions[Tag].ApplyChangesAsync().Wait(10000))
+                                if (allSubscriptions[Tag].ApplyChangesAsync().Wait(60000))
                                 {
                                     return Break("AddSubscribe", true);
                                 }

File diff suppressed because it is too large
+ 64 - 60
src/YSAI.DAQ/YSAI.Test.Console/Program.cs