Merge branch 'master' of https://github.com/iioter/iotgateway
This commit is contained in:
iioter
commit
fb53dbd7d0
Binary file not shown.
@ -524,7 +524,7 @@ namespace DriverModbusMaster
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
rpcResponse.Description = $"写入失败:{Method},{Ioarg}";
|
rpcResponse.Description = $"写入失败,[Method]:{Method},[Ioarg]:{Ioarg},[ex]:{ex}";
|
||||||
}
|
}
|
||||||
return rpcResponse;
|
return rpcResponse;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -148,7 +148,10 @@ namespace DriverSiemensS7
|
|||||||
int startAdr = int.Parse(ioarg.Address.Trim().Split(',')[1]);
|
int startAdr = int.Parse(ioarg.Address.Trim().Split(',')[1]);
|
||||||
int count = int.Parse(ioarg.Address.Trim().Split(',')[2]);
|
int count = int.Parse(ioarg.Address.Trim().Split(',')[2]);
|
||||||
var buffers = plc.ReadBytes(DataType.DataBlock, db, startAdr, count);
|
var buffers = plc.ReadBytes(DataType.DataBlock, db, startAdr, count);
|
||||||
ret.Value = Encoding.ASCII.GetString(buffers);
|
var str = Encoding.ASCII.GetString(buffers);
|
||||||
|
if (str.Contains('\0'))
|
||||||
|
str = str.Split('\0')[0];
|
||||||
|
ret.Value = str;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -226,7 +229,81 @@ namespace DriverSiemensS7
|
|||||||
|
|
||||||
public async Task<RpcResponse> WriteAsync(string RequestId, string Method, DriverAddressIoArgModel Ioarg)
|
public async Task<RpcResponse> WriteAsync(string RequestId, string Method, DriverAddressIoArgModel Ioarg)
|
||||||
{
|
{
|
||||||
RpcResponse rpcResponse = new() { IsSuccess = false, Description = "设备驱动内未实现写入功能" };
|
RpcResponse rpcResponse = new() { IsSuccess = false };
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!IsConnected)
|
||||||
|
rpcResponse.Description = "设备连接已断开";
|
||||||
|
else
|
||||||
|
{
|
||||||
|
object toWrite = null;
|
||||||
|
switch (Ioarg.ValueType)
|
||||||
|
{
|
||||||
|
case DataTypeEnum.Bit:
|
||||||
|
case DataTypeEnum.Bool:
|
||||||
|
toWrite = Ioarg.Value.ToString().ToLower() == "true" || Ioarg.Value.ToString().ToLower() == "1";
|
||||||
|
break;
|
||||||
|
case DataTypeEnum.UByte:
|
||||||
|
toWrite = byte.Parse(Ioarg.Value.ToString());
|
||||||
|
break;
|
||||||
|
case DataTypeEnum.Byte:
|
||||||
|
toWrite = sbyte.Parse(Ioarg.Value.ToString());
|
||||||
|
break;
|
||||||
|
case DataTypeEnum.Uint16:
|
||||||
|
toWrite = ushort.Parse(Ioarg.Value.ToString());
|
||||||
|
break;
|
||||||
|
case DataTypeEnum.Int16:
|
||||||
|
toWrite = short.Parse(Ioarg.Value.ToString());
|
||||||
|
break;
|
||||||
|
case DataTypeEnum.Uint32:
|
||||||
|
toWrite = uint.Parse(Ioarg.Value.ToString());
|
||||||
|
break;
|
||||||
|
case DataTypeEnum.Int32:
|
||||||
|
toWrite = int.Parse(Ioarg.Value.ToString());
|
||||||
|
break;
|
||||||
|
case DataTypeEnum.Float:
|
||||||
|
toWrite = float.Parse(Ioarg.Value.ToString());
|
||||||
|
break;
|
||||||
|
case DataTypeEnum.AsciiString:
|
||||||
|
toWrite = Encoding.ASCII.GetBytes(Ioarg.Value.ToString());
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
rpcResponse.Description = $"类型{DataTypeEnum.Float}不支持写入";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (toWrite == null)
|
||||||
|
return rpcResponse;
|
||||||
|
|
||||||
|
//通用方法
|
||||||
|
if (Method == nameof(Read))
|
||||||
|
{
|
||||||
|
plc.Write(Ioarg.Address, toWrite);
|
||||||
|
|
||||||
|
rpcResponse.IsSuccess = true;
|
||||||
|
return rpcResponse;
|
||||||
|
}
|
||||||
|
//字符串
|
||||||
|
else if (Method == nameof(ReadString))
|
||||||
|
{
|
||||||
|
int db = int.Parse(Ioarg.Address.Trim().Split(',')[0]);
|
||||||
|
int startAdr = int.Parse(Ioarg.Address.Trim().Split(',')[1]);
|
||||||
|
int count = int.Parse(Ioarg.Address.Trim().Split(',')[2]);
|
||||||
|
//防止写入到其他地址 进行截断
|
||||||
|
if (((byte[])toWrite).Length > count)
|
||||||
|
toWrite = ((byte[])toWrite).Take(count);
|
||||||
|
plc.Write(DataType.DataBlock, db, startAdr, toWrite);
|
||||||
|
|
||||||
|
rpcResponse.IsSuccess = true;
|
||||||
|
return rpcResponse;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
rpcResponse.Description = $"不支持写入:{Method}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
rpcResponse.Description = $"写入失败,[Method]:{Method},[Ioarg]:{Ioarg},[ex]:{ex}";
|
||||||
|
}
|
||||||
return rpcResponse;
|
return rpcResponse;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,300 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<ApplicationConfiguration
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xmlns:ua="http://opcfoundation.org/UA/2008/02/Types.xsd"
|
|
||||||
xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd"
|
|
||||||
>
|
|
||||||
<ApplicationName>Quickstart Reference Server</ApplicationName>
|
|
||||||
<ApplicationUri>urn:localhost:UA:Quickstarts:ReferenceServer</ApplicationUri>
|
|
||||||
<ProductUri>uri:opcfoundation.org:Quickstarts:ReferenceServer</ProductUri>
|
|
||||||
<ApplicationType>Server_0</ApplicationType>
|
|
||||||
|
|
||||||
<SecurityConfiguration>
|
|
||||||
|
|
||||||
<!-- Where the application instance certificate is stored (MachineDefault) -->
|
|
||||||
<ApplicationCertificate>
|
|
||||||
<StoreType>Directory</StoreType>
|
|
||||||
<StorePath>%LocalApplicationData%/OPC Foundation/pki/own</StorePath>
|
|
||||||
<SubjectName>CN=Quickstart Reference Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
|
|
||||||
</ApplicationCertificate>
|
|
||||||
|
|
||||||
<!-- Where the issuer certificate are stored (certificate authorities) -->
|
|
||||||
<TrustedIssuerCertificates>
|
|
||||||
<StoreType>Directory</StoreType>
|
|
||||||
<StorePath>%LocalApplicationData%/OPC Foundation/pki/issuer</StorePath>
|
|
||||||
</TrustedIssuerCertificates>
|
|
||||||
|
|
||||||
<!-- Where the trust list is stored -->
|
|
||||||
<TrustedPeerCertificates>
|
|
||||||
<StoreType>Directory</StoreType>
|
|
||||||
<StorePath>%LocalApplicationData%/OPC Foundation/pki/trusted</StorePath>
|
|
||||||
</TrustedPeerCertificates>
|
|
||||||
|
|
||||||
<!-- The directory used to store invalid certficates for later review by the administrator. -->
|
|
||||||
<RejectedCertificateStore>
|
|
||||||
<StoreType>Directory</StoreType>
|
|
||||||
<StorePath>%LocalApplicationData%/OPC Foundation/pki/rejected</StorePath>
|
|
||||||
</RejectedCertificateStore>
|
|
||||||
|
|
||||||
<!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
|
|
||||||
for easy debugging purposes ONLY and turned off for production deployments! -->
|
|
||||||
<AutoAcceptUntrustedCertificates>false</AutoAcceptUntrustedCertificates>
|
|
||||||
|
|
||||||
<!-- WARNING: SHA1 signed certficates are by default rejected and should be phased out.
|
|
||||||
The setting below to allow them is only required for UACTT (1.02.336.244) which uses SHA-1 signed certs. -->
|
|
||||||
<RejectSHA1SignedCertificates>false</RejectSHA1SignedCertificates>
|
|
||||||
<RejectUnknownRevocationStatus>true</RejectUnknownRevocationStatus>
|
|
||||||
<MinimumCertificateKeySize>2048</MinimumCertificateKeySize>
|
|
||||||
<AddAppCertToTrustedStore>false</AddAppCertToTrustedStore>
|
|
||||||
<SendCertificateChain>true</SendCertificateChain>
|
|
||||||
|
|
||||||
<!-- Where the User issuer certificates are stored -->
|
|
||||||
<UserIssuerCertificates>
|
|
||||||
<StoreType>Directory</StoreType>
|
|
||||||
<StorePath>%LocalApplicationData%/OPC Foundation/pki/issuerUser</StorePath>
|
|
||||||
</UserIssuerCertificates>
|
|
||||||
|
|
||||||
<!-- Where the User trust list is stored-->
|
|
||||||
<TrustedUserCertificates>
|
|
||||||
<StoreType>Directory</StoreType>
|
|
||||||
<StorePath>%LocalApplicationData%/OPC Foundation/pki/trustedUser</StorePath>
|
|
||||||
</TrustedUserCertificates>
|
|
||||||
</SecurityConfiguration>
|
|
||||||
|
|
||||||
<TransportConfigurations></TransportConfigurations>
|
|
||||||
<TransportQuotas>
|
|
||||||
<OperationTimeout>600000</OperationTimeout>
|
|
||||||
<MaxStringLength>1048576</MaxStringLength>
|
|
||||||
<MaxByteStringLength>1048576</MaxByteStringLength>
|
|
||||||
<MaxArrayLength>65535</MaxArrayLength>
|
|
||||||
<MaxMessageSize>4194304</MaxMessageSize>
|
|
||||||
<MaxBufferSize>65535</MaxBufferSize>
|
|
||||||
<ChannelLifetime>300000</ChannelLifetime>
|
|
||||||
<SecurityTokenLifetime>3600000</SecurityTokenLifetime>
|
|
||||||
</TransportQuotas>
|
|
||||||
<ServerConfiguration>
|
|
||||||
<BaseAddresses>
|
|
||||||
<ua:String>https://localhost:62540/Quickstarts/ReferenceServer</ua:String>
|
|
||||||
<ua:String>opc.tcp://localhost:62541/Quickstarts/ReferenceServer</ua:String>
|
|
||||||
</BaseAddresses>
|
|
||||||
<!--
|
|
||||||
These list the alternate addresses (via firewalls, multiple NICs etc.) that can be
|
|
||||||
used to communicate with the server. The URL used by the client when calling
|
|
||||||
FindServers/GetEndpoints or CreateSession will be used to filter the list of
|
|
||||||
endpoints returned by checking for alternate base addresses that have a domain
|
|
||||||
that matches the domain in the url provided by the client.
|
|
||||||
|
|
||||||
Note that any additional domains should be listed in the server's certificate. If they
|
|
||||||
are left out the client make refuse to connect because it has no way to know if the
|
|
||||||
alternate domain was authorized by the server administrator.
|
|
||||||
-->
|
|
||||||
<!--
|
|
||||||
<AlternateBaseAddresses>
|
|
||||||
<ua:String>http://AlternateHostName/Quickstarts/ReferenceServer</ua:String>
|
|
||||||
<ua:String>http://10.10.103.150/Quickstarts/ReferenceServer</ua:String>
|
|
||||||
<ua:String>http://[2a01::626d]/Quickstarts/ReferenceServer</ua:String>
|
|
||||||
</AlternateBaseAddresses>
|
|
||||||
-->
|
|
||||||
<SecurityPolicies>
|
|
||||||
<ServerSecurityPolicy>
|
|
||||||
<SecurityMode>SignAndEncrypt_3</SecurityMode>
|
|
||||||
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256</SecurityPolicyUri>
|
|
||||||
</ServerSecurityPolicy>
|
|
||||||
<ServerSecurityPolicy>
|
|
||||||
<SecurityMode>None_1</SecurityMode>
|
|
||||||
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#None</SecurityPolicyUri>
|
|
||||||
</ServerSecurityPolicy>
|
|
||||||
<ServerSecurityPolicy>
|
|
||||||
<SecurityMode>Sign_2</SecurityMode>
|
|
||||||
<SecurityPolicyUri></SecurityPolicyUri>
|
|
||||||
</ServerSecurityPolicy>
|
|
||||||
<ServerSecurityPolicy>
|
|
||||||
<SecurityMode>SignAndEncrypt_3</SecurityMode>
|
|
||||||
<SecurityPolicyUri></SecurityPolicyUri>
|
|
||||||
</ServerSecurityPolicy>
|
|
||||||
<!-- deprecated security policies for reference only
|
|
||||||
<ServerSecurityPolicy>
|
|
||||||
<SecurityMode>Sign_2</SecurityMode>
|
|
||||||
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256</SecurityPolicyUri>
|
|
||||||
</ServerSecurityPolicy>
|
|
||||||
<ServerSecurityPolicy>
|
|
||||||
<SecurityMode>SignAndEncrypt_3</SecurityMode>
|
|
||||||
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256</SecurityPolicyUri>
|
|
||||||
</ServerSecurityPolicy>
|
|
||||||
<ServerSecurityPolicy>
|
|
||||||
<SecurityMode>Sign_2</SecurityMode>
|
|
||||||
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
|
|
||||||
</ServerSecurityPolicy>
|
|
||||||
<ServerSecurityPolicy>
|
|
||||||
<SecurityMode>SignAndEncrypt_3</SecurityMode>
|
|
||||||
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
|
|
||||||
</ServerSecurityPolicy>
|
|
||||||
-->
|
|
||||||
</SecurityPolicies>
|
|
||||||
|
|
||||||
<MinRequestThreadCount>5</MinRequestThreadCount>
|
|
||||||
<MaxRequestThreadCount>100</MaxRequestThreadCount>
|
|
||||||
<MaxQueuedRequestCount>2000</MaxQueuedRequestCount>
|
|
||||||
|
|
||||||
<!-- The SDK expects the server to support the same set of user tokens for every endpoint. -->
|
|
||||||
<UserTokenPolicies>
|
|
||||||
<!-- Allows anonymous users -->
|
|
||||||
<ua:UserTokenPolicy>
|
|
||||||
<ua:TokenType>Anonymous_0</ua:TokenType>
|
|
||||||
<ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#None</ua:SecurityPolicyUri>
|
|
||||||
</ua:UserTokenPolicy>
|
|
||||||
|
|
||||||
<!-- Allows username/password -->
|
|
||||||
<ua:UserTokenPolicy>
|
|
||||||
<ua:TokenType>UserName_1</ua:TokenType>
|
|
||||||
<!-- passwords must be encrypted - this specifies what algorithm to use -->
|
|
||||||
<ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256</ua:SecurityPolicyUri>
|
|
||||||
</ua:UserTokenPolicy>
|
|
||||||
|
|
||||||
<!-- Allows user certificates -->
|
|
||||||
<ua:UserTokenPolicy>
|
|
||||||
<ua:TokenType>Certificate_2</ua:TokenType>
|
|
||||||
<!-- certificate possession must be proven with a digital signature - this specifies what algorithm to use -->
|
|
||||||
<ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256</ua:SecurityPolicyUri>
|
|
||||||
</ua:UserTokenPolicy>
|
|
||||||
</UserTokenPolicies>
|
|
||||||
<DiagnosticsEnabled>true</DiagnosticsEnabled>
|
|
||||||
<MaxSessionCount>100</MaxSessionCount>
|
|
||||||
<MinSessionTimeout>10000</MinSessionTimeout>
|
|
||||||
<MaxSessionTimeout>3600000</MaxSessionTimeout>
|
|
||||||
<MaxBrowseContinuationPoints>10</MaxBrowseContinuationPoints>
|
|
||||||
<MaxQueryContinuationPoints>10</MaxQueryContinuationPoints>
|
|
||||||
<MaxHistoryContinuationPoints>100</MaxHistoryContinuationPoints>
|
|
||||||
<MaxRequestAge>600000</MaxRequestAge>
|
|
||||||
<MinPublishingInterval>100</MinPublishingInterval>
|
|
||||||
<MaxPublishingInterval>3600000</MaxPublishingInterval>
|
|
||||||
<PublishingResolution>50</PublishingResolution>
|
|
||||||
<MaxSubscriptionLifetime>3600000</MaxSubscriptionLifetime>
|
|
||||||
<MaxMessageQueueSize>100</MaxMessageQueueSize>
|
|
||||||
<MaxNotificationQueueSize>100</MaxNotificationQueueSize>
|
|
||||||
<MaxNotificationsPerPublish>1000</MaxNotificationsPerPublish>
|
|
||||||
<MinMetadataSamplingInterval>1000</MinMetadataSamplingInterval>
|
|
||||||
<AvailableSamplingRates>
|
|
||||||
<SamplingRateGroup>
|
|
||||||
<Start>5</Start>
|
|
||||||
<Increment>5</Increment>
|
|
||||||
<Count>20</Count>
|
|
||||||
</SamplingRateGroup>
|
|
||||||
<SamplingRateGroup>
|
|
||||||
<Start>100</Start>
|
|
||||||
<Increment>100</Increment>
|
|
||||||
<Count>4</Count>
|
|
||||||
</SamplingRateGroup>
|
|
||||||
<SamplingRateGroup>
|
|
||||||
<Start>500</Start>
|
|
||||||
<Increment>250</Increment>
|
|
||||||
<Count>2</Count>
|
|
||||||
</SamplingRateGroup>
|
|
||||||
<SamplingRateGroup>
|
|
||||||
<Start>1000</Start>
|
|
||||||
<Increment>500</Increment>
|
|
||||||
<Count>20</Count>
|
|
||||||
</SamplingRateGroup>
|
|
||||||
</AvailableSamplingRates>
|
|
||||||
|
|
||||||
<RegistrationEndpoint>
|
|
||||||
<ua:EndpointUrl>opc.tcp://localhost:4840</ua:EndpointUrl>
|
|
||||||
<ua:Server>
|
|
||||||
<ua:ApplicationUri>opc.tcp://localhost:4840</ua:ApplicationUri>
|
|
||||||
<ua:ApplicationType>DiscoveryServer_3</ua:ApplicationType>
|
|
||||||
<ua:DiscoveryUrls>
|
|
||||||
<ua:String>opc.tcp://localhost:4840</ua:String>
|
|
||||||
</ua:DiscoveryUrls>
|
|
||||||
</ua:Server>
|
|
||||||
<ua:SecurityMode>SignAndEncrypt_3</ua:SecurityMode>
|
|
||||||
<ua:SecurityPolicyUri />
|
|
||||||
<ua:UserIdentityTokens />
|
|
||||||
</RegistrationEndpoint>
|
|
||||||
|
|
||||||
<MaxRegistrationInterval>0</MaxRegistrationInterval>
|
|
||||||
<NodeManagerSaveFile>Quickstarts.ReferenceServer.nodes.xml</NodeManagerSaveFile>
|
|
||||||
<MinSubscriptionLifetime>10000</MinSubscriptionLifetime>
|
|
||||||
<MaxPublishRequestCount>20</MaxPublishRequestCount>
|
|
||||||
<MaxSubscriptionCount>100</MaxSubscriptionCount>
|
|
||||||
<MaxEventQueueSize>10000</MaxEventQueueSize>
|
|
||||||
|
|
||||||
<!-- see https://opcfoundation-onlineapplications.org/profilereporting/ for list of available profiles -->
|
|
||||||
<ServerProfileArray>
|
|
||||||
<ua:String>http://opcfoundation.org/UA-Profile/Server/StandardUA2017</ua:String>
|
|
||||||
<ua:String>http://opcfoundation.org/UA-Profile/Server/DataAccess</ua:String>
|
|
||||||
<ua:String>http://opcfoundation.org/UA-Profile/Server/Methods</ua:String>
|
|
||||||
<ua:String>http://opcfoundation.org/UA-Profile/Server/ReverseConnect</ua:String>
|
|
||||||
</ServerProfileArray>
|
|
||||||
<ShutdownDelay>5</ShutdownDelay>
|
|
||||||
<ServerCapabilities>
|
|
||||||
<ua:String>DA</ua:String>
|
|
||||||
</ServerCapabilities>
|
|
||||||
<SupportedPrivateKeyFormats>
|
|
||||||
<ua:String>PFX</ua:String>
|
|
||||||
<ua:String>PEM</ua:String>
|
|
||||||
</SupportedPrivateKeyFormats>
|
|
||||||
<MaxTrustListSize>0</MaxTrustListSize>
|
|
||||||
<MultiCastDnsEnabled>false</MultiCastDnsEnabled>
|
|
||||||
<!-- Reverse connection parameters for aggregation server sample -->
|
|
||||||
<!--
|
|
||||||
<ReverseConnect>
|
|
||||||
<Clients>
|
|
||||||
<ReverseConnectClient>
|
|
||||||
<EndpointUrl>opc.tcp://localhost:65300</EndpointUrl>
|
|
||||||
<MaxSessionCount>0</MaxSessionCount>
|
|
||||||
<Enabled>true</Enabled>
|
|
||||||
</ReverseConnectClient>
|
|
||||||
</Clients>
|
|
||||||
<ConnectInterval>15000</ConnectInterval>
|
|
||||||
<ConnectTimeout>30000</ConnectTimeout>
|
|
||||||
<RejectTimeout>60000</RejectTimeout>
|
|
||||||
</ReverseConnect>
|
|
||||||
-->
|
|
||||||
<OperationLimits>
|
|
||||||
<MaxNodesPerRead>1000</MaxNodesPerRead>
|
|
||||||
<MaxNodesPerWrite>1000</MaxNodesPerWrite>
|
|
||||||
<MaxNodesPerMethodCall>250</MaxNodesPerMethodCall>
|
|
||||||
<MaxNodesPerBrowse>2500</MaxNodesPerBrowse>
|
|
||||||
<MaxNodesPerTranslateBrowsePathsToNodeIds>1000</MaxNodesPerTranslateBrowsePathsToNodeIds>
|
|
||||||
<MaxMonitoredItemsPerCall>1000</MaxMonitoredItemsPerCall>
|
|
||||||
</OperationLimits>
|
|
||||||
|
|
||||||
</ServerConfiguration>
|
|
||||||
|
|
||||||
<Extensions>
|
|
||||||
<ua:XmlElement>
|
|
||||||
<MemoryBufferConfiguration xmlns="http://samples.org/UA/MemoryBuffer">
|
|
||||||
<Buffers>
|
|
||||||
<MemoryBufferInstance>
|
|
||||||
<Name>UInt32</Name>
|
|
||||||
<TagCount>100</TagCount>
|
|
||||||
<DataType>UInt32</DataType>
|
|
||||||
</MemoryBufferInstance>
|
|
||||||
<MemoryBufferInstance>
|
|
||||||
<Name>Double</Name>
|
|
||||||
<TagCount>100</TagCount>
|
|
||||||
<DataType>Double</DataType>
|
|
||||||
</MemoryBufferInstance>
|
|
||||||
</Buffers>
|
|
||||||
</MemoryBufferConfiguration>
|
|
||||||
</ua:XmlElement>
|
|
||||||
</Extensions>
|
|
||||||
|
|
||||||
<TraceConfiguration>
|
|
||||||
<OutputFilePath>%LocalApplicationData%/OPC Foundation/Logs/Quickstarts.ReferenceServer.log.txt</OutputFilePath>
|
|
||||||
<DeleteOnLoad>true</DeleteOnLoad>
|
|
||||||
<!-- Show Only Errors -->
|
|
||||||
<!-- <TraceMasks>1</TraceMasks> -->
|
|
||||||
<!-- Show Only Security and Errors -->
|
|
||||||
<!-- <TraceMasks>513</TraceMasks> -->
|
|
||||||
<!-- Show Only Security, Errors and Trace -->
|
|
||||||
<!-- <TraceMasks>515</TraceMasks> -->
|
|
||||||
<!-- Show Only Security, COM Calls, Errors and Trace -->
|
|
||||||
<!-- <TraceMasks>771</TraceMasks> -->
|
|
||||||
<!-- Show Only Security, Service Calls, Errors and Trace -->
|
|
||||||
<!-- <TraceMasks>523</TraceMasks> -->
|
|
||||||
<!-- Show Only Security, ServiceResultExceptions, Errors and Trace -->
|
|
||||||
<!-- <TraceMasks>519</TraceMasks> -->
|
|
||||||
</TraceConfiguration>
|
|
||||||
|
|
||||||
</ApplicationConfiguration>
|
|
||||||
15
auto-build-arm.sh
Normal file
15
auto-build-arm.sh
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
echo start
|
||||||
|
docker build -t iotgateway .
|
||||||
|
docker stop iotgateway
|
||||||
|
docker rm iotgateway
|
||||||
|
docker run -d --restart always --name iotgateway -p 518:518 -p 1888:1888 -p 62541:62541 -p 503:503 iotgateway
|
||||||
|
docker cp 3d iotgateway:app/wwwroot/
|
||||||
|
docker cp drivers iotgateway:app/
|
||||||
|
docker cp IoTGateway/iotgateway.db iotgateway:app/
|
||||||
|
docker cp IoTGateway/Quickstarts.ReferenceServer.Config.xml iotgateway:app/
|
||||||
|
docker restart iotgateway
|
||||||
|
docker commit iotgateway registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway:arm
|
||||||
|
docker push registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway:arm
|
||||||
|
docker tag registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway:arm 15261671110/iotgateway:arm
|
||||||
|
docker push 15261671110/iotgateway:arm
|
||||||
15
auto-build.sh
Normal file
15
auto-build.sh
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
echo start
|
||||||
|
docker build -t iotgateway .
|
||||||
|
docker stop iotgateway
|
||||||
|
docker rm iotgateway
|
||||||
|
docker run -d --restart always --name iotgateway -p 518:518 -p 1888:1888 -p 62541:62541 -p 503:503 iotgateway
|
||||||
|
docker cp 3d iotgateway:app/wwwroot/
|
||||||
|
docker cp drivers iotgateway:app/
|
||||||
|
docker cp IoTGateway/iotgateway.db iotgateway:app/
|
||||||
|
docker cp IoTGateway/Quickstarts.ReferenceServer.Config.xml iotgateway:app/
|
||||||
|
docker restart iotgateway
|
||||||
|
docker commit iotgateway registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway
|
||||||
|
docker push registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway
|
||||||
|
docker tag registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway 15261671110/iotgateway
|
||||||
|
docker push 15261671110/iotgateway
|
||||||
183
drivers/DriverModbusMaster/net6.0/DriverModbusMaster.deps.json
Normal file
183
drivers/DriverModbusMaster/net6.0/DriverModbusMaster.deps.json
Normal file
@ -0,0 +1,183 @@
|
|||||||
|
{
|
||||||
|
"runtimeTarget": {
|
||||||
|
"name": ".NETCoreApp,Version=v6.0",
|
||||||
|
"signature": ""
|
||||||
|
},
|
||||||
|
"compilationOptions": {},
|
||||||
|
"targets": {
|
||||||
|
".NETCoreApp,Version=v6.0": {
|
||||||
|
"DriverModbusMaster/1.0.0": {
|
||||||
|
"dependencies": {
|
||||||
|
"PluginInterface": "1.0.0",
|
||||||
|
"System.IO.Ports": "6.0.0"
|
||||||
|
},
|
||||||
|
"runtime": {
|
||||||
|
"DriverModbusMaster.dll": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Newtonsoft.Json/13.0.1": {
|
||||||
|
"runtime": {
|
||||||
|
"lib/netstandard2.0/Newtonsoft.Json.dll": {
|
||||||
|
"assemblyVersion": "13.0.0.0",
|
||||||
|
"fileVersion": "13.0.1.25517"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"runtime.linux-arm.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"runtimeTargets": {
|
||||||
|
"runtimes/linux-arm/native/libSystem.IO.Ports.Native.so": {
|
||||||
|
"rid": "linux-arm",
|
||||||
|
"assetType": "native",
|
||||||
|
"fileVersion": "0.0.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"runtime.linux-arm64.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"runtimeTargets": {
|
||||||
|
"runtimes/linux-arm64/native/libSystem.IO.Ports.Native.so": {
|
||||||
|
"rid": "linux-arm64",
|
||||||
|
"assetType": "native",
|
||||||
|
"fileVersion": "0.0.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"runtime.linux-x64.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"runtimeTargets": {
|
||||||
|
"runtimes/linux-x64/native/libSystem.IO.Ports.Native.so": {
|
||||||
|
"rid": "linux-x64",
|
||||||
|
"assetType": "native",
|
||||||
|
"fileVersion": "0.0.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"dependencies": {
|
||||||
|
"runtime.linux-arm.runtime.native.System.IO.Ports": "6.0.0",
|
||||||
|
"runtime.linux-arm64.runtime.native.System.IO.Ports": "6.0.0",
|
||||||
|
"runtime.linux-x64.runtime.native.System.IO.Ports": "6.0.0",
|
||||||
|
"runtime.osx-arm64.runtime.native.System.IO.Ports": "6.0.0",
|
||||||
|
"runtime.osx-x64.runtime.native.System.IO.Ports": "6.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"runtime.osx-arm64.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"runtimeTargets": {
|
||||||
|
"runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib": {
|
||||||
|
"rid": "osx-arm64",
|
||||||
|
"assetType": "native",
|
||||||
|
"fileVersion": "0.0.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"runtime.osx-x64.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"runtimeTargets": {
|
||||||
|
"runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib": {
|
||||||
|
"rid": "osx-x64",
|
||||||
|
"assetType": "native",
|
||||||
|
"fileVersion": "0.0.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"System.IO.Ports/6.0.0": {
|
||||||
|
"dependencies": {
|
||||||
|
"runtime.native.System.IO.Ports": "6.0.0"
|
||||||
|
},
|
||||||
|
"runtime": {
|
||||||
|
"lib/net6.0/System.IO.Ports.dll": {
|
||||||
|
"assemblyVersion": "6.0.0.0",
|
||||||
|
"fileVersion": "6.0.21.52210"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"runtimeTargets": {
|
||||||
|
"runtimes/unix/lib/net6.0/System.IO.Ports.dll": {
|
||||||
|
"rid": "unix",
|
||||||
|
"assetType": "runtime",
|
||||||
|
"assemblyVersion": "6.0.0.0",
|
||||||
|
"fileVersion": "6.0.21.52210"
|
||||||
|
},
|
||||||
|
"runtimes/win/lib/net6.0/System.IO.Ports.dll": {
|
||||||
|
"rid": "win",
|
||||||
|
"assetType": "runtime",
|
||||||
|
"assemblyVersion": "6.0.0.0",
|
||||||
|
"fileVersion": "6.0.21.52210"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"PluginInterface/1.0.0": {
|
||||||
|
"dependencies": {
|
||||||
|
"Newtonsoft.Json": "13.0.1"
|
||||||
|
},
|
||||||
|
"runtime": {
|
||||||
|
"PluginInterface.dll": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"libraries": {
|
||||||
|
"DriverModbusMaster/1.0.0": {
|
||||||
|
"type": "project",
|
||||||
|
"serviceable": false,
|
||||||
|
"sha512": ""
|
||||||
|
},
|
||||||
|
"Newtonsoft.Json/13.0.1": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
|
||||||
|
"path": "newtonsoft.json/13.0.1",
|
||||||
|
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"runtime.linux-arm.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-75q52H7CSpgIoIDwXb9o833EvBZIXJ0mdPhz1E6jSisEXUBlSCPalC29cj3EXsjpuDwr0dj1LRXZepIQH/oL4Q==",
|
||||||
|
"path": "runtime.linux-arm.runtime.native.system.io.ports/6.0.0",
|
||||||
|
"hashPath": "runtime.linux-arm.runtime.native.system.io.ports.6.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"runtime.linux-arm64.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-xn2bMThmXr3CsvOYmS8ex2Yz1xo+kcnhVg2iVhS9PlmqjZPAkrEo/I40wjrBZH/tU4kvH0s1AE8opAvQ3KIS8g==",
|
||||||
|
"path": "runtime.linux-arm64.runtime.native.system.io.ports/6.0.0",
|
||||||
|
"hashPath": "runtime.linux-arm64.runtime.native.system.io.ports.6.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"runtime.linux-x64.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-16nbNXwv0sC+gLGIuecri0skjuh6R1maIJggsaNP7MQBcbVcEfWFUOkEnsnvoLEjy0XerfibuRptfQ8AmdIcWA==",
|
||||||
|
"path": "runtime.linux-x64.runtime.native.system.io.ports/6.0.0",
|
||||||
|
"hashPath": "runtime.linux-x64.runtime.native.system.io.ports.6.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-KaaXlpOcuZjMdmyF5wzzx3b+PRKIzt6A5Ax9dKenPDQbVJAFpev+casD0BIig1pBcbs3zx7CqWemzUJKAeHdSQ==",
|
||||||
|
"path": "runtime.native.system.io.ports/6.0.0",
|
||||||
|
"hashPath": "runtime.native.system.io.ports.6.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"runtime.osx-arm64.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-fXG12NodG1QrCdoaeSQ1gVnk/koi4WYY4jZtarMkZeQMyReBm1nZlSRoPnUjLr2ZR36TiMjpcGnQfxymieUe7w==",
|
||||||
|
"path": "runtime.osx-arm64.runtime.native.system.io.ports/6.0.0",
|
||||||
|
"hashPath": "runtime.osx-arm64.runtime.native.system.io.ports.6.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"runtime.osx-x64.runtime.native.System.IO.Ports/6.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-/As+zPY49+dSUXkh+fTUbyPhqrdGN//evLxo4Vue88pfh1BHZgF7q4kMblTkxYvwR6Vi03zSYxysSFktO8/SDQ==",
|
||||||
|
"path": "runtime.osx-x64.runtime.native.system.io.ports/6.0.0",
|
||||||
|
"hashPath": "runtime.osx-x64.runtime.native.system.io.ports.6.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"System.IO.Ports/6.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-dRyGI7fUESar5ZLIpiBOaaNLW7YyOBGftjj5Of+xcduC/Rjl7RjhEnWDvvNBmHuF3d0tdXoqdVI/yrVA8f00XA==",
|
||||||
|
"path": "system.io.ports/6.0.0",
|
||||||
|
"hashPath": "system.io.ports.6.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"PluginInterface/1.0.0": {
|
||||||
|
"type": "project",
|
||||||
|
"serviceable": false,
|
||||||
|
"sha512": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
drivers/DriverModbusMaster/net6.0/DriverModbusMaster.dll
Normal file
BIN
drivers/DriverModbusMaster/net6.0/DriverModbusMaster.dll
Normal file
Binary file not shown.
BIN
drivers/DriverModbusMaster/net6.0/DriverModbusMaster.pdb
Normal file
BIN
drivers/DriverModbusMaster/net6.0/DriverModbusMaster.pdb
Normal file
Binary file not shown.
BIN
drivers/DriverModbusMaster/net6.0/PluginInterface.dll
Normal file
BIN
drivers/DriverModbusMaster/net6.0/PluginInterface.dll
Normal file
Binary file not shown.
BIN
drivers/DriverModbusMaster/net6.0/PluginInterface.pdb
Normal file
BIN
drivers/DriverModbusMaster/net6.0/PluginInterface.pdb
Normal file
Binary file not shown.
BIN
drivers/DriverModbusMaster/net6.0/ref/DriverModbusMaster.dll
Normal file
BIN
drivers/DriverModbusMaster/net6.0/ref/DriverModbusMaster.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
68
drivers/net6.0/DriverOPCDaClient.deps.json
Normal file
68
drivers/net6.0/DriverOPCDaClient.deps.json
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
{
|
||||||
|
"runtimeTarget": {
|
||||||
|
"name": ".NETCoreApp,Version=v6.0",
|
||||||
|
"signature": ""
|
||||||
|
},
|
||||||
|
"compilationOptions": {},
|
||||||
|
"targets": {
|
||||||
|
".NETCoreApp,Version=v6.0": {
|
||||||
|
"DriverOPCDaClient/1.0.0": {
|
||||||
|
"dependencies": {
|
||||||
|
"PluginInterface": "1.0.0",
|
||||||
|
"Interop.OPCAutomation": "1.0.0.0"
|
||||||
|
},
|
||||||
|
"runtime": {
|
||||||
|
"DriverOPCDaClient.dll": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Newtonsoft.Json/13.0.1": {
|
||||||
|
"runtime": {
|
||||||
|
"lib/netstandard2.0/Newtonsoft.Json.dll": {
|
||||||
|
"assemblyVersion": "13.0.0.0",
|
||||||
|
"fileVersion": "13.0.1.25517"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"PluginInterface/1.0.0": {
|
||||||
|
"dependencies": {
|
||||||
|
"Newtonsoft.Json": "13.0.1"
|
||||||
|
},
|
||||||
|
"runtime": {
|
||||||
|
"PluginInterface.dll": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Interop.OPCAutomation/1.0.0.0": {
|
||||||
|
"runtime": {
|
||||||
|
"Interop.OPCAutomation.dll": {
|
||||||
|
"assemblyVersion": "1.0.0.0",
|
||||||
|
"fileVersion": "1.0.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"libraries": {
|
||||||
|
"DriverOPCDaClient/1.0.0": {
|
||||||
|
"type": "project",
|
||||||
|
"serviceable": false,
|
||||||
|
"sha512": ""
|
||||||
|
},
|
||||||
|
"Newtonsoft.Json/13.0.1": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
|
||||||
|
"path": "newtonsoft.json/13.0.1",
|
||||||
|
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"PluginInterface/1.0.0": {
|
||||||
|
"type": "project",
|
||||||
|
"serviceable": false,
|
||||||
|
"sha512": ""
|
||||||
|
},
|
||||||
|
"Interop.OPCAutomation/1.0.0.0": {
|
||||||
|
"type": "reference",
|
||||||
|
"serviceable": false,
|
||||||
|
"sha512": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
drivers/net6.0/DriverOPCDaClient.dll
Normal file
BIN
drivers/net6.0/DriverOPCDaClient.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/DriverOPCDaClient.pdb
Normal file
BIN
drivers/net6.0/DriverOPCDaClient.pdb
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
drivers/net6.0/Interop.OPCAutomation.dll
Normal file
BIN
drivers/net6.0/Interop.OPCAutomation.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
drivers/net6.0/ref/DriverAllenBradley.dll
Normal file
BIN
drivers/net6.0/ref/DriverAllenBradley.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverFanuc.dll
Normal file
BIN
drivers/net6.0/ref/DriverFanuc.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverFanucHsl.dll
Normal file
BIN
drivers/net6.0/ref/DriverFanucHsl.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverMTConnect.dll
Normal file
BIN
drivers/net6.0/ref/DriverMTConnect.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverMitsubishi.dll
Normal file
BIN
drivers/net6.0/ref/DriverMitsubishi.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverModbusMaster.dll
Normal file
BIN
drivers/net6.0/ref/DriverModbusMaster.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverOPCDaClient.dll
Normal file
BIN
drivers/net6.0/ref/DriverOPCDaClient.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverOPCUaClient.dll
Normal file
BIN
drivers/net6.0/ref/DriverOPCUaClient.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverOmronFins.dll
Normal file
BIN
drivers/net6.0/ref/DriverOmronFins.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverSiemensS7.dll
Normal file
BIN
drivers/net6.0/ref/DriverSiemensS7.dll
Normal file
Binary file not shown.
BIN
drivers/net6.0/ref/DriverSimTcpClient.dll
Normal file
BIN
drivers/net6.0/ref/DriverSimTcpClient.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
iotgateway.db
BIN
iotgateway.db
Binary file not shown.
Loading…
Reference in New Issue
Block a user