code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'clerk' of https://gitee.com/beijing_hongye_huicheng/lilishop

Browse Source 
 Conflicts:
	config/application.yml
This commit is contained in:
fengtianyangyang
2022-03-03 18:05:32 +08:00
parent ae0c4aea12 a82d3fe57c
commit 5b4113be4d
70 changed files with 3089 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
View File

@@ -1,8 +1,12 @@
package cn.lili.controller.passport;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.Member;
@@ -37,6 +41,8 @@ public class MemberBuyerController {
private SmsUtil smsUtil;
@Autowired
private VerificationService verificationService;
@Autowired
private Cache cache;
@ApiOperation(value = "登录接口")
@@ -116,8 +122,13 @@ public class MemberBuyerController {
//校验短信验证码是否正确
if (smsUtil.verifyCode(mobile, VerificationEnums.FIND_USER, uuid, code)) {
//校验是否通过手机号可获取会员,存在则将会员信息存入缓存，有效时间3分钟
memberService.findByMobile(uuid, mobile);
Member member = memberService.findByMobile(mobile);
if (member == null) {
throw new ServiceException(ResultCode.USER_NOT_PHONE);
}
cache.put(CachePrefix.FIND_MOBILE + uuid, mobile, 300L);
return ResultUtil.success();
} else {
throw new ServiceException(ResultCode.VERIFICATION_SMS_CHECKED_ERROR);
}
@@ -149,7 +160,11 @@ public class MemberBuyerController {
@PutMapping("/modifyPass")
public ResultMessage<Member> modifyPass(@NotNull(message = "旧密码不能为空") @RequestParam String password,
@NotNull(message = "新密码不能为空") @RequestParam String newPassword) {
return ResultUtil.data(memberService.modifyPass(password, newPassword));
AuthUser tokenUser = UserContext.getCurrentUser();
if (tokenUser == null) {
throw new ServiceException(ResultCode.USER_NOT_LOGIN);
}
return ResultUtil.data(memberService.modifyPass(tokenUser.getId(), password, newPassword));
}