|
|
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.aliyuncs.http.HttpRequest;
|
|
|
import com.goafanti.admin.service.AdminService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
@@ -57,17 +58,13 @@ public class UserRegisterController extends BaseController {
|
|
|
@RequestMapping(value = "/register", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
public Result register(@Valid InputUser user, String companyName, String contacts, String mobileCode,String uuid,
|
|
|
- BindingResult bindingResult) {
|
|
|
+ BindingResult bindingResult,HttpRequest req) {
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
UserFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(uuid)){
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "手机串码不能为空"));
|
|
|
- return res;
|
|
|
- }
|
|
|
// 验证码15分钟有效
|
|
|
if (TimeUtils.checkOverTime("register")) {
|
|
|
res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
|
|
|
@@ -120,15 +117,14 @@ public class UserRegisterController extends BaseController {
|
|
|
*/
|
|
|
us.setAid("2");//ID为"2"的管理员
|
|
|
userService.insertRegister(us,companyName,contacts);
|
|
|
- registerEasemobAfterRegister(uuid,us.getId());//开通环信账号
|
|
|
+ User u1 = userService.selectByPrimaryKey(us.getId());
|
|
|
+ if(StringUtils.isNoneBlank(uuid))registerEasemobAfterRegister(uuid,u1);//开通环信账号
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- private void registerEasemobAfterRegister(String uuid,String uid){
|
|
|
- User u = TokenManager.getUserToken();
|
|
|
- if(u != null){
|
|
|
+ private void registerEasemobAfterRegister(String uuid,User u){
|
|
|
JSONObject resultObj = new JSONObject();
|
|
|
String easemobName = String.valueOf(u.getNumber());
|
|
|
String easemobPass = new SimpleHash("md5", u.getId(), null, 1).toHex();
|
|
|
@@ -138,8 +134,7 @@ public class UserRegisterController extends BaseController {
|
|
|
easemobUtils.sendLater(
|
|
|
new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
|
|
|
//绑定账号
|
|
|
- messageService.addJpushEasemobAccount(uuid,uid,easemobName,easemobPass);
|
|
|
+ messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);
|
|
|
|
|
|
- }
|
|
|
}
|
|
|
}
|