|
|
@@ -4,6 +4,7 @@ import java.util.Calendar;
|
|
|
import java.util.UUID;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import javax.validation.Valid;
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.log4j.Logger;
|
|
|
@@ -17,11 +18,13 @@ import com.goafanti.admin.service.AdminService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.BaseController;
|
|
|
+import com.goafanti.common.enums.UserFields;
|
|
|
import com.goafanti.common.model.User;
|
|
|
import com.goafanti.common.utils.PasswordUtil;
|
|
|
import com.goafanti.common.utils.TimeUtils;
|
|
|
import com.goafanti.common.utils.VerifyCodeUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
+import com.goafanti.user.bo.InputUser;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
@Controller
|
|
|
@@ -44,15 +47,14 @@ public class UserRegisterController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/register", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public Result register(User user, String companyName, String contacts, String mobileCode,
|
|
|
+ public Result register(@Valid InputUser user, String companyName, String contacts, String mobileCode,
|
|
|
BindingResult bindingResult) {
|
|
|
Result res = new Result();
|
|
|
- /*String sessVCode = (String) TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE);
|
|
|
- if (sessVCode == null || !sessVCode.equalsIgnoreCase(verificationCode)) {
|
|
|
- logger.info("input vcode:" + verificationCode + "| sess vcode:" + sessVCode);
|
|
|
- res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "验证码错误"));
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
+ UserFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
- }*/
|
|
|
+ }
|
|
|
// 验证码15分钟有效
|
|
|
if (TimeUtils.checkOverTime("register")) {
|
|
|
res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
|
|
|
@@ -78,13 +80,16 @@ public class UserRegisterController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
if (res.getError().isEmpty()) {
|
|
|
- user.setId(UUID.randomUUID().toString());
|
|
|
- user.setMobile(user.getMobile().trim());
|
|
|
+ User us = new User();
|
|
|
+ us.setId(UUID.randomUUID().toString());
|
|
|
+ us.setMobile(user.getMobile().trim());
|
|
|
+ us.setType(user.getType());
|
|
|
+ us.setPassword(user.getPassword());
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
- user.setCreateTime(now.getTime());
|
|
|
- user.setPassword(passwordUtil.getEncryptPwd(user));
|
|
|
- user.setLvl(0);
|
|
|
+ us.setCreateTime(now.getTime());
|
|
|
+ us.setPassword(passwordUtil.getEncryptPwd(us));
|
|
|
+ us.setLvl(0);
|
|
|
/*
|
|
|
List<Admin> admins = adminService.selectAllAdmin();
|
|
|
if (!admins.isEmpty()) {
|
|
|
@@ -92,8 +97,8 @@ public class UserRegisterController extends BaseController {
|
|
|
user.setAid(admins.get(0).getId());// 随机分配管理员
|
|
|
}
|
|
|
*/
|
|
|
- user.setAid("2");//ID为"2"的管理员
|
|
|
- userService.insertRegister(user, contacts, companyName);
|
|
|
+ us.setAid("2");//ID为"2"的管理员
|
|
|
+ userService.insertRegister(us, contacts, companyName);
|
|
|
}
|
|
|
|
|
|
return res;
|