Browse Source

v2.3.1

1.解决多台机器同时访问时终端号冲突
2.修改客户端初始化连接将同步改为异步
3.修复获取session集合报错
4.升级808库
tags/v2.3.1
SmallChi(Koike) 5 years ago
parent
commit
af1584a2bd
9 changed files with 6 additions and 22 deletions
  1. +1
    -0
      simples/JT808.DotNetty.SimpleClient/Services/Up2019Service.cs
  2. +1
    -0
      simples/JT808.DotNetty.SimpleClient/Services/UpService.cs
  3. +1
    -1
      src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj
  4. +1
    -1
      src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj
  5. +0
    -16
      src/JT808.DotNetty.Client/JT808ClientMsgSNDistributedImpl.cs
  6. +0
    -1
      src/JT808.DotNetty.Client/JT808DeviceConfig.cs
  7. +0
    -1
      src/JT808.DotNetty.Client/JT808TcpClientExtensions.cs
  8. +1
    -1
      src/JT808.DotNetty.Services/JT808.DotNetty.Traffic/JT808.DotNetty.Traffic.csproj
  9. +1
    -1
      src/Version.props

+ 1
- 0
simples/JT808.DotNetty.SimpleClient/Services/Up2019Service.cs View File

@@ -24,6 +24,7 @@ namespace JT808.DotNetty.SimpleClient.Services
{ {
string sim = "22222222222"; string sim = "22222222222";
JT808TcpClient client1 = jT808TcpClientFactory.Create(new JT808DeviceConfig(sim, "127.0.0.1", 808, JT808Version.JTT2019)); JT808TcpClient client1 = jT808TcpClientFactory.Create(new JT808DeviceConfig(sim, "127.0.0.1", 808, JT808Version.JTT2019));
Thread.Sleep(5000);
//1.终端注册 //1.终端注册
client1.Send(JT808MsgId.终端注册.Create2019(sim, new JT808_0x0100() client1.Send(JT808MsgId.终端注册.Create2019(sim, new JT808_0x0100()
{ {


+ 1
- 0
simples/JT808.DotNetty.SimpleClient/Services/UpService.cs View File

@@ -24,6 +24,7 @@ namespace JT808.DotNetty.SimpleClient.Services
{ {
string sim = "11111111111"; string sim = "11111111111";
JT808TcpClient client1 = jT808TcpClientFactory.Create(new JT808DeviceConfig(sim, "127.0.0.1", 808)); JT808TcpClient client1 = jT808TcpClientFactory.Create(new JT808DeviceConfig(sim, "127.0.0.1", 808));
Thread.Sleep(5000);
//1.终端注册 //1.终端注册
client1.Send(JT808MsgId.终端注册.Create(sim, new JT808_0x0100() client1.Send(JT808MsgId.终端注册.Create(sim, new JT808_0x0100()
{ {


+ 1
- 1
src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj View File

@@ -20,7 +20,7 @@
<PackageReleaseNotes>基于DotNetty实现的JT808DotNetty的抽象库</PackageReleaseNotes> <PackageReleaseNotes>基于DotNetty实现的JT808DotNetty的抽象库</PackageReleaseNotes>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JT808" Version="2.2.1" />
<PackageReference Include="JT808" Version="2.2.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" /> <None Include="..\..\LICENSE" Pack="true" PackagePath="" />


+ 1
- 1
src/JT808.DotNetty.Client/JT808.DotNetty.Client.csproj View File

@@ -24,7 +24,7 @@
<PackageReference Include="DotNetty.Handlers" Version="0.6.0" /> <PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
<PackageReference Include="DotNetty.Transport.Libuv" Version="0.6.0" /> <PackageReference Include="DotNetty.Transport.Libuv" Version="0.6.0" />
<PackageReference Include="DotNetty.Codecs" Version="0.6.0" /> <PackageReference Include="DotNetty.Codecs" Version="0.6.0" />
<PackageReference Include="JT808" Version="2.2.2" />
<PackageReference Include="JT808" Version="2.2.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />


+ 0
- 16
src/JT808.DotNetty.Client/JT808ClientMsgSNDistributedImpl.cs View File

@@ -1,16 +0,0 @@
using JT808.Protocol;
using JT808.Protocol.Interfaces;
using System.Threading;

namespace JT808.DotNetty.Client
{
internal class JT808ClientMsgSNDistributedImpl : IJT808MsgSNDistributed
{
int _counter = 0;

public ushort Increment()
{
return (ushort)Interlocked.Increment(ref _counter);
}
}
}

+ 0
- 1
src/JT808.DotNetty.Client/JT808DeviceConfig.cs View File

@@ -14,7 +14,6 @@ namespace JT808.DotNetty.Client
TerminalPhoneNo = terminalPhoneNo; TerminalPhoneNo = terminalPhoneNo;
TcpHost = tcpHost; TcpHost = tcpHost;
TcpPort = tcpPort; TcpPort = tcpPort;
MsgSNDistributed = new JT808ClientMsgSNDistributedImpl();
Version = version; Version = version;
} }
public JT808Version Version { get; private set; } public JT808Version Version { get; private set; }


+ 0
- 1
src/JT808.DotNetty.Client/JT808TcpClientExtensions.cs View File

@@ -14,7 +14,6 @@ namespace JT808.DotNetty.Client
public static void Send(this JT808TcpClient client, JT808Package package, int minBufferSize = 4096) public static void Send(this JT808TcpClient client, JT808Package package, int minBufferSize = 4096)
{ {
package.Header.TerminalPhoneNo = client.DeviceConfig.TerminalPhoneNo; package.Header.TerminalPhoneNo = client.DeviceConfig.TerminalPhoneNo;
package.Header.MsgNum = client.DeviceConfig.MsgSNDistributed.Increment();
JT808ClientRequest request = new JT808ClientRequest(package, minBufferSize); JT808ClientRequest request = new JT808ClientRequest(package, minBufferSize);
client.Send(request); client.Send(request);
} }


+ 1
- 1
src/JT808.DotNetty.Services/JT808.DotNetty.Traffic/JT808.DotNetty.Traffic.csproj View File

@@ -24,7 +24,7 @@
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" />
<PackageReference Include="CSRedisCore" Version="3.2.0" />
<PackageReference Include="CSRedisCore" Version="3.2.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj" /> <ProjectReference Include="..\..\JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj" />


+ 1
- 1
src/Version.props View File

@@ -1,5 +1,5 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<JT808DotNettyPackageVersion>2.3.0</JT808DotNettyPackageVersion>
<JT808DotNettyPackageVersion>2.3.1</JT808DotNettyPackageVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

Loading…
Cancel
Save