diff --git a/nacos-feign-api/pom.xml b/nacos-feign-api/pom.xml index c4d582e53d3910238d99fa90f38e752ef51aef3a..7b5a941c6f26a591a11f8cbb7e37e6f08dbb9f0f 100644 --- a/nacos-feign-api/pom.xml +++ b/nacos-feign-api/pom.xml @@ -17,8 +17,8 @@ 1.8 UTF-8 UTF-8 - 2.3.0.RELEASE - 2.2.1.RELEASE + 2.3.7.RELEASE + 2.2.2.RELEASE diff --git a/nacos-feign-api/src/main/java/com/kwan/springcloudalibaba/api/ComputeClient.java b/nacos-feign-api/src/main/java/com/kwan/springcloudalibaba/api/FeignUserService.java similarity index 87% rename from nacos-feign-api/src/main/java/com/kwan/springcloudalibaba/api/ComputeClient.java rename to nacos-feign-api/src/main/java/com/kwan/springcloudalibaba/api/FeignUserService.java index bb76de43a6ebef6e2cfb8258e743f5034d53ab14..8d2d3c9c1bc932d352eb4451148f89665e0c22a6 100644 --- a/nacos-feign-api/src/main/java/com/kwan/springcloudalibaba/api/ComputeClient.java +++ b/nacos-feign-api/src/main/java/com/kwan/springcloudalibaba/api/FeignUserService.java @@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RequestMethod; * @date : 2023/1/10 13:45 */ @FeignClient(value = "nacos-server-producer", path = "/user") -public interface ComputeClient { +public interface FeignUserService { @RequestMapping(method = RequestMethod.GET, value = "/{id}", produces = MediaType.APPLICATION_PROBLEM_JSON_VALUE) - Result selectOne(@PathVariable Integer id); + Result selectOne(@PathVariable(value = "id") Integer id); } diff --git a/nacos-server-common/pom.xml b/nacos-server-common/pom.xml index b2a73b5abc31355dffabf7a8888dcccecbd05147..e1ec47054aba598ef3f37a3f5087177a2939b65e 100644 --- a/nacos-server-common/pom.xml +++ b/nacos-server-common/pom.xml @@ -18,8 +18,8 @@ 1.8 UTF-8 UTF-8 - 2.3.0.RELEASE - 2.2.1.RELEASE + 2.3.7.RELEASE + 2.2.2.RELEASE diff --git a/nacos-server-consumer/pom.xml b/nacos-server-consumer/pom.xml index ec261b215797a9d6526c6c902ad330ca23eb116c..bee0936fb6431359c34590908927941340c1de85 100644 --- a/nacos-server-consumer/pom.xml +++ b/nacos-server-consumer/pom.xml @@ -17,8 +17,8 @@ 1.8 UTF-8 UTF-8 - 2.3.0.RELEASE - 2.2.1.RELEASE + 2.3.7.RELEASE + 2.2.2.RELEASE @@ -58,6 +58,11 @@ spring-cloud-starter-openfeign 2.0.0.RELEASE + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + 2.0.0.RELEASE + diff --git a/nacos-server-consumer/src/main/java/com/kwan/springcloudalibaba/NacosConsumerApplication.java b/nacos-server-consumer/src/main/java/com/kwan/springcloudalibaba/NacosConsumerApplication.java index 6615e96611a9b92dabae355a7b9cc7e6c4098ab0..743d7be475c3e6865f6c1dc5162ae63649bff814 100644 --- a/nacos-server-consumer/src/main/java/com/kwan/springcloudalibaba/NacosConsumerApplication.java +++ b/nacos-server-consumer/src/main/java/com/kwan/springcloudalibaba/NacosConsumerApplication.java @@ -2,12 +2,25 @@ package com.kwan.springcloudalibaba; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.web.client.RestTemplate; -//@EnableFeignClients +@EnableFeignClients +@EnableDiscoveryClient @SpringBootApplication public class NacosConsumerApplication { + @LoadBalanced + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } + + public static void main(String[] args) { SpringApplication.run(NacosConsumerApplication.class, args); } diff --git a/nacos-server-consumer/src/main/java/com/kwan/springcloudalibaba/controller/ConsumerUserController.java b/nacos-server-consumer/src/main/java/com/kwan/springcloudalibaba/controller/ConsumerUserController.java index 2bbfd3f469a64da9bcd49e83f3a7eab3ffecc985..451ee8195abed66ead6bb77dc302cba84fcf21af 100644 --- a/nacos-server-consumer/src/main/java/com/kwan/springcloudalibaba/controller/ConsumerUserController.java +++ b/nacos-server-consumer/src/main/java/com/kwan/springcloudalibaba/controller/ConsumerUserController.java @@ -1,14 +1,18 @@ package com.kwan.springcloudalibaba.controller; -import com.kwan.springcloudalibaba.api.ComputeClient; +import com.kwan.springcloudalibaba.api.FeignUserService; import com.kwan.springcloudalibaba.common.Result; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; @RefreshScope @@ -17,8 +21,29 @@ import org.springframework.web.bind.annotation.RestController; public class ConsumerUserController { @Autowired - private ComputeClient computeClient; + private LoadBalancerClient loadBalancerClient; + @Autowired + private RestTemplate restTemplate; + + /** + * feign方式调用 + */ + @Autowired + private FeignUserService computeClient; + + + @Autowired + private DiscoveryClient discoveryClient; + + @GetMapping(value = "/loadBalancerClient/{id}", produces = MediaType.APPLICATION_PROBLEM_JSON_VALUE) + public Result loadBalancerClient(@PathVariable("id") Integer id) { + //使用LoadBalanceClient和RestTemplate结合的方式来访问 + ServiceInstance serviceInstance = loadBalancerClient.choose("nacos-server-producer"); + String url = String.format("http://%s:%s/user/%s", "nacos-server-producer", serviceInstance.getPort(), id); + System.out.println("request url:" + url); + return Result.ok(restTemplate.getForObject(url, Object.class)); + } /** * http://127.0.0.1:8085/nacos/consumer/1 diff --git a/nacos-server-producer/pom.xml b/nacos-server-producer/pom.xml index 4e4a1fe207b902b9275ec52e4a5ef8f16715f7e1..60d53f44bf86246f49e8fb023ea65e19035d16fa 100644 --- a/nacos-server-producer/pom.xml +++ b/nacos-server-producer/pom.xml @@ -26,8 +26,8 @@ 1.8 UTF-8 UTF-8 - 2.3.0.RELEASE - 2.2.1.RELEASE + 2.3.7.RELEASE + 2.2.2.RELEASE diff --git a/pom.xml b/pom.xml index 3099742612981f499d710235516d87b3f9e9bfaf..f5dbcb98b87cfbcd7f546abaf603a3d826fd2de8 100644 --- a/pom.xml +++ b/pom.xml @@ -15,8 +15,8 @@ 1.8 UTF-8 UTF-8 - 2.3.0.RELEASE - 2.2.5.RELEASE + 2.3.7.RELEASE + 2.2.2.RELEASE @@ -36,13 +36,7 @@ pom import - - - - - - - + org.springframework.boot spring-boot-dependencies @@ -50,6 +44,25 @@ pom import + + + + + + + + + com.netflix.archaius + archaius-core + 0.7.6 + + + com.google.guava + guava + + + +