diff --git a/README.md b/README.md
index 676398b72e..332cf2adc5 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ ABP is a modular framework and the Application Modules provide **pre-built appli
 
 - [**Account**](https://docs.abp.io/en/abp/latest/Modules/Account): Provides UI for the account management and allows user to login/register to the application.
 - **[Identity](https://docs.abp.io/en/abp/latest/Modules/Identity)**: Manages organization units, roles, users and their permissions, based on the Microsoft Identity library.
-- [**IdentityServer**](https://docs.abp.io/en/abp/latest/Modules/IdentityServer): Integrates to IdentityServer4.
+- [**OpenIddict**](https://docs.abp.io/en/abp/latest/Modules/OpenIddict): Integrates to OpenIddict.
 - [**Tenant Management**](https://docs.abp.io/en/abp/latest/Modules/Tenant-Management): Manages tenants for a [multi-tenant](https://docs.abp.io/en/abp/latest/Multi-Tenancy) (SaaS) application.
 
 See the [Application Modules](https://docs.abp.io/en/abp/latest/Modules/Index) document for all pre-built modules.
diff --git a/docs/en/API/Swagger-Integration.md b/docs/en/API/Swagger-Integration.md
index f60655ccfb..56ee1de50e 100644
--- a/docs/en/API/Swagger-Integration.md
+++ b/docs/en/API/Swagger-Integration.md
@@ -101,7 +101,7 @@ services.AddAbpSwaggerGen(
 
 For non MVC/Tiered applications, we need to configure Swagger with OAUTH to handle authorization.  
 
-> ABP Framework uses IdentityServer by default. To get more information about IDS, check this [documentation](../Modules/IdentityServer.md). 
+> ABP Framework uses OpenIddict by default. To get more information about OpenIddict, check this [documentation](../Modules/OpenIddict.md). 
 
 
 
diff --git a/docs/en/CLI.md b/docs/en/CLI.md
index 01f7a92b2f..e51377a59c 100644
--- a/docs/en/CLI.md
+++ b/docs/en/CLI.md
@@ -97,7 +97,7 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
         * `--separate-identity-server`The Identity Server project comes as a separate project and runs at a different endpoint. It separates the Identity Server from the API Host application. If not specified, you will have a single endpoint in the server side.
         * `--pwa`: Specifies the project as Progressive Web Application.
       * `blazor-server`: Blazor Server UI. There are some additional options for this template:
-        * `--tiered`: The Identity Server and the API Host project comes as separate projects and run at different endpoints. It has 3 startup projects: *HttpApi.Host*, *IdentityServer* and *Blazor* and and each runs on different endpoints. If not specified, you will have a single endpoint for your web project.
+        * `--tiered`: The Identity Server and the API Host project comes as separate projects and run at different endpoints. It has 3 startup projects: *HttpApi.Host*, *AuthServer* and *Blazor* and and each runs on different endpoints. If not specified, you will have a single endpoint for your web project.
       * `none`: Without UI. No front-end layer will be created. There are some additional options for this template:
         * `--separate-identity-server`: The Identity Server project comes as a separate project and runs at a different endpoint. It separates the Identity Server from the API Host application. If not specified, you will have a single endpoint in the server side.
     * `--mobile` or `-m`: Specifies the mobile application framework. If not specified, no mobile application will be created. Available options:
diff --git a/docs/en/Getting-Started-React-Native.md b/docs/en/Getting-Started-React-Native.md
index 9199d370dc..ac6325b5fd 100644
--- a/docs/en/Getting-Started-React-Native.md
+++ b/docs/en/Getting-Started-React-Native.md
@@ -65,8 +65,8 @@ A React Native application running on an Android emulator or a physical phone **
 
 ![React Native tiered project local IP entry](images/rn-tiered-local-ip.png)
 
-* Open the `appsettings.json` in the `.IdentityServer` folder. Replace the `localhost` address on the `SelfUrl` property with your local IP address.
-* Open the `launchSettings.json` in the `.IdentityServer/Properties` folder. Replace the `localhost` address on the `applicationUrl` properties with your local IP address.
+* Open the `appsettings.json` in the `.AuthServer` folder. Replace the `localhost` address on the `SelfUrl` property with your local IP address.
+* Open the `launchSettings.json` in the `.AuthServer/Properties` folder. Replace the `localhost` address on the `applicationUrl` properties with your local IP address.
 * Open the `appsettings.json` in the `.HttpApi.Host` folder. Replace the `localhost` address on the `Authority` property with your local IP address.
 * Open the `launchSettings.json` in the `.HttpApi.Host/Properties` folder. Replace the `localhost` address on the `applicationUrl` properties with your local IP address.
 
@@ -85,7 +85,7 @@ Run the backend application as described in the [getting started document](Getti
 
 {{ if Tiered == "Yes" }}
 
-> Make sure that `issuer` matches the running address of the `.IdentityServer` project, `apiUrl` matches the running address of the `.HttpApi.Host` or `.Web` project.
+> Make sure that `issuer` matches the running address of the `.AuthServer` project, `apiUrl` matches the running address of the `.HttpApi.Host` or `.Web` project.
 
 {{else}}
 
diff --git a/docs/en/Getting-Started-Running-Solution.md b/docs/en/Getting-Started-Running-Solution.md
index fe1d0de246..66230c7aef 100644
--- a/docs/en/Getting-Started-Running-Solution.md
+++ b/docs/en/Getting-Started-Running-Solution.md
@@ -15,7 +15,7 @@
 
 ### Connection String
 
-Check the **connection string** in the `appsettings.json` file under the {{if Tiered == "Yes"}}`.IdentityServer` and `.HttpApi.Host` projects{{else}}{{if UI=="MVC"}}`.Web` project{{else if UI=="BlazorServer"}}`.Blazor` project{{else}}`.HttpApi.Host` project{{end}}{{end}}.
+Check the **connection string** in the `appsettings.json` file under the {{if Tiered == "Yes"}}`.AuthServer` and `.HttpApi.Host` projects{{else}}{{if UI=="MVC"}}`.Web` project{{else if UI=="BlazorServer"}}`.Blazor` project{{else}}`.HttpApi.Host` project{{end}}{{end}}.
 
 {{ if DB == "EF" }}
 
@@ -99,7 +99,7 @@ Right click to the `.DbMigrator` project and select **Set as StartUp Project**
 
 > Tiered solutions use **Redis** as the distributed cache. Ensure that it is installed and running in your local computer. If you are using a remote Redis Server, set the configuration in the `appsettings.json` files of the projects below.
 
-1. Ensure that the `.IdentityServer` project is the startup project. Run this application that will open a **login** page in your browser.
+1. Ensure that the `.AuthServer` project is the startup project. Run this application that will open a **login** page in your browser.
 
 > Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.
 
@@ -137,7 +137,7 @@ Ensure that the {{if UI=="MVC"}}`.Web`{{else}}`.Blazor`{{end}} project is the st
 
 > Tiered solutions use Redis as the distributed cache. Ensure that it is installed and running in your local computer. If you are using a remote Redis Server, set the configuration in the `appsettings.json` files of the projects below.
 
-Ensure that the `.IdentityServer` project is the startup project. Run the application which will open a **login** page in your browser.
+Ensure that the `.AuthServer` project is the startup project. Run the application which will open a **login** page in your browser.
 
 > Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.
 
diff --git a/docs/en/Index.md b/docs/en/Index.md
index 3f5c3dbf44..0a33c0e5a4 100644
--- a/docs/en/Index.md
+++ b/docs/en/Index.md
@@ -47,7 +47,7 @@ Application Modules provides pre-built application functionalities;
 
 * [**Account**](Modules/Account.md): Provides UI for the account management and allows user to login/register to the application.
 * **[Identity](Modules/Identity.md)**: Manages organization units, roles, users and their permissions, based on the Microsoft Identity library.
-* [**IdentityServer**](Modules/IdentityServer.md): Integrates to IdentityServer4.
+* [**OpenIddict**](Modules/OpenIddict.md): Integrates to OpenIddict.
 * [**Tenant Management**](Modules/Tenant-Management.md): Manages tenants for a [multi-tenant](Multi-Tenancy.md) (SaaS) application.
 
 See the [Application Modules](Modules/Index.md) document for all pre-built modules.
diff --git a/docs/en/Modules/Account.md b/docs/en/Modules/Account.md
index 72f6f55c0e..7beb5b128d 100644
--- a/docs/en/Modules/Account.md
+++ b/docs/en/Modules/Account.md
@@ -2,7 +2,7 @@
 
 Account module implements the basic authentication features like **login**, **register**, **forgot password** and **account management**.
 
-This module is based on [Microsoft's Identity library](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity) and the [Identity Module](Identity.md). It has [IdentityServer](https://github.com/IdentityServer) integration (based on the [IdentityServer Module](IdentityServer.md)) to provide **single sign-on**, access control and other advanced authentication features.
+This module is based on [Microsoft's Identity library](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity) and the [Identity Module](Identity.md). It has [IdentityServer](https://github.com/IdentityServer) integration (based on the [IdentityServer Module](IdentityServer.md)) and [OpenIddict](https://github.com/openiddict) integration (based on the [OpenIddict Module](OpenIddict.md)) to provide **single sign-on**, access control and other advanced authentication features.
 
 ## How to Install
 
@@ -42,6 +42,10 @@ Social/external login buttons becomes visible if you setup it. See the *Social/E
 
 ![account-module-manage-account](../images/account-module-manage-account.png)
 
+## OpenIddict Integration
+
+[Volo.Abp.Account.Web.OpenIddict](https://www.nuget.org/packages/Volo.Abp.Account.Web.OpenIddict) package provides integration for the [OpenIddict](https://github.com/openiddict). This package comes as installed with the [application startup template](../Startup-Templates/Application.md). See the [OpenIddict Module](OpenIddict.md) documentation.
+
 ## IdentityServer Integration
 
 [Volo.Abp.Account.Web.IdentityServer](https://www.nuget.org/packages/Volo.Abp.Account.Web.IdentityServer) package provides integration for the [IdentityServer](https://github.com/IdentityServer). This package comes as installed with the [application startup template](../Startup-Templates/Application.md). See the [IdentityServer Module](IdentityServer.md) documentation.
diff --git a/docs/en/Modules/Index.md b/docs/en/Modules/Index.md
index 35d46dece0..d5037665f0 100644
--- a/docs/en/Modules/Index.md
+++ b/docs/en/Modules/Index.md
@@ -19,6 +19,7 @@ There are some **free and open source** application modules developed and mainta
 * [**Feature Management**](Feature-Management.md): Used to persist and manage the [features](../Features.md).
 * **[Identity](Identity.md)**: Manages organization units, roles, users and their permissions, based on the Microsoft Identity library.
 * [**IdentityServer**](IdentityServer.md): Integrates to IdentityServer4.
+* [**OpenIddict**](OpenIddict.md): Integrates to OpenIddict.
 * [**Permission Management**](Permission-Management.md): Used to persist permissions.
 * **[Setting Management](Setting-Management.md)**: Used to persist and manage the [settings](../Settings.md).
 * [**Tenant Management**](Tenant-Management.md): Manages tenants for a [multi-tenant](../Multi-Tenancy.md) application.
diff --git a/docs/en/Modules/OpenIddict.md b/docs/en/Modules/OpenIddict.md
index e9a2eeb762..7d7e898eee 100644
--- a/docs/en/Modules/OpenIddict.md
+++ b/docs/en/Modules/OpenIddict.md
@@ -10,7 +10,7 @@ This module implements the domain logic and database integrations, but not provi
 
 ## Relations to Other Modules
 
-This module is based on the [Identity Module](Identity.md) and have an [integration package](https://www.nuget.org/packages/Volo.Abp.Account.Web.IdentityServer) with the [Account Module](Account.md).
+This module is based on the [Identity Module](Identity.md) and have an [integration package](https://www.nuget.org/packages/Volo.Abp.Account.Web.OpenIddict) with the [Account Module](Account.md).
 
 ## The module
 
diff --git a/docs/en/Startup-Templates/Application.md b/docs/en/Startup-Templates/Application.md
index a262ef2d88..028801c634 100644
--- a/docs/en/Startup-Templates/Application.md
+++ b/docs/en/Startup-Templates/Application.md
@@ -226,15 +226,15 @@ The solution structure is shown below:
 
 ![bookstore-visual-studio-solution-v3](../images/bookstore-visual-studio-solution-tiered.png)
 
-As different from the default structure, two new projects come into play: `.IdentityServer` & `.HttpApi.Host`.
+As different from the default structure, two new projects come into play: `.AuthServer` & `.HttpApi.Host`.
 
-#### .IdentityServer Project
+#### .AuthServer Project
 
-This project is used as an authentication server for other projects. `.Web` project uses OpenId Connect Authentication to get identity and access tokens for the current user from the IdentityServer. Then uses the access token to call the HTTP API server. HTTP API server uses bearer token authentication to obtain claims from the access token to authorize the current user.
+This project is used as an authentication server for other projects. `.Web` project uses OpenId Connect Authentication to get identity and access tokens for the current user from the AuthServer. Then uses the access token to call the HTTP API server. HTTP API server uses bearer token authentication to obtain claims from the access token to authorize the current user.
 
 ![tiered-solution-applications](../images/tiered-solution-applications.png)
 
-ABP uses the open source [IdentityServer4](https://identityserver.io/) framework for the authentication between applications. See [IdentityServer4 documentation](http://docs.identityserver.io) for details about the IdentityServer4 and OpenID Connect protocol.
+ABP uses the open source [OpenIddcit](https://github.com/openiddict/openiddict-core) framework for the authentication between applications. See [OpenIddcit documentation](https://documentation.openiddict.com/) for details about the OpenIddict and OpenID Connect protocol.
 
 It has its own `appsettings.json` that contains database connection and other configurations.
 
@@ -256,7 +256,7 @@ This project contains an `appsettings.json` file, but this time it does not have
 
 You should run the application with the given order:
 
-* First, run the `.IdentityServer` since other applications depend on it.
+* First, run the `.AuthServer` since other applications depend on it.
 * Then run the `.HttpApi.Host` since it is used by the `.Web` application.
 * Finally, you can run the `.Web` project and login to the application (using `admin` as the username and `1q2w3E*` as the password).
 
diff --git a/docs/en/Startup-Templates/Module.md b/docs/en/Startup-Templates/Module.md
index c9ac6ccd48..afb6496ed5 100644
--- a/docs/en/Startup-Templates/Module.md
+++ b/docs/en/Startup-Templates/Module.md
@@ -139,7 +139,7 @@ Set `host/YourProjectName.Web.Unified` as the startup project, run `Update-Datab
 
 In this scenario, there are three applications;
 
-* `.IdentityServer` application is an authentication server used by other applications. It has its own `appsettings.json` that contains database connection and other configurations.
+* `.AuthServer` application is an authentication server used by other applications. It has its own `appsettings.json` that contains database connection and other configurations.
 * `.HttpApi.Host` hosts the HTTP API of the module. It has its own `appsettings.json` that contains database connections and other configurations.
 * `.Web.Host` host the UI of the module. This project contains an `appsettings.json` file, but it does not have a connection string because it never connects to the database. Instead, it mainly contains endpoint of the remote API server and the authentication server.
 
@@ -147,7 +147,7 @@ The diagram below shows the relation of the applications:
 
 ![tiered-solution-applications](../images/tiered-solution-applications.png)
 
-`.Web.Host` project uses OpenId Connect Authentication to get identity and access tokens for the current user from the `.IdentityServer`. Then uses the access token to call the `.HttpApi.Host`. HTTP API server uses bearer token authentication to obtain claims from the access token to authorize the current user.
+`.Web.Host` project uses OpenId Connect Authentication to get identity and access tokens for the current user from the `.AuthServer`. Then uses the access token to call the `.HttpApi.Host`. HTTP API server uses bearer token authentication to obtain claims from the access token to authorize the current user.
 
 ##### Pre-requirements
 
@@ -157,7 +157,7 @@ The diagram below shows the relation of the applications:
 
 You should run the application with the given order:
 
-- First, run the `.IdentityServer` since other applications depends on it.
+- First, run the `.AuthServer` since other applications depends on it.
 - Then run the `.HttpApi.Host` since it is used by the `.Web.Host` application.
 - Finally, you can run the `.Web.Host` project and login to the application using `admin` as the username and `1q2w3E*` as the password.
 
@@ -195,7 +195,7 @@ The module you will develop depends on two of these ABP packages: _@abp/ng.core_
 
 Once all dependencies are installed, follow the steps below to serve your development app:
 
-1. Make sure `.IdentityServer` and `*.HttpApi.Host` projects are up and running.
+1. Make sure `.AuthServer` and `*.HttpApi.Host` projects are up and running.
 2. Open your terminal at the root folder, i.e. `angular`.
 3. Run `yarn start` or `npm start`.
 
diff --git a/docs/en/Themes/LeptonXLite/angular.md b/docs/en/Themes/LeptonXLite/angular.md
index 6e4cbef317..805ababd69 100644
--- a/docs/en/Themes/LeptonXLite/angular.md
+++ b/docs/en/Themes/LeptonXLite/angular.md
@@ -79,4 +79,4 @@ To change the logos and brand color of `LeptonX`, simply add the following CSS t
 
 ### Server Side
 
-In order to migrate to LeptonX on your server side projects (Host and/or IdentityServer projects), please follow the [Server Side Migration](mvc.md) document.
+In order to migrate to LeptonX on your server side projects (Host and/or AuthServer projects), please follow the [Server Side Migration](mvc.md) document.
diff --git a/docs/en/Themes/LeptonXLite/blazor.md b/docs/en/Themes/LeptonXLite/blazor.md
index 7bc374746a..1e01cf19e6 100644
--- a/docs/en/Themes/LeptonXLite/blazor.md
+++ b/docs/en/Themes/LeptonXLite/blazor.md
@@ -16,7 +16,7 @@ LeptonX Lite has implementation for the ABP Framework Blazor WebAssembly & Blazo
 ## Installation
 
 {{if UI == "Blazor"}}
-- Complete the [MVC Razor Pages Installation](mvc.md#installation) for the **HttpApi.Host** application first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and if identity server is separated, install to the **IdentityServer**_.
+- Complete the [MVC Razor Pages Installation](mvc.md#installation) for the **HttpApi.Host** application first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and if identity server is separated, install to the **OpenIddict**_.
 
 - Add **Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme** package to your **Blazor WebAssembly** application.
   ```bash
@@ -51,7 +51,7 @@ builder.RootComponents.Add<App>("#ApplicationContainer");
 
 {{if UI == "BlazorServer"}}
 
-- Complete the [MVC Razor Pages Installation](mvc.md#installation) first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and **IdentityServer**_.
+- Complete the [MVC Razor Pages Installation](mvc.md#installation) first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and **AuthServer**_.
 
 - Add **Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme** package to your **Blazor server** application.
   ```bash
diff --git a/docs/en/UI/Angular/Account-Module.md b/docs/en/UI/Angular/Account-Module.md
index 3670a14f73..3b2363361a 100644
--- a/docs/en/UI/Angular/Account-Module.md
+++ b/docs/en/UI/Angular/Account-Module.md
@@ -110,7 +110,7 @@ export const environment = {
   // other options removed for sake of brevity
 
   oAuthConfig: {
-    issuer: 'https://localhost:44305', // IdentityServer url
+    issuer: 'https://localhost:44305', // AuthServer url
     clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'offline_access MyProjectName',
diff --git a/docs/en/UI/Angular/Multi-Tenancy.md b/docs/en/UI/Angular/Multi-Tenancy.md
index cded16e7d4..92f76435ca 100644
--- a/docs/en/UI/Angular/Multi-Tenancy.md
+++ b/docs/en/UI/Angular/Multi-Tenancy.md
@@ -119,7 +119,7 @@ After the configuration above, if your app runs on the `mytenant1.mydomain.com`,
 
 After this replacement, the app will use the following URLs:
 
-- `https://mytenant1.ids.mydomain.com` as IdentityServer URL.
+- `https://mytenant1.ids.mydomain.com` as AuthServer URL.
 - `https://mytenant1.api.mydomain.com` as default URL.
 - `https://mytenant1.identity.mydomain.com` as `AbpIdentity` remote endpoint URL.
 
diff --git a/docs/en/UI/Blazor/Authentication.md b/docs/en/UI/Blazor/Authentication.md
index 9dc34ebce5..19273b49d2 100644
--- a/docs/en/UI/Blazor/Authentication.md
+++ b/docs/en/UI/Blazor/Authentication.md
@@ -3,7 +3,7 @@
 The [application startup template](../../Startup-Templates/Application.md) is properly configured to use OpenId Connect to authenticate the user through the server side login form;
 
 * When the Blazor application needs to authenticate, it is redirected to the server side.
-* Users can enter username & password to login if they already have an account. If not, they can use the register form to create a new user. They can also use forgot password and other features. The server side uses IdentityServer4 to handle the authentication.
+* Users can enter username & password to login if they already have an account. If not, they can use the register form to create a new user. They can also use forgot password and other features. The server side uses OpenIddict to handle the authentication.
 * Finally, they are redirected back to the Blazor application to complete the login process.
 
 This is a typical and recommended approach to implement authentication in Single-Page Applications. The client side configuration is done in the startup template, so you can change it.
diff --git a/docs/zh-Hans/Getting-Started-React-Native.md b/docs/zh-Hans/Getting-Started-React-Native.md
index 225a0f3a13..76581930ce 100644
--- a/docs/zh-Hans/Getting-Started-React-Native.md
+++ b/docs/zh-Hans/Getting-Started-React-Native.md
@@ -18,8 +18,8 @@ ABP平台提供了[React Native](https://reactnative.dev/)模板用于开发移
 
 ![React Native tiered project local IP entry](images/rn-tiered-local-ip.png)
 
-* 打开 `.IdentityServer` 文件夹下的 `appsettings.json` 文件. 将 `SelfUrl` 属性的 `localhost` 替换为你本地的IP地址.
-* 打开 `.IdentityServer/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
+* 打开 `.AuthServer` 文件夹下的 `appsettings.json` 文件. 将 `SelfUrl` 属性的 `localhost` 替换为你本地的IP地址.
+* 打开 `.AuthServer/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
 * 打开 `.HttpApi.Host` 文件夹下的 `appsettings.json` 文件. 将 `Authority` 属性的 `localhost` 替换为你本地的IP地址.
 * 打开 `.HttpApi.Host/Properties` 文件夹下的 `launchSettings.json` 文件. 将 `applicationUrl` 属性的 `localhost` 替换为你本地的IP地址.
 
@@ -41,7 +41,7 @@ yarn
 
 {{ if Tiered == "Yes" }}
 
-> 确保 `issuer` 与正在运行的 `.IdentityServer` 项目匹配, `apiUrl` 与正在运行的 `.HttpApi.Host` 项目匹配.
+> 确保 `issuer` 与正在运行的 `.AuthServer` 项目匹配, `apiUrl` 与正在运行的 `.HttpApi.Host` 项目匹配.
 
 {{else}}
 
diff --git a/docs/zh-Hans/Getting-Started-Running-Solution.md b/docs/zh-Hans/Getting-Started-Running-Solution.md
index 91ee846bc2..8ecd85ec58 100644
--- a/docs/zh-Hans/Getting-Started-Running-Solution.md
+++ b/docs/zh-Hans/Getting-Started-Running-Solution.md
@@ -15,7 +15,7 @@
 
 ### 连接字符串
 
-检查在 {{if Tiered == "Yes"}}`.IdentityServer` 和`.HttpApi.Host` 项目{{else}}{{if UI=="MVC"}}`.Web` 项目{{else if UI=="BlazorServer"}}`.Blazor` 项目{{else}}`.HttpApi.Host` 项目{{end}}{{end}} 中 `appsettings.json` 文件里的**连接字符串**.
+检查在 {{if Tiered == "Yes"}}`.AuthServer` 和`.HttpApi.Host` 项目{{else}}{{if UI=="MVC"}}`.Web` 项目{{else if UI=="BlazorServer"}}`.Blazor` 项目{{else}}`.HttpApi.Host` 项目{{end}}{{end}} 中 `appsettings.json` 文件里的**连接字符串**.
 
 {{ if DB == "EF" }}
 
@@ -97,7 +97,7 @@ dotnet run
 
 > 分层解决方案使用 **Redis** 作为分布式缓存. 确保它已安装并在本地计算机上运行. 如果你使用的是远程 Redis 服务器, 请修改项目的 ` appsettings.json` 文件中的配置.
 
-1. 确保 `.IdentityServer` 项目是启动项目. 运行此应用程序, 它将在浏览器中打开 **登录** 页面.
+1. 确保 `.AuthServer` 项目是启动项目. 运行此应用程序, 它将在浏览器中打开 **登录** 页面.
 
 > 在 Visual Studio 中使用 Ctrl+F5(而不是F5) 在不进行调试的情况下运行应用程序. 如果你没有调试目的, 这会更快.
 
@@ -135,7 +135,7 @@ dotnet run
 
 > 分层解决方案使用 Redis 作为分布式缓存. 确保它已安装并在本地计算机上运行. 如果你使用的是远程 Redis 服务器, 请修改项目的 `appsettings.json` 文件中的配置.
 
-确保 `.IdentityServer` 项目是启动项目. 运行此应用程序, 它将在浏览器中打开 **登录** 页面.
+确保 `.AuthServer` 项目是启动项目. 运行此应用程序, 它将在浏览器中打开 **登录** 页面.
 
 > 在 Visual Studio 中使用 Ctrl+F5(而不是F5) 在不进行调试的情况下运行应用程序. 如果你没有调试目的, 这会更快.
 
diff --git a/docs/zh-Hans/Modules/Account.md b/docs/zh-Hans/Modules/Account.md
index 2e1c838f50..336e939c37 100644
--- a/docs/zh-Hans/Modules/Account.md
+++ b/docs/zh-Hans/Modules/Account.md
@@ -12,7 +12,7 @@
 
 #### 添加NuGet包
 
-添加[Microsoft.AspNetCore.Authentication.Facebook]包到你的项目. 基于你的架构,可能是 `.Web`,`.IdentityServer`(对于分层启动)或 `.Host` 项目.
+添加[Microsoft.AspNetCore.Authentication.Facebook]包到你的项目. 基于你的架构,可能是 `.Web`,`.AuthServer`(对于分层启动)或 `.Host` 项目.
 
 #### 配置提供程序
 
diff --git a/docs/zh-Hans/Modules/Index.md b/docs/zh-Hans/Modules/Index.md
index 656e5db96f..1df7a04413 100644
--- a/docs/zh-Hans/Modules/Index.md
+++ b/docs/zh-Hans/Modules/Index.md
@@ -18,6 +18,7 @@ ABP是一个 **模块化的应用程序框架** 由十多个 **NuGet & NPM packa
 * [**Docs**](Docs.md): 用于创建技术文档页面. ABP的[文档](https://abp.io/documents/) 就使用了此模块.
 * [**Feature Management**](Feature-Management.md): 用于保存和管理功能.
 * [**Identity**](Identity.md): 基于Microsoft Identity管理组织单元,角色,用户和他们的权限.
+* [**OpenIddict**](OpenIddict.md): 集成了OpenIddict.
 * [**Identity Server**](IdentityServer.md): 集成了IdentityServer4.
 * [**Permission Management**](Permission-Management.md): 用于保存权限.
 * [**Setting Management**](Setting-Management.md): 用于保存设置.
diff --git a/docs/zh-Hans/Startup-Templates/Application.md b/docs/zh-Hans/Startup-Templates/Application.md
index b51976f75d..91d7308226 100644
--- a/docs/zh-Hans/Startup-Templates/Application.md
+++ b/docs/zh-Hans/Startup-Templates/Application.md
@@ -239,15 +239,15 @@ ABP有[动态 C# API 客户端](../API/Dynamic-CSharp-API-Clients.md)功能,所
 
 ![bookstore-visual-studio-solution-tiered](../images/bookstore-visual-studio-solution-tiered.png)
 
-与默认结构不同,我们得到了两个新项目: `.IdentityServer` 和 `.HttpApi.Host`.
+与默认结构不同,我们得到了两个新项目: `.AuthServer` 和 `.HttpApi.Host`.
 
-#### .IdentityServer 项目
+#### .AuthServer 项目
 
-用于其他项目的身份验证服务器. `.Web`项目使用OpenId Connect身份验证从IdentityServer获取当前用户的身份和访问令牌. 然后使用访问令牌调用HTTP API服务器. HTTP API服务器使用bearer token从访问令牌获取声明授权当前用户.
+用于其他项目的身份验证服务器. `.Web`项目使用OpenId AuthServer. 然后使用访问令牌调用HTTP API服务器. HTTP API服务器使用bearer token从访问令牌获取声明授权当前用户.
 
 ![tiered-solution-applications](../images/tiered-solution-applications.png)
 
-ABP使用开源的[IdentityServer4](https://identityserver.io/)框架做应用程序间的身份验证. 有关IdentityServer4和OpenId Connect协议的详细信息请参阅[IdentityServer4文档](http://docs.identityserver.io).
+ABP使用开源的[IdentityServer4](https://identityserver.io/) 和 [OpenIddict](https://github.com/openiddict/) 框架做应用程序间的身份验证. 有关IdentityServer4,OpenIddict和OpenId Connect协议的详细信息请参阅[IdentityServer4文档](http://docs.identityserver.io) [OpenIddict文档](https://documentation.openiddict.com/).
 
 它有自己的`appsettings.json`文件(数据库连接字符串等其他配置).
 
@@ -269,7 +269,7 @@ ABP使用开源的[IdentityServer4](https://identityserver.io/)框架做应用
 
 你应该按照以下顺序运行应用:
 
-* 首先运行`.IdentityServer`,因为其他应用程序依赖它做身份验证.
+* 首先运行`.AuthServer`,因为其他应用程序依赖它做身份验证.
 * 然后运行`.HttpApi.Host`,因为`.Web`应用程序需要访问HTTI API.
 * 最后运行`.Web`并登录到应用程序(用户名: `admin` 密码: `1q2w3E*`).
 
diff --git a/docs/zh-Hans/Startup-Templates/Module.md b/docs/zh-Hans/Startup-Templates/Module.md
index 67e0ad3be2..e3f259cc80 100644
--- a/docs/zh-Hans/Startup-Templates/Module.md
+++ b/docs/zh-Hans/Startup-Templates/Module.md
@@ -139,7 +139,7 @@ abp new Acme.IssueManagement -t module --no-ui
 
 在这个场景中,有三个应用程序;
 
-* `.IdentityServer` 应用程序是其他应用程序使用的身份验证服务器,它有自己的 `appsettings.json` 包含数据库连接字符串和其他配置.
+* `.AuthServer` 应用程序是其他应用程序使用的身份验证服务器,它有自己的 `appsettings.json` 包含数据库连接字符串和其他配置.
 * `.HttpApi.Host` 托管模块的HTTP API. 它有自己的 `appsettings.json` 包含数据库连接字符串和其他配置.
 * `.Web.Host` 托管模块的UI. 它包含 `appsettings.json` 文件, 但是其中没有数据库连接字符串, 因为它不需要连接到数据库, 它主要调用远程API服务器和身份认证服务器.
 
@@ -147,7 +147,7 @@ abp new Acme.IssueManagement -t module --no-ui
 
 ![tiered-solution-applications](../images/tiered-solution-applications.png)
 
-`.Web.Host` 项目使用OpenId Connect身份认证从`.IdentityServer`获取当前用户的身份和访问令牌. 然后使用访问令牌调用 `.HttpApi.Host`. HTTP API 服务器使用bearer token验证访问令牌获取当前用户声明并授权用户.
+`.Web.Host` 项目使用OpenId Connect身份认证从`.AuthServer`获取当前用户的身份和访问令牌. 然后使用访问令牌调用 `.HttpApi.Host`. HTTP API 服务器使用bearer token验证访问令牌获取当前用户声明并授权用户.
 
 ##### 前置条件
 
@@ -157,6 +157,6 @@ abp new Acme.IssueManagement -t module --no-ui
 
 你需要按照以下顺序运行应用程序:
 
-- 首先, 运行 `.IdentityServer`,因为其他应用程序依赖它做身份认证.
+- 首先, 运行 `.AuthServer`,因为其他应用程序依赖它做身份认证.
 - 然后运行 `.HttpApi.Host`,因为`.Web.Host`应用程序使用API接口.
 - 最后运行 `.Web.Host` 使用用户名: `admin` 密码: `1q2w3E*` 登录到应用程序.