dathlin/ClientServerProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web 项目BUG修复，v1.5.2

Browse Source
This commit is contained in:
dathlin
2017-10-02 10:00:03 +08:00
parent 5320a12c5b
commit 9674029e3e
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CommonLibrary/ProtocolSupport/CommonProtocol.cs
View File

@@ -44,7 +44,7 @@ namespace CommonLibrary
*
**************************************************************************/
SoftBasic.FrameworkVersion = new SystemVersion("1.5.1");
SoftBasic.FrameworkVersion = new SystemVersion("1.5.2");
}

4
软件系统浏览器模版/Controllers/AccountController.cs
View File

@@ -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)

2
软件系统浏览器模版/Views/Account/Login.cshtml
View File

@@ -21,7 +21,7 @@
@using (Html.BeginForm("Login", "Account", FormMethod.Post, new { @class = "form-horizontal" }))
{
@Html.AntiForgeryToken()
<span class="heading">@CommonLibrary.Resource.StringResouce.SoftName<small style="font-family:'Microsoft YaHei';color:#a1a1a1;font-size:15px">用户登录</small></span>
<span class="heading">@CommonLibrary.SoftResources.StringResouce.SoftName<small style="font-family:'Microsoft YaHei';color:#a1a1a1;font-size:15px">用户登录</small></span>
<div class="form-group">
<input type="text" class="form-control" name="UserName" placeholder="用户名" required>
<i class="fa fa-user"></i>

6
软件系统浏览器模版/Views/Home/About.cshtml
View File

@@ -5,17 +5,17 @@
<dl class="dl-horizontal">
<dt>软件名称</dt>
<dd>@CommonLibrary.Resource.StringResouce.SoftName</dd>
<dd>@CommonLibrary.SoftResources.StringResouce.SoftName</dd>
<dt>版本号</dt>
<dd>V<span>@ClientsLibrary.UserClient.CurrentVersion.ToString()</span></dd>
<dt>版权声明</dt>
<dd>本软件著作权归<span>@CommonLibrary.Resource.StringResouce.SoftCopyRight</span>所有</dd>
<dd>本软件著作权归<span>@CommonLibrary.SoftResources.StringResouce.SoftCopyRight</span>所有</dd>
<dt>基础框架版本</dt>
<dd>V<span>@HslCommunication.BasicFramework.SoftBasic.FrameworkVersion.ToString()</span></dd>
<dt>框架版本</dt>
<dd>本系统框架由<a href="http://www.cnblogs.com/dathlin/">Richard.Hu</a>提供技术支持</dd>
<dt>框架开源地址</dt>
<dd><a href="https://github.com/dathlin/C-S-">https://github.com/dathlin/C-S-</a></dd>
<dd><a href="https://github.com/dathlin/ClientServerProject">https://github.com/dathlin/ClientServerProject</a></dd>
<dt>JSON.Net</dt>
<dd><a href="http://www.newtonsoft.com/json">http://www.newtonsoft.com/json</a></dd>
<dt>Wpf基础架构</dt>

6
软件系统浏览器模版/Views/Shared/_Layout.cshtml
View File

@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>@ViewBag.Title - @CommonLibrary.Resource.StringResouce.SoftName</title>
<title>@ViewBag.Title - @CommonLibrary.SoftResources.StringResouce.SoftName</title>
@Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr")
</head>
@@ -17,7 +17,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
@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" })
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
@@ -68,7 +68,7 @@
}
<small>
&copy; @year - @CommonLibrary.Resource.StringResouce.SoftName | 本软件著作权归<span>@CommonLibrary.Resource.StringResouce.SoftCopyRight</span>所有
&copy; @year - @CommonLibrary.SoftResources.StringResouce.SoftName | 本软件著作权归<span>@CommonLibrary.SoftResources.StringResouce.SoftCopyRight</span>所有
| 服务器版本：V @ClientsLibrary.UserClient.CurrentVersion.ToString()
</small>
</p>