From 864e042d25ee604a1c348b3c0510aabe6558a025 Mon Sep 17 00:00:00 2001 From: jack ning Date: Fri, 11 Jul 2025 12:15:01 +0800 Subject: [PATCH] update deploy/docker: mod 5 files --- deploy/docker/docker-compose-ollama.yaml | 6 ++++-- deploy/docker/docker-compose.yaml | 18 ++++++++++-------- deploy/docker/readme.md | 11 ++++++++++- deploy/docker/readme.zh.md | 13 +++++++++++-- .../visitor/VisitorRestControllerVisitor.java | 4 ++-- 5 files changed, 37 insertions(+), 15 deletions(-) diff --git a/deploy/docker/docker-compose-ollama.yaml b/deploy/docker/docker-compose-ollama.yaml index be2b8b3d75..5ae4edfe4f 100644 --- a/deploy/docker/docker-compose-ollama.yaml +++ b/deploy/docker/docker-compose-ollama.yaml @@ -233,10 +233,8 @@ services: # ai config # 默认对话配置 SPRING_AI_MODEL_CHAT: ollama - # SPRING_AI_MODEL_CHAT: zhipuai # 默认向量模型 SPRING_AI_MODEL_EMBEDDING: ollama - # SPRING_AI_MODEL_EMBEDDING: zhipuai # ollama SPRING_AI_OLLAMA_BASE_URL: http://ollama-bytedesk:11434 SPRING_AI_OLLAMA_CHAT_ENABLED: "true" @@ -254,11 +252,15 @@ services: SPRING_AI_OLLAMA_EMBEDDING_OPTIONS_MODEL_RERANK: bge-reranker-v2-m3:latest # zhipuai # 申请智谱AI API Key：https://www.bigmodel.cn/usercenter/proj-mgmt/apikeys + # SPRING_AI_ZHIPUAI_BASE_URL: https://open.bigmodel.cn/api/paas SPRING_AI_ZHIPUAI_API_KEY: 'sk-xxx' SPRING_AI_ZHIPUAI_CHAT_ENABLED: "false" SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4-flash SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TEMPERATURE: 0.7 SPRING_AI_ZHIPUAI_EMBEDDING_ENABLED: "false" + # SPRING_AI_ZHIPUAI_EMBEDDING_BASE_URL: https://api.bigmodel.cn + # SPRING_AI_ZHIPUAI_EMBEDDING_API_KEY: 'sk-xxx' + SPRING_AI_ZHIPUAI_EMBEDDING_OPTIONS_MODEL: embedding-2 # deepseek # 申请key https://api-docs.deepseek.com/zh-cn/ SPRING_AI_DEEPSEEK_BASE_URL: https://api.deepseek.com diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml index e090be8d57..5634d507d8 100644 --- a/deploy/docker/docker-compose.yaml +++ b/deploy/docker/docker-compose.yaml @@ -212,17 +212,15 @@ services: SPRING_SECURITY_BASIC_ENABLED: "true" # ai config # 默认对话配置 - SPRING_AI_MODEL_CHAT: ollama - # SPRING_AI_MODEL_CHAT: zhipuai + SPRING_AI_MODEL_CHAT: zhipuai # 默认向量模型 - SPRING_AI_MODEL_EMBEDDING: ollama - # SPRING_AI_MODEL_EMBEDDING: zhipuai + SPRING_AI_MODEL_EMBEDDING: zhipuai # ollama SPRING_AI_OLLAMA_BASE_URL: http://host.docker.internal:11434 - SPRING_AI_OLLAMA_CHAT_ENABLED: "true" + SPRING_AI_OLLAMA_CHAT_ENABLED: "false" SPRING_AI_OLLAMA_CHAT_OPTIONS_MODEL: qwen3:0.6b SPRING_AI_OLLAMA_CHAT_OPTIONS_TEMPERATURE: 0.7 - SPRING_AI_OLLAMA_EMBEDDING_ENABLED: "true" + SPRING_AI_OLLAMA_EMBEDDING_ENABLED: "false" # 如果主要处理中文内容，推荐使用BGE模型，在中文语义理解上表现更好 # https://huggingface.co/BAAI/bge-m3: Dimension: 1024, Sequence Length: 8192 SPRING_AI_OLLAMA_EMBEDDING_OPTIONS_MODEL: bge-m3:latest @@ -233,11 +231,15 @@ services: SPRING_AI_OLLAMA_EMBEDDING_OPTIONS_MODEL_RERANK: bge-reranker-v2-m3:latest # zhipuai # 申请智谱AI API Key：https://www.bigmodel.cn/usercenter/proj-mgmt/apikeys + # SPRING_AI_ZHIPUAI_BASE_URL: https://open.bigmodel.cn/api/paas SPRING_AI_ZHIPUAI_API_KEY: 'sk-xxx' - SPRING_AI_ZHIPUAI_CHAT_ENABLED: "false" + SPRING_AI_ZHIPUAI_CHAT_ENABLED: "true" SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4-flash SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TEMPERATURE: 0.7 - SPRING_AI_ZHIPUAI_EMBEDDING_ENABLED: "false" + SPRING_AI_ZHIPUAI_EMBEDDING_ENABLED: "true" + # SPRING_AI_ZHIPUAI_EMBEDDING_BASE_URL: https://api.bigmodel.cn + # SPRING_AI_ZHIPUAI_EMBEDDING_API_KEY: 'sk-xxx' + SPRING_AI_ZHIPUAI_EMBEDDING_OPTIONS_MODEL: embedding-2 # deepseek # 申请key https://api-docs.deepseek.com/zh-cn/ SPRING_AI_DEEPSEEK_BASE_URL: https://api.deepseek.com diff --git a/deploy/docker/readme.md b/deploy/docker/readme.md index 8774f3ad7a..f1c0dbb1e2 100644 --- a/deploy/docker/readme.md +++ b/deploy/docker/readme.md @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-03-12 10:21:18 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-05-14 18:19:39 + * @LastEditTime: 2025-07-11 12:06:58 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -13,6 +13,15 @@ --> # docker +## 文件说明 + +```bash +. +├── docker-compose-middleware.yaml # 仅启动mysql,redis,elasticsearch依赖，不启动微语 +├── docker-compose-ollama.yaml # 启动微语，同时启动mysql,redis,ollama,elasticsearch依赖和微语，内含ollama，默认使用ollama对话 +├── docker-compose.yaml # 启动微语，同时启动mysql,redis,elasticsearch依赖和微语，不内含ollama，默认使用zhipuai +``` + ## docker compose ```bash diff --git a/deploy/docker/readme.zh.md b/deploy/docker/readme.zh.md index 72dbd37b36..cdb795b5b3 100644 --- a/deploy/docker/readme.zh.md +++ b/deploy/docker/readme.zh.md @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-03-12 10:21:18 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-06-24 10:29:21 + * @LastEditTime: 2025-07-11 12:06:22 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -13,7 +13,16 @@ --> # docker -## 微语启动 +## 文件说明 + +```bash +. +├── docker-compose-middleware.yaml # 仅启动mysql,redis,elasticsearch依赖，不启动微语 +├── docker-compose-ollama.yaml # 启动微语，同时启动mysql,redis,ollama,elasticsearch依赖和微语，内含ollama，默认使用ollama对话 +├── docker-compose.yaml # 启动微语，同时启动mysql,redis,elasticsearch依赖和微语，不内含ollama，默认使用zhipuai +``` + +## 微语启动步骤 ```bash # https://www.weiyuai.cn/docs/zh-CN/docs/deploy/docker diff --git a/modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRestControllerVisitor.java b/modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRestControllerVisitor.java index 84bb26ce7c..1b20c8ece4 100644 --- a/modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRestControllerVisitor.java +++ b/modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRestControllerVisitor.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:21:24 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-07-10 11:04:46 + * @LastEditTime: 2025-07-11 12:13:06 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -57,7 +57,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController @AllArgsConstructor -@RequestMapping("/visitor/api/v1/visitor") +@RequestMapping("/visitor/api/v1") @Tag(name = "访客匿名管理", description = "访客匿名相关接口") public class VisitorRestControllerVisitor {