+
+
+
+
-
管理员登录
+
@AR["Admin.Login.Title"]
-
+
-
+
-
+
- 登录
+ @AR["Admin.Login.Submit"]
@@ -57,6 +70,19 @@
+
diff --git a/tools/NcfSimulatedSite/Senparc.Areas.Admin/Areas/Admin/Pages/Login.cshtml.cs b/tools/NcfSimulatedSite/Senparc.Areas.Admin/Areas/Admin/Pages/Login.cshtml.cs
index 9e7fd6afe..7d3d10f20 100644
--- a/tools/NcfSimulatedSite/Senparc.Areas.Admin/Areas/Admin/Pages/Login.cshtml.cs
+++ b/tools/NcfSimulatedSite/Senparc.Areas.Admin/Areas/Admin/Pages/Login.cshtml.cs
@@ -17,6 +17,7 @@
using Senparc.Ncf.Core.Config;
using Senparc.Xncf.Tenant.Domain.Services;
using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
namespace Senparc.Areas.Admin.Areas.Admin.Pages
{
@@ -43,10 +44,13 @@ public class LoginModel : BasePageModel/* BaseAdminPageModel*/
private readonly AdminUserInfoService _userInfoService;
private readonly TenantInfoService _tenantInfoService;
- public LoginModel(AdminUserInfoService userInfoService, TenantInfoService tenantInfoService)
+ private readonly IStringLocalizer
_localizer;
+ public LoginModel(AdminUserInfoService userInfoService, TenantInfoService tenantInfoService,
+ IStringLocalizer localizer)
{
this._userInfoService = userInfoService;
this._tenantInfoService = tenantInfoService;
+ this._localizer = localizer;
}
@@ -124,14 +128,14 @@ public async Task OnPostLoginAsync([FromBody] LoginInDto loginInD
if (tenantInfo == null)
{
SenparcTrace.SendCustomLog("登录失败", $", 错误:租户名称错误:" + tenantKey);
- return Ok("pwd", false, $"用户名:{loginInDto.Name}, 错误:账号或密码错误!");
+ return Ok("pwd", false, _localizer["Admin.Login.Error.InvalidCredentials"]);
}
var requestTenantInfo = this._tenantInfoService.GetRequestTenantInfo(tenantInfo);
if (!_userInfoService.SetTenantInfo(requestTenantInfo))
{
SenparcTrace.SendCustomLog("租户配置失败", $", 错误:租户名配置错误:" + tenantKey);
- return Ok("pwd", false, $"用户名:{loginInDto.Name}, 错误:账号或密码错误!");
+ return Ok("pwd", false, _localizer["Admin.Login.Error.InvalidCredentials"]);
}
tenantKey = tenantInfo.TenantKey;
@@ -147,7 +151,7 @@ public async Task OnPostLoginAsync([FromBody] LoginInDto loginInD
if (userInfo == null)
{
SenparcTrace.SendCustomLog("登录失败", $"用户名:{loginInDto.Name}, 错误:账号或密码错误!101");
- return Ok("pwd", false, "账号或密码错误!");
+ return Ok("pwd", false, _localizer["Admin.Login.Error.InvalidCredentials"]);
//ModelState.AddModelError(nameof(this.Password), "账号或密码错误!");
}
@@ -158,7 +162,7 @@ public async Task OnPostLoginAsync([FromBody] LoginInDto loginInD
{
//ModelState.AddModelError(nameof(this.Password), "账号或密码错误!");
SenparcTrace.SendCustomLog("登录失败", $"用户名:{loginInDto.Name}, 错误:账号或密码错误!102");
- return Ok("pwd", false, "账号或密码错误!");
+ return Ok("pwd", false, _localizer["Admin.Login.Error.InvalidCredentials"]);
}
return Ok(true);
@@ -172,7 +176,7 @@ public async Task OnPostLoginAsync([FromBody] LoginInDto loginInD
{
SenparcTrace.SendCustomLog("登录失败", $"用户名:{loginInDto.Name}, 错误:{ex.Message}");
//其他异常,不返回错误信息
- return Ok("pwd", false, "账号或密码错误!");
+ return Ok("pwd", false, _localizer["Admin.Login.Error.InvalidCredentials"]);
}
}
diff --git a/tools/NcfSimulatedSite/Senparc.Areas.Admin/Areas/Admin/Pages/Menu/Index.cshtml b/tools/NcfSimulatedSite/Senparc.Areas.Admin/Areas/Admin/Pages/Menu/Index.cshtml
index e33e0e126..69fae80d9 100644
--- a/tools/NcfSimulatedSite/Senparc.Areas.Admin/Areas/Admin/Pages/Menu/Index.cshtml
+++ b/tools/NcfSimulatedSite/Senparc.Areas.Admin/Areas/Admin/Pages/Menu/Index.cshtml
@@ -1,19 +1,19 @@
@page
@model Senparc.Areas.Admin.Areas.Admin.Pages.MenuIndexModel
@{
- ViewData["Title"] = "菜单管理"; Layout = "_Layout_Vue";
+ ViewData["Title"] = AR["Menu.管理"]; Layout = "_Layout_Vue";
}
@section Style{
}
@section breadcrumbs {
- 系统管理
- 菜单列表
+ @AR["Common.系统管理"]
+ @AR["Menu.列表"]
}
- 增加菜单
+ @AR["Menu.增加菜单"]
+ label="@AR["Menu.名称"]">
+ label="@AR["Common.备注"]">
+ label="@AR["Common.说明"]">
+ label="@AR["Common.添加时间"]">
{{formaTableTime(scope.row.addTime)}}
-
+
编辑
+ @@click="handleEdit(scope.$index, scope.row,'edit')">@AR["Common.编辑"]
增加下一级
-
- 删除
+ @@click="handleEdit(scope.$index, scope.row,'addNext')">@AR["Menu.增加下级"]
+
+ @AR["Common.删除"]
@@ -64,50 +64,50 @@
label-position="left"
label-width="100px"
style="max-width: 400px; margin-left:50px;">
-
+
-
+
-
+
-
+
- 菜单
- 页面
- 按钮
+ @AR["Menu.菜单"]
+ @AR["Menu.页面"]
+ @AR["Menu.按钮"]
-
+
-
+
-
+
-
+
-
+
- 选择图标
+ @AR["Menu.选择图标"]
-
+