From 54277d39afd2aa627047ad95270bde4e5b63496b Mon Sep 17 00:00:00 2001 From: yh <1844516659@qq.com> Date: Sun, 17 Jul 2022 16:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E6=BB=B4=E5=87=BA=E8=A1=8C=E7=BD=91?= =?UTF-8?q?=E7=BA=A6=E8=BD=A62022-=E4=B9=98=E5=AE=A2=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=80=9A=E8=BF=87feign=E8=B0=83=E7=94=A8=20service-passenger-u?= =?UTF-8?q?ser=E5=AE=9E=E7=8E=B0=20=E6=A0=B9=E6=8D=AE=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remote/ServicePassengerUserCLient.java | 5 +++++ .../mashibing/apipassenger/service/UserService.java | 12 ++++++++---- .../controller/UserController.java | 13 ++++--------- .../servicepassengeruser/service/UserService.java | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/remote/ServicePassengerUserCLient.java b/api-passenger/src/main/java/com/mashibing/apipassenger/remote/ServicePassengerUserCLient.java index 599abd5..a057282 100644 --- a/api-passenger/src/main/java/com/mashibing/apipassenger/remote/ServicePassengerUserCLient.java +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/remote/ServicePassengerUserCLient.java @@ -1,7 +1,9 @@ package com.mashibing.apipassenger.remote; +import com.mashibing.internalcommon.dto.PassengerUser; import com.mashibing.internalcommon.dto.ResponseResult; import com.mashibing.internalcommon.request.VerificationCodeDTO; +import feign.Param; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; @@ -13,4 +15,7 @@ public interface ServicePassengerUserCLient { @RequestMapping(method = RequestMethod.POST,value = "/user") public ResponseResult loginOrRegister(@RequestBody VerificationCodeDTO verificationCodeDTO); + @RequestMapping(method = RequestMethod.GET,value = "/user/{phone}") + public ResponseResult getUserByPhone(@PathVariable("phone") String phone); + } diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/service/UserService.java b/api-passenger/src/main/java/com/mashibing/apipassenger/service/UserService.java index 384ce52..56bf1df 100644 --- a/api-passenger/src/main/java/com/mashibing/apipassenger/service/UserService.java +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/service/UserService.java @@ -1,17 +1,23 @@ package com.mashibing.apipassenger.service; +import com.mashibing.apipassenger.remote.ServicePassengerUserCLient; import com.mashibing.internalcommon.constant.CommonStatusEnum; import com.mashibing.internalcommon.dto.PassengerUser; import com.mashibing.internalcommon.dto.ResponseResult; import com.mashibing.internalcommon.dto.TokenResult; +import com.mashibing.internalcommon.request.VerificationCodeDTO; import com.mashibing.internalcommon.util.JwtUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service @Slf4j public class UserService { + @Autowired + private ServicePassengerUserCLient passengerUserCLient; + public ResponseResult getUserByAccessToken(String accessToken){ log.info("accessToken = "+accessToken); @@ -23,11 +29,9 @@ public class UserService { String phone = tokenResult.getPhone(); // 根据手机号 查询用户信息 + ResponseResult userByPhone = passengerUserCLient.getUserByPhone(phone); - PassengerUser passengerUser = new PassengerUser(); - - - return ResponseResult.success(passengerUser); + return ResponseResult.success(userByPhone.getData()); } diff --git a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java index edfa4af..dd305bb 100644 --- a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java +++ b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java @@ -1,14 +1,10 @@ package com.mashibing.servicepassengeruser.controller; -import com.mashibing.internalcommon.dto.PassengerUser; import com.mashibing.internalcommon.dto.ResponseResult; import com.mashibing.internalcommon.request.VerificationCodeDTO; import com.mashibing.servicepassengeruser.service.UserService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController public class UserController { @@ -23,10 +19,9 @@ public class UserController { } - @GetMapping("/user") - public ResponseResult getUser(@RequestBody VerificationCodeDTO verificationCodeDTO) { - String passengerPhone = verificationCodeDTO.getPassengerPhone(); - return service.getUsers(passengerPhone); + @GetMapping("/user/{phone}") + public ResponseResult getUser(@PathVariable("phone") String passengerPhone){ + return service.getUsersByPhone(passengerPhone); } } diff --git a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java index 4a119dd..a4ebfed 100644 --- a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java +++ b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java @@ -42,7 +42,7 @@ public class UserService { } - public ResponseResult getUsers(String passengerPhone) { + public ResponseResult getUsersByPhone(String passengerPhone) { PassengerUser user = new PassengerUser();