|
|
@ -865,7 +865,7 @@ namespace ServiceLib.Handler.CoreConfig |
|
|
|
var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound); |
|
|
|
var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound); |
|
|
|
|
|
|
|
|
|
|
|
//Previous proxy |
|
|
|
//Previous proxy |
|
|
|
var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!); |
|
|
|
var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile); |
|
|
|
if (prevNode is not null |
|
|
|
if (prevNode is not null |
|
|
|
&& prevNode.configType != EConfigType.Custom) |
|
|
|
&& prevNode.configType != EConfigType.Custom) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -878,7 +878,7 @@ namespace ServiceLib.Handler.CoreConfig |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//Next proxy |
|
|
|
//Next proxy |
|
|
|
var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile!); |
|
|
|
var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile); |
|
|
|
if (nextNode is not null |
|
|
|
if (nextNode is not null |
|
|
|
&& nextNode.configType != EConfigType.Custom) |
|
|
|
&& nextNode.configType != EConfigType.Custom) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -956,7 +956,7 @@ namespace ServiceLib.Handler.CoreConfig |
|
|
|
if (routing != null) |
|
|
|
if (routing != null) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet); |
|
|
|
var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet); |
|
|
|
foreach (var item in rules!) |
|
|
|
foreach (var item in rules ?? []) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (item.enabled) |
|
|
|
if (item.enabled) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -971,7 +971,7 @@ namespace ServiceLib.Handler.CoreConfig |
|
|
|
if (lockedItem != null) |
|
|
|
if (lockedItem != null) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet); |
|
|
|
var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet); |
|
|
|
foreach (var item in rules!) |
|
|
|
foreach (var item in rules ?? []) |
|
|
|
{ |
|
|
|
{ |
|
|
|
GenRoutingUserRule(item, singboxConfig.route.rules); |
|
|
|
GenRoutingUserRule(item, singboxConfig.route.rules); |
|
|
|
} |
|
|
|
} |
|
|
|