diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java b/bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java index bd1d8e5..75c5110 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java +++ b/bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java @@ -95,7 +95,7 @@ public class SysLoginService { public void register(RegisterBody registerBody) { log.info("开始进行注册==============="); long startTime = System.currentTimeMillis(); // 记录开始时间 - String result = convertAndAppend(registerBody.getNickName(), registerBody.getMobile()); + //String result = convertAndAppend(registerBody.getNickName(), registerBody.getMobile()); int contactType = getContactType(registerBody.getMobile()); if (contactType == 0) { @@ -111,7 +111,7 @@ public class SysLoginService { }else { throw new ServiceException("请输入正确的联系方式"); } - registerBody.setUsername(result); + //registerBody.setUsername(result); if (StringUtils.isAnyBlank(registerBody.getUsername(), registerBody.getPassword()) || registerBody.getUsername().length() < UserConstants.USERNAME_MIN_LENGTH || registerBody.getUsername().length() > UserConstants.USERNAME_MAX_LENGTH) { @@ -240,8 +240,8 @@ public class SysLoginService { //通过用户名获取人员信息 LoginUser loginUserNew = new LoginUser(); SysUser sysUserNew = new SysUser(); - String resultName = convertAndAppend(sysUser.getNickName(), sysUser.getPhonenumber()); - R userResult = remoteUserService.getUserInfo(resultName, SecurityConstants.INNER); + //String resultName = convertAndAppend(sysUser.getNickName(), sysUser.getPhonenumber()); + R userResult = remoteUserService.getUserInfo(sysUser.getUserName(), SecurityConstants.INNER); if (userResult.getData() == null || R.FAIL == userResult.getCode()) { log.info("登录用户不存在,进行创建----"); @@ -249,7 +249,8 @@ public class SysLoginService { registerBody.setUsername(sysUser.getUserName()); registerBody.setNickName(sysUser.getNickName()); registerBody.setMobile(sysUser.getPhonenumber()); - registerBody.setDeptId(1L); + // 送变电工程有限公司 + registerBody.setDeptId(100L); registerBody.setPassword("Bonus@Max2024"); //获取配置中的初始密码 AjaxResult result = configService.getConfigKey("sys.user.initPassword"); @@ -263,14 +264,14 @@ public class SysLoginService { register(registerBody); log.info("注册成功!"); //查询用户信息 - userResult = remoteUserService.getUserInfo(resultName, SecurityConstants.INNER); + userResult = remoteUserService.getUserInfo(sysUser.getUserName(), SecurityConstants.INNER); loginUserNew = userResult.getData(); sysUserNew = loginUserNew.getSysUser(); log.info("获取用户信息成功!{}",loginUserNew.getSysUser()); //初始化一个角色 Long[] roleIds = new Long[5]; - // 将数组的第一个元素赋值为 2 - roleIds[0] = 2L; + // 将数组的第一个元素赋值为 36,流程角色 + roleIds[0] = 36L; log.info("开始绑定角色信息{}",roleIds); remoteUserService.insertAuthRole(sysUserNew.getUserId(),roleIds,SecurityConstants.INNER); log.info("角色信息绑定成功!");