From 1fedeaae564847aa6bf93ca2cbc26e7782de3975 Mon Sep 17 00:00:00 2001 From: "Richard.Hu" Date: Mon, 30 Apr 2018 00:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E6=96=B0=E7=9A=845.?= =?UTF-8?q?0.4=E7=89=88=E6=9C=AC=E7=9A=84HslCommunication=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=A4=A7=E5=B9=85=E5=BA=A6=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E4=BA=86=E7=BD=91=E7=BB=9C=E9=80=9A=E4=BF=A1=E7=9A=84?= =?UTF-8?q?=E6=95=88=E7=8E=87=E5=8F=8A=E7=A8=B3=E5=AE=9A=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E9=9D=A2=E8=AE=A1=E5=88=92=E5=AE=8C=E5=96=84web?= =?UTF-8?q?=E7=89=88=E5=8F=8A=E5=AE=89=E5=8D=93=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ClientsLibrary/ClientsLibrary.csproj | 9 +- ClientsLibrary/UserClient.cs | 20 +- ClientsLibrary/app.config | 11 + ClientsLibrary/packages.config | 4 +- .../BasicSupport/FormAbout.designer.cs | 1 - .../BasicSupport/FormAboutVersion.designer.cs | 1 - .../FormInputAndAction.designer.cs | 1 - .../FormPasswordCheck.designer.cs | 1 - CommonLibrary/CommonLibrary.csproj | 9 +- CommonLibrary/packages.config | 4 +- .../HslCommunicationNetTestTool.csproj | 8 +- HslCommunicationNetTestTool/packages.config | 4 +- README.md | 8 +- 软件系统客户端Wpf/App.config | 12 +- 软件系统客户端Wpf/MainWindow.xaml.cs | 25 +-- 软件系统客户端Wpf/packages.config | 4 +- 软件系统客户端Wpf/软件系统客户端Wpf.csproj | 10 +- 软件系统客户端模版/FormMainWindow.cs | 9 +- 软件系统客户端模版/app.config | 2 +- 软件系统客户端模版/packages.config | 4 +- 软件系统客户端模版/软件系统客户端模版.csproj | 8 +- .../BasicSupport/NetAccountManager.cs | 55 ++++- 软件系统服务端模版/FormServerWindow.cs | 192 ++++++------------ 软件系统服务端模版/app.config | 2 +- 软件系统服务端模版/packages.config | 4 +- 软件系统服务端模版/软件系统服务端模版.csproj | 8 +- 软件系统浏览器模版/Web.config | 2 +- 软件系统浏览器模版/packages.config | 4 +- 软件系统浏览器模版/软件系统浏览器模版.csproj | 8 +- 29 files changed, 209 insertions(+), 221 deletions(-) create mode 100644 ClientsLibrary/app.config 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 @@ ..\CommonLibrary\bin\Debug\CommonLibrary.dll - - ..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll + + ..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll - - ..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll @@ -256,6 +256,7 @@ + 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 /// /// 本软件的当前版本，用来验证更新的关键依据 /// - public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.171026"); + public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.180429"); /// @@ -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 /// /// 用于访问服务器数据的网络对象类，必须修改这个端口参数，否则运行失败 /// - 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, }; /// /// 用于使用udp向服务器进行发送即时可丢失数据的对象 /// - 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 /// 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 /// 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 @@ + + + + + + + + + + + \ 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 @@  - - + + \ 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 @@ 4 - - ..\packages\HslCommunication.4.3.0\lib\net35\HslCommunication.dll + + ..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll - - ..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll @@ -168,7 +168,6 @@ -