From 417a48020ded8f238124a6a268d56c744c071fe8 Mon Sep 17 00:00:00 2001 From: topsun Date: Wed, 12 Apr 2023 18:35:11 +0800 Subject: [PATCH] =?UTF-8?q?api-passenger=E9=80=9A=E8=BF=87feign=E5=8F=AF?= =?UTF-8?q?=E5=8F=98=E5=8F=82=E6=95=B0=E6=8E=A7=E5=88=B6=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=B0=83=E7=94=A8service-verificationcode?= =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- online-taxi-public/api-passenger/pom.xml | 19 ++++++++++++++---- .../apipassenger/ApiPassengerApplication.java | 4 +++- .../controller/TestController.java | 14 ------------- .../remote/ServiceVerificatoncodeClient.java | 15 ++++++++++++++ .../service/VerificationCodeService.java | 19 +++++++++++++----- .../ApiPassengerApplication.class | Bin 865 -> 928 bytes .../service/VerificationCodeService.class | Bin 1221 -> 2108 bytes 7 files changed, 47 insertions(+), 24 deletions(-) delete mode 100644 online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/TestController.java create mode 100644 online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServiceVerificatoncodeClient.java diff --git a/online-taxi-public/api-passenger/pom.xml b/online-taxi-public/api-passenger/pom.xml index 98468d7..7660fee 100644 --- a/online-taxi-public/api-passenger/pom.xml +++ b/online-taxi-public/api-passenger/pom.xml @@ -28,10 +28,21 @@ spring-cloud-starter-alibaba-nacos-discovery - - - - + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + com.internal + internal-common + 1.0-SNAPSHOT + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + \ No newline at end of file diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/ApiPassengerApplication.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/ApiPassengerApplication.java index 4792bd1..8d2c520 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/ApiPassengerApplication.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/ApiPassengerApplication.java @@ -3,15 +3,17 @@ package com.taxi.apipassenger; import org.springframework.boot. SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * 通过 Spring Cloud 原生注解 @EnableDiscoveryClient 开启服务注册发现功能： */ @SpringBootApplication @EnableDiscoveryClient +@EnableFeignClients public class ApiPassengerApplication { - public static void main(String[] args) { + public static void main(String[] args) { SpringApplication.run(ApiPassengerApplication.class); } } diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/TestController.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/TestController.java deleted file mode 100644 index 9acc201..0000000 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/TestController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.taxi.apipassenger.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -class TestController { - - @GetMapping("/test") - public String test(){ - - return "test"; - } -} diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServiceVerificatoncodeClient.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServiceVerificatoncodeClient.java new file mode 100644 index 0000000..f9c5650 --- /dev/null +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServiceVerificatoncodeClient.java @@ -0,0 +1,15 @@ +package com.taxi.apipassenger.remote; + +import com.internal.dto.ResponseResult; +import com.internal.response.NumberResponse; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +@FeignClient("service-verificationcode") +public interface ServiceVerificatoncodeClient { + + @RequestMapping(method = RequestMethod.GET,value = "/numberCode/{size}") + ResponseResult getNumberCode(@PathVariable("size") int size); +} diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java index 12879b5..f8e36f0 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java @@ -1,24 +1,33 @@ package com.taxi.apipassenger.service; +import com.internal.dto.ResponseResult; +import com.internal.response.NumberResponse; +import com.taxi.apipassenger.remote.ServiceVerificatoncodeClient; import net.sf.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class VerificationCodeService { - public String generatorCode(String passenegerPhone){ + @Autowired + private ServiceVerificatoncodeClient serviceVerificatoncodeClient; + + public String generatorCode(String passenegerPhone) { //调用验证码服务，获取验证码 System.out.println("调用验证码服务，获取验证码"); - String code = "11111"; + ResponseResult responseResult = serviceVerificatoncodeClient.getNumberCode(6); + int code = responseResult.getData().getNumberCode(); + System.out.println("访问service-verificationcode服务，获取验证码：" + code ); //存入redis System.out.println("存入redis"); //返回值 - JSONObject result =new JSONObject(); - result.put("code",1); - result.put("message","success"); + JSONObject result = new JSONObject(); + result.put("code", code); + result.put("message", "success"); return result.toString(); } } diff --git a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/ApiPassengerApplication.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/ApiPassengerApplication.class index 88a5b971501113245d2f0ee1958221057b9f051d..35cebde1b9a0f9907213b20b2206997771cac8be 100644 GIT binary patch delta 127 zcmaFJwt!vs)W2Q(7#J8#7!mq_`NQ8D!WQWH-uAVPs}xu$WxHB&L{? zUz(zyUyz!YmYSKKr|+7Vn3R+124XwsWTxho6i?p3=*=d_!ywO~Fqx6*AtT@9$4pMF bf(%>?LX)+ab@=%hm>EQYc8LM8I0FL!*!~=L delta 81 zcmZ3${*X=f)W2Q(7#J8#7!5KXCWtXG006et4eS5_ diff --git a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class index f2e22404e35dfb3400b4354faeaa2b9a7a7b9eaa..027f2a07ed0d4738b0a20733c772d324a782f273 100644 GIT binary patch literal 2108 zcma)7-BTPz5dRGv>~U;9xBv+ejF?Cc3|T)2fgGZQ2ojHvaFG}_>aaI=4BqWt?amQ- zOj*8IQC}>zEFbj2D$6Qkw5&r-N`3bKK*&@61IwPF)XUue)de`scUb z0SsU%f}E|mNr+eW4kFao|VE;4Dp2R z<}AhEl@`y-JokO!WQ1pVBIhb$CI7=Y&d@PmaFoo61?kJhtQd0~S8*j>$7dKyxL(Hc z^PY4vX^-c`b=P~xS`^&ztu(il>#bUR+rb(uDEGSbM2f;Tjz~wUQHJ_h?*c<;oB%T% zNJvM_6mpBgyUgh}hG@dId3J$&Qt!*kkXn*-{n-40-GXO}38~A|xd+FmH7N|SnhoMp zAmJ)Pyw!Yh6UXqFflDUlkz_czdHcPMPrkkP-ObG(ZftyYs$f`*&|{ezdm! z@u%B*1D8#_f&~+gpwqw=6R+Z`f!9pDjyD)i=*HhBeUCh~&ozd_JIi>!AhRjqF${0s z`s3bbx5{1Bzp^!D)K$7-dttkO_X`tm;w`<4wxIu|Yt7L- zD4GhvbJP-tN-?U{giSvJD(jG6ty!WGAFhr0f4oAac~wDo2J?D6)?3}fH3#ZgRrzmNk_C%PMr!-|8s+${6bO zWRdKmT_edyN!F31aiz7Jb{0uSvY~Gc?8nmanOeblV zq%5ydh8p@n0Iv+4fFg!oN+F6%=);qgMi(Y<3jGv&lKf8-A0a$No;vBk>S?lihBOWI QAd;xVv!!)lo76MFzrmwq%>V!Z delta 492 zcmXYu&r%aX5XOJAf3lm+65>XXAP_)IOe97yp!^q4xxfLcq&Q;SvQj0~uwx@nd4KWl5euy@kwwU6WX?WFzT zbG+T@bbCj=cDIx0oL$R2Ao5rWS?0BF+Vj~rAuFsZ+y!HL+NqS+Le|*`* z^eGmUoU~e!guG>2v80RcsQ#*o`nz+g_fubVJvDpA48t;!F$;yLiO)+`m#8GV)l1aH z;P|2V)L_$NL~wXdV3bFaDaI&B5p($)Hjc!`53I=U<3#R`fhmF4c!!txyR|6o{5&J* zlR2nGVKg)VeX{3r(ZYyL$-_YgpCR!%DV^uBoRmbqF0!VH>b=naCd?O&3r7jR!h|48 bR)I;WWm6QstAt<#rj5_a{IdegSWn;%lL0{>