From c64d08a5d238a91fae7063f46eac2a66681047f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sat, 29 Aug 2020 11:46:40 +0200 Subject: [PATCH] Changed enum from [1,7] to [0,6] and in FileToDatabaseMigrator changed WeekDay.getDay(day - 1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- README.md | 25 ++----------------- .../configutils/FileToDatabaseMigrator.java | 2 +- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 6d62888..3ccfb1f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Nastepnie w `restservice/src/main/resources/application.properties` nalezy podac ``` spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect -spring.datasource.url=jdbc:mysql://:3306/test +spring.datasource.url=jdbc:mysql://localhost:3306/test spring.datasource.username=root spring.datasource.password=example spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver @@ -19,28 +19,7 @@ spring.jpa.hibernate.ddl-auto=create server.port=1285 ``` -Bywa, ze te ip sie zmienia np o 1 wiec zeby sprawdzic jakie jest obecne ip robimy `docker ps`, ktory nam pokaze wszystkie kontenery na naszym komputerze - -np> - -``` -CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -ebff6c560e06 mariadb "docker-entrypoint.s…" 10 days ago Up 18 minutes 3306/tcp backend_db_1 -9370827a43fe adminer "entrypoint.sh docke…" 10 days ago Up 18 minutes 0.0.0.0:8080->8080/tcp backend_adminer_1 -958c2793699c mongo "docker-entrypoint.s…" 4 weeks ago Up 46 minutes 127.0.0.1:27030->27017/tcp i-par_db_1 - -``` - -I nastepnie wpisujemy te komende ktora nam zwroci ip podanego kontenera - -``` -docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' container_name_or_id -``` - -W tym przykladzie `container_name_or_id` to backend_db_1 - -Nastepnie - +Następnym krokiem jest odpalenie poniższych komend w terminalu. ``` cd restservice mvn spring-boot:run diff --git a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java index 6a0513d..d2bf5ee 100644 --- a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java +++ b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java @@ -77,7 +77,7 @@ public class FileToDatabaseMigrator { String sym_str = sym.toString().trim(); int day = (int) Double.parseDouble(day_cell.toString()); - WeekDay group_day = WeekDay.getDay(day); + WeekDay group_day = WeekDay.getDay(day - 1); String room = room_cell.toString().trim(); int time = this.parseTimeToInt(time_cell.toString());