Merge branch 'dev' of https://github.com/volosoft/abp into dev

docs/en/Background-Jobs-Quartz.md

@@ -0,0 +1,73 @@
+# Quartz Background Job Manager
+
+[Quartz](https://www.quartz-scheduler.net/) is an advanced background job manager. You can integrate Quartz with the ABP Framework to use it instead of the [default background job manager](Background-Jobs.md). In this way, you can use the same background job API for Quartz and your code will be independent of Quartz. If you like, you can directly use Quartz's API, too.
+
+> See the [background jobs document](Background-Jobs.md) to learn how to use the background job system. This document only shows how to install and configure the Quartz integration.
+
+## Installation
+
+It is suggested to use the [ABP CLI](CLI.md) to install this package.
+
+### Using the ABP CLI
+
+Open a command line window in the folder of the project (.csproj file) and type the following command:
+
+````bash
+abp add-package Volo.Abp.BackgroundJobs.Quartz
+````
+
+### Manual Installation
+
+If you want to manually install;
+
+1. Add the [Volo.Abp.BackgroundJobs.Quartz](https://www.nuget.org/packages/Volo.Abp.BackgroundJobs.Quartz) NuGet package to your project:
+
+   ````
+   Install-Package Volo.Abp.BackgroundJobs.Quartz
+   ````
+
+2. Add the `AbpBackgroundJobsQuartzModule` to the dependency list of your module:
+
+````csharp
+[DependsOn(
+    //...other dependencies
+    typeof(AbpBackgroundJobsQuartzModule) //Add the new module dependency
+    )]
+public class YourModule : AbpModule
+{
+}
+````
+
+## Configuration
+
+Quartz is a very configurable library,and the ABP framework provides `AbpQuartzPreOptions` for this. You can use the `PreConfigure` method in your module class to pre-configure this option. ABP will use it when initializing the Quartz module. For example:
+
+````csharp
+[DependsOn(
+    //...other dependencies
+    typeof(AbpBackgroundJobsQuartzModule) //Add the new module dependency
+    )]
+public class YourModule : AbpModule
+{
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        var configuration = context.Services.GetConfiguration();
+
+        PreConfigure<AbpQuartzPreOptions>(options =>
+        {
+            options.Properties = new NameValueCollection
+            {
+                ["quartz.jobStore.dataSource"] = "BackgroundJobsDemoApp",
+                ["quartz.jobStore.type"] = "Quartz.Impl.AdoJobStore.JobStoreTX, Quartz",
+                ["quartz.jobStore.tablePrefix"] = "QRTZ_",
+                ["quartz.serializer.type"] = "json",
+                ["quartz.dataSource.BackgroundJobsDemoApp.connectionString"] = configuration.GetConnectionString("Quartz"),
+                ["quartz.dataSource.BackgroundJobsDemoApp.provider"] = "SqlServer",
+                ["quartz.jobStore.driverDelegateType"] = "Quartz.Impl.AdoJobStore.SqlServerDelegate, Quartz",
+            };
+        });
+    }
+}
+````
+
+Quartz stores job and scheduling information **in memory by default**. In the example, we use the pre-configuration of [options pattern](Options.md) to change it to the database. For more configuration of Quartz, please refer to the Quartz's [documentation](https://www.quartz-scheduler.net/documentation/quartz-3.x/tutorial/index.html).

docs/en/Background-Jobs.md

@@ -11,7 +11,7 @@ Background jobs are **persistent** that means they will be **re-tried** and **ex
 
 ## Abstraction Package
 
-ABP provides an **abstraction** module and **several implementations** for background jobs. It has a built-in/default implementation as well as Hangfire and RabbitMQ integrations.
+ABP provides an **abstraction** module and **several implementations** for background jobs. It has a built-in/default implementation as well as Hangfire, RabbitMQ and Quartz integrations.
 
 `Volo.Abp.BackgroundJobs.Abstractions` nuget package provides needed services to create background jobs and queue background job items. If your module only depend on this package, it can be independent from the actual implementation/integration.
 

docs/en/Background-Worker.md

@@ -0,0 +1,3 @@
+# Background Workers
+
+TODO

docs/en/Background-Workers-Quartz.md

@@ -0,0 +1,68 @@
+# Quartz Background Worker Manager
+
+[Quartz](https://www.quartz-scheduler.net/) is an advanced background worker manager. You can integrate Quartz with the ABP Framework to use it instead of the [default background worker manager](Background-Worker.md). ABP simply integrates quartz.
+
+## Installation
+
+It is suggested to use the [ABP CLI](CLI.md) to install this package.
+
+### Using the ABP CLI
+
+Open a command line window in the folder of the project (.csproj file) and type the following command:
+
+````bash
+abp add-package Volo.Abp.BackgroundWorkers.Quartz
+````
+
+### Manual Installation
+
+If you want to manually install;
+
+1. Add the [Volo.Abp.BackgroundWorkers.Quartz](https://www.nuget.org/packages/Volo.Abp.BackgroundWorkers.Quartz) NuGet package to your project:
+
+   ````
+   Install-Package Volo.Abp.BackgroundWorkers.Quartz
+   ````
+
+2. Add the `AbpBackgroundWorkersQuartzModule` to the dependency list of your module:
+
+````csharp
+[DependsOn(
+    //...other dependencies
+    typeof(AbpBackgroundWorkersQuartzModule) //Add the new module dependency
+    )]
+public class YourModule : AbpModule
+{
+}
+````
+
+### Configuration
+
+See [Configuration](Background-Jobs-Quartz.md#Configuration).
+
+### Create a Background Worker
+
+A background work is a class that derives from the `QuartzBackgroundWorkerBase` base class. for example. A simple worker class is shown below:
+
+```` csharp
+public class MyLogWorker : QuartzBackgroundWorkerBase
+{
+    public MyLogWorker()
+    {
+        JobDetail = JobBuilder.Create<MyLogWorker>().Build();
+        Trigger = TriggerBuilder.Create().StartNow().Build();
+    }
+
+    public override Task Execute(IJobExecutionContext context)
+    {
+        Logger.LogInformation("Executed MyLogWorker..!");
+        return Task.CompletedTask;
+    }
+}
+````
+
+We simply implemented the Execute method to write a log. The background worker is a **singleton by default**. If you want, you can also implement a [dependency interface](Dependency-Injection.md#DependencyInterfaces) to register it as another life cycle.
+
+### More
+
+Please see Quartz's [documentation](https://www.quartz-scheduler.net/documentation/index.html) for more information.

docs/en/docs-nav.json

@@ -348,6 +348,20 @@
             {
               "text": "RabbitMQ Integration",
               "path": "Background-Jobs-RabbitMq.md"
+            },
+            {
+              "text": "Quartz Integration",
+              "path": "Background-Jobs-Quartz.md"
+            }
+          ]
+        },
+        {
+          "text": "Background Workers",
+          "path": "Background-Workers.md",
+          "items": [
+            {
+              "text": "Quartz Integration",
+              "path": "Background-Workers-Quartz.md"
             }
           ]
         }

docs/zh-Hans/Background-Jobs-Quartz.md

@@ -0,0 +1,73 @@
+# Quartz 后台作业管理
+
+[Quartz](https://www.quartz-scheduler.net/)是一个高级的作业管理. 你可以用ABP框架集成Quartz代替[默认后台作业管理](Background-Jobs.md). 通过这种方式你可以使用相同的后台作业API,将你的代码独立于Quartz. 如果你喜欢也可以直接使用Quartz的API.
+
+> 参阅[后台作业文档](Background-Jobs.md),学习如何使用后台作业系统. 本文只介绍了如何安装和配置Quartz集成.
+
+## 安装
+
+建议使用[ABP CLI](CLI.md)安装包.
+
+### 使用ABP CLI
+
+在项目的文件夹(.csproj文件)中打开命令行窗口输入以下命令:
+
+````bash
+abp add-package Volo.Abp.BackgroundJobs.Quartz
+````
+
+### 手动安装
+
+如果你想手动安装;
+
+1. 添加 [Volo.Abp.BackgroundJobs.Quartz](https://www.nuget.org/packages/Volo.Abp.BackgroundJobs.Quartz) NuGet包添加到你的项目:
+
+   ````
+   Install-Package Volo.Abp.BackgroundJobs.Quartz
+   ````
+
+2. 添加 `AbpBackgroundJobsQuartzModule` 到你的模块的依赖列表:
+
+````csharp
+[DependsOn(
+    //...other dependencies
+    typeof(AbpBackgroundJobsQuartzModule) //Add the new module dependency
+    )]
+public class YourModule : AbpModule
+{
+}
+````
+
+## 配置
+
+Quartz是一个可配置的类库,对此ABP框架提供了 `AbpQuartzPreOptions`. 你可以在模块预配置此选项,ABP在初始化Quartz模块时将使用它. 例:
+
+````csharp
+[DependsOn(
+    //...other dependencies
+    typeof(AbpBackgroundJobsQuartzModule) //Add the new module dependency
+    )]
+public class YourModule : AbpModule
+{
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        var configuration = context.Services.GetConfiguration();
+
+        PreConfigure<AbpQuartzPreOptions>(options =>
+        {
+            options.Properties = new NameValueCollection
+            {
+                ["quartz.jobStore.dataSource"] = "BackgroundJobsDemoApp",
+                ["quartz.jobStore.type"] = "Quartz.Impl.AdoJobStore.JobStoreTX, Quartz",
+                ["quartz.jobStore.tablePrefix"] = "QRTZ_",
+                ["quartz.serializer.type"] = "json",
+                ["quartz.dataSource.BackgroundJobsDemoApp.connectionString"] = configuration.GetConnectionString("Quartz"),
+                ["quartz.dataSource.BackgroundJobsDemoApp.provider"] = "SqlServer",
+                ["quartz.jobStore.driverDelegateType"] = "Quartz.Impl.AdoJobStore.SqlServerDelegate, Quartz",
+            };
+        });
+    }
+}
+````
+
+Quartz**默认**将作业与调度信息存储在**内存**中,示例中我们使用[选项模式](Options.md)的预配置将其更改为存储到数据库中. 有关Quartz的更多配置请参阅[Quartz文档](https://www.quartz-scheduler.net/documentation/quartz-3.x/tutorial/index.html).

docs/zh-Hans/Background-Jobs.md

@@ -7,13 +7,13 @@
 - 为执行**长时间运行的任务**而用户无需等待, 例如:用户按了一下"报告"按钮开始一个长时间运行的报告任务, 你把这个任务添加到**队列**里,并在完成后通过电子邮件将报告的结果发送给你的用户.
 - 创建**可重试**和**持久的任务**以**确保**代码将**成功执行**. 例如, 你可以在后台作业中发送电子邮件以克服**临时故障**并**保证**最终发送. 这样用户不需要在发送电子邮件时等待.
 
-后台作业是**持久性的**这意味着即使你的应用程序崩溃了, 后台左右也会在稍后**重试**并**执行**.
+后台作业是**持久性的**这意味着即使你的应用程序崩溃了, 后台作业也会在稍后**重试**并**执行**.
 
 ABP为后台作业提供了一个**抽象**模块和几个后台作业**实现**. 它具有内置/默认的实现以及与Hangfire和RabbitMQ的集成.
 
 ## 抽象模块
 
-ABP为后台作业提供了一个 **abstraction** 模块和 **多个实现**. 它有一个内置/默认实现以及Hangfire与RabbitMQ集成.
+ABP为后台作业提供了一个 **抽象** 模块和 **多个实现**. 它有一个内置/默认实现以及Hangfire,RabbitMQ与Quartz集成.
 
 `Volo.Abp.BackgroundJobs.Abstractions` nuget package 提供了创建后台作业和队列作业所需要的服务. 如果你的模块只依赖这个包,那么它可以独立于其实现/集成.
 
@@ -174,4 +174,5 @@ public class MyModule : AbpModule
 请参阅预构建的作业管理器备选方案:
 
 * [Hangfire 后台作业管理器](Background-Jobs-Hangfire.md)
-* [RabbitMQ 后台作业管理器](Background-Jobs-RabbitMq.md)
+* [RabbitMQ 后台作业管理器](Background-Jobs-RabbitMq.md)
+* [Quartz 后台作业管理器](Background-Jobs-Quartz.md)

docs/zh-Hans/Background-Workers-Quartz.md

@@ -0,0 +1,68 @@
+# Quartz 后台工作者管理
+
+[Quartz](https://www.quartz-scheduler.net/)是一个高级的后台工作者管理. 你可以用ABP框架集成Quartz代替[默认后台工作者管理](Background-Workers.md). ABP简单的集成了Quartz.
+
+## 安装
+
+建议使用[ABP CLI](CLI.md)安装包.
+
+### 使用ABP CLI
+
+在项目的文件夹(.csproj文件)中打开命令行窗口输入以下命令:
+
+````bash
+abp add-package Volo.Abp.BackgroundWorkers.Quartz
+````
+
+### 手动安装
+
+如果你想手动安装;
+
+1. 添加 [Volo.Abp.BackgroundWorkers.Quartz](https://www.nuget.org/packages/Volo.Abp.BackgroundWorkers.Quartz) NuGet包添加到你的项目:
+
+   ````
+   Install-Package Volo.Abp.BackgroundWorkers.Quartz
+   ````
+
+2. 添加 `AbpBackgroundWorkersQuartzModule` 到你的模块的依赖列表:
+
+````csharp
+[DependsOn(
+    //...other dependencies
+    typeof(AbpBackgroundWorkersQuartzModule) //Add the new module dependency
+    )]
+public class YourModule : AbpModule
+{
+}
+````
+
+### 配置
+
+参阅[配置](Background-Jobs-Quartz.md#配置).
+
+### 创建后台工作者
+
+后台工作者是一个继承自 `QuartzBackgroundWorkerBase` 基类的类. 一个简单的工作者如下所示:
+
+```` csharp
+public class MyLogWorker : QuartzBackgroundWorkerBase
+{
+    public MyLogWorker()
+    {
+        JobDetail = JobBuilder.Create<MyLogWorker>().Build();
+        Trigger = TriggerBuilder.Create().StartNow().Build();
+    }
+
+    public override Task Execute(IJobExecutionContext context)
+    {
+        Logger.LogInformation("Executed MyLogWorker..!");
+        return Task.CompletedTask;
+    }
+}
+````
+
+示例中我们重写了 `Execute` 方法写入日志. 后台工作者默认是**单例**. 如果你需要,也可以实现[依赖接口](Dependency-Injection.md#依赖接口)将其注册为其他的生命周期.
+
+### 更多
+
+参阅Quartz[文档](https://www.quartz-scheduler.net/documentation/index.html)了解更多信息.

docs/zh-Hans/Background-Workers.md

@@ -0,0 +1,3 @@
+# 后台工作者
+
+TODO

docs/zh-Hans/docs-nav.json

@@ -328,6 +328,20 @@
             {
               "text": "RabbitMQ 集成",
               "path": "Background-Jobs-RabbitMq.md"
+            },
+            {
+              "text": "Quartz 集成",
+              "path": "Background-Jobs-Quartz.md"
+            }
+          ]
+        },
+        {
+          "text": "后台工作者",
+          "path": "Background-Workers.md",
+          "items": [
+            {
+              "text": "Quartz 集成",
+              "path": "Background-Workers-Quartz.md"
             }
           ]
         }

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpStringLocalizerFactory.cs

@@ -38,10 +38,18 @@ namespace Volo.Abp.Localization
                 return _innerFactory.Create(resourceType);
             }
 
-            return _localizerCache.GetOrAdd(
+            if (_localizerCache.TryGetValue(resourceType, out var cacheItem))
-                resourceType,
+            {
-                _ => CreateStringLocalizerCacheItem(resource)
+                return cacheItem.Localizer;
-            ).Localizer;
+            }
+
+            lock (_localizerCache)
+            {
+                return _localizerCache.GetOrAdd(
+                    resourceType,
+                    _ => CreateStringLocalizerCacheItem(resource)
+                ).Localizer;
+            }
         }
 
         private StringLocalizerCacheItem CreateStringLocalizerCacheItem(LocalizationResource resource)