From fb54dd3c1d44d8534d06998df06450dd3f9efb25 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Tue, 17 Jul 2018 20:29:10 +0800 Subject: [PATCH] =?UTF-8?q?fix[litemall-admin-api]:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E7=94=A8=E6=88=B7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E7=A0=81=E6=9C=AA=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/web/AdminUserController.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java index a67577ad..75641ae6 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java @@ -4,6 +4,8 @@ import com.github.pagehelper.util.StringUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; +import org.linlinjava.litemall.core.util.RegexUtil; +import org.linlinjava.litemall.core.util.bcrypt.BCryptPasswordEncoder; import org.linlinjava.litemall.db.domain.LitemallUser; import org.linlinjava.litemall.db.service.LitemallUserService; import org.linlinjava.litemall.core.util.ResponseUtil; @@ -58,6 +60,26 @@ public class AdminUserController { @PostMapping("/create") public Object create(@LoginAdmin Integer adminId, @RequestBody LitemallUser user){ logger.debug(user); + + String username = user.getUsername(); + String mobile = user.getMobile(); + List userList = userService.queryByUsername(username); + if(userList.size() > 0){ + return ResponseUtil.fail(403, "用户名已注册"); + } + userList = userService.queryByMobile(mobile); + if(userList.size() > 0){ + return ResponseUtil.fail(403, "手机号已注册"); + } + if(!RegexUtil.isMobileExact(mobile)){ + return ResponseUtil.fail(403, "手机号格式不正确"); + } + + String password = user.getPassword(); + BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); + String encodedPassword = encoder.encode(password); + user.setPassword(encodedPassword); + user.setAddTime(LocalDateTime.now()); userService.add(user); return ResponseUtil.ok(user);