Skip to content

Commit b744d61

Browse files
committed
Merge branch 'release/4.9'
2 parents f021aa3 + c9a1675 commit b744d61

File tree

9 files changed

+49
-24
lines changed

9 files changed

+49
-24
lines changed

store-base/store-build-chassis/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>2.3.0.M4</version>
9+
<version>2.3.0.RC1</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.web.reactive.function.client.WebClient;
88

99
@SpringBootApplication
10-
public class EdgeServerApplication {
10+
public class EdgeServer {
1111

1212
@Bean
1313
@LoadBalanced
@@ -16,7 +16,7 @@ public WebClient.Builder loadBalancedWebClientBuilder() {
1616
}
1717

1818
public static void main(String[] args) {
19-
SpringApplication.run(EdgeServerApplication.class, args);
19+
SpringApplication.run(EdgeServer.class, args);
2020
}
2121

2222
}

store-cloud-infra/edge-server/src/main/resources/application.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ spring:
3535
predicates:
3636
- Path=/eureka/**
3737

38+
server:
39+
error:
40+
include-message: always
41+
include-binding-errors: always
42+
3843
eureka:
3944
instance:
4045
hostname: localhost
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@SpringBootTest(
1010
webEnvironment = RANDOM_PORT,
1111
properties = {"eureka.client.enabled: false"})
12-
class EdgeServerApplicationTests {
12+
class EdgeServerTests {
1313

1414
@Test
1515
void contextLoads() {

store-cloud-infra/eureka-server/src/main/resources/application.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ spring:
55
# It is recommended switching to BlockingLoadBalancerClient instead.
66
cloud.loadbalancer.ribbon.enabled: false
77

8-
server.port: 8761
8+
server:
9+
port: 8761
10+
## Should be included to show message, if not error message will be empty
11+
error:
12+
include-message: always
13+
include-binding-errors: always
914

1015
logging.level:
1116
com.netflix:

store-services/product-service/src/main/resources/application.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ spring:
4545

4646
server:
4747
port: 9081
48+
error:
49+
include-message: always
50+
include-binding-errors: always
4851

4952
logging.level:
5053
web: DEBUG

store-services/recommendation-service/src/main/resources/application.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ spring:
4444

4545
server:
4646
port: 9082
47+
error:
48+
include-message: always
49+
include-binding-errors: always
4750

4851
logging.level:
4952
web: DEBUG

store-services/review-service/src/main/resources/application.yaml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ spring:
55
open-in-view: false
66
database: MYSQL
77
properties.hibernate.dialect: org.hibernate.dialect.MySQL8Dialect
8-
# Strongly recommend to set this property to "none" or with flyway to "validate" in a
9-
# production environment!
8+
# Strongly recommend to set this property to "none" or with flyway to "validate" in a
9+
# production environment!
1010
hibernate.ddl-auto: none
1111
datasource:
1212
## You often do not need to specify the driver-class-name,
@@ -41,13 +41,13 @@ spring:
4141
defaultBinder: rabbit
4242
default.contentType: application/json
4343
bindings.input:
44-
destination: reviews
45-
group: reviewsGroup
46-
consumer:
47-
maxAttempts: 3
48-
backOffInitialInterval: 500
49-
backOffMaxInterval: 1000
50-
backOffMultiplier: 2.0
44+
destination: reviews
45+
group: reviewsGroup
46+
consumer:
47+
maxAttempts: 3
48+
backOffInitialInterval: 500
49+
backOffMaxInterval: 1000
50+
backOffMultiplier: 2.0
5151
rabbit.bindings.input.consumer:
5252
autoBindDlq: true
5353
republishToDlq: true
@@ -66,16 +66,20 @@ app:
6666
rabbitmq.host: 127.0.0.1
6767
kafka.broker: 127.0.0.1
6868

69-
server.port: 9083
69+
server:
70+
port: 9083
71+
error:
72+
include-message: always
73+
include-binding-errors: always
7074

7175
logging.level:
72-
web: DEBUG
73-
root: INFO
74-
com.siriusxi.ms.store: DEBUG
75-
org:
76-
hibernate:
77-
SQL: DEBUG
78-
type.descriptor.sql.BasicBinder: TRACE
76+
web: DEBUG
77+
root: INFO
78+
com.siriusxi.ms.store: DEBUG
79+
org:
80+
hibernate:
81+
SQL: DEBUG
82+
type.descriptor.sql.BasicBinder: TRACE
7983

8084
management:
8185
info.git:
@@ -108,7 +112,8 @@ spring:
108112
datasource:
109113
url: "jdbc:mysql://${app.database.host}/${app.database.schema}"
110114

111-
server.port: 8080
115+
server:
116+
port: 8080
112117

113118
eureka:
114119
instance:

store-services/store-service/src/main/resources/application.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Server configs
2-
server.port: 9080
2+
server:
3+
port: 9080
4+
error:
5+
include-message: always
6+
include-binding-errors: always
37

48
spring:
59
application.name: store

0 commit comments

Comments
 (0)