From 79fc2f54e6fa2fb79278f2f33ec93ce8aea10c06 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Sat, 16 Mar 2019 14:44:59 +0800
Subject: [PATCH] Add expireTime property in User entity

---
 .../ryanc/halo/model/dto/UserOutputDTO.java   | 66 +++++++++++++++++++
 .../java/cc/ryanc/halo/model/entity/User.java |  7 ++
 2 files changed, 73 insertions(+)
 create mode 100644 src/main/java/cc/ryanc/halo/model/dto/UserOutputDTO.java

diff --git a/src/main/java/cc/ryanc/halo/model/dto/UserOutputDTO.java b/src/main/java/cc/ryanc/halo/model/dto/UserOutputDTO.java
new file mode 100644
index 000000000..32988202a
--- /dev/null
+++ b/src/main/java/cc/ryanc/halo/model/dto/UserOutputDTO.java
@@ -0,0 +1,66 @@
+package cc.ryanc.halo.model.dto;
+
+import cc.ryanc.halo.model.dto.base.OutputConverter;
+import cc.ryanc.halo.model.entity.User;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.Date;
+
+/**
+ * User output dto.
+ *
+ * @author johnniang
+ * @date 3/16/19
+ */
+@Data
+@ToString
+@EqualsAndHashCode
+public class UserOutputDTO implements OutputConverter<UserOutputDTO, User> {
+
+    /**
+     * User id.
+     */
+    private Integer id;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * Expire time.
+     */
+    private Date expireTime;
+
+    /**
+     * 创建时间戳
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间戳
+     */
+    private Date updateTime;
+}
diff --git a/src/main/java/cc/ryanc/halo/model/entity/User.java b/src/main/java/cc/ryanc/halo/model/entity/User.java
index f49fb98af..e8cc7cbdf 100644
--- a/src/main/java/cc/ryanc/halo/model/entity/User.java
+++ b/src/main/java/cc/ryanc/halo/model/entity/User.java
@@ -61,6 +61,13 @@ public class User {
     @Column(name = "description", columnDefinition = "varchar(1023) default ''")
     private String description;
 
+    /**
+     * Expire time.
+     */
+    @Column(name = "expire_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date expireTime;
+
     /**
      * 创建时间戳
      */