From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 16:30:20 +0800
Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 45 +++++++--------------------------------------
1 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 09b82e9..f2d961b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -1,18 +1,14 @@
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.annotation.Sensitive;
+import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.enums.SensitiveStrategy;
import com.ruoyi.common.xss.Xss;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
@@ -29,28 +25,23 @@
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_user")
-@ApiModel("鐢ㄦ埛淇℃伅涓氬姟瀵硅薄")
public class SysUser extends BaseEntity {
/**
* 鐢ㄦ埛ID
*/
- @ApiModelProperty(value = "鐢ㄦ埛ID")
@TableId(value = "user_id")
private Long userId;
/**
* 閮ㄩ棬ID
*/
- @ApiModelProperty(value = "閮ㄩ棬ID")
private Long deptId;
/**
* 鐢ㄦ埛璐﹀彿
*/
- @ApiModelProperty(value = "鐢ㄦ埛璐﹀彿")
@Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
@NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
@@ -59,16 +50,19 @@
/**
* 鐢ㄦ埛鏄电О
*/
- @ApiModelProperty(value = "鐢ㄦ埛鏄电О")
@Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
private String nickName;
/**
+ * 鐢ㄦ埛绫诲瀷锛坰ys_user绯荤粺鐢ㄦ埛锛�
+ */
+ private String userType;
+
+ /**
* 鐢ㄦ埛閭
*/
@Sensitive(strategy = SensitiveStrategy.EMAIL)
- @ApiModelProperty(value = "鐢ㄦ埛閭")
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String email;
@@ -77,25 +71,21 @@
* 鎵嬫満鍙风爜
*/
@Sensitive(strategy = SensitiveStrategy.PHONE)
- @ApiModelProperty(value = "鎵嬫満鍙风爜")
private String phonenumber;
/**
* 鐢ㄦ埛鎬у埆
*/
- @ApiModelProperty(value = "鐢ㄦ埛鎬у埆")
private String sex;
/**
* 鐢ㄦ埛澶村儚
*/
- @ApiModelProperty(value = "鐢ㄦ埛澶村儚")
private String avatar;
/**
* 瀵嗙爜
*/
- @ApiModelProperty(value = "瀵嗙爜")
@TableField(
insertStrategy = FieldStrategy.NOT_EMPTY,
updateStrategy = FieldStrategy.NOT_EMPTY,
@@ -103,75 +93,59 @@
)
private String password;
- @JsonIgnore
- @JsonProperty
- public String getPassword() {
- return password;
- }
-
/**
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ApiModelProperty(value = "甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
private String status;
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
- @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
@TableLogic
private String delFlag;
/**
* 鏈�鍚庣櫥褰旾P
*/
- @ApiModelProperty(value = "鏈�鍚庣櫥褰旾P")
private String loginIp;
/**
* 鏈�鍚庣櫥褰曟椂闂�
*/
- @ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
private Date loginDate;
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
private String remark;
/**
* 閮ㄩ棬瀵硅薄
*/
- @ApiModelProperty(value = "閮ㄩ棬瀵硅薄")
@TableField(exist = false)
private SysDept dept;
/**
* 瑙掕壊瀵硅薄
*/
- @ApiModelProperty(value = "瑙掕壊瀵硅薄")
@TableField(exist = false)
private List<SysRole> roles;
/**
* 瑙掕壊缁�
*/
- @ApiModelProperty(value = "瑙掕壊缁�")
@TableField(exist = false)
private Long[] roleIds;
/**
* 宀椾綅缁�
*/
- @ApiModelProperty(value = "宀椾綅缁�")
@TableField(exist = false)
private Long[] postIds;
/**
* 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
*/
- @ApiModelProperty(value = "瑙掕壊ID")
@TableField(exist = false)
private Long roleId;
@@ -179,13 +153,8 @@
this.userId = userId;
}
- @ApiModelProperty(value = "鏄惁绠＄悊鍛�")
public boolean isAdmin() {
- return isAdmin(this.userId);
- }
-
- public static boolean isAdmin(Long userId) {
- return userId != null && 1L == userId;
+ return UserConstants.ADMIN_ID.equals(this.userId);
}
}
--
Gitblit v1.9.3