luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2016-04-08 update 1 fboxconnector 1.1.0 update

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2016-04-08 15:26:21 +08:00
parent 7ad109fe76
commit d8ce64f22f
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modbus.Net/Modbus.Net.FBox/FBoxConnector.cs
View File

@@ -8,7 +8,7 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.SignalR.Client;
using Newtonsoft.Json;
using Thinktecture.IdentityModel.Client;
using IdentityModel.Client;
namespace Modbus.Net.FBox
{
@@ -24,7 +24,7 @@ namespace Modbus.Net.FBox
public class FBoxConnector : BaseConnector
{
private OAuth2Client _oauth2;
private TokenClient _oauth2;
private string _refreshToken;
private HttpClient _httpClient { get; set; }
@@ -61,7 +61,7 @@ namespace Modbus.Net.FBox
public FBoxConnector(string machineId, string localSequence, SignalRSigninMsg msg)
{
Constants.SignalRServer = msg.SignalRServer;
System.Net.ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
//System.Net.ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
ConnectionToken = machineId + "," + localSequence;
Msg = msg;
_data = new Dictionary<string, double>();
@@ -102,8 +102,8 @@ namespace Modbus.Net.FBox
try
{
_oauth2 = new OAuth2Client(
new Uri(Constants.TokenEndpoint),
_oauth2 = new TokenClient(
Constants.TokenEndpoint,
Msg.ClientId,
Msg.ClientSecret
);

11
Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.csproj
View File

@@ -31,26 +31,27 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="IdentityModel, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityModel.1.10.0\lib\net45\IdentityModel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Client.2.2.0\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Thinktecture.IdentityModel.Client.Net45, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Thinktecture.IdentityModel.Client.4.0.1\lib\net45\Thinktecture.IdentityModel.Client.Net45.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AddressCombinerFBox.cs" />

4
Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.nuspec
View File

@@ -2,7 +2,7 @@
<package >
<metadata>
<id>Modbus.Net.FBox</id>
<version>1.0.8</version>
<version>1.1.0</version>
<title>Modbus.Net.FBox</title>
<authors>Chris L.(Luo Sheng)</authors>
<owners>Hangzhou Delian Information and Science Technology Co., Ltd.</owners>
@@ -14,7 +14,7 @@
<tags>hardware communicate protocal fbox Delian</tags>
<dependencies>
<dependency id="Modbus.Net" version="1.1.0"></dependency>
<dependency id="Thinktecture.IdentityModel.Client" version="4.0.0"></dependency>
<dependency id="IdentityModel" version="1.10.0"></dependency>
<dependency id="Microsoft.AspNet.SignalR.Client" version="2.2.0"></dependency>
</dependencies>
</metadata>

4
Modbus.Net/Modbus.Net.FBox/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.8")]
[assembly: AssemblyFileVersion("1.0.8")]
[assembly: AssemblyVersion("1.1.0")]
[assembly: AssemblyFileVersion("1.1.0")]

4
Modbus.Net/Modbus.Net.FBox/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="IdentityModel" version="1.10.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Client" version="2.2.0" targetFramework="net452" />
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
<package id="Thinktecture.IdentityModel.Client" version="4.0.1" targetFramework="net452" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
</packages>