tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(sync): 上游同步 - 合并 upstream/main 至 ee6b3446，按新 module 路径收敛冲突

Browse Source
This commit is contained in:
tongtongstudio
2026-10-10 09:31:17 +08:00
parent 2c79a3afb7 ee6b344671
commit 9f4e14bb43
1310 changed files with 47075 additions and 7234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/cmd/host-updater/main.go
View File

@@ -14,7 +14,7 @@ import (
"syscall"
"time"
"infinite-canvas/backend/internal/hostupdate"
"yingce/backend/internal/hostupdate"
)
func main() {

8
backend/cmd/migrate-channel-model-price-tiers/fork_env.go Normal file
View File

@@ -0,0 +1,8 @@
// 本项目附加文件（fork 专属）：不改上游 main.go，仅让该命令启动时读取仓库根 .env。
package main
import "yingce/backend/internal/config"
func init() {
config.LoadDotEnv()
}

10
backend/cmd/migrate-channel-model-price-tiers/main.go
View File

@@ -12,11 +12,10 @@ import (
"strings"
"time"
"infinite-canvas/backend/internal/config"
"infinite-canvas/backend/internal/database"
"infinite-canvas/backend/internal/model"
"infinite-canvas/backend/internal/repository"
"infinite-canvas/backend/internal/service"
"yingce/backend/internal/database"
"yingce/backend/internal/model"
"yingce/backend/internal/repository"
"yingce/backend/internal/service"
"gorm.io/gorm"
)
@@ -39,7 +38,6 @@ type familyPlan struct {
}
func main() {
config.LoadDotEnv()
apply := flag.Bool("apply", false, "创建系统模型价格档并切换当前前台目录版本")
flag.Parse()
db, err := database.Open(database.Config{Driver: "postgres", DSN: os.Getenv("DATABASE_URL"), DataDir: os.Getenv("CANVAS_BACKEND_DATA_DIR")})

8
backend/cmd/migrate-logical-model-families/fork_env.go Normal file
View File

@@ -0,0 +1,8 @@
// 本项目附加文件（fork 专属）：不改上游 main.go，仅让该命令启动时读取仓库根 .env。
package main
import "yingce/backend/internal/config"
func init() {
config.LoadDotEnv()
}

10
backend/cmd/migrate-logical-model-families/main.go
View File

@@ -12,11 +12,10 @@ import (
"strconv"
"strings"
"infinite-canvas/backend/internal/config"
"infinite-canvas/backend/internal/database"
"infinite-canvas/backend/internal/model"
"infinite-canvas/backend/internal/repository"
"infinite-canvas/backend/internal/service"
"yingce/backend/internal/database"
"yingce/backend/internal/model"
"yingce/backend/internal/repository"
"yingce/backend/internal/service"
"gorm.io/gorm"
)
@@ -56,7 +55,6 @@ var familyDefinitions = []familyDefinition{
}
func main() {
config.LoadDotEnv()
apply := flag.Bool("apply", false, "写入模型家族并归档旧 SKU 目录项")
flag.Parse()

8
backend/cmd/migrate-schema/fork_env.go Normal file
View File

@@ -0,0 +1,8 @@
// 本项目附加文件（fork 专属）：不改上游 main.go，仅让该命令启动时读取仓库根 .env。
package main
import "yingce/backend/internal/config"
func init() {
config.LoadDotEnv()
}

6
backend/cmd/migrate-schema/main.go
View File

@@ -7,13 +7,11 @@ import (
"os"
"strings"
"infinite-canvas/backend/internal/canvas"
"infinite-canvas/backend/internal/config"
"infinite-canvas/backend/internal/database"
"yingce/backend/internal/canvas"
"yingce/backend/internal/database"
)
func main() {
config.LoadDotEnv()
command := "up"
if len(os.Args) > 1 {
command = strings.ToLower(strings.TrimSpace(os.Args[1]))

8
backend/cmd/migrate-sqlite-postgres/fork_env.go Normal file
View File

@@ -0,0 +1,8 @@
// 本项目附加文件（fork 专属）：不改上游 main.go，仅让该命令启动时读取仓库根 .env。
package main
import "yingce/backend/internal/config"
func init() {
config.LoadDotEnv()
}

6
backend/cmd/migrate-sqlite-postgres/main.go
View File

@@ -13,9 +13,8 @@ import (
"time"
"unicode/utf8"
"infinite-canvas/backend/internal/config"
"infinite-canvas/backend/internal/database"
"infinite-canvas/backend/internal/model"
"yingce/backend/internal/database"
"yingce/backend/internal/model"
"gorm.io/gorm"
"gorm.io/gorm/logger"
@@ -28,7 +27,6 @@ type tableMigration struct {
}
func main() {
config.LoadDotEnv()
sourcePath := strings.TrimSpace(os.Getenv("SQLITE_SOURCE_PATH"))
targetDSN := strings.TrimSpace(os.Getenv("DATABASE_URL"))
if sourcePath == "" || targetDSN == "" {

4
backend/cmd/migrate-sqlite-postgres/main_test.go
View File

@@ -4,8 +4,8 @@ import (
"sync"
"testing"
"infinite-canvas/backend/internal/database"
"infinite-canvas/backend/internal/model"
"yingce/backend/internal/database"
"yingce/backend/internal/model"
"gorm.io/gorm"
"gorm.io/gorm/schema"

2
backend/cmd/payment-alipay/main.go
View File

@@ -5,7 +5,7 @@ import (
"os"
"time"
paymentplugins "infinite-canvas/backend/payment-plugins"
paymentplugins "yingce/backend/payment-plugins"
)
func main() {

2
backend/cmd/payment-epay/main.go
View File

@@ -5,7 +5,7 @@ import (
"os"
"time"
paymentplugins "infinite-canvas/backend/payment-plugins"
paymentplugins "yingce/backend/payment-plugins"
)
func main() {

2
backend/cmd/payment-wechat/main.go
View File

@@ -5,7 +5,7 @@ import (
"os"
"time"
paymentplugins "infinite-canvas/backend/payment-plugins"
paymentplugins "yingce/backend/payment-plugins"
)
func main() {

2
backend/cmd/payment-xunhupay/main.go
View File

@@ -5,7 +5,7 @@ import (
"os"
"time"
paymentplugins "infinite-canvas/backend/payment-plugins"
paymentplugins "yingce/backend/payment-plugins"
)
func main() {

2
backend/cmd/payment-zhifufm/main.go
View File

@@ -5,7 +5,7 @@ import (
"os"
"time"
paymentplugins "infinite-canvas/backend/payment-plugins"
paymentplugins "yingce/backend/payment-plugins"
)
func main() {

8
backend/cmd/reseed-logical-model-sources/fork_env.go Normal file
View File

@@ -0,0 +1,8 @@
// 本项目附加文件（fork 专属）：不改上游 main.go，仅让该命令启动时读取仓库根 .env。
package main
import "yingce/backend/internal/config"
func init() {
config.LoadDotEnv()
}

10
backend/cmd/reseed-logical-model-sources/main.go
View File

@@ -9,11 +9,10 @@ import (
"sort"
"strings"
"infinite-canvas/backend/internal/config"
"infinite-canvas/backend/internal/database"
"infinite-canvas/backend/internal/model"
"infinite-canvas/backend/internal/repository"
"infinite-canvas/backend/internal/service"
"yingce/backend/internal/database"
"yingce/backend/internal/model"
"yingce/backend/internal/repository"
"yingce/backend/internal/service"
"gorm.io/gorm"
)
@@ -26,7 +25,6 @@ type sourcePlan struct {
}
func main() {
config.LoadDotEnv()
apply := flag.Bool("apply", false, "将符合条件的前台模型改为系统渠道模型驱动")
flag.Parse()

28
backend/cmd/server/fork_env.go Normal file
View File

@@ -0,0 +1,28 @@
// 本项目附加文件（fork 专属）：不改上游 main.go，达到同样的启动行为。
// 独立成一个文件后，上游对同目录 main.go 的任何改动都不会再与本文件冲突。
package main
import (
"log"
"os"
"strings"
"yingce/backend/internal/config"
)
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")
}
// 启动诊断：确认 .env / 环境变量已被读到，避免误用空 DATABASE_URL 时的静默回退。
dbURLState := "empty"
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)
}

19
backend/cmd/server/main.go
View File

@@ -16,13 +16,12 @@ import (
"syscall"
"time"
"infinite-canvas/backend/internal/config"
"infinite-canvas/backend/internal/database"
"infinite-canvas/backend/internal/handler"
"infinite-canvas/backend/internal/logging"
"infinite-canvas/backend/internal/repository"
"infinite-canvas/backend/internal/service"
"infinite-canvas/backend/internal/updaterclient"
"yingce/backend/internal/database"
"yingce/backend/internal/handler"
"yingce/backend/internal/logging"
"yingce/backend/internal/repository"
"yingce/backend/internal/service"
"yingce/backend/internal/updaterclient"
"github.com/gin-gonic/gin"
)
@@ -41,8 +40,6 @@ func main() {
}
func run(ctx context.Context) error {
// 先加载仓库根的 .env（若存在），再读取环境变量，保证直连 `go run` 也能读到配置。
config.LoadDotEnv()
dataDir := env("CANVAS_BACKEND_DATA_DIR", "data")
if err := os.MkdirAll(dataDir, 0o755); err != nil {
return err
@@ -58,7 +55,6 @@ func run(ctx context.Context) error {
if err := database.ConfigurePool(db); err != nil {
return err
}
log.Printf("database driver: %s (DATABASE_URL %s)", db.Dialector.Name(), map[bool]string{true: "set", false: "empty"}[strings.TrimSpace(os.Getenv("DATABASE_URL")) != ""])
sqlDB, err := db.DB()
if err != nil {
return err
@@ -78,8 +74,7 @@ func run(ctx context.Context) error {
}
repo := repository.New(db)
// 本项目本地开发端口 7381，避开上游默认的 8080（见 AGENTS.md「本项目附加约定」）。
addr := env("CANVAS_BACKEND_ADDR", ":7381")
addr := env("CANVAS_BACKEND_ADDR", ":8080")
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))

6
backend/cmd/server/system_status.go
View File

@@ -5,9 +5,9 @@ import (
"net/http"
"sync/atomic"
"infinite-canvas/backend/internal/buildinfo"
"infinite-canvas/backend/internal/database"
"infinite-canvas/backend/internal/service"
"yingce/backend/internal/buildinfo"
"yingce/backend/internal/database"
"yingce/backend/internal/service"
"github.com/gin-gonic/gin"
"gorm.io/gorm"

6
backend/cmd/server/system_status_test.go
View File

@@ -5,9 +5,9 @@ import (
"net/http/httptest"
"testing"
"infinite-canvas/backend/internal/database"
"infinite-canvas/backend/internal/repository"
"infinite-canvas/backend/internal/service"
"yingce/backend/internal/database"
"yingce/backend/internal/repository"
"yingce/backend/internal/service"
"github.com/gin-gonic/gin"
)