bit365/hello-shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在 Aspire 中集成 PostgreSQL 数据库

Browse Source
This commit is contained in:
hello 2025-03-19 23:21:01 +08:00
parent ade2f40524
commit 9e6b5be92c
23 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Directory.Packages.props
View File

@ -6,12 +6,14 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.1.0" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.1.0" />
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="9.1.0" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.1.0" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.1.0" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.1.0" />
<PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.1.0" />
<PackageVersion Include="AutoMapper" Version="14.0.0" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Dapr" Version="9.2.1" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Dapr" Version="9.3.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="Dapr.AspNetCore" Version="1.15.2" />
<PackageVersion Include="EFCore.NamingConventions" Version="9.0.0" />
@ -43,7 +45,7 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.3.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.0.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
</ItemGroup>

1
src/HelloShop.AppHost/HelloShop.AppHost.csproj
View File

@ -17,6 +17,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" />
<PackageReference Include="Aspire.Hosting.RabbitMQ" />
<PackageReference Include="Aspire.Hosting.Redis" />
<PackageReference Include="CommunityToolkit.Aspire.Hosting.Dapr" />

11
src/HelloShop.AppHost/Program.cs
View File

@ -6,6 +6,14 @@ using HelloShop.AppHost.Extensions;
var builder = DistributedApplication.CreateBuilder(args);
var postgreUser = builder.AddParameter("postgreUser", secret: true);
var postgrePassword = builder.AddParameter("postgrePassword", secret: true);
var postgres = builder.AddPostgres("postgres", postgreUser, postgrePassword, port: 5432).WithPgAdmin()
.WithLifetime(ContainerLifetime.Persistent);
var identitydb = postgres.AddDatabase("identitydb");
var productdb = postgres.AddDatabase("productdb");
var orderingdb = postgres.AddDatabase("orderingdb");
var cache = builder.AddRedis("cache", port: 6380).WithLifetime(ContainerLifetime.Persistent).WithPersistence();
var rabbitmqUser = builder.AddParameter("rabbitmqUser", secret: true);
@ -13,12 +21,14 @@ var rabbitmqPassword = builder.AddParameter("rabbitmqPassword", secret: true);
var rabbitmq = builder.AddRabbitMQ("rabbitmq", rabbitmqUser, rabbitmqPassword).WithLifetime(ContainerLifetime.Persistent).WithManagementPlugin();
var identityService = builder.AddProject<Projects.HelloShop_IdentityService>("identityservice")
.WithReference(identitydb).WaitFor(identitydb)
.WithDaprSidecar();
DaprSidecarOptions daprSidecarOptions = new() { ResourcesPaths = ["DaprComponents"] };
var orderingService = builder.AddProject<Projects.HelloShop_OrderingService>("orderingservice")
.WithReference(identityService)
.WithReference(orderingdb).WaitFor(orderingdb)
.WithDaprSidecar(options =>
{
options.WithOptions(daprSidecarOptions).WithReferenceAndWaitFor(rabbitmq).WithReferenceAndWaitFor(cache);
@ -26,6 +36,7 @@ var orderingService = builder.AddProject<Projects.HelloShop_OrderingService>("or
var productService = builder.AddProject<Projects.HelloShop_ProductService>("productservice")
.WithReference(identityService).WaitFor(identityService)
.WithReference(productdb).WaitFor(productdb)
.WithDaprSidecar(options =>
{
options.WithOptions(daprSidecarOptions).WithReferenceAndWaitFor(rabbitmq).WithReferenceAndWaitFor(cache);

2
src/HelloShop.AppHost/appsettings.json
View File

@ -7,6 +7,8 @@
}
},
"Parameters": {
"postgreUser": "postgres",
"postgrePassword": "postgres",
"rabbitmqUser": "guest",
"rabbitmqPassword": "guest"
}

4
src/HelloShop.IdentityService/Authentication/CustomJwtBearerHandler.cs
View File

@ -12,13 +12,13 @@ using System.Text.Encodings.Web;
namespace HelloShop.IdentityService.Authentication;
public class CustomJwtBearerHandler(IOptionsMonitor<CustomJwtBearerOptions> options, ILoggerFactory logger, UrlEncoder encoder,TimeProvider timeProvider) : SignInAuthenticationHandler<CustomJwtBearerOptions>(options, logger, encoder)
public class CustomJwtBearerHandler(IOptionsMonitor<CustomJwtBearerOptions> options, ILoggerFactory logger, UrlEncoder encoder, TimeProvider timeProvider) : SignInAuthenticationHandler<CustomJwtBearerOptions>(options, logger, encoder)
{
protected override Task<AuthenticateResult> HandleAuthenticateAsync() => throw new NotImplementedException();
protected override async Task HandleSignInAsync(ClaimsPrincipal user, AuthenticationProperties? properties)
{
var utcNow =timeProvider.GetUtcNow();
var utcNow = timeProvider.GetUtcNow();
JwtSecurityTokenHandler tokenHandler = new();

2
src/HelloShop.IdentityService/Authorization/LocalPermissionChecker.cs
View File

@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Distributed;
namespace HelloShop.IdentityService.Authorization;
public class LocalPermissionChecker(IHttpContextAccessor httpContextAccessor, IdentityServiceDbContext dbContext, IDistributedCache distributedCache,TimeProvider timeProvider) : PermissionChecker(httpContextAccessor, distributedCache, timeProvider)
public class LocalPermissionChecker(IHttpContextAccessor httpContextAccessor, IdentityServiceDbContext dbContext, IDistributedCache distributedCache, TimeProvider timeProvider) : PermissionChecker(httpContextAccessor, distributedCache, timeProvider)
{
public override async Task<bool> IsGrantedAsync(int roleId, string name, string? resourceType = null, string? resourceId = null)
{

2
src/HelloShop.IdentityService/Constants/DbConstants.cs
View File

@ -5,7 +5,7 @@ namespace HelloShop.IdentityService.Constants
{
public class DbConstants
{
public const string ConnectionStringName = "IdentityDatabase";
public const string ConnectionStringName = "identitydb";
public const string MigrationsHistoryTableName = "migrations_history";
}

2
src/HelloShop.IdentityService/HelloShop.IdentityService.csproj
View File

@ -8,10 +8,10 @@
<ProjectReference Include="..\HelloShop.ServiceDefaults\HelloShop.ServiceDefaults.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageReference Include="EFCore.NamingConventions" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>

6
src/HelloShop.IdentityService/Infrastructure/IdentityServiceDbContext.cs
View File

@ -15,11 +15,5 @@ namespace HelloShop.IdentityService.Infrastructure
base.OnModelCreating(modelBuilder);
modelBuilder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
base.OnConfiguring(optionsBuilder);
optionsBuilder.UseSnakeCaseNamingConvention();
}
}
}

6
src/HelloShop.IdentityService/Program.cs
View File

@ -11,6 +11,7 @@ using HelloShop.ServiceDefaults.Extensions;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.EntityFrameworkCore;
using Microsoft.IdentityModel.Tokens;
using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
using System.Text;
var builder = WebApplication.CreateBuilder(args);
@ -21,9 +22,10 @@ builder.AddServiceDefaults();
builder.Services.AddControllers();
builder.Services.AddDbContext<IdentityServiceDbContext>(options =>
builder.AddNpgsqlDbContext<IdentityServiceDbContext>(connectionName: DbConstants.ConnectionStringName, configureDbContextOptions: options =>
{
options.UseNpgsql(builder.Configuration.GetConnectionString(DbConstants.ConnectionStringName), x => x.MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName));
new NpgsqlDbContextOptionsBuilder(options).MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName);
options.UseSnakeCaseNamingConvention();
});
builder.Services.AddIdentity<User, Role>(options =>

3
src/HelloShop.IdentityService/appsettings.json
View File

@ -5,8 +5,5 @@
"Microsoft.AspNetCore": "Warning"
}
},
"ConnectionStrings": {
"IdentityDatabase": "Host=localhost;Port=5432;Database=identity;Username=postgres;Password=postgres"
},
"AllowedHosts": "*"
}

4
src/HelloShop.OrderingService/Constants/DbConstants.cs
View File

@ -5,9 +5,9 @@ namespace HelloShop.OrderingService.Constants
{
public class DbConstants
{
public const string MasterConnectionStringName = "OrderingDatabaseMaster";
public const string MasterConnectionStringName = "orderingdb";
public const string SlaveConnectionStringName = "OrderingDatabaseSlave";
public const string SlaveConnectionStringName = "orderingdb";
public const string MigrationsHistoryTableName = "migrations_history";
}

5
src/HelloShop.OrderingService/Extensions/Extensions.cs
View File

@ -12,6 +12,7 @@ using HelloShop.ServiceDefaults.DistributedEvents.DaprBuildingBlocks;
using HelloShop.ServiceDefaults.Extensions;
using Microsoft.EntityFrameworkCore;
using Microsoft.IdentityModel.Tokens;
using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
using System.Reflection;
using System.Text;
@ -34,9 +35,9 @@ namespace HelloShop.OrderingService.Extensions
builder.Services.AddDataSeedingProviders();
builder.Services.AddDbContext<OrderingServiceDbContext>(options =>
builder.AddNpgsqlDbContext<OrderingServiceDbContext>(connectionName: DbConstants.MasterConnectionStringName, configureDbContextOptions: options =>
{
options.UseNpgsql(builder.Configuration.GetConnectionString(DbConstants.MasterConnectionStringName), x => x.MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName));
new NpgsqlDbContextOptionsBuilder(options).MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName);
options.UseSnakeCaseNamingConvention();
});

3
src/HelloShop.OrderingService/HelloShop.OrderingService.csproj
View File

@ -8,14 +8,13 @@
<ProjectReference Include="..\HelloShop.ServiceDefaults\HelloShop.ServiceDefaults.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageReference Include="EFCore.NamingConventions" />
<PackageReference Include="MediatR" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
</ItemGroup>
</Project>

2
src/HelloShop.OrderingService/Workers/GracePeriodWorker.cs
View File

@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore;
namespace HelloShop.OrderingService.Workers
{
public class GracePeriodWorker(IServiceScopeFactory serviceScopeFactory, ILogger<GracePeriodWorker> logger,TimeProvider timeProvider) : BackgroundService
public class GracePeriodWorker(IServiceScopeFactory serviceScopeFactory, ILogger<GracePeriodWorker> logger, TimeProvider timeProvider) : BackgroundService
{
protected async override Task ExecuteAsync(CancellationToken stoppingToken)
{

6
src/HelloShop.OrderingService/appsettings.json
View File

@ -5,9 +5,5 @@
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"ConnectionStrings": {
"OrderingDatabaseMaster": "Host=localhost;Port=5432;Database=ordering;Username=postgres;Password=postgres",
"OrderingDatabaseSlave": "Host=localhost;Port=5432;Database=ordering;Username=postgres;Password=postgres"
}
"AllowedHosts": "*"
}

2
src/HelloShop.ProductService/Constants/DbConstants.cs
View File

@ -5,7 +5,7 @@ namespace HelloShop.ProductService.Constants;
public static class DbConstants
{
public const string ConnectionStringName = "ProductDatabase";
public const string ConnectionStringName = "productdb";
public const string MigrationsHistoryTableName = "migrations_history";
}

3
src/HelloShop.ProductService/HelloShop.ProductService.csproj
View File

@ -8,13 +8,12 @@
<ProjectReference Include="..\HelloShop.ServiceDefaults\HelloShop.ServiceDefaults.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageReference Include="EFCore.NamingConventions" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
</ItemGroup>
</Project>

5
src/HelloShop.ProductService/Program.cs
View File

@ -9,6 +9,7 @@ using HelloShop.ServiceDefaults.DistributedLocks;
using HelloShop.ServiceDefaults.Extensions;
using Microsoft.EntityFrameworkCore;
using Microsoft.IdentityModel.Tokens;
using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
using System.Text;
var builder = WebApplication.CreateBuilder(args);
@ -29,9 +30,9 @@ builder.Services.AddAuthentication().AddJwtBearer(options =>
});
// Add extensions services to the container.
builder.Services.AddDbContext<ProductServiceDbContext>(options =>
builder.AddNpgsqlDbContext<ProductServiceDbContext>(connectionName: DbConstants.ConnectionStringName, configureDbContextOptions: options =>
{
options.UseNpgsql(builder.Configuration.GetConnectionString(DbConstants.ConnectionStringName), x => x.MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName));
new NpgsqlDbContextOptionsBuilder(options).MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName);
options.UseSnakeCaseNamingConvention();
});
builder.Services.AddHttpClient().AddHttpContextAccessor().AddDistributedMemoryCache();

5
src/HelloShop.ProductService/appsettings.json
View File

@ -5,8 +5,5 @@
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"ConnectionStrings": {
"ProductDatabase": "Host=localhost;Port=5432;Database=product;Username=postgres;Password=postgres"
}
"AllowedHosts": "*"
}

2
src/HelloShop.ServiceDefaults/Authorization/FakePermissionChecker.cs
View File

@ -6,7 +6,7 @@ using Microsoft.Extensions.Caching.Distributed;
namespace HelloShop.ServiceDefaults.Authorization
{
public class FakePermissionChecker(IHttpContextAccessor httpContextAccessor, IDistributedCache distributedCache, TimeProvider timeProvider) : PermissionChecker(httpContextAccessor, distributedCache,timeProvider)
public class FakePermissionChecker(IHttpContextAccessor httpContextAccessor, IDistributedCache distributedCache, TimeProvider timeProvider) : PermissionChecker(httpContextAccessor, distributedCache, timeProvider)
{
public override Task<bool> IsGrantedAsync(int roleId, string permissionName, string? resourceType = null, string? resourceId = null) => Task.FromResult(true);
}

2
src/HelloShop.ServiceDefaults/Authorization/PermissionChecker.cs
View File

@ -8,7 +8,7 @@ using System.Security.Claims;
namespace HelloShop.ServiceDefaults.Authorization;
public abstract class PermissionChecker(IHttpContextAccessor httpContextAccessor, IDistributedCache distributedCache,TimeProvider timeProvider) : IPermissionChecker
public abstract class PermissionChecker(IHttpContextAccessor httpContextAccessor, IDistributedCache distributedCache, TimeProvider timeProvider) : IPermissionChecker
{
protected HttpContext HttpContext { get; init; } = httpContextAccessor.HttpContext ?? throw new InvalidOperationException();

2
src/HelloShop.ServiceDefaults/Authorization/RemotePermissionChecker.cs
View File

@ -9,7 +9,7 @@ using System.Net.Http.Headers;
namespace HelloShop.ServiceDefaults.Authorization;
public class RemotePermissionChecker(IHttpContextAccessor httpContextAccessor, IDistributedCache distributedCache, IHttpClientFactory httpClientFactory,TimeProvider timeProvider) : PermissionChecker(httpContextAccessor, distributedCache, timeProvider)
public class RemotePermissionChecker(IHttpContextAccessor httpContextAccessor, IDistributedCache distributedCache, IHttpClientFactory httpClientFactory, TimeProvider timeProvider) : PermissionChecker(httpContextAccessor, distributedCache, timeProvider)
{
public override async Task<bool> IsGrantedAsync(int roleId, string permissionName, string? resourceType = null, string? resourceId = null)
{