ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2025-12-30 10:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update deploy/docker: mod 5 files

Browse Source
This commit is contained in:
jack ning
2025-07-11 12:15:01 +08:00
parent bef082a414
commit 864e042d25
5 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deploy/docker/docker-compose-ollama.yaml
View File

@@ -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

18
deploy/docker/docker-compose.yaml
View File

@@ -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

11
deploy/docker/readme.md
View File

@@ -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

13
deploy/docker/readme.zh.md
View File

@@ -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

4
modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRestControllerVisitor.java
View File

@@ -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 {