提交 2a9d8e81 编写于 作者: 智布道's avatar 智布道 👁

Merge branch 'master' into dev

# Conflicts:
#	pom.xml
...@@ -2,6 +2,7 @@ package me.zhyd.oauth.model; ...@@ -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; ...@@ -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 {
/** /**
* 授权响应状态码 * 授权响应状态码
......
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; ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册