feat: 建立商品目录接入基础 (#132)
This commit is contained in:
chengma
@@ -34,6 +34,16 @@ database:
|
||||
# 运行机器上，不得提交、打包、截图或粘贴到工单和日志。
|
||||
password: "你的 MySQL 密码"
|
||||
|
||||
integrations:
|
||||
catalog:
|
||||
# 第三方商品目录脚本的稳定来源名，会写入导入记录。不要放用户姓名或密码。
|
||||
source: external-catalog
|
||||
|
||||
# 专用 Bearer Token，至少 32 个字符。线上优先使用
|
||||
# CMAUTOBUY_CATALOG_TOKEN；Token 不得写入日志、数据库、工单或提交。
|
||||
# 留空表示商品目录接口禁用，不影响 Admin 页面和 Client 四接口。
|
||||
token: ""
|
||||
|
||||
syb:
|
||||
# 顺运宝 ERP 地址。一般不用改，域名变了才改。
|
||||
base_url: https://www.shunyunbaoerp.com
|
||||
|
||||
+69
-2
@@ -31,6 +31,8 @@ const (
|
||||
databasePasswordEnv = "CMAUTOBUY_DB_PASSWORD"
|
||||
databaseTLSModeEnv = "CMAUTOBUY_DB_TLS_MODE"
|
||||
databaseTLSCAEnv = "CMAUTOBUY_DB_TLS_CA"
|
||||
catalogSourceEnv = "CMAUTOBUY_CATALOG_SOURCE"
|
||||
catalogTokenEnv = "CMAUTOBUY_CATALOG_TOKEN"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -52,6 +54,24 @@ type DatabaseConfig struct {
|
||||
TLSCA string `yaml:"tls_ca"`
|
||||
}
|
||||
|
||||
// CatalogIntegrationConfig 是第三方商品目录接口的独立身份配置。
|
||||
// Token 只允许来自未提交的 config.yaml 或环境变量，String 永远不输出明文。
|
||||
type CatalogIntegrationConfig struct {
|
||||
Source string `yaml:"source"`
|
||||
Token string `yaml:"token"`
|
||||
}
|
||||
|
||||
func (c CatalogIntegrationConfig) String() string {
|
||||
token := "(未启用)"
|
||||
if c.Token != "" {
|
||||
token = "****"
|
||||
}
|
||||
return fmt.Sprintf("CatalogIntegrationConfig{Source:%s Token:%s}", c.Source, token)
|
||||
}
|
||||
|
||||
// Enabled 表示商品目录接口已经配置专用凭据。
|
||||
func (c CatalogIntegrationConfig) Enabled() bool { return c.Token != "" }
|
||||
|
||||
// String 永远隐藏密码，防止排错时用 %v 把凭据写进日志。
|
||||
func (c DatabaseConfig) String() string {
|
||||
password := "(空)"
|
||||
@@ -98,6 +118,47 @@ func LoadDatabaseFromEnv() (DatabaseConfig, error) {
|
||||
return mergeDatabaseConfig(DatabaseConfig{})
|
||||
}
|
||||
|
||||
// LoadCatalogIntegration 读取可选的商品目录接口配置。未配置 Token 时接口保持禁用，
|
||||
// 不影响 Admin 其余页面和 Client 四接口启动。
|
||||
func LoadCatalogIntegration() (CatalogIntegrationConfig, error) {
|
||||
path, err := ConfigPath()
|
||||
if err != nil {
|
||||
return CatalogIntegrationConfig{}, fmt.Errorf("无法确定 config.yaml 应该在的位置: %w", err)
|
||||
}
|
||||
var cfg CatalogIntegrationConfig
|
||||
raw, readErr := os.ReadFile(path)
|
||||
if readErr == nil {
|
||||
parsed, parseErr := parseConfig(raw, path)
|
||||
if parseErr != nil {
|
||||
return CatalogIntegrationConfig{}, parseErr
|
||||
}
|
||||
cfg = parsed.Integrations.Catalog
|
||||
} else if !os.IsNotExist(readErr) {
|
||||
return CatalogIntegrationConfig{}, fmt.Errorf("读取配置文件 %s 失败: %w", path, readErr)
|
||||
}
|
||||
return mergeCatalogIntegration(cfg)
|
||||
}
|
||||
|
||||
func mergeCatalogIntegration(cfg CatalogIntegrationConfig) (CatalogIntegrationConfig, error) {
|
||||
if value := strings.TrimSpace(os.Getenv(catalogSourceEnv)); value != "" {
|
||||
cfg.Source = value
|
||||
}
|
||||
if value := os.Getenv(catalogTokenEnv); value != "" {
|
||||
cfg.Token = value
|
||||
}
|
||||
cfg.Source = strings.TrimSpace(cfg.Source)
|
||||
if cfg.Source == "" {
|
||||
cfg.Source = "external"
|
||||
}
|
||||
if len(cfg.Source) > 64 {
|
||||
return CatalogIntegrationConfig{}, fmt.Errorf("商品目录来源名称不能超过 64 个字符")
|
||||
}
|
||||
if cfg.Token != "" && len(cfg.Token) < 32 {
|
||||
return CatalogIntegrationConfig{}, fmt.Errorf("%s 至少需要 32 个字符", catalogTokenEnv)
|
||||
}
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
// mergeDatabaseConfig 把环境变量合并到文件配置上。环境变量只要非空，
|
||||
// 就覆盖对应 YAML 字段，避免线上误读部署目录里遗留的本地配置。
|
||||
func mergeDatabaseConfig(cfg DatabaseConfig) (DatabaseConfig, error) {
|
||||
@@ -258,8 +319,14 @@ func (c SybConfig) String() string {
|
||||
|
||||
// Config 是 config.yaml 的顶层结构。
|
||||
type Config struct {
|
||||
Database DatabaseConfig `yaml:"database"`
|
||||
Syb SybConfig `yaml:"syb"`
|
||||
Database DatabaseConfig `yaml:"database"`
|
||||
Syb SybConfig `yaml:"syb"`
|
||||
Integrations IntegrationsConfig `yaml:"integrations"`
|
||||
}
|
||||
|
||||
// IntegrationsConfig 收拢所有非 Client 的第三方数据接入配置。
|
||||
type IntegrationsConfig struct {
|
||||
Catalog CatalogIntegrationConfig `yaml:"catalog"`
|
||||
}
|
||||
|
||||
// configFileName 是 config.yaml 相对 exe（或 go run 时相对工作目录）的文件名。
|
||||
|
||||
@@ -301,3 +301,29 @@ func TestLoad_配置文件损坏时报明确错误(t *testing.T) {
|
||||
t.Fatal("格式错误的 YAML 应该返回错误")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCatalogIntegrationConfig_环境覆盖且不泄露Token(t *testing.T) {
|
||||
t.Setenv(catalogSourceEnv, "script-a")
|
||||
t.Setenv(catalogTokenEnv, "0123456789abcdef0123456789abcdef")
|
||||
cfg, err := mergeCatalogIntegration(CatalogIntegrationConfig{Source: "yaml", Token: "yaml-token-that-is-long-enough-123456"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if cfg.Source != "script-a" || cfg.Token != "0123456789abcdef0123456789abcdef" {
|
||||
t.Fatalf("环境变量未覆盖：%s", cfg)
|
||||
}
|
||||
if strings.Contains(cfg.String(), cfg.Token) || !strings.Contains(cfg.String(), "****") {
|
||||
t.Fatalf("配置字符串泄露 Token：%s", cfg)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCatalogIntegrationConfig_弱Token拒绝且留空可禁用(t *testing.T) {
|
||||
t.Setenv(catalogSourceEnv, "")
|
||||
t.Setenv(catalogTokenEnv, "")
|
||||
if cfg, err := mergeCatalogIntegration(CatalogIntegrationConfig{}); err != nil || cfg.Enabled() {
|
||||
t.Fatalf("留空应安全禁用：cfg=%s err=%v", cfg, err)
|
||||
}
|
||||
if _, err := mergeCatalogIntegration(CatalogIntegrationConfig{Token: "too-short"}); err == nil || !strings.Contains(err.Error(), catalogTokenEnv) {
|
||||
t.Fatalf("弱 Token 应被拒绝：%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
// Package integration 提供给受信任第三方脚本的 JSON 接口。
|
||||
// 它与网页登录和 /api/v1/client 完全隔离，不能复用 Cookie 或 X-Client-Id。
|
||||
package integration
|
||||
|
||||
import (
|
||||
"crypto/subtle"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"cmautobuy/admin/config"
|
||||
)
|
||||
|
||||
const sourceContextKey = "catalog_integration_source"
|
||||
|
||||
// RequireCatalogToken 校验商品目录接口的专用 Bearer Token。
|
||||
func RequireCatalogToken(cfg config.CatalogIntegrationConfig) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
if !cfg.Enabled() {
|
||||
integrationError(c, http.StatusServiceUnavailable, "INTEGRATION_DISABLED",
|
||||
"商品目录接口尚未配置", true, nil)
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
provided, ok := bearerToken(c.GetHeader("Authorization"))
|
||||
if !ok || subtle.ConstantTimeCompare([]byte(provided), []byte(cfg.Token)) != 1 {
|
||||
integrationError(c, http.StatusUnauthorized, "UNAUTHORIZED",
|
||||
"接口凭据无效", false, nil)
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
c.Set(sourceContextKey, cfg.Source)
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
func bearerToken(header string) (string, bool) {
|
||||
parts := strings.Fields(header)
|
||||
if len(parts) != 2 || !strings.EqualFold(parts[0], "Bearer") || parts[1] == "" {
|
||||
return "", false
|
||||
}
|
||||
return parts[1], true
|
||||
}
|
||||
|
||||
func integrationSource(c *gin.Context) string {
|
||||
value, _ := c.Get(sourceContextKey)
|
||||
source, _ := value.(string)
|
||||
return source
|
||||
}
|
||||
|
||||
func integrationError(c *gin.Context, status int, code, message string, retryable bool, details any) {
|
||||
if details == nil {
|
||||
details = gin.H{}
|
||||
}
|
||||
c.JSON(status, gin.H{"error": gin.H{
|
||||
"code": code, "message": message, "retryable": retryable,
|
||||
"request_id": c.GetHeader("X-Request-Id"), "details": details,
|
||||
}})
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"cmautobuy/admin/config"
|
||||
)
|
||||
|
||||
func TestRequireCatalogToken(t *testing.T) {
|
||||
gin.SetMode(gin.TestMode)
|
||||
const token = "0123456789abcdef0123456789abcdef"
|
||||
for _, tc := range []struct {
|
||||
name, header string
|
||||
cfg config.CatalogIntegrationConfig
|
||||
want int
|
||||
}{
|
||||
{"未启用", "", config.CatalogIntegrationConfig{}, http.StatusServiceUnavailable},
|
||||
{"缺少", "", config.CatalogIntegrationConfig{Source: "script", Token: token}, http.StatusUnauthorized},
|
||||
{"错误", "Bearer wrong", config.CatalogIntegrationConfig{Source: "script", Token: token}, http.StatusUnauthorized},
|
||||
{"正确", "Bearer " + token, config.CatalogIntegrationConfig{Source: "script", Token: token}, http.StatusNoContent},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
r := gin.New()
|
||||
r.GET("/protected", RequireCatalogToken(tc.cfg), func(c *gin.Context) {
|
||||
if integrationSource(c) != tc.cfg.Source {
|
||||
t.Fatalf("source=%q", integrationSource(c))
|
||||
}
|
||||
c.Status(http.StatusNoContent)
|
||||
})
|
||||
req := httptest.NewRequest(http.MethodGet, "/protected", nil)
|
||||
req.Header.Set("Authorization", tc.header)
|
||||
resp := httptest.NewRecorder()
|
||||
r.ServeHTTP(resp, req)
|
||||
if resp.Code != tc.want {
|
||||
t.Fatalf("status=%d body=%s", resp.Code, resp.Body.String())
|
||||
}
|
||||
if strings.Contains(resp.Body.String(), token) || strings.Contains(resp.Body.String(), "wrong") {
|
||||
t.Fatal("响应泄露接口凭据")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package model
|
||||
|
||||
// CatalogImportStatus 是一次商品目录批次的稳定状态。
|
||||
type CatalogImportStatus string
|
||||
|
||||
const (
|
||||
CatalogImportProcessing CatalogImportStatus = "processing"
|
||||
CatalogImportSucceeded CatalogImportStatus = "succeeded"
|
||||
CatalogImportFailed CatalogImportStatus = "failed"
|
||||
)
|
||||
|
||||
// CatalogImportRun 保存批次追踪信息，不保存 Token 或完整请求体。
|
||||
type CatalogImportRun struct {
|
||||
Source string
|
||||
BatchID string
|
||||
RequestHash string
|
||||
Status CatalogImportStatus
|
||||
RequestCount int
|
||||
ConflictCount int
|
||||
ObservedAt string
|
||||
LastRequestAt string
|
||||
LastConflictAt string
|
||||
ShopeeCreated int
|
||||
ShopeeUpdated int
|
||||
SKUCreated int
|
||||
SKUUpdated int
|
||||
PddCreated int
|
||||
PddUpdated int
|
||||
AssociationCreated int
|
||||
AssociationUnchanged int
|
||||
FailureCount int
|
||||
ErrorSummary string
|
||||
ResponseBody string
|
||||
CreatedAt string
|
||||
FinishedAt string
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/go-sql-driver/mysql"
|
||||
|
||||
"cmautobuy/admin/model"
|
||||
)
|
||||
|
||||
var (
|
||||
// ErrCatalogImportRunExists 表示同一来源的批次号已经登记，由 service 判断是否重放。
|
||||
ErrCatalogImportRunExists = errors.New("商品目录批次已经存在")
|
||||
ErrCatalogImportRunNotFound = errors.New("商品目录批次不存在")
|
||||
)
|
||||
|
||||
// InsertCatalogImportRun 先登记 processing 批次；表的复合主键是并发幂等的最终防线。
|
||||
func InsertCatalogImportRun(q Execer, run model.CatalogImportRun) error {
|
||||
_, err := q.Exec(`INSERT INTO catalog_import_runs (
|
||||
source,batch_id,request_hash,status,request_count,conflict_count,observed_at,
|
||||
last_request_at,created_at
|
||||
) VALUES (?,?,?,?,1,0,NULLIF(?,''),?,?)`, run.Source, run.BatchID, run.RequestHash,
|
||||
run.Status, run.ObservedAt, run.LastRequestAt, run.CreatedAt)
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
var mysqlErr *mysql.MySQLError
|
||||
if errors.As(err, &mysqlErr) && mysqlErr.Number == 1062 {
|
||||
return ErrCatalogImportRunExists
|
||||
}
|
||||
if strings.Contains(strings.ToLower(err.Error()), "unique constraint failed") {
|
||||
return ErrCatalogImportRunExists
|
||||
}
|
||||
return fmt.Errorf("登记商品目录批次失败: %w", err)
|
||||
}
|
||||
|
||||
// GetCatalogImportRun 查询一个批次的摘要，不读取原始请求体。
|
||||
func GetCatalogImportRun(q Execer, source, batchID string) (model.CatalogImportRun, error) {
|
||||
var run model.CatalogImportRun
|
||||
var observedAt, lastConflictAt, errorSummary, responseBody, finishedAt sql.NullString
|
||||
err := q.QueryRow(`SELECT source,batch_id,request_hash,status,request_count,conflict_count,
|
||||
observed_at,last_request_at,last_conflict_at,shopee_created,shopee_updated,sku_created,
|
||||
sku_updated,pdd_created,pdd_updated,association_created,association_unchanged,failure_count,
|
||||
error_summary,response_body,created_at,finished_at
|
||||
FROM catalog_import_runs WHERE source=? AND batch_id=?`, source, batchID).Scan(
|
||||
&run.Source, &run.BatchID, &run.RequestHash, &run.Status, &run.RequestCount, &run.ConflictCount,
|
||||
&observedAt, &run.LastRequestAt, &lastConflictAt, &run.ShopeeCreated, &run.ShopeeUpdated,
|
||||
&run.SKUCreated, &run.SKUUpdated, &run.PddCreated, &run.PddUpdated, &run.AssociationCreated,
|
||||
&run.AssociationUnchanged, &run.FailureCount, &errorSummary, &responseBody, &run.CreatedAt, &finishedAt)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return model.CatalogImportRun{}, ErrCatalogImportRunNotFound
|
||||
}
|
||||
if err != nil {
|
||||
return model.CatalogImportRun{}, fmt.Errorf("查询商品目录批次失败: %w", err)
|
||||
}
|
||||
run.ObservedAt = observedAt.String
|
||||
run.LastConflictAt = lastConflictAt.String
|
||||
run.ErrorSummary = errorSummary.String
|
||||
run.ResponseBody = responseBody.String
|
||||
run.FinishedAt = finishedAt.String
|
||||
return run, nil
|
||||
}
|
||||
|
||||
// RecordCatalogImportReplay 记录相同请求的重复提交，业务数据不会再次写入。
|
||||
func RecordCatalogImportReplay(q Execer, source, batchID, requestedAt string) error {
|
||||
result, err := q.Exec(`UPDATE catalog_import_runs SET request_count=request_count+1,last_request_at=?
|
||||
WHERE source=? AND batch_id=?`, requestedAt, source, batchID)
|
||||
return catalogRunUpdateResult(result, err, "记录商品目录批次重放")
|
||||
}
|
||||
|
||||
// RecordCatalogImportConflict 记录同一批次号携带不同内容的冲突。
|
||||
func RecordCatalogImportConflict(q Execer, source, batchID, requestedAt string) error {
|
||||
result, err := q.Exec(`UPDATE catalog_import_runs SET request_count=request_count+1,
|
||||
conflict_count=conflict_count+1,last_request_at=?,last_conflict_at=?
|
||||
WHERE source=? AND batch_id=?`, requestedAt, requestedAt, source, batchID)
|
||||
return catalogRunUpdateResult(result, err, "记录商品目录批次冲突")
|
||||
}
|
||||
|
||||
func catalogRunUpdateResult(result sql.Result, err error, action string) error {
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s失败: %w", action, err)
|
||||
}
|
||||
affected, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return fmt.Errorf("读取%s结果失败: %w", action, err)
|
||||
}
|
||||
if affected == 0 {
|
||||
return ErrCatalogImportRunNotFound
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
_ "modernc.org/sqlite"
|
||||
|
||||
"cmautobuy/admin/model"
|
||||
)
|
||||
|
||||
func TestCatalogImportRun_登记查询重放和冲突(t *testing.T) {
|
||||
db, err := sql.Open("sqlite", ":memory:")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer db.Close()
|
||||
if _, err := db.Exec(`CREATE TABLE catalog_import_runs (
|
||||
source TEXT NOT NULL,batch_id TEXT NOT NULL,request_hash TEXT NOT NULL,status TEXT NOT NULL,
|
||||
request_count INTEGER NOT NULL,conflict_count INTEGER NOT NULL,observed_at TEXT,last_request_at TEXT NOT NULL,
|
||||
last_conflict_at TEXT,shopee_created INTEGER NOT NULL DEFAULT 0,shopee_updated INTEGER NOT NULL DEFAULT 0,
|
||||
sku_created INTEGER NOT NULL DEFAULT 0,sku_updated INTEGER NOT NULL DEFAULT 0,pdd_created INTEGER NOT NULL DEFAULT 0,
|
||||
pdd_updated INTEGER NOT NULL DEFAULT 0,association_created INTEGER NOT NULL DEFAULT 0,
|
||||
association_unchanged INTEGER NOT NULL DEFAULT 0,failure_count INTEGER NOT NULL DEFAULT 0,
|
||||
error_summary TEXT,response_body TEXT,created_at TEXT NOT NULL,finished_at TEXT,
|
||||
PRIMARY KEY(source,batch_id))`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
run := model.CatalogImportRun{Source: "script-a", BatchID: "batch-1", RequestHash: "abc",
|
||||
Status: model.CatalogImportProcessing, ObservedAt: "2026-08-11T00:00:00Z",
|
||||
LastRequestAt: "2026-08-11T00:01:00Z", CreatedAt: "2026-08-11T00:01:00Z"}
|
||||
if err := InsertCatalogImportRun(db, run); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := InsertCatalogImportRun(db, run); !errors.Is(err, ErrCatalogImportRunExists) {
|
||||
t.Fatalf("重复批次应由唯一键拦截：%v", err)
|
||||
}
|
||||
if err := RecordCatalogImportReplay(db, run.Source, run.BatchID, "2026-08-11T00:02:00Z"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := RecordCatalogImportConflict(db, run.Source, run.BatchID, "2026-08-11T00:03:00Z"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got, err := GetCatalogImportRun(db, run.Source, run.BatchID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got.RequestCount != 3 || got.ConflictCount != 1 || got.LastConflictAt == "" {
|
||||
t.Fatalf("批次计数不正确：%+v", got)
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
"cmautobuy/admin/spec"
|
||||
)
|
||||
|
||||
const mysqlSchemaVersion = 6
|
||||
const mysqlSchemaVersion = 7
|
||||
|
||||
// OpenMySQL 打开生产 MySQL 8 数据库。错误信息绝不包含完整 DSN 或密码。
|
||||
func OpenMySQL(cfg config.DatabaseConfig) (*sql.DB, error) {
|
||||
@@ -495,10 +495,98 @@ func MigrateMySQL(db *sql.DB) error {
|
||||
if _, err := db.Exec(`INSERT INTO schema_migrations (version, applied_at) VALUES (?, ?)`, 6, time.Now().UTC().Format(time.RFC3339Nano)); err != nil {
|
||||
return fmt.Errorf("记录 MySQL schema v6 失败: %w", err)
|
||||
}
|
||||
current = 6
|
||||
}
|
||||
if current < 7 {
|
||||
if err := migrateMySQLV7(db); err != nil {
|
||||
return fmt.Errorf("执行 MySQL schema v7 失败: %w", err)
|
||||
}
|
||||
if err := checkMySQLV7Shape(db); err != nil {
|
||||
return fmt.Errorf("MySQL schema v7 自检失败，未记录版本: %w", err)
|
||||
}
|
||||
if _, err := db.Exec(`INSERT INTO schema_migrations (version, applied_at) VALUES (?, ?)`, 7, time.Now().UTC().Format(time.RFC3339Nano)); err != nil {
|
||||
return fmt.Errorf("记录 MySQL schema v7 失败: %w", err)
|
||||
}
|
||||
}
|
||||
return CheckMySQLSchema(db)
|
||||
}
|
||||
|
||||
const mysqlSchemaV7CatalogRuns = `CREATE TABLE IF NOT EXISTS catalog_import_runs (
|
||||
source VARCHAR(64) COLLATE utf8mb4_bin NOT NULL,
|
||||
batch_id VARCHAR(191) COLLATE utf8mb4_bin NOT NULL,
|
||||
request_hash VARCHAR(64) COLLATE utf8mb4_bin NOT NULL,
|
||||
status VARCHAR(16) COLLATE utf8mb4_bin NOT NULL DEFAULT 'processing',
|
||||
request_count INT UNSIGNED NOT NULL DEFAULT 1,
|
||||
conflict_count INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
observed_at VARCHAR(35) NULL,
|
||||
last_request_at VARCHAR(35) NOT NULL,
|
||||
last_conflict_at VARCHAR(35) NULL,
|
||||
shopee_created INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
shopee_updated INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
sku_created INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
sku_updated INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
pdd_created INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
pdd_updated INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
association_created INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
association_unchanged INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
failure_count INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
error_summary VARCHAR(1000) NULL,
|
||||
response_body LONGTEXT NULL,
|
||||
created_at VARCHAR(35) NOT NULL,
|
||||
finished_at VARCHAR(35) NULL,
|
||||
PRIMARY KEY (source, batch_id),
|
||||
KEY idx_catalog_runs_list (created_at DESC, source, batch_id),
|
||||
KEY idx_catalog_runs_status (status, created_at DESC),
|
||||
CONSTRAINT chk_catalog_runs_status CHECK (status IN ('processing','succeeded','failed'))
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`
|
||||
|
||||
// migrateMySQLV7 建立第三方商品目录批次基础。所有 DDL 均逐项检查，支持隐式提交后重放。
|
||||
func migrateMySQLV7(db *sql.DB) error {
|
||||
columns := []struct {
|
||||
table, name, ddl string
|
||||
}{
|
||||
{"shopee_products", "source_observed_at", `ALTER TABLE shopee_products ADD COLUMN source_observed_at VARCHAR(35) NULL AFTER source`},
|
||||
{"shopee_skus", "source_observed_at", `ALTER TABLE shopee_skus ADD COLUMN source_observed_at VARCHAR(35) NULL AFTER is_manual`},
|
||||
{"pdd_products", "source", `ALTER TABLE pdd_products ADD COLUMN source VARCHAR(16) COLLATE utf8mb4_bin NULL AFTER collect_status`},
|
||||
{"pdd_products", "source_observed_at", `ALTER TABLE pdd_products ADD COLUMN source_observed_at VARCHAR(35) NULL AFTER source`},
|
||||
}
|
||||
for _, column := range columns {
|
||||
exists, err := mysqlColumnExists(db, column.table, column.name)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !exists {
|
||||
if _, err := db.Exec(column.ddl); err != nil {
|
||||
return fmt.Errorf("增加 %s.%s 失败: %w", column.table, column.name, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var clause string
|
||||
err := db.QueryRow(`SELECT cc.check_clause FROM information_schema.table_constraints tc
|
||||
JOIN information_schema.check_constraints cc ON cc.constraint_schema=tc.constraint_schema AND cc.constraint_name=tc.constraint_name
|
||||
WHERE tc.constraint_schema=DATABASE() AND tc.table_name='shopee_products'
|
||||
AND tc.constraint_name='chk_shopee_products_source' AND tc.constraint_type='CHECK'`).Scan(&clause)
|
||||
if err != nil && err != sql.ErrNoRows {
|
||||
return fmt.Errorf("读取蝦皮来源约束失败: %w", err)
|
||||
}
|
||||
normalized := strings.NewReplacer("`", "", " ", "", "(", "", ")", "", "_utf8mb4", "", `\`, "").Replace(strings.ToLower(clause))
|
||||
if !strings.Contains(normalized, "'api'") {
|
||||
if err == nil {
|
||||
if _, dropErr := db.Exec(`ALTER TABLE shopee_products DROP CHECK chk_shopee_products_source`); dropErr != nil {
|
||||
return fmt.Errorf("移除旧蝦皮来源约束失败: %w", dropErr)
|
||||
}
|
||||
}
|
||||
if _, addErr := db.Exec(`ALTER TABLE shopee_products ADD CONSTRAINT chk_shopee_products_source CHECK (source IN ('report','syb','api'))`); addErr != nil {
|
||||
return fmt.Errorf("扩展蝦皮来源约束失败: %w", addErr)
|
||||
}
|
||||
}
|
||||
if _, err := db.Exec(mysqlSchemaV7CatalogRuns); err != nil {
|
||||
return fmt.Errorf("建立商品目录导入记录表失败: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// migrateMySQLV6 给任务补充创建人。存量任务保持 NULL，明确标记为历史任务；
|
||||
// 新代码创建任务时写入当前网页登录用户。DDL 逐项检查，支持中断后重放。
|
||||
func migrateMySQLV6(db *sql.DB) error {
|
||||
@@ -843,6 +931,7 @@ func CheckMySQLSchema(db *sql.DB) error {
|
||||
"tasks", "clients", "idempotency_keys", "task_claims", "syb_session", "syb_sync_state",
|
||||
"users", "web_sessions", "client_user_assignments", "syb_sync_runs", "admin_initialization_lock",
|
||||
"spec_mapping_decisions",
|
||||
"catalog_import_runs",
|
||||
}
|
||||
if err := checkMySQLSchema(db, mysqlRequiredTables); err != nil {
|
||||
return err
|
||||
@@ -856,7 +945,71 @@ func CheckMySQLSchema(db *sql.DB) error {
|
||||
if err := checkMySQLV5Shape(db); err != nil {
|
||||
return err
|
||||
}
|
||||
return checkMySQLV6Shape(db)
|
||||
if err := checkMySQLV6Shape(db); err != nil {
|
||||
return err
|
||||
}
|
||||
return checkMySQLV7Shape(db)
|
||||
}
|
||||
|
||||
func checkMySQLV7Shape(db *sql.DB) error {
|
||||
for _, column := range []struct{ table, name string }{
|
||||
{"shopee_products", "source_observed_at"},
|
||||
{"shopee_skus", "source_observed_at"},
|
||||
{"pdd_products", "source_observed_at"},
|
||||
} {
|
||||
if err := checkMySQLVarcharColumn(db, column.table, column.name, 35, true, "utf8mb4_0900_ai_ci", ""); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := checkMySQLNullDefault(db, column.table, column.name); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := checkMySQLVarcharColumn(db, "pdd_products", "source", 16, true, "utf8mb4_bin", ""); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := checkMySQLNullDefault(db, "pdd_products", "source"); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := checkMySQLSchema(db, []string{"catalog_import_runs"}); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, column := range []struct {
|
||||
name string
|
||||
length int64
|
||||
nullable bool
|
||||
collation string
|
||||
def string
|
||||
}{
|
||||
{"source", 64, false, "utf8mb4_bin", ""},
|
||||
{"batch_id", 191, false, "utf8mb4_bin", ""},
|
||||
{"request_hash", 64, false, "utf8mb4_bin", ""},
|
||||
{"status", 16, false, "utf8mb4_bin", "processing"},
|
||||
} {
|
||||
if err := checkMySQLVarcharColumn(db, "catalog_import_runs", column.name, column.length, column.nullable, column.collation, column.def); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
var clause string
|
||||
if err := db.QueryRow(`SELECT cc.check_clause FROM information_schema.table_constraints tc
|
||||
JOIN information_schema.check_constraints cc ON cc.constraint_schema=tc.constraint_schema AND cc.constraint_name=tc.constraint_name
|
||||
WHERE tc.constraint_schema=DATABASE() AND tc.table_name='catalog_import_runs'
|
||||
AND tc.constraint_name='chk_catalog_runs_status' AND tc.constraint_type='CHECK'`).Scan(&clause); err != nil {
|
||||
return fmt.Errorf("商品目录批次状态约束缺失: %w", err)
|
||||
}
|
||||
normalized := strings.NewReplacer("`", "", " ", "", "(", "", ")", "", "_utf8mb4", "", `\`, "").Replace(strings.ToLower(clause))
|
||||
for _, value := range []string{"'processing'", "'succeeded'", "'failed'"} {
|
||||
if !strings.Contains(normalized, value) {
|
||||
return fmt.Errorf("商品目录批次状态约束不正确")
|
||||
}
|
||||
}
|
||||
var sourceClause string
|
||||
if err := db.QueryRow(`SELECT cc.check_clause FROM information_schema.table_constraints tc
|
||||
JOIN information_schema.check_constraints cc ON cc.constraint_schema=tc.constraint_schema AND cc.constraint_name=tc.constraint_name
|
||||
WHERE tc.constraint_schema=DATABASE() AND tc.table_name='shopee_products'
|
||||
AND tc.constraint_name='chk_shopee_products_source' AND tc.constraint_type='CHECK'`).Scan(&sourceClause); err != nil || !strings.Contains(strings.ToLower(sourceClause), "api") {
|
||||
return fmt.Errorf("蝦皮商品来源约束未允许 api")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func checkMySQLV6Shape(db *sql.DB) error {
|
||||
|
||||
@@ -340,6 +340,48 @@ func TestMySQLMigrate_V6形状错误不记版本(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestMySQLMigrate_V6升级V7且断点重跑(t *testing.T) {
|
||||
db := openMySQLMigrationTestDB(t)
|
||||
defer db.Close()
|
||||
cleanMySQLTestSchema(t, db)
|
||||
defer cleanMySQLTestSchema(t, db)
|
||||
prepareMySQLV6(t, db)
|
||||
|
||||
// 模拟 MySQL DDL 已经提交、版本号尚未记录的中断状态。
|
||||
if err := migrateMySQLV7(db); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := MigrateMySQL(db); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := MigrateMySQL(db); err != nil {
|
||||
t.Fatalf("v7 重跑失败: %v", err)
|
||||
}
|
||||
var versions int
|
||||
if err := db.QueryRow(`SELECT COUNT(*) FROM schema_migrations WHERE version=7`).Scan(&versions); err != nil || versions != 1 {
|
||||
t.Fatalf("v7=%d err=%v", versions, err)
|
||||
}
|
||||
mustExec(t, db, `INSERT INTO shopee_products(goods_id,title,source,created_at,updated_at)
|
||||
VALUES('API-1','接口商品','api','2026-08-11T00:00:00Z','2026-08-11T00:00:00Z')`)
|
||||
}
|
||||
|
||||
func TestMySQLMigrate_V7形状错误不记版本(t *testing.T) {
|
||||
db := openMySQLMigrationTestDB(t)
|
||||
defer db.Close()
|
||||
cleanMySQLTestSchema(t, db)
|
||||
defer cleanMySQLTestSchema(t, db)
|
||||
prepareMySQLV6(t, db)
|
||||
mustExec(t, db, `ALTER TABLE shopee_products ADD COLUMN source_observed_at VARCHAR(10) NULL`)
|
||||
if err := MigrateMySQL(db); err == nil {
|
||||
t.Fatal("错误 source_observed_at 形状必须阻止 v7")
|
||||
}
|
||||
var count int
|
||||
db.QueryRow(`SELECT COUNT(*) FROM schema_migrations WHERE version=7`).Scan(&count)
|
||||
if count != 0 {
|
||||
t.Fatal("v7 自检失败不得记录版本")
|
||||
}
|
||||
}
|
||||
|
||||
func openMySQLMigrationTestDB(t *testing.T) *sql.DB {
|
||||
t.Helper()
|
||||
if os.Getenv("CMAUTOBUY_MYSQL_TEST") != "1" {
|
||||
@@ -381,6 +423,19 @@ func prepareMySQLV4(t *testing.T, db *sql.DB) {
|
||||
mustExec(t, db, `INSERT INTO schema_migrations(version,applied_at) VALUES (3,'2026-08-10T00:00:00Z'),(4,'2026-08-10T00:00:00Z')`)
|
||||
}
|
||||
|
||||
func prepareMySQLV6(t *testing.T, db *sql.DB) {
|
||||
t.Helper()
|
||||
prepareMySQLV4(t, db)
|
||||
if err := migrateMySQLV5(db); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := migrateMySQLV6(db); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
mustExec(t, db, `INSERT INTO schema_migrations(version,applied_at)
|
||||
VALUES (5,'2026-08-10T00:00:00Z'),(6,'2026-08-10T00:00:00Z')`)
|
||||
}
|
||||
|
||||
func mustExec(t *testing.T, db *sql.DB, query string, args ...any) {
|
||||
t.Helper()
|
||||
if _, err := db.Exec(query, args...); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user