From 459d5a54fff362d718771c049c498bfc164ccf1e Mon Sep 17 00:00:00 2001 From: lorenacj <66785221+AndriuuU@users.noreply.github.com> Date: Fri, 1 Dec 2023 10:36:15 +0100 Subject: [PATCH] Funciona internet --- SpringApiConsulta/pom.xml | 64 +++---------------- .../src/main/resources/application.properties | 4 +- .../lib/services/Citas_service.dart | 14 ++-- .../lib/services/auth_service.dart | 10 +-- .../lib/services/servicios_service.dart | 4 +- .../lib/services/user_service.dart | 8 +-- 6 files changed, 29 insertions(+), 75 deletions(-) diff --git a/SpringApiConsulta/pom.xml b/SpringApiConsulta/pom.xml index ca5f142..45f6833 100644 --- a/SpringApiConsulta/pom.xml +++ b/SpringApiConsulta/pom.xml @@ -7,16 +7,14 @@ spring-boot-starter-parent 3.0.5 - com.example.consulta - ProyectConsultas + ProyectConsultasapi 0.0.1-SNAPSHOT - ProyectConsultas + ProyectConsultasApi Proyecto de una consulta clinica 17 - @@ -98,61 +96,17 @@ jaxb-api 2.3.0 - - io.jsonwebtoken - jjwt-api - 0.11.2 - - - io.jsonwebtoken - jjwt-impl - 0.11.2 - runtime - - - io.jsonwebtoken - jjwt-jackson - 0.11.2 - runtime - - - - com.itextpdf - itextpdf - 5.5.13.3 - - - org.apache.pdfbox - pdfbox - 3.0.0-RC1 - - - - org.bouncycastle - bcprov-jdk15on - 1.56 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 17 - 17 - - - - + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/SpringApiConsulta/src/main/resources/application.properties b/SpringApiConsulta/src/main/resources/application.properties index c2bb496..f51ca18 100644 --- a/SpringApiConsulta/src/main/resources/application.properties +++ b/SpringApiConsulta/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.jpa.hibernate.ddl-auto=update spring.datasource.url=jdbc:mysql://aws.connect.psdb.cloud/clinicadermatologica?sslMode=VERIFY_IDENTITY -spring.datasource.username=8b9bdfjp0uwvd4m15pv2 -spring.datasource.password=pscale_pw_79wdT72pnQtLDaVT3Gh6eOMyBOCdTZ3O4SFBKaEiUE0 +spring.datasource.username=fj8p7ulr710fcqkh3377 +spring.datasource.password=pscale_pw_W7RqtrQsv97SiT0nLG8vVompsJ2HjWtVazYKkBw97BZ spring.datasource.driver-class-name=com.mysql.jdbc.Driver springdoc.swagger-ui.path=/swagger-ui.html diff --git a/consulta_dermatologica/lib/services/Citas_service.dart b/consulta_dermatologica/lib/services/Citas_service.dart index 2ce2953..5e0f733 100644 --- a/consulta_dermatologica/lib/services/Citas_service.dart +++ b/consulta_dermatologica/lib/services/Citas_service.dart @@ -10,7 +10,7 @@ import 'package:intl/intl.dart'; import 'auth_service.dart'; class CitasService extends ChangeNotifier { - final String _baseUrl = "192.168.1.142:8080"; + final String _baseUrl = "dermatoloapi.azurewebsites.net"; final storage = FlutterSecureStorage(); List listaCitas = []; bool isLoading = false; @@ -30,7 +30,7 @@ class CitasService extends ChangeNotifier { try { String token = await AuthService().readToken(); - final url = Uri.http(_baseUrl, '/api/get/citas', {}); + final url = Uri.https(_baseUrl, '/api/get/citas', {}); print(url); final resp = await http.get(url, @@ -72,7 +72,7 @@ class CitasService extends ChangeNotifier { errorMessage = ''; try { String token = await AuthService().readToken(); - final url = Uri.http(_baseUrl, '/api/delete/citas/$citaId', {}); + final url = Uri.https(_baseUrl, '/api/delete/citas/$citaId', {}); final response = await http.delete( url, headers: { @@ -105,7 +105,7 @@ class CitasService extends ChangeNotifier { class CitasServiceAdmin extends ChangeNotifier{ - final String _baseUrl="192.168.1.142:8080"; + final String _baseUrl="dermatoloapi.azurewebsites.net"; CitasServiceAdmin() { this.getListCitasAdmin(); @@ -115,7 +115,7 @@ class CitasServiceAdmin extends ChangeNotifier{ getListCitasAdmin() async { - final url=Uri.http(_baseUrl,'/api/all/citas',{}); + final url=Uri.https(_baseUrl,'/api/all/citas',{}); print(url); final resp = await http.get(url, @@ -149,7 +149,7 @@ class CitasServiceAdmin extends ChangeNotifier{ //Coger citas class CogerCitasService extends ChangeNotifier{ - final String _baseUrl="192.168.1.142:8080"; + final String _baseUrl="dermatoloapi.azurewebsites.net"; final storage = FlutterSecureStorage(); //final String _firebaseToken=''; @@ -193,7 +193,7 @@ DateTime fecha = DateTime.parse(fechacom); }; String token = await AuthService().readToken(); - final url = Uri.http(_baseUrl, '/api/register/citas', {}); + final url = Uri.https(_baseUrl, '/api/register/citas', {}); print(url); final resp = await http.post( diff --git a/consulta_dermatologica/lib/services/auth_service.dart b/consulta_dermatologica/lib/services/auth_service.dart index 5ef8bf9..9bc1e33 100644 --- a/consulta_dermatologica/lib/services/auth_service.dart +++ b/consulta_dermatologica/lib/services/auth_service.dart @@ -8,7 +8,7 @@ import 'package:consulta_dermatologica/models/models.dart'; class AuthService extends ChangeNotifier{ - final String _baseUrl="192.168.54.64:8080"; + final String _baseUrl="dermatoloapi.azurewebsites.net"; final storage = FlutterSecureStorage(); //final String _firebaseToken=''; @@ -23,7 +23,7 @@ class AuthService extends ChangeNotifier{ 'password': password, }; - final url=Uri.http(_baseUrl,'/api/register/cliente',{}); + final url=Uri.https(_baseUrl,'/api/register/cliente',{}); print(authData); final resp = await http.post(url, @@ -54,7 +54,7 @@ Future login(String username, String password) async { }; try { - final url = Uri.http(_baseUrl, '/api/login', {}); + final url = Uri.https(_baseUrl, '/api/login', {}); final resp = await http.post(url, headers: { 'Content-type': 'application/json', @@ -95,7 +95,7 @@ Future login(String username, String password) async { class ListClientes extends ChangeNotifier{ - final String _baseUrl="192.168.54.64:8080"; + final String _baseUrl="dermatoloapi.azurewebsites.net"; //final String _firebaseToken=''; listClientes() { this.getListClientes(); @@ -105,7 +105,7 @@ class ListClientes extends ChangeNotifier{ getListClientes() async { - final url=Uri.http(_baseUrl,'/api/all/cliente',{}); + final url=Uri.https(_baseUrl,'/api/all/cliente',{}); print(url); final resp = await http.get(url, diff --git a/consulta_dermatologica/lib/services/servicios_service.dart b/consulta_dermatologica/lib/services/servicios_service.dart index 0ae1f9c..541b5b1 100644 --- a/consulta_dermatologica/lib/services/servicios_service.dart +++ b/consulta_dermatologica/lib/services/servicios_service.dart @@ -9,7 +9,7 @@ import 'package:consulta_dermatologica/models/models.dart'; class ServicioService extends ChangeNotifier{ - final String _baseUrl="192.168.1.142:8080"; + final String _baseUrl="dermatoloapi.azurewebsites.net"; //final String _firebaseToken=''; ServicioService() { this.getListService(); @@ -19,7 +19,7 @@ class ServicioService extends ChangeNotifier{ getListService() async { - final url=Uri.http(_baseUrl,'/api/all/servicios/',{}); + final url=Uri.https(_baseUrl,'/api/all/servicios/',{}); print(url); final resp = await http.get(url, diff --git a/consulta_dermatologica/lib/services/user_service.dart b/consulta_dermatologica/lib/services/user_service.dart index 99a2290..3699f3e 100644 --- a/consulta_dermatologica/lib/services/user_service.dart +++ b/consulta_dermatologica/lib/services/user_service.dart @@ -10,14 +10,14 @@ import 'package:intl/intl.dart'; import 'auth_service.dart'; class UserService extends ChangeNotifier { - final String _baseUrl = "192.168.1.142:8080"; + final String _baseUrl = "dermatoloapi.azurewebsites.net"; final storage = FlutterSecureStorage(); Future getUser() async { String token = await AuthService().readToken(); - final url=Uri.http(_baseUrl,'/api/get/cliente',{}); + final url=Uri.https(_baseUrl,'/api/get/cliente',{}); final resp = await http.get( url, @@ -42,7 +42,7 @@ class UserService extends ChangeNotifier { } Future updateCliente(String name,String address,String phone,String email) async { String token = await AuthService().readToken(); - final url = Uri.http(_baseUrl, '/api/update/cliente'); + final url = Uri.https(_baseUrl, '/api/update/cliente'); final Map citaData = { 'nombre': name, @@ -73,7 +73,7 @@ class UserService extends ChangeNotifier { Future updateUser(String username,String password) async { String token = await AuthService().readToken(); - final url = Uri.http(_baseUrl, '/api/update/userpass'); + final url = Uri.https(_baseUrl, '/api/update/userpass'); final Map userData = { 'username': username,