Skip to content
Snippets Groups Projects
Commit 09f5d769 authored by Marcos Viera's avatar Marcos Viera
Browse files

mayor timeout

parent 973a8880
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Frontend Angular 4/src/app/shared/config.ts
+ 6
− 4
View file @ 09f5d769
...@@ -25,10 +25,12 @@ ...@@ -25,10 +25,12 @@
// export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint'; // export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint';
// psico // psico
// export const SERVER = 'https://matefun.math.psico.edu.uy'; export const SERVER = 'https://matefun.math.psico.edu.uy';
// export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint'; export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint';
//diego docker //diego docker
export const SERVER = 'http://localhost:8080'; // export const SERVER = 'http://localhost:8080';
export const GHCI_URL = 'ws://localhost:8080/endpoint'; // export const GHCI_URL = 'ws://localhost:8080/endpoint';
\ No newline at end of file
Servidor JEE/WebContent/index.html
+ 1
− 1
View file @ 09f5d769
<!doctype html><html><head><meta charset="utf-8"><title>Proyecto MateFun</title><base href="/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> --><script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" crossorigin="anonymous"></script><!-- <!doctype html><html><head><meta charset="utf-8"><title>Proyecto MateFun</title><base href="/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> --><script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" crossorigin="anonymous"></script><!--
<script src="https://wzrd.in/standalone/function-plot@1.18.1" crossorigin="anonymous"></script> <script src="https://wzrd.in/standalone/function-plot@1.18.1" crossorigin="anonymous"></script>
--><link href="styles.8e9b76ce39821b2f5328.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.e4a1c4b538d0a92ac54f.bundle.js"></script><script type="text/javascript" src="polyfills.d50ac7c762e2eb4097d9.bundle.js"></script><script type="text/javascript" src="scripts.d01654a9119059a68b2b.bundle.js"></script><script type="text/javascript" src="vendor.d3c1758890cc7548bc7b.bundle.js"></script><script type="text/javascript" src="main.94941e96a5bd65bdeb71.bundle.js"></script></body></html> --><link href="styles.8e9b76ce39821b2f5328.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.03061d0c1b13c9057d47.bundle.js"></script><script type="text/javascript" src="polyfills.d50ac7c762e2eb4097d9.bundle.js"></script><script type="text/javascript" src="scripts.d01654a9119059a68b2b.bundle.js"></script><script type="text/javascript" src="vendor.d3c1758890cc7548bc7b.bundle.js"></script><script type="text/javascript" src="main.94941e96a5bd65bdeb71.bundle.js"></script></body></html>
\ No newline at end of file \ No newline at end of file
Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun
+ 0
− 0
View file @ 09f5d769
No preview for this file type
Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java
+ 1
− 0
View file @ 09f5d769
...@@ -86,6 +86,7 @@ public class CommandsBean { ...@@ -86,6 +86,7 @@ public class CommandsBean {
JsonReader jsonReader = Json.createReader(new StringReader(comandos)); JsonReader jsonReader = Json.createReader(new StringReader(comandos));
JsonObject comandoJson = jsonReader.readObject(); JsonObject comandoJson = jsonReader.readObject();
String token = comandoJson.getString("token"); String token = comandoJson.getString("token");
System.out.print("=======================================>" + session.getMaxIdleTimeout());
jsonReader.close(); jsonReader.close();
if (!this.proceso.isAlive()) { if (!this.proceso.isAlive()) {
restartProcess(this.cedula, token, session); restartProcess(this.cedula, token, session);
......
Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java
+ 2
− 1
View file @ 09f5d769
...@@ -75,7 +75,7 @@ public class LoginEJB { ...@@ -75,7 +75,7 @@ public class LoginEJB {
public boolean validarSesion(String token){ public boolean validarSesion(String token){
Sesion sesion = em.find(Sesion.class,token); Sesion sesion = em.find(Sesion.class,token);
Date now = new Date(); 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 true;
} }
return false; return false;
...@@ -167,6 +167,7 @@ public class LoginEJB { ...@@ -167,6 +167,7 @@ public class LoginEJB {
MoodleCoursesInfoDTO coursesInfo = null; MoodleCoursesInfoDTO coursesInfo = null;
coursesInfo = getCursesInfo(token, userInfo.getUserid(), 1l); coursesInfo = getCursesInfo(token, userInfo.getUserid(), 1l);
Long courseId = null; Long courseId = null;
for (MoodleCourseDTO course : coursesInfo.getEnrolledcourses()) { for (MoodleCourseDTO course : coursesInfo.getEnrolledcourses()) {
System.out.println(course.getShortname()); System.out.println(course.getShortname());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment