Merge pull request #66 from EasyAbp/develop

1.4.1
EasyAbp · May 6, 2021 · 93ad7ff · 93ad7ff
2 parents b832d59 + 0b83925
commit 93ad7ff
Show file tree

Hide file tree

Showing 39 changed files with 1,181 additions and 1,072 deletions.
diff --git a/angular/package.json b/angular/package.json
@@ -12,11 +12,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.3.2",
-    "@abp/ng.theme.basic": "~4.2.2",
-    "@abp/ng.identity": "~4.2.2",
-    "@abp/ng.tenant-management": "~4.2.2",
-    "@abp/ng.setting-management": "~4.2.2",
+    "@abp/ng.account": "~4.3.0",
+    "@abp/ng.theme.basic": "~4.3.0",
+    "@abp/ng.identity": "~4.3.0",
+    "@abp/ng.tenant-management": "~4.3.0",
+    "@abp/ng.setting-management": "~4.3.0",
     "@angular/animations": "~8.2.14",
     "@angular/common": "~8.2.14",
     "@angular/compiler": "~8.2.14",

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpApp.Application.Contracts.csproj b/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpApp.Application.Contracts.csproj
@@ -13,12 +13,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.ObjectExtending" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.ObjectExtending" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpApp.Application.csproj b/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpApp.Application.csproj
@@ -14,12 +14,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.Application" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Emailing" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.Application" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Account.Application" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Emailing" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.Application" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.3.0" />
     <ProjectReference Include="..\MyAbpApp.Application.Contracts\MyAbpApp.Application.Contracts.csproj" />
     <ProjectReference Include="..\MyAbpApp.EntityFrameworkCore.DbMigrations\MyAbpApp.EntityFrameworkCore.DbMigrations.csproj" />
   </ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain/MyAbpApp.Domain.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain/MyAbpApp.Domain.csproj
@@ -12,16 +12,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Emailing" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.Domain" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Emailing" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.Domain" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj b/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj
@@ -9,15 +9,15 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MyAbpApp.Domain\MyAbpApp.Domain.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.HttpApi.Client/MyAbpApp.HttpApi.Client.csproj b/sample/MyAbpApp/src/MyAbpApp.HttpApi.Client/MyAbpApp.HttpApi.Client.csproj
@@ -12,11 +12,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.HttpApi/MyAbpApp.HttpApi.csproj b/sample/MyAbpApp/src/MyAbpApp.HttpApi/MyAbpApp.HttpApi.csproj
@@ -13,11 +13,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
@@ -45,15 +45,15 @@
     <ProjectReference Include="..\MyAbpApp.Application\MyAbpApp.Application.csproj" />
     <ProjectReference Include="..\MyAbpApp.HttpApi\MyAbpApp.HttpApi.csproj" />
     <ProjectReference Include="..\MyAbpApp.EntityFrameworkCore.DbMigrations\MyAbpApp.EntityFrameworkCore.DbMigrations.csproj" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.Web" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Web" Version="4.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="4.2.1" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Swashbuckle" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.Web" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Web" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpAppWebModule.cs b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpAppWebModule.cs
@@ -214,7 +214,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
             }
 
             app.UseCorrelationId();
-            app.UseVirtualFiles();
+            app.UseStaticFiles();
             app.UseRouting();
             app.UseAuthentication();
             app.UseJwtTokenMiddleware();

diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/package.json b/sample/MyAbpApp/src/MyAbpApp.Web/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~4.2.2"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~4.3.0"
   }
 }
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/wwwroot/libs/abp/core/abp.js b/sample/MyAbpApp/src/MyAbpApp.Web/wwwroot/libs/abp/core/abp.js
@@ -684,6 +684,13 @@ var abp = abp || {};
         document.cookie = cookieValue;
     }
 
+    /**
+     * Escape HTML to help prevent XSS attacks. 
+     */
+    abp.utils.htmlEscape = function (html) {
+        return typeof html === 'string' ? html.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;') : html;
+    }
+
     /* SECURITY ***************************************/
     abp.security = abp.security || {};
     abp.security.antiForgery = abp.security.antiForgery || {};

diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/wwwroot/libs/abp/jquery/abp.jquery.js b/sample/MyAbpApp/src/MyAbpApp.Web/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -99,19 +99,28 @@ var abp = abp || {};
         options.success = undefined;
         options.error = undefined;
 
-        return $.Deferred(function ($dfd) {
-            $.ajax(options)
+        var xhr = null;
+        var promise = $.Deferred(function ($dfd) {
+            xhr = $.ajax(options)
                 .done(function (data, textStatus, jqXHR) {
                     $dfd.resolve(data);
                     userOptions.success && userOptions.success(data);
                 }).fail(function (jqXHR) {
+                    if(jqXHR.status === 0 || jqXHR.statusText === 'abort') {
+                        //ajax request is abort, ignore error handle.
+                        return;
+                    }
                     if (jqXHR.getResponseHeader('_AbpErrorFormat') === 'true') {
                         abp.ajax.handleAbpErrorResponse(jqXHR, userOptions, $dfd);
                     } else {
                         abp.ajax.handleNonAbpErrorResponse(jqXHR, userOptions, $dfd);
                     }
                 });
-        });
+        }).promise();
+
+        promise['jqXHR'] = xhr;
+
+        return promise;
     };
 
     $.extend(abp.ajax, {