Skip to content

Commit 51b3ccc

Browse files
committed
refactor: update RestTemplate configuration in ClientConfig
- Modified the RestTemplate bean definition in ClientConfig to use RestTemplateBuilder for improved customization and configuration. - Added UUID generation strategy to FoodMerchant entity for unique identifier management. - Removed RestTemplate bean from UserApplication as it is now centralized in ClientConfig.
1 parent 6fe570c commit 51b3ccc

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

ts-client-sdk/src/main/java/edu/fudan/common/client/config/ClientConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package edu.fudan.common.client.config;
22

3+
import org.springframework.boot.web.client.RestTemplateBuilder;
34
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
45
import org.springframework.context.annotation.Bean;
56
import org.springframework.context.annotation.Configuration;
@@ -13,7 +14,7 @@ public class ClientConfig {
1314

1415
@Bean
1516
@LoadBalanced
16-
public RestTemplate restTemplate() {
17-
return new RestTemplate();
17+
public RestTemplate restTemplate(RestTemplateBuilder builder) {
18+
return builder.build();
1819
}
1920
}

ts-food-merchant-service/src/main/java/food/entity/FoodMerchant.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
import javax.persistence.Entity;
66
import javax.persistence.GeneratedValue;
77
import javax.persistence.Id;
8-
import javax.validation.constraints.NotNull;
9-
import java.util.UUID;
108

119
@Entity
10+
@GenericGenerator(name = "jpa-uuid", strategy = "org.hibernate.id.UUIDGenerator")
1211
public class FoodMerchant {
13-
12+
@Id
13+
@GeneratedValue(generator = "jpa-uuid")
14+
@Column(length = 36)
15+
private String id;
16+
17+
public FoodMerchant() {
18+
// Default constructor
19+
}
1420
}

ts-user-service/src/main/java/user/UserApplication.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5-
import org.springframework.boot.web.client.RestTemplateBuilder;
65
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
7-
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
8-
import org.springframework.context.annotation.Bean;
96
import org.springframework.context.annotation.ComponentScan;
107
import org.springframework.context.annotation.EnableAspectJAutoProxy;
118
import org.springframework.integration.annotation.IntegrationComponentScan;
129
import org.springframework.scheduling.annotation.EnableAsync;
13-
import org.springframework.web.client.RestTemplate;
1410
import springfox.documentation.swagger2.annotations.EnableSwagger2;
1511

1612
/**
@@ -27,9 +23,4 @@ public class UserApplication {
2723
public static void main(String[] args) {
2824
SpringApplication.run(UserApplication.class, args);
2925
}
30-
@LoadBalanced
31-
@Bean
32-
public RestTemplate restTemplate(RestTemplateBuilder builder) {
33-
return builder.build();
34-
}
3526
}

0 commit comments

Comments
 (0)