Merge branch 'dev' into maliming/FodyConfigureAwait

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

@@ -79,6 +79,7 @@
     "UniqueComputerId": "Unique computer id",
     "LastSeenDate": "Last seen date",
     "{0}Computer{1}WillBeRemovedFromRecords": "Computer of {0} ({1}) will be removed from records",
+    "OrganizationDeletionWarningMessage": "Organization will be deleted",
     "This{0}AlreadyExistInThisOrganization": "This {0} already exist in this organization"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json

@@ -1,6 +1,8 @@
 {
   "culture": "zh-Hans",
   "texts": {
+    "Permission:Organizations": "组织",
+    "Permission:Manage": "管理组织",
     "Permission:NpmPackages": "NPM包",
     "Permission:NugetPackages": "Nuget包",
     "Permission:Maintenance": "维护",
@@ -11,6 +13,7 @@
     "Permission:Edit": "编辑",
     "Permission:Delete": "删除",
     "Permission:Create": "创建",
+    "Menu:Organizations": "组织",
     "Menu:Packages": "包",
     "NpmPackageDeletionWarningMessage": "该NPM包将会被删除. 你确定吗?",
     "NugetPackageDeletionWarningMessage": "该Nuget包将会被删除. 你确定吗?",
@@ -55,6 +58,27 @@
     "Menu:NpmPackages": "NPM包",
     "Menu:Modules": "模块",
     "Menu:Maintenance": "维护",
-    "Menu:NugetPackages": "Nuget包"
+    "Menu:NugetPackages": "Nuget包",
+    "CreateAnOrganization": "创建新组织",
+    "Organizations": "组织",
+    "LongName": "完整名称",
+    "LicenseType": "授权类型",
+    "LicenseStartTime": "授权开始时间",
+    "LicenseEndTime": "授权结束时间",
+    "AllowedDeveloperCount": "允许的开发人员数量",
+    "UserNameOrEmailAddress": "用户名或电子邮件地址",
+    "AddOwner": "添加所有者",
+    "UserName": "用户名",
+    "Email": "电子邮件地址",
+    "Developers": "开发者",
+    "AddDeveloper": "添加开发者",
+    "Create": "创建",
+    "UserNotFound": "用户不存在",
+    "{0}WillBeRemovedFromMembers": "{0} 将从成员中删除",
+    "Computers": "计算机",
+    "UniqueComputerId": "计算机唯一ID",
+    "LastSeenDate": "上次查看日期",
+    "{0}Computer{1}WillBeRemovedFromRecords": "计算机 {0} ({1}) 将从记录中删除",
+    "This{0}AlreadyExistInThisOrganization": "该组织中已经存在此 {0}"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -26,6 +26,7 @@
     "MyOrganizations": "My organizations",
     "ApiKey": "API key",
     "UserNameNotFound": "There is no user with username {0}",
-    "SuccessfullyAddedToNewsletter": "Thanks you for subscribing to our newsletter!"
+    "SuccessfullyAddedToNewsletter": "Thanks you for subscribing to our newsletter!",
+    "ManageProfile": "Manage your profile"
   }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliConsts.cs

@@ -5,5 +5,7 @@
         public const string Command = "AbpCliCommand";
 
         public const string BranchPrefix = "branch@";
+
+        public const string DocsLink = "https://docs.abp.io";
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppProTemplate.cs

@@ -10,7 +10,7 @@
         public AppProTemplate()
             : base(TemplateName)
         {
-            
+            DocumentUrl = CliConsts.DocsLink + "/en/commercial/latest";
         }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs

@@ -10,7 +10,7 @@
         public AppTemplate() 
             : base(TemplateName)
         {
-
+            DocumentUrl = CliConsts.DocsLink + "/en/abp/latest/Startup-Templates/Application";
         }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@@ -10,7 +10,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
         protected AppTemplateBase(string templateName)
             : base(templateName, DatabaseProvider.EntityFrameworkCore, UiFramework.Mvc)
         {
-            DocumentUrl = "https://docs.abp.io/en/abp/latest/Startup-Templates/Application";
         }
 
         public static bool IsAppTemplate(string templateName)

modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/AccountController.cs

@@ -35,7 +35,7 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
             ValidateLoginInfo(login);
 
             await ReplaceEmailToUsernameOfInputIfNeeds(login);
-
+            
             return GetAbpLoginResult(await _signInManager.PasswordSignInAsync(
                 login.UserNameOrEmailAddress,
                 login.Password,
@@ -44,6 +44,13 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
             ));
         }
 
+        [HttpGet]
+        [Route("logout")]
+        public virtual async Task Logout()
+        {
+           await _signInManager.SignOutAsync();
+        }
+
         [HttpPost]
         [Route("checkPassword")]
         public virtual async Task<AbpLoginResult> CheckPassword(UserLoginInfo login)