.kiro/settings/mcp.json

@@ -0,0 +1,19 @@
+{
+  "mcpServers": {
+    "mssql": {
+      "command": "uvx",
+      "args": ["mcp-server-mssql"],
+      "env": {
+        "MSSQL_CONNECTION_STRING": "Server=localhost;Database=YourDatabase;User Id=YourUser;Password=YourPassword;TrustServerCertificate=True"
+      },
+      "disabled": false,
+      "autoApprove": []
+    },
+    "playwright": {
+      "command": "npx",
+      "args": ["-y", "@executeautomation/playwright-mcp-server"],
+      "disabled": false,
+      "autoApprove": []
+    }
+  }
+}

docker-compose-local-dev/local-schema-catchup.sql

@@ -1,106 +0,0 @@
-/* ─────────────────────────────────────────────────────────────
-   本地开发库（AML-local-dev.bak 还原后）的架构补齐脚本
-
-   .bak 是某个时间点的库快照，没有 __EFMigrationsHistory，DbMigrator 无从判断
-   增量 → 后续后端迁移新增的表 / 列在本地库里全部缺失，调用相关接口会 500。
-   本脚本把这些 DDL 按迁移原样补上（全部带存在性判断，可重复执行）：
-
-     20260718121851_PaygOfflineOrderManage        隨付即用(PAYG)下单与线下订单管理
-     20260719120000_AddAgentUserSettingAndPaymentMethod   代理归属国家 + 支持的支付网关
-     20260720000000_SplitOrderTypeAddOrderSource  订单来源与业务意图拆分
-
-   另外补上 IsDeleted 的 DEFAULT 0 约束：.bak 还原后部分表丢了默认值约束，
-   而 EF 的 INSERT 并不显式带该列 → 报 "Cannot insert the value NULL into column 'IsDeleted'"。
-
-   用法：
-     docker exec -i aml-mssql /opt/mssql-tools18/bin/sqlcmd \
-       -S localhost -U sa -P 'Aml@Local2026' -C -d AbpAML -i /dev/stdin < local-schema-catchup.sql
-   ───────────────────────────────────────────────────────────── */
-
-SET NOCOUNT ON;
-
-/* ── 1) IsDeleted 默认值约束（.bak 还原丢失）───────────────── */
-DECLARE @sql nvarchar(max) = N'';
-SELECT @sql = @sql + N'ALTER TABLE [' + t.name + N'] ADD CONSTRAINT [DF_' + t.name + N'_IsDeleted] DEFAULT 0 FOR [IsDeleted];' + CHAR(10)
-FROM sys.tables t
-JOIN sys.columns c ON c.object_id = t.object_id AND c.name = 'IsDeleted'
-WHERE c.default_object_id = 0;
-EXEC sp_executesql @sql;
-
-/* ── 2) PaygOfflineOrderManage ─────────────────────────────── */
-IF COL_LENGTH('AMLPortal_Orders', 'ContactEmail') IS NULL
-    ALTER TABLE AMLPortal_Orders ADD ContactEmail nvarchar(max) NULL;
-IF COL_LENGTH('AMLPortal_Orders', 'SubjectName') IS NULL
-    ALTER TABLE AMLPortal_Orders ADD SubjectName nvarchar(max) NULL;
-IF COL_LENGTH('AMLPortal_Orders', 'SubjectType') IS NULL
-    ALTER TABLE AMLPortal_Orders ADD SubjectType nvarchar(max) NULL;
-IF OBJECT_ID('AML_ConsumerLinks') IS NOT NULL AND COL_LENGTH('AML_ConsumerLinks', 'PaidOrderId') IS NULL
-    ALTER TABLE AML_ConsumerLinks ADD PaidOrderId uniqueidentifier NULL;
-
-IF OBJECT_ID('AML_OrderProcessLogs') IS NULL
-CREATE TABLE AML_OrderProcessLogs (
-    Id uniqueidentifier NOT NULL CONSTRAINT PK_AML_OrderProcessLogs PRIMARY KEY,
-    OrderKind int NOT NULL,
-    OrderId uniqueidentifier NOT NULL,
-    Action nvarchar(max) NULL,
-    Remark nvarchar(max) NULL,
-    OperatorName nvarchar(max) NULL,
-    ExtraProperties nvarchar(max) NULL,
-    ConcurrencyStamp nvarchar(40) NULL,
-    CreationTime datetime2 NOT NULL,
-    CreatorId uniqueidentifier NULL,
-    LastModificationTime datetime2 NULL,
-    LastModifierId uniqueidentifier NULL,
-    IsDeleted bit NOT NULL CONSTRAINT DF_AML_OrderProcessLogs_IsDeleted DEFAULT 0,
-    DeleterId uniqueidentifier NULL,
-    DeletionTime datetime2 NULL
-);
-IF NOT EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_AML_OrderProcessLogs_OrderId')
-    CREATE INDEX IX_AML_OrderProcessLogs_OrderId ON AML_OrderProcessLogs(OrderId);
-
-/* ── 3) AddAgentUserSettingAndPaymentMethod ────────────────── */
-IF OBJECT_ID('AMLPortal_AgentUserSettings') IS NULL
-CREATE TABLE AMLPortal_AgentUserSettings (
-    Id uniqueidentifier NOT NULL CONSTRAINT PK_AMLPortal_AgentUserSettings PRIMARY KEY,
-    AgentUserId uniqueidentifier NOT NULL,
-    CountryCode nvarchar(max) NULL,
-    ExtraProperties nvarchar(max) NULL,
-    ConcurrencyStamp nvarchar(40) NULL,
-    CreationTime datetime2 NOT NULL,
-    CreatorId uniqueidentifier NULL,
-    LastModificationTime datetime2 NULL,
-    LastModifierId uniqueidentifier NULL,
-    IsDeleted bit NOT NULL CONSTRAINT DF_AMLPortal_AgentUserSettings_IsDeleted DEFAULT 0,
-    DeleterId uniqueidentifier NULL,
-    DeletionTime datetime2 NULL
-);
-IF OBJECT_ID('AMLPortal_AgentUserPaymentMethods') IS NULL
-CREATE TABLE AMLPortal_AgentUserPaymentMethods (
-    Id uniqueidentifier NOT NULL CONSTRAINT PK_AMLPortal_AgentUserPaymentMethods PRIMARY KEY,
-    AgentUserId uniqueidentifier NOT NULL,
-    PaymentGateway int NOT NULL,          -- PaymentGatewayEnums：100=线下 / 200=QFPay
-    ExtraProperties nvarchar(max) NULL,
-    ConcurrencyStamp nvarchar(40) NULL,
-    CreationTime datetime2 NOT NULL,
-    CreatorId uniqueidentifier NULL,
-    LastModificationTime datetime2 NULL,
-    LastModifierId uniqueidentifier NULL,
-    IsDeleted bit NOT NULL CONSTRAINT DF_AMLPortal_AgentUserPaymentMethods_IsDeleted DEFAULT 0,
-    DeleterId uniqueidentifier NULL,
-    DeletionTime datetime2 NULL
-);
-IF NOT EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_AMLPortal_AgentUserSettings_AgentUserId')
-    CREATE INDEX IX_AMLPortal_AgentUserSettings_AgentUserId ON AMLPortal_AgentUserSettings(AgentUserId);
-IF NOT EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_AMLPortal_AgentUserPaymentMethods_AgentUserId')
-    CREATE INDEX IX_AMLPortal_AgentUserPaymentMethods_AgentUserId ON AMLPortal_AgentUserPaymentMethods(AgentUserId);
-
-/* ── 4) SplitOrderTypeAddOrderSource ───────────────────────── */
-IF COL_LENGTH('AMLPortal_Orders', 'OrderSource') IS NULL
-BEGIN
-    ALTER TABLE AMLPortal_Orders ADD OrderSource int NOT NULL CONSTRAINT DF_AMLPortal_Orders_OrderSource DEFAULT 1;
-    -- 存量线下手工补录单：OrderType=300(OfflineManual) → 续费(200) + 来源后台手工补录(2)
-    -- 走动态 SQL：同一批次里新加的列，静态语句在编译期就会报「列名无效」
-    EXEC(N'UPDATE AMLPortal_Orders SET OrderType = 200, OrderSource = 2 WHERE OrderType = 300;');
-END
-
-PRINT '本地库架构补齐完成';

docker-compose-local-dev/seed-root-ou.sql

@@ -1,101 +0,0 @@
--- ============================================================================
--- 本地开发种子：root OU + 通知收件用户
---
--- 用途
---   appsettings.local.json 的 AppConfig:Portal:EditionOUMappings 里，EditionId="root"
---   映射到 OU `3A0971B1-75B7-C43A-F39D-3CED32E0DF30`。该 ID 来自 dev 环境（这份配置是
---   Nacos 改造前的 dev 快照），本地种子库里并没有这个 OU。
---
--- 不跑这个脚本会怎样
---   门户订单支付后自动建租户会失败，且报错极具误导性：
---     CustomTenantController.CreateAsync 最后一步「发邮件给 root OU」
---       → _organizationUnitRepository.FindAsync(ouid) 返回 null
---       → GetMembersAsync(null) 在 EF 表达式求值时抛 NullReferenceException
---       → 接口 500 → OrderService.CreateTenant 捕获 → 整个事务回滚
---   现象是：订单已支付(PaymentStatus=200)，但 Orders.TargetTenantID 为 NULL、
---   SaasTenants 里查无此租户，AMLPortal_TenantEventQueues 留下一条 Status=300(重试中)。
---   日志里只有 "An exception was thrown while attempting to evaluate a LINQ query
---   parameter expression"，很难联想到是缺一条 OU 数据。
---   （GetParentAgentList 里也有同一段 root OU 逻辑，同样依赖它。）
---
--- 何时执行
---   任何一次重建本地库之后，都要跑一遍：
---     · `docker compose -f docker-compose.local.yml down -v`（EF 迁移 + 代码种子重建）
---     · 或 RESTORE `AML-local-dev.bak`（目前本地库的实际数据来源）
---   两条路都不会带出这条 OU：它既不在代码种子里（属环境数据），那份 .bak 里也没有。
---
--- 执行方式
---   docker exec -i aml-mssql /opt/mssql-tools18/bin/sqlcmd \
---     -S localhost -U sa -P "Aml@Local2026" -C -d AbpAML \
---     -i /dev/stdin < seed-root-ou.sql
---
---   或先 docker cp 进容器再 -i 指定路径。
---
--- 幂等：可重复执行，已存在则跳过。
--- ============================================================================
-
-SET NOCOUNT ON;
-
--- 收件邮箱：租户创建成功的通知会真实发送到这里（经 iCS(stag) → smtp.yandex.com，
--- 不走 appsettings 里的 Abp.Mailing.Smtp，那个 127.0.0.1:25 本地并不存在）。
--- 想换收件人改这里即可。
-DECLARE @NotifyEmail nvarchar(256) = N'f-r-x@163.com';
-DECLARE @UserName    nvarchar(256) = N'local-sales-admin';
-
--- 必须与 appsettings.local.json 中 EditionOUMappings[EditionId="root"].OUIDs[0] 一致
-DECLARE @OuId uniqueidentifier = '3A0971B1-75B7-C43A-F39D-3CED32E0DF30';
-DECLARE @UserId uniqueidentifier;
-
-BEGIN TRAN;
-
--- 1) root OU（host 级：TenantId / ParentId 均为 NULL）
---    Code 只需在 host 范围内不与现有 OU 冲突；种子数据已占用 00001~00003。
-IF NOT EXISTS (SELECT 1 FROM AbpOrganizationUnits WHERE Id = @OuId)
-BEGIN
-    INSERT INTO AbpOrganizationUnits
-        (Id, TenantId, ParentId, Code, DisplayName, ExtraProperties, ConcurrencyStamp, CreationTime, IsDeleted)
-    VALUES
-        (@OuId, NULL, NULL, N'00099', N'Local Root OU (sales admin)', N'{}',
-         CONVERT(nvarchar(40), NEWID()), GETDATE(), 0);
-    PRINT '[seed] AbpOrganizationUnits: root OU created';
-END
-ELSE
-    PRINT '[seed] AbpOrganizationUnits: root OU already exists, skipped';
-
--- 2) 通知收件用户（host 级，不设密码 —— 仅用于被 GetMembersAsync 查到并取 Email/UserName）
-SELECT @UserId = Id FROM AbpUsers WHERE TenantId IS NULL AND NormalizedEmail = UPPER(@NotifyEmail);
-
-IF @UserId IS NULL
-BEGIN
-    SET @UserId = NEWID();
-    INSERT INTO AbpUsers
-        (Id, TenantId, UserName, NormalizedUserName, Name, Email, NormalizedEmail, EmailConfirmed,
-         PasswordHash, SecurityStamp, IsExternal, PhoneNumberConfirmed, TwoFactorEnabled,
-         LockoutEnabled, AccessFailedCount, ExtraProperties, ConcurrencyStamp, CreationTime, IsDeleted)
-    VALUES
-        (@UserId, NULL, @UserName, UPPER(@UserName), N'Local Sales Admin', @NotifyEmail, UPPER(@NotifyEmail), 1,
-         NULL, CONVERT(nvarchar(40), NEWID()), 0, 0, 0,
-         0, 0, N'{}', CONVERT(nvarchar(40), NEWID()), GETDATE(), 0);
-    PRINT '[seed] AbpUsers: notify user created';
-END
-ELSE
-    PRINT '[seed] AbpUsers: notify user already exists, skipped';
-
--- 3) 用户挂到 OU 下（FindAllParentAgentsFromOU 靠这层关联找人）
-IF NOT EXISTS (SELECT 1 FROM AbpUserOrganizationUnits WHERE UserId = @UserId AND OrganizationUnitId = @OuId)
-BEGIN
-    INSERT INTO AbpUserOrganizationUnits (UserId, OrganizationUnitId, TenantId, CreationTime)
-    VALUES (@UserId, @OuId, NULL, GETDATE());
-    PRINT '[seed] AbpUserOrganizationUnits: membership created';
-END
-ELSE
-    PRINT '[seed] AbpUserOrganizationUnits: membership already exists, skipped';
-
-COMMIT;
-
--- 验证：应返回恰好一行
-SELECT u.UserName, u.Email, ou.DisplayName, ou.Code
-FROM AbpUsers u
-JOIN AbpUserOrganizationUnits uo ON uo.UserId = u.Id
-JOIN AbpOrganizationUnits ou     ON ou.Id = uo.OrganizationUnitId
-WHERE ou.Id = @OuId;

docs/AML_Backend/docker-compose-local-dev/Dockerfile.local

@@ -6,19 +6,17 @@
 #   - Targets .NET 6 (the projects are net6.0; the CI Dockerfile still says 5.0).
 #   - Does not COPY the non-existent src/access-token.bin.
 #   - Produces two runtime targets: `host` (the API) and `migrator` (data init).
-#   - Bakes appsettings.local.json over appsettings.json.
+#   - Bakes docker-compose-local-dev/appsettings.local.json over appsettings.json.
 #     The repo's appsettings.json now only carries a NacosConfig section and pulls
 #     the real settings from a Nacos server (192.168.1.120:8848) that is not
 #     reachable in local dev. Program.cs only loads Nacos when a NacosConfig
 #     section exists, so replacing appsettings.json with a Nacos-free, fully
 #     self-contained config makes the app start without Nacos.
 #
-# Build context = the AML_Backend repo root. This Dockerfile lives OUTSIDE that
+# Build context = repository root (AML_Backend); this Dockerfile lives one level
-# repo, in the monorepo-root docker-compose-local-dev/, so appsettings.local.json
+# down in docker-compose-local-dev/. BuildKit uses the sibling
-# is not reachable from the main context; compose passes that directory in as the
+# docker-compose-local-dev/Dockerfile.local.dockerignore (not the repo-root
-# named additional context `localcfg` (see docker-compose.local.yml). BuildKit
+# .dockerignore), which keeps appsettings.json and docker-compose-local-dev/.
-# uses the sibling Dockerfile.local.dockerignore (not AML_Backend/.dockerignore),
-# which keeps appsettings.json.
 
 ############################
 # Restore + build (whole solution available)
@@ -77,7 +75,7 @@ WORKDIR /app
 COPY --from=publish-host /app/host ./
 # Local dev: replace the Nacos-only appsettings.json with a full self-contained
 # config (no NacosConfig section -> the app does not try to reach Nacos).
-COPY --from=localcfg appsettings.local.json ./appsettings.json
+COPY docker-compose-local-dev/appsettings.local.json ./appsettings.json
 EXPOSE 44331
 ENTRYPOINT ["dotnet", "iCON.Abp.FX.HttpApi.Host.dll"]
 
@@ -91,7 +89,7 @@ WORKDIR /app
 COPY --from=publish-migrator /app/migrator ./
 # Same Nacos-free local config as the host (the migrator's own appsettings.json
 # is Nacos-only too); reuse the host's seed Data / wwwroot content.
-COPY --from=localcfg appsettings.local.json ./appsettings.json
+COPY docker-compose-local-dev/appsettings.local.json ./appsettings.json
 COPY --from=publish-host /app/host/Data ./Data
 COPY --from=publish-host /app/host/wwwroot ./wwwroot
 ENTRYPOINT ["dotnet", "iCON.Abp.FX.DbMigrator.dll"]

docs/AML_Backend/docker-compose-local-dev/appsettings.local.json

@@ -304,13 +304,6 @@
         "RetryTimes": 0,
         "RetryMinutes": 0
       },
-      "ClearExpiredPaygOrderJob": {
-        "Enabled": true,
-        "RunOnStart": true,
-        "IntervalSeconds": 300,
-        "RetryTimes": 0,
-        "RetryMinutes": 0
-      },
       "TenantTobeExpiredRemindJob": {
         "Enabled": true,
         "RunOnStart": true,
@@ -393,7 +386,7 @@
       "RequestTokenPath": "connect/token?__tenant=Portal",
       "RequestTokenParams": "grant_type=password,response_type=token,username=Portal@iconsz.com,password=1qaz@WSX,scope=FX,client_id=PortalClient,client_secret=1qaz@WSX",
       "AbpTokenExpiredSeconds": "3600",
-      "PortalTenantId": "3A087539-4DCE-150D-A3EE-9AAD1F533D02",
+      "PortalTenantId": "3A07C0C9-50E2-638F-C2BB-61A4DA42B8D4",
       "ExpireOrderMins": 5,
       "IsMockupPayment": true,
       "SalesEmailAddress": "307736951@qq.com",
@@ -439,22 +432,8 @@
         }
       ],
       "jQSeparatedEditions": {
-        "EditionIds": [ "3A1A296B-DAB4-4B94-B267-4424683B8916" ],
+        "EditionIds": [ "3A1A2969-6200-7B6C-1FE2-F4001F2F17E1" ],
         "EditionNames": [ "CPA" ]
-      },
-      "OfflineSubscribeOrderMail": {
-        "Cc": [],
-        "Bcc": []
-      }
-    },
-    "TwoC": {
-      "TenantId": null,
-      "LinkValidHours": 72,
-      "ExpireOrderMins": 60,
-      "IsMockupPayment": true,
-      "OfflineOrderMail": {
-        "Cc": [],
-        "Bcc": []
       }
     },
     "BusinessDefaultData": {

docs/AML_Backend/docker-compose-local-dev/docker-compose.local.yml

@@ -56,14 +56,10 @@ services:
 
   db-migrator:
     build:
-      # This stack lives at the monorepo root, OUTSIDE the AML_Backend repo, so the
+      # Context is the AML_Backend repo root (one level up); this compose file and
-      # build context points into that subproject and the Dockerfile is referenced
+      # the Dockerfile live in docker-compose-local-dev/.
-      # from here. appsettings.local.json is no longer inside the context, so it is
+      context: ..
-      # passed in as a named additional context (`localcfg`) instead.
+      dockerfile: docker-compose-local-dev/Dockerfile.local
-      context: ../AML_Backend
-      dockerfile: ../docker-compose-local-dev/Dockerfile.local
-      additional_contexts:
-        localcfg: .
       target: migrator
     image: aml-dbmigrator:local
     container_name: aml-dbmigrator
@@ -77,10 +73,8 @@ services:
 
   httpapi-host:
     build:
-      context: ../AML_Backend
+      context: ..
-      dockerfile: ../docker-compose-local-dev/Dockerfile.local
+      dockerfile: docker-compose-local-dev/Dockerfile.local
-      additional_contexts:
-        localcfg: .
       target: host
     image: aml-httpapi-host:local
     container_name: aml-httpapi-host
@@ -106,21 +100,6 @@ services:
       App__SelfUrl: "http://localhost:44331"
       AuthServer__Authority: "http://localhost:44331"
       AuthServer__RequireHttpsMetadata: "false"
-      # 内部 token 请求（AbpTokenService → connect/token）：本地 host 仅监听 HTTP，
-      # 覆盖 appsettings 的 https 默认值，否则 TenantRenewal / 建租户等内部调用会 SSL 握手失败。
-      AppConfig__General__ApiLocalhostUrl: "http://localhost:44331/"
-      # 在线支付：appsettings.local.json 里 Portal.IsMockupPayment=true，会让 CreateOrder 建单后
-      # 立即自造一次 QFPay 回调把订单置为已支付 —— 这样前端永远走不到收银台。置 false 才能测
-      # 真实支付链（下单 → 收银台 → PaymentWebhook → 订单转已支付）。
-      # 若只想跳过支付、快速拿到已开通的租户，改回 "true" 即可。
-      AppConfig__Portal__IsMockupPayment: "false"
-      # 隨付即用(PAYG / CreatePayAsYouGoOrder)：支付成功后把检测链接挂到 2C 池租户下，
-      # 建单时就会校验此项，未配置直接报 "TwoC.TenantId is not configured"。
-      # 取本地库 SaasTenants 里名为 "2C" 的租户 Id。
-      AppConfig__TwoC__TenantId: "3A1C1F4F-32A8-26B9-743D-5B12DE3B49E8"
-      # PAYG 在线单的模拟支付：true 会在建单后自造一次成功回调（跳过收银台）。
-      # 与上面订阅单的 IsMockupPayment 同理，要测真实收银台链路就置 false。
-      AppConfig__TwoC__IsMockupPayment: "false"
       # RabbitMQ: use the bundled broker service and run the background consumer.
       AppConfig__RabbitMQConfig__HostName: "rabbitmq"
       AppConfig__RabbitMQConfig__EnableConsumer: "true"