Merge pull request #1389 from colinin/update-cli-template

feat: update template and cli

aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj

@@ -5,7 +5,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>9.1.1</Version>
+		<Version>9.3.6</Version>
 		<Copyright>colin</Copyright>
 		<Description>Use LINGYUN.MicroService.Templates command line</Description>
 		<PackAsTool>true</PackAsTool>

aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateCommand.cs

@@ -114,12 +114,6 @@ namespace LINGYUN.Abp.Cli.Commands
                 Logger.LogInformation("DBMS: " + databaseManagementSystem);
             }
 
-            var telemetryProvider = GetTelemetryProvider(commandLineArgs);
-            if (!telemetryProvider.IsNullOrWhiteSpace())
-            {
-                Logger.LogInformation("Telemetry provider: " + telemetryProvider);
-            }
-
             var randomPort = string.IsNullOrWhiteSpace(
                 commandLineArgs.Options.GetOrNull(CreateOptions.NoRandomPort.Short, CreateOptions.NoRandomPort.Long));
             var applicationPort = randomPort ? RandomHelper.GetRandom(5001, 65535).ToString() : "5000";
@@ -172,8 +166,7 @@ namespace LINGYUN.Abp.Cli.Commands
                 commandLineArgs.Options,
                 connectionString,
                 applicationPort,
-                daprPort,
+                daprPort
-                telemetryProvider
             );
 
             await CreateProjectService.CreateAsync(projectArgs);
@@ -204,7 +197,6 @@ namespace LINGYUN.Abp.Cli.Commands
             sb.AppendLine("-csf|--create-solution-folder               (default: true)");
             sb.AppendLine("-cs|--connection-string <connection-string> (your database connection string)");
             sb.AppendLine("--dbms <database-management-system>         (your database management system)");
-            sb.AppendLine("--tm <telemetry>                            (your telemetry provider, optional: SkyWalking、OpenTelemetry, default: OpenTelemetry)");
             sb.AppendLine("--no-random-port                            (Use template's default ports)");
             sb.AppendLine("");
             sb.AppendLine("Examples:");
@@ -217,7 +209,6 @@ namespace LINGYUN.Abp.Cli.Commands
             sb.AppendLine("  labp create Acme.BookStore -csf false");
             sb.AppendLine("  labp create Acme.BookStore --local-framework-ref --abp-path \"D:\\github\\abp\"");
             sb.AppendLine("  labp create Acme.BookStore --dbms mysql");
-            sb.AppendLine("  labp create Acme.BookStore --tm SkyWalking");
             sb.AppendLine("  labp create Acme.BookStore --connection-string \"Server=myServerName\\myInstanceName;Database=myDatabase;User Id=myUsername;Password=myPassword\"");
             sb.AppendLine("");
             // TODO: 文档
@@ -232,14 +223,6 @@ namespace LINGYUN.Abp.Cli.Commands
                 || commandLineArgs.Options.ContainsKey(NewCommand.Options.CreateSolutionFolder.Short);
         }
 
-        protected virtual string GetTelemetryProvider(CommandLineArgs commandLineArgs)
-        {
-            var provider = commandLineArgs.Options.GetOrNull(
-                CreateOptions.Telemetry.Short,
-                CreateOptions.Telemetry.Long);
-            return string.IsNullOrWhiteSpace(provider) ? "OpenTelemetry" : provider;
-        }
-
         protected virtual DatabaseProvider GetDatabaseProvider(CommandLineArgs commandLineArgs)
         {
             var optionValue = commandLineArgs.Options.GetOrNull(

aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateOptions.cs

@@ -21,11 +21,5 @@
             public const string Short = "nrp";
             public const string Long = "no-random-port";
         }
-
-        public static class Telemetry
-        {
-            public const string Short = "tm";
-            public const string Long = "telemetry";
-        }
     }
 }

aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/LocalFileCreateProjectService.cs

@@ -63,7 +63,6 @@ namespace LINGYUN.Abp.Cli.Commands
             commandBuilder.AppendFormat(" -n {0}", createArgs.SolutionName.ProjectName);
             commandBuilder.AppendFormat(" -o {0}", createArgs.OutputFolder);
             commandBuilder.AppendFormat(" --DatabaseManagement {0}", dbm);
-            commandBuilder.AppendFormat(" --Telemetry {0}", createArgs.TelemetryProvider);
 
             Logger.LogInformation("Execute command: " + commandBuilder.ToString());
 

aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/ProjectCreateArgs.cs

@@ -9,7 +9,6 @@ namespace LINGYUN.Abp.Cli.Commands
         public string PackageName { get; }
         public string ApplicationPort { get; }
         public string DaprPort { get; }
-        public string TelemetryProvider { get; }
         public ProjectCreateArgs(
             string packageName,
             SolutionName solutionName, 
@@ -27,8 +26,7 @@ namespace LINGYUN.Abp.Cli.Commands
             Dictionary<string, string> extraProperties = null, 
             string connectionString = null,
             string applicationPort = "5000",
-            string daprPort = "3500",
+            string daprPort = "3500") 
-            string telemetryProvider = "OpenTelemetry") 
             : base(
                   solutionName, 
                   templateName, 
@@ -48,7 +46,6 @@ namespace LINGYUN.Abp.Cli.Commands
             PackageName = packageName;
             ApplicationPort = applicationPort;
             DaprPort = daprPort;
-            TelemetryProvider = telemetryProvider;
         }
     }
 }

aspnet-core/templates/micro/PackageName.CompanyName.ProjectName.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>LINGYUN.Abp.MicroService.Templates</PackageId>
-    <Version>9.2.0</Version>
+    <Version>9.3.6</Version>
     <Authors>colin.in@foxmail.com</Authors>
     <Description>Abp framework micro-service template</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

aspnet-core/templates/micro/content/.gitignore

@@ -0,0 +1,11 @@
+.vs
+bin
+obj
+logs
+LocalNuget
+Modules
+TestResults
+appsettings.Development.json
+appsettings.Staging.json
+appsettings.Production.json
+

aspnet-core/templates/micro/content/.template.config/template.json

@@ -30,23 +30,6 @@
   "sourceName": "ProjectName",
   "preferNameDirectory": true,
   "symbols": {
-    "Telemetry": {
-      "type": "parameter",
-      "description": "Distributed tracking provider",
-      "datatype": "choice",
-      "defaultValue": "OpenTelemetry",
-      "isRequired": false,
-      "choices": [
-        {
-          "choice": "SkyWalking",
-          "description": "Use SkyWalking"
-        },
-        {
-          "choice": "OpenTelemetry",
-          "description": "Use OpenTelemetry"
-        }
-      ]
-    },
     "DatabaseManagement": {
       "type": "parameter",
       "description": "Database Management",
@@ -103,14 +86,6 @@
     "PostgreSql": {
       "type": "computed",
       "value": "(DatabaseManagement == \"PostgreSql\")"
-    },
-    "SkyWalking": {
-      "type": "computed",
-      "value": "(Telemetry == \"SkyWalking\")"
-    },
-    "OpenTelemetry": {
-      "type": "computed",
-      "value": "(Telemetry == \"OpenTelemetry\")"
     }
   }
 }

aspnet-core/templates/micro/content/.template.config/template.zh-Hans.json

@@ -1,5 +1,4 @@
 {
   "description": "适用于abp框架的微服务模板项目",
-  "symbols/Telemetry/description": "微服务追踪提供者, 可选项为: SkyWalking、OpenTelemetry, 默认使用OpenTelemetry.",
   "symbols/DatabaseManagement/description": "数据库管理提供者, 可选项为: SqlServer、MySQL、Sqlite、Oracle、OracleDevart、PostgreSql, 默认使用MySQL."
 }

aspnet-core/templates/micro/content/Directory.Packages.props

@@ -2,11 +2,11 @@
 	<PropertyGroup>
 		<DotNetCoreCAPPackageVersion>8.3.5</DotNetCoreCAPPackageVersion>
 		<ElsaPackageVersion>2.15.1</ElsaPackageVersion>
-		<VoloAbpPackageVersion>9.2.0</VoloAbpPackageVersion>
+		<VoloAbpPackageVersion>9.3.6</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>9.2.0</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>9.3.6</LINGYUNAbpPackageVersion>
-		<MicrosoftExtensionsPackageVersion>9.0.4</MicrosoftExtensionsPackageVersion>
+		<MicrosoftExtensionsPackageVersion>9.0.5</MicrosoftExtensionsPackageVersion>
-		<MicrosoftAspNetCorePackageVersion>9.0.4</MicrosoftAspNetCorePackageVersion>
+		<MicrosoftAspNetCorePackageVersion>9.0.5</MicrosoftAspNetCorePackageVersion>
-		<MicrosoftEntityFrameworkCorePackageVersion>9.0.4</MicrosoftEntityFrameworkCorePackageVersion>
+		<MicrosoftEntityFrameworkCorePackageVersion>9.0.5</MicrosoftEntityFrameworkCorePackageVersion>
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 	</PropertyGroup>
 
@@ -243,7 +243,7 @@
 
 	<!-- Abp Framework -->
 	<ItemGroup>
-		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.2.0" />
+		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.3.6" />
 		<PackageVersion Include="Volo.Abp.Core" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.Account.Application" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.Account.Application.Contracts" Version="$(VoloAbpPackageVersion)" />
@@ -290,6 +290,7 @@
 		<PackageVersion Include="Volo.Abp.DistributedLocking" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.EntityFrameworkCore" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.EntityFrameworkCore.MySql" Version="$(VoloAbpPackageVersion)" />
+		<PackageVersion Include="Volo.Abp.EntityFrameworkCore.MySql.Pomelo" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.EntityFrameworkCore.Oracle" Version="$(VoloAbpPackageVersion)" />
@@ -391,8 +392,9 @@
 		<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsPackageVersion)" />
 		<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsPackageVersion)" />
 		<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsPackageVersion)" />
-		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
+		<PackageVersion Include="MySql.EntityFrameworkCore" Version="9.0.6" />
-		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql.Json.Microsoft" Version="9.0.0-preview.3.efcore.9.0.0" />
+		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
+		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql.Json.Microsoft" Version="9.0.0" />
 	</ItemGroup>
 
 	<!-- Elsa -->

aspnet-core/templates/micro/content/PackageName.CompanyName.ProjectName.sln

@@ -9,6 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.Pro
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solution Items", "{C9675742-7986-4BC1-9781-FD1C3C5B6287}"
 	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
 		common.props = common.props
 		configureawait.props = configureawait.props
 		Directory.Build.props = Directory.Build.props

aspnet-core/templates/micro/content/common.props

@@ -1,12 +1,12 @@
 <Project>
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
-		<Version>9.2.0</Version>
+		<Version>9.3.6</Version>
 		<Authors>colin</Authors>
 		<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
 		<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
 		<PackageOutputPath>$(SolutionDir)LocalNuget</PackageOutputPath>
-		<PackageVersion>9.2.0</PackageVersion>
+		<PackageVersion>9.3.6</PackageVersion>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>

aspnet-core/templates/micro/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj

@@ -31,8 +31,8 @@
 		<PackageReference Include="LINGYUN.Abp.Serilog.Enrichers.Application" />
 		<PackageReference Include="LINGYUN.Abp.Serilog.Enrichers.UniqueId" />
 		<PackageReference Include="LINGYUN.Abp.TextTemplating.EntityFrameworkCore" />
-		<PackageReference Include="LINGYUN.Abp.Telemetry.SkyWalking" Condition="'$(SkyWalking)'=='true'" />
+		<PackageReference Include="LINGYUN.Abp.Telemetry.SkyWalking" />
-		<PackageReference Include="LINGYUN.Abp.Telemetry.OpenTelemetry" Condition="'$(OpenTelemetry)'=='true'" />
+		<PackageReference Include="LINGYUN.Abp.Telemetry.OpenTelemetry" />
 		<PackageReference Include="LINGYUN.Abp.Emailing.Platform" />
 		<PackageReference Include="LINGYUN.Abp.Sms.Platform" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />

aspnet-core/templates/micro/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.Configure.cs

@@ -24,6 +24,7 @@ using Microsoft.OpenApi.Models;
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
@@ -328,9 +329,35 @@ public partial class ProjectNameHttpApiHostModule
             },
             options =>
             {
-                options.SwaggerDoc("v1", new OpenApiInfo { Title = "ProjectName API", Version = "v1" });
+                options.SwaggerDoc("v1", new OpenApiInfo
+                {
+                    Title = "ProjectName API",
+                    Version = "v1",
+                    Contact = new OpenApiContact
+                    {
+                        Name = "anonymous", // your name
+                        Email = "anonymous@gmail.com", // your email
+                        Url = new Uri("http://localhost/profile") // your profile
+                    },
+                    License = new OpenApiLicense
+                    {
+                        Name = "MIT",
+                        Url = new Uri("https://licenses.nuget.org/MIT")
+                    }
+                });
                 options.DocInclusionPredicate((docName, description) => true);
                 options.CustomSchemaIds(type => type.FullName);
+                options.DescribeAllParametersInCamelCase();
+                options.TagActionsBy(api =>
+                {
+                    // 控制器分组显示
+                    var groupName = api.GroupName ?? "未分组";
+                    var controllerName = api.ActionDescriptor.RouteValues["controller"];
+
+                    // 使用控制器名称和摘要信息创建分组
+                    return new[] { $"{groupName}/{controllerName}" };
+                });
+
                 options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
                 {
                     Description = "JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"",
@@ -340,6 +367,7 @@ public partial class ProjectNameHttpApiHostModule
                     Type = SecuritySchemeType.Http,
                     BearerFormat = "JWT"
                 });
+
                 options.AddSecurityRequirement(new OpenApiSecurityRequirement
                 {
                     {
@@ -350,6 +378,15 @@ public partial class ProjectNameHttpApiHostModule
                         new string[] { }
                     }
                 });
+
+                var currentPath = AppContext.BaseDirectory;
+                var xmlDocFiles = Directory.GetFiles(currentPath, "PackageName.CompanyName.ProjectName.*.xml");
+
+                foreach (var xmlDocFile in xmlDocFiles)
+                {
+                    options.IncludeXmlComments(xmlDocFile);
+                }
+
                 options.OperationFilter<TenantHeaderParamter>();
                 options.HideAbpEndpoints();
             });
@@ -393,6 +430,14 @@ public partial class ProjectNameHttpApiHostModule
             // options.AutoValidateFilter = (type) => !type.Namespace.Contains("elsa", StringComparison.CurrentCultureIgnoreCase);
         });
 
+        if (isDevelopment)
+        {
+            // 开发环境可以取消注释禁用权限检查
+            // services.AddAlwaysAllowAuthorization();
+            // 开发环境可以取消注释禁用会话检查
+            // services.AddAlwaysAllowSession();
+        }
+
         services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             .AddAbpJwtBearer(options =>
             {
@@ -404,6 +449,11 @@ public partial class ProjectNameHttpApiHostModule
                     options.TokenValidationParameters.ValidIssuers = validIssuers;
                     options.TokenValidationParameters.IssuerValidator = TokenWildcardIssuerValidator.IssuerValidator;
                 }
+                var validAudiences = configuration.GetSection("AuthServer:ValidAudiences").Get<List<string>>();
+                if (validAudiences?.Count > 0)
+                {
+                    options.TokenValidationParameters.ValidAudiences = validAudiences;
+                }
             });
 
         if (!isDevelopment)

aspnet-core/templates/micro/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs

@@ -12,11 +12,8 @@ using LINGYUN.Abp.Saas.EntityFrameworkCore;
 using LINGYUN.Abp.Serilog.Enrichers.Application;
 using LINGYUN.Abp.Serilog.Enrichers.UniqueId;
 using LINGYUN.Abp.Sms.Platform;
-#if SkyWalking
 using LINGYUN.Abp.Telemetry.SkyWalking;
-#elif OpenTelemetry
 using LINGYUN.Abp.Telemetry.OpenTelemetry;
-#endif
 using LINGYUN.Abp.TextTemplating.EntityFrameworkCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -45,6 +42,7 @@ namespace PackageName.CompanyName.ProjectName;
     typeof(AbpSerilogEnrichersUniqueIdModule),
     typeof(AbpAuditLoggingElasticsearchModule),
     typeof(AbpAspNetCoreSerilogModule),
+    typeof(AbpCAPEventBusModule),
 
     typeof(ProjectNameApplicationModule),
     typeof(ProjectNameHttpApiModule),
@@ -52,7 +50,6 @@ namespace PackageName.CompanyName.ProjectName;
     typeof(ProjectNameDbMigratorEntityFrameworkCoreModule),
 
     typeof(AbpEmailingExceptionHandlingModule),
-    typeof(AbpCAPEventBusModule),
     typeof(AbpHttpClientIdentityModelWebModule),
     typeof(AbpAspNetCoreMultiTenancyModule),
 
@@ -69,13 +66,10 @@ namespace PackageName.CompanyName.ProjectName;
     typeof(AbpAspNetCoreMvcWrapperModule),
     typeof(AbpAspNetCoreHttpOverridesModule),
     typeof(AbpIdentitySessionAspNetCoreModule),
-#if SkyWalking
     typeof(AbpTelemetrySkyWalkingModule),
-#elif OpenTelemetry
     typeof(AbpTelemetryOpenTelemetryModule),
-#endif
-    typeof(AbpClaimsMappingModule),
     typeof(AbpExporterMiniExcelModule),
+    typeof(AbpClaimsMappingModule),
     typeof(AbpEmailingPlatformModule),
     typeof(AbpSmsPlatformModule),
     typeof(AbpSwashbuckleModule),

aspnet-core/templates/micro/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json

@@ -26,8 +26,13 @@
   },
   "ConnectionStrings": {
     "Default": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "Business": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpSaas": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "Framework": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456"
+    "AbpTenantManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpSettingManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpPermissionManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpFeatureManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpTextTemplating": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpLocalizationManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456"
   },
   "DistributedLock": {
     "IsEnabled": true,

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore.csproj

@@ -17,7 +17,7 @@
 		</PackageReference>
 		<PackageReference Include="LINGYUN.Abp.Data.DbMigrator" />
 		<PackageReference Include="LINGYUN.Abp.Saas.EntityFrameworkCore" />
-		<PackageReference Include="Volo.Abp.EntityFrameworkCore.MySql" Condition="'$(MySQL)'=='true'" />
+		<PackageReference Include="Volo.Abp.EntityFrameworkCore.MySql.Pomelo" Condition="'$(MySQL)'=='true'" />
 		<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Condition="'$(SqlServer)'=='true'" />
 		<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Condition="'$(Sqlite)'=='true'" />
 		<PackageReference Include="Volo.Abp.EntityFrameworkCore.Oracle" Condition="'$(Oracle)'=='true'" />

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore/ProjectNameDbMigratorEntityFrameworkCoreModule.cs

@@ -27,7 +27,7 @@ namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
     typeof(ProjectNameEntityFrameworkCoreModule),
     typeof(AbpSaasEntityFrameworkCoreModule),
 #if MySQL
-    typeof(AbpEntityFrameworkCoreMySQLModule),
+    typeof(AbpEntityFrameworkCoreMySQLPomeloModule),
 #elif SqlServer
     typeof(AbpEntityFrameworkCoreSqlServerModule),
 #elif Sqlite
@@ -45,30 +45,6 @@ public class ProjectNameDbMigratorEntityFrameworkCoreModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        // 配置连接字符串
-        Configure<AbpDbConnectionOptions>(options =>
-        {
-            // 业务数据库
-            options.Databases.Configure("ProjectName", database =>
-            {
-                database.MapConnection(
-                    "ProjectName"
-                );
-            });
-            // abp框架数据库
-            options.Databases.Configure("Framework", database =>
-            {
-                database.MapConnection(
-                    "AbpSaas",
-                    "AbpTextTemplating",
-                    "AbpSettingManagement",
-                    "AbpFeatureManagement",
-                    "AbpPermissionManagement",
-                    "AbpLocalizationManagement"
-                );
-            });
-        });
-
         // 配置Ef
         Configure<AbpDbContextOptions>(options =>
         {

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator/PackageName.CompanyName.ProjectName.DbMigrator.csproj

@@ -27,13 +27,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore\PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore.csproj" />
+		<ProjectReference Include="..\PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore\PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <None Update="appsettings.json">
+		<None Update="appsettings.json">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
+		</None>
 	</ItemGroup>
 
 </Project>

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator/appsettings.json

@@ -1,7 +1,13 @@
 {
   "ConnectionStrings": {
     "ProjectName": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "Framework": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456"
+    "AbpSaas": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpTenantManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpSettingManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpPermissionManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpFeatureManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpTextTemplating": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "AbpLocalizationManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456"
   },
   "DistributedLock": {
     "IsEnabled": true,

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName.CompanyName.ProjectName.Application.Contracts.csproj

@@ -10,6 +10,7 @@
 		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<Nullable>enable</Nullable>
 		<RootNamespace />
 	</PropertyGroup>

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Domain.Shared/PackageName.CompanyName.ProjectName.Domain.Shared.csproj

@@ -10,6 +10,7 @@
 		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<Nullable>enable</Nullable>
 		<RootNamespace />
 	</PropertyGroup>

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.HttpApi/PackageName.CompanyName.ProjectName.HttpApi.csproj

@@ -10,6 +10,7 @@
 		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<Nullable>enable</Nullable>
 		<RootNamespace />
 	</PropertyGroup>