diff --git a/src/Plugins/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCUAClient.cs b/src/Plugins/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCUAClient.cs index 2988aabaa..35d819ba7 100644 --- a/src/Plugins/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCUAClient.cs +++ b/src/Plugins/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCUAClient.cs @@ -1407,7 +1407,7 @@ public class OPCUAClient : DisposableObject EndpointConfiguration endpointConfiguration = EndpointConfiguration.Create(m_configuration); ConfiguredEndpoint endpoint = new ConfiguredEndpoint(null, endpointDescription, endpointConfiguration); - var d= await m_application.CheckApplicationInstanceCertificate(true, 0); + var d = await m_application.CheckApplicationInstanceCertificate(true, 0); //var x509 = await m_configuration.SecurityConfiguration.ApplicationCertificate.Find(true); m_session = await Opc.Ua.Client.Session.Create( m_configuration, diff --git a/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/GlobalUsings.cs b/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/GlobalUsings.cs index 062a3f981..0877c6554 100644 --- a/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/GlobalUsings.cs +++ b/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/GlobalUsings.cs @@ -1 +1,4 @@ global using System; + +global using TouchSocket.Core; +global using TouchSocket.Sockets; diff --git a/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/Siemens/SiemensS7PLC.cs b/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/Siemens/SiemensS7PLC.cs index 4bc96a7c1..56b5dad64 100644 --- a/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/Siemens/SiemensS7PLC.cs +++ b/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/Siemens/SiemensS7PLC.cs @@ -5,9 +5,7 @@ using System.Threading.Tasks; using ThingsGateway.Foundation.Extension; -using TouchSocket.Core; using TouchSocket.Resources; -using TouchSocket.Sockets; namespace ThingsGateway.Foundation.Adapter.Siemens { diff --git a/src/Plugins/ThingsGateway.Modbus/GlobalUsings.cs b/src/Plugins/ThingsGateway.Modbus/GlobalUsings.cs new file mode 100644 index 000000000..b59529d19 --- /dev/null +++ b/src/Plugins/ThingsGateway.Modbus/GlobalUsings.cs @@ -0,0 +1,2 @@ +global using TouchSocket.Core; +global using TouchSocket.Sockets; diff --git a/src/Plugins/ThingsGateway.Modbus/ModbusRtu.cs b/src/Plugins/ThingsGateway.Modbus/ModbusRtu.cs index 31cf5ff29..21d164760 100644 --- a/src/Plugins/ThingsGateway.Modbus/ModbusRtu.cs +++ b/src/Plugins/ThingsGateway.Modbus/ModbusRtu.cs @@ -6,9 +6,6 @@ using ThingsGateway.Foundation; using ThingsGateway.Foundation.Serial; using ThingsGateway.Web.Foundation; -using TouchSocket.Core; -using TouchSocket.Sockets; - namespace ThingsGateway.Modbus { public class ModbusRtu : DriverBase, IDisposable diff --git a/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverTcp.cs b/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverTcp.cs index 5fca24262..d4f1dae9a 100644 --- a/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverTcp.cs +++ b/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverTcp.cs @@ -3,9 +3,6 @@ using ThingsGateway.Foundation; using ThingsGateway.Web.Foundation; -using TouchSocket.Core; -using TouchSocket.Sockets; - namespace ThingsGateway.Modbus { public class ModbusRtuOverTcp : DriverBase, IDisposable diff --git a/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverUdp.cs b/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverUdp.cs index c31dd1162..4d28e210b 100644 --- a/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverUdp.cs +++ b/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverUdp.cs @@ -3,8 +3,6 @@ using ThingsGateway.Foundation; using ThingsGateway.Web.Foundation; -using TouchSocket.Sockets; - namespace ThingsGateway.Modbus { public class ModbusRtuOverUdp : DriverBase diff --git a/src/Plugins/ThingsGateway.Modbus/ModbusServer.cs b/src/Plugins/ThingsGateway.Modbus/ModbusServer.cs index 034dc9631..178afa551 100644 --- a/src/Plugins/ThingsGateway.Modbus/ModbusServer.cs +++ b/src/Plugins/ThingsGateway.Modbus/ModbusServer.cs @@ -9,9 +9,6 @@ using ThingsGateway.Foundation.Adapter.Modbus; using ThingsGateway.Foundation.Extension; using ThingsGateway.Web.Foundation; -using TouchSocket.Core; -using TouchSocket.Sockets; - namespace ThingsGateway.Modbus { public class ModbusServer : UpLoadBase diff --git a/src/Plugins/ThingsGateway.Modbus/ModbusTcp.cs b/src/Plugins/ThingsGateway.Modbus/ModbusTcp.cs index 78c1e5bcd..1e1957181 100644 --- a/src/Plugins/ThingsGateway.Modbus/ModbusTcp.cs +++ b/src/Plugins/ThingsGateway.Modbus/ModbusTcp.cs @@ -3,9 +3,6 @@ using ThingsGateway.Foundation; using ThingsGateway.Web.Foundation; -using TouchSocket.Core; -using TouchSocket.Sockets; - namespace ThingsGateway.Modbus { public class ModbusTcp : DriverBase diff --git a/src/Plugins/ThingsGateway.Modbus/ModbusUdp.cs b/src/Plugins/ThingsGateway.Modbus/ModbusUdp.cs index a1c0b33f0..31c218b80 100644 --- a/src/Plugins/ThingsGateway.Modbus/ModbusUdp.cs +++ b/src/Plugins/ThingsGateway.Modbus/ModbusUdp.cs @@ -3,9 +3,6 @@ using ThingsGateway.Foundation; using ThingsGateway.Web.Foundation; -using TouchSocket.Core; -using TouchSocket.Sockets; - namespace ThingsGateway.Modbus { diff --git a/src/Plugins/ThingsGateway.Mqtt/MqttClient.cs b/src/Plugins/ThingsGateway.Mqtt/MqttClient.cs index bb94aa07c..db883ff40 100644 --- a/src/Plugins/ThingsGateway.Mqtt/MqttClient.cs +++ b/src/Plugins/ThingsGateway.Mqtt/MqttClient.cs @@ -243,7 +243,7 @@ namespace ThingsGateway.Mqtt foreach (var item in devData) { - + var devMessage = new MqttApplicationMessageBuilder() .WithTopic($"{DeviceTopic}") .WithPayload(item.GetSciptListValue(BigTextScriptDeviceModel)).Build(); diff --git a/src/Plugins/ThingsGateway.OPCUA/OPCUAServer.cs b/src/Plugins/ThingsGateway.OPCUA/OPCUAServer.cs index aaf10e045..b59fa3143 100644 --- a/src/Plugins/ThingsGateway.OPCUA/OPCUAServer.cs +++ b/src/Plugins/ThingsGateway.OPCUA/OPCUAServer.cs @@ -121,7 +121,7 @@ public partial class OPCUAServer : UpLoadBase private void VariableValueChange(CollectVariableRunTime collectVariableRunTime) { - CollectVariableRunTimes.Enqueue(collectVariableRunTime.Adapt()); + CollectVariableRunTimes.Enqueue(collectVariableRunTime.Adapt()); } @@ -214,7 +214,7 @@ public partial class OPCUAServer : UpLoadBase TrustedPeerCertificates = new CertificateTrustList() { StoreType = CertificateStoreType.Directory, - StorePath = "%CommonApplicationData%\\ThingsGateway\\pki\\issuer", + StorePath = "%CommonApplicationData%\\ThingsGateway\\pki\\issuer", }, TrustedIssuerCertificates = new CertificateTrustList() diff --git a/src/Plugins/ThingsGateway.OPCUA/OPCUAServer/ThingsGatewayNodeManager.cs b/src/Plugins/ThingsGateway.OPCUA/OPCUAServer/ThingsGatewayNodeManager.cs index f4e833d32..1f4268a08 100644 --- a/src/Plugins/ThingsGateway.OPCUA/OPCUAServer/ThingsGatewayNodeManager.cs +++ b/src/Plugins/ThingsGateway.OPCUA/OPCUAServer/ThingsGatewayNodeManager.cs @@ -96,12 +96,12 @@ public class ThingsGatewayNodeManager : CustomNodeManager2 /// /// 读取历史数据 /// - public override void HistoryRead(OperationContext context, - HistoryReadDetails details, - TimestampsToReturn timestampsToReturn, - bool releaseContinuationPoints, - IList nodesToRead, - IList results, + public override void HistoryRead(OperationContext context, + HistoryReadDetails details, + TimestampsToReturn timestampsToReturn, + bool releaseContinuationPoints, + IList nodesToRead, + IList results, IList errors) { base.HistoryRead(context, details, timestampsToReturn, releaseContinuationPoints, nodesToRead, results, errors); diff --git a/src/Plugins/ThingsGateway.OPCUA/OPCUAServer/ThingsGatewayServer.cs b/src/Plugins/ThingsGateway.OPCUA/OPCUAServer/ThingsGatewayServer.cs index 1af1dfe13..c5feb3db0 100644 --- a/src/Plugins/ThingsGateway.OPCUA/OPCUAServer/ThingsGatewayServer.cs +++ b/src/Plugins/ThingsGateway.OPCUA/OPCUAServer/ThingsGatewayServer.cs @@ -233,7 +233,7 @@ public partial class ThingsGatewayServer : StandardServer "Security token is not a valid username token. An empty password is not accepted."); } var _openApiUserService = _serviceScope.ServiceProvider.GetService(); - var userInfo = _openApiUserService.GetUserByAccount(userName).GetAwaiter().GetResult();//获取用户信息 + var userInfo = _openApiUserService.GetUserByAccount(userName).GetAwaiter().GetResult();//获取用户信息 if (userInfo == null) { // construct translation object with default text. @@ -259,7 +259,7 @@ public partial class ThingsGatewayServer : StandardServer { return new UserIdentity(userNameToken); } - + } private void VerifyUserTokenCertificate(X509Certificate2 certificate) diff --git a/src/Plugins/ThingsGateway.RabbitMQ/RabbitMQClient.cs b/src/Plugins/ThingsGateway.RabbitMQ/RabbitMQClient.cs index 6dbb94a46..028d6b39e 100644 --- a/src/Plugins/ThingsGateway.RabbitMQ/RabbitMQClient.cs +++ b/src/Plugins/ThingsGateway.RabbitMQ/RabbitMQClient.cs @@ -3,8 +3,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using NewLife.Serialization; - using RabbitMQ.Client; using System.Collections.Concurrent; @@ -14,8 +12,6 @@ using ThingsGateway.Foundation; using ThingsGateway.Foundation.Extension; using ThingsGateway.Web.Foundation; -using TouchSocket.Core; - namespace ThingsGateway.RabbitMQ { public class RabbitMQClient : UpLoadBase diff --git a/src/Plugins/ThingsGateway.Siemens/GlobalUsings.cs b/src/Plugins/ThingsGateway.Siemens/GlobalUsings.cs index fc2ab9e84..342b5e3a7 100644 --- a/src/Plugins/ThingsGateway.Siemens/GlobalUsings.cs +++ b/src/Plugins/ThingsGateway.Siemens/GlobalUsings.cs @@ -1,7 +1,5 @@ global using Microsoft.Extensions.DependencyInjection; -global using System.Net; - global using ThingsGateway.Foundation.Adapter.Siemens; global using ThingsGateway.Web.Foundation; diff --git a/src/ThingsGateway.Application/Services/System/UserCenter/UserCenterService.cs b/src/ThingsGateway.Application/Services/System/UserCenter/UserCenterService.cs index f8fbbf1f6..4cb3c3208 100644 --- a/src/ThingsGateway.Application/Services/System/UserCenter/UserCenterService.cs +++ b/src/ThingsGateway.Application/Services/System/UserCenter/UserCenterService.cs @@ -1,6 +1,6 @@ namespace ThingsGateway.Application { - + /// [Injection(Proxy = typeof(OperDispatchProxy))] public class UserCenterService : DbRepository, IUserCenterService diff --git a/src/ThingsGateway.Foundation/Foundation/Extensions/StringExtension.cs b/src/ThingsGateway.Foundation/Foundation/Extensions/StringExtension.cs index 84f9a764b..a5b6c0e73 100644 --- a/src/ThingsGateway.Foundation/Foundation/Extensions/StringExtension.cs +++ b/src/ThingsGateway.Foundation/Foundation/Extensions/StringExtension.cs @@ -2,7 +2,7 @@ namespace ThingsGateway.Foundation.Extension { - /// + /// public static class StringExtension { /// diff --git a/src/ThingsGateway.Foundation/Foundation/Message/CollectMessageBase.cs b/src/ThingsGateway.Foundation/Foundation/Message/CollectMessageBase.cs index b7057f555..5745b3e5e 100644 --- a/src/ThingsGateway.Foundation/Foundation/Message/CollectMessageBase.cs +++ b/src/ThingsGateway.Foundation/Foundation/Message/CollectMessageBase.cs @@ -5,18 +5,18 @@ { private byte[] sendBytes = new byte[] { }; - /// + /// public int BodyLength { get; set; } - /// + /// public byte[] HeadBytes { get; set; } - /// + /// public virtual int HeadBytesLength { get; } - /// + /// public byte[] ReceivedBytes { get; set; } - /// + /// public byte[] SendBytes { get @@ -30,7 +30,7 @@ } } - /// + /// public abstract bool CheckHeadBytes(byte[] head); /// diff --git a/src/ThingsGateway.Foundation/Foundation/Trans/BCDFormat.cs b/src/ThingsGateway.Foundation/Foundation/Trans/BCDFormat.cs index 55eae3c38..39f46d21e 100644 --- a/src/ThingsGateway.Foundation/Foundation/Trans/BCDFormat.cs +++ b/src/ThingsGateway.Foundation/Foundation/Trans/BCDFormat.cs @@ -5,15 +5,15 @@ /// public enum BcdFormat { - /// + /// C8421 = 1, - /// + /// C5421 = 2, - /// + /// C2421 = 3, - /// + /// C3 = 4, - /// + /// Gray = 5, } } \ No newline at end of file diff --git a/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs b/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs index 4618abc19..da7949574 100644 --- a/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs +++ b/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs @@ -97,7 +97,7 @@ namespace ThingsGateway.Foundation var task = m_waitHandle.WaitOneAsync(); if (Task.WhenAny(task, Task.Delay(millisecond)).GetAwaiter().GetResult() == task) { - + } else {