♻️ refactor: 优化了安全管理器和各核心服务的代码结构和逻辑处理方式

boot/platform/src/main/java/com/platform/boot/relational/LoggerFilter.java

@@ -160,7 +160,8 @@ private Mono<String> processRequestBody(ServerWebExchange exchange, ServerHttpRe
                 HandlerStrategies.withDefaults().messageReaders());
         return serverRequest.bodyToMono(String.class).doOnNext((objectValue) -> {
             Object previousCachedBody = exchange.getAttributes().put(CACHED_REQUEST_BODY_ATTR, objectValue);
-            log.debug("{}Logger filter [processRequestBody] body: {}", exchange.getLogPrefix(), previousCachedBody);
+            log.debug("{}Logger filter chain [processRequestBody] body: {}",
+                    exchange.getLogPrefix(), previousCachedBody);
         });
     }
 

boot/platform/src/main/java/com/platform/boot/security/SecurityManager.java

@@ -88,24 +88,21 @@ public Mono<User> loadByOauth2(String bindType, String openid) {
                 .bind("bindType", bindType).bind("openid", openid)
                 .map((row, metadata) -> this.r2dbcConverter.read(User.class, row, metadata))
                 .all();
-        return queryWithCache(bindType + openid, userMono).singleOrEmpty();
+        return this.queryWithCache(bindType + openid, userMono).singleOrEmpty();
     }
 
     public Mono<User> loadByUsername(String username) {
         Query query = Query.query(Criteria.where("username").is(username).ignoreCase(true));
         var userMono = this.entityTemplate.select(query, User.class);
-        return queryWithCache(username, userMono).singleOrEmpty();
+        return this.queryWithCache(username, userMono).singleOrEmpty();
     }
 
     @Override
     public Mono<UserDetails> findByUsername(String username) {
 
-        var userMono = this.loadByUsername(username)
-                .zipWhen(user -> this.authorities(user.getCode()));
-
+        var userMono = this.loadByUsername(username).zipWhen(user -> this.authorities(user.getCode()));
         var userDetailsMono = userMono
                 .flatMap(tuple2 -> buildUserDetails(tuple2.getT1(), new HashSet<>(tuple2.getT2())));
-
         return userDetailsMono.cast(UserDetails.class)
                 .onErrorResume(throwable -> Mono.error(new AuthenticationServiceException(
                         throwable.getLocalizedMessage(), throwable)))
@@ -117,14 +114,14 @@ public Mono<UserDetails> findByUsername(String username) {
     private Mono<SecurityDetails> buildUserDetails(User user, Set<GrantedAuthority> authorities) {
         SecurityDetails userDetails = SecurityDetails.of(user.getCode(), user.getUsername(), user.getName(),
                 user.getPassword(), user.getDisabled(), user.getAccountExpired(),
-                user.getAccountLocked(), user.getCredentialsExpired(), authorities, Map.of("username", user.getUsername()),
-                "username");
-        var tuple2Mono = Mono.zip(this.loadGroups(user.getCode()), this.loadTenants(user.getCode()));
-        return tuple2Mono.flatMap(tuple2 -> {
+                user.getAccountLocked(), user.getCredentialsExpired(), authorities,
+                Map.of("username", user.getUsername()), "username");
+        var tuple2Mono = Mono.zipDelayError(this.loadGroups(user.getCode()), this.loadTenants(user.getCode()));
+        return tuple2Mono.mapNotNull(tuple2 -> {
             userDetails.setGroups(new HashSet<>(tuple2.getT1()));
             userDetails.setTenants(new HashSet<>(tuple2.getT2()));
-            return Mono.defer(() -> Mono.just(userDetails));
-        }).switchIfEmpty(Mono.defer(() -> Mono.just(userDetails)));
+            return userDetails;
+        }).then(Mono.defer(() -> Mono.just(userDetails)));
     }
 
     private Mono<List<GroupMemberResponse>> loadGroups(String userCode) {

boot/platform/src/main/java/com/platform/boot/security/core/group/GroupsController.java

@@ -33,17 +33,9 @@ public Mono<Page<Group>> page(GroupRequest request, Pageable pageable) {
                 this.groupsService.page(request.securityCode(securityDetails.getTenantCode()), pageable));
     }
 
-    @PostMapping("add")
+    @PostMapping("save")
     @PreAuthorize("hasRole(@contextUtils.RULE_ADMINISTRATORS)")
     public Mono<Group> add(@Valid @RequestBody GroupRequest request) {
-        Assert.isNull(request.getId(), "When adding a new Group, the ID must be null");
-        return this.groupsService.operate(request);
-    }
-
-    @PutMapping("modify")
-    @PreAuthorize("hasRole(@contextUtils.RULE_ADMINISTRATORS)")
-    public Mono<Group> modify(@Valid @RequestBody GroupRequest request) {
-        Assert.notNull(request.getId(), "When modifying an existing Group, the ID must not be null");
         return this.groupsService.operate(request);
     }
 

boot/platform/src/main/java/com/platform/boot/security/core/group/authority/GroupAuthorityRequest.java

@@ -1,7 +1,6 @@
 package com.platform.boot.security.core.group.authority;
 
 import com.platform.boot.commons.utils.BeanUtils;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -18,7 +17,6 @@
 @ToString(callSuper = true)
 public class GroupAuthorityRequest extends GroupAuthority implements Serializable {
 
-    @NotNull(message = "权限[authorities]不能为空!")
     private Set<String> authorities;
 
     public GroupAuthority toGroupAuthority() {

boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMemberRequest.java

@@ -10,7 +10,6 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -22,9 +21,10 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class GroupMemberRequest extends GroupMember implements Serializable {
+public class GroupMemberRequest extends GroupMember {
 
     private Set<String> users;
+
     private String username;
 
     public GroupMember toGroupMember() {

boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMembersService.java

@@ -70,12 +70,6 @@ public Mono<GroupMember> save(GroupMember groupMember) {
         }
     }
 
-    /**
-     * Deletes a tenant.
-     *
-     * @param request the tenant request
-     * @return a Mono of void
-     */
     public Mono<Void> delete(GroupMemberRequest request) {
         return this.memberRepository.delete(request.toGroupMember()).doAfterTerminate(() -> this.cache.clear());
     }

boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantRequest.java

@@ -7,7 +7,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -17,7 +16,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class TenantRequest extends Tenant implements Serializable {
+public class TenantRequest extends Tenant {
 
     private Map<String, Object> query;
 

boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantsController.java

@@ -33,17 +33,9 @@ public Mono<Page<Tenant>> page(TenantRequest request, Pageable pageable) {
         return this.tenantsService.page(request, pageable);
     }
 
-    @PostMapping("add")
+    @PostMapping("save")
     @PreAuthorize("hasRole(@contextUtils.RULE_ADMINISTRATORS)")
-    public Mono<Tenant> add(@Valid @RequestBody TenantRequest request) {
-        Assert.isNull(request.getId(), "When adding a new Tenant, the ID must be null");
-        return this.tenantsService.operate(request);
-    }
-
-    @PutMapping("modify")
-    @PreAuthorize("hasRole(@contextUtils.RULE_ADMINISTRATORS)")
-    public Mono<Tenant> modify(@Valid @RequestBody TenantRequest request) {
-        Assert.notNull(request.getId(), "When modifying an existing Tenant, the ID must not be null");
+    public Mono<Tenant> operate(@Valid @RequestBody TenantRequest request) {
         return this.tenantsService.operate(request);
     }
 

boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantsService.java

@@ -22,6 +22,7 @@
 public class TenantsService extends AbstractDatabase {
 
     private final TenantsRepository tenantsRepository;
+
     private final TenantMembersRepository membersRepository;
 
     public Flux<Tenant> search(TenantRequest request, Pageable pageable) {

boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMemberRequest.java

@@ -24,7 +24,9 @@
 public class TenantMemberRequest extends TenantMember {
 
     private Set<String> users;
+
     private String username;
+
     private String securityCode;
 
     public TenantMemberRequest securityCode(String securityCode) {

boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMembersService.java

@@ -57,7 +57,6 @@ public Mono<Page<TenantMemberResponse>> page(TenantMemberRequest request, Pageab
                 .map(tuple2 -> new PageImpl<>(tuple2.getT1(), pageable, tuple2.getT2()));
     }
 
-
     @Transactional(rollbackFor = Exception.class)
     public Mono<TenantMember> operate(TenantMemberRequest request) {
         var tenantMemberMono = this.entityTemplate.selectOne(Query.query(request.toCriteria()), TenantMember.class)

boot/platform/src/main/java/com/platform/boot/security/core/user/authority/UserAuthoritiesService.java

@@ -28,12 +28,13 @@ public Flux<UserAuthority> search(UserAuthorityRequest request) {
 
     public Mono<UserAuthority> operate(UserAuthorityRequest request) {
         var dataMono = this.entityTemplate.selectOne(Query.query(request.toCriteria()), UserAuthority.class);
-        return dataMono.switchIfEmpty(Mono.defer(() -> this.save(request.toAuthority())))
-                .doAfterTerminate(() -> this.cache.clear());
+        dataMono = dataMono.switchIfEmpty(Mono.defer(() -> this.save(request.toAuthority())));
+        return dataMono.doAfterTerminate(() -> this.cache.clear());
     }
 
     public Mono<Void> delete(UserAuthorityRequest request) {
-        return this.userAuthoritiesRepository.delete(request.toAuthority()).doAfterTerminate(() -> this.cache.clear());
+        return this.userAuthoritiesRepository.delete(request.toAuthority())
+                .doAfterTerminate(() -> this.cache.clear());
     }
 
     public Mono<UserAuthority> save(UserAuthority userAuthority) {

boot/platform/src/main/java/com/platform/boot/security/filter/CsrfWebFilter.java

@@ -20,7 +20,7 @@ public class CsrfWebFilter implements WebFilter, Ordered {
 
     @Override
     public @NonNull Mono<Void> filter(ServerWebExchange exchange, @NonNull WebFilterChain chain) {
-        log.debug("{}Csrf filter chain continue next.", exchange.getLogPrefix());
+        log.debug("{}Csrf filter chain [CsrfWebFilter] next.", exchange.getLogPrefix());
         Mono<CsrfToken> csrfTokenMono = exchange.getAttribute(CsrfToken.class.getName());
         if (csrfTokenMono != null) {
             return csrfTokenMono.flatMap(csrfToken -> Mono.defer(() -> chain.filter(exchange))