From 9ed5b521d613edb51b160cca931ee680019e2896 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 07 三月 2023 22:26:13 +0800
Subject: [PATCH] fix 修复 用户密码暴露问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
index fb7fc0e..55c008a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
@@ -1,6 +1,11 @@
package com.ruoyi.system.domain.vo;
-import com.ruoyi.common.core.constant.UserConstants;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.translation.annotation.Translation;
+import com.ruoyi.common.translation.constant.TransConstant;
+import com.ruoyi.system.domain.SysUser;
+import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
@@ -12,10 +17,10 @@
/**
* 鐢ㄦ埛淇℃伅瑙嗗浘瀵硅薄 sys_user
*
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
*/
@Data
+@AutoMapper(target = SysUser.class)
public class SysUserVo implements Serializable {
@Serial
@@ -25,6 +30,11 @@
* 鐢ㄦ埛ID
*/
private Long userId;
+
+ /**
+ * 绉熸埛ID
+ */
+ private String tenantId;
/**
* 閮ㄩ棬ID
@@ -64,11 +74,14 @@
/**
* 澶村儚鍦板潃
*/
- private String avatar;
+ @Translation(type = TransConstant.OSS_ID_TO_URL)
+ private Long avatar;
/**
* 瀵嗙爜
*/
+ @JsonIgnore
+ @JsonProperty
private String password;
/**
@@ -120,9 +133,5 @@
* 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
*/
private Long roleId;
-
- public boolean isAdmin() {
- return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
- }
}
--
Gitblit v1.9.3