feat: 修改代码冲突
This commit is contained in:
parent
a78b40c339
commit
920b86e56a
@ -1899,7 +1899,7 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 准备节点地址列表
|
// 准备节点地址列表
|
||||||
final nodeAddresses = []; // <MapEntry<String, SocketAddress>>[];
|
final nodeAddresses = <MapEntry<String, SocketAddress>>[];
|
||||||
|
|
||||||
for (final node in testableNodes) {
|
for (final node in testableNodes) {
|
||||||
// 从节点配置中提取服务器地址和端口
|
// 从节点配置中提取服务器地址和端口
|
||||||
@ -1907,7 +1907,7 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
|
|||||||
String host = node.serverAddr;
|
String host = node.serverAddr;
|
||||||
int port = 0;
|
int port = 0;
|
||||||
|
|
||||||
/*// 尝试从config中获取端口
|
// 尝试从config中获取端口
|
||||||
if (node.config.containsKey('server_port')) {
|
if (node.config.containsKey('server_port')) {
|
||||||
port = node.config['server_port'] as int;
|
port = node.config['server_port'] as int;
|
||||||
} else if (node.config.containsKey('port')) {
|
} else if (node.config.containsKey('port')) {
|
||||||
@ -1924,7 +1924,7 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
|
|||||||
KRLogUtil.kr_w('⚠️ 节点 ${node.tag} 缺少地址或端口信息', tag: 'HomeController');
|
KRLogUtil.kr_w('⚠️ 节点 ${node.tag} 缺少地址或端口信息', tag: 'HomeController');
|
||||||
// 设置为失败
|
// 设置为失败
|
||||||
node.urlTestDelay.value = 65535;
|
node.urlTestDelay.value = 65535;
|
||||||
}*/
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
KRLogUtil.kr_e('❌ 解析节点 ${node.tag} 配置失败: $e', tag: 'HomeController');
|
KRLogUtil.kr_e('❌ 解析节点 ${node.tag} 配置失败: $e', tag: 'HomeController');
|
||||||
node.urlTestDelay.value = 65535;
|
node.urlTestDelay.value = 65535;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user