From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 97 +++++++++++++++++-------------------------------
1 files changed, 34 insertions(+), 63 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 0adef26..2fa57f5 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,95 +1,99 @@
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.annotation.Excel.Type;
-import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.core.domain.BaseEntity;
+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;
import javax.validation.constraints.Size;
-import java.io.Serializable;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_user")
-public class SysUser implements Serializable {
- private static final long serialVersionUID = 1L;
+@ApiModel("鐢ㄦ埛淇℃伅涓氬姟瀵硅薄")
+public class SysUser extends BaseEntity {
/**
* 鐢ㄦ埛ID
*/
- @Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
- @TableId(value = "user_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "鐢ㄦ埛ID")
+ @TableId(value = "user_id")
private Long userId;
/**
* 閮ㄩ棬ID
*/
- @Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
+ @ApiModelProperty(value = "閮ㄩ棬ID")
private Long deptId;
/**
* 鐢ㄦ埛璐﹀彿
*/
+ @ApiModelProperty(value = "鐢ㄦ埛璐﹀彿")
@NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- @Excel(name = "鐧诲綍鍚嶇О")
private String userName;
/**
* 鐢ㄦ埛鏄电О
*/
+ @ApiModelProperty(value = "鐢ㄦ埛鏄电О")
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- @Excel(name = "鐢ㄦ埛鍚嶇О")
private String nickName;
/**
* 鐢ㄦ埛閭
*/
+ @ApiModelProperty(value = "鐢ㄦ埛閭")
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- @Excel(name = "鐢ㄦ埛閭")
private String email;
/**
* 鎵嬫満鍙风爜
*/
- @Excel(name = "鎵嬫満鍙风爜")
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
private String phonenumber;
/**
* 鐢ㄦ埛鎬у埆
*/
- @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
+ @ApiModelProperty(value = "鐢ㄦ埛鎬у埆")
private String sex;
/**
* 鐢ㄦ埛澶村儚
*/
+ @ApiModelProperty(value = "鐢ㄦ埛澶村儚")
private String avatar;
/**
* 瀵嗙爜
*/
+ @ApiModelProperty(value = "瀵嗙爜")
+ @TableField(
+ insertStrategy = FieldStrategy.NOT_EMPTY,
+ updateStrategy = FieldStrategy.NOT_EMPTY,
+ whereStrategy = FieldStrategy.NOT_EMPTY
+ )
private String password;
@JsonIgnore
@@ -99,102 +103,68 @@
}
/**
- * 鐩愬姞瀵�
- */
- private String salt;
-
- /**
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+ @ApiModelProperty(value = "甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
private String status;
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
@TableLogic
private String delFlag;
/**
* 鏈�鍚庣櫥褰旾P
*/
- @Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
+ @ApiModelProperty(value = "鏈�鍚庣櫥褰旾P")
private String loginIp;
/**
* 鏈�鍚庣櫥褰曟椂闂�
*/
- @Excel(name = "鏈�鍚庣櫥褰曟椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+ @ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
private Date loginDate;
-
- /**
- * 鍒涘缓鑰�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
/**
* 澶囨敞
*/
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
/**
* 閮ㄩ棬瀵硅薄
*/
- @Excels({
- @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
- @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
- })
+ @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;
@@ -202,6 +172,7 @@
this.userId = userId;
}
+ @ApiModelProperty(value = "鏄惁绠＄悊鍛�")
public boolean isAdmin() {
return isAdmin(this.userId);
}
--
Gitblit v1.9.3