CN-JS-HuiBai/Singbox-For-SBPanel
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate contentjson and badjson to library &

Browse Source 
Add omitempty in format
This commit is contained in:
世界
2023-12-01 20:15:11 +08:00
parent e09a94bb9e
commit 38d28e0763
38 changed files with 48 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/sing-box/cmd_run.go
View File

@@ -13,10 +13,10 @@ import (
"time"
"github.com/sagernet/sing-box"
"github.com/sagernet/sing-box/common/badjsonmerge"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/option"
E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/json/badjson"
"github.com/spf13/cobra"
)
@@ -108,7 +108,7 @@ func readConfigAndMerge() (option.Options, error) {
}
var mergedOptions option.Options
for _, options := range optionsList {
mergedOptions, err = badjsonmerge.MergeOptions(options.options, mergedOptions)
mergedOptions, err = badjson.Merge(options.options, mergedOptions)
if err != nil {
return option.Options{}, E.Cause(err, "merge config at ", options.path)
}