From 6ed08665d9521e2de8017f4050c9ee02ca8ac273 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Mon, 17 Aug 2020 17:15:33 +0800
Subject: [PATCH] create account area folder

---
 .../Account}/Controllers/ErrorController.cs           | 11 +++++++----
 .../Volo.Abp.Account.Web.IdentityServer.csproj        |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)
 rename modules/account/src/Volo.Abp.Account.Web.IdentityServer/{ => Areas/Account}/Controllers/ErrorController.cs (85%)

diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Controllers/ErrorController.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Areas/Account/Controllers/ErrorController.cs
similarity index 85%
rename from modules/account/src/Volo.Abp.Account.Web.IdentityServer/Controllers/ErrorController.cs
rename to modules/account/src/Volo.Abp.Account.Web.IdentityServer/Areas/Account/Controllers/ErrorController.cs
index 5c7572d74d..1262d0c42c 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Controllers/ErrorController.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Areas/Account/Controllers/ErrorController.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Net;
+using System.Threading.Tasks;
 using AutoMapper.Internal;
 using IdentityServer4.Models;
 using IdentityServer4.Services;
@@ -11,7 +12,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Views.Error;
 using Volo.Abp.Http;
 
-namespace Volo.Abp.Account.Web.Controllers
+namespace Volo.Abp.Account.Web.Areas.Account.Controllers
 {
     [Area("account")]
     public class ErrorController : AbpController
@@ -43,10 +44,12 @@ namespace Volo.Abp.Account.Web.Controllers
                 errorMessage.ErrorDescription = null;
             }
 
-            return View(GetErrorPageUrl(500), new AbpErrorViewModel
+            const int statusCode = (int)HttpStatusCode.InternalServerError;
+
+            return View(GetErrorPageUrl(statusCode), new AbpErrorViewModel
             {
                 ErrorInfo = new RemoteServiceErrorInfo(errorMessage.Error, errorMessage.ErrorDescription),
-                HttpStatusCode = 500
+                HttpStatusCode = statusCode
             });
         }
 
diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj
index 566d40b3f9..698f1f3fc9 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj
@@ -37,4 +37,8 @@
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.6" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Areas\Account" />
+  </ItemGroup>
+
 </Project>