Parcourir la source

删除OPCUA服务端 匿名登录机制

Shun il y a 2 ans
Parent
commit
2f19123a88

+ 2 - 1
README.md

@@ -567,5 +567,6 @@ while(true)
 3. OPCUA服务端工具改造完成
 
 #### 2023-12-25
-1. 修改OPCUA服务端 验证机制
+1. 修改Mqtt服务端 验证机制
+2. 删除OPCUA服务端 匿名登录机制
 

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

@@ -99,7 +99,7 @@
 
   <ItemGroup>
     <PackageReference Include="YSAI.Mqtt" Version="23.359.7955" />
-    <PackageReference Include="YSAI.Opc" Version="23.356.35571" />
+    <PackageReference Include="YSAI.Opc" Version="23.359.8686" />
   </ItemGroup>
 
   <ItemGroup>

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

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

+ 7 - 7
src/YSAI.Opc/ua/client/OpcUaClientData.cs

@@ -22,6 +22,13 @@ namespace YSAI.Opc.ua.client
             [Description("唯一标识符")]
             public string? SN { get; set; } = Guid.NewGuid().ToUpperNString();
 
+            /// <summary>
+            /// 服务地址
+            /// </summary>
+            [Description("服务地址")]
+            [Display(true, true, true, ParamStructure.dataCate.text)]
+            public string? ServerUrl { get; set; }
+
             /// <summary>
             /// 用户名
             /// </summary>
@@ -50,13 +57,6 @@ namespace YSAI.Opc.ua.client
             [Display(true, true, false, ParamStructure.dataCate.text)]
             public string? SecreKey { get; set; }
 
-            /// <summary>
-            /// 服务地址
-            /// </summary>
-            [Description("服务地址")]
-            [Display(true, true, true, ParamStructure.dataCate.text)]
-            public string? ServerUrl { get; set; }
-
             /// <summary>
             /// 客户端名称(唯一)
             /// </summary>

+ 5 - 5
src/YSAI.Opc/ua/service/OpcUaServiceOperate.cs

@@ -154,7 +154,7 @@ namespace YSAI.Opc.ua.service
                     }
                     LastEventTime = DateTime.UtcNow;
                 }
-                await Task.Delay(1000);
+                Thread.Sleep(1000);
             }
         }
 
@@ -393,10 +393,10 @@ namespace YSAI.Opc.ua.service
     <!-- The SDK expects the server to support the same set of user tokens for every endpoint. -->
     <UserTokenPolicies>
       <!-- 匿名登录 -->
-      <ua:UserTokenPolicy>
-        <ua:TokenType>Anonymous_0</ua:TokenType>
-        <ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#None</ua:SecurityPolicyUri>
-      </ua:UserTokenPolicy>
+      <!--<ua:UserTokenPolicy>
+            <ua:TokenType>Anonymous_0</ua:TokenType>
+            <ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#None</ua:SecurityPolicyUri>
+          </ua:UserTokenPolicy>-->
 
       <!-- 账号密码登录 -->
       <ua:UserTokenPolicy>

+ 1 - 1
src/YSAI.Tool.Wpf/YSAI.Tool.Wpf.csproj

@@ -28,7 +28,7 @@
 		<PackageReference Include="YSAI.NetMQ" Version="23.352.38022" />
 		<PackageReference Include="YSAI.Netty" Version="23.352.38022" />
 		<PackageReference Include="YSAI.Omron" Version="23.353.7802" />
-		<PackageReference Include="YSAI.Opc" Version="23.356.35571" />
+		<PackageReference Include="YSAI.Opc" Version="23.359.8686" />
 		<PackageReference Include="YSAI.RabbitMQ" Version="23.352.38022" />
 		<PackageReference Include="YSAI.Redis" Version="23.352.38022" />
 		<PackageReference Include="YSAI.Siemens" Version="23.353.7802" />