|
@@ -48,19 +48,14 @@ public class AuthServiceImpl implements IAuthService {
|
|
|
ApiAssert.fail(Objects.equals(0, user.getStatus()), "用户已禁用,请联系管理员");
|
|
|
ApiAssert.fail(!MD5Salt.isValid(user.getUsername() + user.getSalt()
|
|
|
, user.getPassword(), loginParam.getPassword()), "登录密码错误");
|
|
|
- // 设置登录 COOKIE
|
|
|
- SSOToken st = new SSOToken();
|
|
|
- st.setId(user.getId());
|
|
|
- st.setIssuer(user.getUsername());
|
|
|
- st.setUserAgent(request);
|
|
|
- st.setOrigin(TokenOrigin.HTML5);
|
|
|
- st.setData(new HashMap<>(){{
|
|
|
- // 设置会话ID,用于区分客户端消息发送
|
|
|
- put("sid", IdWorker.get32UUID());
|
|
|
- }});
|
|
|
+
|
|
|
// 登录信息
|
|
|
Map<String, Object> loginInfo = new HashMap<>(4);
|
|
|
- loginInfo.put("token", st.getToken());
|
|
|
+ loginInfo.put("token", new SSOToken().id(user.getId()).issuer(user.getUsername())
|
|
|
+ .userAgent(request).origin(TokenOrigin.HTML5).data(new HashMap<>() {{
|
|
|
+ // 设置会话ID,用于区分客户端消息发送
|
|
|
+ put("sid", IdWorker.get32UUID());
|
|
|
+ }}).getToken());
|
|
|
loginInfo.put("userInfo", new HashMap<String, Object>(2) {{
|
|
|
put("userId", user.getId());
|
|
|
put("userName", user.getNickName());
|