diff --git a/modules/core/pom.xml b/modules/core/pom.xml index c295104d9a..ce2ba96f33 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -39,6 +39,13 @@ provided + + + org.springframework.boot + spring-boot-starter-oauth2-client + provided + + org.springframework.boot spring-boot-starter-oauth2-resource-server diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Entity.java b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Entity.java index 73eeacd647..50fdf4dc07 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Entity.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Entity.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-07-10 23:20:36 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-06-07 10:31:16 + * @LastEditTime: 2025-06-07 10:38:13 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -26,11 +26,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import lombok.experimental.SuperBuilder; // 第三方授权登录 @Entity @Data -@Builder +@SuperBuilder @Accessors(chain = true) @EqualsAndHashCode(callSuper = true) @AllArgsConstructor diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Request.java b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Request.java index 4f68e34d03..173de112d8 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Request.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Request.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-07-10 23:50:46 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-03-10 13:17:42 + * @LastEditTime: 2025-06-07 10:38:20 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -16,14 +16,14 @@ package com.bytedesk.core.rbac.auth.oauth2; import com.bytedesk.core.base.BaseRequest; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data -@Builder -@EqualsAndHashCode(callSuper = false) +@SuperBuilder +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor public class OAuth2Request extends BaseRequest { diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Response.java b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Response.java index 3dade07b69..9cb7caf9f5 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Response.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/oauth2/OAuth2Response.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-07-10 23:50:58 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-08-26 06:19:11 + * @LastEditTime: 2025-06-07 10:38:31 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -21,10 +21,11 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data -@Builder -@EqualsAndHashCode(callSuper = false) +@SuperBuilder +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor public class OAuth2Response extends BaseResponse { diff --git a/modules/pom.xml b/modules/pom.xml index ac2eb4d9dd..507d5f2b09 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -53,14 +53,7 @@ spring-boot-starter-webflux provided - - - - org.springframework.boot - spring-boot-starter-oauth2-client - provided - - + org.springframework.boot spring-boot-starter-freemarker