@wdyy/skills 0.1.6 → 0.1.7

package/.well-known/skills/wdyy-deployment-standard/templates/docker-compose.blue-green.yml

@@ -1,36 +1,70 @@
 services:
+  frontend-blue:
+    image: ${FRONTEND_IMAGE:?FRONTEND_IMAGE is required}
+    env_file: ../../.env
+    environment:
+      INSTANCE_ID: blue
+      NGINX_ENVSUBST_FILTER: "^(INSTANCE_ID|FRONTEND_URL|FRONTEND_PORT|RELEASE_VERSION)$"
+    ports:
+      - "${DOCKER_BIND_IP}:${FRONTEND_BLUE_PORT}:${FRONTEND_PORT}"
+    volumes:
+      - ../../logs:/app/logs
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "probe_host=$${FRONTEND_URL}; [ \"$${probe_host}\" != 0.0.0.0 ] || probe_host=127.0.0.1; wget -qO- \"http://$${probe_host}:$${FRONTEND_PORT}/health\""]
+      interval: 10s
+      timeout: 3s
+      retries: 6
+
   backend-blue:
-    image: ${BACKEND_BLUE_IMAGE:-backend-blue:not-configured}
-    env_file: ../../.env.production
+    image: ${BACKEND_IMAGE:?BACKEND_IMAGE is required}
+    env_file: ../../.env
     environment:
       INSTANCE_ID: blue
-      HOST: ${BACKEND_LISTEN_HOST}
-      PORT: ${BACKEND_CONTAINER_PORT}
+      HOST: ${BACKEND_URL}
+      PORT: ${BACKEND_PORT}
+    ports:
+      - "${DOCKER_BIND_IP}:${BACKEND_BLUE_PORT}:${BACKEND_PORT}"
+    volumes:
+      - ../../logs:/app/logs
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "probe_host=$${BACKEND_URL}; [ \"$${probe_host}\" != 0.0.0.0 ] || probe_host=127.0.0.1; wget -qO- \"http://$${probe_host}:$${BACKEND_PORT}/health\""]
+      interval: 10s
+      timeout: 3s
+      retries: 6
+
+  frontend-green:
+    image: ${FRONTEND_IMAGE:?FRONTEND_IMAGE is required}
+    env_file: ../../.env
+    environment:
+      INSTANCE_ID: green
+      NGINX_ENVSUBST_FILTER: "^(INSTANCE_ID|FRONTEND_URL|FRONTEND_PORT|RELEASE_VERSION)$"
     ports:
-      - "${BACKEND_BIND_IP}:${BLUE_PORT}:${BACKEND_CONTAINER_PORT}"
+      - "${DOCKER_BIND_IP}:${FRONTEND_GREEN_PORT}:${FRONTEND_PORT}"
     volumes:
       - ../../logs:/app/logs
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "${BACKEND_CONTAINER_HEALTH_URL}"]
+      test: ["CMD-SHELL", "probe_host=$${FRONTEND_URL}; [ \"$${probe_host}\" != 0.0.0.0 ] || probe_host=127.0.0.1; wget -qO- \"http://$${probe_host}:$${FRONTEND_PORT}/health\""]
       interval: 10s
       timeout: 3s
       retries: 6
 
   backend-green:
-    image: ${BACKEND_GREEN_IMAGE:-backend-green:not-configured}
-    env_file: ../../.env.production
+    image: ${BACKEND_IMAGE:?BACKEND_IMAGE is required}
+    env_file: ../../.env
     environment:
       INSTANCE_ID: green
-      HOST: ${BACKEND_LISTEN_HOST}
-      PORT: ${BACKEND_CONTAINER_PORT}
+      HOST: ${BACKEND_URL}
+      PORT: ${BACKEND_PORT}
     ports:
-      - "${BACKEND_BIND_IP}:${GREEN_PORT}:${BACKEND_CONTAINER_PORT}"
+      - "${DOCKER_BIND_IP}:${BACKEND_GREEN_PORT}:${BACKEND_PORT}"
     volumes:
       - ../../logs:/app/logs
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "${BACKEND_CONTAINER_HEALTH_URL}"]
+      test: ["CMD-SHELL", "probe_host=$${BACKEND_URL}; [ \"$${probe_host}\" != 0.0.0.0 ] || probe_host=127.0.0.1; wget -qO- \"http://$${probe_host}:$${BACKEND_PORT}/health\""]
       interval: 10s
       timeout: 3s
       retries: 6

package/.well-known/skills/wdyy-deployment-standard/templates/dockerignore.template

@@ -13,3 +13,5 @@ logs/
 node_modules/
 venv/
 .pnpm-store/
+.deploy-build.lock/
+.deploy-build.*

package/.well-known/skills/wdyy-deployment-standard/templates/env.example.template

@@ -0,0 +1,30 @@
+# 前端
+FRONTEND_URL=0.0.0.0
+FRONTEND_PORT=5173
+
+# 后端
+BACKEND_URL=0.0.0.0
+BACKEND_PORT=3000
+
+# 数据库
+DB_URL=
+DB_PORT=5432
+DB_USER=
+DB_PASSWORD=
+DB_NAME=
+DB_SCHEMA=
+
+# API
+
+# 部署
+PROJECT_NAME=
+SERVER_PROJECTS_ROOT=
+PROJECT_HTTP_PORT=
+DOCKER_BIND_IP=
+FRONTEND_BLUE_PORT=
+FRONTEND_GREEN_PORT=
+BACKEND_BLUE_PORT=
+BACKEND_GREEN_PORT=
+FRONTEND_BASE_IMAGE=
+BACKEND_BASE_IMAGE=
+DATABASE_MIGRATION_MODE=

package/.well-known/skills/wdyy-deployment-standard/templates/frontend-container.conf.template

@@ -0,0 +1,24 @@
+server {
+  listen ${FRONTEND_URL}:${FRONTEND_PORT};
+  server_name _;
+  root /usr/share/nginx/html;
+  index index.html;
+  access_log /app/logs/frontend-${INSTANCE_ID}-access.log;
+  error_log /app/logs/frontend-${INSTANCE_ID}-error.log warn;
+
+  location = /health {
+    access_log off;
+    default_type text/plain;
+    return 200 'ok';
+  }
+
+  location = /version {
+    access_log off;
+    default_type text/plain;
+    return 200 '${RELEASE_VERSION}';
+  }
+
+  location / {
+    try_files $uri $uri/ /index.html;
+  }
+}

package/.well-known/skills/wdyy-deployment-standard/templates/frontend.Dockerfile.template

@@ -0,0 +1,7 @@
+ARG FRONTEND_BASE_IMAGE
+FROM ${FRONTEND_BASE_IMAGE}
+ARG RELEASE_VERSION
+ENV RELEASE_VERSION=${RELEASE_VERSION}
+LABEL org.opencontainers.image.version=${RELEASE_VERSION}
+COPY src/frontend/dist/ /usr/share/nginx/html/
+COPY scripts/deployment/frontend-container.conf.template /etc/nginx/templates/default.conf.template

package/.well-known/skills/wdyy-deployment-standard/templates/nginx-upstream.template.conf

@@ -1,27 +1,26 @@
-include "__DEPLOY_ROOT__/nginx/backend-active.conf";
+# wdyy-project: __PROJECT_NAME__
+# wdyy-port: __PROJECT_HTTP_PORT__
+# wdyy-docker-ports: __DOCKER_HOST_PORTS__
+include "__DEPLOY_ROOT__/nginx/active-upstreams.conf";
 
 server {
+  listen __PROJECT_HTTP_PORT__;
+  server_name _;
+
   location /api/ {
-    proxy_pass __BACKEND_PROXY_URL__;
+    proxy_pass http://__BACKEND_UPSTREAM_NAME__;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Trace-Id $request_id;
   }
 
-  location /releases/ {
-    root "__DEPLOY_ROOT__";
-    try_files $uri =404;
-  }
-
   location / {
-    root "__DEPLOY_ROOT__/current";
-    try_files $uri $uri/ /index.html;
-  }
-
-  location = /index.html {
-    root "__DEPLOY_ROOT__/current";
-    add_header Cache-Control "no-cache, no-store, must-revalidate" always;
-  }
-
-  location ~* ^/releases/.+\.(?:js|css|woff2?|png|jpg|svg)$ {
-    add_header Cache-Control "public, max-age=31536000, immutable" always;
+    proxy_pass http://__FRONTEND_UPSTREAM_NAME__;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
   }
 }

package/README.md

@@ -18,7 +18,7 @@ OpenSpec                           单项变更的需求、设计、任务、实
 | `wdyy-api-standard` | 根据“获取XX数据”“使用XX接口”等需求定位接口 reference，并按已确认契约写入调用方式。 |
 | `wdyy-bug-record` | 手动汇总当前任务已解决的问题，并按模板追加至 `docs/bug_record.md`。 |
 | `wdyy-logging-standard` | 结构化日志、敏感字段移除、traceId、前端异常上报与日志轮转。 |
-| `wdyy-deployment-standard` | 人工 SCP 交付、版本化前端资源、Docker 蓝绿发布与回滚。 |
+| `wdyy-deployment-standard` | 扩充标准五段环境配置，生成人工交付、双 Docker 蓝绿发布与回滚文件。 |
 
 ## 使用方式
 
@@ -29,7 +29,7 @@ npm install -g @wdyy/skills
 wdyy init
 ```
 
-`wdyy init` 会在系统用户目录 `.agents/skills/` 安装或更新 5 个受管理 Skill，不在目标项目创建 `.agents/skills/`。它还会执行 `git init`，创建或补齐 `.gitignore` 的 `.env`、`node_modules/`、`venv/`、`.pnpm-store/`、`logs/`、`dist/`、`.DS_Store`、`*.tar.gz` 规则，创建 `src/frontend`、`src/backend`、`database`、`deploy`、`docs`、`scripts`、`tests` 和空 `.env.example`，并执行 `openspec init`、创建或追加 `docs/bug_record.md` 模板。若目标项目已有 `AGENTS.md`，原文件保持不变，命令将生成 `AGENTS_new.md`。
+`wdyy init` 会在系统用户目录 `.agents/skills/` 安装或更新 5 个受管理 Skill，不在目标项目创建 `.agents/skills/`。它还会执行 `git init`，创建或补齐 `.gitignore` 的 `.env`、`node_modules/`、`venv/`、`.pnpm-store/`、`logs/`、`dist/`、`.DS_Store`、`*.tar.gz` 规则，创建 `src/frontend`、`src/backend`、`database`、`deploy`、`docs`、`scripts`、`tests`，并以相同的“前端、后端、数据库、API、部署”结构创建缺失的 `.env` 与 `.env.example`。默认前端监听 `0.0.0.0:5173`、后端监听 `0.0.0.0:3000`、数据库端口为 `5432`；已有环境文件保持不变。随后命令执行 `openspec init`、创建或追加 `docs/bug_record.md` 模板。若目标项目已有 `AGENTS.md`，原文件保持不变，命令将生成 `AGENTS_new.md`。
 
 ### 仅更新已安装的 Skill
 

package/lib/wdyy-cli.js

@@ -34,7 +34,28 @@ const requiredGitIgnoreEntries = [
   '*.tar.gz'
 ];
 
-const defaultProjectLayout = [...defaultProjectDirectories, '.env.example'];
+const defaultEnvironmentContent = `# 前端
+FRONTEND_URL=0.0.0.0
+FRONTEND_PORT=5173
+
+# 后端
+BACKEND_URL=0.0.0.0
+BACKEND_PORT=3000
+
+# 数据库
+DB_URL=
+DB_PORT=5432
+DB_USER=
+DB_PASSWORD=
+DB_NAME=
+DB_SCHEMA=
+
+# API
+
+# 部署
+`;
+
+const defaultProjectLayout = [...defaultProjectDirectories, '.env', '.env.example'];
 
 const generatedAgentsContent = `# 企业开发规则
 
@@ -49,7 +70,7 @@ const generatedAgentsContent = `# 企业开发规则
 
 默认项目目录为 ${defaultProjectLayout.map((path) => `\`${path}\``).join('、')}。
 
-所有 URL、端口和 IP 地址必须从 \`.env\` 文件读取，禁止在代码中硬编码；不得提交秘密或生产环境 \`.env\`。
+所有 URL、端口和 IP 地址必须从项目根目录的 \`.env\` 文件读取，禁止在代码中硬编码；不得提交秘密或生产环境 \`.env\`。
 
 项目开发完成后必须创建 \`README.md\`，内容包括项目技术栈、目录结构和安装部署说明。
 
@@ -158,13 +179,18 @@ async function createDefaultProjectLayout(targetRoot, writtenPaths) {
     if (!existed) writtenPaths.push(destination);
   }
 
-  const envExamplePath = join(targetRoot, '.env.example');
-  try {
-    await access(envExamplePath);
-  } catch (error) {
-    if (error.code !== 'ENOENT') throw error;
-    await writeFile(envExamplePath, '', 'utf8');
-    writtenPaths.push(envExamplePath);
+  for (const environmentFile of ['.env', '.env.example']) {
+    const environmentPath = join(targetRoot, environmentFile);
+    try {
+      await access(environmentPath);
+    } catch (error) {
+      if (error.code !== 'ENOENT') throw error;
+      await writeFile(environmentPath, defaultEnvironmentContent, {
+        encoding: 'utf8',
+        mode: environmentFile === '.env' ? 0o600 : 0o644
+      });
+      writtenPaths.push(environmentPath);
+    }
   }
   console.log(`已准备默认项目目录: ${defaultProjectDirectories.join('、')}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdyy/skills",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "企业内部开发 Skill 与项目初始化命令",
   "type": "module",
   "bin": {