Mise en place du json
This commit is contained in:
parent
8c3a3c66f7
commit
31a06d807e
3 changed files with 25 additions and 18 deletions
|
@ -6,35 +6,35 @@ chatapp/Model/MessageHorodate.java
|
|||
chatapp.Model.MessageHorodate
|
||||
chatapp/Model/ListUtilisateurs.java
|
||||
chatapp.Model.ListUtilisateurs
|
||||
chatapp/Protocol/RunnerEcouteTCP.java
|
||||
chatapp.Protocol.RunnerEcouteTCP
|
||||
chatapp/View/DemarrerSession.java
|
||||
chatapp.View.DemarrerSession
|
||||
chatapp/View/FenetreSession.java
|
||||
chatapp.View.FenetreSession
|
||||
chatapp/Controller/ChatApp.java
|
||||
chatapp.Controller.ChatApp
|
||||
chatapp/Model/DataBase.java
|
||||
chatapp.Model.DataBase
|
||||
chatapp/View/View_Menu.java
|
||||
chatapp.View.View_Menu
|
||||
chatapp/View/ConnexionScreen.java
|
||||
chatapp.View.ConnexionScreen
|
||||
chatapp/View/ChangementPseudo.java
|
||||
chatapp.View.ChangementPseudo
|
||||
chatapp/Protocol/RunnerEcouteUDP.java
|
||||
chatapp.Protocol.RunnerEcouteUDP
|
||||
chatapp/View/View_Utilisateurs.java
|
||||
chatapp.View.View_Utilisateurs
|
||||
chatapp/Protocol/RunnerEcouteTCP.java
|
||||
chatapp.Protocol.RunnerEcouteTCP
|
||||
chatapp/Protocol/UDPEchange.java
|
||||
chatapp.Protocol.RunnerUDP
|
||||
chatapp.Protocol.UDPEchange
|
||||
chatapp/Controller/ChatApp.java
|
||||
chatapp.Controller.ChatApp
|
||||
chatapp/Main.java
|
||||
chatapp.Main
|
||||
chatapp/View/Clavardage.java
|
||||
chatapp.View.Clavardage
|
||||
chatapp.View.Clavardage$1
|
||||
chatapp/Model/DataBase.java
|
||||
chatapp.Model.DataBase
|
||||
chatapp/Protocol/SessionClavardage.java
|
||||
chatapp.Protocol.SessionClavardage
|
||||
chatapp/View/ConnexionScreen.java
|
||||
chatapp.View.ConnexionScreen
|
||||
chatapp/View/View_Utilisateurs.java
|
||||
chatapp.View.View_Utilisateurs
|
||||
chatapp/View/View_Menu.java
|
||||
chatapp.View.View_Menu
|
||||
chatapp/Protocol/RunnerEcouteUDP.java
|
||||
chatapp.Protocol.RunnerEcouteUDP
|
||||
chatapp/Protocol/HttpEchange.java
|
||||
chatapp.Protocol.HttpEchange
|
||||
chatapp/View/DemarrerSession.java
|
||||
chatapp.View.DemarrerSession
|
||||
|
|
|
@ -53,7 +53,7 @@ public class DataBase {
|
|||
public DataBase(ChatApp chatapp) {
|
||||
this.chatapp = chatapp;
|
||||
this.login = (String) chatapp.getConfigJSON().get("BaseDeDonnesLogin");
|
||||
this.pswd = (String) chatapp.getConfigJSON().get("BaseDeDonnesMDP");
|
||||
this.pswd = (String) chatapp.getConfigJSON().get("BaseDeDonneesMDP");
|
||||
this.dBurl = (String) chatapp.getConfigJSON().get("BaseDeDonnesURL");
|
||||
try {
|
||||
//Besoin d'installer le driver JDBC entre java IDE et le system DBMS pour faire un pont entre les deux
|
||||
|
@ -69,7 +69,10 @@ public class DataBase {
|
|||
//this.connection = DriverManager.getConnection("jdbc:mysql://localhost/POO_AL_NM?allowPublicKeyRetrieval=true&useSSL=false", "root", "1234");
|
||||
// Auriane : DECOMMENTER CETTE LIGNE
|
||||
//this.connection = DriverManager.getConnection("jdbc:mysql://localhost:8889/POO_AL_NM?allowPublicKeyRetrieval=true&useSSL=false", "root", "root");
|
||||
this.connection = DriverManager.getConnection(this.dBurl,login,pswd);
|
||||
System.out.println(this.dBurl);
|
||||
System.out.println(this.pswd);
|
||||
System.out.println(this.login);
|
||||
this.connection = DriverManager.getConnection(this.dBurl,this.login,this.pswd);
|
||||
System.out.println("Connexion Etablie");
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
|
|
|
@ -258,6 +258,9 @@ class RunnerUDP implements Runnable {
|
|||
( app.getActifUsers() ).addList(u);
|
||||
reponse += "true\n";
|
||||
}
|
||||
else{
|
||||
System.out.println("Non ajout de root dans la liste");
|
||||
}
|
||||
}
|
||||
reponse += app.getMe().toString();
|
||||
|
||||
|
@ -285,6 +288,7 @@ class RunnerUDP implements Runnable {
|
|||
app.getActifUsers().afficherListeUtilisateurs();
|
||||
}
|
||||
else{
|
||||
System.out.println("Le serveur nous a repondu");
|
||||
int max = received.split("\n").length ;
|
||||
if (max > 3 ){
|
||||
for (int i = 3 ; i < max ; i++){
|
||||
|
|
Loading…
Reference in a new issue