From 7ea3d8dc286cb1a63b67c5c59b7176bff6a185be Mon Sep 17 00:00:00 2001 From: Artur Date: Sun, 26 Apr 2026 21:45:12 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BA=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/core/constants.dart | 3 ++- lib/data/datasources/ws_client.dart | 2 +- lib/data/repositories/contact_repository.dart | 6 ++--- lib/domain/services/api_service.dart | 27 +++++++++---------- lib/logic/auth_provider.dart | 8 +++--- srv/main.py | 4 +++ 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/lib/core/constants.dart b/lib/core/constants.dart index b15e409..759edbf 100644 --- a/lib/core/constants.dart +++ b/lib/core/constants.dart @@ -1,3 +1,4 @@ class AppConstants { - static const baseUrl = '192.168.0.180:8000'; + //static const baseUrl = '192.168.0.180:8000'; + static const baseUrl = 'https://api.chepuhagram.ru'; } \ No newline at end of file diff --git a/lib/data/datasources/ws_client.dart b/lib/data/datasources/ws_client.dart index e2f82fd..794fe72 100644 --- a/lib/data/datasources/ws_client.dart +++ b/lib/data/datasources/ws_client.dart @@ -29,7 +29,7 @@ class SocketService { } // В FastAPI эндпоинт обычно ожидает токен в URL или подзаголовке - final uri = Uri.parse("ws://${AppConstants.baseUrl}/ws?token=$token"); + final uri = Uri.parse("ws://${AppConstants.baseUrl.split('//')[1]}/ws?token=$token"); _channel = WebSocketChannel.connect(uri); diff --git a/lib/data/repositories/contact_repository.dart b/lib/data/repositories/contact_repository.dart index 4665afd..9061658 100644 --- a/lib/data/repositories/contact_repository.dart +++ b/lib/data/repositories/contact_repository.dart @@ -15,7 +15,7 @@ class ContactRepository { } final response = await _client.get( - Uri.http(AppConstants.baseUrl, 'users/chats'), + Uri.parse('${AppConstants.baseUrl}/users/chats'), headers: { 'Authorization': 'Bearer $token', 'Content-Type': 'application/json', @@ -37,7 +37,7 @@ class ContactRepository { } final response = await _client.get( - Uri.http(AppConstants.baseUrl, 'users/all'), + Uri.parse('${AppConstants.baseUrl}/users/all'), headers: { 'Authorization': 'Bearer $token', 'Content-Type': 'application/json', @@ -55,7 +55,7 @@ class ContactRepository { Future fetchContactById(int userId) async { final token = await _apiService.getAccessToken(); final response = await _client.get( - Uri.http(AppConstants.baseUrl, 'users/$userId'), + Uri.parse('${AppConstants.baseUrl}/users/$userId'), headers: { 'Authorization': 'Bearer $token', 'Content-Type': 'application/json', diff --git a/lib/domain/services/api_service.dart b/lib/domain/services/api_service.dart index 49618a5..24c1b4a 100644 --- a/lib/domain/services/api_service.dart +++ b/lib/domain/services/api_service.dart @@ -15,7 +15,7 @@ class ApiService extends ChangeNotifier { try { final refreshToken = await _storage.read(key: 'refresh_token'); final response = await _client.post( - Uri.http(AppConstants.baseUrl, 'auth/refresh'), + Uri.parse('${AppConstants.baseUrl}/auth/refresh'), body: jsonEncode({'refresh_token': refreshToken}), headers: {'Content-Type': 'application/json'}, ); @@ -70,7 +70,7 @@ class ApiService extends ChangeNotifier { try { final token = await getAccessToken(); final response = await _client.post( - Uri.http(AppConstants.baseUrl, 'auth/update-fcm', {'token': fcmtoken}), + Uri.parse('${AppConstants.baseUrl}/auth/update-fcm?token=$fcmtoken'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', @@ -96,7 +96,7 @@ class ApiService extends ChangeNotifier { try { final token = await getAccessToken(); final response = await _client.post( - Uri.http(AppConstants.baseUrl, 'auth/set-public-key'), + Uri.parse('${AppConstants.baseUrl}/auth/set-public-key'), body: jsonEncode({'public_key': publicKey}), headers: { 'Content-Type': 'application/json', @@ -120,7 +120,7 @@ class ApiService extends ChangeNotifier { Future> getMe() async { final token = await getAccessToken(); final response = await _client.get( - Uri.http(AppConstants.baseUrl, 'users/me'), + Uri.parse('${AppConstants.baseUrl}/users/me'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', @@ -136,7 +136,7 @@ class ApiService extends ChangeNotifier { Future updateEncryptedPrivateKey(String encryptedPrivateKey) async { final token = await getAccessToken(); final response = await _client.put( - Uri.http(AppConstants.baseUrl, 'users/me/encryption-key'), + Uri.parse('${AppConstants.baseUrl}/users/me/encryption-key'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', @@ -150,7 +150,7 @@ class ApiService extends ChangeNotifier { Future changePassword(String currentPassword, String newPassword) async { final token = await getAccessToken(); final response = await _client.put( - Uri.http(AppConstants.baseUrl, 'users/me/password'), + Uri.parse('${AppConstants.baseUrl}/users/me/password'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', @@ -166,11 +166,8 @@ class ApiService extends ChangeNotifier { Future> getChatHistory(int contactId) async { final token = await getAccessToken(); - final response = await http.get( - Uri.http( - AppConstants.baseUrl, - 'messages/history/${contactId.toString()}', - ), + final response = await _client.get( + Uri.parse('${AppConstants.baseUrl}/messages/history/${contactId.toString()}'), headers: { 'Content-Type': 'application/json', "Authorization": "Bearer $token", @@ -189,7 +186,7 @@ class ApiService extends ChangeNotifier { }) async { final token = await getAccessToken(); final response = await _client.put( - Uri.http(AppConstants.baseUrl, 'users/me'), + Uri.parse('${AppConstants.baseUrl}/users/me'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', @@ -214,7 +211,7 @@ class ApiService extends ChangeNotifier { Future> getUserById(int userId) async { final token = await getAccessToken(); final response = await _client.get( - Uri.http(AppConstants.baseUrl, 'users/$userId'), + Uri.parse('${AppConstants.baseUrl}/users/$userId'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', @@ -236,7 +233,7 @@ class ApiService extends ChangeNotifier { }) async { final token = await getAccessToken(); final response = await _client.put( - Uri.http(AppConstants.baseUrl, 'users/me/privacy'), + Uri.parse('${AppConstants.baseUrl}/users/me/privacy'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', @@ -256,7 +253,7 @@ class ApiService extends ChangeNotifier { Future> getPrivacySettings() async { final token = await getAccessToken(); final response = await _client.get( - Uri.http(AppConstants.baseUrl, 'users/me/privacy'), + Uri.parse('${AppConstants.baseUrl}/users/me/privacy'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', diff --git a/lib/logic/auth_provider.dart b/lib/logic/auth_provider.dart index e2ff634..bc2e254 100644 --- a/lib/logic/auth_provider.dart +++ b/lib/logic/auth_provider.dart @@ -87,7 +87,7 @@ class AuthProvider extends ChangeNotifier { try { final response = await _client.post( - Uri.http(AppConstants.baseUrl, 'auth/login'), + Uri.parse('${AppConstants.baseUrl}/auth/login'), body: {'username': username, 'password': password}, ); @@ -161,7 +161,7 @@ class AuthProvider extends ChangeNotifier { try { final response = await _client .get( - Uri.http(AppConstants.baseUrl, 'users/me'), + Uri.parse('${AppConstants.baseUrl}/users/me'), headers: {'Authorization': 'Bearer $token'}, ) .timeout(const Duration(seconds: 5)); @@ -200,7 +200,7 @@ class AuthProvider extends ChangeNotifier { final keys = await _cryptoService.initAccountSecurity(masterPassword); final response = await _client.post( - Uri.http(AppConstants.baseUrl, 'auth/setup-account'), + Uri.parse('${AppConstants.baseUrl}/auth/setup-account'), headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer $token', @@ -234,7 +234,7 @@ class AuthProvider extends ChangeNotifier { try { final token = await _apiService.getAccessToken(); final response = await _client.get( - Uri.http(AppConstants.baseUrl, 'users/me'), + Uri.parse('${AppConstants.baseUrl}/users/me'), headers: {'Authorization': 'Bearer $token'}, ); diff --git a/srv/main.py b/srv/main.py index ee50fd3..1083559 100644 --- a/srv/main.py +++ b/srv/main.py @@ -17,3 +17,7 @@ app.add_middleware( allow_methods=["*"], allow_headers=["*"], ) + +if __name__ == "__main__": + import uvicorn + uvicorn.run(app, host="0.0.0.0", port=8587) \ No newline at end of file