From 9c4f98a66f42dd033aa9429ab007d159be81677e Mon Sep 17 00:00:00 2001 From: dathlin Date: Wed, 22 Nov 2017 14:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0NuGet=E5=8C=85=E5=88=B04.0.0?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=AE=8C=E6=88=90=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=82=E9=85=8D=E5=B7=A5=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?v1.7.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ClientsLibrary/AccountSupport/AccountLogin.cs | 2 +- ClientsLibrary/AccountSupport/FormAccountDetails.cs | 2 +- ClientsLibrary/AccountSupport/FormAccountSelect.cs | 2 +- ClientsLibrary/AccountSupport/FormRegisterAccount.cs | 2 +- ClientsLibrary/AccountSupport/UserPortrait.cs | 1 + ClientsLibrary/BasicSupport/FormDownloading.cs | 6 +++--- ClientsLibrary/ClientsLibrary.csproj | 4 ++-- ClientsLibrary/Configuration/ClientConfiguration.cs | 4 ++-- ClientsLibrary/Configuration/GeneralConfiguration.cs | 4 ++-- ClientsLibrary/Configuration/ListConfiguration.cs | 4 ++-- ClientsLibrary/Configuration/RolesConfiguration.cs | 4 ++-- ClientsLibrary/LogsSupport/FormLogView.cs | 4 ++-- ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs | 2 +- ClientsLibrary/UserClient.cs | 2 +- ClientsLibrary/packages.config | 2 +- CommonLibrary/AccountSupport/RoleAssign.cs | 2 +- CommonLibrary/AccountSupport/ServerAccount.cs | 2 +- CommonLibrary/BasicSupport/SoftSettings.cs | 2 +- CommonLibrary/CommonLibrary.csproj | 4 ++-- CommonLibrary/UserSystem.cs | 2 +- CommonLibrary/packages.config | 2 +- HslCommunicationNetTestTool/Form1.cs | 2 +- .../HslCommunicationNetTestTool.csproj | 4 ++-- HslCommunicationNetTestTool/packages.config | 2 +- 软件系统客户端Wpf/MainWindow.xaml.cs | 4 ++-- 软件系统客户端Wpf/packages.config | 2 +- 软件系统客户端Wpf/软件系统客户端Wpf.csproj | 4 ++-- 软件系统客户端模版/FormMainWindow.cs | 4 ++-- 软件系统客户端模版/packages.config | 2 +- 软件系统客户端模版/软件系统客户端模版.csproj | 4 ++-- 软件系统服务端模版/BasicSupport/NetAccountManager.cs | 4 ++-- 软件系统服务端模版/FormServerWindow.cs | 8 ++------ 软件系统服务端模版/packages.config | 2 +- 软件系统服务端模版/软件系统服务端模版.csproj | 4 ++-- 软件系统浏览器模版/Controllers/AccountController.cs | 6 +++--- 软件系统浏览器模版/Controllers/HomeController.cs | 10 +++++----- 软件系统浏览器模版/packages.config | 2 +- 软件系统浏览器模版/软件系统浏览器模版.csproj | 4 ++-- 38 files changed, 62 insertions(+), 65 deletions(-) diff --git a/ClientsLibrary/AccountSupport/AccountLogin.cs b/ClientsLibrary/AccountSupport/AccountLogin.cs index a3101b3..9200482 100644 --- a/ClientsLibrary/AccountSupport/AccountLogin.cs +++ b/ClientsLibrary/AccountSupport/AccountLogin.cs @@ -55,7 +55,7 @@ namespace ClientsLibrary Thread.Sleep(200); // 请求指令头数据，该数据需要更具实际情况更改 - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.维护检查); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.维护检查); if (result.IsSuccess) { byte[] temp = Encoding.Unicode.GetBytes(result.Content); diff --git a/ClientsLibrary/AccountSupport/FormAccountDetails.cs b/ClientsLibrary/AccountSupport/FormAccountDetails.cs index bd93516..9636b6e 100644 --- a/ClientsLibrary/AccountSupport/FormAccountDetails.cs +++ b/ClientsLibrary/AccountSupport/FormAccountDetails.cs @@ -182,7 +182,7 @@ namespace ClientsLibrary }; - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer( + OperateResult result = UserClient.Net_simplify_client.ReadFromServer( CommonHeadCode.SimplifyHeadCode.上传头像MD5, json.ToString()); diff --git a/ClientsLibrary/AccountSupport/FormAccountSelect.cs b/ClientsLibrary/AccountSupport/FormAccountSelect.cs index dea842c..8df6ef8 100644 --- a/ClientsLibrary/AccountSupport/FormAccountSelect.cs +++ b/ClientsLibrary/AccountSupport/FormAccountSelect.cs @@ -63,7 +63,7 @@ namespace ClientsLibrary { // 初始化 - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户, m_condition); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户, m_condition); if (result.IsSuccess) { List accounts = JArray.Parse(result.Content).ToObject>(); diff --git a/ClientsLibrary/AccountSupport/FormRegisterAccount.cs b/ClientsLibrary/AccountSupport/FormRegisterAccount.cs index 4962dbe..4370c53 100644 --- a/ClientsLibrary/AccountSupport/FormRegisterAccount.cs +++ b/ClientsLibrary/AccountSupport/FormRegisterAccount.cs @@ -103,7 +103,7 @@ namespace ClientsLibrary account.EMail = textBox6.Text; - OperateResultString result = net_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.注册账号, account.ToJsonString()); + OperateResult result = net_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.注册账号, account.ToJsonString()); if (result.IsSuccess && result.Content == "1") { MessageBox.Show("注册成功！"); diff --git a/ClientsLibrary/AccountSupport/UserPortrait.cs b/ClientsLibrary/AccountSupport/UserPortrait.cs index 468f6f7..53cd750 100644 --- a/ClientsLibrary/AccountSupport/UserPortrait.cs +++ b/ClientsLibrary/AccountSupport/UserPortrait.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading; using System.Windows.Forms; +using HslCommunication.Core; namespace ClientsLibrary { diff --git a/ClientsLibrary/BasicSupport/FormDownloading.cs b/ClientsLibrary/BasicSupport/FormDownloading.cs index 61260fd..8f4aa03 100644 --- a/ClientsLibrary/BasicSupport/FormDownloading.cs +++ b/ClientsLibrary/BasicSupport/FormDownloading.cs @@ -23,7 +23,7 @@ namespace ClientsLibrary public partial class FormDownloading : Form { - public FormDownloading(int customer,Action action) + public FormDownloading(int customer,Action> action) { InitializeComponent(); @@ -89,13 +89,13 @@ namespace ClientsLibrary private int net_cmd = 0; - private Action DealWithResult = null; + private Action> DealWithResult = null; private void ThreadRequestServer() { //后台请求数据 System.Threading.Thread.Sleep(100); - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(net_cmd); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(net_cmd); Invoke(new Action(() => { DealWithResult(result); diff --git a/ClientsLibrary/ClientsLibrary.csproj b/ClientsLibrary/ClientsLibrary.csproj index d2f9295..544f290 100644 --- a/ClientsLibrary/ClientsLibrary.csproj +++ b/ClientsLibrary/ClientsLibrary.csproj @@ -33,8 +33,8 @@ ..\CommonLibrary\bin\Debug\CommonLibrary.dll - - ..\packages\HslCommunication.3.17.15\lib\HslCommunication.dll + + ..\packages\HslCommunication.4.0.0\lib\HslCommunication.dll ..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll diff --git a/ClientsLibrary/Configuration/ClientConfiguration.cs b/ClientsLibrary/Configuration/ClientConfiguration.cs index 49c988a..81262ca 100644 --- a/ClientsLibrary/Configuration/ClientConfiguration.cs +++ b/ClientsLibrary/Configuration/ClientConfiguration.cs @@ -59,7 +59,7 @@ namespace ClientsLibrary.Configuration { // 初始化 - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.请求信任客户端, ""); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.请求信任客户端, ""); if(result.IsSuccess) { JObject json=JObject.Parse(result.Content); @@ -97,7 +97,7 @@ namespace ClientsLibrary.Configuration { "TrustList", new JArray(list.ToArray()) } }; - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer( + OperateResult result = UserClient.Net_simplify_client.ReadFromServer( CommonLibrary.CommonHeadCode.SimplifyHeadCode.上传信任客户端, json.ToString()); if(result.IsSuccess) diff --git a/ClientsLibrary/Configuration/GeneralConfiguration.cs b/ClientsLibrary/Configuration/GeneralConfiguration.cs index 72c343c..c721bc8 100644 --- a/ClientsLibrary/Configuration/GeneralConfiguration.cs +++ b/ClientsLibrary/Configuration/GeneralConfiguration.cs @@ -32,7 +32,7 @@ namespace ClientsLibrary.Configuration { // 初始化 - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.请求信任客户端, ""); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.请求信任客户端, ""); if (result.IsSuccess) { JObject json = JObject.Parse(result.Content); @@ -61,7 +61,7 @@ namespace ClientsLibrary.Configuration { "AllowFrameLogin", new JValue(checkBox2.Checked) }, }; - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer( + OperateResult result = UserClient.Net_simplify_client.ReadFromServer( CommonLibrary.CommonHeadCode.SimplifyHeadCode.上传信任客户端, json.ToString()); if (result.IsSuccess) diff --git a/ClientsLibrary/Configuration/ListConfiguration.cs b/ClientsLibrary/Configuration/ListConfiguration.cs index bb49bf2..e44b948 100644 --- a/ClientsLibrary/Configuration/ListConfiguration.cs +++ b/ClientsLibrary/Configuration/ListConfiguration.cs @@ -60,7 +60,7 @@ namespace ClientsLibrary.Configuration dataGridView1.Columns[0].HeaderText = HeadText; // 向服务器请求数据初始化 - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(Download, ""); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(Download, ""); if (result.IsSuccess) { @@ -124,7 +124,7 @@ namespace ClientsLibrary.Configuration } } - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(Upload, + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(Upload, Newtonsoft.Json.Linq.JArray.FromObject(data).ToString()); if (result.IsSuccess) diff --git a/ClientsLibrary/Configuration/RolesConfiguration.cs b/ClientsLibrary/Configuration/RolesConfiguration.cs index ff6fa22..6801543 100644 --- a/ClientsLibrary/Configuration/RolesConfiguration.cs +++ b/ClientsLibrary/Configuration/RolesConfiguration.cs @@ -33,7 +33,7 @@ namespace ClientsLibrary.Configuration UILocalization(); // 初始化 - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.请求角色配置, ""); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.请求角色配置, ""); if (result.IsSuccess) { List roles = JArray.Parse(result.Content).ToObject>(); @@ -210,7 +210,7 @@ namespace ClientsLibrary.Configuration } } - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer( + OperateResult result = UserClient.Net_simplify_client.ReadFromServer( CommonHeadCode.SimplifyHeadCode.上传角色配置, JArray.FromObject(roles).ToString()); if (result.IsSuccess) { diff --git a/ClientsLibrary/LogsSupport/FormLogView.cs b/ClientsLibrary/LogsSupport/FormLogView.cs index 42441b5..ac3c6b7 100644 --- a/ClientsLibrary/LogsSupport/FormLogView.cs +++ b/ClientsLibrary/LogsSupport/FormLogView.cs @@ -47,7 +47,7 @@ namespace ClientsLibrary private void ReadFromServer(int head_code) { - OperateResultString result = net_simplify_client.ReadFromServer(head_code); + OperateResult result = net_simplify_client.ReadFromServer(head_code); if (result.IsSuccess) { logNetAnalysisControl1.SetLogNetSource(result.Content); @@ -60,7 +60,7 @@ namespace ClientsLibrary private void ClearFromServer(int head_code) { - OperateResultString result = net_simplify_client.ReadFromServer(head_code); + OperateResult result = net_simplify_client.ReadFromServer(head_code); if (result.IsSuccess) MessageBox.Show("清除成功"); else MessageBox.Show(result.ToMessageShowString()); } diff --git a/ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs b/ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs index c15d2f2..6fb0343 100644 --- a/ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs +++ b/ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs @@ -69,7 +69,7 @@ namespace ClientsLibrary private void userButton_version_Click(object sender, EventArgs e) { - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更新版本, textBox1.Text); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更新版本, textBox1.Text); if (result.IsSuccess && result.Content == "1") { MessageBox.Show("更新成功！"); diff --git a/ClientsLibrary/UserClient.cs b/ClientsLibrary/UserClient.cs index f572863..bf24185 100644 --- a/ClientsLibrary/UserClient.cs +++ b/ClientsLibrary/UserClient.cs @@ -120,7 +120,7 @@ namespace ClientsLibrary { "Name", UserAccount.UserName }, { "Role", roleCode } }; - HslCommunication.OperateResultString result = Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.检查角色权限, + HslCommunication.OperateResult result = Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.检查角色权限, json.ToString()); if(result.IsSuccess) diff --git a/ClientsLibrary/packages.config b/ClientsLibrary/packages.config index 42871d2..fb2e2ab 100644 --- a/ClientsLibrary/packages.config +++ b/ClientsLibrary/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/CommonLibrary/AccountSupport/RoleAssign.cs b/CommonLibrary/AccountSupport/RoleAssign.cs index 74c14c5..99b81e1 100644 --- a/CommonLibrary/AccountSupport/RoleAssign.cs +++ b/CommonLibrary/AccountSupport/RoleAssign.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using HslCommunication; using Newtonsoft.Json.Linq; +using HslCommunication.Core; namespace CommonLibrary { diff --git a/CommonLibrary/AccountSupport/ServerAccount.cs b/CommonLibrary/AccountSupport/ServerAccount.cs index 0f9ec59..d1dcbe0 100644 --- a/CommonLibrary/AccountSupport/ServerAccount.cs +++ b/CommonLibrary/AccountSupport/ServerAccount.cs @@ -38,7 +38,7 @@ namespace CommonLibrary /// /// 一个简单的混合锁，相比Lock速度更快 /// - private HslCommunication.SimpleHybirdLock hybirdLock = new HslCommunication.SimpleHybirdLock(); + private HslCommunication.Core.SimpleHybirdLock hybirdLock = new HslCommunication.Core.SimpleHybirdLock(); #endregion diff --git a/CommonLibrary/BasicSupport/SoftSettings.cs b/CommonLibrary/BasicSupport/SoftSettings.cs index 73bfc17..fa15286 100644 --- a/CommonLibrary/BasicSupport/SoftSettings.cs +++ b/CommonLibrary/BasicSupport/SoftSettings.cs @@ -90,7 +90,7 @@ namespace CommonLibrary /// /// 列表锁 /// - private HslCommunication.SimpleHybirdLock hybirdLock = new HslCommunication.SimpleHybirdLock(); + private HslCommunication.Core.SimpleHybirdLock hybirdLock = new HslCommunication.Core.SimpleHybirdLock(); /// /// 判断一个客户端的ID能否登录到系统 diff --git a/CommonLibrary/CommonLibrary.csproj b/CommonLibrary/CommonLibrary.csproj index fae2aa0..1db465d 100644 --- a/CommonLibrary/CommonLibrary.csproj +++ b/CommonLibrary/CommonLibrary.csproj @@ -30,8 +30,8 @@ 4 - - ..\packages\HslCommunication.3.17.15\lib\HslCommunication.dll + + ..\packages\HslCommunication.4.0.0\lib\HslCommunication.dll ..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll diff --git a/CommonLibrary/UserSystem.cs b/CommonLibrary/UserSystem.cs index 12cd36d..81771eb 100644 --- a/CommonLibrary/UserSystem.cs +++ b/CommonLibrary/UserSystem.cs @@ -44,7 +44,7 @@ namespace CommonLibrary **************************************************************************/ - SoftBasic.FrameworkVersion = new SystemVersion("1.7.7"); + SoftBasic.FrameworkVersion = new SystemVersion("1.7.8"); } diff --git a/CommonLibrary/packages.config b/CommonLibrary/packages.config index 42871d2..fb2e2ab 100644 --- a/CommonLibrary/packages.config +++ b/CommonLibrary/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/HslCommunicationNetTestTool/Form1.cs b/HslCommunicationNetTestTool/Form1.cs index cd75f84..f0c4952 100644 --- a/HslCommunicationNetTestTool/Form1.cs +++ b/HslCommunicationNetTestTool/Form1.cs @@ -140,7 +140,7 @@ namespace HslCommunicationNetTestTool for (int i = 0; i < count; i++) { - OperateResultString resultString = CurrentClient.ReadFromServer(handle, textBox2.Text); + OperateResult resultString = CurrentClient.ReadFromServer(handle, textBox2.Text); if (resultString.IsSuccess) { diff --git a/HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj b/HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj index fac93f2..1fc2270 100644 --- a/HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj +++ b/HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj @@ -31,8 +31,8 @@ 4 - - ..\packages\HslCommunication.3.17.15\lib\HslCommunication.dll + + ..\packages\HslCommunication.4.0.0\lib\HslCommunication.dll ..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll diff --git a/HslCommunicationNetTestTool/packages.config b/HslCommunicationNetTestTool/packages.config index 42871d2..fb2e2ab 100644 --- a/HslCommunicationNetTestTool/packages.config +++ b/HslCommunicationNetTestTool/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/软件系统客户端Wpf/MainWindow.xaml.cs b/软件系统客户端Wpf/MainWindow.xaml.cs index 26ed47b..34f0794 100644 --- a/软件系统客户端Wpf/MainWindow.xaml.cs +++ b/软件系统客户端Wpf/MainWindow.xaml.cs @@ -223,7 +223,7 @@ namespace 软件系统客户端Wpf { FormAccountManage fam = new FormAccountManage(() => { - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户); if (result.IsSuccess) return result.Content; else return result.ToMessageShowString(); }, m => UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更细账户, m).IsSuccess); @@ -275,7 +275,7 @@ namespace 软件系统客户端Wpf { using (FormSuper fs = new FormSuper(() => { - OperateResultBytes result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.性能计数, new byte[0]); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.性能计数, new byte[0]); //解析 if (result.IsSuccess) { diff --git a/软件系统客户端Wpf/packages.config b/软件系统客户端Wpf/packages.config index 20acd7c..df19f5e 100644 --- a/软件系统客户端Wpf/packages.config +++ b/软件系统客户端Wpf/packages.config @@ -1,6 +1,6 @@  - + diff --git a/软件系统客户端Wpf/软件系统客户端Wpf.csproj b/软件系统客户端Wpf/软件系统客户端Wpf.csproj index 3ea9b63..984bf8f 100644 --- a/软件系统客户端Wpf/软件系统客户端Wpf.csproj +++ b/软件系统客户端Wpf/软件系统客户端Wpf.csproj @@ -40,8 +40,8 @@ ..\CommonLibrary\bin\Debug\CommonLibrary.dll - - ..\packages\HslCommunication.3.17.15\lib\HslCommunication.dll + + ..\packages\HslCommunication.4.0.0\lib\HslCommunication.dll ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll diff --git a/软件系统客户端模版/FormMainWindow.cs b/软件系统客户端模版/FormMainWindow.cs index feb18fa..fc878dc 100644 --- a/软件系统客户端模版/FormMainWindow.cs +++ b/软件系统客户端模版/FormMainWindow.cs @@ -251,7 +251,7 @@ namespace 软件系统客户端模版 { FormAccountManage fam = new FormAccountManage(() => { - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户); if (result.IsSuccess) return result.Content; else return result.ToMessageShowString(); }, m => UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更细账户, m).IsSuccess); @@ -309,7 +309,7 @@ namespace 软件系统客户端模版 { using (FormSuper fs = new FormSuper(() => { - OperateResultBytes result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.性能计数, new byte[0]); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.性能计数, new byte[0]); //解析 if (result.IsSuccess) { diff --git a/软件系统客户端模版/packages.config b/软件系统客户端模版/packages.config index 42871d2..fb2e2ab 100644 --- a/软件系统客户端模版/packages.config +++ b/软件系统客户端模版/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/软件系统客户端模版/软件系统客户端模版.csproj b/软件系统客户端模版/软件系统客户端模版.csproj index 49f2b36..369956c 100644 --- a/软件系统客户端模版/软件系统客户端模版.csproj +++ b/软件系统客户端模版/软件系统客户端模版.csproj @@ -39,8 +39,8 @@ ..\CommonLibrary\bin\Debug\CommonLibrary.dll - - ..\packages\HslCommunication.3.17.15\lib\HslCommunication.dll + + ..\packages\HslCommunication.4.0.0\lib\HslCommunication.dll ..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll diff --git a/软件系统服务端模版/BasicSupport/NetAccountManager.cs b/软件系统服务端模版/BasicSupport/NetAccountManager.cs index 1ceb462..09a7dec 100644 --- a/软件系统服务端模版/BasicSupport/NetAccountManager.cs +++ b/软件系统服务端模版/BasicSupport/NetAccountManager.cs @@ -1,5 +1,5 @@ using CommonLibrary; -using HslCommunication; +using HslCommunication.Core; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -73,7 +73,7 @@ namespace 软件系统服务端模版.BasicSupport private List OnlineClients = new List(); // 所有在线客户端的列表 private SimpleHybirdLock hybirdLock = new SimpleHybirdLock(); // 操作列表的混合锁 - private string m_ClientsOnlineCache = "[]"; // 在线客户端的缓存 + private string m_ClientsOnlineCache = "[]"; // 在线客户端的缓存 #endregion } diff --git a/软件系统服务端模版/FormServerWindow.cs b/软件系统服务端模版/FormServerWindow.cs index 854fe38..afdfa56 100644 --- a/软件系统服务端模版/FormServerWindow.cs +++ b/软件系统服务端模版/FormServerWindow.cs @@ -14,6 +14,7 @@ using HslCommunication.BasicFramework; using System.Diagnostics; using HslCommunication.LogNet; using HslCommunication; +using HslCommunication.Core; using 软件系统服务端模版.BasicSupport; @@ -929,7 +930,6 @@ namespace 软件系统服务端模版 net_socket_server.ClientOnline += new NetBase.IEDelegate(Net_socket_server_ClientOnline);// 客户端上线触发 net_socket_server.ClientOffline += new NetBase.IEDelegate(Net_socket_server_ClientOffline);// 客户端下线触发，包括异常掉线 net_socket_server.AllClientsStatusChange += new NetBase.IEDelegate(Net_socket_server_AllClientsStatusChange);// 客户端上下线变化时触发 - net_socket_server.MessageAlerts += new NetBase.IEDelegate(Net_socket_server_MessageAlerts);// 服务器产生提示消息触发 net_socket_server.AcceptByte += new NetBase.IEDelegate(Net_socket_server_AcceptByte);// 服务器接收到字节数据触发 net_socket_server.AcceptString += new NetBase.IEDelegate(Net_socket_server_AcceptString);// 服务器接收到字符串数据触发 net_socket_server.ServerStart(UserSystem.Port_Main_Net); @@ -984,11 +984,7 @@ namespace 软件系统服务端模版 { //如果此处充斥大量if语句，影响观感，则考虑进行指令头分类操作，客户端异步发送的字节数组都会到此处处理 } - - private void Net_socket_server_MessageAlerts(string object1) - { - UserInterfaceMessageRender(object1 + Environment.NewLine); - } + private void Net_socket_server_ClientOffline(AsyncStateOne object1, string object2) { diff --git a/软件系统服务端模版/packages.config b/软件系统服务端模版/packages.config index 42871d2..fb2e2ab 100644 --- a/软件系统服务端模版/packages.config +++ b/软件系统服务端模版/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/软件系统服务端模版/软件系统服务端模版.csproj b/软件系统服务端模版/软件系统服务端模版.csproj index 1e46c69..6840415 100644 --- a/软件系统服务端模版/软件系统服务端模版.csproj +++ b/软件系统服务端模版/软件系统服务端模版.csproj @@ -35,8 +35,8 @@ ..\CommonLibrary\bin\Debug\CommonLibrary.dll - - ..\packages\HslCommunication.3.17.15\lib\HslCommunication.dll + + ..\packages\HslCommunication.4.0.0\lib\HslCommunication.dll ..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll diff --git a/软件系统浏览器模版/Controllers/AccountController.cs b/软件系统浏览器模版/Controllers/AccountController.cs index b7a00af..9d90e29 100644 --- a/软件系统浏览器模版/Controllers/AccountController.cs +++ b/软件系统浏览器模版/Controllers/AccountController.cs @@ -44,7 +44,7 @@ namespace 软件系统浏览器模版.Controllers public ActionResult Login(FormCollection fc) { //请求指令头数据，该数据需要更具实际情况更改 - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.维护检查); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.维护检查); if (result.IsSuccess) { //例如返回结果为1说明允许登录，0则说明服务器处于维护中，并将信息显示 @@ -230,7 +230,7 @@ namespace 软件系统浏览器模版.Controllers { UserAccount.PasswordText, inputPassword1 } }; - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.密码修改, json.ToString()); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.密码修改, json.ToString()); if (result.IsSuccess) { return PartialViewMessage(MessageBoxStyle.success, "密码修改成功！"); @@ -281,7 +281,7 @@ namespace 软件系统浏览器模版.Controllers account.Grade = int.Parse(fc["grade"]); account.LoginEnable = bool.Parse(fc["loginEnable"]); account.ForbidMessage = fc["reason"]; - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.注册账号, account.ToJsonString()); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.注册账号, account.ToJsonString()); if (result.IsSuccess && result.Content == "1") { return PartialViewMessage(MessageBoxStyle.success, "账户注册成功！"); diff --git a/软件系统浏览器模版/Controllers/HomeController.cs b/软件系统浏览器模版/Controllers/HomeController.cs index 1800f3a..be028a3 100644 --- a/软件系统浏览器模版/Controllers/HomeController.cs +++ b/软件系统浏览器模版/Controllers/HomeController.cs @@ -105,7 +105,7 @@ namespace 软件系统浏览器模版.Controllers if (Request.IsAjaxRequest()) { //对建议进行保存 - HslCommunication.OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.意见反馈, UserClient.UserAccount.UserName + ":" + advice); + HslCommunication.OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.意见反馈, UserClient.UserAccount.UserName + ":" + advice); if (result.IsSuccess) { return PartialViewMessage(MessageBoxStyle.success, "建议提交成功！"); @@ -154,7 +154,7 @@ namespace 软件系统浏览器模版.Controllers } - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更新公告, announcement); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更新公告, announcement); if (result.IsSuccess) { UserClient.Announcement = announcement; @@ -181,7 +181,7 @@ namespace 软件系统浏览器模版.Controllers [AuthorizeUser] public ActionResult ManagementAccount() { - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户); if(result.IsSuccess) { ViewData["accounts"] = result.Content; @@ -210,7 +210,7 @@ namespace 软件系统浏览器模版.Controllers UserAccount account = Session[SessionItemsDescription.UserAccount] as UserAccount; - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更细账户, Accounts); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更细账户, Accounts); if (result.IsSuccess) { return PartialViewMessage(MessageBoxStyle.success, "账户更改成功！"); @@ -260,7 +260,7 @@ namespace 软件系统浏览器模版.Controllers } - OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.群发消息, SendMessage); + OperateResult result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.群发消息, SendMessage); if (result.IsSuccess) { UserClient.Announcement = SendMessage; diff --git a/软件系统浏览器模版/packages.config b/软件系统浏览器模版/packages.config index 6dcb823..113d09e 100644 --- a/软件系统浏览器模版/packages.config +++ b/软件系统浏览器模版/packages.config @@ -2,7 +2,7 @@ - + diff --git a/软件系统浏览器模版/软件系统浏览器模版.csproj b/软件系统浏览器模版/软件系统浏览器模版.csproj index 00ca8f1..f9bc7f9 100644 --- a/软件系统浏览器模版/软件系统浏览器模版.csproj +++ b/软件系统浏览器模版/软件系统浏览器模版.csproj @@ -57,8 +57,8 @@ False ..\CommonLibrary\bin\Debug\CommonLibrary.dll - - ..\packages\HslCommunication.3.17.15\lib\HslCommunication.dll + + ..\packages\HslCommunication.4.0.0\lib\HslCommunication.dll ..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.4.0\lib\net45\Microsoft.AI.Agent.Intercept.dll