diff --git a/deploy/server/README.md b/deploy/server/README.md index 7d63dfc..1b3df1e 100644 --- a/deploy/server/README.md +++ b/deploy/server/README.md @@ -21,4 +21,4 @@ docker compose -f compose.yaml -f deploy/server/compose.override.yaml \ mock-provider api worker web gateway ``` -安全组和主机防火墙只保留TCP 80、443以及受限来源的SSH 22。如果云安全组暂未放行443,可临时将宿主机80映射到网关443,并使用`https://SERVER_IP:80`;放行443后应恢复标准HTTPS地址。正式环境仍应配置自有域名、生产OIDC和真实外部服务,并切换到Kubernetes生产覆盖层。 +安全组和主机防火墙只保留TCP 80、443以及受限来源的SSH 22。HTTP 80仅用于跳转到标准HTTPS 443。正式环境仍应配置自有域名、生产OIDC和真实外部服务,并切换到Kubernetes生产覆盖层。 diff --git a/deploy/server/compose.override.yaml b/deploy/server/compose.override.yaml index f656c43..a55c229 100644 --- a/deploy/server/compose.override.yaml +++ b/deploy/server/compose.override.yaml @@ -159,7 +159,7 @@ services: gateway: image: nginx:1.30-alpine ports: - - "80:443" + - "80:80" - "443:443" volumes: - ./deploy/server/nginx.conf:/etc/nginx/conf.d/default.conf:ro diff --git a/test/fixtures/local_seed.sql b/test/fixtures/local_seed.sql index 9e11036..9669d48 100644 --- a/test/fixtures/local_seed.sql +++ b/test/fixtures/local_seed.sql @@ -12,9 +12,13 @@ VALUES ('10000000-0000-0000-0000-000000000101', '10000000-0000-0000-0000-000000000111', '10000000-0000-0000-0000-000000000001', 'http://localhost:58180/realms/voice-local', '00000000-0000-0000-0000-000000000101', '本地所有者', 'active', 'ops_admin'), ('10000000-0000-0000-0000-000000000102', '10000000-0000-0000-0000-000000000112', '10000000-0000-0000-0000-000000000001', 'http://localhost:58180/realms/voice-local', '00000000-0000-0000-0000-000000000102', '本地编辑者', 'active', 'ops_approver'), ('20000000-0000-0000-0000-000000000103', '20000000-0000-0000-0000-000000000113', '20000000-0000-0000-0000-000000000001', 'http://localhost:58180/realms/voice-local', '00000000-0000-0000-0000-000000000103', '隔离租户查看者', 'active', 'customer') -ON CONFLICT (tenant_id, oidc_issuer, oidc_subject) DO UPDATE SET - display_name = EXCLUDED.display_name, status = EXCLUDED.status, - platform_role = EXCLUDED.platform_role, updated_at = now(); +ON CONFLICT (id) DO UPDATE SET + oidc_issuer = EXCLUDED.oidc_issuer, + oidc_subject = EXCLUDED.oidc_subject, + display_name = EXCLUDED.display_name, + status = EXCLUDED.status, + platform_role = EXCLUDED.platform_role, + updated_at = now(); INSERT INTO household (id, public_id, tenant_id, name, owner_user_id, status) VALUES