diff --git a/DockerFile b/DockerFile deleted file mode 100644 index 4f1f5af6e49941c87ec99adbddca52d15e39e5c2..0000000000000000000000000000000000000000 --- a/DockerFile +++ /dev/null @@ -1,4 +0,0 @@ -FROM openjdk:8-jdk-alpine -ARG JAR_FILE=target/*.jar -COPY ${JAR_FILE} app.jar -ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/conf/setting.json b/conf/setting.json index b43aaa68217193cc6d92768ae081b71852feef76..06a247c33afc001f8d5d676d525dafb3351adbc7 100644 --- a/conf/setting.json +++ b/conf/setting.json @@ -1,7 +1,7 @@ { - "fdpurl": "http://6ddrvi64oo.lb.c1.gra7.k8s.ovh.net", - "fdpemail": "admin@cines-lab.fr", - "fdppassword": "adminadmin", - "elasticurl": "http://6ddrvi64oo.lb.c1.gra7.k8s.ovh.net", - "smartapiurl": "http://6ddrvi64oo.lb.c1.gra7.k8s.ovh.net/toto" + "fdpurl": "http://172.17.0.3:30056", + "fdpemail": "albert.einstein@example.com", + "fdppassword": "password", + "elasticurl": "http://172.17.0.3:9200", + "smartapiurl": "http://172.17.0.3:30306" } diff --git a/src/main/java/com/ffdsregisterapi/Controller.java b/src/main/java/com/ffdsregisterapi/Controller.java index 223bfd74ac910dd3b068a4e8567c414d4ea6a10f..9476f278dbf0bf99c0ff14ce8e96ef9b07684716 100644 --- a/src/main/java/com/ffdsregisterapi/Controller.java +++ b/src/main/java/com/ffdsregisterapi/Controller.java @@ -9,10 +9,16 @@ import java.io.*; @RestController public class Controller { - @CrossOrigin(origins = "http://localhost:4200") + @CrossOrigin(origins = "*") + @GetMapping(value = "/") + public String info() { + return "API ffds-resister-api"; + } + + + @CrossOrigin(origins = "*") @PostMapping (value="/api/setting") public void result(@RequestBody String data) { - try{ File ff=new File("conf/setting.json"); ff.createNewFile(); @@ -24,7 +30,7 @@ public class Controller { } - @CrossOrigin(origins = "http://localhost:4200") + @CrossOrigin(origins = "*") @GetMapping(value = "/api/setting/load", produces= MediaType.APPLICATION_JSON_VALUE) public String setting() { String chaine=""; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f900456f36e78fa7fa369ea9bffd1207d1c27b8d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +server.address=0.0.0.0