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 88a5b97..35cebde 100644 Binary files a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/ApiPassengerApplication.class and b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/ApiPassengerApplication.class differ 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 f2e2240..027f2a0 100644 Binary files a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class and b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class differ