+
+
### Database Provider Options
-## The Book: Mastering ABP Framework
-Written by the creator of ABP Framework, this book will help you to gain a complete understanding of the ABP Framework and modern web application development techniques.
-
-* [Buy on Amazon](https://www.amazon.com/gp/product/B097Z2DM8Q)
-* [Buy on Packt Publishing](https://www.packtpub.com/product/mastering-abp-framework/9781801079242)
-* [More details about the book](https://abp.io/books/mastering-abp-framework)
-
-
## What ABP Provides?
ABP provides a **full stack developer experience**.
+
+
### Architecture
@@ -64,30 +58,48 @@ ABP offers a complete, **modular** and **layered** software architecture based o
ABP Framework is suitable for **[microservice solutions](https://docs.abp.io/en/abp/latest/Microservice-Architecture)** as well as monolithic applications.
+
+
### Infrastructure
-There are a lot of features provided by the ABP Framework to achieve real world scenarios easier, like [Event Bus](https://docs.abp.io/en/abp/latest/Event-Bus), [Background Job System](https://docs.abp.io/en/abp/latest/Background-Jobs), [Audit Logging](https://docs.abp.io/en/abp/latest/Audit-Logging), [BLOB Storing](https://docs.abp.io/en/abp/latest/Blob-Storing), [Data Seeding](https://docs.abp.io/en/abp/latest/Data-Seeding), [Data Filtering](https://docs.abp.io/en/abp/latest/Data-Filtering), etc.
+There are a lot of features provided by the ABP Framework to achieve real-world scenarios easier, like [Event Bus](https://docs.abp.io/en/abp/latest/Event-Bus), [Background Job System](https://docs.abp.io/en/abp/latest/Background-Jobs), [Audit Logging](https://docs.abp.io/en/abp/latest/Audit-Logging), [BLOB Storing](https://docs.abp.io/en/abp/latest/Blob-Storing), [Data Seeding](https://docs.abp.io/en/abp/latest/Data-Seeding), [Data Filtering](https://docs.abp.io/en/abp/latest/Data-Filtering), etc.
+
+
+
+### Cross-Cutting Concerns
+
+ABP also simplifies (and even automates wherever possible) cross-cutting concerns and common non-functional requirements like [Exception Handling](https://docs.abp.io/en/abp/latest/Exception-Handling), [Validation](https://docs.abp.io/en/abp/latest/Validation), [Authorization](https://docs.abp.io/en/abp/latest/Authorization), [Localization](https://docs.abp.io/en/abp/latest/Localization), [Caching](https://docs.abp.io/en/abp/latest/Caching), [Dependency Injection](https://docs.abp.io/en/abp/latest/Dependency-Injection), [Setting Management](https://docs.abp.io/en/abp/latest/Settings), etc.
-### Cross Cutting Concerns
-ABP also simplifies (and even automates wherever possible) cross cutting concerns and common non-functional requirements like [Exception Handling](https://docs.abp.io/en/abp/latest/Exception-Handling), [Validation](https://docs.abp.io/en/abp/latest/Validation), [Authorization](https://docs.abp.io/en/abp/latest/Authorization), [Localization](https://docs.abp.io/en/abp/latest/Localization), [Caching](https://docs.abp.io/en/abp/latest/Caching), [Dependency Injection](https://docs.abp.io/en/abp/latest/Dependency-Injection), [Setting Management](https://docs.abp.io/en/abp/latest/Settings), etc.
### Application Modules
ABP is a modular framework and the Application Modules provide **pre-built application functionalities**;
- [**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.
+- **[Identity](https://docs.abp.io/en/abp/latest/Modules/Identity)**: Manages organization units, roles, users and their permissions based on the Microsoft Identity library.
- [**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.
+
+
### Startup Templates
The [Startup templates](https://docs.abp.io/en/abp/latest/Startup-Templates/Index) are pre-built Visual Studio solution templates. You can create your own solution based on these templates to **immediately start your development**.
-## ABP Community
+
+
+## Mastering ABP Framework Book
+
+This book will help you to gain a complete understanding of the ABP Framework and modern web application development techniques. It is written by the creator and team lead of the ABP Framework. You can buy from [Amazon](https://www.amazon.com/gp/product/B097Z2DM8Q) or [Packt Publishing](https://www.packtpub.com/product/mastering-abp-framework/9781801079242). Find further info about the book at [abp.io/books/mastering-abp-framework](https://abp.io/books/mastering-abp-framework).
+
+
+
+
+
+## The Community
### ABP Community Web Site
@@ -103,28 +115,31 @@ See the [sample projects](https://docs.abp.io/en/abp/latest/Samples/Index) built
### Want to Contribute?
-ABP is a community-driven open source project. See [the contribution guide](https://docs.abp.io/en/abp/latest/Contribution/Index) if you want to be a part of this project.
+ABP is a community-driven open-source project. See [the contribution guide](https://docs.abp.io/en/abp/latest/Contribution/Index) if you want to participate in this project.
+
+
## Official Links
-*
-
+
{%{{{ 'AbpTenantManagement::Tenants' | abpLocalization }}}%}
@@ -554,7 +568,11 @@ Open the generated `nav-items.component.html` in `src/app/nav-items` folder and
```html
-
- }
- else
- {
- -
-
+
-
diff --git a/docs/en/UI/Angular/Confirmation-Service.md b/docs/en/UI/Angular/Confirmation-Service.md index 53b5dae397..bd270ba11d 100644 --- a/docs/en/UI/Angular/Confirmation-Service.md +++ b/docs/en/UI/Angular/Confirmation-Service.md @@ -71,10 +71,10 @@ const options: Partial
= { yesText: "Confirm", messageLocalizationParams: ["Demo"], titleLocalizationParams: [], - // You can customize icon + // You can customize icon // icon: 'fa fa-exclamation-triangle', // or // iconTemplate : ' 
'
-}
+};
this.confirmation.warn(
"AbpIdentity::RoleDeletionConfirmationMessage",
@@ -129,23 +129,26 @@ this.confirmation.clear();
### How to Change Icons of The Confirmation Popup
-You can change icons with the token of "confirmationIcons" in ThemeSharedModule in the app.module.ts. The changes will affect all confirmation popup in the project.
-
-```js
-...
-ThemeSharedModule.forRoot({
- confirmationIcons: {
- info: 'fa fa-info-circle',
- success: 'fa fa-check-circle',
- warning: 'fa fa-exclamation-triangle',
- error: 'fa fa-times-circle',
- default: 'fa fa-question-circle',
- },
-}),
-...
+You can change icons with the `withConfirmationIcon()` method of `provideAbpThemeShared` function in the app.module.ts. The changes will affect all confirmation popup in the project.
+
+```ts
+import { provideAbpThemeShared, withConfirmationIcon } from '@abp/ng.theme.shared';
+
+@NgModule({
+ providers: [
+ // ...
+ provideAbpThemeShared(withConfirmationIcon({
+ info: 'fa fa-info-circle',
+ success: 'fa fa-check-circle',
+ warning: 'fa fa-exclamation-triangle',
+ error: 'fa fa-times-circle',
+ default: 'fa fa-question-circle',
+ })),
+ ],
+})
+export class AppModule {}
```
-
## API
### success
diff --git a/docs/en/UI/Angular/Feature-Libraries.md b/docs/en/UI/Angular/Feature-Libraries.md
index bdfff93371..e23bab4bb4 100644
--- a/docs/en/UI/Angular/Feature-Libraries.md
+++ b/docs/en/UI/Angular/Feature-Libraries.md
@@ -41,13 +41,13 @@ yarn add @abp/ng.identity
As of ABP v3.0, every lazy-loaded module has a config module available via a secondary entry point on the same package. Importing them in your root module looks like this:
-```js
-import { IdentityConfigModule } from "@abp/ng.identity/config";
+```ts
+import { provideIdentityConfig } from "@abp/ng.identity/config";
@NgModule({
- imports: [
+ providers: [
// other imports
- IdentityConfigModule.forRoot(),
+ provideIdentityConfig(),
],
// providers, declarations, and bootstrap
})
diff --git a/docs/en/UI/Angular/Form-Validation.md b/docs/en/UI/Angular/Form-Validation.md
index a178fa213c..1c3c1a0d49 100644
--- a/docs/en/UI/Angular/Form-Validation.md
+++ b/docs/en/UI/Angular/Form-Validation.md
@@ -6,28 +6,20 @@ Reactive forms in ABP Angular UI are validated by [ngx-validate](https://www.npm
## How to Add New Error Messages
-You can add a new error message by passing validation options to the `ThemeSharedModule` in your root module.
+You can add a new error message by passing validation options to the `withValidationBluePrint` method of `provideAbpThemeShared` function in your root module.
-```js
-import { VALIDATION_BLUEPRINTS } from "@ngx-validate/core";
-import { DEFAULT_VALIDATION_BLUEPRINTS } from "@abp/ng.theme.shared";
+```ts
+import { provideAbpThemeShared, withValidationBluePrint } from '@abp/ng.theme.shared';
@NgModule({
- imports: [
- ThemeSharedModule.forRoot({
- validation: {
- blueprints: {
- uniqueUsername: "::AlreadyExists[{%{{{ username }}}%}]",
- },
- },
-
- // rest of theme shared config
- }),
-
- // other imports
+ providers: [
+ provideAbpThemeShared(
+ withValidationBluePrint({
+ uniqueUsername: "::AlreadyExists[{%{{{ username }}}%}]"
+ })
+ ),
+ ...
],
-
- // rest of the module metadata
})
export class AppModule {}
```
@@ -77,26 +69,16 @@ You can overwrite an existing error message by passing validation options to the
To use this instead of the built-in required input message, all you need to do is the following.
-```js
-import { VALIDATION_BLUEPRINTS } from "@ngx-validate/core";
-import { DEFAULT_VALIDATION_BLUEPRINTS } from "@abp/ng.theme.shared";
+```ts
+import { provideAbpThemeShared, withValidationBluePrint } from '@abp/ng.theme.shared';
@NgModule({
- imports: [
- ThemeSharedModule.forRoot({
- validation: {
- blueprints: {
- required: "::RequiredInput",
- },
- },
-
- // rest of theme shared config
- }),
-
- // other imports
+ providers: [
+ provideAbpThemeShared(withValidationBluePrint({
+ required: "::RequiredInput",
+ })),
+ ...
],
-
- // rest of the module metadata
})
export class AppModule {}
```
diff --git a/docs/en/UI/Angular/HTTP-Error-Handling.md b/docs/en/UI/Angular/HTTP-Error-Handling.md
index 8b4077fb53..6e35ecb4cd 100644
--- a/docs/en/UI/Angular/HTTP-Error-Handling.md
+++ b/docs/en/UI/Angular/HTTP-Error-Handling.md
@@ -5,22 +5,20 @@
ABP offers a configurations for errors handling like below
```ts
-import { ThemeSharedModule } from '@abp/ng.theme.shared';
+import { provideAbpThemeShared, withHttpErrorConfig } from '@abp/ng.theme.shared';
import { MyCustomRouteErrorComponent } from './my-custom-route.component';
@NgModule({
- imports: [
- ThemeSharedModule.forRoot({
- httpErrorConfig: {
- skipHandledErrorCodes: [403],
- errorScreen: {
- forWhichErrors: [404],
- component: CustomErrorComponent,
- hideCloseIcon: false
- }
+ providers: [
+ // ...
+ provideAbpThemeShared(withHttpErrorConfig({
+ skipHandledErrorCodes: [403],
+ errorScreen: {
+ forWhichErrors: [404],
+ component: MyCustomRouteErrorComponent,
+ hideCloseIcon: false
}
- }),
- ...
+ })),
],
})
export class AppModule {}
diff --git a/docs/en/UI/Angular/Localization.md b/docs/en/UI/Angular/Localization.md
index 72a6b4fc57..f386f1e8e9 100644
--- a/docs/en/UI/Angular/Localization.md
+++ b/docs/en/UI/Angular/Localization.md
@@ -11,7 +11,7 @@ The Localization key format consists of 2 sections which are **Resource Name** a
const environment = {
//...
localization: {
- defaultResourceName: 'MyProjectName',
+ defaultResourceName: "MyProjectName",
},
};
```
@@ -38,7 +38,8 @@ You can also specify a default value as shown below:
```html
- {%{{{ { key: 'Resource::Key', defaultValue: 'Default Value' } | abpLocalization }}}%} + {%{{{ { key: 'Resource::Key', defaultValue: 'Default Value' } | + abpLocalization }}}%}
``` @@ -82,17 +83,17 @@ After that, you are able to use localization service. ```js this.localizationService.instant( - 'AbpIdentity::UserDeletionConfirmation', - 'John' + "AbpIdentity::UserDeletionConfirmation", + "John" ); // with fallback value this.localizationService.instant( { - key: 'AbpIdentity::UserDeletionConfirmation', - defaultValue: 'Default Value', + key: "AbpIdentity::UserDeletionConfirmation", + defaultValue: "Default Value", }, - 'John' + "John" ); // Output @@ -102,12 +103,12 @@ this.localizationService.instant( To get a localized text as [_Observable_](https://rxjs.dev/guide/observable) use `get` method instead of `instant`: ```js -this.localizationService.get('Resource::Key'); +this.localizationService.get("Resource::Key"); // with fallback value this.localizationService.get({ - key: 'Resource::Key', - defaultValue: 'Default Value', + key: "Resource::Key", + defaultValue: "Default Value", }); ``` @@ -118,41 +119,46 @@ Localizations can be determined on backend side. Angular UI gets the localizatio See an example: ```ts -// app.module.ts +import { provideAbpCore, withOptions } from '@abp/ng.core'; @NgModule({ - imports: [ - //...other imports - CoreModule.forRoot({ - localizations: [ - { - culture: 'en', - resources: [ - { - resourceName: 'MyProjectName', - texts: { - Administration: 'Administration', - HomePage: 'Home', + providers: [ + // ... + provideAbpCore( + withOptions({ + ..., + localizations: [ + { + culture: 'en', + resources: [ + { + resourceName: 'MyProjectName', + texts: { + Administration: 'Administration', + HomePage: 'Home', + }, }, - }, - ], - }, - { - culture: 'de', - resources: [ - { - resourceName: 'MyProjectName', - texts: { - Administration: 'Verwaltung', - HomePage: 'Startseite', + ], + }, + { + culture: 'de', + resources: [ + { + resourceName: 'MyProjectName', + texts: { + Administration: 'Verwaltung', + HomePage: 'Startseite', + }, }, - }, - ], - }, - ], - }), - ] + ], + }, + ], + }), + ), + ... + ], }) +export class AppModule {} ``` ...or, you can determine the localizations in a feature module: @@ -256,10 +262,10 @@ Find [styles configuration in angular.json](https://angular.io/guide/workspace-c If you have created and injected chunks for Fontawesome as seen above, you no longer need the lazy loading in the `AppComponent` which was implemented before v2.9. Simply remove them. The `AppComponent` in the template of the new version looks like this: ```js -import { Component } from '@angular/core'; +import { Component } from "@angular/core"; @Component({ - selector: 'app-root', + selector: "app-root", template: `@@ -274,33 +280,32 @@ Since ABP has more than one language, Angular locale files loads lazily using [W ### registerLocaleFn -`registerLocale` function that exported from `@abp/ng.core/locale` package is a higher order function that accepts `cultureNameLocaleFileMap` object and `errorHandlerFn` function as params and returns Webpack `import` function. A `registerLocale` function must be passed to the `forRoot` of the `CoreModule` as shown below: - -```js -// app.module.ts +`registerLocale` function that exported from `@abp/ng.core/locale` package is a higher order function that accepts `cultureNameLocaleFileMap` object and `errorHandlerFn` function as params and returns Webpack `import` function. A `registerLocale` function must be passed to the `withOptions` of the `provideAbpCore` as shown below: +```ts +import { provideAbpCore, withOptions } from '@abp/ng.core'; import { registerLocale } from '@abp/ng.core/locale'; -// if you have commercial license and the language management module, add the below import -// import { registerLocale } from '@volo/abp.ng.language-management/locale'; - @NgModule({ - imports: [ - // ... - CoreModule.forRoot({ - // ...other options, - registerLocaleFn: registerLocale( - // you can pass the cultureNameLocaleFileMap and errorHandlerFn as optionally - { - cultureNameLocaleFileMap: { 'pt-BR': 'pt' }, - errorHandlerFn: ({ resolve, reject, locale, error }) => { - // the error can be handled here + providers: [ + provideAbpCore( + withOptions({ + ..., + registerLocaleFn: registerLocale( + // you can pass the cultureNameLocaleFileMap and errorHandlerFn as optionally + { + cultureNameLocaleFileMap: { 'pt-BR': 'pt' }, + errorHandlerFn: ({ resolve, reject, locale, error }) => { + // the error can be handled here + }, }, - }, - ) - }), - //... - ] + ), + }), + ), + ... + ], +}) +export class AppModule {} ``` ### Mapping of Culture Name to Angular Locale File Name @@ -320,20 +325,23 @@ import { registerLocale } from '@abp/ng.core/locale'; @NgModule({ - imports: [ + providers: [ // ... - CoreModule.forRoot({ - // ...other options, - registerLocaleFn: registerLocale( - { - cultureNameLocaleFileMap: { - "DotnetCultureName": "AngularLocaleFileName", - "pt-BR": "pt" // example + provideAbpCore( + withOptions({ + ..., + registerLocaleFn: registerLocale( + { + cultureNameLocaleFileMap: { + "DotnetCultureName": "AngularLocaleFileName", + "pt-BR": "pt" // example + }, }, - }, - ) - }), - //... + ) + }), + ), + ] +}) ``` See [all locale files in Angular](https://github.com/angular/angular/tree/master/packages/common/locales). @@ -345,12 +353,12 @@ Add the below code to the `app.module.ts` by replacing `your-locale` placeholder ```js //app.module.ts -import { storeLocaleData } from '@abp/ng.core/locale'; +import { storeLocaleData } from "@abp/ng.core/locale"; import( /* webpackChunkName: "_locale-your-locale-js"*/ /* webpackMode: "eager" */ - '@angular/common/locales/your-locale.js' -).then((m) => storeLocaleData(m.default, 'your-locale')); + "@angular/common/locales/your-locale.js" +).then((m) => storeLocaleData(m.default, "your-locale")); ``` ...or a custom `registerLocale` function can be passed to the `CoreModule`: @@ -373,14 +381,17 @@ export function registerLocale(locale: string) { import { registerLocale } from './register-locale'; @NgModule({ - imports: [ + providers: [ // ... - CoreModule.forRoot({ - // ...other options, - registerLocaleFn: registerLocale - }), + provideAbpCore( + withOptions({ + ..., + registerLocaleFn: registerLocale, + }), + ), //... ] +}) ``` After this custom `registerLocale` function, since the en and fr added to the `webpackInclude`, only en and fr locale files will be created as chunks: @@ -391,5 +402,5 @@ Which locale files you add to `webpackInclude` magic comment, they will be inclu ## See Also -* [Localization in ASP.NET Core](../../Localization.md) -* [Video tutorial](https://abp.io/video-courses/essentials/localization) \ No newline at end of file +- [Localization in ASP.NET Core](../../Localization.md) +- [Video tutorial](https://abp.io/video-courses/essentials/localization) diff --git a/docs/en/UI/Angular/OAuth-Module.md b/docs/en/UI/Angular/OAuth-Module.md index b747c5221d..0e67d44d07 100644 --- a/docs/en/UI/Angular/OAuth-Module.md +++ b/docs/en/UI/Angular/OAuth-Module.md @@ -1,9 +1,12 @@ # ABP OAuth Package + The authentication functionality has been moved from @abp/ng.core to @abp/ng.ouath since v7.0. -If your app is version 7.0 or higher, you should include "AbpOAuthModule.forRoot()" in your app.module.ts as an import after "CoreModule.forRoot(...)". +If your app is version 8.3 or higher, you should include "provideAbpOAuth()" in your app.module.ts as an providers after "provideAbpCore() +". Those abstractions can be found in the @abp/ng-core packages. + - `AuthService` (the class that implements the IAuthService interface). - `NAVIGATE_TO_MANAGE_PROFILE` Inject token. - `ApiInterceptor` (the class that implements the IApiInterceptor interface). @@ -11,9 +14,9 @@ Those abstractions can be found in the @abp/ng-core packages. Those base classes are overridden by the "AbpOAuthModule" for oAuth. There are also three functions provided with AbpOAuthModule. - `PIPE_TO_LOGIN_FN_KEY` a provide that calls a function when the user is not authenticated. The function should be PipeToLoginFn type. -- `SET_TOKEN_RESPONSE_TO_STORAGE_FN_KEY` a provide that calls a function when the user is authenticated. The function should be SetTokenResponseToStorageFn type. +- `SET_TOKEN_RESPONSE_TO_STORAGE_FN_KEY` a provide that calls a function when the user is authenticated. The function should be SetTokenResponseToStorageFn type. - `CHECK_AUTHENTICATION_STATE_FN_KEY` a provide that calls a function when the user is authenticated and stores the auth state. The function should be CheckAuthenticationStateFn type. -The tokens and interfaces are in the `@abp/ng.core` package but the implementation of these interfaces is in the `@abp/ng.oauth` package. + The tokens and interfaces are in the `@abp/ng.core` package but the implementation of these interfaces is in the `@abp/ng.oauth` package. If you want to make your own authentication system, you must also change these 'abstract' classes. diff --git a/docs/en/UI/AspNetCore/Static-JavaScript-Proxies.md b/docs/en/UI/AspNetCore/Static-JavaScript-Proxies.md index fffc53cf83..2ad46a2f9d 100644 --- a/docs/en/UI/AspNetCore/Static-JavaScript-Proxies.md +++ b/docs/en/UI/AspNetCore/Static-JavaScript-Proxies.md @@ -66,7 +66,7 @@ acme.bookStore.authors.author.get = function(id, ajaxParams) { }; ```` -> `generate-proxy` command generates proxies for only the APIs you've defined in your application (assumes `app` as the module name). If you are developing a modular application, you can specify the `-m` (or `--module`) parameter to specify the module you want to generate proxies. See the *generate-proxy* section in the [ABP CLI](../CLI.md) documentation for other options. +> `generate-proxy` command generates proxies for only the APIs you've defined in your application (assumes `app` as the module name). If you are developing a modular application, you can specify the `-m` (or `--module`) parameter to specify the module you want to generate proxies. See the *generate-proxy* section in the [ABP CLI](../../CLI.md) documentation for other options. ### Using the Proxy Functions @@ -154,4 +154,4 @@ See the [jQuery.ajax](https://api.jquery.com/jQuery.ajax/) documentation for all * [Dynamic JavaScript API Client Proxies](Dynamic-JavaScript-Proxies.md) * [Auto API Controllers](../../API/Auto-API-Controllers.md) -* [Web Application Development Tutorial](../../Tutorials/Part-1.md) \ No newline at end of file +* [Web Application Development Tutorial](../../Tutorials/Part-1.md) diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index d30322e277..d45a304039 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -1165,6 +1165,10 @@ "text": "Ellipsis", "path": "UI/Angular/Ellipsis-Directive.md" }, + { + "text": "Projection Strategy", + "path": "UI/Angular/Projection-Strategy.md" + }, { "text": "Context Strategy", "path": "UI/Angular/Context-Strategy.md" diff --git a/docs/en/images/book-mastering-abp-framework.png b/docs/en/images/book-mastering-abp-framework.png index c2a98a02a5..7a25f583d3 100644 Binary files a/docs/en/images/book-mastering-abp-framework.png and b/docs/en/images/book-mastering-abp-framework.png differ diff --git a/docs/en/images/cmskit-module-comments-settings.png b/docs/en/images/cmskit-module-comments-settings.png new file mode 100644 index 0000000000..3c5a60d571 Binary files /dev/null and b/docs/en/images/cmskit-module-comments-settings.png differ diff --git a/docs/en/images/db-options.png b/docs/en/images/db-options.png index 368377f5a3..0c581c4883 100644 Binary files a/docs/en/images/db-options.png and b/docs/en/images/db-options.png differ diff --git a/docs/en/images/ddd-microservice-simple.png b/docs/en/images/ddd-microservice-simple.png index f4195bff9d..6588c2c753 100644 Binary files a/docs/en/images/ddd-microservice-simple.png and b/docs/en/images/ddd-microservice-simple.png differ diff --git a/docs/en/images/ui-options.png b/docs/en/images/ui-options.png index 6f0d19b73e..6affab9d21 100644 Binary files a/docs/en/images/ui-options.png and b/docs/en/images/ui-options.png differ diff --git a/docs/zh-Hans/Data-Filtering.md b/docs/zh-Hans/Data-Filtering.md index 8a43ad93b1..01c4590761 100644 --- a/docs/zh-Hans/Data-Filtering.md +++ b/docs/zh-Hans/Data-Filtering.md @@ -166,17 +166,14 @@ protected override bool ShouldFilterEntity (IMutableEntityType entityTyp return base.ShouldFilterEntity (entityType); } -protected override Expression () +protected override Expression (ModelBuilder modelBuilder) { - var expression = base.CreateFilterExpression (); + var expression = base.CreateFilterExpression (modelBuilder); if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) { - Expression (e, "IsActive"); - expression = expression == null - ? isActiveFilter - : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); + Expression (e, "IsActive"); + expression = expression == null ? isActiveFilter : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); } return expression; @@ -186,6 +183,78 @@ protected override Expression DataFilter?.IsEnabled () ?? false; + +protected override bool ShouldFilterEntity (IMutableEntityType entityType) +{ + if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) + { + return true; + } + + return base.ShouldFilterEntity (entityType); +} + +protected override Expression (ModelBuilder modelBuilder) +{ + var expression = base.CreateFilterExpression (modelBuilder); + + if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) + { + Expression (e, "IsActive"); + + if (UseDbFunction()) + { + isActiveFilter = e => IsActiveFilter(((IIsActive)e).IsActive, true); + + var abpEfCoreCurrentDbContext = this.GetService (); + modelBuilder.HasDbFunction(typeof(MyProjectNameDbContext).GetMethod(nameof(IsActiveFilter))!) + .HasTranslation(args => + { + // (bool isActive, bool boolParam) + var isActive = args[0]; + var boolParam = args[1]; + + if (abpEfCoreCurrentDbContext.Context?.DataFilter.IsEnabled () == true) + { + // isActive == true + return new SqlBinaryExpression( + ExpressionType.Equal, + isActive, + new SqlConstantExpression(Expression.Constant(true), boolParam.TypeMapping), + boolParam.Type, + boolParam.TypeMapping); + } + + // empty where sql + return new SqlConstantExpression(Expression.Constant(true), boolParam.TypeMapping); + }); + } + + expression = expression == null ? isActiveFilter : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); + } + + return expression; +} + +public static bool IsActiveFilter(bool isActive, bool boolParam) +{ + throw new NotSupportedException(AbpEfCoreDataFilterDbFunctionMethods.NotSupportedExceptionMessage); +} + +public override string GetCompiledQueryCacheKey() +{ + return $"{base.GetCompiledQueryCacheKey()}:{IsActiveFilterEnabled}"; +} +```` + ### MongoDB ABP抽象了 `IMongoDbRepositoryFilterer` 接口为[MongoDB 集成](MongoDB.md)实现数据过滤, 只有正确的使用仓储,它才会工作. 否则你需要手动过滤数据. diff --git a/docs/zh-Hans/Local-Event-Bus.md b/docs/zh-Hans/Local-Event-Bus.md index 7a842a9e98..ebdb3f20a6 100644 --- a/docs/zh-Hans/Local-Event-Bus.md +++ b/docs/zh-Hans/Local-Event-Bus.md @@ -211,6 +211,14 @@ namespace AbpDemo * 对于 EF Core, 他们在 `DbContext.SaveChanges` 发布. * 对于 MongoDB, 在你调用仓储的 `InsertAsync`, `UpdateAsync` 或 `DeleteAsync` 方法发布(因为MongoDB没有更改追踪系统). + +#### AbpEntityChangeOptions + +`AbpEntityChangeOptions`类中有一个`PublishEntityUpdatedEventWhenNavigationChanges`选项，默认值为`true`。 +如果将其设置为`false`，则当导航属性更改时，将不会发布`EntityUpdatedEventData `事件。 + +> 此选项仅用于EF Core + ## 另请参阅 * [分布式事件总线](Distributed-Event-Bus.md) \ No newline at end of file diff --git a/docs/zh-Hans/UI/Angular/Localization.md b/docs/zh-Hans/UI/Angular/Localization.md index 9ddb414234..d9dc81de34 100644 --- a/docs/zh-Hans/UI/Angular/Localization.md +++ b/docs/zh-Hans/UI/Angular/Localization.md @@ -205,16 +205,23 @@ export class AppComponent {} // app.module.ts @NgModule({ - imports: [ - // other imports - CoreModule.forRoot({ - // other options - cultureNameLocaleFileMap: { - "DotnetCultureName": "AngularLocaleFileName", - "pt-BR": "pt" // example - } - }) - //... + providers: [ + // ... + provideAbpCore( + withOptions({ + ..., + registerLocaleFn: registerLocale( + { + cultureNameLocaleFileMap: { + "DotnetCultureName": "AngularLocaleFileName", + "pt-BR": "pt" // example + }, + }, + ) + }), + ), + ] +}) ``` 查看 [Angular中所有的语言环境文件](https://github.com/angular/angular/tree/master/packages/common/locales). diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs index e518b54a95..b54c90abf8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Components.Server.Theming.Bundling; diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs index 42d354dc5d..3e186b9d0f 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Volo.Abp.AspNetCore.Components.DependencyInjection; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.Modularity; using Volo.Abp.UI; diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebOptions.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebOptions.cs index 2f5b8ca886..7ea40e6170 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebOptions.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.AspNetCore.Components.Server; +namespace Volo.Abp.AspNetCore.Components.Web; public class AbpAspNetCoreComponentsWebOptions { diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs index 25a57616e4..b4ea3cb50c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; -using Volo.Abp.AspNetCore.Components.Server; using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Web.ExceptionHandling; using Volo.Abp.AspNetCore.Components.Web.Security; diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ClientProxyExceptionEventHandler.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ClientProxyExceptionEventHandler.cs index d7c47c8aee..a4d615123c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ClientProxyExceptionEventHandler.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ClientProxyExceptionEventHandler.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Microsoft.JSInterop; -using Volo.Abp.AspNetCore.Components.Server; using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.DependencyInjection; using Volo.Abp.EventBus; @@ -26,31 +25,19 @@ public class ClientProxyExceptionEventHandler : ILocalEventHandler >(); + if (!options.Value.IsBlazorWebApp) { - var options = scope.ServiceProvider.GetRequiredService (); - navigationManager.NavigateToLogout(authenticationOptions.Value.LogoutUrl, "/"); - } - else - { - var jsRuntime = scope.ServiceProvider.GetRequiredService (); - await jsRuntime.InvokeVoidAsync("eval", "setTimeout(function(){location.assign('/')}, 2000)"); - } - - break; + var authenticationOptions = scope.ServiceProvider.GetRequiredService (); + navigationManager.NavigateToLogout(authenticationOptions.Value.LogoutUrl, "/"); } - case 403: + else { var jsRuntime = scope.ServiceProvider.GetRequiredService (); await jsRuntime.InvokeVoidAsync("eval", "setTimeout(function(){location.assign('/')}, 2000)"); - - break; } } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/CachedBundleDynamicFileProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/CachedBundleDynamicFileProvider.cs new file mode 100644 index 0000000000..2173925878 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/CachedBundleDynamicFileProvider.cs @@ -0,0 +1,57 @@ +using System; +using Microsoft.Extensions.FileProviders; +using Microsoft.Extensions.Options; +using Volo.Abp.Caching; +using Volo.Abp.DependencyInjection; +using Volo.Abp.VirtualFileSystem; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +[Dependency(ReplaceServices = true)] +public class CachedBundleDynamicFileProvider : DynamicFileProvider +{ + protected IDistributedCache Cache { get; } + protected IOptions BundlingOptions { get; } + + public CachedBundleDynamicFileProvider( + IDistributedCache cache, + IOptions bundlingOptions) + { + Cache = cache; + BundlingOptions = bundlingOptions; + } + + public override IFileInfo GetFileInfo(string? subpath) + { + var fileInfo = base.GetFileInfo(subpath); + + if (!subpath.IsNullOrWhiteSpace() && fileInfo is NotFoundFileInfo && + subpath.Contains(BundlingOptions.Value.BundleFolderName, StringComparison.OrdinalIgnoreCase)) + { + var filePath = NormalizePath(subpath); + var cacheItem = Cache.Get(filePath); + if (cacheItem == null) + { + return fileInfo; + } + + fileInfo = new InMemoryFileInfo(filePath, cacheItem.FileContent, cacheItem.Name); + DynamicFiles.AddOrUpdate(filePath, fileInfo, (key, value) => fileInfo); + } + + return fileInfo; + } + + public override void AddOrUpdate(IFileInfo fileInfo) + { + var filePath = fileInfo.GetVirtualOrPhysicalPathOrNull(); + Cache.GetOrAdd(filePath!, () => new InMemoryFileInfoCacheItem(filePath!, fileInfo.ReadBytes(), fileInfo.Name)); + base.AddOrUpdate(fileInfo); + } + + public override bool Delete(string filePath) + { + Cache.Remove(filePath); + return base.Delete(filePath); + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/InMemoryFileInfoCacheItem.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/InMemoryFileInfoCacheItem.cs new file mode 100644 index 0000000000..74082913f1 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/InMemoryFileInfoCacheItem.cs @@ -0,0 +1,22 @@ +using System; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +[Serializable] +[IgnoreMultiTenancy] +public class InMemoryFileInfoCacheItem +{ + public InMemoryFileInfoCacheItem(string dynamicPath, byte[] fileContent, string name) + { + DynamicPath = dynamicPath; + Name = name; + FileContent = fileContent; + } + + public string DynamicPath { get; set; } + + public string Name { get; set; } + + public byte[] FileContent { get; set; } +} diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs index 91bc360f72..0d70ae6aa9 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs @@ -22,8 +22,9 @@ public abstract class BackgroundWorkerBase : IBackgroundWorker protected ILogger Logger => LazyServiceProvider.LazyGetService (provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance); - protected CancellationTokenSource StoppingTokenSource { get; } - protected CancellationToken StoppingToken { get; } + protected CancellationTokenSource StoppingTokenSource { get; set; } + + protected CancellationToken StoppingToken { get; set; } public BackgroundWorkerBase() { diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs index a3cd7372a6..2773b88bed 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs @@ -46,6 +46,12 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions public static string? GetDateEditInputFormatOrNull(this IBasicObjectExtensionPropertyInfo property) { + var dataFormatString = property.GetDataFormatStringOrNull(); + if (dataFormatString != null) + { + return dataFormatString; + } + if (property.IsDate()) { return "{0:yyyy-MM-dd}"; @@ -59,6 +65,14 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions return null; } + public static string? GetDataFormatStringOrNull(this IBasicObjectExtensionPropertyInfo property) + { + return property + .Attributes + .OfType () + .FirstOrDefault()?.DataFormatString; + } + public static string? GetTextInputValueOrNull(this IBasicObjectExtensionPropertyInfo property, object? value) { if (value == null) diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs index 8e494cba2f..ad0f996654 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.BlazoriseUI.Components; public partial class UiPageProgress : ComponentBase, IDisposable { - protected PageProgress PageProgressRef { get; set; } = default!; + protected PageProgress? PageProgressRef { get; set; } protected int? Percentage { get; set; } @@ -33,8 +33,11 @@ public partial class UiPageProgress : ComponentBase, IDisposable Visible = e.Percentage == null || (e.Percentage >= 0 && e.Percentage <= 100); Color = GetColor(e.Options.Type); - await PageProgressRef.SetValueAsync(e.Percentage); - + if(PageProgressRef != null) + { + await PageProgressRef.SetValueAsync(e.Percentage); + } + await InvokeAsync(StateHasChanged); } diff --git a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs index 768a9ba171..c5ae0b5393 100644 --- a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs +++ b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Caching.Distributed; @@ -19,6 +20,8 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems protected static readonly string SlidingExpirationKey; protected static readonly string DataKey; protected static readonly long NotPresent; + protected static readonly RedisValue[] HashMembersAbsoluteExpirationSlidingExpirationData; + protected static readonly RedisValue[] HashMembersAbsoluteExpirationSlidingExpiration; private readonly static FieldInfo SetScriptField; private readonly static FieldInfo RedisDatabaseField; @@ -27,29 +30,29 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems private readonly static MethodInfo MapMetadataMethod; private readonly static MethodInfo GetAbsoluteExpirationMethod; private readonly static MethodInfo GetExpirationInSecondsMethod; + private readonly static MethodInfo OnRedisErrorMethod; - protected IDatabase RedisDatabase => GetRedisDatabase()!; - private IDatabase? _redisDatabase; - - protected string Instance { get; } + protected RedisKey InstancePrefix { get; } static AbpRedisCache() { var type = typeof(RedisCache); - RedisDatabaseField = Check.NotNull(type.GetField("_cache", BindingFlags.Instance | BindingFlags.NonPublic), nameof(RedisDatabaseField))!; + RedisDatabaseField = Check.NotNull(type.GetField("_cache", BindingFlags.Instance | BindingFlags.NonPublic), nameof(RedisDatabaseField)); - SetScriptField = Check.NotNull(type.GetField("_setScript", BindingFlags.Instance | BindingFlags.NonPublic), nameof(SetScriptField))!; + SetScriptField = Check.NotNull(type.GetField("_setScript", BindingFlags.Instance | BindingFlags.NonPublic), nameof(SetScriptField)); - ConnectMethod = Check.NotNull(type.GetMethod("Connect", BindingFlags.Instance | BindingFlags.NonPublic), nameof(ConnectMethod))!; + ConnectMethod = Check.NotNull(type.GetMethod("Connect", BindingFlags.Instance | BindingFlags.NonPublic), nameof(ConnectMethod)); - ConnectAsyncMethod = Check.NotNull(type.GetMethod("ConnectAsync", BindingFlags.Instance | BindingFlags.NonPublic), nameof(ConnectAsyncMethod))!; + ConnectAsyncMethod = Check.NotNull(type.GetMethod("ConnectAsync", BindingFlags.Instance | BindingFlags.NonPublic), nameof(ConnectAsyncMethod)); - MapMetadataMethod = Check.NotNull(type.GetMethod("MapMetadata", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static), nameof(MapMetadataMethod))!; + MapMetadataMethod = Check.NotNull(type.GetMethod("MapMetadata", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static), nameof(MapMetadataMethod)); - GetAbsoluteExpirationMethod = Check.NotNull(type.GetMethod("GetAbsoluteExpiration", BindingFlags.Static | BindingFlags.NonPublic), nameof(GetAbsoluteExpirationMethod))!; + GetAbsoluteExpirationMethod = Check.NotNull(type.GetMethod("GetAbsoluteExpiration", BindingFlags.Static | BindingFlags.NonPublic), nameof(GetAbsoluteExpirationMethod)); - GetExpirationInSecondsMethod = Check.NotNull(type.GetMethod("GetExpirationInSeconds", BindingFlags.Static | BindingFlags.NonPublic), nameof(GetExpirationInSecondsMethod))!; + GetExpirationInSecondsMethod = Check.NotNull(type.GetMethod("GetExpirationInSeconds", BindingFlags.Static | BindingFlags.NonPublic), nameof(GetExpirationInSecondsMethod)); + + OnRedisErrorMethod = Check.NotNull(type.GetMethod("OnRedisError", BindingFlags.Instance | BindingFlags.NonPublic), nameof(OnRedisErrorMethod)); AbsoluteExpirationKey = type.GetField("AbsoluteExpirationKey", BindingFlags.Static | BindingFlags.NonPublic)!.GetValue(null)!.ToString()!; @@ -58,32 +61,30 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems DataKey = type.GetField("DataKey", BindingFlags.Static | BindingFlags.NonPublic)!.GetValue(null)!.ToString()!; NotPresent = type.GetField("NotPresent", BindingFlags.Static | BindingFlags.NonPublic)!.GetValue(null)!.To (); + + HashMembersAbsoluteExpirationSlidingExpirationData = [AbsoluteExpirationKey, SlidingExpirationKey, DataKey]; + + HashMembersAbsoluteExpirationSlidingExpiration = [AbsoluteExpirationKey, SlidingExpirationKey]; } public AbpRedisCache(IOptions optionsAccessor) : base(optionsAccessor) { - Instance = optionsAccessor.Value.InstanceName ?? string.Empty; - } - - protected virtual void Connect() - { - if (GetRedisDatabase() != null) + var instanceName = optionsAccessor.Value.InstanceName; + if (!string.IsNullOrEmpty(instanceName)) { - return; + InstancePrefix = (RedisKey)Encoding.UTF8.GetBytes(instanceName); } + } - ConnectMethod.Invoke(this, Array.Empty
-
-
-
+
+
-
- }
+ }
+
@L["MemberNotPublishedPostYet"]
+ } + else + { +
+
-
+
@L["MemberNotPublishedPostYet"]
+