update: 增加docker 统一打包 (#232)

* update: 增加docker 统一打包

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

---------

Co-authored-by: hrz <1710360675@qq.com>

main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java

@@ -35,8 +35,8 @@ public interface ErrorCode {
     int REDIS_ERROR = 10027;
     int JOB_ERROR = 10028;
     int INVALID_SYMBOL = 10029;
-
-
+    
+    // 密码相关错误码
     int PASSWORD_LENGTH_ERROR = 10030;
     int PASSWORD_WEAK_ERROR = 10031;
     int DEL_MYSELF_ERROR = 10032;

main/xiaozhi-server/.dockerignore

@@ -1,13 +0,0 @@
-.git
-__pycache__
-*.pyc
-.env
-Dockerfile
-../docs/
-tmp/
-data/
-LICENSE
-README.md
-README_en.md
-manager/static
-manager/static/webui/

main/xiaozhi-server/Dockerfile

@@ -1,16 +0,0 @@
-# 第一阶段：构建 Python 依赖
-FROM kalicyh/poetry:v3.10_xiaozhi AS builder
-
-WORKDIR /opt/xiaozhi-esp32-server
-
-# 同时拷贝本地环境.venv
-COPY . .
-# 检查是否有缺失
-RUN poetry install --no-root
-
-# 设置虚拟环境路径
-ENV PATH="/app/.venv/bin:$PATH"
-
-# 启动应用
-ENTRYPOINT ["poetry", "run", "python"]
-CMD ["app.py"]

main/xiaozhi-server/docker-compose.yml

@@ -1,7 +1,12 @@
+# 如果本机已经安装了MySQL，可以直接在数据库中创建名为`xiaozhi_esp32_server`的数据库。
+# 如果还没有MySQL，你可以通过docker安装mysql,执行以下一句话
+# docker run --name xiaozhi-esp32-server-db -e MYSQL_ROOT_PASSWORD=123456 -p 3306:3306 -e MYSQL_DATABASE=xiaozhi_esp32_server -e MYSQL_INITDB_ARGS="--character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci" -d mysql:latest
+# 如果你的mysql账号和密码有修改过，记得修改下方数据库的账号和密码
+# 记得修改下方数据库的IP，ip不能写127.0.0.1或localhost，否则容器无法访问，要写你电脑局域网ip
 version: '3'
 services:
   xiaozhi-esp32-server:
-    image: ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:latest
+    image: ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:server_latest
     container_name: xiaozhi-esp32-server
     restart: always
     security_opt:
@@ -11,10 +16,22 @@ services:
     ports:
       # ws服务端
       - "8000:8000"
-      # 管理后台
-      - "8002:8002"
     volumes:
       # 配置文件目录
       - ./data:/opt/xiaozhi-esp32-server/data
       # 模型文件挂接，很重要
-      - ./models/SenseVoiceSmall/model.pt:/opt/xiaozhi-esp32-server/models/SenseVoiceSmall/model.pt
+      - ./models/SenseVoiceSmall/model.pt:/opt/xiaozhi-esp32-server/models/SenseVoiceSmall/model.pt
+  xiaozhi-esp32-server-web:
+    image: ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:web_latest
+    container_name: xiaozhi-esp32-server-web
+    restart: always
+    ports:
+      - "8002:8002"
+    environment:
+      - TZ=Asia/Shanghai
+      ##记得改mysql和redis IP 密码
+      - SPRING_DATASOURCE_DRUID_URL=jdbc:mysql://192.168.1.20:3306/xiaozhi_esp32_server?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+      - SPRING_DATASOURCE_DRUID_USERNAME=root
+      - SPRING_DATASOURCE_DRUID_PASSWORD=123456
+      - SPRING_DATA_REDIS_HOST=192.168.1.20
+      - SPRING_DATA_REDIS_PORT=6379

main/xiaozhi-server/pyproject.toml

@@ -1,42 +0,0 @@
-[tool.poetry]
-name = "xiaozhi-esp32-server"
-version = "0.1.0"
-description = ""
-authors = ["kalicyh <34980061+kaliCYH@users.noreply.github.com>"]
-readme = "README.md"
-
-[tool.poetry.dependencies]
-python = "^3.10"
-pyyml = "0.0.2"
-torch = "2.2.2"
-silero-vad = "5.1.2"
-websockets = "14.2"
-numpy = "1.26.4"
-pydub = "0.25.1"
-funasr = "1.2.3"
-torchaudio = "2.2.2"
-openai = "1.61.0"
-google-generativeai = "0.8.4"
-edge-tts = "7.0.0"
-httpx = "0.27.2"
-aiohttp = "3.9.3"
-aiohttp-cors = "0.7.0"
-ormsgpack = "1.7.0"
-ruamel-yaml = "0.18.10"
-setuptools = "^75.8.0"
-loguru = "^0.7.3"
-opuslib-next = "^1.1.2"
-fastapi = {extras = ["all"], version = "^0.115.8"}
-uvicorn = "^0.34.0"
-pyjwt = "^2.10.1"
-python-jose = {extras = ["cryptography"], version = "^3.3.0"}
-bcrypt = "^4.2.1"
-sqlalchemy = "^2.0.38"
-pymysql = "^1.1.1"
-asyncpg = "^0.30.0"
-onnxruntime = "1.19.2"
-
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"