Browse Source

登录问题修改,去除email重复问题

wangmh 7 years ago
parent
commit
7f9eb17c4e

+ 1 - 1
sso-common/src/main/java/com/uas/sso/core/Const.java

@@ -11,7 +11,7 @@ public class Const {
     /**
      * 重复分隔符
      */
-    public static final String REPEAT_SEPARATOR = "#";
+    public static final String REPEAT_SEPARATOR = "_";
 
     /**
      * 邮箱正则

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

@@ -444,6 +444,7 @@ public class LoginController extends BaseController {
          * 设置登录 Cookie 最后一个参数 true 时添加 cookie 同时销毁当前 JSESSIONID
          * 创建信任的 JSESSIONID
          */
+        String baseUrl = (String) request.getSession().getAttribute("baseUrl");
         SSOToken st = new SSOToken(request, userAccount.getMobile());
         st.setData(JSON.toJSONString(userAccount));
         SSOHelper.setSSOCookie(request, response, st, true);
@@ -457,7 +458,7 @@ public class LoginController extends BaseController {
 
         // 设置返回值,通知各个应用用户已经登录
         ModelMap data = new ModelMap();
-        data = addOtherAppRequestData(userAccount, data, request.getSession().getAttribute("baseUrl"), isLoginAll);
+        data = addOtherAppRequestData(userAccount, data, baseUrl, isLoginAll);
         data.put("returnUrl", HttpUtil.decodeURL(returnUrl));
         return success(data);
     }

+ 1 - 1
sso-server/src/main/java/com/uas/sso/controller/UserManagerController.java

@@ -347,7 +347,7 @@ public class UserManagerController extends BaseController {
             }
             System.out.println("------------ end pageNumber:"+(pageNumber-1)+"pageSize"+pageSize+"-------------");
         } while (isAll && (pUsers == null || !pUsers.isLast()));
-        updateEmailUnique();
+//        updateEmailUnique();
         return success(repeatMobile);
     }
 

+ 1 - 1
sso-server/src/main/java/com/uas/sso/entity/User.java

@@ -84,7 +84,7 @@ public class User implements Serializable {
     /**
      * 用户邮箱
      */
-    @Column(name = "user_email", unique = true)
+    @Column(name = "user_email")
     private String email;
 
     /**