From 9674029e3e3c6544dbbbbf3640f5c3b5d0ed7dba Mon Sep 17 00:00:00 2001 From: dathlin Date: Mon, 2 Oct 2017 10:00:03 +0800 Subject: [PATCH] =?UTF-8?q?web=20=E9=A1=B9=E7=9B=AEBUG=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=8Cv1.5.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CommonLibrary/ProtocolSupport/CommonProtocol.cs | 2 +- 软件系统浏览器模版/Controllers/AccountController.cs | 4 +++- 软件系统浏览器模版/Views/Account/Login.cshtml | 2 +- 软件系统浏览器模版/Views/Home/About.cshtml | 6 +++--- 软件系统浏览器模版/Views/Shared/_Layout.cshtml | 6 +++--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CommonLibrary/ProtocolSupport/CommonProtocol.cs b/CommonLibrary/ProtocolSupport/CommonProtocol.cs index 76b6f37..35f97f9 100644 --- a/CommonLibrary/ProtocolSupport/CommonProtocol.cs +++ b/CommonLibrary/ProtocolSupport/CommonProtocol.cs @@ -44,7 +44,7 @@ namespace CommonLibrary * **************************************************************************/ - SoftBasic.FrameworkVersion = new SystemVersion("1.5.1"); + SoftBasic.FrameworkVersion = new SystemVersion("1.5.2"); } diff --git a/软件系统浏览器模版/Controllers/AccountController.cs b/软件系统浏览器模版/Controllers/AccountController.cs index c5211c8..8e8b6b4 100644 --- a/软件系统浏览器模版/Controllers/AccountController.cs +++ b/软件系统浏览器模版/Controllers/AccountController.cs @@ -65,7 +65,9 @@ namespace 软件系统浏览器模版.Controllers { { UserAccount.UserNameText, new JValue(fc["UserName"]) }, { UserAccount.PasswordText, new JValue(fc["UserPassword"]) }, - { UserAccount.LoginWayText, new JValue("webApp") } + { UserAccount.LoginWayText, new JValue("webApp") }, + { UserAccount.DeviceUniqueID, new JValue(UserClient.JsonSettings.SystemInfo) }, // 客户端唯一ID + { UserAccount.FrameworkVersion, new JValue(SoftBasic.FrameworkVersion.ToString()) } // 客户端框架版本 }; result = UserClient.Net_simplify_client.ReadFromServer(CommonLibrary.CommonHeadCode.SimplifyHeadCode.账户检查, json.ToString()); if (result.IsSuccess) diff --git a/软件系统浏览器模版/Views/Account/Login.cshtml b/软件系统浏览器模版/Views/Account/Login.cshtml index 39a7172..d467267 100644 --- a/软件系统浏览器模版/Views/Account/Login.cshtml +++ b/软件系统浏览器模版/Views/Account/Login.cshtml @@ -21,7 +21,7 @@ @using (Html.BeginForm("Login", "Account", FormMethod.Post, new { @class = "form-horizontal" })) { @Html.AntiForgeryToken() - @CommonLibrary.Resource.StringResouce.SoftName用户登录 + @CommonLibrary.SoftResources.StringResouce.SoftName用户登录
diff --git a/软件系统浏览器模版/Views/Home/About.cshtml b/软件系统浏览器模版/Views/Home/About.cshtml index 4d3f72d..a4c4ee1 100644 --- a/软件系统浏览器模版/Views/Home/About.cshtml +++ b/软件系统浏览器模版/Views/Home/About.cshtml @@ -5,17 +5,17 @@
软件名称
-
@CommonLibrary.Resource.StringResouce.SoftName
+
@CommonLibrary.SoftResources.StringResouce.SoftName
版本号
V@ClientsLibrary.UserClient.CurrentVersion.ToString()
版权声明
-
本软件著作权归@CommonLibrary.Resource.StringResouce.SoftCopyRight所有
+
本软件著作权归@CommonLibrary.SoftResources.StringResouce.SoftCopyRight所有
基础框架版本
V@HslCommunication.BasicFramework.SoftBasic.FrameworkVersion.ToString()
框架版本
本系统框架由Richard.Hu提供技术支持
框架开源地址
-
https://github.com/dathlin/C-S-
+
https://github.com/dathlin/ClientServerProject
JSON.Net
http://www.newtonsoft.com/json
Wpf基础架构
diff --git a/软件系统浏览器模版/Views/Shared/_Layout.cshtml b/软件系统浏览器模版/Views/Shared/_Layout.cshtml index 3c8a0e7..1ceebf6 100644 --- a/软件系统浏览器模版/Views/Shared/_Layout.cshtml +++ b/软件系统浏览器模版/Views/Shared/_Layout.cshtml @@ -4,7 +4,7 @@ - @ViewBag.Title - @CommonLibrary.Resource.StringResouce.SoftName + @ViewBag.Title - @CommonLibrary.SoftResources.StringResouce.SoftName @Styles.Render("~/Content/css") @Scripts.Render("~/bundles/modernizr") @@ -17,7 +17,7 @@ - @Html.ActionLink(CommonLibrary.Resource.StringResouce.SoftName, "Index", "Home", new { area = "" }, new { @class = "navbar-brand" }) + @Html.ActionLink(CommonLibrary.SoftResources.StringResouce.SoftName, "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })