邮箱校验发送邮箱内容修改

sso-server/src/main/java/com/uas/sso/controller/ChangeAdminController.java

@@ -125,6 +125,7 @@ public class ChangeAdminController extends BaseController {
         tokenService.save(existToken);
         ModelMap data = new ModelMap();
         data.put("vipName", userAccount.getVipName());
+        data.put("type", "更换管理员");
         // TODO 邮件认证地址
         data.put("url", "http://192.168.253.66:8081/sso/resetPwd/check/question?token="+existToken.getId());
 

sso-server/src/main/java/com/uas/sso/controller/ResetPasswordController.java

@@ -76,7 +76,7 @@ public class ResetPasswordController extends BaseController {
         if (StringUtils.isEmpty(resetCaptcha)) {
             return error("未获取验证码");
         }
-        if (!resetCaptcha.equals(captcha)) {
+        if (!captcha.equalsIgnoreCase(resetCaptcha)) {
             return error("请输入正确的验证码");
         }
 
@@ -241,6 +241,7 @@ public class ResetPasswordController extends BaseController {
         tokenService.save(token);
         ModelMap data = new ModelMap();
         data.put("vipName", user.getVipName());
+        data.put("type", "重置密码");
         // TODO 邮件认证地址
         data.put("url", "http://192.168.253.118:3001/reset/passwordResetValidQuestion?token="+token.getId());
 
@@ -323,7 +324,7 @@ public class ResetPasswordController extends BaseController {
         tokenService.delete(pageToken);
 
         // 返回token
-        expireToken = new Token(user, EXPIRES);
+        expireToken = new Token(user.getUserUU(), EXPIRES);
         tokenService.save(expireToken);
         ModelMap data = new ModelMap();
         data.put("token", expireToken.getId());
@@ -354,7 +355,8 @@ public class ResetPasswordController extends BaseController {
         }
 
         // 从token中获取用户信息
-        User user = (User) expireToken.getBind();
+        Long userUU = (Long) expireToken.getBind();
+        User user = userService.findOne(userUU);
 
         // 设置加密后的密码
         String encryPassword = userService.getEncryPassword(Const.ENCRY_FORMAT, password, user.getSalt());

sso-server/src/main/java/com/uas/sso/controller/UpdateUserController.java

@@ -76,7 +76,7 @@ public class UpdateUserController extends BaseController {
     }
 
     /**
-     * 校验手机号验证码
+     * 校验手机号
      *
      * @author wangmh
      * @date 2018/1/11 20:17
@@ -114,7 +114,7 @@ public class UpdateUserController extends BaseController {
 
 
     /**
-     * 通过邮箱重置密码，发送邮箱确认
+     * 通过邮箱校验，发送邮箱确认
      *
      * @return
      */
@@ -136,13 +136,16 @@ public class UpdateUserController extends BaseController {
         // TODO 邮件认证地址
         switch (operate) {
             case "mobile":
+                data.put("type", "验证手机");
                 data.put("url", "http://192.168.253.118:3001/validation/phoneValidationSecondStep?token=" + token.getId());
                 break;
             case "email":
+                data.put("type", "验证邮箱");
                 data.put("url", "http://192.168.253.118:3001/validation/emailValidationSecondStep?token=" + token.getId());
                 break;
             case "question":
-                data.put("url", "http://192.168.253.118:3001/validation/phoneValidationSecondStep?token=" + token.getId());
+                data.put("type", "设置密保");
+                data.put("url", "http://192.168.253.118:3001/encrypted-setting/EncryptedSettingSecondStep?token=" + token.getId());
                 break;
             default:
                 return error("参数错误");
@@ -304,6 +307,7 @@ public class UpdateUserController extends BaseController {
         ModelMap data = new ModelMap();
         data.put("vipName", user.getVipName());
         // TODO 邮件认证地址
+        data.put("type", "验证邮箱");
         data.put("url", "http://192.168.253.118:3001/update/user/email?token=" + returnToken.getId());
 
         // 发送邮件