Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.contactBaseData.backend into KON_14-Kontakte-Modulzuordnung
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/config/CorsConfig.java b/src/main/java/org/eclipse/openk/contactbasedata/config/CorsConfig.java
index 1d82a2e..7988c90 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/config/CorsConfig.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/config/CorsConfig.java
@@ -25,7 +25,8 @@
if (corsEnabled) {
log.info("Cors enabled");
log.info("AllowedOrigins: " + allowedOrigins);
- registry.addMapping("/**");
+ registry.addMapping("/**").allowedMethods("GET", "POST", "PUT", "DELETE").allowedOrigins("*")
+ .allowedHeaders("*");
//.allowedOrigins(allowedOrigins).maxAge(1800);
} else {
log.info("Cors disabled");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index caa2f93..b1a50e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -130,7 +130,7 @@
authNAuthService:
ribbon:
- listOfServers: http://localhost:8380
+ listOfServers: http://localhost:8080
cors:
allowedOrigins: http://localhost:8080
