diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts index b7a3aec0d258082f52877e4b0f1007f5d9013676..e9d12f0dbbbb52b918844ec8b9e329609f5ce7f6 100755 --- a/Frontend Angular 4/src/app/shared/config.ts +++ b/Frontend Angular 4/src/app/shared/config.ts @@ -25,10 +25,12 @@ // export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint'; // psico -// export const SERVER = 'https://matefun.math.psico.edu.uy'; -// export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint'; +export const SERVER = 'https://matefun.math.psico.edu.uy'; +export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint'; //diego docker -export const SERVER = 'http://localhost:8080'; -export const GHCI_URL = 'ws://localhost:8080/endpoint'; \ No newline at end of file +// export const SERVER = 'http://localhost:8080'; +// export const GHCI_URL = 'ws://localhost:8080/endpoint'; + + diff --git a/Servidor JEE/WebContent/index.html b/Servidor JEE/WebContent/index.html index 6210752b487ba3f855a462766f1ef4683573d559..0bc59c1e8752efb74ab6854d231fb45d247c8068 100644 --- a/Servidor JEE/WebContent/index.html +++ b/Servidor JEE/WebContent/index.html @@ -1,4 +1,4 @@ Proyecto MateFun
\ No newline at end of file + -->
\ No newline at end of file diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun index dccd8f0c3c6398833a7f6ed6e4b70a7ef4442bf5..3b29a02164cf53d2dc50f625cb4513eb4d9bc2e3 100755 Binary files a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun differ diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java index ae467daf346c41c7450fae9b6afc8886666a72f9..ed3785c53fbb68643f44acaeb7c2c418d2842604 100644 --- a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java +++ b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java @@ -86,6 +86,7 @@ public class CommandsBean { JsonReader jsonReader = Json.createReader(new StringReader(comandos)); JsonObject comandoJson = jsonReader.readObject(); String token = comandoJson.getString("token"); + System.out.print("=======================================>" + session.getMaxIdleTimeout()); jsonReader.close(); if (!this.proceso.isAlive()) { restartProcess(this.cedula, token, session); diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java index d1f5ce11bf9b8909a90a62f3e384ad85e0368cc6..16e8ea92e7015fd9139d9f474ba24cac1eec289c 100644 --- a/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java +++ b/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java @@ -75,7 +75,7 @@ public class LoginEJB { public boolean validarSesion(String token){ Sesion sesion = em.find(Sesion.class,token); Date now = new Date(); - if(sesion != null && sesion.getTimestamp().getTime() > now.getTime()-60*60*1000){ + if(sesion != null && sesion.getTimestamp().getTime() > now.getTime()-60*60*4000){ return true; } return false; @@ -167,6 +167,7 @@ public class LoginEJB { MoodleCoursesInfoDTO coursesInfo = null; coursesInfo = getCursesInfo(token, userInfo.getUserid(), 1l); + Long courseId = null; for (MoodleCourseDTO course : coursesInfo.getEnrolledcourses()) { System.out.println(course.getShortname());