From c7e41b8d31738c521e2e49fb13fac502aa3612cd Mon Sep 17 00:00:00 2001 From: topsun Date: Wed, 19 Apr 2023 18:24:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=A4=B4=E5=83=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 23 +++++++++++++++ .../interceptor/JwtInterceptor.java | 2 -- .../remote/ServicePassengerUserClient.java | 2 +- .../apipassenger/service/UserService.java | 28 +++++++++++++++++++ .../java/com/internal}/dto/PassengerUser.java | 4 ++- .../mapper/PassengerUserMapper.java | 2 +- .../service/UserService.java | 2 +- 7 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/UserController.java create mode 100644 online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/UserService.java rename online-taxi-public/{service-passenger-user/src/main/java/com/taxi/servicepassengeruser => internal-common/src/main/java/com/internal}/dto/PassengerUser.java (84%) diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/UserController.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/UserController.java new file mode 100644 index 0000000..2e0e2e3 --- /dev/null +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/UserController.java @@ -0,0 +1,23 @@ +package com.taxi.apipassenger.controller; + +import com.internal.dto.ResponseResult; +import com.taxi.apipassenger.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.servlet.http.HttpServletRequest; + +@Service +public class UserController { + @Autowired + private UserService userService; + + @GetMapping("/usersInfo") + public ResponseResult getUserInfo(HttpServletRequest httpServletRequest){ + //从http请求中获取accessToken + String authorization = httpServletRequest.getHeader("Authorization"); + //根据accessToken查询 + return userService.getUserInfo(authorization); + } +} diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/interceptor/JwtInterceptor.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/interceptor/JwtInterceptor.java index e4a5c1b..480aad6 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/interceptor/JwtInterceptor.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/interceptor/JwtInterceptor.java @@ -1,6 +1,5 @@ package com.taxi.apipassenger.interceptor; -import com.auth0.jwt.exceptions.TokenExpiredException; import com.internal.contant.TokenConstant; import com.internal.dto.ResponseResult; import com.internal.dto.TokenResult; @@ -15,7 +14,6 @@ import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; -import java.security.SignatureException; public class JwtInterceptor implements HandlerInterceptor { diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServicePassengerUserClient.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServicePassengerUserClient.java index 6ba4203..b01fd4f 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServicePassengerUserClient.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServicePassengerUserClient.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*; @FeignClient("service-passenger-user") public interface ServicePassengerUserClient { - @RequestMapping(method = RequestMethod.POST,value = "/user") + @RequestMapping(method = RequestMethod.POST,value = " /user") ResponseResult loginOrReg(@RequestBody VerificationCodeDTO verificationCodeDTO); } diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/UserService.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/UserService.java new file mode 100644 index 0000000..b5f1e61 --- /dev/null +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/UserService.java @@ -0,0 +1,28 @@ +package com.taxi.apipassenger.service; + +import com.internal.dto.PassengerUser; +import com.internal.dto.ResponseResult; +import com.internal.dto.TokenResult; +import com.internal.util.JwtUtils; +import org.springframework.stereotype.Service; + +@Service +public class UserService { + + public ResponseResult getUserInfo(String accessToken) { + TokenResult tokenResult = null; + PassengerUser userInfoResult = null; + try { + tokenResult = JwtUtils.checkToken(accessToken); + String passengerPhone = tokenResult.getPassengerPhone(); + userInfoResult = new PassengerUser(); + + //根据手机号查询用户信息 + + + } catch (Exception e) { + throw new RuntimeException(e); + } + return ResponseResult.success(userInfoResult); + } +} diff --git a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/dto/PassengerUser.java b/online-taxi-public/internal-common/src/main/java/com/internal/dto/PassengerUser.java similarity index 84% rename from online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/dto/PassengerUser.java rename to online-taxi-public/internal-common/src/main/java/com/internal/dto/PassengerUser.java index 25eaa34..b9069b2 100644 --- a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/dto/PassengerUser.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/dto/PassengerUser.java @@ -1,4 +1,4 @@ -package com.taxi.servicepassengeruser.dto; +package com.internal.dto; import lombok.Data; @@ -21,4 +21,6 @@ public class PassengerUser { private byte state; + private String profilePhoto; + } diff --git a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/mapper/PassengerUserMapper.java b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/mapper/PassengerUserMapper.java index afde46e..945af52 100644 --- a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/mapper/PassengerUserMapper.java +++ b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/mapper/PassengerUserMapper.java @@ -1,7 +1,7 @@ package com.taxi.servicepassengeruser.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.taxi.servicepassengeruser.dto.PassengerUser; +import com.internal.dto.PassengerUser; import org.springframework.stereotype.Repository; diff --git a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/service/UserService.java b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/service/UserService.java index 3ce50fd..38818c5 100644 --- a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/service/UserService.java +++ b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/service/UserService.java @@ -1,7 +1,7 @@ package com.taxi.servicepassengeruser.service; +import com.internal.dto.PassengerUser; import com.internal.dto.ResponseResult; -import com.taxi.servicepassengeruser.dto.PassengerUser; import com.taxi.servicepassengeruser.mapper.PassengerUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;