|
|
@@ -39,7 +39,6 @@ public class RegisterController {
|
|
|
private AttachService attachService;
|
|
|
@Autowired
|
|
|
private UserService userService;
|
|
|
-
|
|
|
@RequestMapping(method = RequestMethod.GET)
|
|
|
public String getSignupPage() {
|
|
|
return "signup";
|
|
|
@@ -82,7 +81,7 @@ public class RegisterController {
|
|
|
return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 激活码验证激活
|
|
|
*/
|
|
|
@@ -169,7 +168,7 @@ public class RegisterController {
|
|
|
headers.add("Content-Type", "application/text; charset=utf-8");
|
|
|
return new ResponseEntity<Boolean>(enterpriseService.isSaasUrlUseable(enSaasUrl), headers, HttpStatus.OK);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 根据用户输入的登录账号获取用户的部分信息
|
|
|
* @param userName
|
|
|
@@ -180,17 +179,20 @@ public class RegisterController {
|
|
|
public ModelMap getUserInfoByUserName(String userName) {
|
|
|
ModelMap map = new ModelMap();
|
|
|
User user = userService.findShieldUuserInfo(userName);
|
|
|
+ map.put("userTel", user.getUserTel());
|
|
|
+ map.put("userPwd", user.getUserPwd());
|
|
|
map.put("enName", StringUtil.getSheildString(user.getEnterprise().getEnName(), 5, 2));
|
|
|
map.put("userName", StringUtil.getSheildString(user.getUserName(), 1, 1));
|
|
|
map.put("userUU", user.getUserUU());
|
|
|
map.put("userEmail", StringUtil.getSheildString(user.getUserEmail(), user.getUserEmail().indexOf("@") - 2, 2));
|
|
|
User admin = userService.findUserByUserUU(user.getEnterprise().getEnAdminuu());
|
|
|
SystemSession.setUser(user);
|
|
|
- if(admin != null)
|
|
|
- map.put("adminEmail", StringUtil.getSheildString(admin.getUserEmail(), admin.getUserEmail().indexOf("@") - 2, 2));
|
|
|
+ if (admin != null)
|
|
|
+ map.put("adminEmail",
|
|
|
+ StringUtil.getSheildString(admin.getUserEmail(), admin.getUserEmail().indexOf("@") - 2, 2));
|
|
|
return map;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 忘记密码,发送验证邮件
|
|
|
* @param userName
|
|
|
@@ -201,7 +203,7 @@ public class RegisterController {
|
|
|
public void sendForgetEmail(Long userUU, String type, HttpServletRequest request) {
|
|
|
userService.sendForgetEmai(userUU, type, request);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 验证忘记密码,并返回新的验证码(用于重设密码时验证)
|
|
|
* @param userName
|
|
|
@@ -214,7 +216,7 @@ public class RegisterController {
|
|
|
map.put("checkcode", userService.checkForget(userUU, checkcode));
|
|
|
return map;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 忘记密码,发送验证邮件
|
|
|
* @param userName
|