diff --git a/ClientsLibrary/ClientsLibrary.csproj b/ClientsLibrary/ClientsLibrary.csproj
index b8f7482..db4d61e 100644
--- a/ClientsLibrary/ClientsLibrary.csproj
+++ b/ClientsLibrary/ClientsLibrary.csproj
@@ -33,11 +33,11 @@
     <Reference Include="CommonLibrary">
       <HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="HslCommunication, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -256,6 +256,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="img\ExtensionManager_vsix_OSReg_16x.png" />
     <None Include="packages.config" />
   </ItemGroup>
diff --git a/ClientsLibrary/UserClient.cs b/ClientsLibrary/UserClient.cs
index bf24185..87176a5 100644
--- a/ClientsLibrary/UserClient.cs
+++ b/ClientsLibrary/UserClient.cs
@@ -37,7 +37,7 @@ namespace ClientsLibrary
         /// <summary>
         /// 本软件的当前版本，用来验证更新的关键依据
         /// </summary>
-        public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.171026");
+        public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.180429");
 
 
         /// <summary>
@@ -64,7 +64,7 @@ namespace ClientsLibrary
                 new VersionInfo()
                 {
                     VersionNum = new SystemVersion("1.0.0"),
-                    ReleaseDate = new DateTime(2017, 10, 1), // 该版本发布的日期
+                    ReleaseDate = new DateTime(2018, 5, 1), // 该版本发布的日期
                     UpdateDetails = new StringBuilder(
                         "1.本系统第一版本正式发布使用。"+Environment.NewLine+
                         "2.提供了多客户端用时在线的功能。"+Environment.NewLine+
@@ -91,20 +91,18 @@ namespace ClientsLibrary
         /// <summary>
         /// 用于访问服务器数据的网络对象类，必须修改这个端口参数，否则运行失败
         /// </summary>
-        public static NetSimplifyClient Net_simplify_client { get; set; } = new NetSimplifyClient(
-            new IPEndPoint(IPAddress.Parse(ServerIp), UserSystem.Port_Second_Net))
+        public static NetSimplifyClient Net_simplify_client { get; set; } = new NetSimplifyClient(ServerIp, UserSystem.Port_Second_Net)
         {
-            KeyToken = UserSystem.KeyToken,
-            ConnectTimeout = 5000,
+            Token = UserSystem.KeyToken,
+            ConnectTimeOut = 5000,
         };
 
         /// <summary>
         /// 用于使用udp向服务器进行发送即时可丢失数据的对象
         /// </summary>
-        public static NetUdpClient Net_Udp_Client { get; set; } = new NetUdpClient(
-            new IPEndPoint(IPAddress.Parse(ServerIp), UserSystem.Port_Udp_Server))
+        public static NetUdpClient Net_Udp_Client { get; set; } = new NetUdpClient(ServerIp, UserSystem.Port_Udp_Server)
         {
-            KeyToken = UserSystem.KeyToken,
+            Token = UserSystem.KeyToken,
         };
 
 
@@ -146,7 +144,7 @@ namespace ClientsLibrary
         /// </summary>
         public static IntegrationFileClient Net_File_Client { get; set; } = new IntegrationFileClient()
         {
-            KeyToken = UserSystem.KeyToken,
+            Token = UserSystem.KeyToken,
             LogNet = LogNet,
             ServerIpEndPoint = new IPEndPoint(IPAddress.Parse(ServerIp), UserSystem.Port_Ultimate_File_Server)
         };
@@ -156,7 +154,7 @@ namespace ClientsLibrary
         /// </summary>
         public static IntegrationFileClient Net_Update_Client { get; set; } = new IntegrationFileClient()
         {
-            KeyToken = UserSystem.KeyToken,
+            Token = UserSystem.KeyToken,
             LogNet = LogNet,
             ServerIpEndPoint = new IPEndPoint(IPAddress.Parse(ServerIp), UserSystem.Port_Advanced_File_Server)
         };
diff --git a/ClientsLibrary/app.config b/ClientsLibrary/app.config
new file mode 100644
index 0000000..2bbe771
--- /dev/null
+++ b/ClientsLibrary/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/ClientsLibrary/packages.config b/ClientsLibrary/packages.config
index 22347a5..2a3a232 100644
--- a/ClientsLibrary/packages.config
+++ b/ClientsLibrary/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="4.3.0" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net35" />
+  <package id="HslCommunication" version="5.0.4" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/CommonLibrary/BasicSupport/FormAbout.designer.cs b/CommonLibrary/BasicSupport/FormAbout.designer.cs
index c17d6bb..b8bb40f 100644
--- a/CommonLibrary/BasicSupport/FormAbout.designer.cs
+++ b/CommonLibrary/BasicSupport/FormAbout.designer.cs
@@ -101,7 +101,6 @@
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.MaximizeBox = false;
             this.MaximumSize = new System.Drawing.Size(421, 198);
diff --git a/CommonLibrary/BasicSupport/FormAboutVersion.designer.cs b/CommonLibrary/BasicSupport/FormAboutVersion.designer.cs
index 65ce9d3..687741f 100644
--- a/CommonLibrary/BasicSupport/FormAboutVersion.designer.cs
+++ b/CommonLibrary/BasicSupport/FormAboutVersion.designer.cs
@@ -125,7 +125,6 @@
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.MaximizeBox = false;
             this.MaximumSize = new System.Drawing.Size(454, 229);
diff --git a/CommonLibrary/BasicSupport/FormInputAndAction.designer.cs b/CommonLibrary/BasicSupport/FormInputAndAction.designer.cs
index c88313d..09ce440 100644
--- a/CommonLibrary/BasicSupport/FormInputAndAction.designer.cs
+++ b/CommonLibrary/BasicSupport/FormInputAndAction.designer.cs
@@ -101,7 +101,6 @@
             this.Controls.Add(this.textBox1);
             this.Controls.Add(this.label1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.MaximizeBox = false;
             this.MaximumSize = new System.Drawing.Size(547, 319);
diff --git a/CommonLibrary/BasicSupport/FormPasswordCheck.designer.cs b/CommonLibrary/BasicSupport/FormPasswordCheck.designer.cs
index 407c78e..2c53ac1 100644
--- a/CommonLibrary/BasicSupport/FormPasswordCheck.designer.cs
+++ b/CommonLibrary/BasicSupport/FormPasswordCheck.designer.cs
@@ -64,7 +64,6 @@
             this.ClientSize = new System.Drawing.Size(407, 109);
             this.Controls.Add(this.userButton1);
             this.Controls.Add(this.textBox2);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximumSize = new System.Drawing.Size(423, 148);
             this.MinimizeBox = false;
             this.MinimumSize = new System.Drawing.Size(423, 148);
diff --git a/CommonLibrary/CommonLibrary.csproj b/CommonLibrary/CommonLibrary.csproj
index 020e8d4..b879f84 100644
--- a/CommonLibrary/CommonLibrary.csproj
+++ b/CommonLibrary/CommonLibrary.csproj
@@ -30,11 +30,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HslCommunication, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -168,7 +168,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CommonLibrary/packages.config b/CommonLibrary/packages.config
index 22347a5..2a3a232 100644
--- a/CommonLibrary/packages.config
+++ b/CommonLibrary/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="4.3.0" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net35" />
+  <package id="HslCommunication" version="5.0.4" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj b/HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj
index 2b83696..24b762d 100644
--- a/HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj
+++ b/HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj
@@ -31,11 +31,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HslCommunication, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/HslCommunicationNetTestTool/packages.config b/HslCommunicationNetTestTool/packages.config
index 22347a5..2a3a232 100644
--- a/HslCommunicationNetTestTool/packages.config
+++ b/HslCommunicationNetTestTool/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="4.3.0" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net35" />
+  <package id="HslCommunication" version="5.0.4" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/README.md b/README.md
index dcaf22c..a230fce 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@
 安卓端的程序在文件夹AndroidTemplate中，请使用Android Studio打开该文件夹，并修改连接的服务器地址。（该模版还在完善中...）
 
 ## Quick Experience
-如果觉得下载源代码比较麻烦，又想快速体验客户端功能，那就点击<a href="https://github.com/dathlin/ClientServerProject/raw/master/QuickExperience/软件自动更新.exe">软件自动更新.exe</a>下载程序，放置到任意位置，推荐桌面，双击安装程序，输入默认的账户密码即可体验完整的最新版本的客户端，当服务器的客户端版本更新时，你再打开本程序时也会自动升级。然后桌面的 **软件自动更新.exe** 就可以删除了。此处目前仅仅体验winform程序。
+如果觉得下载源代码比较麻烦，又想快速体验客户端功能，那就点击<a href="https://github.com/dathlin/ClientServerProject/raw/master/QuickExperience/软件自动更新.exe">软件自动更新.exe</a>下载程序，放置到任意位置，推荐桌面，双击安装程序，输入默认的账户密码即可体验完整的最新版本的客户端，当服务器的客户端版本更新时，你再打开本程序时也会自动升级。然后桌面的 **软件自动更新.exe** 就可以删除了。此处目前仅仅体验wpf程序。
 
 至于卸载软件，只要删除桌面的快捷方式和安装目录的文件即可，其他位置不会有任何的文件残留。
 
@@ -97,13 +97,17 @@
 
 
 ## HslCommunication.dll [![NuGet Status](https://img.shields.io/nuget/v/HslCommunication.svg)](https://www.nuget.org/packages/HslCommunication/)
-<p>本C-S项目的核心组件，该组件功能提供了一些基础功能类和整个C-S项目的网络支持，除此之外，该组件提供了访问三菱PLC和西门子PLC的数据功能。
+<p>本C-S项目的核心组件，该组件功能提供了一些基础功能类和整个C-S项目的网络支持，除此之外，该组件提供了访问三菱PLC，西门子PLC，欧姆龙PLC，Modbus的数据功能。
 关于这个库的项目介绍地址如下：</p>
 
 [http://www.cnblogs.com/dathlin/p/7703805.html](http://www.cnblogs.com/dathlin/p/7703805.html)
 
 在Nuget控制台输入下面的指令即可安装，或者使用VS2017的Nuget包管理器来方便的下载组件，如果不清楚怎么使用Nuget可以参考网上教程。
 
+关于该库的急速体验Demo程序下载地址：
+
+[HslCommunicationDemo.zip](https://github.com/dathlin/HslCommunication/raw/master/Download/HslCommunicationDemo.zip)
+
 <pre>
 <code>
 Install-Package HslCommunication
diff --git a/软件系统客户端Wpf/App.config b/软件系统客户端Wpf/App.config
index 8553874..49dfe5d 100644
--- a/软件系统客户端Wpf/App.config
+++ b/软件系统客户端Wpf/App.config
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <section name="软件系统客户端Wpf.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
@@ -15,4 +15,12 @@
             </setting>
         </软件系统客户端Wpf.Properties.Settings>
     </userSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/软件系统客户端Wpf/MainWindow.xaml.cs b/软件系统客户端Wpf/MainWindow.xaml.cs
index 34f0794..31474e8 100644
--- a/软件系统客户端Wpf/MainWindow.xaml.cs
+++ b/软件系统客户端Wpf/MainWindow.xaml.cs
@@ -23,6 +23,7 @@ using System.Threading;
 using 软件系统客户端Wpf.Views;
 using System.Windows.Media.Animation;
 using MaterialDesignThemes.Wpf;
+using HslCommunication.Core.Net;
 
 namespace 软件系统客户端Wpf
 {
@@ -424,7 +425,7 @@ namespace 软件系统客户端Wpf
         {
             try
             {
-                net_socket_client.KeyToken = UserSystem.KeyToken; // 新增的身份令牌
+                net_socket_client.Token = UserSystem.KeyToken; // 新增的身份令牌
                 net_socket_client.EndPointServer = new System.Net.IPEndPoint(
                     System.Net.IPAddress.Parse(UserClient.ServerIp),
                     UserSystem.Port_Main_Net);
@@ -439,10 +440,10 @@ namespace 软件系统客户端Wpf
         /// <summary>
         /// 接收到服务器的字节数据的回调方法
         /// </summary>
-        /// <param name="state">网络连接对象</param>
+        /// <param name="session">网络连接对象</param>
         /// <param name="customer">用户自定义的指令头，用来区分数据用途</param>
         /// <param name="data">数据</param>
-        private void Net_socket_client_AcceptString(AsyncStateOne state, NetHandle customer, string data)
+        private void Net_socket_client_AcceptString(AppSession session, NetHandle customer, string data)
         {
             if (customer == CommonHeadCode.MultiNetHeadCode.弹窗新消息)
             {
@@ -454,21 +455,7 @@ namespace 软件系统客户端Wpf
             }
             else if (customer == CommonHeadCode.MultiNetHeadCode.总在线信息)
             {
-                //if (IsWindowShow) Dispatcher.Invoke(new Action(() =>
-                //{
-                //    // ListBox_Onlines.ItemsSource = data.Split('#');
-
-                //    ClientsOnline.Children.Clear();
-                //    NetAccount[] accounts = JArray.Parse(data).ToObject<NetAccount[]>();
-
-                //    foreach(var m in accounts)
-                //    {
-                //        Views.Controls.UserClientRenderItem userClient = new Views.Controls.UserClientRenderItem();
-                //        userClient.SetClientRender(m);
-                //        ClientsOnline.Children.Add(userClient);
-                //    }
-
-                //}));
+                
             }
             else if (customer == CommonHeadCode.MultiNetHeadCode.关闭客户端)
             {
@@ -570,7 +557,7 @@ namespace 软件系统客户端Wpf
             }
         }
 
-        private void Net_socket_client_AcceptByte(AsyncStateOne object1, NetHandle customer, byte[] object2)
+        private void Net_socket_client_AcceptByte(AppSession session, NetHandle customer, byte[] object2)
         {
             // 接收到服务器发来的字节数据
             if (IsWindowShow) Dispatcher.Invoke(new Action(() =>
diff --git a/软件系统客户端Wpf/packages.config b/软件系统客户端Wpf/packages.config
index dc956ee..17e42bc 100644
--- a/软件系统客户端Wpf/packages.config
+++ b/软件系统客户端Wpf/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="4.3.0" targetFramework="net45" />
+  <package id="HslCommunication" version="5.0.4" targetFramework="net45" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net45" />
   <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/软件系统客户端Wpf/软件系统客户端Wpf.csproj b/软件系统客户端Wpf/软件系统客户端Wpf.csproj
index bb963b3..33d98ab 100644
--- a/软件系统客户端Wpf/软件系统客户端Wpf.csproj
+++ b/软件系统客户端Wpf/软件系统客户端Wpf.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{DB8977DD-F909-449D-B58E-08B8A6A78F2F}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>软件系统客户端Wpf</RootNamespace>
-    <AssemblyName>软件系统客户端Wpf</AssemblyName>
+    <AssemblyName>软件系统客户端模版</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -40,8 +40,8 @@
     <Reference Include="CommonLibrary">
       <HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="HslCommunication, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
     <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
@@ -49,8 +49,8 @@
     <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/软件系统客户端模版/FormMainWindow.cs b/软件系统客户端模版/FormMainWindow.cs
index c7f9abf..3721867 100644
--- a/软件系统客户端模版/FormMainWindow.cs
+++ b/软件系统客户端模版/FormMainWindow.cs
@@ -12,6 +12,7 @@ using System.Threading;
 using HslCommunication;
 using HslCommunication.Enthernet;
 using HslCommunication.BasicFramework;
+using HslCommunication.Core.Net;
 using ClientsLibrary;
 using HslCommunication.LogNet;
 
@@ -376,7 +377,7 @@ namespace 软件系统客户端模版
         {
             try
             {
-                net_socket_client.KeyToken = UserSystem.KeyToken; // 新增的身份令牌
+                net_socket_client.Token = UserSystem.KeyToken; // 新增的身份令牌
                 net_socket_client.LogNet = UserClient.LogNet;
                 net_socket_client.EndPointServer = new System.Net.IPEndPoint(
                     System.Net.IPAddress.Parse(UserClient.ServerIp),
@@ -393,10 +394,10 @@ namespace 软件系统客户端模版
         /// <summary>
         /// 接收到服务器的字节数据的回调方法
         /// </summary>
-        /// <param name="state">网络连接对象</param>
+        /// <param name="session">网络连接对象</param>
         /// <param name="customer">用户自定义的指令头，用来区分数据用途</param>
         /// <param name="data">数据</param>
-        private void Net_socket_client_AcceptString(AsyncStateOne state, NetHandle customer, string data)
+        private void Net_socket_client_AcceptString(AppSession session, NetHandle customer, string data)
         {
             if (customer == CommonHeadCode.MultiNetHeadCode.弹窗新消息)
             {
@@ -499,7 +500,7 @@ namespace 软件系统客户端模版
             }
         }
 
-        private void Net_socket_client_AcceptByte(AsyncStateOne object1, NetHandle customer, byte[] object2)
+        private void Net_socket_client_AcceptByte(AppSession session, NetHandle customer, byte[] object2)
         {
             // 接收到服务器发来的字节数据
             if (IsHandleCreated) Invoke(new Action(() =>
diff --git a/软件系统客户端模版/app.config b/软件系统客户端模版/app.config
index dde2c3c..2bbe771 100644
--- a/软件系统客户端模版/app.config
+++ b/软件系统客户端模版/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/软件系统客户端模版/packages.config b/软件系统客户端模版/packages.config
index 22347a5..2a3a232 100644
--- a/软件系统客户端模版/packages.config
+++ b/软件系统客户端模版/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="4.3.0" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net35" />
+  <package id="HslCommunication" version="5.0.4" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/软件系统客户端模版/软件系统客户端模版.csproj b/软件系统客户端模版/软件系统客户端模版.csproj
index 178ab1a..5e43d31 100644
--- a/软件系统客户端模版/软件系统客户端模版.csproj
+++ b/软件系统客户端模版/软件系统客户端模版.csproj
@@ -39,11 +39,11 @@
     <Reference Include="CommonLibrary">
       <HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="HslCommunication, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/软件系统服务端模版/BasicSupport/NetAccountManager.cs b/软件系统服务端模版/BasicSupport/NetAccountManager.cs
index 09a7dec..7a26efa 100644
--- a/软件系统服务端模版/BasicSupport/NetAccountManager.cs
+++ b/软件系统服务端模版/BasicSupport/NetAccountManager.cs
@@ -22,6 +22,25 @@ namespace 软件系统服务端模版.BasicSupport
     /// </summary>
     public class NetAccountManager
     {
+
+        #region Constructor
+
+
+        /// <summary>
+        /// 实例化一个默认的对象
+        /// </summary>
+        public NetAccountManager()
+        {
+            OnlineClients = new List<NetAccount>( );
+            hybirdLock = new SimpleHybirdLock( );
+            m_ClientsOnlineCache = "[]";
+        }
+
+        #endregion
+
+        #region Public Method
+
+
         /// <summary>
         /// 新增一个在线的客户端
         /// </summary>
@@ -63,17 +82,47 @@ namespace 软件系统服务端模版.BasicSupport
             hybirdLock.Leave();
         }
 
+        /// <summary>
+        /// 判断指定名字的客户端是否在线
+        /// </summary>
+        /// <param name="userName">用户名字</param>
+        /// <returns>在线就返回<c>True</c>，否则返回<c>Flase</c></returns>
+        public bool IsClientOnline(string userName)
+        {
+            bool result = false;
+            hybirdLock.Enter( );
+
+            for (int i = 0; i < OnlineClients.Count; i++)
+            {
+                if (OnlineClients[i].UserName == userName)
+                {
+                    result = true;
+                    break;
+                }
+            }
+
+            hybirdLock.Leave( );
+            return result;
+        }
+
+
+        #endregion
+
+        #region Public Properties
+
+
         /// <summary>
         /// 缓存的在线客户端信息
         /// </summary>
         public string ClientsOnlineCache { get => m_ClientsOnlineCache; }
 
+        #endregion
 
         #region Private Member
 
-        private List<NetAccount> OnlineClients = new List<NetAccount>();       // 所有在线客户端的列表
-        private SimpleHybirdLock hybirdLock = new SimpleHybirdLock();          // 操作列表的混合锁
-        private string m_ClientsOnlineCache = "[]";                            // 在线客户端的缓存
+        private List<NetAccount> OnlineClients;                         // 所有在线客户端的列表
+        private SimpleHybirdLock hybirdLock;                            // 操作列表的混合锁
+        private string m_ClientsOnlineCache;                            // 在线客户端的缓存
 
         #endregion
     }
diff --git a/软件系统服务端模版/FormServerWindow.cs b/软件系统服务端模版/FormServerWindow.cs
index e793c2d..410b736 100644
--- a/软件系统服务端模版/FormServerWindow.cs
+++ b/软件系统服务端模版/FormServerWindow.cs
@@ -16,6 +16,7 @@ using HslCommunication.LogNet;
 using HslCommunication;
 using HslCommunication.Core;
 using 软件系统服务端模版.BasicSupport;
+using HslCommunication.Core.Net;
 
 
 /********************************************************************************************
@@ -357,7 +358,7 @@ namespace 软件系统服务端模版
                 net_soft_update_Server.LogNet = new LogNetSingle(LogSavePath + @"\update_log.txt");
                 //在服务器的这个路径下，放置客户端运行的所有文件，不要包含settings文件，不要从此处运行
                 //只放置exe和dll组件，必须放置：软件自动更新.exe
-                net_soft_update_Server.KeyToken = UserSystem.KeyToken;
+                net_soft_update_Server.Token = UserSystem.KeyToken;
                 net_soft_update_Server.FileUpdatePath = Application.StartupPath + @"\AdvancedFiles\ClientFiles";//客户端文件路径
                 net_soft_update_Server.ServerStart(UserSystem.Port_Update_Net);
             }
@@ -382,13 +383,12 @@ namespace 软件系统服务端模版
         {
             try
             {
-                net_simplify_server.KeyToken = UserSystem.KeyToken;//设置身份令牌
+                net_simplify_server.Token = UserSystem.KeyToken;//设置身份令牌
                 net_simplify_server.LogNet = new LogNetSingle(LogSavePath + @"\simplify_log.txt");//日志路径
                 net_simplify_server.LogNet.SetMessageDegree(HslMessageDegree.INFO);//默认debug及以上级别日志均进行存储，根据需要自行选择
                 net_simplify_server.ReceiveStringEvent += Net_simplify_server_ReceiveStringEvent;//接收到字符串触发
                 net_simplify_server.ReceivedBytesEvent += Net_simplify_server_ReceivedBytesEvent;//接收到字节触发
                 net_simplify_server.ServerStart(UserSystem.Port_Second_Net);
-                net_simplify_server.ConnectTimeout = 5200;
             }
             catch (Exception ex)
             {
@@ -398,18 +398,18 @@ namespace 软件系统服务端模版
         /// <summary>
         /// 接收来自客户端的字节数据
         /// </summary>
-        /// <param name="state">网络状态</param>
+        /// <param name="session">网络状态</param>
         /// <param name="customer">字节数据，根据实际情况选择是否使用</param>
         /// <param name="data">来自客户端的字节数据</param>
-        private void Net_simplify_server_ReceivedBytesEvent(AsyncStateOne state, NetHandle customer, byte[] data)
+        private void Net_simplify_server_ReceivedBytesEvent(AppSession session, NetHandle customer, byte[] data)
         {
             if(customer==CommonHeadCode.SimplifyHeadCode.性能计数)
             {
-                net_simplify_server.SendMessage(state, customer, GetPerfomace());
+                net_simplify_server.SendMessage(session, customer, GetPerfomace());
             }
             else
             {
-                net_simplify_server.SendMessage(state, customer, data);
+                net_simplify_server.SendMessage(session, customer, data);
             }
         }
 
@@ -427,10 +427,10 @@ namespace 软件系统服务端模版
         /// <summary>
         /// 接收到来自客户端的数据，此处需要放置维护验证，更新验证等等操作
         /// </summary>
-        /// <param name="state">客户端的地址</param>
+        /// <param name="session">客户端的地址</param>
         /// <param name="handle">用于自定义的指令头，可不用，转而使用data来区分</param>
         /// <param name="data">接收到的服务器的数据</param>
-        private void Net_simplify_server_ReceiveStringEvent(AsyncStateOne state, NetHandle handle, string data)
+        private void Net_simplify_server_ReceiveStringEvent(AppSession session, NetHandle handle, string data)
         {
 
             /*******************************************************************************************
@@ -443,15 +443,15 @@ namespace 软件系统服务端模版
 
             if (handle.CodeMajor == 1 && handle.CodeMinor == 1)
             {
-                DataProcessingWithStartA(state, handle, data);
+                DataProcessingWithStartA(session, handle, data);
             }
             else if (handle.CodeMajor == 1 && handle.CodeMinor == 2)
             {
-                DataProcessingWithStartB(state, handle, data);
+                DataProcessingWithStartB(session, handle, data);
             }
             else
             {
-                net_simplify_server.SendMessage(state, handle, data);
+                net_simplify_server.SendMessage(session, handle, data);
             }
         }
 
@@ -470,7 +470,7 @@ namespace 软件系统服务端模版
         /// <param name="state">网络状态对象</param>
         /// <param name="handle">用户自定义的指令头</param>
         /// <param name="data">实际的数据</param>
-        private void DataProcessingWithStartA(AsyncStateOne state, NetHandle handle, string data)
+        private void DataProcessingWithStartA( AppSession state, NetHandle handle, string data)
         {
             if (handle == CommonHeadCode.SimplifyHeadCode.维护检查)
             {
@@ -505,7 +505,7 @@ namespace 软件系统服务端模版
                 string frameworkVersion = SoftBasic.GetValueFromJsonObject(json, UserAccount.FrameworkVersion, "1.0.0");
 
 
-                UserAccount account = UserServer.ServerAccounts.CheckAccount(name, password, state.GetRemoteEndPoint().Address.ToString(), way);
+                UserAccount account = UserServer.ServerAccounts.CheckAccount(name, password, state.IpEndPoint.Address.ToString(), way);
 
 
                 // 先判定框架版本是否正确
@@ -741,7 +741,7 @@ namespace 软件系统服务端模版
         /// <param name="state">网络状态对象</param>
         /// <param name="handle">用户自定义的命令头</param>
         /// <param name="data">实际的数据</param>
-        private void DataProcessingWithStartB(AsyncStateOne state, NetHandle handle, string data)
+        private void DataProcessingWithStartB( AppSession state, NetHandle handle, string data)
         {
             if (handle == CommonHeadCode.SimplifyHeadCode.网络日志查看)
             {
@@ -895,7 +895,7 @@ namespace 软件系统服务端模版
          * 
          ****************************************************************************************************/
 
-        private void DataProcessingWithStartC(AsyncStateOne state, NetHandle handle, string data)
+        private void DataProcessingWithStartC( AppSession state, NetHandle handle, string data)
         {
 
         }
@@ -924,16 +924,15 @@ namespace 软件系统服务端模版
         {
             try
             {
-                net_socket_server.KeyToken = UserSystem.KeyToken;                                                // 设置身份令牌
-                net_socket_server.LogNet =new LogNetSingle(LogSavePath + @"\net_log.txt");                           // 设置日志存储路径
-                net_socket_server.LogNet.SetMessageDegree(HslMessageDegree.INFO);                                   // 默认debug及以上级别日志均进行存储，根据需要自行选择
-                net_socket_server.FormatClientOnline = "#IP:{0} Name:{1}";                                           // 必须为#开头，具体格式可由自身需求确定
-                net_socket_server.IsSaveLogClientLineChange = true;                                                  // 设置客户端上下线是否记录到日志
-                net_socket_server.ClientOnline += new NetBase.IEDelegate<AsyncStateOne>(Net_socket_server_ClientOnline);// 客户端上线触发
-                net_socket_server.ClientOffline += new NetBase.IEDelegate<AsyncStateOne, string>(Net_socket_server_ClientOffline);// 客户端下线触发，包括异常掉线
-                net_socket_server.AllClientsStatusChange += new NetBase.IEDelegate<string>(Net_socket_server_AllClientsStatusChange);// 客户端上下线变化时触发
-                net_socket_server.AcceptByte += new NetBase.IEDelegate<AsyncStateOne, NetHandle, byte[]>(Net_socket_server_AcceptByte);// 服务器接收到字节数据触发
-                net_socket_server.AcceptString += new NetBase.IEDelegate<AsyncStateOne, NetHandle, string>(Net_socket_server_AcceptString);// 服务器接收到字符串数据触发
+                net_socket_server.Token = UserSystem.KeyToken;                                                 // 设置身份令牌
+                net_socket_server.LogNet =new LogNetSingle(LogSavePath + @"\net_log.txt");                     // 设置日志存储路径
+                net_socket_server.LogNet.SetMessageDegree(HslMessageDegree.INFO);                              // 默认debug及以上级别日志均进行存储，根据需要自行选择
+                net_socket_server.IsSaveLogClientLineChange = true;                                            // 设置客户端上下线是否记录到日志
+                net_socket_server.ClientOnline += Net_socket_server_ClientOnline;                              // 客户端上线触发
+                net_socket_server.ClientOffline += Net_socket_server_ClientOffline;                            // 客户端下线触发，包括异常掉线
+                net_socket_server.AllClientsStatusChange += Net_socket_server_AllClientsStatusChange;          // 客户端上下线变化时触发
+                net_socket_server.AcceptByte += Net_socket_server_AcceptByte;                                  // 服务器接收到字节数据触发
+                net_socket_server.AcceptString += Net_socket_server_AcceptString;                              // 服务器接收到字符串数据触发
                 net_socket_server.ServerStart(UserSystem.Port_Main_Net);
             }
             catch (Exception ex)
@@ -952,11 +951,11 @@ namespace 软件系统服务端模版
          ******************************************************************************************************************/
 
 
-        private void Net_socket_server_AcceptString(AsyncStateOne object1, NetHandle handle, string data)
+        private void Net_socket_server_AcceptString(AppSession session, NetHandle handle, string data)
         {
             if (handle.CodeMajor == 2 && handle.CodeMinor == 1)
             {
-                DataProcessingWithStartH(object1, handle, data);
+                DataProcessingWithStartH( session, handle, data);
             }
 
         }
@@ -970,11 +969,11 @@ namespace 软件系统服务端模版
         /// <param name="state">网络状态</param>
         /// <param name="customer">用户自定义的指令头</param>
         /// <param name="data">字符串数据</param>
-        private void DataProcessingWithStartH(AsyncStateOne state, NetHandle customer, string data)
+        private void DataProcessingWithStartH( AppSession session, NetHandle customer, string data)
         {
             if (customer == CommonHeadCode.MultiNetHeadCode.留言版消息)
             {
-                ChatAddMessage(state.LoginAlias, data);
+                ChatAddMessage( session.LoginAlias, data);
             }
         }
 
@@ -982,31 +981,31 @@ namespace 软件系统服务端模版
         #endregion
 
 
-        private void Net_socket_server_AcceptByte(AsyncStateOne state, NetHandle customer, byte[] data)
+        private void Net_socket_server_AcceptByte(AppSession session, NetHandle customer, byte[] data)
         {
             //如果此处充斥大量if语句，影响观感，则考虑进行指令头分类操作，客户端异步发送的字节数组都会到此处处理
         }
         
 
-        private void Net_socket_server_ClientOffline(AsyncStateOne object1, string object2)
+        private void Net_socket_server_ClientOffline(AppSession session, string object2)
         {
-            netAccountManager.RemoveOnlineClient(object1.ClientUniqueID);
-            net_socket_server.SendAllClients(CommonHeadCode.MultiNetHeadCode.用户下线, object1.ClientUniqueID);
+            netAccountManager.RemoveOnlineClient(session.ClientUniqueID);
+            net_socket_server.SendAllClients(CommonHeadCode.MultiNetHeadCode.用户下线, session.ClientUniqueID);
 
-            UserInterfaceMessageRender(DateTime.Now.ToString("MM-dd HH:mm:ss ") + object1.IpAddress + "：" + object1.LoginAlias + " " + object2);
+            UserInterfaceMessageRender(DateTime.Now.ToString("MM-dd HH:mm:ss ") + session.IpAddress + "：" + session.LoginAlias + " " + object2);
         }
 
-        private void Net_socket_server_ClientOnline(AsyncStateOne object1)
+        private void Net_socket_server_ClientOnline(AppSession session)
         {
             NetAccount account = new NetAccount
             {
-                UserName = object1.LoginAlias,
-                Roles = UserServer.ServerRoles.GetRolesByUserName(object1.LoginAlias),
-                IpAddress = object1.IpAddress,
-                Alias = UserServer.ServerAccounts.GetAccountAlias(object1.LoginAlias),
-                Factory = UserServer.ServerAccounts.GetAccountFactory(object1.LoginAlias),
+                UserName = session.LoginAlias,
+                Roles = UserServer.ServerRoles.GetRolesByUserName(session.LoginAlias),
+                IpAddress = session.IpAddress,
+                Alias = UserServer.ServerAccounts.GetAccountAlias(session.LoginAlias),
+                Factory = UserServer.ServerAccounts.GetAccountFactory(session.LoginAlias),
                 LoginTime = DateTime.Now,
-                UniqueId = object1.ClientUniqueID
+                UniqueId = session.ClientUniqueID
             };
 
             net_socket_server.SendAllClients(CommonHeadCode.MultiNetHeadCode.新用户上线, JObject.FromObject(account).ToString());
@@ -1022,33 +1021,21 @@ namespace 软件系统服务端模版
             };
             
             // 发送客户端的初始化数据
-            net_socket_server.Send(object1, CommonHeadCode.MultiNetHeadCode.初始化数据, json.ToString());
+            net_socket_server.Send(session, CommonHeadCode.MultiNetHeadCode.初始化数据, json.ToString());
             // 新增到在线客户端的队列中
             netAccountManager.AddOnlineClient(account);
             // 触发上下线功能
-            UserInterfaceMessageRender(DateTime.Now.ToString("MM-dd HH:mm:ss ") + object1.IpAddress + "：" + object1.LoginAlias + " 上线");
+            UserInterfaceMessageRender(DateTime.Now.ToString("MM-dd HH:mm:ss ") + session.IpAddress + "：" + session.LoginAlias + " 上线");
         }
 
 
-        private void Net_socket_server_AllClientsStatusChange(string data)
+        private void Net_socket_server_AllClientsStatusChange(int count)
         {
             // 此处决定要不要将在线客户端的数据发送所有客户端
-            // net_socket_server.SendAllClients(CommonHeadCode.MultiNetHeadCode.总在线信息, data);
-            Net_Socket_All_Clients = data;
-            if (IsWindowShow && IsHandleCreated)
-            {
-                BeginInvoke(new Action(() =>
-                {
-                    listBox1.DataSource = data.Split('#');
-                    label4.Text = net_socket_server.ClientCount.ToString();
-                }));
-            }
+            // net_socket_server.SendAllClients(CommonHeadCode.MultiNetHeadCode.总在线信息, netAccountManager.ClientsOnlineCache);
+            
         }
-
-        /// <summary>
-        /// 所有在线客户端的信息，此处做了一个缓存
-        /// </summary>
-        private string Net_Socket_All_Clients = string.Empty;
+        
 
         /// <summary>
         /// 用来判断客户端是否已经在线，除了超级管理员，其他的账户不允许重复在线，重复登录的账户予以特殊标记
@@ -1056,19 +1043,10 @@ namespace 软件系统服务端模版
         /// <returns>该客户端是否在线</returns>
         private bool IsClinetOnline(string userName)
         {
+            // 超级管理员允许重复登录
             if (userName == "admin") return false;
-            if(Net_Socket_All_Clients.Contains($"Name:{userName}#"))
-            {
-                return true;
-            }
-            else if(Net_Socket_All_Clients.EndsWith($"Name:{userName}"))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
+            // 其他的需要检测信息
+            return netAccountManager.IsClientOnline( userName );
         }
 
         /// <summary>
@@ -1214,6 +1192,10 @@ namespace 软件系统服务端模版
          * 
          *    本文件管理器引擎目前主要实现1个功能
          *    1. 允许客户端上传服务器的客户端文件，用来提供软件自动更新使用的
+         *    
+         *    AFS 文件服务器的特点是支持原生的文件上传下载，和你在服务器上看到的本地目录是一致的
+         *    优点：原生，上传的文件可以用于其他操作的识别
+         *    缺点：不支持额外的信息输入
          * 
          **************************************************************************************/
 
@@ -1233,7 +1215,7 @@ namespace 软件系统服务端模版
                 net_file_Advanced.FilesDirectoryPath = Application.StartupPath + @"\AdvancedFiles";
                 net_file_Advanced.FilesDirectoryPathTemp = Application.StartupPath + @"\AdvancedFiles\Temp";
                 net_file_Advanced.LogNet = new LogNetSingle(LogSavePath + @"\Advanced_file_log.txt");
-                net_file_Advanced.KeyToken = UserSystem.KeyToken;
+                net_file_Advanced.Token = UserSystem.KeyToken;
                 net_file_Advanced.ServerStart(UserSystem.Port_Advanced_File_Server);
             }
             catch (Exception ex)
@@ -1254,6 +1236,8 @@ namespace 软件系统服务端模版
          *    1. 用于管理客户端的头像文件存储服务
          *    2. 用于管理每个账户的私有文件存储服务
          *    3. 用于主界面的共享文件管理
+         *    
+         *    UFS文件引擎的特点是支持复杂的额外信息，更彻底的读写分离，缺点是不支持原生访问，需要通过映射表来实现操作。
          * 
          **************************************************************************************/
 
@@ -1269,7 +1253,7 @@ namespace 软件系统服务端模版
             try
             {
                 net_ultimate_file_server = new UltimateFileServer();
-                net_ultimate_file_server.KeyToken = UserSystem.KeyToken;
+                net_ultimate_file_server.Token = UserSystem.KeyToken;
                 net_ultimate_file_server.LogNet = new LogNetSingle(LogSavePath + @"\ultimate_file_log.txt");
                 net_ultimate_file_server.LogNet.SetMessageDegree(HslMessageDegree.DEBUG);//默认debug及以上级别日志均进行存储，根据需要自行选择
                 net_ultimate_file_server.FilesDirectoryPath = Application.StartupPath + @"\UltimateFiles";
@@ -1343,7 +1327,7 @@ namespace 软件系统服务端模版
                 net_udp_server = new NetUdpServer();
                 net_udp_server.LogNet =new LogNetSingle(LogSavePath + @"\udp_log.txt");//日志路径
                 net_udp_server.LogNet.SetMessageDegree(HslMessageDegree.DEBUG);//默认debug及以上级别日志均进行存储，根据需要自行选择
-                net_udp_server.KeyToken = CommonLibrary.UserSystem.KeyToken;
+                net_udp_server.Token = UserSystem.KeyToken;
                 net_udp_server.ReceiveCacheLength = 1024;//单次接收数据的缓冲长度
                 net_udp_server.AcceptByte += Net_udp_server_AcceptByte;//接收到字节数据的时候触发事件
                 net_udp_server.AcceptString += Net_udp_server_AcceptString;//接收到字符串数据的时候触发事件
@@ -1355,72 +1339,22 @@ namespace 软件系统服务端模版
             }
         }
 
-        private void Net_udp_server_AcceptString(AsyncStateOne state, NetHandle customer, string data)
+        private void Net_udp_server_AcceptString(AppSession session, NetHandle customer, string data)
         {
             //此处为测试
             Invoke(new Action(() =>
             {
-                textBox1.AppendText($"{DateTime.Now.ToString("MM-dd HH:mm:ss ")}来自IP:{state.IpEndPoint.Address.ToString()} 内容:{data}{Environment.NewLine}");
+                textBox1.AppendText($"{DateTime.Now.ToString("MM-dd HH:mm:ss ")}来自IP:{session.IpEndPoint.Address.ToString()} 内容:{data}{Environment.NewLine}");
             }));
         }
 
-        private void Net_udp_server_AcceptByte(AsyncStateOne state, NetHandle customer, byte[] data)
+        private void Net_udp_server_AcceptByte( AppSession session, NetHandle customer, byte[] data)
         {
             //具体用法参考上面字符串方法
         }
 
         #endregion
-
-        #region 访问PLC块示例代码
-
-        /*************************************************************************************************
-         * 
-         *    以下展示一个高性能访问多台PLC数据的类，即使同时访问100台设备，性能也是非常高
-         * 
-         *    该类没有仔细的在现场环境测试过，不保证完全可用
-         * 
-         *************************************************************************************************/
-
-        HslCommunication.Profinet.MelsecNetMultiAsync MelsecMulti { get; set; }
-
-        private void MelsecNetMultiInnitialization()
-        {
-            List<System.Net.IPAddress> IpEndPoints = new List<System.Net.IPAddress>();
-            //增加100台需要访问的三菱设备，指定所有设备IP和端口，注意：顺序很重要
-            for (int i = 1; i < 100; i++)
-            {
-                IpEndPoints.Add(System.Net.IPAddress.Parse("192.168.10." + i));
-            }
-
-            //每隔1秒钟访问一次，读取的地址为D6000-D6019，超时时间为700毫秒，主端口为6000，备用端口为6001
-            MelsecMulti = new HslCommunication.Profinet.MelsecNetMultiAsync(0, 0, HslCommunication.Profinet.MelsecDataType.D, 6000, 20, 700, 1000, IpEndPoints.ToArray(), 6000, 6001);
-            MelsecMulti.OnReceivedData += MelsecMulti_OnReceivedData;//所有机台的数据都返回时触发
-        }
-
-        private void MelsecMulti_OnReceivedData(byte[] object1)
-        {
-            /*********************************************************************************************
-             * 
-             *    正常情况下，一秒触发一次，object1包含了所有机台读取到的数据
-             *    比如每台设备读取D6000开始20个D，如上述指令所示
-             *    那么每台设备数据长度为20*2+2=42个byte，100台设备就是4200字节长度
-             *    也就是说，object1的0-41字节是第一台设备的，以此类推
-             *    每台设备的前两个字节都为0才说明本次数据访问正常，为0x00,0x01说明连接失败，其他说明说明三菱本身的异常
-             * 
-             ********************************************************************************************/
-            for (int i = 0; i < 100; i++)
-            {
-                int startIndex = i * 42;
-                ushort netState = BitConverter.ToUInt16(object1, startIndex);// 为0，说明数据正常，不为0说明网络访问失败或是指令出错
-
-
-            }
-        }
-
-
-
-        #endregion
-
+        
         #region 流水号生成示例代码
 
         private SoftNumericalOrder OrderAutoCreate { get; set; }
diff --git a/软件系统服务端模版/app.config b/软件系统服务端模版/app.config
index dde2c3c..2bbe771 100644
--- a/软件系统服务端模版/app.config
+++ b/软件系统服务端模版/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/软件系统服务端模版/packages.config b/软件系统服务端模版/packages.config
index 22347a5..2a3a232 100644
--- a/软件系统服务端模版/packages.config
+++ b/软件系统服务端模版/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="4.3.0" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net35" />
+  <package id="HslCommunication" version="5.0.4" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/软件系统服务端模版/软件系统服务端模版.csproj b/软件系统服务端模版/软件系统服务端模版.csproj
index fc5bffc..807c3dc 100644
--- a/软件系统服务端模版/软件系统服务端模版.csproj
+++ b/软件系统服务端模版/软件系统服务端模版.csproj
@@ -35,11 +35,11 @@
     <Reference Include="CommonLibrary">
       <HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="HslCommunication, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/软件系统浏览器模版/Web.config b/软件系统浏览器模版/Web.config
index 77585b8..c735124 100644
--- a/软件系统浏览器模版/Web.config
+++ b/软件系统浏览器模版/Web.config
@@ -21,7 +21,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
diff --git a/软件系统浏览器模版/packages.config b/软件系统浏览器模版/packages.config
index 7e1d7f5..2f1b481 100644
--- a/软件系统浏览器模版/packages.config
+++ b/软件系统浏览器模版/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
   <package id="bootstrap" version="3.3.7" targetFramework="net45" />
-  <package id="HslCommunication" version="4.3.0" targetFramework="net45" />
+  <package id="HslCommunication" version="5.0.4" targetFramework="net45" />
   <package id="jQuery" version="1.10.2" targetFramework="net45" />
   <package id="jQuery.Validation" version="1.16.0" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights" version="2.4.0" targetFramework="net45" />
@@ -27,7 +27,7 @@
   <package id="Microsoft.Net.Compilers" version="2.4.0" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Modernizr" version="2.8.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="Respond" version="1.4.2" targetFramework="net45" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net45" />
   <package id="WebGrease" version="1.6.0" targetFramework="net45" />
diff --git a/软件系统浏览器模版/软件系统浏览器模版.csproj b/软件系统浏览器模版/软件系统浏览器模版.csproj
index 34490d2..f3a674c 100644
--- a/软件系统浏览器模版/软件系统浏览器模版.csproj
+++ b/软件系统浏览器模版/软件系统浏览器模版.csproj
@@ -57,8 +57,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="HslCommunication, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.AI.Agent.Intercept, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.4.0\lib\net45\Microsoft.AI.Agent.Intercept.dll</HintPath>
@@ -88,8 +88,8 @@
       <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />