From e151fd2ab69d911695da519798026f98a31d020d Mon Sep 17 00:00:00 2001 From: dhanuka84 Date: Sun, 12 Sep 2021 20:41:18 +0800 Subject: [PATCH 1/4] make sql compatible with H2 --- .../kbe-brewery-beer-service/src/main/resources/schema.sql | 4 +++- .../kbe-brewery-order-service/src/main/resources/schema.sql | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sb-services/kbe-brewery-beer-service/src/main/resources/schema.sql b/sb-services/kbe-brewery-beer-service/src/main/resources/schema.sql index a3d8f23..7c14f82 100644 --- a/sb-services/kbe-brewery-beer-service/src/main/resources/schema.sql +++ b/sb-services/kbe-brewery-beer-service/src/main/resources/schema.sql @@ -1 +1,3 @@ -CREATE DATABASE IF NOT EXISTS beerservice CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +--CREATE DATABASE IF NOT EXISTS beerservice CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE SCHEMA IF NOT EXISTS beerservice; +SET COLLATION CHARSET_utf8; diff --git a/sb-services/kbe-brewery-order-service/src/main/resources/schema.sql b/sb-services/kbe-brewery-order-service/src/main/resources/schema.sql index a3d8f23..7c14f82 100644 --- a/sb-services/kbe-brewery-order-service/src/main/resources/schema.sql +++ b/sb-services/kbe-brewery-order-service/src/main/resources/schema.sql @@ -1 +1,3 @@ -CREATE DATABASE IF NOT EXISTS beerservice CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +--CREATE DATABASE IF NOT EXISTS beerservice CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE SCHEMA IF NOT EXISTS beerservice; +SET COLLATION CHARSET_utf8; From a3f7e40910e78fc82cb5d3d736dc0e1e0de3c5ed Mon Sep 17 00:00:00 2001 From: dhanuka84 Date: Sun, 12 Sep 2021 22:17:55 +0800 Subject: [PATCH 2/4] adding utc for hibernate --- README.md | 6 +++++- .../src/main/resources/application.properties | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b3ef86..01d6a9b 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,8 @@ You can access the API documentation [here](https://sfg-beer-works.github.io/bre * Subscribe to Spring Framework Guru on [YouTube](https://www.youtube.com/channel/UCrXb8NaMPQCQkT8yMP_hSkw) * Like Spring Framework Guru on [Facebook](https://www.facebook.com/springframeworkguru/) * Follow Spring Framework Guru on [Twitter](https://twitter.com/spring_guru) -* Connect with John Thompson on [LinkedIn](http://www.linkedin.com/in/springguru) \ No newline at end of file +* Connect with John Thompson on [LinkedIn](http://www.linkedin.com/in/springguru) + +mvn clean package + +mvn spring-boot:build-image diff --git a/sb-services/kbe-brewery-beer-service/src/main/resources/application.properties b/sb-services/kbe-brewery-beer-service/src/main/resources/application.properties index a9cafa6..08b1595 100644 --- a/sb-services/kbe-brewery-beer-service/src/main/resources/application.properties +++ b/sb-services/kbe-brewery-beer-service/src/main/resources/application.properties @@ -22,6 +22,7 @@ sfg.brewery.inventory-user=good sfg.brewery.inventory-password=beer spring.cache.jcache.config=classpath:ehcache.xml spring.jpa.hibernate.ddl-auto=update +spring.jpa.properties.hibernate.jdbc.time_zone=UTC spring.zipkin.enabled=true spring.cloud.discovery.enabled=false From 68a29f58ad95473d4aefd5faa18585f75ac32cfd Mon Sep 17 00:00:00 2001 From: dhanuka84 Date: Sun, 12 Sep 2021 22:21:02 +0800 Subject: [PATCH 3/4] adding utc for hibernate --- kbe-brewery-gateway/src/main/resources/application.properties | 3 ++- .../src/main/resources/application.properties | 1 + .../src/main/resources/application.properties | 3 ++- .../src/main/resources/application.properties | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kbe-brewery-gateway/src/main/resources/application.properties b/kbe-brewery-gateway/src/main/resources/application.properties index ec05993..109dd5d 100644 --- a/kbe-brewery-gateway/src/main/resources/application.properties +++ b/kbe-brewery-gateway/src/main/resources/application.properties @@ -4,4 +4,5 @@ spring.sleuth.reactor.decorate-on-each = true spring.zipkin.enabled=false logging.level.org.springframework.cloud.gateway=trace -logging.level.io.github.resilience4j=trace \ No newline at end of file +logging.level.io.github.resilience4j=trace +spring.jpa.properties.hibernate.jdbc.time_zone=UTC \ No newline at end of file diff --git a/sb-services/kbe-brewery-inventory-failover/src/main/resources/application.properties b/sb-services/kbe-brewery-inventory-failover/src/main/resources/application.properties index aecffc3..51a995c 100644 --- a/sb-services/kbe-brewery-inventory-failover/src/main/resources/application.properties +++ b/sb-services/kbe-brewery-inventory-failover/src/main/resources/application.properties @@ -1,4 +1,5 @@ spring.application.name=inventory-failover server.port=8083 logging.level.org.springframework.web=debug +spring.jpa.properties.hibernate.jdbc.time_zone=UTC diff --git a/sb-services/kbe-brewery-inventory-service/src/main/resources/application.properties b/sb-services/kbe-brewery-inventory-service/src/main/resources/application.properties index bddbbf8..f315e4c 100644 --- a/sb-services/kbe-brewery-inventory-service/src/main/resources/application.properties +++ b/sb-services/kbe-brewery-inventory-service/src/main/resources/application.properties @@ -15,4 +15,5 @@ spring.security.user.name=good spring.security.user.password=beer # Spring Data hangs when not set under Spring Boot 2.3.0 -spring.data.jpa.repositories.bootstrap-mode=default \ No newline at end of file +spring.data.jpa.repositories.bootstrap-mode=default +spring.jpa.properties.hibernate.jdbc.time_zone=UTC \ No newline at end of file diff --git a/sb-services/kbe-brewery-order-service/src/main/resources/application.properties b/sb-services/kbe-brewery-order-service/src/main/resources/application.properties index 6c655b7..e7947dd 100644 --- a/sb-services/kbe-brewery-order-service/src/main/resources/application.properties +++ b/sb-services/kbe-brewery-order-service/src/main/resources/application.properties @@ -35,4 +35,5 @@ spring.artemis.user=artemis spring.artemis.password=simetraehcapa # Spring Data hangs when not set under Spring Boot 2.3.0 -spring.data.jpa.repositories.bootstrap-mode=default \ No newline at end of file +spring.data.jpa.repositories.bootstrap-mode=default +spring.jpa.properties.hibernate.jdbc.time_zone=UTC \ No newline at end of file From 6414aac9401b57719e03505973a9b0208646ff29 Mon Sep 17 00:00:00 2001 From: dhanuka84 Date: Mon, 20 Sep 2021 00:00:22 +0800 Subject: [PATCH 4/4] mysql username fix --- k8s-scripts/beer-service-deployment.yml | 5 +++-- k8s-scripts/gateway-deployment.yml | 3 ++- k8s-scripts/inventory-deployment.yml | 5 +++-- k8s-scripts/inventory-failover-deployment.yml | 3 ++- k8s-scripts/order-service-deployment.yml | 13 +++++++++++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/k8s-scripts/beer-service-deployment.yml b/k8s-scripts/beer-service-deployment.yml index df1b303..c990051 100644 --- a/k8s-scripts/beer-service-deployment.yml +++ b/k8s-scripts/beer-service-deployment.yml @@ -23,11 +23,12 @@ spec: co.elastic.logs.json-logging/json.message_key: "message" spec: containers: - - image: springframeworkguru/kbe-brewery-beer-service + - image: kbe-brewery-beer-service:1.0-SNAPSHOT + imagePullPolicy: Never name: kbe-brewery-beer-service resources: {} env: - - name: SPRING_DATASOURCE_USER + - name: SPRING_DATASOURCE_USERNAME value: root - name: SPRING_DATASOURCE_PASSWORD value: dbpassword diff --git a/k8s-scripts/gateway-deployment.yml b/k8s-scripts/gateway-deployment.yml index de4adbb..293647b 100644 --- a/k8s-scripts/gateway-deployment.yml +++ b/k8s-scripts/gateway-deployment.yml @@ -18,7 +18,8 @@ spec: app: gateway spec: containers: - - image: springframeworkguru/kbe-brewery-gateway + - image: kbe-brewery-gateway:1.0-SNAPSHOT + imagePullPolicy: Never name: kbe-brewery-gateway resources: {} status: {} diff --git a/k8s-scripts/inventory-deployment.yml b/k8s-scripts/inventory-deployment.yml index 8849d5f..a94a6d4 100644 --- a/k8s-scripts/inventory-deployment.yml +++ b/k8s-scripts/inventory-deployment.yml @@ -23,11 +23,12 @@ spec: co.elastic.logs.json-logging/json.message_key: "message" spec: containers: - - image: springframeworkguru/kbe-brewery-inventory-service + - image: kbe-brewery-inventory-service:1.0-SNAPSHOT + imagePullPolicy: Never name: kbe-brewery-inventory-service resources: {} env: - - name: SPRING_DATASOURCE_USER + - name: SPRING_DATASOURCE_USERNAME value: root - name: SPRING_DATASOURCE_PASSWORD value: dbpassword diff --git a/k8s-scripts/inventory-failover-deployment.yml b/k8s-scripts/inventory-failover-deployment.yml index 24528cf..df9dc3f 100644 --- a/k8s-scripts/inventory-failover-deployment.yml +++ b/k8s-scripts/inventory-failover-deployment.yml @@ -23,7 +23,8 @@ spec: co.elastic.logs.json-logging/json.message_key: "message" spec: containers: - - image: springframeworkguru/kbe-brewery-inventory-failover + - image: kbe-brewery-inventory-failover:1.0-SNAPSHOT + imagePullPolicy: Never name: kbe-brewery-inventory-failover resources: {} status: {} diff --git a/k8s-scripts/order-service-deployment.yml b/k8s-scripts/order-service-deployment.yml index a5bf506..2fba345 100644 --- a/k8s-scripts/order-service-deployment.yml +++ b/k8s-scripts/order-service-deployment.yml @@ -23,18 +23,27 @@ spec: co.elastic.logs.json-logging/json.message_key: "message" spec: containers: - - image: springframeworkguru/kbe-brewery-order-service + - image: kbe-brewery-order-service:1.0-SNAPSHOT + imagePullPolicy: Never name: kbe-brewery-order-service resources: {} env: - name: SPRING_DATASOURCE_USER value: root + - name: SPRING_DATASOURCE_USERNAME + value: root - name: SPRING_DATASOURCE_PASSWORD value: dbpassword + - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME + value: com.mysql.cj.jdbc.Driver + - name: SPRING_JPA_PROPERTIES_HIBERNATE_DIALECT + value: "org.hibernate.dialect.MySQL57InnoDBDialect" + - name: SPRING_JPA_DATABASEPLATFORM + value: "org.hibernate.dialect.MySQL57InnoDBDialect" - name: SPRING_JPA_HIBERNATE_DDL-AUTO value: update - name: SPRING_DATASOURCE_URL - value: jdbc:mysql://mysql:3306/beerservice?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC + value: jdbc:mysql://mysql:3306/beerservice?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false - name: SPRING_ARTEMIS_HOST value: jms - name: SFG_BREWERY_BEER-SERVICE-HOST