xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-30 23:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(database): repair legacy string tgId in inbound settings on upgrade

Browse Source 
Old panel builds and external tools writing directly to the DB store
tgId as a JSON string; parsing such settings into the strict int64
Client model fails with "json: cannot unmarshal string into Go struct
field Client.tgId of type int64" and blocks every client operation on
that inbound. The one-shot InboundClientTgIdFix seeder already ran on
existing installs, so the repair is re-registered as
InboundClientTgIdFix2 to run once more on upgrade, and it now preserves
numeric string ids instead of zeroing them. The Client model itself
stays number-only.
This commit is contained in:
MHSanaei
2026-07-18 13:06:05 +02:00
parent 2f156c8eb0
commit 16b2bcf9aa
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/database/db.go
+8 -3
View File
@@ -1057,7 +1057,7 @@ func runSeeders(isUsersEmpty bool) error {
} }
if empty && isUsersEmpty { if empty && isUsersEmpty {
seeders := []string{"UserPasswordHash", "ClientsTable", "InboundClientsArrayFix", "InboundClientTgIdFix", "InboundClientSubIdFix", "FreedomFinalRulesReverseFix", "ApiTokensHash", "LegacyProxySettingsCleanup", "WireguardPeersToClients", "MtprotoSecretsToClients", "NodeInboundsAdopted", "ResetIpLimitNoFail2ban"} seeders := []string{"UserPasswordHash", "ClientsTable", "InboundClientsArrayFix", "InboundClientTgIdFix2", "InboundClientSubIdFix", "FreedomFinalRulesReverseFix", "ApiTokensHash", "LegacyProxySettingsCleanup", "WireguardPeersToClients", "MtprotoSecretsToClients", "NodeInboundsAdopted", "ResetIpLimitNoFail2ban"}
for _, name := range seeders { for _, name := range seeders {
if err := db.Create(&model.HistoryOfSeeders{SeederName: name}).Error; err != nil { if err := db.Create(&model.HistoryOfSeeders{SeederName: name}).Error; err != nil {
return err return err
@@ -1126,7 +1126,7 @@ func runSeeders(isUsersEmpty bool) error {
} }
} }
if !slices.Contains(seedersHistory, "InboundClientTgIdFix") { if !slices.Contains(seedersHistory, "InboundClientTgIdFix2") {
if err := normalizeInboundClientTgId(); err != nil { if err := normalizeInboundClientTgId(); err != nil {
return err return err
} }
@@ -1384,6 +1384,11 @@ func normalizeInboundClientTgId() error {
continue continue
} }
obj["tgId"] = int64(0) obj["tgId"] = int64(0)
if s, isStr := tgRaw.(string); isStr {
if id, err := strconv.ParseInt(strings.ReplaceAll(strings.TrimSpace(s), " ", ""), 10, 64); err == nil {
obj["tgId"] = id
}
}
clients[i] = obj clients[i] = obj
mutated = true mutated = true
} }
@@ -1401,7 +1406,7 @@ func normalizeInboundClientTgId() error {
return err return err
} }
} }
return tx.Create(&model.HistoryOfSeeders{SeederName: "InboundClientTgIdFix"}).Error return tx.Create(&model.HistoryOfSeeders{SeederName: "InboundClientTgIdFix2"}).Error
}) })
} }