Modify the way the mail template is defined as the standard way of the framework.

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs

@@ -1,6 +1,8 @@
-using Volo.Abp.BackgroundJobs;
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Emailing.Templates;
-using Volo.Abp.Emailing.Templates.Virtual;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.Settings;
@@ -16,6 +18,11 @@ namespace Volo.Abp.Emailing
         )]
     public class AbpEmailingModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            AutoAddDefinitionProviders(context.Services);
+        }
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<VirtualFileSystemOptions>(options =>
@@ -27,18 +34,26 @@ namespace Volo.Abp.Emailing
             {
                 options.AddJob<BackgroundEmailSendingJob>();
             });
+        }
+
+        private static void AutoAddDefinitionProviders(IServiceCollection services)
+        {
+            var definitionProviders = new List<Type>();
 
-            Configure<EmailTemplateOptions>(options =>
+            services.OnRegistred(context =>
             {
-                options.Templates
-                    .Add(
-                        new EmailTemplateDefinition(StandardEmailTemplates.DefaultLayout, isLayout: true, layout: null)
-                            .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/DefaultLayout.html")
-                    ).Add(
-                        new EmailTemplateDefinition(StandardEmailTemplates.SimpleMessage)
-                            .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/SimpleMessageTemplate.html")
-                    );
+
+                if (typeof(IEmailTemplateDefinitionProvider).IsAssignableFrom(context.ImplementationType))
+                {
+                    definitionProviders.Add(context.ImplementationType);
+                }
+            });
+
+            services.Configure<EmailTemplateOptions>(options =>
+            {
+                options.DefinitionProviders.AddIfNotContains(definitionProviders);
             });
         }
+
     }
 }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs

@@ -0,0 +1,16 @@
+using Volo.Abp.Emailing.Templates.Virtual;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class DefaultEmailTemplateProvider : EmailTemplateDefinitionProvider
+    {
+        public override void Define(IEmailTemplateDefinitionContext context)
+        {
+            context.Add(new EmailTemplateDefinition(StandardEmailTemplates.DefaultLayout, isLayout: true, layout: null)
+                .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/DefaultLayout.html"));
+
+            context.Add(new EmailTemplateDefinition(StandardEmailTemplates.SimpleMessage)
+                .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/SimpleMessageTemplate.html"));
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionContext.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class EmailTemplateDefinitionContext : IEmailTemplateDefinitionContext
+    {
+        protected Dictionary<string, EmailTemplateDefinition> EmailTemplates { get; }
+
+        public EmailTemplateDefinitionContext(Dictionary<string, EmailTemplateDefinition> emailTemplates)
+        {
+            EmailTemplates = emailTemplates;
+        }
+
+        public virtual EmailTemplateDefinition GetOrNull(string name)
+        {
+            return EmailTemplates.GetOrDefault(name);
+        }
+
+        public virtual IReadOnlyList<EmailTemplateDefinition> GetAll()
+        {
+            return EmailTemplates.Values.ToImmutableList();
+        }
+
+        public virtual void Add(params EmailTemplateDefinition[] definitions)
+        {
+            if (definitions.IsNullOrEmpty())
+            {
+                return;
+            }
+
+            foreach (var definition in definitions)
+            {
+                EmailTemplates[definition.Name] = definition;
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public class EmailTemplateDefinitionManager : IEmailTemplateDefinitionManager, ISingletonDependency
+    {
+        protected Lazy<IDictionary<string, EmailTemplateDefinition>> EmailTemplateDefinitions { get; }
+
+        protected EmailTemplateOptions Options { get; }
+
+        protected IServiceProvider ServiceProvider { get; }
+
+        public EmailTemplateDefinitionManager(
+            IOptions<EmailTemplateOptions> options,
+            IServiceProvider serviceProvider)
+        {
+            ServiceProvider = serviceProvider;
+            Options = options.Value;
+
+            EmailTemplateDefinitions =
+                new Lazy<IDictionary<string, EmailTemplateDefinition>>(CreateEmailTemplateDefinitions, true);
+        }
+
+        public virtual EmailTemplateDefinition Get(string name)
+        {
+            Check.NotNull(name, nameof(name));
+
+            var template = GetOrNull(name);
+
+            if (template == null)
+            {
+                throw new AbpException("Undefined template: " + name);
+            }
+
+            return template;
+        }
+
+        public virtual IReadOnlyList<EmailTemplateDefinition> GetAll()
+        {
+            return EmailTemplateDefinitions.Value.Values.ToImmutableList();
+        }
+
+        public virtual EmailTemplateDefinition GetOrNull(string name)
+        {
+            return EmailTemplateDefinitions.Value.GetOrDefault(name);
+        }
+
+        protected virtual IDictionary<string, EmailTemplateDefinition> CreateEmailTemplateDefinitions()
+        {
+            var templates = new Dictionary<string, EmailTemplateDefinition>();
+
+            using (var scope = ServiceProvider.CreateScope())
+            {
+                var providers = Options
+                    .DefinitionProviders
+                    .Select(p => scope.ServiceProvider.GetRequiredService(p) as IEmailTemplateDefinitionProvider)
+                    .ToList();
+
+                foreach (var provider in providers)
+                {
+                    provider.Define(new EmailTemplateDefinitionContext(templates));
+                }
+            }
+
+            return templates;
+        }
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionProvider.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public abstract class EmailTemplateDefinitionProvider : IEmailTemplateDefinitionProvider, ITransientDependency
+    {
+        public abstract void Define(IEmailTemplateDefinitionContext context);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Volo.Abp.Collections;
 using Volo.Abp.Emailing.Templates.Virtual;
 
 namespace Volo.Abp.Emailing.Templates
@@ -7,10 +8,10 @@ namespace Volo.Abp.Emailing.Templates
     {
         public List<IEmailTemplateProviderContributor> Providers { get; }
 
-        public EmailTemplateDefinitionDictionary Templates { get; }
-
         public string DefaultLayout { get; set; }
 
+        public ITypeList<IEmailTemplateDefinitionProvider> DefinitionProviders { get; }
+
         public EmailTemplateOptions()
         {
             Providers = new List<IEmailTemplateProviderContributor>
@@ -18,9 +19,9 @@ namespace Volo.Abp.Emailing.Templates
                 new VirtualFileEmailTemplateProviderContributor()
             };
 
-            Templates = new EmailTemplateDefinitionDictionary();
-
             DefaultLayout = StandardEmailTemplates.DefaultLayout;
+
+            DefinitionProviders = new TypeList<IEmailTemplateDefinitionProvider>();
         }
     }
 }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionContext.cs

@@ -0,0 +1,9 @@
+namespace Volo.Abp.Emailing.Templates
+{
+    public interface IEmailTemplateDefinitionContext
+    {
+        EmailTemplateDefinition GetOrNull(string name);
+
+        void Add(params EmailTemplateDefinition[] definitions);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionManager.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Emailing.Templates
+{
+    public interface IEmailTemplateDefinitionManager
+    {
+        [NotNull]
+        EmailTemplateDefinition Get([NotNull] string name);
+
+        IReadOnlyList<EmailTemplateDefinition> GetAll();
+
+        EmailTemplateDefinition GetOrNull(string name);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionProvider.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.Emailing.Templates
+{
+    public interface IEmailTemplateDefinitionProvider
+    {
+        void Define(IEmailTemplateDefinitionContext context);
+    }
+}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Virtual/VirtualFileEmailTemplateProviderContributor.cs

@@ -33,10 +33,8 @@ namespace Volo.Abp.Emailing.Templates.Virtual
         {
             return contributorContext
                 .ServiceProvider
-                .GetRequiredService<IOptions<EmailTemplateOptions>>()
-                .Value
-                .Templates
-                .GetOrDefault(contributorContext.Name);
+                .GetRequiredService<IEmailTemplateDefinitionManager>()
+                .GetOrNull(contributorContext.Name);
         }
 
         protected virtual IFileInfo FindVirtualFileInfo(EmailTemplateProviderContributorContext contributorContext, EmailTemplateDefinition templateDefinition)

framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Volo.Abp.Emailing\Volo.Abp.Emailing.csproj" />
+    <ProjectReference Include="..\..\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
   </ItemGroup>

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs

@@ -1,7 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Emailing.Templates;
-using Volo.Abp.Emailing.Templates.Virtual;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.Emailing
@@ -17,13 +14,6 @@ namespace Volo.Abp.Emailing
             {
                 options.FileSets.AddEmbedded<AbpEmailingTestModule>();
             });
-
-            Configure<EmailTemplateOptions>(options =>
-            {
-                options.Templates["template1"] =
-                    new EmailTemplateDefinition("template1")
-                        .SetVirtualFilePath("/Volo/Abp/Emailing/TestTemplates/template1.html");
-            });
         }
     }
-}
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/EmailTemplateStore_Tests.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Shouldly;
 using Volo.Abp.Emailing.Templates;
 using Xunit;
@@ -7,6 +7,11 @@ namespace Volo.Abp.Emailing
 {
     public class EmailTemplateStore_Tests : AbpIntegratedTest<AbpEmailingTestModule>
     {
+        protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
+        {
+            options.UseAutofac();
+        }
+
         private readonly IEmailTemplateProvider _emailTemplateProvider;
 
         public EmailTemplateStore_Tests()

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestEmailTemplateProvider.cs

@@ -0,0 +1,14 @@
+using Volo.Abp.Emailing.Templates;
+using Volo.Abp.Emailing.Templates.Virtual;
+
+namespace Volo.Abp.Emailing
+{
+    public class TestEmailTemplateProvider : EmailTemplateDefinitionProvider
+    {
+        public override void Define(IEmailTemplateDefinitionContext context)
+        {
+            context.Add(new EmailTemplateDefinition("template1")
+                .SetVirtualFilePath("/Volo/Abp/Emailing/TestTemplates/template1.html"));
+        }
+    }
+}