mirror of
https://github.com/2dust/v2rayN.git
synced 2026-04-16 04:25:45 +00:00
Compare commits
3 commits
a74dc383b7
...
30dd9f95e3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30dd9f95e3 | ||
|
|
661affd6a5 | ||
|
|
14c5b92423 |
4 changed files with 18 additions and 8 deletions
|
|
@ -572,7 +572,12 @@ public partial class CoreConfigSingboxService
|
|||
for (var i = 0; i < nodes.Count; i++)
|
||||
{
|
||||
var node = nodes[i];
|
||||
var currentTag = $"{baseTagName}-{i + 1}";
|
||||
var currentTag = $"{baseTagName}-{i + 1}-{node.Remarks}";
|
||||
|
||||
if (nodes.Count == 1)
|
||||
{
|
||||
currentTag = baseTagName;
|
||||
}
|
||||
|
||||
if (node.ConfigType.IsGroupType())
|
||||
{
|
||||
|
|
@ -603,8 +608,8 @@ public partial class CoreConfigSingboxService
|
|||
for (var i = 0; i < nodesReverse.Count; i++)
|
||||
{
|
||||
var node = nodesReverse[i];
|
||||
var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}";
|
||||
var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}" : null;
|
||||
var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}-{node.Remarks}";
|
||||
var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}-{node.Remarks}" : null;
|
||||
if (node.ConfigType.IsGroupType())
|
||||
{
|
||||
var childProfiles = new CoreConfigSingboxService(context with { Node = node, }).BuildGroupProxyOutbounds(currentTag);
|
||||
|
|
|
|||
|
|
@ -494,7 +494,7 @@ public partial class CoreConfigSingboxService
|
|||
return Global.ProxyTag;
|
||||
}
|
||||
|
||||
var tag = $"{node.IndexId}-{Global.ProxyTag}";
|
||||
var tag = $"{node.IndexId}-{Global.ProxyTag}-{node.Remarks}";
|
||||
if (_coreConfig.outbounds.Any(o => o.tag.StartsWith(tag))
|
||||
|| (_coreConfig.endpoints != null && _coreConfig.endpoints.Any(e => e.tag.StartsWith(tag))))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -699,7 +699,12 @@ public partial class CoreConfigV2rayService
|
|||
for (var i = 0; i < nodes.Count; i++)
|
||||
{
|
||||
var node = nodes[i];
|
||||
var currentTag = $"{baseTagName}-{i + 1}";
|
||||
var currentTag = $"{baseTagName}-{i + 1}-{node.Remarks}";
|
||||
|
||||
if (nodes.Count == 1)
|
||||
{
|
||||
currentTag = baseTagName;
|
||||
}
|
||||
|
||||
if (node.ConfigType.IsGroupType())
|
||||
{
|
||||
|
|
@ -730,8 +735,8 @@ public partial class CoreConfigV2rayService
|
|||
for (var i = 0; i < nodesReverse.Count; i++)
|
||||
{
|
||||
var node = nodesReverse[i];
|
||||
var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}";
|
||||
var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}" : null;
|
||||
var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}-{node.Remarks}";
|
||||
var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}-{node.Remarks}" : null;
|
||||
if (node.ConfigType.IsGroupType())
|
||||
{
|
||||
var childProfiles = new CoreConfigV2rayService(context with { Node = node, }).BuildGroupProxyOutbounds(currentTag);
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ public partial class CoreConfigV2rayService
|
|||
return Global.ProxyTag;
|
||||
}
|
||||
|
||||
var tag = $"{node.IndexId}-{Global.ProxyTag}";
|
||||
var tag = $"{node.IndexId}-{Global.ProxyTag}-{node.Remarks}";
|
||||
if (_coreConfig.outbounds.Any(p => p.tag.StartsWith(tag)))
|
||||
{
|
||||
return tag;
|
||||
|
|
|
|||
Loading…
Reference in a new issue