diff --git a/lib/core/config/app_config.dart b/lib/core/config/app_config.dart index 98baefc..2d1c8c7 100644 --- a/lib/core/config/app_config.dart +++ b/lib/core/config/app_config.dart @@ -11,10 +11,10 @@ import 'package:flutter/foundation.dart'; class AppConfig { const AppConfig._(); - /// 开发调试默认服务地址,当前直接指向公网。 + /// 开发调试默认服务地址,当前指向本机局域网 IP。 /// - /// 需要切换局域网联调时只改这一行,地址不要带结尾斜杠。 - static const String devHostBaseUrl = 'http://39.162.50.99:8081'; + /// 换网络时只改这一行,地址不要带结尾斜杠。 + static const String devHostBaseUrl = 'http://10.39.237.1:8081'; /// 本机后端地址:通过 `adb reverse tcp:8081 tcp:8081` 映射到开发机, /// 探测可达时 App 直连本机服务;不可达时回落到公网地址。 diff --git a/test/config/server_endpoint_test.dart b/test/config/server_endpoint_test.dart index 524eede..59beeb8 100644 --- a/test/config/server_endpoint_test.dart +++ b/test/config/server_endpoint_test.dart @@ -62,8 +62,8 @@ void main() { ); }); - test('should_use_the_configured_public_address_for_device_default', () { - expect(AppConfig.devHostBaseUrl, 'http://39.162.50.99:8081'); + test('should_use_the_configured_local_address_for_device_default', () { + expect(AppConfig.devHostBaseUrl, 'http://10.39.237.1:8081'); }); test('should_skip_probe_when_compiled_override_is_set', () async { @@ -111,7 +111,11 @@ void main() { }, ); - expect(attempts, [AppConfig.lanBaseUrl, AppConfig.devHostBaseUrl]); + expect(attempts, [ + AppConfig.lanBaseUrl, + AppConfig.devHostBaseUrl, + AppConfig.publicBaseUrl, + ]); expect(AppConfig.apiBaseUrl, AppConfig.publicBaseUrl); }); @@ -129,7 +133,7 @@ void main() { attempts.add(baseUrl); active++; if (active > maxActive) maxActive = active; - if (active == 2) allStarted.complete(); + if (active == 3) allStarted.complete(); await allStarted.future; active--; return baseUrl == AppConfig.lanBaseUrl || @@ -139,8 +143,12 @@ void main() { await probing.timeout(const Duration(seconds: 1)); - expect(attempts, [AppConfig.lanBaseUrl, AppConfig.devHostBaseUrl]); - expect(maxActive, 2); + expect(attempts, [ + AppConfig.lanBaseUrl, + AppConfig.devHostBaseUrl, + AppConfig.publicBaseUrl, + ]); + expect(maxActive, 3); expect(AppConfig.apiBaseUrl, AppConfig.lanBaseUrl); }, ); @@ -156,7 +164,11 @@ void main() { }, ); - expect(attempts, [AppConfig.lanBaseUrl, AppConfig.devHostBaseUrl]); + expect(attempts, [ + AppConfig.lanBaseUrl, + AppConfig.devHostBaseUrl, + AppConfig.publicBaseUrl, + ]); expect(AppConfig.apiBaseUrl, AppConfig.publicBaseUrl); }); @@ -171,7 +183,11 @@ void main() { }, ); - expect(attempts, [AppConfig.lanBaseUrl, AppConfig.devHostBaseUrl]); + expect(attempts, [ + AppConfig.lanBaseUrl, + AppConfig.devHostBaseUrl, + AppConfig.publicBaseUrl, + ]); expect(AppConfig.apiBaseUrl, AppConfig.devHostBaseUrl); }); @@ -187,7 +203,12 @@ void main() { }, ); - expect(attempts, [custom, AppConfig.lanBaseUrl, AppConfig.devHostBaseUrl]); + expect(attempts, [ + custom, + AppConfig.lanBaseUrl, + AppConfig.devHostBaseUrl, + AppConfig.publicBaseUrl, + ]); expect(AppConfig.apiBaseUrl, custom); });