From 2bda9e785a1016eedd31b104ce72226fdce05e71 Mon Sep 17 00:00:00 2001
From: Leonardo Vannucci <leonardo.vannucci@grupposistematica.it>
Date: Tue, 18 Sep 2018 10:33:21 +0200
Subject: [PATCH] fix
---
dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties | 7 +++++--
dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java | 1 +
dg1cloud-core/src/main/resources/application.properties | 6 ++++--
dg1cloud-core/src/main/java/logback.xml | 1 +
dg1cloud-core/pom.xml | 9 +++++++--
5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/dg1cloud-core/pom.xml b/dg1cloud-core/pom.xml
index 0b10067..68a9c00 100644
--- a/dg1cloud-core/pom.xml
+++ b/dg1cloud-core/pom.xml
@@ -33,6 +33,7 @@
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
+ <version>4.0.1</version>
</dependency>
<dependency>
@@ -165,11 +166,15 @@
<configuration>
<schemaLanguage>WSDL</schemaLanguage>
<generatePackage>it.isharedoc.schemas.instance</generatePackage>
- <schemas>
+ <schemaDirectory>${project.basedir}/etc/isd</schemaDirectory>
+ <schemaIncludes>
+ <schemaInclude>webserviceInstance3.wsdl</schemaInclude>
+ </schemaIncludes>
+ <!-- <schemas>
<schema>
<url>https://democorepa3.grupposistematica.it/isharedoc/webservices/webserviceInstance3.wsdl</url>
</schema>
- </schemas>
+ </schemas> -->
</configuration>
</plugin>
<!-- end::wsdl[] -->
diff --git a/dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties b/dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties
index 5dada09..2c00cfe 100644
--- a/dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties
+++ b/dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties
@@ -1,7 +1,7 @@
application.version=v0.0.1beta
-repository.base.upload.path=/etc/dg1cloud/repository/upload
-repository.base.storage.path=/etc/dg1cloud/repository/storage
+repository.base.upload.path=/etc/digione/dg1cloud/repository/upload
+repository.base.storage.path=/etc/digione/dg1cloud/repository/storage
repository.scanner.job.fixed.delay=60000
repository.scanner.job.initial.delay=1000
@@ -19,6 +19,9 @@
google.recaptcha.url=https://www.google.com/recaptcha/api/siteverify
google.recaptcha.key=6LfCHmkUAAAAAFa1KmVtPFecItBriBHx1qmKHcVS
google.recaptcha.secret=6LfCHmkUAAAAAKXdXWO36daHnItKQwkEvXOpX6YY
+#per albotest.grupposistematica.it
+#google.recaptcha.key=6LfjtnAUAAAAAHigYi-lWdvvd6cDb13R-8JEL9xr
+#google.recaptcha.secret=6LfjtnAUAAAAAJzerDHkZ_0niXTjIk_tvEehIzE4
isharedoc.ws.endpoint.instance=https://democorepa3.grupposistematica.it/isharedoc/webservices/instanceService3/
isharedoc.ws.username=admin
diff --git a/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java b/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
index b9a13e3..a617078 100644
--- a/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
+++ b/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
@@ -101,6 +101,7 @@
modelAndView.addObject("message", "Richiesta inviata con successo");
modelAndView.addObject("alertClass", "alert-success");
} catch (Exception e) {
+ logger.error("Errore invio email", e);
modelAndView.addObject("message", "Richiesta inviata con successo, ma non รจ stato possibile inviare la conferma tramite email");
modelAndView.addObject("alertClass", "alert-warning");
}
diff --git a/dg1cloud-core/src/main/java/logback.xml b/dg1cloud-core/src/main/java/logback.xml
index 3fa9e77..48bea4e 100644
--- a/dg1cloud-core/src/main/java/logback.xml
+++ b/dg1cloud-core/src/main/java/logback.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
diff --git a/dg1cloud-core/src/main/resources/application.properties b/dg1cloud-core/src/main/resources/application.properties
index cb2ffd3..725dc40 100644
--- a/dg1cloud-core/src/main/resources/application.properties
+++ b/dg1cloud-core/src/main/resources/application.properties
@@ -1,6 +1,6 @@
spring.datasource.url=jdbc:postgresql://localhost:5432/dg1cloud
-spring.datasource.username=postgres
-spring.datasource.password=passero
+#spring.datasource.username=postgres
+#spring.datasource.password=passero
spring.datasource.driver-class-name=org.postgresql.Driver
spring.datasource.tomcat.initial-size=10
spring.datasource.tomcat.max-wait=30000
@@ -19,6 +19,8 @@
#server.address=vannux.grupposistematica.it
server.error.include-stacktrace=always
+logging.config=file:/etc/digione/dg1cloud/logback.xml
+
logging.level.it.digione.dg1cloud=DEBUG
logging.level.org.springframework.ws=TRACE
--
Gitblit v1.6.2