Просмотр исходного кода

Update en el mapping y eliminadas algunas dependencias

marher22 2 месяцев назад
Родитель
Сommit
5606f24938

+ 1 - 1
.vscode/settings.json

@@ -11,7 +11,7 @@
             "password": "acd425"
         }
     ],
-    "java.configuration.updateBuildConfiguration": "interactive",
+    "java.configuration.updateBuildConfiguration": "automatic",
     "java.compile.nullAnalysis.mode": "automatic",
     "java.dependency.syncWithFolderExplorer": false
 }

+ 0 - 20
pom.xml

@@ -56,19 +56,11 @@
 			<artifactId>micrometer-registry-prometheus</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-properties-migrator</artifactId>
 		    <scope>runtime</scope>
 		</dependency>
 		<dependency>
-		    <groupId>nz.net.ultraq.thymeleaf</groupId>
-		    <artifactId>thymeleaf-layout-dialect</artifactId>
-		</dependency>
-		<dependency>
 		    <groupId>org.thymeleaf.extras</groupId>
 		    <artifactId>thymeleaf-extras-springsecurity6</artifactId>
 		</dependency>
@@ -107,18 +99,6 @@
 		</dependency>
 		
 		<dependency>
-		  <groupId>fr.opensagres.xdocreport</groupId>
-		  <artifactId>fr.opensagres.xdocreport.document.docx</artifactId>
-		  <version>2.0.0</version>
-		</dependency>
-				
-		<dependency>
-		  <groupId>fr.opensagres.xdocreport</groupId>
-		  <artifactId>fr.opensagres.xdocreport.template.velocity</artifactId>
-		  <version>2.0.0</version>
-		</dependency>	
-		
-		<dependency>
 		    <groupId>com.mysql</groupId>
 		    <artifactId>mysql-connector-j</artifactId>
 		</dependency>

+ 9 - 9
src/main/java/es/uv/saic/feing/CoreClient.java

@@ -18,34 +18,34 @@ import es.uv.saic.dto.OrganDTO;
 @FeignClient(name = "saic-core-service")
 public interface CoreClient {
     
-    @GetMapping("/getOrgByRuct/{ruct}")
+    @GetMapping("/organs/{ruct}")
     public OrganDTO getOrgByRuct(@PathVariable Integer ruct);
     
-    @GetMapping("/existsOrg/{tlugar}/{idTitulacio}")
+    @GetMapping("/organs/exist/{tlugar}/{idTitulacio}")
     public boolean existsOrg(@PathVariable String tlugar,  @PathVariable Integer idTitulacio);
 
-    @DeleteMapping("/delete/by/{enquesta}")
+    @DeleteMapping("/indicadorEnquesta/{enquesta}")
     public Integer deleteByEnquestaC(@PathVariable String enquesta);
 
     @PostMapping("/save")
     public void save(@RequestBody IndicadorEnquestaTmp ie);
 
-    @GetMapping("/checkDuplicates/{enquesta}")
+    @GetMapping("/indicadorEnquesta/checkDuplicates/{enquesta}")
     public List<IndicadorEnquestaTmpDup> checkDuplicates(@PathVariable String enquesta);
 
-    @DeleteMapping("/delete/current/{enquesta}")
+    @DeleteMapping("/indicadorEnquesta/current/{enquesta}")
     public Integer deleteFromCurrent(@PathVariable String enquesta);
     
-    @DeleteMapping("/delete/pending/{enquesta}")
+    @DeleteMapping("/indicadorEnquesta/pending/{enquesta}")
     public Integer deleteFromPending(@PathVariable String enquesta);
 
-    @GetMapping("/checkIntegrity/{enquesta}")
+    @GetMapping("/indicadorEnquesta/checkIntegrity/{enquesta}")
     public List<IndicadorEnquestaTmpDup> checkIntegrity(@PathVariable String enquesta);
 
-    @GetMapping("/consolidateByEnquesta/{enquesta}")
+    @GetMapping("/indicadorEnquesta/consolidate/{enquesta}")
     public Integer consolidateByEnquesta(@PathVariable String enquesta);
 
-    @GetMapping("/countByEnquesta/{enquesta}")
+    @GetMapping("/indicadorEnquesta/count/{enquesta}")
     public Integer countByEnquesta(@RequestParam String enquesta);
 
     @PostMapping("/sendEmail")

+ 0 - 10
src/main/resources/application-local.properties

@@ -2,16 +2,6 @@
 saic.url.domain = http://127.0.0.1
 saic.url.public = ${saic.url.data.domain}/public
 
-# JPA Debug
-#spring.jpa.show-sql=true 
-#spring.jackson.serialization.FAIL_ON_SELF_REFERENCES=false
-
-# Email config
-saic.mailer.queue.enabled = false
-saic.mailer.reminder.enabled = false
-saic.mailer.calendar.enabled = false
-saic.mailer.maxMailsPerRound = 20
-
 # Data parser config
 saic.parser.surveys.path = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/databases/
 saic.parser.surveys.enabled = false

+ 0 - 13
src/main/resources/application.properties

@@ -16,17 +16,12 @@ spring.profiles.active=@activatedProperties@
 # Multilang config
 spring.messages.encoding=UTF-8
 
-# Templates config
-spring.thymeleaf.mode=HTML
-spring.thymeleaf.encoding=UTF-8
-
 # JPA config
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 spring.jpa.hibernate.ddl-auto=none
 #spring.jpa.properties.hibernate.show_sql=true
 
-
 # Logs config
 logging.logback.rollingpolicy.max-file-size=10MB
 logging.level.root=INFO
@@ -42,14 +37,6 @@ spring.sql.init.platform=postgres
 
 #spring.jpa.show-sql=true 
 
-# Email config
-spring.main.banner-mode=off
-spring.mail.protocol=smtp
-spring.mail.host=post.uv.es
-spring.mail.port=25
-spring.mail.properties.mail.smtp.auth = false
-spring.mail.properties.mail.smtp.starttls.enable = false
-
 # Server
 server.port=0
 server.forward-headers-strategy=native