Merge branch 'main' into dev

Dockerfile

@@ -0,0 +1,29 @@
+# 第一阶段：构建Python依赖
+FROM python:3.10-slim AS builder
+
+WORKDIR /app
+
+COPY main/xiaozhi-server/requirements.txt .
+
+# 优化apt安装
+RUN pip install --no-cache-dir -r requirements.txt
+
+# 第三阶段：生产镜像
+FROM python:3.10-slim
+
+WORKDIR /opt/xiaozhi-esp32-server
+
+# 优化apt安装
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends libopus0 ffmpeg && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# 从构建阶段复制Python包和前端构建产物
+COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
+
+# 复制应用代码
+COPY main/xiaozhi-server/ .
+
+# 启动应用
+CMD ["python", "app.py"]

docs/docker-build.md

@@ -8,6 +8,8 @@ sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
 ```
 2、编译docker镜像
 ```
+#进入xiaozhi-server目录
+cd main/xiaozhi-server/
 # 普通编译
 docker build -t xiaozhi-esp32-server:local -f ./Dockerfile-pip .
 ```

main/README.md

@@ -1,3 +1,5 @@
+本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../README.md#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F-)
+
 # 项目目录介绍
 当你看到这份文件的时候，这个这个项目还没完善好。我们还有很多东西要做。
 
@@ -18,3 +20,4 @@ xiaozhi-esp32-server
 
 [manager前后端接口协议](https://app.apifox.com/invite/project?token=H_8qhgfjUeaAL0wybghgU)
 
+[前端页面设计图](https://codesign.qq.com/app/s/526108506410828)

main/manager-api/README.md

@@ -1,3 +1,4 @@
+本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../README.md#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F-)
 # 项目介绍
 
 manager-api 该项目基于SpringBoot框架开发。

main/manager-web/README.md

@@ -1,3 +1,5 @@
+本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../README.md#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F-)
+
 # xiaozhi
 
 ## Project setup
@@ -11,14 +13,17 @@ npm install
 ```
 
 ### Compiles and hot-reloads for development
+
 ```
 npm run serve
 ```
 
 ### Compiles and minifies for production
+
 ```
 npm run build
 ```
 
 ### Customize configuration
+
 See [Configuration Reference](https://cli.vuejs.org/config/).

main/xiaozhi-server/Dockerfile

@@ -1,7 +1,7 @@
 # 第一阶段：构建 Python 依赖
 FROM kalicyh/poetry:v3.10_xiaozhi AS builder
 
-WORKDIR /app
+WORKDIR /opt/xiaozhi-esp32-server
 
 # 同时拷贝本地环境.venv
 COPY . .

main/xiaozhi-server/Dockerfile-pip

@@ -1,51 +0,0 @@
-# 第一阶段：前端构建
-FROM node:18 AS frontend-builder
-
-WORKDIR /app/web
-
-# 配置npm使用淘宝源
-RUN npm config set registry https://registry.npmmirror.com
-
-COPY web/package*.json ./
-
-# 安装axios依赖
-RUN npm install axios
-RUN npm install
-
-COPY web .
-
-RUN npm run build
-
-# 第二阶段：构建Python依赖
-FROM python:3.10-slim AS builder
-
-WORKDIR /app
-
-COPY requirements.txt .
-
-# 优化apt安装
-RUN pip install --no-cache-dir -r requirements.txt \
-    -i https://mirrors.aliyun.com/pypi/simple/
-
-# 第三阶段：生产镜像
-FROM python:3.10-slim
-
-WORKDIR /opt/xiaozhi-esp32-server
-
-# 优化apt安装
-RUN echo "deb https://mirrors.aliyun.com/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
-    echo "deb https://mirrors.aliyun.com/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends libopus0 ffmpeg && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# 从构建阶段复制Python包和前端构建产物
-COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
-COPY --from=frontend-builder /app/web/dist /opt/xiaozhi-esp32-server/manager/static/webui
-
-# 复制应用代码
-COPY . .
-
-# 启动应用
-CMD ["python", "app.py"]

main/xiaozhi-server/config.yaml

@@ -343,3 +343,11 @@ music:
     - ".wav"
     - ".p3"
   refresh_time: 300 # 刷新音乐列表的时间间隔，单位为秒
+
+# 以下配置在小于等于0.0.9版本中的docker容器中可用
+# 0.0.9以后的新版本源码部署已经无法奏效
+manager:
+  enabled: false
+  ip: 0.0.0.0
+  port: 8002
+use_private_config: false

main/xiaozhi-server/docker-compose.yml

@@ -13,6 +13,6 @@ services:
       - "8002:8002"
     volumes:
       # 配置文件目录
-      - ./data:/app/data
+      - ./data:/opt/xiaozhi-esp32-server/data
       # 模型文件挂接，很重要
-      - ./models/SenseVoiceSmall/model.pt:/app/models/SenseVoiceSmall/model.pt
+      - ./models/SenseVoiceSmall/model.pt:/opt/xiaozhi-esp32-server/models/SenseVoiceSmall/model.pt