diff --git a/Dockerfile b/Dockerfile index 00aadfb..5de8794 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,10 +49,10 @@ COPY . . # 创建临时目录 RUN mkdir -p /tmp/web_captures -EXPOSE 16026 +EXPOSE 16025 # 健康检查 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ - CMD curl -f http://localhost:16026/health || exit 1 + CMD curl -f http://localhost:16025/health || exit 1 -CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:16026", "--timeout", "120", "app:app"] \ No newline at end of file +CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:16025", "--timeout", "120", "app:app"] \ No newline at end of file diff --git a/PROJECT_SUMMARY.md b/PROJECT_SUMMARY.md index 4e0216b..75e325f 100644 --- a/PROJECT_SUMMARY.md +++ b/PROJECT_SUMMARY.md @@ -6,7 +6,7 @@ - **当前版本**: v1.0.2 - **提交历史**: - v1.0.0: 初始化项目 - - v1.0.1: 修改端口为 16026 + - v1.0.1: 修改端口为 16025 - v1.0.2: 修复 agent-browser socket 权限问题 ## 操作步骤 @@ -39,5 +39,5 @@ git push -u origin master --tags ## 服务地址 -- Web 界面: http://192.168.0.101:16026 -- API 接口: http://192.168.0.101:16026/api/capture \ No newline at end of file +- Web 界面: http://192.168.0.101:16025 +- API 接口: http://192.168.0.101:16025/api/capture \ No newline at end of file diff --git a/README.md b/README.md index 6b65cf1..40e365a 100644 --- a/README.md +++ b/README.md @@ -104,18 +104,18 @@ API 信息接口 ```bash # 基础截图 -curl -X POST http://localhost:16026/api/capture \ +curl -X POST http://localhost:16025/api/capture \ -H "Content-Type: application/json" \ -d '{"url": "https://example.com", "action": "screenshot"}' \ --output screenshot.png # 提取HTML -curl -X POST http://localhost:16026/api/capture \ +curl -X POST http://localhost:16025/api/capture \ -H "Content-Type: application/json" \ -d '{"url": "https://example.com", "action": "html"}' # 滚动加载后全页截图 -curl -X POST http://localhost:16026/api/capture \ +curl -X POST http://localhost:16025/api/capture \ -H "Content-Type: application/json" \ -d '{ "url": "https://news.ycombinator.com", @@ -127,7 +127,7 @@ curl -X POST http://localhost:16026/api/capture \ --output full_page.png # 自定义视口 -curl -X POST http://localhost:16026/api/capture \ +curl -X POST http://localhost:16025/api/capture \ -H "Content-Type: application/json" \ -d '{ "url": "https://example.com", @@ -144,7 +144,7 @@ import requests # 截图 response = requests.post( - 'http://localhost:16026/api/capture', + 'http://localhost:16025/api/capture', json={ 'url': 'https://example.com', 'action': 'screenshot' @@ -155,7 +155,7 @@ with open('screenshot.png', 'wb') as f: # 提取HTML response = requests.post( - 'http://localhost:16026/api/capture', + 'http://localhost:16025/api/capture', json={ 'url': 'https://example.com', 'action': 'html' @@ -169,7 +169,7 @@ print(html) ```javascript // 截图 -const response = await fetch('http://localhost:16026/api/capture', { +const response = await fetch('http://localhost:16025/api/capture', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ @@ -182,7 +182,7 @@ const response = await fetch('http://localhost:16026/api/capture', { const blob = await response.blob(); // 提取HTML -const response = await fetch('http://localhost:16026/api/capture', { +const response = await fetch('http://localhost:16025/api/capture', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ @@ -199,7 +199,7 @@ console.log(data.html); ### 使用 Gunicorn ```bash -gunicorn -w 4 -b 0.0.0.0:16026 app:app +gunicorn -w 4 -b 0.0.0.0:16025 app:app ``` ### 使用 Systemd 服务 @@ -230,12 +230,12 @@ RUN playwright install chromium --with-deps COPY . . EXPOSE 5000 -CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:16026", "app:app"] +CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:16025", "app:app"] ``` ```bash docker build -t web-capture-api . -docker run -p 16026:16026 web-capture-api +docker run -p 16025:16025 web-capture-api ``` ## 性能优化 diff --git a/app.py b/app.py index 1723469..493e8fb 100644 --- a/app.py +++ b/app.py @@ -583,5 +583,5 @@ if __name__ == '__main__': print(" agent-browser: npm install -g agent-browser && agent-browser install") print(" playwright: pip install playwright && playwright install chromium") - print("\n🚀 Server running on http://0.0.0.0:16026") - app.run(host='0.0.0.0', port=16026, debug=True) \ No newline at end of file + print("\n🚀 Server running on http://0.0.0.0:16025") + app.run(host='0.0.0.0', port=16025, debug=True) \ No newline at end of file diff --git a/deploy.sh b/deploy.sh index d26cdd3..66621f9 100755 --- a/deploy.sh +++ b/deploy.sh @@ -23,4 +23,4 @@ echo "运行方式:" echo " 开发模式: python3.12 app.py" echo " 生产模式: gunicorn -w 4 -b 0.0.0.0:5000 app:app" echo "" -echo "访问地址: http://localhost:16026" \ No newline at end of file +echo "访问地址: http://localhost:16025" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index ce8a41b..f70625f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,14 +6,14 @@ services: image: web-capture-api:latest container_name: web-capture-api ports: - - "16026:16026" + - "16025:16025" environment: - TZ=Asia/Shanghai volumes: - ./captures:/tmp/web_captures restart: unless-stopped healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:16026/health"] + test: ["CMD", "curl", "-f", "http://localhost:16025/health"] interval: 30s timeout: 10s retries: 3 diff --git a/install.sh b/install.sh index 2a807bd..18a36ed 100755 --- a/install.sh +++ b/install.sh @@ -110,7 +110,7 @@ echo " cd $(pwd)" echo " $PYTHON app.py" echo "" echo "📖 访问地址:" -echo " http://localhost:16026" +echo " http://localhost:16025" echo "" echo "📚 API 文档:" -echo " http://localhost:16026/api" \ No newline at end of file +echo " http://localhost:16025/api" \ No newline at end of file diff --git a/test_api.py b/test_api.py index 442e3dd..a512a0d 100755 --- a/test_api.py +++ b/test_api.py @@ -7,7 +7,7 @@ import requests import json import sys -API_URL = "http://localhost:16026" +API_URL = "http://localhost:16025" def test_health(): diff --git a/web-capture-api.service b/web-capture-api.service index a197bb4..926de94 100644 --- a/web-capture-api.service +++ b/web-capture-api.service @@ -6,7 +6,7 @@ After=network.target Type=simple User=openclaw WorkingDirectory=/home/openclaw/.openclaw/workspace-hz4th_coder/works/web-capture-api -ExecStart=/home/openclaw/.openclaw/workspace-hz4th_coder/works/web-capture-api/venv/bin/gunicorn -w 4 -b 0.0.0.0:16026 app:app +ExecStart=/home/openclaw/.openclaw/workspace-hz4th_coder/works/web-capture-api/venv/bin/gunicorn -w 4 -b 0.0.0.0:16025 app:app Restart=always RestartSec=10