feat:修复部分问题
This commit is contained in:
parent
8a9f22babe
commit
d59887374b
@ -33,28 +33,16 @@ REDIS_DB=0
|
||||
|
||||
# ==================== 镭射卡生成器 ====================
|
||||
# LASER_GEN_PROVIDER:
|
||||
# minimax (默认) - 后端直连 MiniMax
|
||||
# dify - 调 Dify laser_card_variants_v1 工作流 (阻塞)
|
||||
# openai - 后端直连 OpenAI /v1/images/edits (阻塞, 5 路并发 + 直接落 OSS)
|
||||
# LASER_GEN_PROVIDER=minimax
|
||||
# openai (默认) - 后端走微达API中转站 /v1/images/edits (5 路并发 + 直接落 OSS)
|
||||
# minimax - 后端直连 MiniMax
|
||||
# dify - 调 Dify laser_card_variants_v1 工作流 (阻塞)
|
||||
LASER_GEN_PROVIDER=openai
|
||||
|
||||
# ==================== OpenAI Images API (LASER_GEN_PROVIDER=openai 时使用) ====================
|
||||
# 生产环境必须设置,否则 LASER_GEN_PROVIDER=openai 启动会直接报错
|
||||
OPENAI_API_KEY=
|
||||
OPENAI_BASE_URL=https://api.openai.com/v1
|
||||
OPENAI_MODEL=gpt-image-1.5
|
||||
|
||||
# ==================== Dify Workflow (laser_card_v1) ====================
|
||||
# Dify API 入口 (laser_card_variants_v1 工作流, 仅在 LASER_GEN_PROVIDER=dify 时使用)
|
||||
# DIFY_API_BASE=http://localhost/v1
|
||||
# DIFY_API_KEY=app-tIfFhFwj3xnbRurK1oxxBXnA
|
||||
|
||||
# ==================== Laser Card ====================
|
||||
# 镭射卡 6 层合成服务(gateway 通过容器名 + 端口访问)
|
||||
# LASER_COMPOSITOR_URL=http://lasercompositor:7002
|
||||
# COMPOSITOR_PORT=7002
|
||||
# # 抠图服务:imageseg=阿里云 SegmentHDBody / ivpd=IVPD SegmentImage / auto=自部署HTTP→imageseg→IVPD
|
||||
# SEGMENT_PROVIDER=imageseg
|
||||
# ==================== 中转站 OpenAI 兼容 API(微达API / XBCL)====================
|
||||
# ⚠️ 生产环境务必先在 https://xbcl.link 申请独立 API key,不要用开发环境的 key
|
||||
OPENAI_API_KEY=sk-b1f01c1ebc177e8fbd8e19ca3edeb542b521c39039977ef2974ce06c5d4cc18d
|
||||
OPENAI_BASE_URL=https://xbcl.link/v1
|
||||
OPENAI_MODEL=gpt-image-2
|
||||
|
||||
# ==================== SMS Configuration ====================
|
||||
SMS_ACCESS_KEY_ID=LTAI5t6QcdJHpYbCPxM8SXYE
|
||||
@ -64,13 +52,3 @@ SMS_TEMPLATE_CODE=SMS_314621237
|
||||
SMS_REGION=cn-hangzhou
|
||||
|
||||
|
||||
# ==================== 中转站 ====================
|
||||
DB_PASSWORD=admin
|
||||
DB_NAME=top-fans
|
||||
JWT_SECRET=topfans-secret-key-please-change-in-production
|
||||
LASER_GEN_PROVIDER=openai
|
||||
OPENAI_API_KEY=sk-b1f01c1ebc177e8fbd8e19ca3edeb542b521c39039977ef2974ce06c5d4cc18d
|
||||
OPENAI_BASE_URL=https://xbcl.link/v1
|
||||
OPENAI_MODEL=gpt-image-2
|
||||
DIFY_API_BASE=http://172.23.0.1/v1
|
||||
DIFY_API_KEY=app-Ibs7reARanyuYGZ7zrLyiM6e
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# -f docker-compose.local.yml \
|
||||
# -f docker-compose.override.yml \
|
||||
# -f docker-compose.infra.yml \
|
||||
# --env-file .env.local --env-file .env.local.dev \
|
||||
# --env-file .env --env-file .env.local --env-file .env.local.dev \
|
||||
# up -d
|
||||
# ===================================================================
|
||||
|
||||
|
||||
@ -444,7 +444,12 @@ services:
|
||||
DUBBO_STATISTIC_SERVICE_URL: tri://statisticservice:20009
|
||||
DUBBO_NOTIFICATION_SERVICE_URL: tri://notificationservice:20010
|
||||
DUBBO_MODERATION_SERVICE_URL: tri://moderationservice:20011
|
||||
# 镭射卡 AI 生成(MiniMax 文生图)
|
||||
# 镭射卡 AI 生成(OpenAI 中转站 — 微达API,直连 OpenAI 会被墙)
|
||||
LASER_GEN_PROVIDER: ${LASER_GEN_PROVIDER:-openai}
|
||||
OPENAI_BASE_URL: ${OPENAI_BASE_URL:-https://xbcl.link/v1}
|
||||
OPENAI_API_KEY: ${OPENAI_API_KEY:-}
|
||||
OPENAI_MODEL: ${OPENAI_MODEL:-gpt-image-2}
|
||||
# 镭射卡 AI 生成(MiniMax 兜底)
|
||||
MINIMAX_API_KEY: ${MINIMAX_API_KEY:-}
|
||||
MINIMAX_API_URL: ${MINIMAX_API_URL:-https://api.minimaxi.com/v1/image_generation}
|
||||
# 镭射卡 6 层合成微服务(容器内通过 service name 访问)
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# 与 docker-compose.local.yml 合并;只覆盖本机需要的字段
|
||||
# 用法:
|
||||
# docker compose -f docker-compose.local.yml -f docker-compose.override.yml \
|
||||
# --env-file .env.local --env-file .env.local.dev up -d
|
||||
# --env-file .env --env-file .env.local --env-file .env.local.dev up -d
|
||||
# ===================================================================
|
||||
|
||||
# 覆盖所有业务的 DB/REDIS 凭据(指向本机手起的容器)
|
||||
@ -81,13 +81,10 @@ services:
|
||||
# gateway 决定镭射卡走哪条路径。compose 原件没引用这个变量,
|
||||
# 这里补上,让 .env.local.dev 里的 LASER_GEN_PROVIDER 真正进容器
|
||||
# (LASER_GEN_PROVIDER 的值由 .env.local.dev 控制,默认 openai)
|
||||
LASER_GEN_PROVIDER: ${LASER_GEN_PROVIDER:-minimax}
|
||||
# OpenAI Images API key,仅在 LASER_GEN_PROVIDER=openai 时使用
|
||||
# docker-compose.local.yml 没声明此变量,这里手动注入
|
||||
# (值由 .env.local.dev 提供,untracked 不进 git)
|
||||
LASER_GEN_PROVIDER: ${LASER_GEN_PROVIDER:-openai}
|
||||
OPENAI_API_KEY: ${OPENAI_API_KEY:-}
|
||||
OPENAI_BASE_URL: ${OPENAI_BASE_URL:-https://api.openai.com/v1}
|
||||
OPENAI_MODEL: ${OPENAI_MODEL:-gpt-image-1.5}
|
||||
OPENAI_BASE_URL: ${OPENAI_BASE_URL:-https://xbcl.link/v1}
|
||||
OPENAI_MODEL: ${OPENAI_MODEL:-gpt-image-2}
|
||||
# 本机用生产同款 JWT_SECRET(生产 token 能直接用本机 gateway 验签)
|
||||
# ⚠️ 仅本地开发用,生产不要用这个 secret
|
||||
JWT_SECRET: ${JWT_SECRET:-topfans-secret-key-local-dev-only}
|
||||
|
||||
@ -590,6 +590,11 @@ services:
|
||||
DUBBO_NOTIFICATION_SERVICE_URL: tri://notificationservice:20010
|
||||
DUBBO_MODERATION_SERVICE_URL: tri://moderationservice:20011
|
||||
LASER_COMPOSITOR_URL: http://lasercompositor:7002
|
||||
# 镭射卡 AI 生成(OpenAI 中转站 — 微达API,通过 .env.prod 注入 API Key)
|
||||
LASER_GEN_PROVIDER: ${LASER_GEN_PROVIDER:-openai}
|
||||
OPENAI_BASE_URL: ${OPENAI_BASE_URL:-https://xbcl.link/v1}
|
||||
OPENAI_API_KEY: ${OPENAI_API_KEY:-}
|
||||
OPENAI_MODEL: ${OPENAI_MODEL:-gpt-image-2}
|
||||
# 抠图(人像扣底)、OSS、Dify、JWT、Redis 全部走 env_file: .env.prod
|
||||
REDIS_HOST: topfans-redis
|
||||
REDIS_PORT: 6379
|
||||
|
||||
Loading…
Reference in New Issue
Block a user