From a7edd1e42532403a5097b19c571bb9bc0d0979b6 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期一, 13 六月 2022 13:21:17 +0800 Subject: [PATCH] bug修改 --- springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 63 +++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java index dd35982..3787d73 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java @@ -5,6 +5,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.R; +import com.panzhihua.common.model.vos.community.ComActVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; @@ -20,6 +21,8 @@ import com.panzhihua.common.model.vos.LoginReturnsVO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.utlis.JWTTokenUtil; + +import static java.util.Objects.nonNull; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -108,9 +111,15 @@ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal(); String token = JWTTokenUtil.generateToken(loginUser); String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser); + ComActVO comActVO = loginUser.getComActVO(); LoginReturnVO loginReturnVO = new LoginReturnVO(); loginReturnVO.setToken(token); loginReturnVO.setRefreshToken(refeshToken); + loginReturnVO.setCommunityId(loginUser.getCommunityId()); + if (nonNull(comActVO)) { + loginReturnVO.setLat(comActVO.getLat()); + loginReturnVO.setLng(comActVO.getLng()); + } return loginReturnVO; } @@ -235,8 +244,60 @@ loginReturnVO.setToken(token); loginReturnVO.setRefreshToken(refeshToken); loginReturnVO.setUserId(loginUser.getUserId()); - loginReturnVO.setCommunityId(loginUser.getCommunityId()); return loginReturnVO; } + /** + * 便民服务商家后台登录 + * @param account 账户 + * @param password 密码 + * @return 登录结果 + */ + @Override + public LoginReturnVO loginMerchantBackStage(String account, String password) { + Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10", password)); + LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal(); + String token = JWTTokenUtil.generateToken(loginUser); + String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser); + LoginReturnVO loginReturnVO = new LoginReturnVO(); + loginReturnVO.setToken(token); + loginReturnVO.setRefreshToken(refeshToken); + return loginReturnVO; + } + + /** + * 西区大屏登录 + * @param account 账号 + * @param password 密码 + * @return 登录结果 + */ + @Override + public LoginReturnVO loginXQDP(String account, String password){ + Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15", password)); + LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal(); + String token = JWTTokenUtil.generateToken(loginUser); + String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser); + LoginReturnVO loginReturnVO = new LoginReturnVO(); + loginReturnVO.setToken(token); + loginReturnVO.setRefreshToken(refeshToken); + return loginReturnVO; + } + + /** + * 微商业街用户登录 + * @param account 账户 + * @param password 密码 + * @return 登录结果 + */ + @Override + public LoginReturnVO loginMcsUser(String account, String password) { + Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_11", password)); + LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal(); + String token = JWTTokenUtil.generateToken(loginUser); + String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser); + LoginReturnVO loginReturnVO = new LoginReturnVO(); + loginReturnVO.setToken(token); + loginReturnVO.setRefreshToken(refeshToken); + return loginReturnVO; + } } -- Gitblit v1.7.1