From c5aab751df0ea1adba7a1eeab3a5605b2a051c61 Mon Sep 17 00:00:00 2001 From: Nicola Brunner Date: Sat, 25 Apr 2020 16:33:00 +0200 Subject: [PATCH] fix update sensor --- .../java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java | 2 +- src/main/resources/application-dev.properties | 2 +- src/main/resources/application-prod.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java index a84e705..397bb1e 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java @@ -38,7 +38,7 @@ public abstract class Device { @OneToMany(mappedBy = "device", orphanRemoval = true) @GsonExclude - // @SocketGsonExclude + @SocketGsonExclude private Set> triggers = new HashSet<>(); /** diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 3c77362..8720442 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -27,7 +27,7 @@ spring.mail.properties.mail.smtp.writetimeout=5000 email.registrationSubject=Complete your SmartHut.sm registration email.registration=To confirm your registration, please click here: email.registrationPath=http://localhost:8080/register/confirm-account?token= -email.registrationRedirect=http://localhost:3000 +email.registrationRedirect=http://localhost:3000/login email.resetpasswordSubject=SmartHut.sm password reset email.resetpassword=To reset your password, please click here: diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 5888106..1727673 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -32,7 +32,7 @@ spring.mail.properties.mail.smtp.writetimeout=5000 email.registrationSubject=Complete your SmartHut.sm registration email.registration=To confirm your registration, please click here: email.registrationPath=${BACKEND_URL}/register/confirm-account?token= -email.registrationRedirect=${FRONTEND_URL} +email.registrationRedirect=${FRONTEND_URL}/login # Password reset email properties