trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
@@ -211,6 +211,49 @@ } /** * 重置登录账号 */ @RequestMapping("resetUserName") public Object resetUserName(String username, String password, String safeword, String verifcode, String type) { String userId = SecurityUtils.getUser().getUserId(); if (StringUtils.isEmptyString(userId)) { throw new YamiShopBindException("请先登录"); } // 重置类型:1/手机;2/邮箱; String error = this.validateParam(username, verifcode, password, type); if (!StringUtils.isNullOrEmpty(error)) { throw new YamiShopBindException(error); } if (StringUtils.isEmptyString(safeword)) { throw new YamiShopBindException("资金密码不能为空"); } userService.resetUserName(userId ,username, password, safeword, verifcode, type); User secUser = userService.findByUserName(username); Log log = new Log(); log.setCategory(Constants.LOG_CATEGORY_SECURITY); log.setLog("用户重置登录账号,ip[" + IPHelper.getIpAddr() + "]"); log.setUserId(secUser.getUserId()); log.setUsername(username); logService.save(log); UserInfoInTokenBO userInfoInToken = new UserInfoInTokenBO(); userInfoInToken.setUserId(secUser.getUserId()); userInfoInToken.setSysType(SysTypeEnum.ORDINARY.value()); userInfoInToken.setEnabled(secUser.getStatus() == 1); tokenStore.deleteAllToken(String.valueOf(SysTypeEnum.ORDINARY.value()), String.valueOf(secUser.getUserId())); TokenInfoVO tokenInfoVO = tokenStore.storeAndGetVo(userInfoInToken); this.userService.online(secUser.getUserId()); this.ipMenuService.saveIpMenuWhite(IPHelper.getIpAddr()); Map<String, Object> data = new HashMap<String, Object>(); data.put("token", tokenInfoVO.getAccessToken()); data.put("username", secUser.getUserName()); data.put("usercode", secUser.getUserName()); secUser.setUserLastip(IPHelper.getIpAddr()); userService.updateById(secUser); return Result.succeed(data); } /** * 设置资金密码(注册时) */ @PostMapping("/setSafewordReg") trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -1541,5 +1541,45 @@ userLevel = 1; } return userLevel; } @Override public void resetUserName(String userId, String username, String password, String safeword, String verifcode, String type) { User party = getById(userId); if (party == null) { throw new YamiShopBindException("账号不存在"); } String authCode = identifyingCodeTimeWindowService.getAuthCode(username.trim()); if ((authCode == null) || (!authCode.equals(verifcode))) { throw new YamiShopBindException("验证码不正确"); } if (!passwordEncoder.matches(password, party.getLoginPassword())) { throw new YamiShopBindException("密码不正确!"); } if (!passwordEncoder.matches(safeword, party.getSafePassword())) { throw new YamiShopBindException("资金密码不正确!"); } if (findByUserName(username) != null) { throw new YamiShopBindException("用户名重复"); } party.setUserName(username); save(party); if (type.equals("1")) { // 手机注册 // if (StringUtils.isEmptyString(reg.getUsername()) || !Strings.isNumber(reg.getUsername()) || reg.getUsername().length() > 15) { if (StringUtils.isEmptyString(username) || username.length() > 20) { throw new YamiShopBindException("请输入正确的手机号码"); } this.savePhone(username, party.getUserId()); } else { // 邮箱注册 if (!Strings.isEmail(username)) { throw new YamiShopBindException("请输入正确的邮箱地址"); } if (findPartyByEmail(username) != null) { throw new YamiShopBindException("邮箱已重复"); } this.saveEmail(username, party.getUserId()); } } } trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java
@@ -139,4 +139,7 @@ Page getAgentAllStatistics(long current,long size,String startTime, String endTime,String userName, String userId); void resetUserName(String userId, String username, String password, String safeword, String verifcode, String type); }