From 7c85b86104191c85055a8e5585006415afebf5d0 Mon Sep 17 00:00:00 2001 From: TinyYu Date: Thu, 28 Jul 2022 10:48:43 +0800 Subject: [PATCH] =?UTF-8?q?ribbon=E8=B4=9F=E8=BD=BD=E5=9D=87=E8=A1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spring-cloud-netflix-eureka-server/pom.xml | 3 ++- spring-cloud-order-server/pom.xml | 7 ++++++- .../cn/mobius/OrderServerApplication.java | 2 ++ .../java/cn/mobius/controller/OrderCtrl.java | 3 ++- .../src/main/resources/application.yml | 7 +++---- .../target/classes/application.yml | 7 +++---- .../cn/mobius/OrderServerApplication.class | Bin 1054 -> 1121 bytes .../cn/mobius/controller/OrderCtrl.class | Bin 1300 -> 1516 bytes spring-cloud-user-server/pom.xml | 2 +- .../java/cn/mobius/controller/UserCtrl.java | 6 +++++- .../src/main/resources/application-dev.yml | 17 +++++++++++++++++ .../src/main/resources/application-test.yml | 17 +++++++++++++++++ .../src/main/resources/application.yml | 5 ++++- .../target/classes/application-dev.yml | 17 +++++++++++++++++ .../target/classes/application-test.yml | 17 +++++++++++++++++ .../target/classes/application.yml | 5 ++++- .../cn/mobius/controller/UserCtrl.class | Bin 1302 -> 1617 bytes 17 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 spring-cloud-user-server/src/main/resources/application-dev.yml create mode 100644 spring-cloud-user-server/src/main/resources/application-test.yml create mode 100644 spring-cloud-user-server/target/classes/application-dev.yml create mode 100644 spring-cloud-user-server/target/classes/application-test.yml diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index fb38258..9d12734 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 ac82e35..91e6e41 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 628f248..48fffbf 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 f8fbfbb..48ff547 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 5f90571..bbf5601 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 5f90571..bbf5601 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 GIT binary patch delta 180 zcmbQo@sLC5)W2Q(7#J8#7*x3!*cfEk8DzN_u!R5rUa@iQ{=Ob%zZ zXXRsHXW*Yao7u}&gn=7qArAv1kmLZ;yg*tMh`AV;7{q|II1n>2NPtO6xQrB#FU`OJ E0J|X`BLDyZ delta 133 zcmaFJF^@y()W2Q(7#J8#7*x0z*chbQ8DzK^WEtex8RWSbSU`M*jY{5(lh-g_VN>K` zP-0Nt+{VPu$jCi;8nZnsF9SOR-{f1&UY0@(+(1)!7#M*h2ax6k(xO1j1{4tk(o78E RU{V4s$_3<00{K!53;@Dy58eO( 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 GIT binary patch delta 573 zcmZWm$x6de6g@9#n>LM8t@CUhYSS9$sSePcpeq#|R+WaTNG)j;T=@$^{0tWgQbAE% zyLIO`_zmKDtqAJkoqO-exnr*MkMQE_=fg9ADXi$wVQNU~P+$g;l6F*rC1ETC1LGPd zG)(H0PivUD9eh)^8xa*~Im(`8t>bJVZ*92FVIiM6Jv`3Yj=;cy>lPO*>$GG$DZVq? zsrXjjb~EQ&WL9&QfmzH+m^ZM1w1FDbdZro+EE-tCvbU+m(t&KTXcuw0OIf?^1P=22TSBo`HkW)-ejx*7G&&BEk;> zJOr`H8}&6`G*b{@1SYf)jf(F_E7}+dw4(z)G|@kxRcVJFq3qm4jrhv&n`H#b(AE=o z2qq&T^$B_z;TME%s8k@U%YOn^h%%BLdaG5c9rj5Kp%Yzf73Fx{=%KuqtY45uWdXTJ gA7B3-LK{^WaB@S1la=|#`kso>D3v*duk^lez delta 394 zcmX|6yGp}Q82(O9E^V4tjji`fHCAh^o>ZNRIJh}DilCEdX@^3^#KEZ#;3C8au^$il{pY)#s9RXK;M>?h!@}lp?@QY$ zVML(bjiRfTQoa7gd9T|KqgFH64%AK9zE+)fbZ~pj?eJ1H9psRYJJK_^94G|wz4YRJ z{cd3K89+cw3`Co^0x>zxDT)*X_!j3VB}EiO!+(Joa?voxX{KZmE_Ww0U>s%M1S*(- zo`z3|l3c~rj{GOchN}mp}`}u^6#(x0*THky#N3J diff --git a/spring-cloud-user-server/pom.xml b/spring-cloud-user-server/pom.xml index adee745..b464d2c 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 eef9cb5..9cf0eb6 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 0000000..bb88d2f --- /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 0000000..0f4cd31 --- /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 938af11..730545d 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 0000000..bb88d2f --- /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 0000000..0f4cd31 --- /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 938af11..730545d 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 GIT binary patch delta 741 zcmaJjHoRv6-3xx3Z56^!tz7)79aS3IC%Muk_k+_NpLjNPPX&N=t zo-?LAmrIP#S8FqtOAtTaEPi|OdQ4&x*CdkYRp`3J4cwHtg|fsHZWGe&XX&L?ZHQW7 z9>TI`2>Hy!zhz6=4Wac;yx~Bm^1thd=X7Ty^kp^*xj?XL&pHchfpjau{|O*yYGC$# z%wp`f@JTh$&ld##K5V!1mBF6ahjPoHcMLS_U>oiPB?cJFt^jH5WJcJ9-3WG)O$1mE z7A#@}6fJ6%%UO6y&?CiY-2 zciYG65HUe#l{kk6`K0cF8rY8m92aVZgA4-56xeCVcC<-GIp#xu^oMYsxz2o;U-CGj FzX2l&iMjv) delta 408 zcmYL_IZpyn6otPxFbs^3ML-mHalw7T4cu*PjD?kjl_peLNw786R)lEpFTjL2K?^Ok zGB*APL;MxSJ7DxB_uO;ta`JLN^o^Z+`+j@^7TC6FVbErXVLu}_X+~|v7Yj$|pv={Gft9^Ze+vn6JL7u-efCE#@>C78Snw{nc0H+G0twOx7Z& zSz%SP#=0WX>=q08v(M+-`ejA4K~}TLR&~R(tI8fT6?1>)J_Ch#3x>-3X5u0&HJ>P? z9}(0IZqiCrlp;nPFCpQ3vTI0A)-a+T2X92zFdckR%fasuxRa*AzhSsxm}oBj8p=9t zB*eH~rcHGq3OXc0QcFs79-<0#(JeJgNufuGhh9O0zQ$-&Sik6jzwwkDA8gTSIsQC> EADE>ye*gdg -- Gitee