From a879487551210c81ecde988faacc5b4ee89adbc4 Mon Sep 17 00:00:00 2001
From: 16337 <1633794139@qq.com>
Date: Tue, 17 Mar 2026 11:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=20Docker=20COS=20=E5=87=AD=E8=AF=81=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=AA=E5=9B=BE=E4=BB=A3=E7=90=86=20404=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- docker-compose.yml 添加 COS_SECRET_ID/KEY/REGION/BUCKET 环境变量透传
- docker/.env 填入腾讯云 COS 凭证和截图回调地址
- AiRoiController 移除多余 @GetMapping 注解，消除 Spring 双注解警告

根因：容器未传入 COS 凭证 → CosUtil 初始化跳过 → proxyScreenshotImage 返回 null → 404

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/.env                                           | 11 ++++++++++-
 docker/docker-compose.yml                             |  9 +++++++++
 .../iot/vmp/aiot/controller/AiRoiController.java      |  1 -
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/docker/.env b/docker/.env
index 0de472237..d5deb54bb 100644
--- a/docker/.env
+++ b/docker/.env
@@ -16,4 +16,13 @@ SIP_Password=wvp_sip_password
 
 
 RecordSip=true
-RecordPushLive=
\ No newline at end of file
+RecordPushLive=
+
+# COS 截图代理（腾讯云 COS）
+COS_REGION=ap-shanghai
+COS_BUCKET=xhwkzx-1-1389966313
+COS_SECRET_ID=AKIDVxPiqmVhYv7FCwVqytdAVddQ2TJySt9I
+COS_SECRET_KEY=1rVyEI8mMVWs21xfBUjy4BE6DA4z7KWb
+
+# AI 截图回调地址
+AI_SCREENSHOT_CALLBACK_URL=http://124.221.55.225:18080
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 25662a38a..d868466b8 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -133,6 +133,15 @@ services:
       RecordSip: ${RecordSip}
       RecordPushLive: ${RecordPushLive}
 
+      # COS 截图代理
+      COS_SECRET_ID: ${COS_SECRET_ID:}
+      COS_SECRET_KEY: ${COS_SECRET_KEY:}
+      COS_REGION: ${COS_REGION:ap-beijing}
+      COS_BUCKET: ${COS_BUCKET:}
+
+      # AI 截图回调地址
+      AI_SCREENSHOT_CALLBACK_URL: ${AI_SCREENSHOT_CALLBACK_URL:}
+
   polaris-nginx:
     # 显式指定构建上下文和Dockerfile路径
     build:
diff --git a/src/main/java/com/genersoft/iot/vmp/aiot/controller/AiRoiController.java b/src/main/java/com/genersoft/iot/vmp/aiot/controller/AiRoiController.java
index 1410a485a..91b775e72 100644
--- a/src/main/java/com/genersoft/iot/vmp/aiot/controller/AiRoiController.java
+++ b/src/main/java/com/genersoft/iot/vmp/aiot/controller/AiRoiController.java
@@ -117,7 +117,6 @@ public class AiRoiController {
     }
 
     @Operation(summary = "截图图片代理（服务端从 COS 下载后返回）")
-    @GetMapping("/snap/image")
     @RequestMapping(value = "/snap/image", method = {RequestMethod.GET, RequestMethod.HEAD})
     public ResponseEntity<?> getSnapImage(@RequestParam String cameraCode, HttpServletRequest request) {
         // HEAD 请求：只检查是否存在，不返回图片数据