Resolved conflicts

2024-10-12 21:33:14 +05:30
parent 3102300f64 f0d1af1842
commit c518eccb9c
40 changed files with 1409 additions and 60 deletions
--- a/src/main/resources/application-production.properties
+++ b/src/main/resources/application-production.properties
@@ -6,12 +6,12 @@ spring.datasource.driver-class-name=org.postgresql.Driver

 # JPA Configuration
 spring.h2.console.enabled=true
-base-url=http://bandi-api.gepafin.it
+base-url=https://bandi-api.gepafin.it

 isVatCheckGloballyDisabled = false
 #fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com
-fe.base.url=http://bandi.gepafin.it
+fe.base.url=https://bandi.gepafin.it
 #SPID configuration
 spid.ipd.base.url=https://login.regione.umbria.it
 active.profile.folder=production
-isMailSendingEnabled = true
+isMailSendingEnabled = true