diff --git a/db.sql b/db.sql index 2681e3b..7141047 100644 --- a/db.sql +++ b/db.sql @@ -11,6 +11,10 @@ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `t_warehouse_address`; +DROP TABLE IF EXISTS `t_notice_read`; +DROP TABLE IF EXISTS `t_notice`; +DROP TABLE IF EXISTS `t_dict`; +DROP TABLE IF EXISTS `t_country`; DROP TABLE IF EXISTS `t_recharge_record`; DROP TABLE IF EXISTS `t_customer`; DROP TABLE IF EXISTS `t_label_print_record`; diff --git a/src/Oms.Application/OmsApplicationModule.cs b/src/Oms.Application/OmsApplicationModule.cs index e2503b9..154e817 100644 --- a/src/Oms.Application/OmsApplicationModule.cs +++ b/src/Oms.Application/OmsApplicationModule.cs @@ -1,5 +1,6 @@ using Fake.Modularity; using Fake.ObjectMapping.AutoMapper; +using Fake.Security.Claims; using Oms.Domain; namespace Oms.Application; diff --git a/src/SimpleAdmin.Api/SimpleAdminApiModule.cs b/src/SimpleAdmin.Api/SimpleAdminApiModule.cs index 0be6f83..99380a5 100644 --- a/src/SimpleAdmin.Api/SimpleAdminApiModule.cs +++ b/src/SimpleAdmin.Api/SimpleAdminApiModule.cs @@ -6,6 +6,7 @@ using Fake.Rbac.Infrastructure; using Fake.AspNetCore.Auditing; using Fake.AspNetCore.Mvc; using Fake.FeiShu; +using Fake.Security.Claims; using Fake.Serilog; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Logging; @@ -27,6 +28,11 @@ public class SimpleAdminApiModule : FakeModule { private const string DefaultCorsPolicyName = "default"; + public override void PreConfigureServices(ServiceConfigurationContext context) + { + FakeClaimTypes.UserId = "mapId"; + } + public override void ConfigureServices(ServiceConfigurationContext context) { var services = context.Services; diff --git a/src/SimpleAdmin.Api/SimpleJwtService.cs b/src/SimpleAdmin.Api/SimpleJwtService.cs index 1f392e0..b1cc2fd 100644 --- a/src/SimpleAdmin.Api/SimpleJwtService.cs +++ b/src/SimpleAdmin.Api/SimpleJwtService.cs @@ -4,6 +4,7 @@ using Fake.DependencyInjection; using Fake.Rbac.Application.Jwt; using Fake.Rbac.Application.Services; using Fake.Rbac.Infrastructure; +using Fake.Security.Claims; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; @@ -25,12 +26,10 @@ public class SimpleJwtService(IOptions jwtOptions, IUserService user .FirstOrDefaultAsync(cancellationToken); if (mapId.HasValue) { - claims.RemoveAll(x => x.Type == SimpleOmsClaimTypes.MapId); - claims.Add(new Claim(SimpleOmsClaimTypes.MapId, mapId.Value.ToString())); + claims.RemoveAll(x => x.Type == FakeClaimTypes.UserId); + claims.Add(new Claim(FakeClaimTypes.UserId, mapId.Value.ToString())); } - claims.RemoveAll(x => x.Type == SimpleOmsClaimTypes.LoginType); - claims.Add(new Claim(SimpleOmsClaimTypes.LoginType, "0")); return claims; } }