邮箱认证问题

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

@@ -3,6 +3,7 @@ package com.uas.sso.controller;
 import com.alibaba.fastjson.JSON;
 import com.uas.message.mail.service.MailService;
 import com.uas.message.sms.service.SmsService;
+import com.uas.sso.SSOHelper;
 import com.uas.sso.core.Const;
 import com.uas.sso.core.PasswordStrength;
 import com.uas.sso.entity.Setting;
@@ -26,6 +27,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Map;
 
+import static com.uas.sso.SSOConfig.getSSOProperties;
+
 /**
  * controller基础类
  *
@@ -353,4 +356,8 @@ public class BaseController {
             e.printStackTrace();
         }
     }
+
+    protected String getFrontUrl() {
+        return SSOHelper.getSSOService().getConfig().getSSOProperties().get("sso.front.url");
+    }
 }

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

@@ -132,7 +132,7 @@ public class ChangeAdminController extends BaseController {
         data.put("vipName", userAccount.getVipName());
         data.put("type", "更换管理员");
         // TODO 邮件认证地址
-        data.put("url", "https://sso.ubtob.com/sso/resetPwd/check/question?token="+existToken.getId());
+        data.put("url", getFrontUrl() + "/sso/resetPwd/check/question?token="+existToken.getId());
 
         // 发送邮件
         String email = userAccount.getEmail();

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

@@ -243,7 +243,7 @@ public class ResetPasswordController extends BaseController {
         data.put("vipName", user.getVipName());
         data.put("type", "重置密码");
         // TODO 邮件认证地址
-        data.put("url", "http://192.168.253.118:3001/reset/passwordResetValidQuestion?token="+token.getId());
+        data.put("url", getFrontUrl() + "/reset/passwordResetValidQuestion?token="+token.getId());
 
         // 发送邮件
         String email = user.getEmail();

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

@@ -137,15 +137,15 @@ public class UpdateUserController extends BaseController {
         switch (operate) {
             case "mobile":
                 data.put("type", "验证手机");
-                data.put("url", "http://192.168.253.118:3001/validation/phoneValidationSecondStep?token=" + token.getId());
+                data.put("url", getFrontUrl() + "/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());
+                data.put("url", getFrontUrl() + "/validation/emailValidationSecondStep?token=" + token.getId());
                 break;
             case "question":
                 data.put("type", "设置密保");
-                data.put("url", "http://192.168.253.118:3001/encrypted-setting/EncryptedSettingSecondStep?token=" + token.getId());
+                data.put("url", getFrontUrl() + "/encrypted-setting/EncryptedSettingSecondStep?token=" + token.getId());
                 break;
             default:
                 return error("参数错误");
@@ -308,7 +308,7 @@ public class UpdateUserController extends BaseController {
         data.put("vipName", user.getVipName());
         // TODO 邮件认证地址
         data.put("type", "验证邮箱");
-        data.put("url", "http://192.168.253.118:3001/update/user/email?token=" + returnToken.getId());
+        data.put("url", getFrontUrl() + "/update/user/email?token=" + returnToken.getId());
 
         // 发送邮件
         if (!StringUtils.isEmpty(email)) {
@@ -335,13 +335,13 @@ public class UpdateUserController extends BaseController {
         Token existToken = tokenService.findOne(token);
         if (existToken == null || existToken.isExpired()) {
             // token过期，跳转到失败页面
-            return new ModelAndView("redirect:http://192.168.253.118:3001/validation/validFail");
+            return new ModelAndView("redirect:"+ getFrontUrl() + "/validation/validFail");
         }
 
         // 拿出userUU，并删除token
         if (existToken.getBind() == null || !(existToken.getBind() instanceof Map)) {
             // token错误，跳转到失败页面
-            return new ModelAndView("redirect:http://192.168.253.118:3001/validation/validFail");
+            return new ModelAndView("redirect:"+ getFrontUrl() + "/validation/validFail");
         }
         Map<String, Object> data = (Map) existToken.getBind();
         Long userUU = (Long) data.get("userUU");
@@ -351,7 +351,7 @@ public class UpdateUserController extends BaseController {
 
         // 删除token
         tokenService.delete(token);
-        return new ModelAndView("redirect:http://192.168.253.118:3001/validation/emailValidationThirdStep");
+        return new ModelAndView("redirect:"+ getFrontUrl() + "/validation/emailValidationThirdStep");
     }
 
     @RequestMapping(value = "/setQuestion", method = RequestMethod.POST)

sso-server/src/main/resources/dev/account.properties

@@ -4,8 +4,7 @@ sso.app=sso
 sso.secretkey=0taQcW073Z7G628g5H
 #sso.cookie.domain=ubtob.com
 sso.cookie.secure=false
-sso.login.url=http://192.168.253.12:32323/
-#sso.proxy.uri=http://192.168.253.118:3001/
+sso.front.url=http://10.1.51.37:3001
 
 ### crossdomain verify
 sso.authcookie.secretkey=Z318866alN6gA0piuO

sso-server/src/main/resources/prod/account.properties

@@ -2,10 +2,9 @@
 sso.app=sso
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
-sso.cookie.domain=ubtob.com
+#sso.cookie.domain=ubtob.com
 sso.cookie.secure=false
-sso.login.url=https://sso.ubtob.com/
-#sso.proxy.uri=http://192.168.253.118:3001/
+sso.front.url=https://sso.ubtob.com
 
 ### crossdomain verify
 sso.authcookie.secretkey=Z318866alN6gA0piuO

sso-server/src/main/resources/test/account.properties

@@ -4,8 +4,7 @@ sso.app=sso
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.domain=ubtob.com
 sso.cookie.secure=false
-sso.login.url=http://192.168.253.118:3001/
-sso.proxy.uri=http://192.168.253.118:3001/
+sso.front.url=http://192.168.253.12:32323
 
 ### crossdomain verify
 sso.authcookie.secretkey=Z318866alN6gA0piuO