Merge branch 'master' into dev

# Conflicts: # pom.xml
gduxj · Dec 26, 2019 · 2a9d8e8 · 2a9d8e8
2 parents dda873c + 2038f24
commit 2a9d8e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/me/zhyd/oauth/model/AuthResponse.java b/src/main/java/me/zhyd/oauth/model/AuthResponse.java
@@ -2,6 +2,7 @@
 
 import lombok.*;
 import me.zhyd.oauth.enums.AuthResponseStatus;
+
 import java.io.Serializable;
 
 /**
@@ -13,8 +14,6 @@
 @Getter
 @Setter
 @Builder
-@NoArgsConstructor
-@AllArgsConstructor
 public class AuthResponse<T> implements Serializable {
     /**
      * 授权响应状态码

diff --git a/src/main/java/me/zhyd/oauth/model/AuthToken.java b/src/main/java/me/zhyd/oauth/model/AuthToken.java
@@ -1,6 +1,8 @@
 package me.zhyd.oauth.model;
 
-import lombok.*;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
@@ -13,8 +15,6 @@
 @Getter
 @Setter
 @Builder
-@NoArgsConstructor
-@AllArgsConstructor
 public class AuthToken implements Serializable {
     private String accessToken;
     private int expireIn;