Merge branch 'master' into dev
# Conflicts: # pom.xml
This commit is contained in:
@@ -2,6 +2,7 @@ package me.zhyd.oauth.model;
|
|||||||
|
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import me.zhyd.oauth.enums.AuthResponseStatus;
|
import me.zhyd.oauth.enums.AuthResponseStatus;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -13,8 +14,6 @@ import java.io.Serializable;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Builder
|
@Builder
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class AuthResponse<T> implements Serializable {
|
public class AuthResponse<T> implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 授权响应状态码
|
* 授权响应状态码
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package me.zhyd.oauth.model;
|
package me.zhyd.oauth.model;
|
||||||
|
|
||||||
import lombok.*;
|
import lombok.Builder;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
@@ -13,8 +15,6 @@ import java.io.Serializable;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Builder
|
@Builder
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class AuthToken implements Serializable {
|
public class AuthToken implements Serializable {
|
||||||
private String accessToken;
|
private String accessToken;
|
||||||
private int expireIn;
|
private int expireIn;
|
||||||
|
|||||||
Reference in New Issue
Block a user