From 5bbc4931d97805cd9a58324ef2f337021110b55a Mon Sep 17 00:00:00 2001 From: Liuyang <2746366019@qq.com> Date: Wed, 12 Mar 2025 09:49:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor(yudao-server):=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=9B=B8=E5=85=B3=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 application-ymx-docker.yaml 重命名为 application-docker-dev.yaml - 更新数据库连接字符串、用户名和密码 - 修改 Spring Boot Admin Server 地址- 更新日志文件路径 - 调整部分配置项格式 - 更新微服务 API 地址 - 修改 logback-spring.xml 中的 springProfile 名称 --- ...ocker.yaml => application-docker-dev.yaml} | 77 ++++++++++--------- .../src/main/resources/logback-spring.xml | 2 +- 2 files changed, 41 insertions(+), 38 deletions(-) rename yudao-server/src/main/resources/{application-ymx-docker.yaml => application-docker-dev.yaml} (87%) diff --git a/yudao-server/src/main/resources/application-ymx-docker.yaml b/yudao-server/src/main/resources/application-docker-dev.yaml similarity index 87% rename from yudao-server/src/main/resources/application-ymx-docker.yaml rename to yudao-server/src/main/resources/application-docker-dev.yaml index f2740347f..63645752b 100644 --- a/yudao-server/src/main/resources/application-ymx-docker.yaml +++ b/yudao-server/src/main/resources/application-docker-dev.yaml @@ -15,7 +15,7 @@ spring: druid: # Druid 【监控】相关的全局配置 web-stat-filter: enabled: true - stat-view-servlet: + stat-view_servlet: enabled: true allow: # 设置白名单，不填则允许所有访问 url-pattern: /druid/* @@ -46,14 +46,14 @@ spring: primary: master datasource: master: - url: jdbc:mysql://18.210.203.44:3306/xhllm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 - username: llm - password: ymxllm123# + url: jdbc:mysql://119.3.223.215:3306/xhllm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8mb4 # MySQL Connector/J 8.X 连接的示例 + username: xhllm_user + password: XNJZ-xhllm_user-!#%246 slave: # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jxdbc:mysql://18.210.203.44:3306/xhllm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true - username: llm - password: ymxllm123# + url: jdbc:mysql://119.3.223.215:3306/xhllm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8mb4 + username: xhllm_user + password: XNJZ-xhllm_user-!#%246 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: @@ -97,7 +97,7 @@ spring: # rocketmq 配置项，对应 RocketMQProperties 配置类 rocketmq: - name-server: 127.0.0.1:9876 # RocketMQ Namesrv + name_server: 127.0.0.1:9876 # RocketMQ Namesrv spring: # RabbitMQ 配置项，对应 RabbitProperties 配置类 @@ -108,7 +108,7 @@ spring: password: rabbit # RabbitMQ 服务的密码 # Kafka 配置项，对应 KafkaProperties 配置类 kafka: - bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔 + bootstrap_servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔 --- #################### 服务保障相关配置 #################### @@ -133,7 +133,7 @@ spring: admin: # Spring Boot Admin Client 客户端的相关配置 client: - url: http://18.210.203.44:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址 + url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址 instance: service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] # Spring Boot Admin Server 服务端的相关配置 @@ -142,7 +142,7 @@ spring: # 日志文件配置 logging: file: - name: /home/ubuntu/soft/logs/xhllm/${spring.application.name}.log # 日志文件名，全路径 + name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 level: # 配置自己写的 MyBatis Mapper 打印日志 cn.iocoder.yudao.module.bpm.dal.mysql: debug @@ -166,7 +166,10 @@ logging: org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 debug: false - +server: + servlet: + encoding: + charset: UTF-8 --- #################### 微信公众号、小程序相关配置 #################### wx: mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 @@ -249,23 +252,23 @@ llm: #################### 8123: RAG服务、训练集和标注相关API。 ################### ### RAG服务 #RAG健康检查 GET - rag_health: http://18.210.203.44:8123/health + rag_health: ${RAG_Service_URL}/health #上传并向量化 POST - rag_embed: http://18.210.203.44:8123/embed + rag_embed: ${RAG_Service_URL}/embed #获取所有向量id GET - rag_ids: http://18.210.203.44:8123/ids + rag_ids: ${RAG_Service_URL}/ids #根据id获取文档 GET - rag_documents: http://18.210.203.44:8123/documents + rag_documents: ${RAG_Service_URL}/documents #根据id删除文档 DEL - rag_documents_del: http://18.210.203.44:8123/documents + rag_documents_del: ${RAG_Service_URL}/documents #根据file_id检索向量 POST - rag_query: http://18.210.203.44:8123/query + rag_query: ${RAG_Service_URL}/query #支持多个文件id查询向量 GET - rag_query_multiple: http://18.210.203.44:8123/query_multiple + rag_query_multiple: ${RAG_Service_URL}/query_multiple # 知识库向量嵌入 - embed: http://18.210.203.44:8123/embed + embed: ${RAG_Service_URL}/embed # 知识库查询 - embed_query: http://18.210.203.44:8123/query + embed_query: ${RAG_Service_URL}/query #### LLM train and service api 训练集、标注相关API # 训练集列表 GET @@ -283,22 +286,22 @@ llm: #################### 9000: 大模型管理、微调任务、文件上传和模型部署相关API。 ################### # 大模型列表 GET - models_list: http://18.210.203.44:9000/api/models + models_list: http://10.14.3.231:9000/api/models # 登录 POST - login: http://18.210.203.44:9000/api/auth/login - account: http://18.210.203.44:9000/api/auth/account + login: http://10.14.3.231:9000/api/auth/login + account: http://10.14.3.231:9000/api/auth/account login_username: admin login_password: admin # 微调任务详情 GET - finetuning_detail: http://18.210.203.44:9000/api/finetuning + finetuning_detail: ${Finetuning_Service_URL}/api/finetuning # 微调任务取消 - finetuning_cancel: http://18.210.203.44:9000/api/finetuning/%s/cancel + finetuning_cancel: ${Finetuning_Service_URL}/api/finetuning/%s/cancel # 微调文件列表 GET - finetuning_file_list: http://18.210.203.44:9000/api/files?purpose=fine-tune + finetuning_file_list: ${Finetuning_Service_URL}/api/files?purpose=fine-tune # 模型部署 - model_create: http://18.210.203.44:9000/api/models + model_create: ${Finetuning_Service_URL}/api/models # aigc模型推理 - aigc_model_completions: http://18.210.203.44:9000/api/channels/chat/completions + aigc_model_completions: ${Finetuning_Service_URL}/api/channels/chat/completions #################### 5123: 微调任务、模型部署、文件管理、提示词优化、自动评估、文生图等API。 ################### @@ -319,33 +322,33 @@ llm: # 模型文件下载 model_file_download: /models/download/?file_path= # 提示词优化 - optimize_prompt: http://18.210.203.44:5123/optimize-prompt + optimize_prompt: ${AIGC_Service_URL}/optimize-prompt # 自动评估 auto_evaluation: /llm-eval # 文生图 - text_to_image: http://18.210.203.44:5123/generate-image + text_to_image: http://36.103.199.248:5123/generate-image # 检查点文件列表 check_file_list: /llm/finetuning/checkpoints?model_name= # 模型调优停止 POST stop_finetuning: /llm/finetuning/stop # 基座模型状态 POST - base_model_status: http://18.210.203.44:5123/llm/deploy/list + base_model_status: ${AIGC_Service_URL}/llm/deploy/list # 模型部署 POST - deploy_model: http://18.210.203.44:5123/llm/deploy + deploy_model: ${AIGC_Service_URL}/llm/deploy # 模型删除 - delete_model: http://18.210.203.44:5123/llm/deploy/stop + delete_model: ${AIGC_Service_URL}/llm/deploy/stop #################### 30000: 大模型对话相关API。 ################### #### 大模型对话 # 模型列表 GET - base_model_list: http://18.210.203.44:30000/model/v1/models + base_model_list: ${Model-Dialog_Service_URL}/model/v1/models # 模型对话 POST - model_completions: http://18.210.203.44:30000/v1/chat/completions + model_completions: ${Model-Dialog_Service_URL}/v1/chat/completions #################### 48080: 应用和管理服务相关API。 ################### application_api: http://localhost:48080/admin-api/llm/application/api/apiKey/chat - model_service_api: http://localhost:48080/admin-api/llm/model-service/api/apiKey/chat + model_service_api: http://localhost:48080/admin-api/llm/model_Service/api/apiKey/chat --- #################### iot相关配置 TODO 芋艿：再瞅瞅 #################### diff --git a/yudao-server/src/main/resources/logback-spring.xml b/yudao-server/src/main/resources/logback-spring.xml index 03978ea00..c1eb2dac5 100644 --- a/yudao-server/src/main/resources/logback-spring.xml +++ b/yudao-server/src/main/resources/logback-spring.xml @@ -65,7 +65,7 @@ - +