From 2203388b65cde87f3d3d8aa7e71f30b308eb4b85 Mon Sep 17 00:00:00 2001 From: topsun Date: Wed, 19 Apr 2023 16:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8Ctoken=E5=88=B7=E6=96=B0=E8=81=94?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/InterceptorConfig.java | 1 + .../interceptor/JwtInterceptor.java | 15 --------------- .../service/VerificationCodeService.java | 2 +- .../service/VerificationCodeService.class | Bin 4250 -> 4250 bytes .../main/java/com/internal/util/JwtUtils.java | 10 +++------- 5 files changed, 5 insertions(+), 23 deletions(-) diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/interceptor/InterceptorConfig.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/interceptor/InterceptorConfig.java index 06a371a..ed21e18 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/interceptor/InterceptorConfig.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/interceptor/InterceptorConfig.java @@ -24,6 +24,7 @@ public class InterceptorConfig implements WebMvcConfigurer { .addPathPatterns("/**")//拦截的路径 .excludePathPatterns("/noauthTest") .excludePathPatterns("/user") + .excludePathPatterns("/token-refresh") .excludePathPatterns("/verification-code-check") .excludePathPatterns("/verification-code");//不拦截的路径 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 1fae85f..e4a5c1b 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 @@ -27,21 +27,8 @@ public class JwtInterceptor implements HandlerInterceptor { boolean resultBoolean = true; String resultStr = ""; String token = request.getHeader("Authorization"); - //解析token TokenResult tokenResult = JwtUtils.checkToken(token); -// try { -// //解析token -// tokenResult =JwtUtils.parseToken(token); -// } catch (SignatureException exception) { -// resultStr = "token sign error "; -// resultBoolean = false; -// }catch (TokenExpiredException ex){ -// resultStr = "token time out"; -// resultBoolean = false; -// }catch (Exception exception){ -// resultBoolean = false; -// } if(tokenResult == null){ resultStr = "token invalid "; resultBoolean = false; @@ -57,14 +44,12 @@ public class JwtInterceptor implements HandlerInterceptor { resultBoolean = false; } } - // if(!resultBoolean){ PrintWriter outPrintWriter = response.getWriter(); JSONObject jsonObject = JSONObject.fromObject(ResponseResult.fail(resultStr)); outPrintWriter.print(jsonObject.toString()); } - return resultBoolean; } } 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 a639373..9e30bc9 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 @@ -41,7 +41,7 @@ public class VerificationCodeService { //key,value,过期时间 String key = RedisPrefixUtils.getVerificationCodePrefixKey(passenegerPhone); //存入redis - stringRedisTemplate.opsForValue().set(key, numberCode + "", 2, TimeUnit.MINUTES); + stringRedisTemplate.opsForValue().set(key, numberCode + "", 5, TimeUnit.MINUTES); //通过短信服务商，将对应的验证码发送到手机上。阿里短信服务，腾讯短信通，容联 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 cef1aa8151b28e361a750a8aa4492de6a5421231..f0a1e9b39849c870556f5e646d82ab288d07bd00 100644 GIT binary patch delta 12 TcmbQGI7@LtIwR}G3?l&m8@vP0 delta 12 TcmbQGI7@LtIwRA@3?l&m8?6J( diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/util/JwtUtils.java b/online-taxi-public/internal-common/src/main/java/com/internal/util/JwtUtils.java index 9374688..6d113fe 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/util/JwtUtils.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/util/JwtUtils.java @@ -22,25 +22,21 @@ public class JwtUtils { private static final String JWT_TOKEN_TYPE = "tokenType"; + private static final String JWT_TOKEN_TIME = "tokenTime"; + //生成token public static String generatorToken(String passengerPhone,String identity,String tokenType) { Map map = new HashMap<>(); map.put(JWT_KEY_PHONE,passengerPhone); map.put(JWT_KEY_IDENTITY,identity); map.put(JWT_TOKEN_TYPE,tokenType); - //token过期时间 - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DATE, 1); -// Date date = calendar.getTime(); - + map.put(JWT_TOKEN_TIME,Calendar.getInstance().getTime().toString()); JWTCreator.Builder builder = JWT.create(); map.forEach( (k, v) -> { builder.withClaim(k, v); } ); - //整合过期时间 -// builder.withExpiresAt(date);//token保持到redis，已经设置有效期时间 //生成token String sign = builder.sign(Algorithm.HMAC256(SIGN)); return sign;