Add login IP record

src/main/kotlin/top/fatweb/api/entity/permission/LoginUser.kt

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonTypeInfo
 import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.userdetails.UserDetails
+import java.time.LocalDateTime
+import java.time.ZoneOffset
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
 class LoginUser() : UserDetails {
@@ -25,20 +27,22 @@ class LoginUser() : UserDetails {
     }
 
     @JsonIgnore
-    override fun getPassword(): String? = user.password
+    override fun getPassword() = user.password
 
     @JsonIgnore
-    override fun getUsername(): String? = user.username
+    override fun getUsername() = user.username
 
     @JsonIgnore
-    override fun isAccountNonExpired(): Boolean = true
+    override fun isAccountNonExpired() =
+        user.expiration == null || user.expiration!!.isAfter(LocalDateTime.now(ZoneOffset.UTC))
 
     @JsonIgnore
-    override fun isAccountNonLocked(): Boolean = true
+    override fun isAccountNonLocked() = user.locking == 0
 
     @JsonIgnore
-    override fun isCredentialsNonExpired(): Boolean = true
+    override fun isCredentialsNonExpired() =
+        user.credentialsExpiration == null || user.credentialsExpiration!!.isAfter(LocalDateTime.now(ZoneOffset.UTC))
 
     @JsonIgnore
-    override fun isEnabled(): Boolean = user.enable == 1
+    override fun isEnabled() = user.enable == 1
 }

src/main/kotlin/top/fatweb/api/entity/permission/User.kt

@@ -2,10 +2,11 @@ package top.fatweb.api.entity.permission
 
 import com.baomidou.mybatisplus.annotation.*
 import java.io.Serializable
+import java.time.LocalDateTime
 
 /**
  * <p>
- * 用户
+ * 用户表
  * </p>
  *
  * @author FatttSnake
@@ -13,7 +14,8 @@ import java.io.Serializable
  */
 @TableName("t_user")
 class User() : Serializable {
-    constructor(username: String, password: String, enable: Boolean = true) : this() {
+    constructor(id: Long?, username: String, password: String, enable: Boolean = true) : this() {
+        this.id = id
         this.username = username
         this.password = password
         this.enable = if (enable) 1 else 0
@@ -34,12 +36,54 @@ class User() : Serializable {
     @TableField("password")
     var password: String? = null
 
+    /**
+     * 锁定
+     */
+    @TableField("locking")
+    var locking: Int? = null
+
+    /**
+     * 过期时间
+     */
+    @TableField("expiration")
+    var expiration: LocalDateTime? = null
+
+    /**
+     * 认证过期时间
+     */
+    @TableField("credentials_expiration")
+    var credentialsExpiration: LocalDateTime? = null
+
     /**
      * 启用
      */
     @TableField("enable")
     var enable: Int? = null
 
+    /**
+     * 上次登录时间
+     */
+    @TableField("last_login_time")
+    var lastLoginTime: LocalDateTime? = null
+
+    /**
+     * 上次登录 IP
+     */
+    @TableField("last_login_ip")
+    var lastLoginIp: String? = null
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    var createTime: LocalDateTime? = null
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    var updateTime: LocalDateTime? = null
+
     @TableField("deleted")
     @TableLogic
     var deleted: Long? = null
@@ -49,6 +93,6 @@ class User() : Serializable {
     var version: Int? = null
 
     override fun toString(): String {
-        return "User{id=$id, username=$username, password=$password, enable=$enable, deleted=$deleted, version=$version}"
+        return "User(id=$id, username=$username, password=$password, locking=$locking, expiration=$expiration, credentialsExpiration=$credentialsExpiration, enable=$enable, lastLoginTime=$lastLoginTime, lastLoginIp=$lastLoginIp, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version)"
     }
 }