Browse Source

企业注册第一步返回值,改成邮箱是否认证

wangmh 8 years ago
parent
commit
7cbc85e56d

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

@@ -1,6 +1,7 @@
 package com.uas.sso.controller;
 
 import com.uas.sso.core.PasswordStrength;
+import com.uas.sso.core.Status;
 import com.uas.sso.core.Step;
 import com.uas.sso.core.Type;
 import com.uas.sso.entity.User;
@@ -56,9 +57,9 @@ public class UserspaceRegisterController extends BaseController {
             data.put("hasRegister", false);
         } else {
             data.put("hasRegister", true);
-            data.put("hasEmail", StringUtils.isEmpty(user.getEmail()));
+            data.put("hasEmail", user.getEmailValidCode() == Status.AUTHENTICATED.getCode());
         }
-        request.getSession().setAttribute("mobile", user.getMobile());
+        request.getSession().setAttribute("mobile", mobile);
 
         // 删除token
         tokenService.delete(token);
@@ -173,7 +174,7 @@ public class UserspaceRegisterController extends BaseController {
     public ModelMap checkCode(String token, String mobile, String code) {
         // 校验token是否正确
         String sessionToken = (String) request.getSession().getAttribute("token");
-        if (StringUtils.isEmpty(sessionToken) || sessionToken.equals(token)) {
+        if (StringUtils.isEmpty(sessionToken) || !sessionToken.equals(token)) {
             return error("请重新获取验证码");
         }