From 7ba73247afa45cda57fca2a07ebbd81089c87168 Mon Sep 17 00:00:00 2001
From: zydi <zydi@obscura.ac.cn>
Date: Thu, 13 Feb 2025 02:15:58 +0000
Subject: [PATCH] update

---
 app/README.md                               | 31 ++++++++++++---------
 app/{app => api}/config.py                  |  0
 app/{app => api}/main.py                    |  0
 app/{app => api}/models.py                  |  0
 app/{function => config}/config.py          |  0
 app/docs/{function => config}/config.md     |  0
 app/docs/{function => tools}/rtsp2video.md  |  0
 app/docs/{function => tools}/video2image.md |  0
 app/{function => tools}/rtsp2video.py       |  0
 app/{function => tools}/video2image.py      |  0
 10 files changed, 18 insertions(+), 13 deletions(-)
 rename app/{app => api}/config.py (100%)
 rename app/{app => api}/main.py (100%)
 rename app/{app => api}/models.py (100%)
 rename app/{function => config}/config.py (100%)
 rename app/docs/{function => config}/config.md (100%)
 rename app/docs/{function => tools}/rtsp2video.md (100%)
 rename app/docs/{function => tools}/video2image.md (100%)
 rename app/{function => tools}/rtsp2video.py (100%)
 rename app/{function => tools}/video2image.py (100%)

diff --git a/app/README.md b/app/README.md
index 84d692d..5b000dc 100644
--- a/app/README.md
+++ b/app/README.md
@@ -5,25 +5,30 @@
 
 ## 系统架构
 
-### Web应用层 (app/)
+### Web应用层 (api/)
 - `main.py`: FastAPI Web应用主程序，提供REST API接口
 - `models.py`: 数据模型和业务逻辑处理
 - `config.py`: 系统配置文件
 
-### 功能模块层 (function/)
-1. **视频采集模块**
-   - `rtsp2video.py`: RTSP视频流采集和录制
-   - `video2image.py`: 视频关键帧提取
+### 配置层 (config/)
+- `config.py`: 功能和工具的系统配置文件
 
-2. **人脸分析模块**
+### 功能模块层 (function/)
+
+1. **人脸分析模块**
    - `face.py`: 人脸检测和识别
    - `face-emb.py`: 人脸特征提取
    - `pose.py`: 人体姿态检测
 
-3. **行为分析模块**
+2. **行为分析模块**
    - `qwen.py`: 基于Qwen2-VL-7B模型的视频内容分析
    - `info.json`: 行为和场景类别定义
 
+### 工具模块 (tools/)
+
+- `rtsp2video.py`: RTSP视频流采集和录制
+- `video2image.py`: 视频关键帧提取
+
 ## 主要功能
 
 ### 1. 视频采集
@@ -69,13 +74,13 @@
 ## 使用说明
 1. 确保配置文件中的各项参数正确设置
 2. 启动Redis服务
-3. 运行视频采集模块：`python rtsp2video.py`
+3. 运行视频采集模块：`python tools/rtsp2video.py`
 4. 运行分析模块：
-   - `python video2image.py`
-   - `python pose.py`
-   - `python face.py`
-   - `python qwen.py`
-5. 启动Web服务：`python main.py`
+   - `python tools/video2image.py`
+   - `python function/pose.py`
+   - `python function/face.py`
+   - `python function/qwen.py`
+5. 启动Web服务：`python api/main.py`
 
 ## API接口
 - GET `/web/face/{camera_id}/data`: 获取人脸识别数据
diff --git a/app/app/config.py b/app/api/config.py
similarity index 100%
rename from app/app/config.py
rename to app/api/config.py
diff --git a/app/app/main.py b/app/api/main.py
similarity index 100%
rename from app/app/main.py
rename to app/api/main.py
diff --git a/app/app/models.py b/app/api/models.py
similarity index 100%
rename from app/app/models.py
rename to app/api/models.py
diff --git a/app/function/config.py b/app/config/config.py
similarity index 100%
rename from app/function/config.py
rename to app/config/config.py
diff --git a/app/docs/function/config.md b/app/docs/config/config.md
similarity index 100%
rename from app/docs/function/config.md
rename to app/docs/config/config.md
diff --git a/app/docs/function/rtsp2video.md b/app/docs/tools/rtsp2video.md
similarity index 100%
rename from app/docs/function/rtsp2video.md
rename to app/docs/tools/rtsp2video.md
diff --git a/app/docs/function/video2image.md b/app/docs/tools/video2image.md
similarity index 100%
rename from app/docs/function/video2image.md
rename to app/docs/tools/video2image.md
diff --git a/app/function/rtsp2video.py b/app/tools/rtsp2video.py
similarity index 100%
rename from app/function/rtsp2video.py
rename to app/tools/rtsp2video.py
diff --git a/app/function/video2image.py b/app/tools/video2image.py
similarity index 100%
rename from app/function/video2image.py
rename to app/tools/video2image.py