Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-02-27 20:53:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: maybe fix something idk

Browse source
This commit is contained in:
kirden 2026-02-22 21:11:37 +03:00
parent e09db5ee66
commit 8804e47dce
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
database/model/model.go
View file

@ -2,7 +2,7 @@
package model package model
import ( import (
"encoding/json" js "encoding/json"
"fmt" "fmt"
"github.com/mhsanaei/3x-ui/v2/util/json_util" "github.com/mhsanaei/3x-ui/v2/util/json_util"
@ -93,7 +93,7 @@ func (i *Inbound) GenXrayInboundConfig() *xray.InboundConfig {
if i.Port >= 10000 && i.Port <= 11000 { if i.Port >= 10000 && i.Port <= 11000 {
var ss map[string]any var ss map[string]any
if err := json.Unmarshal([]byte(i.StreamSettings), &ss); err != nil || ss == nil { if err := js.Unmarshal([]byte(i.StreamSettings), &ss); err != nil || ss == nil {
ss = map[string]any{} ss = map[string]any{}
} }
@ -103,9 +103,9 @@ func (i *Inbound) GenXrayInboundConfig() *xray.InboundConfig {
case map[string]any: case map[string]any:
tlsMap = v tlsMap = v
default: default:
if bs, err := json.Marshal(existing); err == nil { if bs, err := js.Marshal(existing); err == nil {
var tmp map[string]any var tmp map[string]any
if err2 := json.Unmarshal(bs, &tmp); err2 == nil { if err2 := js.Unmarshal(bs, &tmp); err2 == nil {
tlsMap = tmp tlsMap = tmp
} }
} }
@ -117,7 +117,7 @@ func (i *Inbound) GenXrayInboundConfig() *xray.InboundConfig {
ss["tlsSettings"] = tlsMap ss["tlsSettings"] = tlsMap
if b, err := json.Marshal(ss); err == nil { if b, err := js.Marshal(ss); err == nil {
streamRaw = string(b) streamRaw = string(b)
} }