|
|
@@ -144,21 +144,21 @@ public class UserApiController extends BaseApiController {
|
|
|
public Result updateMobile(String mobile, String mobileCode) {
|
|
|
Result res = new Result();
|
|
|
if (StringUtils.isBlank(mobile)) {
|
|
|
- res.getError().add(buildError(ErrorConstants.MOBILE_EMPTY_ERROR, "手机号不能为�?!"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.MOBILE_EMPTY_ERROR, "手机号不能为空!"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
if (StringUtils.isBlank(mobileCode)) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "手机验证�?"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "手机验证码为空?"));
|
|
|
return res;
|
|
|
}
|
|
|
- // 验证�?15分钟有效
|
|
|
+ // 验证码15分钟有效
|
|
|
if (TimeUtils.checkOverTime("register")) {
|
|
|
- res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失�?"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
|
|
|
return res;
|
|
|
}
|
|
|
if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)) {
|
|
|
- res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错�?"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误?"));
|
|
|
return res;
|
|
|
}
|
|
|
User user = userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
@@ -194,7 +194,7 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 公共可替�?
|
|
|
+ * 公共可替代
|
|
|
*/
|
|
|
@RequestMapping(value = "/avatar/uploadReplace", method = RequestMethod.POST)
|
|
|
public Result avatarReplace(HttpServletRequest req, String sign) {
|
|
|
@@ -345,14 +345,14 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
if (StringUtils.isBlank(pro.getCompanyName())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到单位名�?", "单位名称"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到单位名称", "单位名称"));
|
|
|
return res;
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 团体会员�?术能�?
|
|
|
+ * 团体会员技术能力
|
|
|
*
|
|
|
* @param orgTech
|
|
|
* @return
|
|
|
@@ -570,7 +570,7 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 个人会员职业信息/团体会员�?术能�?
|
|
|
+ * 个人会员职业信息/团体会员技术能力
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -608,7 +608,7 @@ public class UserApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/nickname", method = RequestMethod.GET)
|
|
|
public Result nickname() {
|
|
|
User u = userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
- Assert.notNull(u, "用户不存�?");
|
|
|
+ Assert.notNull(u, "用户不存在");
|
|
|
return res().data(u.getNickname());
|
|
|
}
|
|
|
|
|
|
@@ -658,7 +658,7 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 登陆后返回用户基本信�?
|
|
|
+ * 登陆后返回用户基本信息
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -687,7 +687,7 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 个人实名认证流程下一�?
|
|
|
+ * 个人实名认证流程下一步
|
|
|
*/
|
|
|
@RequestMapping(value = "/userNextPro", method = RequestMethod.POST)
|
|
|
public Result userNextProcess(UserIdentity userIdentity, String verificationCode) {
|
|
|
@@ -790,13 +790,13 @@ public class UserApiController extends BaseApiController {
|
|
|
private Result checkCertify(Result res) {
|
|
|
OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
|
|
|
if (null == o || !IdentityAuditStatus.PASSED.getCode().equals(o.getAuditStatus())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未�?�过实名认证,无法操作!"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 新增客户联系�?
|
|
|
+ * 新增客户联系人
|
|
|
* @param bo
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -816,7 +816,7 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 修改客户联系�?
|
|
|
+ * 修改客户联系人
|
|
|
* @param bo
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -836,7 +836,7 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 删除客户联系�?
|
|
|
+ * 删除客户联系人
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -852,7 +852,7 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 获取用户联系�?
|
|
|
+ * 获取用户联系人
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/getUserContacts", method = RequestMethod.GET)
|