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

fix(inbounds): apply runtime changes after the DB commit (#5768)

Browse Source 
* fix(inbounds): apply runtime changes after commit

* ci: fix staticcheck findings
This commit is contained in:
n0ctal
2026-07-09 01:12:28 +05:00
committed by GitHub
parent f4199353da
commit f431e9cc03
9 changed files with 420 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/node.go
+9 -3
View File
@@ -500,13 +500,19 @@ func (r staticEgressResolver) NodeEgressProxyURL(int) string { return string(r)
// reporting the old tag until the remote update lands, and a leftover entry
// that matches nothing is harmless.
func (s *NodeService) EnsureInboundTagAllowed(nodeID int, tag string) error {
return s.EnsureInboundTagAllowedTx(database.GetDB(), nodeID, tag)
}
func (s *NodeService) EnsureInboundTagAllowedTx(tx *gorm.DB, nodeID int, tag string) error {
tag = strings.TrimSpace(tag)
if nodeID <= 0 || tag == "" {
return nil
}
db := database.GetDB()
if tx == nil {
tx = database.GetDB()
}
node := &model.Node{}
if err := db.Where("id = ?", nodeID).First(node).Error; err != nil {
if err := tx.Where("id = ?", nodeID).First(node).Error; err != nil {
return err
}
if node.InboundSyncMode != "selected" {
@@ -519,7 +525,7 @@ func (s *NodeService) EnsureInboundTagAllowed(nodeID int, tag string) error {
if err != nil {
return err
}
return db.Model(model.Node{}).Where("id = ?", nodeID).
return tx.Model(model.Node{}).Where("id = ?", nodeID).
Updates(map[string]any{"inbound_tags": string(buf)}).Error
}