1.升级依赖2.优化表达式3.解决已知bug

This commit is contained in:
iioter 2022-07-15 22:34:52 +08:00
parent 53c362327b
commit 2a75a15ed4
64 changed files with 97 additions and 81 deletions

View File

@ -39,7 +39,7 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
AllMethods = deviceService.GetDriverMethods(Entity.DeviceId);
}
if (AllMethods.Count() > 0)
if (AllMethods?.Count() > 0)
AllMethods[0].Selected = true;
}

View File

@ -7,7 +7,7 @@
<SatelliteResourceLanguages>zh-Hans,en</SatelliteResourceLanguages>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<PlatformTarget>x86</PlatformTarget>
<!--<PlatformTarget>x86</PlatformTarget>-->
</PropertyGroup>
<ItemGroup>
@ -19,10 +19,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
<PackageReference Include="MQTTnet" Version="3.1.1" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.1.1" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.1.1" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.1.1" />
<PackageReference Include="MQTTnet" Version="3.1.2" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.1.2" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.1.2" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.1.2" />
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
</ItemGroup>

Binary file not shown.

View File

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="IoTClient" Version="1.0.22" />
<PackageReference Include="IoTClient" Version="1.0.28" />
</ItemGroup>
<ItemGroup>

View File

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HslCommunication" Version="11.0.0" />
<PackageReference Include="HslCommunication" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

View File

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="IoTClient" Version="1.0.22" />
<PackageReference Include="IoTClient" Version="1.0.28" />
</ItemGroup>
<ItemGroup>

View File

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.4.367.75" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.4.369.30" />
</ItemGroup>
<ItemGroup>

View File

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="IoTClient" Version="1.0.22" />
<PackageReference Include="IoTClient" Version="1.0.28" />
</ItemGroup>
<ItemGroup>

View File

@ -274,7 +274,7 @@ namespace Plugin
//mysql会把一些符号转义没找到原因先临时处理下
private string DealMysqlStr(string Expression)
{
return Expression.Replace("&lt;", ">").Replace("&gt;", "<").Replace("&amp;", "&");
return Expression.Replace("&lt;", "<").Replace("&gt;", ">").Replace("&amp;", "&").Replace("&quot;", "\"");
}
}

View File

@ -7,10 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamicExpresso.Core" Version="2.10.0" />
<PackageReference Include="DynamicExpresso.Core" Version="2.13.0" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="MQTTnet" Version="3.1.1" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.4.367.75" />
<PackageReference Include="MQTTnet" Version="3.1.2" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.4.369.30" />
</ItemGroup>
<ItemGroup>

View File

@ -64,7 +64,7 @@
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.2" />
<PackageReference Include="VueCliMiddleware" Version="6.0.0" />
</ItemGroup>

View File

@ -8,21 +8,21 @@
".NETCoreApp,Version=v6.0": {
"DriverAllenBradley/1.0.0": {
"dependencies": {
"IoTClient": "1.0.22",
"IoTClient": "1.0.28",
"PluginInterface": "1.0.0"
},
"runtime": {
"DriverAllenBradley.dll": {}
}
},
"IoTClient/1.0.22": {
"IoTClient/1.0.28": {
"dependencies": {
"System.IO.Ports": "4.6.0"
},
"runtime": {
"lib/netstandard2.0/IoTClient.dll": {
"assemblyVersion": "1.0.22.0",
"fileVersion": "1.0.22.0"
"assemblyVersion": "1.0.28.0",
"fileVersion": "1.0.28.0"
}
}
},
@ -140,12 +140,12 @@
"serviceable": false,
"sha512": ""
},
"IoTClient/1.0.22": {
"IoTClient/1.0.28": {
"type": "package",
"serviceable": true,
"sha512": "sha512-UqkeoTFWpDiskvtuPiwdk7XLkvb2no1iJSE0sJusjccapbs6J5GPCf/0eGqu4ftlrHxG8E4fd7lgTA1R5Ztbgw==",
"path": "iotclient/1.0.22",
"hashPath": "iotclient.1.0.22.nupkg.sha512"
"sha512": "sha512-C9H2L6dkYE2zk3XPNhYIQgPzu+vfaDUHWao3xt4kR0/PxHO7LP94i2hnJqh+tmB/+k2wULKkdy+g1RbJEIxOvQ==",
"path": "iotclient/1.0.28",
"hashPath": "iotclient.1.0.28.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/3.0.0": {
"type": "package",

Binary file not shown.

Binary file not shown.

View File

@ -8,7 +8,7 @@
".NETCoreApp,Version=v6.0": {
"DriverFanucHsl/1.0.0": {
"dependencies": {
"HslCommunication": "11.0.0",
"HslCommunication": "11.0.2",
"Newtonsoft.Json": "13.0.1",
"PluginInterface": "1.0.0"
},
@ -16,15 +16,15 @@
"DriverFanucHsl.dll": {}
}
},
"HslCommunication/11.0.0": {
"HslCommunication/11.0.2": {
"dependencies": {
"Newtonsoft.Json": "13.0.1",
"System.IO.Ports": "4.7.0"
},
"runtime": {
"lib/netstandard2.1/HslCommunication.dll": {
"assemblyVersion": "11.0.0.0",
"fileVersion": "11.0.0.0"
"assemblyVersion": "11.0.2.0",
"fileVersion": "11.0.2.0"
}
}
},
@ -142,12 +142,12 @@
"serviceable": false,
"sha512": ""
},
"HslCommunication/11.0.0": {
"HslCommunication/11.0.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-9JcbMka4dQ8251DCXIP9JExrIqmnt6b6/pX1ZFsdQ7/GQsPtfGMshvQDFUuSx8xf9+gADw3sFu5CDcpbFSQpZg==",
"path": "hslcommunication/11.0.0",
"hashPath": "hslcommunication.11.0.0.nupkg.sha512"
"sha512": "sha512-5nZiUlp9yoZXjV0M+qGbIlyp2Zoyo8wHL2BY7BXe0PW4J7CdCxnJt+my0K/T5+AyXreM+MO+HvC1K0HIKVH42A==",
"path": "hslcommunication/11.0.2",
"hashPath": "hslcommunication.11.0.2.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/3.1.0": {
"type": "package",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -8,21 +8,21 @@
".NETCoreApp,Version=v6.0": {
"DriverMitsubishi/1.0.0": {
"dependencies": {
"IoTClient": "1.0.22",
"IoTClient": "1.0.28",
"PluginInterface": "1.0.0"
},
"runtime": {
"DriverMitsubishi.dll": {}
}
},
"IoTClient/1.0.22": {
"IoTClient/1.0.28": {
"dependencies": {
"System.IO.Ports": "4.6.0"
},
"runtime": {
"lib/netstandard2.0/IoTClient.dll": {
"assemblyVersion": "1.0.22.0",
"fileVersion": "1.0.22.0"
"assemblyVersion": "1.0.28.0",
"fileVersion": "1.0.28.0"
}
}
},
@ -140,12 +140,12 @@
"serviceable": false,
"sha512": ""
},
"IoTClient/1.0.22": {
"IoTClient/1.0.28": {
"type": "package",
"serviceable": true,
"sha512": "sha512-UqkeoTFWpDiskvtuPiwdk7XLkvb2no1iJSE0sJusjccapbs6J5GPCf/0eGqu4ftlrHxG8E4fd7lgTA1R5Ztbgw==",
"path": "iotclient/1.0.22",
"hashPath": "iotclient.1.0.22.nupkg.sha512"
"sha512": "sha512-C9H2L6dkYE2zk3XPNhYIQgPzu+vfaDUHWao3xt4kR0/PxHO7LP94i2hnJqh+tmB/+k2wULKkdy+g1RbJEIxOvQ==",
"path": "iotclient/1.0.28",
"hashPath": "iotclient.1.0.28.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/3.0.0": {
"type": "package",

Binary file not shown.

Binary file not shown.

View File

@ -8,13 +8,21 @@
".NETCoreApp,Version=v6.0": {
"DriverOPCUaClient/1.0.0": {
"dependencies": {
"OPCFoundation.NetStandard.Opc.Ua.Client": "1.4.367.75",
"OPCFoundation.NetStandard.Opc.Ua.Client": "1.4.369.30",
"PluginInterface": "1.0.0"
},
"runtime": {
"DriverOPCUaClient.dll": {}
}
},
"Microsoft.Extensions.Logging.Abstractions/6.0.1": {
"runtime": {
"lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll": {
"assemblyVersion": "6.0.0.0",
"fileVersion": "6.0.322.12309"
}
}
},
"Newtonsoft.Json/13.0.1": {
"runtime": {
"lib/netstandard2.0/Newtonsoft.Json.dll": {
@ -23,49 +31,50 @@
}
}
},
"OPCFoundation.NetStandard.Opc.Ua.Client/1.4.367.75": {
"OPCFoundation.NetStandard.Opc.Ua.Client/1.4.369.30": {
"dependencies": {
"OPCFoundation.NetStandard.Opc.Ua.Configuration": "1.4.367.75",
"OPCFoundation.NetStandard.Opc.Ua.Core": "1.4.367.75"
"OPCFoundation.NetStandard.Opc.Ua.Configuration": "1.4.369.30",
"OPCFoundation.NetStandard.Opc.Ua.Core": "1.4.369.30"
},
"runtime": {
"lib/net6.0/Opc.Ua.Client.dll": {
"assemblyVersion": "1.4.367.0",
"fileVersion": "1.4.367.75"
"assemblyVersion": "1.4.369.0",
"fileVersion": "1.4.369.30"
}
}
},
"OPCFoundation.NetStandard.Opc.Ua.Configuration/1.4.367.75": {
"OPCFoundation.NetStandard.Opc.Ua.Configuration/1.4.369.30": {
"dependencies": {
"OPCFoundation.NetStandard.Opc.Ua.Core": "1.4.367.75"
"OPCFoundation.NetStandard.Opc.Ua.Core": "1.4.369.30"
},
"runtime": {
"lib/net6.0/Opc.Ua.Configuration.dll": {
"assemblyVersion": "1.4.367.0",
"fileVersion": "1.4.367.75"
"assemblyVersion": "1.4.369.0",
"fileVersion": "1.4.369.30"
}
}
},
"OPCFoundation.NetStandard.Opc.Ua.Core/1.4.367.75": {
"OPCFoundation.NetStandard.Opc.Ua.Core/1.4.369.30": {
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "6.0.1",
"Newtonsoft.Json": "13.0.1",
"OPCFoundation.NetStandard.Opc.Ua.Security.Certificates": "1.4.367.75"
"OPCFoundation.NetStandard.Opc.Ua.Security.Certificates": "1.4.369.30"
},
"runtime": {
"lib/net6.0/Opc.Ua.Core.dll": {
"assemblyVersion": "1.4.367.0",
"fileVersion": "1.4.367.75"
"assemblyVersion": "1.4.369.0",
"fileVersion": "1.4.369.30"
}
}
},
"OPCFoundation.NetStandard.Opc.Ua.Security.Certificates/1.4.367.75": {
"OPCFoundation.NetStandard.Opc.Ua.Security.Certificates/1.4.369.30": {
"dependencies": {
"System.Formats.Asn1": "6.0.0"
},
"runtime": {
"lib/net6.0/Opc.Ua.Security.Certificates.dll": {
"assemblyVersion": "1.4.367.0",
"fileVersion": "1.4.367.75"
"assemblyVersion": "1.4.369.0",
"fileVersion": "1.4.369.30"
}
}
},
@ -86,6 +95,13 @@
"serviceable": false,
"sha512": ""
},
"Microsoft.Extensions.Logging.Abstractions/6.0.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==",
"path": "microsoft.extensions.logging.abstractions/6.0.1",
"hashPath": "microsoft.extensions.logging.abstractions.6.0.1.nupkg.sha512"
},
"Newtonsoft.Json/13.0.1": {
"type": "package",
"serviceable": true,
@ -93,33 +109,33 @@
"path": "newtonsoft.json/13.0.1",
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
},
"OPCFoundation.NetStandard.Opc.Ua.Client/1.4.367.75": {
"OPCFoundation.NetStandard.Opc.Ua.Client/1.4.369.30": {
"type": "package",
"serviceable": true,
"sha512": "sha512-Y1BF7xoDS0LPz5ksbfsKJbMvbeE4sXazgHwadfSTtrCixOzxwzZrBVo0k+LmI5z13uzIq0mMOA6mTNcdgnAxzA==",
"path": "opcfoundation.netstandard.opc.ua.client/1.4.367.75",
"hashPath": "opcfoundation.netstandard.opc.ua.client.1.4.367.75.nupkg.sha512"
"sha512": "sha512-xJHIazzYwIjixJEm/3QSqobySQilJ6VDIAnkNsmSAn5N43AtB0mV5anLT+tg3BDPznYL5hIINIm/4Gt9kSWarQ==",
"path": "opcfoundation.netstandard.opc.ua.client/1.4.369.30",
"hashPath": "opcfoundation.netstandard.opc.ua.client.1.4.369.30.nupkg.sha512"
},
"OPCFoundation.NetStandard.Opc.Ua.Configuration/1.4.367.75": {
"OPCFoundation.NetStandard.Opc.Ua.Configuration/1.4.369.30": {
"type": "package",
"serviceable": true,
"sha512": "sha512-4VtYqVSpmm4Pxfy5w40GJxuVLSBeTeyZwUf8dPp//g3Op4D0NCl5M7NYS5LW7a8FFJZHeRBfLsnaKmNkRFRhTA==",
"path": "opcfoundation.netstandard.opc.ua.configuration/1.4.367.75",
"hashPath": "opcfoundation.netstandard.opc.ua.configuration.1.4.367.75.nupkg.sha512"
"sha512": "sha512-QXLG2eM4caw6Q9a50Pj3RjXFZa8lWQWu560+KtZ2NlHc4Bq4dRHkThK5JnP9yKcB6jsCSWKzIuh9fwoy+VO8Cw==",
"path": "opcfoundation.netstandard.opc.ua.configuration/1.4.369.30",
"hashPath": "opcfoundation.netstandard.opc.ua.configuration.1.4.369.30.nupkg.sha512"
},
"OPCFoundation.NetStandard.Opc.Ua.Core/1.4.367.75": {
"OPCFoundation.NetStandard.Opc.Ua.Core/1.4.369.30": {
"type": "package",
"serviceable": true,
"sha512": "sha512-6yyKF1Kp/doU1P9iVDZ5rIaw2DQJeG5ce8uEGRqX2HnvD+TBMgKXcs0t2WxRJ47ISwcGzrqjONt/XFDxPv1vQQ==",
"path": "opcfoundation.netstandard.opc.ua.core/1.4.367.75",
"hashPath": "opcfoundation.netstandard.opc.ua.core.1.4.367.75.nupkg.sha512"
"sha512": "sha512-SGFmPdZVFw42wLzi60Kdl4o3S6BFkNi02qgg1fr/3gDiYA5ZWdDAN0odZWtFoDK6eDQHSPjQv/r+nMBigoTuFw==",
"path": "opcfoundation.netstandard.opc.ua.core/1.4.369.30",
"hashPath": "opcfoundation.netstandard.opc.ua.core.1.4.369.30.nupkg.sha512"
},
"OPCFoundation.NetStandard.Opc.Ua.Security.Certificates/1.4.367.75": {
"OPCFoundation.NetStandard.Opc.Ua.Security.Certificates/1.4.369.30": {
"type": "package",
"serviceable": true,
"sha512": "sha512-Az6TN1I0WfZnbUZG3OHJ8PEKxAk+jEm7Tm198xhLahP+wuGOYXReZeqK1pJGZB/oXybExUFYfryRGjZxBgVqOA==",
"path": "opcfoundation.netstandard.opc.ua.security.certificates/1.4.367.75",
"hashPath": "opcfoundation.netstandard.opc.ua.security.certificates.1.4.367.75.nupkg.sha512"
"sha512": "sha512-SkyfvLeunJK008ysVg3Q3al77Q3rMJoqAti7MTjDnE/7viXy/IxSKGA24Foc+vIE4LmPqpdyKpgUE5j4nH+egQ==",
"path": "opcfoundation.netstandard.opc.ua.security.certificates/1.4.369.30",
"hashPath": "opcfoundation.netstandard.opc.ua.security.certificates.1.4.369.30.nupkg.sha512"
},
"System.Formats.Asn1/6.0.0": {
"type": "package",

Binary file not shown.

Binary file not shown.

View File

@ -8,21 +8,21 @@
".NETCoreApp,Version=v6.0": {
"DriverOmronFins/1.0.0": {
"dependencies": {
"IoTClient": "1.0.22",
"IoTClient": "1.0.28",
"PluginInterface": "1.0.0"
},
"runtime": {
"DriverOmronFins.dll": {}
}
},
"IoTClient/1.0.22": {
"IoTClient/1.0.28": {
"dependencies": {
"System.IO.Ports": "4.6.0"
},
"runtime": {
"lib/netstandard2.0/IoTClient.dll": {
"assemblyVersion": "1.0.22.0",
"fileVersion": "1.0.22.0"
"assemblyVersion": "1.0.28.0",
"fileVersion": "1.0.28.0"
}
}
},
@ -140,12 +140,12 @@
"serviceable": false,
"sha512": ""
},
"IoTClient/1.0.22": {
"IoTClient/1.0.28": {
"type": "package",
"serviceable": true,
"sha512": "sha512-UqkeoTFWpDiskvtuPiwdk7XLkvb2no1iJSE0sJusjccapbs6J5GPCf/0eGqu4ftlrHxG8E4fd7lgTA1R5Ztbgw==",
"path": "iotclient/1.0.22",
"hashPath": "iotclient.1.0.22.nupkg.sha512"
"sha512": "sha512-C9H2L6dkYE2zk3XPNhYIQgPzu+vfaDUHWao3xt4kR0/PxHO7LP94i2hnJqh+tmB/+k2wULKkdy+g1RbJEIxOvQ==",
"path": "iotclient/1.0.28",
"hashPath": "iotclient.1.0.28.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/3.0.0": {
"type": "package",

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.