refactor(store): DB 规约统一 —— 雪花字符串 id + created/updated/deleted_at 软删
所有数据库映射结构体收敛到统一基类,清理混乱。
- store/base.go:BaseModel{ID string(雪花,bwmarrin/snowflake) PK, CreatedAt, UpdatedAt,
DeletedAt gorm软删index} + BeforeCreate 生成 id + NewID()。
- 全模型嵌入 BaseModel:User/Task/LLMModel/KB/Doc/Agent(去掉各自 ID uint/CreatedAt);
Task 业务 id(task_xxx)挪到 TaskID 唯一列,主键统一雪花。
- 模型 id uint→string:admin :id 路由、SetActiveModel/DeleteModel/SaveModel、modelBody.ID。
- 一次性迁移 migrateLegacyIntIDs:检测旧整型 id(AutoMigrate 不改主键类型)→ 备份
sundynix_model 行(唯一不可再生的 API 密钥)→ 删旧表 → 按新规约重建 → 回灌模型(新雪花 id)。
其它表(User/Task/KB/Doc/Agent)为可重建测试数据,重置。
- Doc 预埋 Size/Preview/ObjectKey 字段,DocLink 表(为后续 B/C)。
验证:重启 gateway → 日志"回灌 2 条模型配置";PG sundynix_model.id=varchar、有
created_at/updated_at/deleted_at;DeepSeek/百炼 密钥保留(keylen 35);admin 列表返回
雪花 string id + 脱敏 key;健康五灯全绿。gateway build 通过。
注:mcp-go 的 sundynix_user_profile(Profile) 模型尚未套同规约,待跟进对齐。
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -3,6 +3,7 @@ module github.com/sundynix/sundynix-gateway
|
|||||||
go 1.24
|
go 1.24
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
github.com/bwmarrin/snowflake v0.3.0
|
||||||
github.com/gin-gonic/gin v1.10.0
|
github.com/gin-gonic/gin v1.10.0
|
||||||
github.com/redis/go-redis/v9 v9.20.0
|
github.com/redis/go-redis/v9 v9.20.0
|
||||||
github.com/sundynix/sundynix-shared v0.0.0
|
github.com/sundynix/sundynix-shared v0.0.0
|
||||||
|
|||||||
@@ -2,12 +2,18 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
|||||||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
||||||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
||||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
||||||
|
github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
|
||||||
|
github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
|
||||||
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
|
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
|
||||||
|
github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
|
||||||
github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=
|
github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=
|
||||||
|
github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k=
|
||||||
github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE=
|
github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE=
|
||||||
|
github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo=
|
||||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
|
github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
|
||||||
|
github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
|
||||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
@@ -29,6 +35,7 @@ github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaC
|
|||||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
||||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||||
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
||||||
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
||||||
@@ -78,11 +85,13 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
|
|||||||
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
|
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
|
||||||
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
|
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
|
||||||
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
|
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
|
||||||
|
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0=
|
github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0=
|
||||||
github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
|
github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
|
||||||
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
|
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
|
||||||
|
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||||
@@ -94,6 +103,7 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
|
|||||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||||
|
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
|
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
|
||||||
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
||||||
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
|
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
|
||||||
@@ -103,6 +113,7 @@ github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F
|
|||||||
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
|
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
|
||||||
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
|
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
|
||||||
golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4=
|
golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4=
|
||||||
|
golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
||||||
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
|
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
|
||||||
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
|
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
|
||||||
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -18,7 +17,7 @@ import (
|
|||||||
// 表 sundynix_model 由 Gateway 持有;Dispatcher 经 NATS 取激活配置。
|
// 表 sundynix_model 由 Gateway 持有;Dispatcher 经 NATS 取激活配置。
|
||||||
|
|
||||||
type modelBody struct {
|
type modelBody struct {
|
||||||
ID uint `json:"id"`
|
ID string `json:"id"`
|
||||||
Kind string `json:"kind"`
|
Kind string `json:"kind"`
|
||||||
Provider string `json:"provider"`
|
Provider string `json:"provider"`
|
||||||
BaseURL string `json:"base_url"`
|
BaseURL string `json:"base_url"`
|
||||||
@@ -58,7 +57,7 @@ func (h *Handler) SaveModel(c *gin.Context) {
|
|||||||
if kind == "" {
|
if kind == "" {
|
||||||
kind = contract.ConfigKindChat
|
kind = contract.ConfigKindChat
|
||||||
}
|
}
|
||||||
m := &store.LLMModel{ID: b.ID, Kind: kind, Provider: provider, BaseURL: b.BaseURL, APIKey: b.APIKey, Model: b.Model}
|
m := &store.LLMModel{BaseModel: store.BaseModel{ID: b.ID}, Kind: kind, Provider: provider, BaseURL: b.BaseURL, APIKey: b.APIKey, Model: b.Model}
|
||||||
if err := h.db.SaveModel(c.Request.Context(), m); err != nil {
|
if err := h.db.SaveModel(c.Request.Context(), m); err != nil {
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
@@ -69,8 +68,8 @@ func (h *Handler) SaveModel(c *gin.Context) {
|
|||||||
|
|
||||||
// SetActiveModel: POST /api/v1/admin/models/:id/active —— 设为激活并广播。
|
// SetActiveModel: POST /api/v1/admin/models/:id/active —— 设为激活并广播。
|
||||||
func (h *Handler) SetActiveModel(c *gin.Context) {
|
func (h *Handler) SetActiveModel(c *gin.Context) {
|
||||||
id, _ := strconv.Atoi(c.Param("id"))
|
id := c.Param("id")
|
||||||
if err := h.db.SetActiveModel(c.Request.Context(), uint(id)); err != nil {
|
if err := h.db.SetActiveModel(c.Request.Context(), id); err != nil {
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -80,8 +79,8 @@ func (h *Handler) SetActiveModel(c *gin.Context) {
|
|||||||
|
|
||||||
// DeleteModel: DELETE /api/v1/admin/models/:id
|
// DeleteModel: DELETE /api/v1/admin/models/:id
|
||||||
func (h *Handler) DeleteModel(c *gin.Context) {
|
func (h *Handler) DeleteModel(c *gin.Context) {
|
||||||
id, _ := strconv.Atoi(c.Param("id"))
|
id := c.Param("id")
|
||||||
if err := h.db.DeleteModel(c.Request.Context(), uint(id)); err != nil {
|
if err := h.db.DeleteModel(c.Request.Context(), id); err != nil {
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -98,7 +97,7 @@ func (h *Handler) TestModel(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
// 若传了已存的 id 但未带 key,用库里的真实 key。
|
// 若传了已存的 id 但未带 key,用库里的真实 key。
|
||||||
key := b.APIKey
|
key := b.APIKey
|
||||||
if key == "" && b.ID != 0 {
|
if key == "" && b.ID != "" {
|
||||||
if rows, _ := h.db.ListModels(c.Request.Context(), ""); rows != nil {
|
if rows, _ := h.db.ListModels(c.Request.Context(), ""); rows != nil {
|
||||||
for _, m := range rows {
|
for _, m := range rows {
|
||||||
if m.ID == b.ID {
|
if m.ID == b.ID {
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package store
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/bwmarrin/snowflake"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// 雪花 ID 生成器(单节点;多实例部署应按机器分配 node id)。
|
||||||
|
var sfNode *snowflake.Node
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
n, err := snowflake.NewNode(1)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
sfNode = n
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewID 生成字符串型雪花 ID(全库主键统一用它)。
|
||||||
|
func NewID() string { return sfNode.Generate().String() }
|
||||||
|
|
||||||
|
// BaseModel 是所有数据库映射结构体的基础字段:
|
||||||
|
// 字符串雪花主键 + 创建/更新时间 + GORM 软删除索引(deleted_at)。
|
||||||
|
// 约定:每个模型都嵌入它,不再各自声明 ID/CreatedAt/UpdatedAt。
|
||||||
|
type BaseModel struct {
|
||||||
|
ID string `gorm:"primaryKey;size:24" json:"id"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// BeforeCreate 为空 ID 的新记录分配雪花 ID(嵌入后各模型自动具备)。
|
||||||
|
func (b *BaseModel) BeforeCreate(*gorm.DB) error {
|
||||||
|
if b.ID == "" {
|
||||||
|
b.ID = NewID()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -12,11 +12,10 @@ import (
|
|||||||
// 表名 sundynix_kb。(owner,name) 唯一 —— 同一用户下知识库名不重复。
|
// 表名 sundynix_kb。(owner,name) 唯一 —— 同一用户下知识库名不重复。
|
||||||
// 向量/全文/图谱实际以 "owner/name" 作分区键,保证只有 owner 能查到自己的库。
|
// 向量/全文/图谱实际以 "owner/name" 作分区键,保证只有 owner 能查到自己的库。
|
||||||
type KB struct {
|
type KB struct {
|
||||||
ID uint `gorm:"primaryKey"`
|
BaseModel
|
||||||
Owner string `gorm:"size:64;uniqueIndex:idx_kb_owner_name"`
|
Owner string `gorm:"size:64;uniqueIndex:idx_kb_owner_name"`
|
||||||
Name string `gorm:"size:64;uniqueIndex:idx_kb_owner_name"`
|
Name string `gorm:"size:64;uniqueIndex:idx_kb_owner_name"`
|
||||||
Kind string `gorm:"size:16"` // folder / project / case / general
|
Kind string `gorm:"size:16"` // folder / project / case / general
|
||||||
CreatedAt time.Time
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (KB) TableName() string { return "sundynix_kb" }
|
func (KB) TableName() string { return "sundynix_kb" }
|
||||||
@@ -48,11 +47,10 @@ func (p *Postgres) EnsureKB(ctx context.Context, owner, name, kind string) error
|
|||||||
// Agent 是一份保存的 Agent 编排(React Flow 图 JSON,按 owner 隔离)。
|
// Agent 是一份保存的 Agent 编排(React Flow 图 JSON,按 owner 隔离)。
|
||||||
// 表名 sundynix_agent。(owner,name) 唯一 —— 同一用户下编排名不重复。
|
// 表名 sundynix_agent。(owner,name) 唯一 —— 同一用户下编排名不重复。
|
||||||
type Agent struct {
|
type Agent struct {
|
||||||
ID uint `gorm:"primaryKey"`
|
BaseModel
|
||||||
Owner string `gorm:"size:64;uniqueIndex:idx_agent_on"`
|
Owner string `gorm:"size:64;uniqueIndex:idx_agent_on"`
|
||||||
Name string `gorm:"size:128;uniqueIndex:idx_agent_on"`
|
Name string `gorm:"size:128;uniqueIndex:idx_agent_on"`
|
||||||
Graph string `gorm:"type:text"` // {nodes,edges} 的 JSON(含布局)
|
Graph string `gorm:"type:text"` // {nodes,edges} 的 JSON(含布局)
|
||||||
UpdatedAt time.Time
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (Agent) TableName() string { return "sundynix_agent" }
|
func (Agent) TableName() string { return "sundynix_agent" }
|
||||||
@@ -75,7 +73,7 @@ func (p *Postgres) SaveAgent(ctx context.Context, owner, name, graph string) err
|
|||||||
return p.db.WithContext(ctx).Clauses(clause.OnConflict{
|
return p.db.WithContext(ctx).Clauses(clause.OnConflict{
|
||||||
Columns: []clause.Column{{Name: "owner"}, {Name: "name"}},
|
Columns: []clause.Column{{Name: "owner"}, {Name: "name"}},
|
||||||
DoUpdates: clause.Assignments(map[string]any{"graph": graph, "updated_at": time.Now()}),
|
DoUpdates: clause.Assignments(map[string]any{"graph": graph, "updated_at": time.Now()}),
|
||||||
}).Create(&Agent{Owner: owner, Name: name, Graph: graph, UpdatedAt: time.Now()}).Error
|
}).Create(&Agent{Owner: owner, Name: name, Graph: graph}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteAgent 删除某 owner 的一份编排。
|
// DeleteAgent 删除某 owner 的一份编排。
|
||||||
@@ -89,16 +87,30 @@ func (p *Postgres) DeleteAgent(ctx context.Context, owner, name string) error {
|
|||||||
// Doc 是入库的一份原始文档/笔记(供 Obsidian 式"文库"浏览:列表 + Markdown 阅读 + 双链)。
|
// Doc 是入库的一份原始文档/笔记(供 Obsidian 式"文库"浏览:列表 + Markdown 阅读 + 双链)。
|
||||||
// 表名 sundynix_doc。(owner,kb,name) 唯一;按 owner 隔离。
|
// 表名 sundynix_doc。(owner,kb,name) 唯一;按 owner 隔离。
|
||||||
type Doc struct {
|
type Doc struct {
|
||||||
ID uint `gorm:"primaryKey"`
|
BaseModel
|
||||||
Owner string `gorm:"size:64;uniqueIndex:idx_doc_okn"`
|
Owner string `gorm:"size:64;uniqueIndex:idx_doc_okn"`
|
||||||
KB string `gorm:"size:64;uniqueIndex:idx_doc_okn"`
|
KB string `gorm:"size:64;uniqueIndex:idx_doc_okn"`
|
||||||
Name string `gorm:"size:160;uniqueIndex:idx_doc_okn"`
|
Name string `gorm:"size:160;uniqueIndex:idx_doc_okn"`
|
||||||
Content string `gorm:"type:text"`
|
Size int // 原文字数(rune)
|
||||||
CreatedAt time.Time
|
Preview string `gorm:"size:600"` // 前若干字预览(列表/反链用,不拉全文)
|
||||||
|
Content string `gorm:"type:text"` // 小文档内联正文;大文档转 MinIO 后置空
|
||||||
|
ObjectKey string `gorm:"size:160"` // 大文档在 MinIO 的对象键(空=内联 Content)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (Doc) TableName() string { return "sundynix_doc" }
|
func (Doc) TableName() string { return "sundynix_doc" }
|
||||||
|
|
||||||
|
// DocLink 是文档间 [[双链]] 的索引(owner+kb 内 from→to),供反链/笔记关系图按 SQL 查询,
|
||||||
|
// 避免在前端扫全部正文。入库/编辑时按 from 文档重建其出链。
|
||||||
|
type DocLink struct {
|
||||||
|
BaseModel
|
||||||
|
Owner string `gorm:"size:64;index:idx_link_okf"`
|
||||||
|
KB string `gorm:"size:64;index:idx_link_okf"`
|
||||||
|
FromName string `gorm:"size:160;index:idx_link_okf"`
|
||||||
|
ToName string `gorm:"size:160;index"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (DocLink) TableName() string { return "sundynix_doc_link" }
|
||||||
|
|
||||||
// SaveDoc 写入/更新一份文档(owner+kb+name 唯一,重名覆盖内容)。
|
// SaveDoc 写入/更新一份文档(owner+kb+name 唯一,重名覆盖内容)。
|
||||||
func (p *Postgres) SaveDoc(ctx context.Context, owner, kb, name, content string) error {
|
func (p *Postgres) SaveDoc(ctx context.Context, owner, kb, name, content string) error {
|
||||||
if p.db == nil {
|
if p.db == nil {
|
||||||
@@ -123,7 +135,7 @@ func (p *Postgres) ListVault(ctx context.Context, owner, kb string) ([]Doc, erro
|
|||||||
// LLMModel 是一个模型后端配置(控制面:管理员在此登记可用模型)。
|
// LLMModel 是一个模型后端配置(控制面:管理员在此登记可用模型)。
|
||||||
// 表名 sundynix_model(遵守前缀约定)。每个 kind 同一时刻仅一条 Active=true。
|
// 表名 sundynix_model(遵守前缀约定)。每个 kind 同一时刻仅一条 Active=true。
|
||||||
type LLMModel struct {
|
type LLMModel struct {
|
||||||
ID uint `gorm:"primaryKey"`
|
BaseModel
|
||||||
Kind string `gorm:"size:16;index"` // chat / embedding
|
Kind string `gorm:"size:16;index"` // chat / embedding
|
||||||
Provider string `gorm:"size:32"` // openai-compatible / vllm
|
Provider string `gorm:"size:32"` // openai-compatible / vllm
|
||||||
BaseURL string `gorm:"size:255"` // 如 https://api.deepseek.com
|
BaseURL string `gorm:"size:255"` // 如 https://api.deepseek.com
|
||||||
@@ -148,22 +160,25 @@ func (p *Postgres) ListModels(ctx context.Context, kind string) ([]LLMModel, err
|
|||||||
return rows, err
|
return rows, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// SaveModel 新增或更新一条模型配置(ID==0 新增)。
|
// SaveModel 新增或更新一条模型配置(ID 空则新增,BeforeCreate 生成雪花 ID)。
|
||||||
func (p *Postgres) SaveModel(ctx context.Context, m *LLMModel) error {
|
func (p *Postgres) SaveModel(ctx context.Context, m *LLMModel) error {
|
||||||
if p.db == nil {
|
if p.db == nil {
|
||||||
return errStoreDisabled
|
return errStoreDisabled
|
||||||
}
|
}
|
||||||
|
if m.ID == "" {
|
||||||
|
return p.db.WithContext(ctx).Create(m).Error
|
||||||
|
}
|
||||||
return p.db.WithContext(ctx).Save(m).Error
|
return p.db.WithContext(ctx).Save(m).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetActiveModel 把指定模型设为激活(同 kind 内其余取消),事务保证每 kind 唯一激活。
|
// SetActiveModel 把指定模型设为激活(同 kind 内其余取消),事务保证每 kind 唯一激活。
|
||||||
func (p *Postgres) SetActiveModel(ctx context.Context, id uint) error {
|
func (p *Postgres) SetActiveModel(ctx context.Context, id string) error {
|
||||||
if p.db == nil {
|
if p.db == nil {
|
||||||
return errStoreDisabled
|
return errStoreDisabled
|
||||||
}
|
}
|
||||||
return p.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
return p.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||||
var m LLMModel
|
var m LLMModel
|
||||||
if err := tx.First(&m, id).Error; err != nil {
|
if err := tx.First(&m, "id = ?", id).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := tx.Model(&LLMModel{}).Where("kind = ? AND active = ?", m.Kind, true).Update("active", false).Error; err != nil {
|
if err := tx.Model(&LLMModel{}).Where("kind = ? AND active = ?", m.Kind, true).Update("active", false).Error; err != nil {
|
||||||
@@ -187,9 +202,9 @@ func (p *Postgres) GetActiveModel(ctx context.Context, kind string) (*LLMModel,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// DeleteModel 删除一条模型配置。
|
// DeleteModel 删除一条模型配置。
|
||||||
func (p *Postgres) DeleteModel(ctx context.Context, id uint) error {
|
func (p *Postgres) DeleteModel(ctx context.Context, id string) error {
|
||||||
if p.db == nil {
|
if p.db == nil {
|
||||||
return errStoreDisabled
|
return errStoreDisabled
|
||||||
}
|
}
|
||||||
return p.db.WithContext(ctx).Delete(&LLMModel{}, id).Error
|
return p.db.WithContext(ctx).Delete(&LLMModel{}, "id = ?", id).Error
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,21 @@
|
|||||||
package store
|
package store
|
||||||
|
|
||||||
import "time"
|
|
||||||
|
|
||||||
// 数据库映射模型。表名经 GORM NamingStrategy 统一加 sundynix_ 前缀 + 单数:
|
// 数据库映射模型。表名经 GORM NamingStrategy 统一加 sundynix_ 前缀 + 单数:
|
||||||
// User → sundynix_user,Task → sundynix_task。
|
// User → sundynix_user,Task → sundynix_task。
|
||||||
|
// 约定:均嵌入 BaseModel(雪花字符串 id + created_at/updated_at + 软删 deleted_at);
|
||||||
// 建表/改表一律走 AutoMigrate,不手写 DDL。
|
// 建表/改表一律走 AutoMigrate,不手写 DDL。
|
||||||
|
|
||||||
// User 是平台用户(Users)。
|
// User 是平台用户(Users)。
|
||||||
type User struct {
|
type User struct {
|
||||||
ID uint `gorm:"primaryKey"`
|
BaseModel
|
||||||
Email string `gorm:"uniqueIndex;size:255"`
|
Email string `gorm:"uniqueIndex;size:255"`
|
||||||
CreatedAt time.Time
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Task 是一次提交的 Agent 编排任务(DSL)。
|
// Task 是一次提交的 Agent 编排任务(DSL)。
|
||||||
|
// 业务 id(task_xxx,用于 NATS subject/stream)单列 TaskID,主键统一雪花。
|
||||||
type Task struct {
|
type Task struct {
|
||||||
ID string `gorm:"primaryKey;size:64"` // task_xxx
|
BaseModel
|
||||||
Graph string `gorm:"type:jsonb"` // React Flow 导出的 DSL 原文
|
TaskID string `gorm:"uniqueIndex;size:64"` // task_xxx
|
||||||
Status string `gorm:"size:32"` // submitted / done / failed
|
Graph string `gorm:"type:jsonb"` // React Flow 导出的 DSL 原文
|
||||||
CreatedAt time.Time
|
Status string `gorm:"size:32"` // submitted / done / failed
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,16 +34,43 @@ func OpenPostgres(dsn string) *Postgres {
|
|||||||
log.Printf("[store] postgres 不可用,降级运行(不持久化): %v", err)
|
log.Printf("[store] postgres 不可用,降级运行(不持久化): %v", err)
|
||||||
return &Postgres{}
|
return &Postgres{}
|
||||||
}
|
}
|
||||||
if err := db.AutoMigrate(&User{}, &Task{}, &LLMModel{}, &KB{}, &Doc{}, &Agent{}); err != nil {
|
// 一次性迁移:旧表用整型自增 id,与新雪花字符串 id 不兼容(AutoMigrate 不改主键类型)。
|
||||||
|
// 备份模型密钥(唯一不可再生的数据) → 重建全部表 → 回灌模型。其余为可重建的测试数据。
|
||||||
|
migrateLegacyIntIDs(db)
|
||||||
|
|
||||||
|
if err := db.AutoMigrate(&User{}, &Task{}, &LLMModel{}, &KB{}, &Doc{}, &Agent{}, &DocLink{}); err != nil {
|
||||||
log.Printf("[store] postgres AutoMigrate 失败,降级运行: %v", err)
|
log.Printf("[store] postgres AutoMigrate 失败,降级运行: %v", err)
|
||||||
return &Postgres{}
|
return &Postgres{}
|
||||||
}
|
}
|
||||||
// 回填:kind 列新增前的旧模型行默认归为 chat(幂等)。
|
log.Println("[store] postgres connected & migrated (雪花 id + 软删 规约)")
|
||||||
db.Model(&LLMModel{}).Where("kind = '' OR kind IS NULL").Update("kind", "chat")
|
|
||||||
log.Println("[store] postgres connected, migrated sundynix_user / sundynix_task")
|
|
||||||
return &Postgres{db: db}
|
return &Postgres{db: db}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// migrateLegacyIntIDs 检测到旧整型 id 表则备份模型密钥、删旧表(AutoMigrate 随后按新规约重建)。
|
||||||
|
func migrateLegacyIntIDs(db *gorm.DB) {
|
||||||
|
var dt string
|
||||||
|
db.Raw(`SELECT data_type FROM information_schema.columns WHERE table_name='sundynix_model' AND column_name='id'`).Scan(&dt)
|
||||||
|
if dt != "bigint" && dt != "integer" {
|
||||||
|
return // 全新库或已是新规约
|
||||||
|
}
|
||||||
|
log.Println("[store] 检测到旧整型 id 表,执行雪花 id 迁移(保模型密钥,重置其它测试表)")
|
||||||
|
var saved []map[string]any
|
||||||
|
db.Table("sundynix_model").Find(&saved)
|
||||||
|
for _, t := range []string{"sundynix_doc_link", "sundynix_doc", "sundynix_agent", "sundynix_kb", "sundynix_model", "sundynix_task", "sundynix_user"} {
|
||||||
|
db.Exec("DROP TABLE IF EXISTS " + t + " CASCADE")
|
||||||
|
}
|
||||||
|
_ = db.AutoMigrate(&LLMModel{}) // 先建模型表以回灌
|
||||||
|
for _, r := range saved {
|
||||||
|
s := func(k string) string { v, _ := r[k].(string); return v }
|
||||||
|
b, _ := r["active"].(bool)
|
||||||
|
_ = db.Create(&LLMModel{
|
||||||
|
Kind: s("kind"), Provider: s("provider"), BaseURL: s("base_url"),
|
||||||
|
APIKey: s("api_key"), Model: s("model"), Active: b,
|
||||||
|
}).Error
|
||||||
|
}
|
||||||
|
log.Printf("[store] 已回灌 %d 条模型配置(新雪花 id)", len(saved))
|
||||||
|
}
|
||||||
|
|
||||||
// Enabled 报告是否处于真实持久化模式。
|
// Enabled 报告是否处于真实持久化模式。
|
||||||
func (p *Postgres) Enabled() bool { return p.db != nil }
|
func (p *Postgres) Enabled() bool { return p.db != nil }
|
||||||
|
|
||||||
@@ -52,7 +79,7 @@ func (p *Postgres) SaveTask(ctx context.Context, id, graph string) error {
|
|||||||
if p.db == nil {
|
if p.db == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return p.db.WithContext(ctx).Create(&Task{ID: id, Graph: graph, Status: "submitted"}).Error
|
return p.db.WithContext(ctx).Create(&Task{TaskID: id, Graph: graph, Status: "submitted"}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
// CountTasks 返回已提交任务数(降级模式返回 0)。
|
// CountTasks 返回已提交任务数(降级模式返回 0)。
|
||||||
|
|||||||
Reference in New Issue
Block a user