From 8d5d9025507f4325eb4e715dc3bd534127b39993 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 23 Jun 2021 16:47:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passport/AdminUserManagerController.java | 16 +++++++++++++--- .../passport/StorePassportController.java | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index c6f25213..ccd1d8f5 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -8,6 +8,8 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.token.Token; import cn.lili.common.utils.PageUtil; import cn.lili.common.utils.StringUtils; +import cn.lili.common.verification.enums.VerificationEnums; +import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -49,11 +51,19 @@ public class AdminUserManagerController { @Autowired private DepartmentService departmentService; + @Autowired + private VerificationService verificationService; @GetMapping(value = "/login") @ApiOperation(value = "登录管理员") - public ResultMessage login(String username, String password) { - return ResultUtil.data(adminUserService.login(username, password)); + public ResultMessage login(@NotNull(message = "用户名不能为空") @RequestParam String username, + @NotNull(message = "密码不能为空") @RequestParam String password, + @RequestHeader String uuid) { + if (verificationService.check(uuid, VerificationEnums.LOGIN)) { + return ResultUtil.data(adminUserService.login(username, password)); + } else { + throw new ServiceException(ResultCode.VERIFICATION_ERROR); + } } @@ -152,7 +162,7 @@ public class AdminUserManagerController { } adminUserService.saveAdminUser(adminUser, roles); } catch (Exception e) { - log.error("添加用户错误",e); + log.error("添加用户错误", e); } return ResultUtil.success(); } diff --git a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java index 52474ff5..d9c97762 100644 --- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java +++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java @@ -1,7 +1,11 @@ package cn.lili.controller.passport; +import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; +import cn.lili.common.exception.ServiceException; +import cn.lili.common.verification.enums.VerificationEnums; +import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; @@ -32,6 +36,8 @@ public class StorePassportController { @Autowired private MemberService memberService; + @Autowired + private VerificationService verificationService; @ApiOperation(value = "登录接口") @ApiImplicitParams({ @@ -40,8 +46,12 @@ public class StorePassportController { }) @PostMapping("/userLogin") public ResultMessage userLogin(@NotNull(message = "用户名不能为空") @RequestParam String username, - @NotNull(message = "密码不能为空") @RequestParam String password) { - return ResultUtil.data(this.memberService.usernameStoreLogin(username, password)); + @NotNull(message = "密码不能为空") @RequestParam String password, @RequestHeader String uuid) { + if (verificationService.check(uuid, VerificationEnums.LOGIN)) { + return ResultUtil.data(this.memberService.usernameStoreLogin(username, password)); + } else { + throw new ServiceException(ResultCode.VERIFICATION_ERROR); + } } @ApiOperation(value = "修改密码")