1

doc/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -4,8 +4,24 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <IncludeSymbols>False</IncludeSymbols>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\..\doc\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Include="..\..\..\doc\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.ClearScript" Version="7.4.3" />

src/YSAI.DAQ/YSAI.Mqtt/client/MqttClientOperate.cs

@@ -20,6 +20,9 @@ namespace YSAI.Mqtt.client
     /// </summary>
     public sealed class MqttClientOperate : IBaseAbstract, Core.@interface.only.IMqttClient, IRelay
     {
+        protected override string LogHead => "[ MqttClientOperate 操作 ]";
+        protected override string ClassName => "MqttClientOperate";
+
         private static readonly object Lock = new object();  //锁
         private static List<MqttClientOperate> ThisObjList = new List<MqttClientOperate>(); //自身对象集合
         /// <summary>
@@ -106,10 +109,6 @@ namespace YSAI.Mqtt.client
             ThisObjList.Remove(this);
         }
 
-        protected override string LogHead => "[ MqttClientOperate 操作 ]";
-
-        protected override string ClassName => "MqttClientOperate";
-
         public Task<OperateResult> PublishSubscribeAsync(string Topic, string Content, int QoSLevel = 0, bool Retain = false)
         {
             return Task.Run(()=> PublishSubscribe(Topic, Content, QoSLevel, Retain));

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

@@ -790,16 +790,12 @@ namespace YSAI.Opc.ua.client
 
                             if (Nodes.Count > 0)
                             {
-                                //不在主线程中实现
-                                Task.Run(async () =>
-                                {
-                                    //添加订阅
-                                    clientSession?.AddSubscription(allSubscriptions[Tag]);
-                                    //在服务器端创建订阅
-                                    await allSubscriptions[Tag].CreateAsync();
-                                    // 在服务器端创建监控项
-                                    await allSubscriptions[Tag].ApplyChangesAsync();
-                                }).Wait();
+                                //添加订阅
+                                clientSession?.AddSubscription(allSubscriptions[Tag]);
+                                //在服务器端创建订阅
+                                allSubscriptions[Tag].Create();
+                                // 在服务器端创建监控项
+                                allSubscriptions[Tag].ApplyChanges();
                             }
                         }
                         else
@@ -832,16 +828,12 @@ namespace YSAI.Opc.ua.client
                                 subscription.AddItem(monitoredItem);   //添加订阅通知项
                                 monitoredItem.Notification += delegate (MonitoredItem monitoredItem, MonitoredItemNotificationEventArgs e) { OnMonitoredItemNotification(monitoredItem, e, item); };  //重写事件添加一个参数
                             }
-                            //不在主线程中实现
-                            Task.Run(async () =>
-                            {
-                                //添加订阅
-                                clientSession?.AddSubscription(subscription);
-                                //在服务器端创建订阅
-                                await subscription.CreateAsync();
-                                // 在服务器端创建监控项
-                                await subscription.ApplyChangesAsync();
-                            }).Wait();
+                            //添加订阅
+                            clientSession?.AddSubscription(allSubscriptions[Tag]);
+                            //在服务器端创建订阅
+                            allSubscriptions[Tag].Create();
+                            // 在服务器端创建监控项
+                            allSubscriptions[Tag].ApplyChanges();
                             //把此订阅添加到集合，方便后续移除订阅(当存在此键则更新值，不存在则添加)
                             allSubscriptions?.AddOrUpdate(Tag, subscription, (k, v) => subscription);
                         }

src/YSAI.DAQ/YSAI.Test.Console/Program.cs

@@ -11,7 +11,7 @@ using YSAI.RelayManage;
 using YSAI.Unility;
 
 
-OpcUaClientData.Basics opcUaClientData = new OpcUaClientData.Basics() 
+OpcUaClientData.Basics opcUaClientData1 = new OpcUaClientData.Basics() 
 {
     Name="ysai",
     Password="ysai",
@@ -20,10 +20,25 @@ OpcUaClientData.Basics opcUaClientData = new OpcUaClientData.Basics()
     UserName="ysai"
 };
 
-OpcUaClientOperate opcUaClientOperate = OpcUaClientOperate.Instance(opcUaClientData);
+OpcUaClientOperate opcUaClientOperate = OpcUaClientOperate.Instance(opcUaClientData1);
 
 OperateResult operateResult = opcUaClientOperate.On();
 
+Console.WriteLine();
+
+OpcUaClientData.Basics opcUaClientData2 = new OpcUaClientData.Basics()
+{
+    Name = "ysai",
+    Password = "ysai",
+    ServerUrl = "opc.tcp://127.0.0.1:8866/Opc.Ua.Service",
+    SN = "OPCUA2",
+    UserName = "ysai"
+};
+
+opcUaClientOperate = OpcUaClientOperate.Instance(opcUaClientData2);
+
+operateResult = opcUaClientOperate.On();
+
 
 //FileTool.StringToFile("config/YSAI.Opc.ua.client.OpcUaClientReadController.OPCUA1.Daq.Config.json", opcUaClientData.ToJson().JsonFormatting());