kefengwei · oakuraape · Nov 3, 2020 · Nov 3, 2020 · Nov 18, 2020 · Nov 30, 2020
diff --git a/angular/package.json b/angular/package.json
@@ -15,11 +15,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.0.5",
-    "@abp/ng.identity": "~3.0.5",
-    "@abp/ng.setting-management": "~3.0.5",
-    "@abp/ng.tenant-management": "~3.0.5",
-    "@abp/ng.theme.basic": "~3.0.5",
+    "@abp/ng.account": "~3.3.1",
+    "@abp/ng.identity": "~3.3.1",
+    "@abp/ng.setting-management": "~3.3.1",
+    "@abp/ng.tenant-management": "~3.3.1",
+    "@abp/ng.theme.basic": "~3.3.1",
     "@angular/animations": "~10.0.0",
     "@angular/common": "~10.0.0",
     "@angular/compiler": "~10.0.0",

diff --git a/host/EasyAbp.IdentityServerAdmin.Host.Shared/EasyAbp.IdentityServerAdmin.Host.Shared.csproj b/host/EasyAbp.IdentityServerAdmin.Host.Shared/EasyAbp.IdentityServerAdmin.Host.Shared.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>EasyAbp.IdentityServerAdmin</RootNamespace>
   </PropertyGroup>
 

diff --git a/.../EasyAbp.IdentityServerAdmin.HttpApi.Host/EasyAbp.IdentityServerAdmin.HttpApi.Host.csproj b/.../EasyAbp.IdentityServerAdmin.HttpApi.Host/EasyAbp.IdentityServerAdmin.HttpApi.Host.csproj
@@ -3,27 +3,30 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>EasyAbp.IdentityServerAdmin</RootNamespace>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <UserSecretsId>EasyAbp.IdentityServerAdmin-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.4.1-dev-00188" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0-dev-00905" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.5" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="3.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.0.0-rc.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...yAbp.IdentityServerAdmin.IdentityServer/EasyAbp.IdentityServerAdmin.IdentityServer.csproj b/...yAbp.IdentityServerAdmin.IdentityServer/EasyAbp.IdentityServerAdmin.IdentityServer.csproj
@@ -1,50 +1,53 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>EasyAbp.IdentityServerAdmin</RootNamespace>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <UserSecretsId>EasyAbp.IdentityServerAdmin-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.4.1-dev-00188" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0-dev-00905" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.5" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AuditLogging.MongoDB" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Account.Application" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Identity.MongoDB" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.IdentityServer.MongoDB" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.MongoDB" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Identity.Application" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.SettingManagement.MongoDB" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="3.0.5" />
-    <PackageReference Include="Volo.Abp.TenantManagement.MongoDB" Version="3.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AuditLogging.MongoDB" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Account.Application" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Identity.MongoDB" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.IdentityServer.MongoDB" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.MongoDB" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Identity.Application" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.SettingManagement.MongoDB" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="4.0.0-rc.4" />
+    <PackageReference Include="Volo.Abp.TenantManagement.MongoDB" Version="4.0.0-rc.4" />
     <ProjectReference Include="..\..\src\EasyAbp.IdentityServerAdmin.Application.Contracts\EasyAbp.IdentityServerAdmin.Application.Contracts.csproj" />
     <ProjectReference Include="..\EasyAbp.IdentityServerAdmin.Host.Shared\EasyAbp.IdentityServerAdmin.Host.Shared.csproj" />
   </ItemGroup>

diff --git a/...bp.IdentityServerAdmin.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/...bp.IdentityServerAdmin.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs
@@ -142,7 +142,7 @@ private async Task<Client> CreateClientAsync(
             string postLogoutRedirectUri = null,
             IEnumerable<string> permissions = null)
         {
-            var client = await _clientRepository.FindByCliendIdAsync(name);
+            var client = await _clientRepository.FindByClientIdAsync(name);
             if (client == null)
             {
                 client = await _clientRepository.InsertAsync(

diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/package.json b/host/EasyAbp.IdentityServerAdmin.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~3.3.1"
   }
-}
+}
diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/core/abp.js b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/core/abp.js
@@ -689,7 +689,7 @@ var abp = abp || {};
     abp.security.antiForgery = abp.security.antiForgery || {};
 
     abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN';
-    abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN';
+    abp.security.antiForgery.tokenHeaderName = 'RequestVerificationToken';
 
     abp.security.antiForgery.getToken = function () {
         return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName);
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),

diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 

diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/luxon/abp.luxon.js b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/luxon/abp.luxon.js
@@ -0,0 +1,46 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);