Paramétrage pour déploiement minotaur

src/main/java/fr/inra/oresing/OreSiNg.java

@@ -49,8 +49,8 @@ public class OreSiNg implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(final CorsRegistry registry) {
         registry.addMapping("/api/**")
-                .allowedOrigins("http://localhost:8080")
-                .allowedMethods("POST", "PUT", "GET", "DELETE")
+
+                .allowedOrigins("http://localhost:8080", "https://147.100.179.128", "https://data-minotaur.eu", "http://147.100.179.128", "http://data-minotaur.eu")
                 .allowCredentials(true);
     }
 

src/main/resources/application.properties

 #Configuration for development mode
 #Need to be overridden in final bundle
 spring.config.import=optional:file:.env-default[.properties],optional:file:.env[.properties]
-server.port = ${SERVER_PORT}
-server.servlet-path=${SERVER_SERVLET-PATH}}
+server.port = ${MINOTAUR_SERVER_PORT}
+server.servlet-path=${MINOTAUR_SERVER_SERVLET-PATH}}
 
 springdoc.swagger-ui.path=/swagger-ui.html
 springdoc.api-docs.path=/api-docs
 
-spring.datasource.url=jdbc:postgresql://${DB_HOST_PORT}/${DB_DATABASE}?preparedStatementCacheQueries=0
-spring.datasource.username=${DB_USER}
-spring.datasource.password=${DB_PASSWORD}
+spring.datasource.url=jdbc:postgresql://${MINOTAUR_HOST_PORT}/${MINOTAUR_DATABASE}?preparedStatementCacheQueries=0
+spring.datasource.username=${MINOTAUR_USER}
+spring.datasource.password=${MINOTAUR_PASSWORD}
 #logging.level.org.springframework.jdbc=TRACE
 
 spring_datasource_hikari_connection-timeout=${SPRING_DATASOURCE_HIKARI_CONNNECTION-TIMEOUT}

ui/src/config.js

 //const V1 = '147.100.179.128';
-const V2 = "147.100.179.122";
-const LOCALHOST = "localhost:8081";
+const V2 = "data-minotaur.eu";
+const V2_HTTP = "https://"
+const LOCALHOST_HTTP = "http://"
+const WSS = "wss://"
+const LOCALHOST = "http://localhost:8081";
 const DEPLOIEMENT = V2;
 
 const SERVER = process.env.NODE_ENV === "production" ? DEPLOIEMENT : LOCALHOST;
+const HTTP = process.env.NODE_ENV === "production" ? V2_HTTP : LOCALHOST_HTTP;
 console.log("********************" + SERVER + "***************************");
 const constants = {
-  BASE: "http://" + SERVER + "/api/v1/",
-  API_URL: "http://" + SERVER + "/api/v1/",
-  WS_URL: "wss://" + SERVER + "/api/V1/",
-  SWAGGER: "http://" + SERVER + "/swagger-ui.html",
+  BASE: HTTP + SERVER + "/api/v1/",
+  API_URL: HTTP + SERVER + "/api/v1/",
+  WS_URL: WSS + SERVER + "/api/V1/",
+  SWAGGER: HTTP + SERVER + "/swagger-ui.html",
 };
 export default constants;