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/SysRole.java | 56 ++------------------------------------------------------
1 files changed, 2 insertions(+), 54 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
index ff01b5a..f4d3f30 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
@@ -1,23 +1,12 @@
package com.ruoyi.system.domain;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import com.ruoyi.common.tenant.core.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-
-import java.util.Set;
/**
* 瑙掕壊琛� sys_role
@@ -29,44 +18,32 @@
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName("sys_role")
-@ExcelIgnoreUnannotated
-public class SysRole extends BaseEntity {
+public class SysRole extends TenantEntity {
/**
* 瑙掕壊ID
*/
- @ExcelProperty(value = "瑙掕壊搴忓彿")
@TableId(value = "role_id")
private Long roleId;
/**
* 瑙掕壊鍚嶇О
*/
- @ExcelProperty(value = "瑙掕壊鍚嶇О")
- @NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String roleName;
/**
* 瑙掕壊鏉冮檺
*/
- @ExcelProperty(value = "瑙掕壊鏉冮檺")
- @NotBlank(message = "鏉冮檺瀛楃涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String roleKey;
/**
* 瑙掕壊鎺掑簭
*/
- @ExcelProperty(value = "瑙掕壊鎺掑簭")
- @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private Integer roleSort;
/**
* 鏁版嵁鑼冨洿锛�1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛�3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛�4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛�
*/
- @ExcelProperty(value = "鏁版嵁鑼冨洿", converter = ExcelDictConvert.class)
- @ExcelDictFormat(readConverterExp = "1=鎵�鏈夋暟鎹潈闄�,2=鑷畾涔夋暟鎹潈闄�,3=鏈儴闂ㄦ暟鎹潈闄�,4=鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺,5=浠呮湰浜烘暟鎹潈闄�")
private String dataScope;
/**
@@ -82,8 +59,6 @@
/**
* 瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "瑙掕壊鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
/**
@@ -97,35 +72,8 @@
*/
private String remark;
- /**
- * 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦�
- */
- @TableField(exist = false)
- private boolean flag = false;
-
- /**
- * 鑿滃崟缁�
- */
- @TableField(exist = false)
- private Long[] menuIds;
-
- /**
- * 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛�
- */
- @TableField(exist = false)
- private Long[] deptIds;
-
- /**
- * 瑙掕壊鑿滃崟鏉冮檺
- */
- @TableField(exist = false)
- private Set<String> permissions;
-
public SysRole(Long roleId) {
this.roleId = roleId;
}
- public boolean isAdmin() {
- return UserConstants.SUPER_ADMIN_ID.equals(this.roleId);
- }
}
--
Gitblit v1.9.3