优化权限维度

zhou-hao · zhou-hao · commit 61d4fe9899cb · 2020-01-07T18:15:48.000+08:00
diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/DimensionProvider.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/DimensionProvider.java
@@ -1,13 +1,16 @@
 package org.hswebframework.web.authorization;
 
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 public interface DimensionProvider {
 
     Flux<? extends DimensionType> getAllType();
 
     Flux<? extends Dimension> getDimensionByUserId(String userId);
 
+    Mono<? extends Dimension> getDimensionById(DimensionType type, String id);
+
     Flux<String> getUserIdByDimensionId(String dimensionId);
 
 }
diff --git a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/web/ResponseMessageWrapper.java b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/web/ResponseMessageWrapper.java
@@ -17,7 +17,10 @@
 import java.util.List;
 
 public class ResponseMessageWrapper extends ResponseBodyResultHandler {
-    public ResponseMessageWrapper(List<HttpMessageWriter<?>> writers, RequestedContentTypeResolver resolver, ReactiveAdapterRegistry registry) {
+
+    public ResponseMessageWrapper(List<HttpMessageWriter<?>> writers,
+                                  RequestedContentTypeResolver resolver,
+                                  ReactiveAdapterRegistry registry) {
         super(writers, resolver, registry);
         setOrder(90);
     }
diff --git a/hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomJackson2JsonDecoder.java b/hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomJackson2JsonDecoder.java
@@ -43,7 +43,8 @@ public CustomJackson2JsonDecoder(ObjectMapper mapper, MimeType... mimeTypes) {
 
     @Override
     public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType) {
-        JavaType javaType = getObjectMapper().getTypeFactory().constructType(elementType.getType());
+        Type type = elementType.resolve() == null ? elementType.getType() : elementType.resolve();
+        JavaType javaType = getObjectMapper().getTypeFactory().constructType(type);
         // Skip String: CharSequenceDecoder + "*/*" comes after
         return (!CharSequence.class.isAssignableFrom(elementType.toClass()) &&
                 getObjectMapper().canDeserialize(javaType) && supportsMimeType(mimeType));
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/UserDimensionProvider.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/UserDimensionProvider.java
@@ -5,6 +5,7 @@
 import org.hswebframework.web.authorization.DimensionProvider;
 import org.hswebframework.web.authorization.DimensionType;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 public class UserDimensionProvider implements DimensionProvider {
 
@@ -19,6 +20,12 @@ public Flux<Dimension> getDimensionByUserId(String userId) {
                 .map(id -> Dimension.of(userId, userId, DefaultDimensionType.user));
     }
 
+    @Override
+    public Mono<? extends Dimension> getDimensionById(DimensionType type, String id) {
+        return Mono.just(id)
+                .map(userId -> Dimension.of(userId, userId, DefaultDimensionType.user));
+    }
+
     @Override
     public Flux<String> getUserIdByDimensionId(String dimensionId) {
         return Flux.just(dimensionId);
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/entity/AuthorizationSettingEntity.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/entity/AuthorizationSettingEntity.java
@@ -47,7 +47,7 @@ public class AuthorizationSettingEntity implements Entity {
     @NotBlank(message = "维度目标不能为空",groups = CreateGroup.class)
     private String dimensionTarget;
 
-    @Column(name = "dimension_target_name", length = 64, updatable = false)
+    @Column(name = "dimension_target_name", length = 64)
     @Comment("维度目标名称")//维度实例名称.如: 用户名. 角色名
     private String dimensionTargetName;
 
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultDimensionService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultDimensionService.java
@@ -5,6 +5,7 @@
 import org.hswebframework.ezorm.rdb.mapping.ReactiveRepository;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.mapping.defaults.SaveResult;
+import org.hswebframework.web.authorization.Dimension;
 import org.hswebframework.web.authorization.DimensionProvider;
 import org.hswebframework.web.authorization.DimensionType;
 import org.hswebframework.web.crud.service.GenericReactiveCrudService;
@@ -61,6 +62,16 @@ public Flux<DimensionTypeEntity> getAllType() {
                 .fetch();
     }
 
+    @Override
+    public Mono<DynamicDimension> getDimensionById(DimensionType type, String id) {
+
+        return createQuery()
+                .where(DimensionEntity::getId,id)
+                .fetch()
+                .singleOrEmpty()
+                .map(entity-> DynamicDimension.of(entity, type));
+    }
+
     @Override
     public Flux<DynamicDimension> getDimensionByUserId(String userId) {
         return getAllType()
