From 597417bf0851fd42d0f3c8a617d38842ca577f9e Mon Sep 17 00:00:00 2001
From: hajimi <phperbylyh@163.com>
Date: Sat, 1 Aug 2026 17:37:56 +0800
Subject: [PATCH] feat: include crawler in development compose

---
 docker/docker-compose.dev.yml | 22 ++++++++++++++++++++++
 docs/业务进度管理.md          | 12 ++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 4eb7bf3..14177fd 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -27,6 +27,28 @@ services:
       - ../server:/likeadmin_php/server
       - ./.env.server:/likeadmin_php/server/.env:ro
 
+  crawler:
+    container_name: sport-era-crawler
+    image: sport-era-crawler:latest
+    build:
+      context: ./crawler
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    env_file:
+      - ./.env.docker
+    environment:
+      TZ: Asia/Shanghai
+      DQD_CONFIG_PATH: /app/config/settings.yaml
+      DQD_TASKS_FILE: /app/config/crawler_tasks.yaml
+      DQD_LOCK_DIR: /app/data/locks
+    volumes:
+      - ./crawler/logs:/app/logs
+      - ./crawler/data:/app/data
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    networks:
+      - sport-era-dev
+
   nginx:
     image: registry.cn-guangzhou.aliyuncs.com/likeadmin/nginx:1.23.1
     restart: unless-stopped
diff --git a/docs/业务进度管理.md b/docs/业务进度管理.md
index 6867235..61e1a82 100644
--- a/docs/业务进度管理.md
+++ b/docs/业务进度管理.md
@@ -13,6 +13,18 @@
 
 ## 一、已完成事项
 
+### 94. 统一开发编排接入 crawler
+
+- 状态：已完成 - 时间：2026-08-01
+
+完成内容：
+- 将 crawler 服务合并到 `docker/docker-compose.dev.yml`，统一通过该编排启动开发服务。
+- crawler 继续使用 `docker/crawler/logs`、`docker/crawler/data` 宿主机目录持久化运行日志和任务锁。
+- crawler 私有环境文件仍使用 `docker/.env.docker`，连接本地宿主机 MySQL `3307` 与 Redis `6379`。
+
+验证说明：
+- 已从统一编排启动 `sport-era-crawler`，并核验容器内 `match_live_stream` 的分钟级 cron 规则。
+
 ### 93. Docker 测试环境改用宿主机 MySQL 与 Redis
 
 - 状态：代码已修改，待部署测试服验证 - 时间：2026-08-01