From 1c02f5b648cd3c58a7db7dcec761071d5daabb26 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 20 八月 2024 13:24:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
index 86e014d..ef764f3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
@@ -1,24 +1,46 @@
package com.zy.asrs.wms.system.controller.result;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.zy.asrs.wms.system.entity.User;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
/**
* Created by vincent on 1/30/2024
*/
@Data
@NoArgsConstructor
-@AllArgsConstructor
public class LoginResult implements Serializable {
private static final long serialVersionUID = 1L;
private String accessToken;
- private User user;
+ private Map<String, Object> user;
+ public LoginResult(String accessToken, User user) {
+ this.accessToken = accessToken;
+
+ HashMap<String, Object> userMap = new HashMap<>();
+ userMap.put("username", user.getUsername());
+ userMap.put("nickname", user.getNickname());
+ userMap.put("avatar", user.getAvatar());
+ userMap.put("code", user.getCode());
+ userMap.put("sex", user.getSex());
+ userMap.put("phone", user.getPhone());
+ userMap.put("email", user.getEmail());
+ userMap.put("emailVerified", user.getEmailVerified());
+ userMap.put("deptId", user.getDeptId());
+ userMap.put("realName", user.getRealName());
+ userMap.put("hostId", user.getHostId());
+ userMap.put("status", user.getStatus());
+ userMap.put("memo", user.getMemo());
+ this.user = userMap;
+ }
}
--
Gitblit v1.9.1