diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index fb3825867119fef112fe037b0c94979b7ffbe32f..9d127343eba57c7ae4107f9f31a15dc4b6060511 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -13,11 +13,12 @@ spring-cloud-netflix-eureka-server - + org.springframework.cloud spring-cloud-starter-netflix-eureka-server + \ No newline at end of file diff --git a/spring-cloud-order-server/pom.xml b/spring-cloud-order-server/pom.xml index ac82e351a21f9ed2e0ed9bd023054d53444a8b82..91e6e41fc84f1a42776c18f7aab1fd2dc435f74f 100644 --- a/spring-cloud-order-server/pom.xml +++ b/spring-cloud-order-server/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud - spring-cloud-netflix-eureka-client + spring-cloud-starter-netflix-eureka-client @@ -29,5 +29,10 @@ spring-cloud-common 1.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + \ No newline at end of file diff --git a/spring-cloud-order-server/src/main/java/cn/mobius/OrderServerApplication.java b/spring-cloud-order-server/src/main/java/cn/mobius/OrderServerApplication.java index 628f248bc92aa998fca4f0515265cf79c602d2fb..48fffbf99eadb4d39708360bee0569d3fd540c14 100644 --- a/spring-cloud-order-server/src/main/java/cn/mobius/OrderServerApplication.java +++ b/spring-cloud-order-server/src/main/java/cn/mobius/OrderServerApplication.java @@ -2,6 +2,7 @@ package cn.mobius; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.context.annotation.Bean; import org.springframework.web.client.RestTemplate; @@ -14,6 +15,7 @@ public class OrderServerApplication { } @Bean + @LoadBalanced // 开启负载均衡 public RestTemplate getRestTemplate() { return new RestTemplate(); } diff --git a/spring-cloud-order-server/src/main/java/cn/mobius/controller/OrderCtrl.java b/spring-cloud-order-server/src/main/java/cn/mobius/controller/OrderCtrl.java index f8fbfbb2d2ef1c9570b4da2e4ab77149641f147a..48ff547789326dc02cf57393065f16f4612f5fdc 100644 --- a/spring-cloud-order-server/src/main/java/cn/mobius/controller/OrderCtrl.java +++ b/spring-cloud-order-server/src/main/java/cn/mobius/controller/OrderCtrl.java @@ -17,7 +17,8 @@ public class OrderCtrl { @GetMapping("/getByUserId/{id}") public User getByUserId(@PathVariable Long id){ - String url = "http://localhost:1020/user/getByUserId/1"; + // 直接使用服务名请求 + String url = "http://user-server/user/getByUserId/" + id; return restTemplate.getForObject(url, User.class); } diff --git a/spring-cloud-order-server/src/main/resources/application.yml b/spring-cloud-order-server/src/main/resources/application.yml index 5f90571784ee85a876875796b05531c6b2de5557..bbf5601ac7f0a8d2982c13b62232f1222fdd785b 100644 --- a/spring-cloud-order-server/src/main/resources/application.yml +++ b/spring-cloud-order-server/src/main/resources/application.yml @@ -1,14 +1,13 @@ #注册到EurekaServer eureka: - # 客户端配置 client: serviceUrl: - # eureka服务端地址 defaultZone: http://localhost:1010/eureka/ + instance: + prefer-ip-address: true #使用ip地址进行注册 + instance-id: order-server:1030 #实例ID spring: application: - # 服务名称 name: order-server -# 服务端端口号 server: port: 1030 \ No newline at end of file diff --git a/spring-cloud-order-server/target/classes/application.yml b/spring-cloud-order-server/target/classes/application.yml index 5f90571784ee85a876875796b05531c6b2de5557..bbf5601ac7f0a8d2982c13b62232f1222fdd785b 100644 --- a/spring-cloud-order-server/target/classes/application.yml +++ b/spring-cloud-order-server/target/classes/application.yml @@ -1,14 +1,13 @@ #注册到EurekaServer eureka: - # 客户端配置 client: serviceUrl: - # eureka服务端地址 defaultZone: http://localhost:1010/eureka/ + instance: + prefer-ip-address: true #使用ip地址进行注册 + instance-id: order-server:1030 #实例ID spring: application: - # 服务名称 name: order-server -# 服务端端口号 server: port: 1030 \ No newline at end of file diff --git a/spring-cloud-order-server/target/classes/cn/mobius/OrderServerApplication.class b/spring-cloud-order-server/target/classes/cn/mobius/OrderServerApplication.class index 3d2b2843dd3aad3dcf259fddafcedc5a49c5a3ae..d24316cf506886d181edbf203c579e0552690c43 100644 Binary files a/spring-cloud-order-server/target/classes/cn/mobius/OrderServerApplication.class and b/spring-cloud-order-server/target/classes/cn/mobius/OrderServerApplication.class differ diff --git a/spring-cloud-order-server/target/classes/cn/mobius/controller/OrderCtrl.class b/spring-cloud-order-server/target/classes/cn/mobius/controller/OrderCtrl.class index ae8607fe0838f0a08d4a257321d9101fcc7a65ec..665365e43c128331fea346fb6e3044f941c01e01 100644 Binary files a/spring-cloud-order-server/target/classes/cn/mobius/controller/OrderCtrl.class and b/spring-cloud-order-server/target/classes/cn/mobius/controller/OrderCtrl.class differ diff --git a/spring-cloud-user-server/pom.xml b/spring-cloud-user-server/pom.xml index adee745116444d426d46354282e458f4e12620f9..b464d2cd69b1c7788437581b200763b12471ba85 100644 --- a/spring-cloud-user-server/pom.xml +++ b/spring-cloud-user-server/pom.xml @@ -15,7 +15,7 @@ org.springframework.cloud - spring-cloud-netflix-eureka-client + spring-cloud-starter-netflix-eureka-client org.springframework.boot diff --git a/spring-cloud-user-server/src/main/java/cn/mobius/controller/UserCtrl.java b/spring-cloud-user-server/src/main/java/cn/mobius/controller/UserCtrl.java index eef9cb5e8e3fef7ef950e9926e78ac67e48989a1..9cf0eb63ac212f6baa25b53d87c145836699466c 100644 --- a/spring-cloud-user-server/src/main/java/cn/mobius/controller/UserCtrl.java +++ b/spring-cloud-user-server/src/main/java/cn/mobius/controller/UserCtrl.java @@ -1,6 +1,7 @@ package cn.mobius.controller; import domain.User; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -10,8 +11,11 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/user") public class UserCtrl { + @Value("${server.port}") + private int port; + @GetMapping("/getByUserId/{id}") public User getByUserId(@PathVariable Long id) { - return User.builder().username("测试").age(12).info("测试user信息").build(); + return User.builder().username("测试").age(12).info("端口:" + port).build(); } } diff --git a/spring-cloud-user-server/src/main/resources/application-dev.yml b/spring-cloud-user-server/src/main/resources/application-dev.yml new file mode 100644 index 0000000000000000000000000000000000000000..bb88d2fe9411a7d705d37c4a312bc3ffe76c52eb --- /dev/null +++ b/spring-cloud-user-server/src/main/resources/application-dev.yml @@ -0,0 +1,17 @@ +#注册到EurekaServer +eureka: + # 客户端配置 + client: + serviceUrl: + # eureka服务端地址 + defaultZone: http://localhost:1010/eureka/ + instance: + prefer-ip-address: true #使用ip地址进行注册 + instance-id: user-server:1022 #实例ID +spring: + application: + # 服务名称 + name: user-server +# 服务端端口号 +server: + port: 1022 \ No newline at end of file diff --git a/spring-cloud-user-server/src/main/resources/application-test.yml b/spring-cloud-user-server/src/main/resources/application-test.yml new file mode 100644 index 0000000000000000000000000000000000000000..0f4cd31b19f9d7e637d26f5c80682daf17bc1d2e --- /dev/null +++ b/spring-cloud-user-server/src/main/resources/application-test.yml @@ -0,0 +1,17 @@ +#注册到EurekaServer +eureka: + # 客户端配置 + client: + serviceUrl: + # eureka服务端地址 + defaultZone: http://localhost:1010/eureka/ + instance: + prefer-ip-address: true #使用ip地址进行注册 + instance-id: user-server:1021 #实例ID +spring: + application: + # 服务名称 + name: user-server +# 服务端端口号 +server: + port: 1021 \ No newline at end of file diff --git a/spring-cloud-user-server/src/main/resources/application.yml b/spring-cloud-user-server/src/main/resources/application.yml index 938af1198c809ee09e489e67bd69a66bbd87eed5..730545dc22ad77bd26974f6001aac658abc14fa8 100644 --- a/spring-cloud-user-server/src/main/resources/application.yml +++ b/spring-cloud-user-server/src/main/resources/application.yml @@ -5,10 +5,13 @@ eureka: serviceUrl: # eureka服务端地址 defaultZone: http://localhost:1010/eureka/ + instance: + prefer-ip-address: true #使用ip地址进行注册 + instance-id: user-server:1020 #实例ID spring: application: # 服务名称 name: user-server # 服务端端口号 server: - port: 1020 \ No newline at end of file + port: 1020 diff --git a/spring-cloud-user-server/target/classes/application-dev.yml b/spring-cloud-user-server/target/classes/application-dev.yml new file mode 100644 index 0000000000000000000000000000000000000000..bb88d2fe9411a7d705d37c4a312bc3ffe76c52eb --- /dev/null +++ b/spring-cloud-user-server/target/classes/application-dev.yml @@ -0,0 +1,17 @@ +#注册到EurekaServer +eureka: + # 客户端配置 + client: + serviceUrl: + # eureka服务端地址 + defaultZone: http://localhost:1010/eureka/ + instance: + prefer-ip-address: true #使用ip地址进行注册 + instance-id: user-server:1022 #实例ID +spring: + application: + # 服务名称 + name: user-server +# 服务端端口号 +server: + port: 1022 \ No newline at end of file diff --git a/spring-cloud-user-server/target/classes/application-test.yml b/spring-cloud-user-server/target/classes/application-test.yml new file mode 100644 index 0000000000000000000000000000000000000000..0f4cd31b19f9d7e637d26f5c80682daf17bc1d2e --- /dev/null +++ b/spring-cloud-user-server/target/classes/application-test.yml @@ -0,0 +1,17 @@ +#注册到EurekaServer +eureka: + # 客户端配置 + client: + serviceUrl: + # eureka服务端地址 + defaultZone: http://localhost:1010/eureka/ + instance: + prefer-ip-address: true #使用ip地址进行注册 + instance-id: user-server:1021 #实例ID +spring: + application: + # 服务名称 + name: user-server +# 服务端端口号 +server: + port: 1021 \ No newline at end of file diff --git a/spring-cloud-user-server/target/classes/application.yml b/spring-cloud-user-server/target/classes/application.yml index 938af1198c809ee09e489e67bd69a66bbd87eed5..730545dc22ad77bd26974f6001aac658abc14fa8 100644 --- a/spring-cloud-user-server/target/classes/application.yml +++ b/spring-cloud-user-server/target/classes/application.yml @@ -5,10 +5,13 @@ eureka: serviceUrl: # eureka服务端地址 defaultZone: http://localhost:1010/eureka/ + instance: + prefer-ip-address: true #使用ip地址进行注册 + instance-id: user-server:1020 #实例ID spring: application: # 服务名称 name: user-server # 服务端端口号 server: - port: 1020 \ No newline at end of file + port: 1020 diff --git a/spring-cloud-user-server/target/classes/cn/mobius/controller/UserCtrl.class b/spring-cloud-user-server/target/classes/cn/mobius/controller/UserCtrl.class index 14e170f5fcabeca94e0990a3579160b5c97b37d6..f86b9ad11af14db6be69a7f2fd55345819b74147 100644 Binary files a/spring-cloud-user-server/target/classes/cn/mobius/controller/UserCtrl.class and b/spring-cloud-user-server/target/classes/cn/mobius/controller/UserCtrl.class differ