From d82fd875fd73a60563988e5c1d390f9ab6f58124 Mon Sep 17 00:00:00 2001 From: "12691282@qq.com" <12691282@qq.com> Date: Wed, 30 Oct 2024 09:21:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=99=AE=E9=80=9A=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UmsMemberController.java | 44 +++++++------------ .../mall/portal/service/UmsMemberService.java | 2 +- .../service/impl/UmsMemberServiceImpl.java | 22 ++++++++-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/mall-portal/src/main/java/com/buy507/mall/portal/controller/UmsMemberController.java b/mall-portal/src/main/java/com/buy507/mall/portal/controller/UmsMemberController.java index 43dd0f4..6729fd1 100644 --- a/mall-portal/src/main/java/com/buy507/mall/portal/controller/UmsMemberController.java +++ b/mall-portal/src/main/java/com/buy507/mall/portal/controller/UmsMemberController.java @@ -1,26 +1,16 @@ package com.buy507.mall.portal.controller; -import java.util.Map; - +import com.buy507.mall.common.api.CommonResult; +import com.buy507.mall.portal.domain.*; +import com.buy507.mall.portal.service.UmsMemberService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; -import com.buy507.mall.common.api.CommonResult; -import com.buy507.mall.portal.domain.FirstMemberInfoParam; -import com.buy507.mall.portal.domain.MemberInfoResult; -import com.buy507.mall.portal.domain.MemberTransferParam; -import com.buy507.mall.portal.domain.WeChatLogin; -import com.buy507.mall.portal.domain.WithdrawApplyParam; -import com.buy507.mall.portal.service.UmsMemberService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import java.util.Map; /** * 会员管理Controller @@ -34,7 +24,6 @@ public class UmsMemberController { private UmsMemberService memberService; - /* @ApiOperation("注册") @RequestMapping(value = "/register", method = RequestMethod.POST) @ResponseBody @@ -43,36 +32,33 @@ public class UmsMemberController { @RequestParam String authCode) { return memberService.register(telephone, password, authCode); } - + + @ApiOperation(value = "登录以后返回token") @RequestMapping(value = "/login", method = RequestMethod.POST) @ResponseBody public CommonResult login(@RequestParam String telephone, @RequestParam String password) { - String token = memberService.login(telephone, password); - if (token == null) { + Map tokenMap = memberService.login(telephone, password); + if (tokenMap == null) { return CommonResult.validateFailed("用户名或密码错误"); } - Map tokenMap = new HashMap<>(); - tokenMap.put("token", token); - tokenMap.put("tokenHead", tokenHead); return CommonResult.success(tokenMap); } - */ - + @ApiOperation(value = "微信登录接口，登录成功以后返回token") @RequestMapping(value = "/wechatLogin", method = RequestMethod.POST) @ResponseBody public CommonResult> wechatLogin(@RequestBody WeChatLogin weChatLogin) { - + if(StringUtils.isEmpty(weChatLogin.getCode())) { return CommonResult.failed("授权码code不能为空"); } - + Map tokenMap = memberService.wechatLogin(weChatLogin); if (tokenMap == null) { return CommonResult.unauthorized(null); } - + return CommonResult.success(tokenMap); } diff --git a/mall-portal/src/main/java/com/buy507/mall/portal/service/UmsMemberService.java b/mall-portal/src/main/java/com/buy507/mall/portal/service/UmsMemberService.java index 9cc6f80..75aa816 100644 --- a/mall-portal/src/main/java/com/buy507/mall/portal/service/UmsMemberService.java +++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/UmsMemberService.java @@ -44,7 +44,7 @@ public interface UmsMemberService { * @param password 密码 * @return 生成的JWT的token */ - String login(String telephone,String password); + Map login(String telephone,String password); /** * 微信登录 diff --git a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java index dc74213..10235ac 100644 --- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java +++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java @@ -245,8 +245,8 @@ public class UmsMemberServiceImpl implements UmsMemberService { } @Override - public String login(String telephone, String password) { - String token = null; + public Map login(String telephone, String password) { + Map tokenMap = null; //密码需要客户端加密后传递 try { UserDetails userDetails = userDetailsService.loadUserByUsername(telephone); @@ -255,12 +255,26 @@ public class UmsMemberServiceImpl implements UmsMemberService { } UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authentication); - token = jwtTokenUtil.generateToken(userDetails); + UmsMember member = ((MemberDetails) userDetails).getUmsMember(); + String token = jwtTokenUtil.generateToken(userDetails); + tokenMap = new HashMap<>(); + tokenMap.put("token", token); + tokenMap.put("tokenHead", tokenHead); + tokenMap.put("phone", member.getPhone() == null ? "" : member.getPhone()); + if(StringUtils.isEmpty(member.getPhone()) || StringUtils.isEmpty(member.getRealName())) { + tokenMap.put("flag", "0"); + } else { + tokenMap.put("flag", "1"); + } + //insertLoginLog(username); } catch (AuthenticationException e) { LOGGER.warn("登录异常:{}", e.getMessage()); } - return token; + + + + return tokenMap; } @Override