fix(dev): 本地开发编排 - 端口约定对齐 7380/7381
Some checks failed
Publish container images / Quality checks (push) Has been cancelled
Publish container images / Resolve build version (push) Has been cancelled
Publish container images / Build open-ai-canvas-backend (amd64) (push) Has been cancelled
Publish container images / Build open-ai-canvas-backend (arm64) (push) Has been cancelled
Publish container images / Build open-ai-canvas-web (multi) (push) Has been cancelled
Publish container images / Build open-ai-canvas-yingce-agent (multi) (push) Has been cancelled
Publish container images / Publish open-ai-canvas-backend manifest (push) Has been cancelled
Publish container images / Publish open-ai-canvas-web manifest (push) Has been cancelled
Publish container images / Publish open-ai-canvas-yingce-agent manifest (push) Has been cancelled
Publish container images / Publish release assets (push) Has been cancelled
Some checks failed
Publish container images / Quality checks (push) Has been cancelled
Publish container images / Resolve build version (push) Has been cancelled
Publish container images / Build open-ai-canvas-backend (amd64) (push) Has been cancelled
Publish container images / Build open-ai-canvas-backend (arm64) (push) Has been cancelled
Publish container images / Build open-ai-canvas-web (multi) (push) Has been cancelled
Publish container images / Build open-ai-canvas-yingce-agent (multi) (push) Has been cancelled
Publish container images / Publish open-ai-canvas-backend manifest (push) Has been cancelled
Publish container images / Publish open-ai-canvas-web manifest (push) Has been cancelled
Publish container images / Publish open-ai-canvas-yingce-agent manifest (push) Has been cancelled
Publish container images / Publish release assets (push) Has been cancelled
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// 本项目附加文件(fork 专属):不改上游 main.go,达到同样的启动行为。
|
||||
// 独立成一个文件后,上游对同目录 main.go 的任何改动都不会再与本文件冲突。
|
||||
// 本项目附加文件(fork 专属):只补启动期的 .env 加载与诊断,不改上游 main.go 的主体。
|
||||
// 独立成一个文件后,上游对同目录 main.go 的改动基本不会再与本文件冲突。
|
||||
package main
|
||||
|
||||
import (
|
||||
@@ -13,10 +13,11 @@ import (
|
||||
func init() {
|
||||
config.LoadDotEnv()
|
||||
|
||||
// 本地开发默认绑定 127.0.0.1:7381(见 AGENTS.md「本项目附加约定」)。
|
||||
// 显式配置优先,例如 Compose 注入的 CANVAS_BACKEND_ADDR=":8080" 不会被覆盖。
|
||||
if strings.TrimSpace(os.Getenv("CANVAS_BACKEND_ADDR")) == "" {
|
||||
_ = os.Setenv("CANVAS_BACKEND_ADDR", "127.0.0.1:7381")
|
||||
// 监听地址的默认值在 main.go(127.0.0.1:7381,见 AGENTS.md「本项目附加约定」),
|
||||
// 容器内由 Dockerfile / Compose 显式注入 :8080;这里不再改写环境变量。
|
||||
addr := strings.TrimSpace(os.Getenv("CANVAS_BACKEND_ADDR"))
|
||||
if addr == "" {
|
||||
addr = "127.0.0.1:7381 (main.go default)"
|
||||
}
|
||||
|
||||
// 启动诊断:确认 .env / 环境变量已被读到,避免误用空 DATABASE_URL 时的静默回退。
|
||||
@@ -24,5 +25,5 @@ func init() {
|
||||
if strings.TrimSpace(os.Getenv("DATABASE_URL")) != "" {
|
||||
dbURLState = "set"
|
||||
}
|
||||
log.Printf("fork-env: CANVAS_BACKEND_ADDR=%s, DATABASE_URL=%s", os.Getenv("CANVAS_BACKEND_ADDR"), dbURLState)
|
||||
log.Printf("fork-env: CANVAS_BACKEND_ADDR=%s, DATABASE_URL=%s", addr, dbURLState)
|
||||
}
|
||||
|
||||
@@ -74,7 +74,9 @@ func run(ctx context.Context) error {
|
||||
}
|
||||
|
||||
repo := repository.New(db)
|
||||
addr := env("CANVAS_BACKEND_ADDR", ":8080")
|
||||
// 本项目宿主机默认监听 127.0.0.1:7381(见 AGENTS.md「本项目附加约定」);
|
||||
// 容器内由 backend/Dockerfile 与各 Compose 显式注入 :8080。
|
||||
addr := env("CANVAS_BACKEND_ADDR", "127.0.0.1:7381")
|
||||
svc := service.New(repo, dataDir)
|
||||
if updaterToken := strings.TrimSpace(os.Getenv("CANVAS_UPDATER_TOKEN")); updaterToken != "" {
|
||||
svc.ConfigureUpdateManager(updaterclient.New(env("CANVAS_UPDATER_SOCKET", "/run/open-ai-canvas-updater/updater.sock"), updaterToken))
|
||||
|
||||
Reference in New Issue
Block a user