Buriburizaemon/Ratte
1
0
Fork 0
mirror of https://github.com/InazumaV/Ratte.git synced 2026-02-04 12:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix OtherOptions not merge

Browse Source
This commit is contained in:
Yuzuki616
2025-01-18 02:13:32 +09:00
parent 68519193ec
commit acaeddf26a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
handler/node.go
View File

@@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"github.com/InazumaV/Ratte-Interface/core" "github.com/InazumaV/Ratte-Interface/core"
"github.com/InazumaV/Ratte-Interface/panel" "github.com/InazumaV/Ratte-Interface/panel"
"github.com/InazumaV/Ratte/common/maps"
) )
func (h *Handler) PullNodeHandle(n *panel.NodeInfo) error { func (h *Handler) PullNodeHandle(n *panel.NodeInfo) error {
@@ -40,8 +41,10 @@ func (h *Handler) PullNodeHandle(n *panel.NodeInfo) error {
if err != nil { if err != nil {
h.l.WithError(err).Error("Exec before add node hook failed") h.l.WithError(err).Error("Exec before add node hook failed")
} }
ni := (*core.NodeInfo)(n)
ni.OtherOptions = maps.Merge[string, any](ni.OtherOptions, h.Options.Expand)
err = h.c.AddNode(&core.AddNodeParams{ err = h.c.AddNode(&core.AddNodeParams{
NodeInfo: (*core.NodeInfo)(n), NodeInfo: ni,
TlsOptions: core.TlsOptions{ TlsOptions: core.TlsOptions{
CertPath: h.Cert.CertPath, CertPath: h.Cert.CertPath,
KeyPath: h.Cert.KeyPath, KeyPath: h.Cert.KeyPath,