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用户登录