Fix (#9271)
Some checks are pending
release Linux / build (push) Waiting to run
release Linux / release-zip (push) Blocked by required conditions
release Linux / build and release deb x64 & arm64 (push) Waiting to run
release Linux / build and release rpm x64 & arm64 (push) Waiting to run
release Linux / build and release rpm riscv64 (push) Waiting to run
release macOS / build (push) Waiting to run
release macOS / release-zip (push) Blocked by required conditions
release macOS / package and release macOS dmg (push) Blocked by required conditions
release Windows desktop (Avalonia UI) / build (push) Waiting to run
release Windows desktop (Avalonia UI) / release-zip (push) Blocked by required conditions
release Windows / build (push) Waiting to run
release Windows / release-zip (push) Blocked by required conditions

* Fix

* Fix res and uri

* Fix core config
This commit is contained in:
DHR60 2026-05-10 06:21:51 +00:00 committed by GitHub
parent e7973840ce
commit f8bc706cda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 13 additions and 10 deletions

View file

@ -1816,9 +1816,9 @@ public static class ConfigHandler
ProfileItem? activeProfile = null; ProfileItem? activeProfile = null;
if (isSub && subid.IsNotEmpty()) if (isSub && subid.IsNotEmpty())
{ {
await RemoveServersViaSubid(config, subid, true);
lstOriSub = await AppManager.Instance.ProfileItems(subid); lstOriSub = await AppManager.Instance.ProfileItems(subid);
activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId); activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId);
await RemoveServersViaSubid(config, subid, true);
} }
var counter = 0; var counter = 0;

View file

@ -230,6 +230,9 @@ public class InnerFmt
jsonObj["TransportExtraObj"] = transportExtraObj; jsonObj["TransportExtraObj"] = transportExtraObj;
jsonObj.Remove("TransportExtra"); jsonObj.Remove("TransportExtra");
} }
// remove subid and isSub
jsonObj.Remove("Subid");
jsonObj.Remove("IsSub");
// Remove empty properties to reduce the length of the exported string // Remove empty properties to reduce the length of the exported string
RemoveEmptyJson(jsonObj); RemoveEmptyJson(jsonObj);
var jsonStr = JsonUtils.Serialize(jsonObj, false); var jsonStr = JsonUtils.Serialize(jsonObj, false);

View file

@ -3718,7 +3718,7 @@ namespace ServiceLib.Resx {
} }
/// <summary> /// <summary>
/// 查找类似 For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode 的本地化字符串。 /// 查找类似 For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode 的本地化字符串。
/// </summary> /// </summary>
public static string TbSettingsBindInterfaceTip { public static string TbSettingsBindInterfaceTip {
get { get {

View file

@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
<value>Bind Interface</value> <value>Bind Interface</value>
</data> </data>
<data name="TbSettingsBindInterfaceTip" xml:space="preserve"> <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
<value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value> <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
</data> </data>
<data name="TbPreSharedKey" xml:space="preserve"> <data name="TbPreSharedKey" xml:space="preserve">
<value>PreSharedKey</value> <value>PreSharedKey</value>

View file

@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
<value>Bind Interface</value> <value>Bind Interface</value>
</data> </data>
<data name="TbSettingsBindInterfaceTip" xml:space="preserve"> <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
<value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value> <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
</data> </data>
<data name="TbPreSharedKey" xml:space="preserve"> <data name="TbPreSharedKey" xml:space="preserve">
<value>PreSharedKey</value> <value>PreSharedKey</value>

View file

@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
<value>Bind Interface</value> <value>Bind Interface</value>
</data> </data>
<data name="TbSettingsBindInterfaceTip" xml:space="preserve"> <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
<value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value> <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
</data> </data>
<data name="TbPreSharedKey" xml:space="preserve"> <data name="TbPreSharedKey" xml:space="preserve">
<value>PreSharedKey</value> <value>PreSharedKey</value>

View file

@ -1720,7 +1720,7 @@
<value>绑定网口</value> <value>绑定网口</value>
</data> </data>
<data name="TbSettingsBindInterfaceTip" xml:space="preserve"> <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
<value>用于多网口环境,填写要绑定的网口名称,仅生效于 Windows 系统 TUN 模式</value> <value>用于多网口环境,填写要绑定的网口名称,仅生效于 Windows 系统 TUN 模式</value>
</data> </data>
<data name="TbPreSharedKey" xml:space="preserve"> <data name="TbPreSharedKey" xml:space="preserve">
<value>PreSharedKey</value> <value>PreSharedKey</value>

View file

@ -1720,7 +1720,7 @@
<value>綁定網路介面</value> <value>綁定網路介面</value>
</data> </data>
<data name="TbSettingsBindInterfaceTip" xml:space="preserve"> <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
<value>適用於多網路介面環境請填寫要綁定的介面名稱Windows 系統有效,其他系統僅在 TUN 模式下生效</value> <value>適用於多網路介面環境請填寫要綁定的介面名稱Windows 系統有效,其他系統僅在 TUN 模式下生效</value>
</data> </data>
<data name="TbPreSharedKey" xml:space="preserve"> <data name="TbPreSharedKey" xml:space="preserve">
<value>PreSharedKey</value> <value>PreSharedKey</value>

View file

@ -10,9 +10,9 @@ public partial class CoreConfigV2rayService
var listenPort = AppManager.Instance.GetLocalPort(EInboundProtocol.socks); var listenPort = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
_coreConfig.inbounds = []; _coreConfig.inbounds = [];
var inbound = BuildInbound(_config.Inbound.First(), EInboundProtocol.socks, true); var inbound = BuildInbound(_config.Inbound.First(), EInboundProtocol.socks, true);
var isUsingLocalMixedPort = _node.Address == Global.Loopback && _node.Port == listenPort;
if (!context.IsTunEnabled if (!context.IsTunEnabled || !isUsingLocalMixedPort)
|| (context.IsTunEnabled && _node.Address != Global.Loopback && _node.Port != listenPort))
{ {
_coreConfig.inbounds.Add(inbound); _coreConfig.inbounds.Add(inbound);