From 249558d93a6b63089af0c1af2ab643ea1ec1e86b Mon Sep 17 00:00:00 2001 From: yovinchen Date: Sat, 24 Feb 2024 23:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20h5=20=E7=AB=AF=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xlcs/common/utils/JwtHelper.java | 27 +++++++++---------- .../auth/LoginMvcConfigurerAdapter.java | 2 +- xlcs-parent/service/service-user/pom.xml | 6 +++++ .../xlcs/user/service/LoginService.java | 2 +- .../user/service/impl/UserServiceImpl.java | 3 +++ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/JwtHelper.java b/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/JwtHelper.java index fb4e1e4..9d3d7e9 100644 --- a/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/JwtHelper.java +++ b/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/JwtHelper.java @@ -14,27 +14,26 @@ import java.util.Date; */ public class JwtHelper { - private static final long tokenExpiration = 365L * 24 * 60 * 60 * 1000; + private static final long tokenExpiration = 5 * 60 * 1000; private static final String tokenSignKey = "xlcs"; public static String createToken(Long userId, String userName) { - String token = Jwts.builder() - .setSubject("xlcs-USER") - .setExpiration(new Date(System.currentTimeMillis() + tokenExpiration)) - .claim("userId", userId) - .claim("userName", userName) - .signWith(SignatureAlgorithm.HS512, tokenSignKey) - .compressWith(CompressionCodecs.GZIP) - .compact(); - return token; + return Jwts.builder() + .setSubject("xlcs-USER") + .setExpiration(new Date(System.currentTimeMillis() + tokenExpiration)) + .claim("userId", userId) + .claim("userName", userName) + .signWith(SignatureAlgorithm.HS512, tokenSignKey) + .compressWith(CompressionCodecs.GZIP) + .compact(); } public static Long getUserId(String token) { if (StringUtils.isEmpty(token)) return null; Jws claimsJws = Jwts.parser() - .setSigningKey(tokenSignKey) - .parseClaimsJws(token); + .setSigningKey(tokenSignKey) + .parseClaimsJws(token); Claims claims = claimsJws.getBody(); Integer userId = (Integer) claims.get("userId"); return userId.longValue(); @@ -45,8 +44,8 @@ public class JwtHelper { if (StringUtils.isEmpty(token)) return ""; Jws claimsJws = Jwts.parser() - .setSigningKey(tokenSignKey) - .parseClaimsJws(token); + .setSigningKey(tokenSignKey) + .parseClaimsJws(token); Claims claims = claimsJws.getBody(); return (String) claims.get("userName"); } diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/LoginMvcConfigurerAdapter.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/LoginMvcConfigurerAdapter.java index bab7d05..cd14ea1 100644 --- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/LoginMvcConfigurerAdapter.java +++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/LoginMvcConfigurerAdapter.java @@ -24,7 +24,7 @@ public class LoginMvcConfigurerAdapter extends WebMvcConfigurationSupport { public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(new UserLoginInterceptor(redisTemplate)) .addPathPatterns("/api/**") - .excludePathPatterns("/api/user/weixin/wxLogin/*"); + .excludePathPatterns("/api/user/weixin/wxLogin/*", "/api/user/h5/login/*"); super.addInterceptors(registry); } } diff --git a/xlcs-parent/service/service-user/pom.xml b/xlcs-parent/service/service-user/pom.xml index ae247af..ae36d4a 100644 --- a/xlcs-parent/service/service-user/pom.xml +++ b/xlcs-parent/service/service-user/pom.xml @@ -16,5 +16,11 @@ 8 UTF-8 + + + org.springframework.boot + spring-boot-starter-actuator + + diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginService.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginService.java index e73d77f..58d711a 100644 --- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginService.java +++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginService.java @@ -36,7 +36,7 @@ public class LoginService { public Map login(String phone, String password) { User user = userService.getOne(new LambdaQueryWrapper().eq(User::getPhone, phone) .eq(User::getPassword, MD5.encrypt(password))); - if (user.getPhone() == null) { + if (user == null) { throw new xlcsException(ResultCodeEnum.ACCOUNT_PASSWORD_ERROR); } // 根据userId查询配送点和配送员信息 diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java index 37157bf..32c6c78 100644 --- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java +++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yovinchen.xlcs.common.auth.AuthContextHolder; import com.yovinchen.xlcs.common.exception.xlcsException; import com.yovinchen.xlcs.common.result.ResultCodeEnum; +import com.yovinchen.xlcs.common.utils.MD5; import com.yovinchen.xlcs.enums.UserType; import com.yovinchen.xlcs.model.user.Leader; import com.yovinchen.xlcs.model.user.User; @@ -164,7 +165,9 @@ public class UserServiceImpl extends ServiceImpl implements Us //构建用户信息 user = new User(); user.setNickName(phone); + user.setPhone(phone); user.setPhotoUrl(""); + user.setPassword(MD5.encrypt(password)); user.setUserType(UserType.USER); user.setIsNew(1); baseMapper.insert(user);