瀏覽代碼

邮箱链接改成前端发送

wangmh 7 年之前
父節點
當前提交
01439545f8

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

@@ -229,7 +229,7 @@ public class ResetPasswordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/check/email", method = RequestMethod.GET)
-    public ModelMap checkByEmail() {
+    public ModelMap checkByEmail(String url) {
         // 从session中获取用户信息
         User user = (User) request.getSession().getAttribute("user");
         if (StringUtils.isEmpty(user)) {
@@ -244,7 +244,7 @@ public class ResetPasswordController extends BaseController {
         data.put("vipName", user.getVipName());
         data.put("type", "重置密码");
         // TODO 邮件认证地址
-        data.put("url", getFrontUrl() + "/reset/forgetPasswordValidationAccount?token="+token.getId());
+        data.put("url", url + (url.contains("?") ? "&" : "?") + "token=" + token.getId());
 
         // 发送邮件
         String email = user.getEmail();

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

@@ -33,7 +33,7 @@ public class UpdateUserController extends BaseController {
     /**
      * 校验信息token有效期
      */
-    private static final int EXPIRES = 10 * 60;
+    private static final int EXPIRES = 7 * 24 * 60 * 60;
 
     /**
      * 获取可以校验方式
@@ -120,7 +120,7 @@ public class UpdateUserController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/check/email", method = RequestMethod.GET)
-    public ModelMap checkByEmail(String operate, @RequestParam String email) {
+    public ModelMap checkByEmail(String operate, @RequestParam String email, String url) {
         // 校验空参数
         if (StringUtils.isEmpty(email)) {
             return error("邮箱不能为空");
@@ -139,11 +139,11 @@ public class UpdateUserController extends BaseController {
         switch (operate) {
             case "mobile":
                 data.put("type", "验证手机");
-                data.put("url", getFrontUrl() + "/validation/phoneValidation?token=" + token.getId());
+                data.put("url", url + (url.contains("?") ? "&" : "?") + "token=" + token.getId());
                 break;
             case "email":
                 data.put("type", "验证邮箱");
-                data.put("url", getFrontUrl() + "/validation/emailValidation?step=2&token=" + token.getId());
+                data.put("url", url + (url.contains("?") ? "&" : "?") + "step=2&token=" + token.getId());
                 break;
             case "question":
                 data.put("type", "设置密保");