zhou-hao 5 年之前
父节点
当前提交
25f56a5da0

+ 1 - 1
hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomCodecsAutoConfiguration.java

@@ -27,7 +27,7 @@ public class CustomCodecsAutoConfiguration {
 		@Order(1)
 		@ConditionalOnBean(ObjectMapper.class)
 		CodecCustomizer jacksonDecoderCustomizer(EntityFactory entityFactory, ObjectMapper objectMapper) {
-			objectMapper.setTypeFactory(new CustomTypeFactory(entityFactory));
+		//	objectMapper.setTypeFactory(new CustomTypeFactory(entityFactory));
 			SimpleModule module = new SimpleModule();
 			JsonDeserializer deserializer = new EnumDict.EnumDictJSONDeserializer();
 			module.addDeserializer(Enum.class,  deserializer);

+ 13 - 15
hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomTypeFactory.java

@@ -15,9 +15,9 @@ public class CustomTypeFactory extends TypeFactory {
         this.entityFactory = factory;
     }
 
-    protected CustomTypeFactory(LRUMap<Object,JavaType> typeCache, TypeParser p,
-                          TypeModifier[] mods, ClassLoader classLoader){
-        super(typeCache,p,mods,classLoader);
+    protected CustomTypeFactory(LRUMap<Object, JavaType> typeCache, TypeParser p,
+                                TypeModifier[] mods, ClassLoader classLoader) {
+        super(typeCache, p, mods, classLoader);
     }
 
 
@@ -33,7 +33,7 @@ public class CustomTypeFactory extends TypeFactory {
 
     @Override
     public TypeFactory withModifier(TypeModifier mod) {
-        LRUMap<Object,JavaType> typeCache = _typeCache;
+        LRUMap<Object, JavaType> typeCache = _typeCache;
         TypeModifier[] mods;
         if (mod == null) { // mostly for unit tests
             mods = null;
@@ -41,7 +41,7 @@ public class CustomTypeFactory extends TypeFactory {
             //    in this case; can't recall why, but keeping the same
             typeCache = null;
         } else if (_modifiers == null) {
-            mods = new TypeModifier[] { mod };
+            mods = new TypeModifier[]{mod};
             // 29-Jul-2019, tatu: Actually I think we better clear cache in this case
             //    as well to ensure no leakage occurs (see [databind#2395])
             typeCache = null;
@@ -54,11 +54,11 @@ public class CustomTypeFactory extends TypeFactory {
 
     @Override
     protected JavaType _fromWellKnownInterface(ClassStack context, Class<?> rawType, TypeBindings bindings, JavaType superClass, JavaType[] superInterfaces) {
-        JavaType javaType= super._fromWellKnownInterface(context, rawType, bindings, superClass, superInterfaces);
-        if(javaType==null){
+        JavaType javaType = super._fromWellKnownInterface(context, rawType, bindings, superClass, superInterfaces);
+        if (javaType == null) {
             rawType = entityFactory.getInstanceType(rawType);
-            if(rawType!=null){
-                javaType =SimpleType.constructUnsafe(rawType);
+            if (rawType != null) {
+                javaType = SimpleType.constructUnsafe(rawType);
             }
         }
         return javaType;
@@ -67,11 +67,11 @@ public class CustomTypeFactory extends TypeFactory {
     @Override
     protected JavaType _fromWellKnownClass(ClassStack context, Class<?> rawType, TypeBindings bindings, JavaType superClass, JavaType[] superInterfaces) {
 
-        JavaType javaType= super._fromWellKnownClass(context, rawType, bindings, superClass, superInterfaces);
-        if(javaType==null){
+        JavaType javaType = super._fromWellKnownClass(context, rawType, bindings, superClass, superInterfaces);
+        if (javaType == null) {
             rawType = entityFactory.getInstanceType(rawType);
-            if(rawType!=null){
-                javaType =SimpleType.constructUnsafe(rawType);
+            if (rawType != null) {
+                javaType = SimpleType.constructUnsafe(rawType);
             }
         }
 
@@ -79,6 +79,4 @@ public class CustomTypeFactory extends TypeFactory {
     }
 
 
-
-
 }

+ 6 - 0
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/configuration/AuthorizationServiceAutoConfiguration.java

@@ -6,6 +6,7 @@ import org.hswebframework.web.authorization.ReactiveAuthenticationManager;
 import org.hswebframework.web.authorization.ReactiveAuthenticationManagerProvider;
 import org.hswebframework.web.system.authorization.api.UserDimensionProvider;
 import org.hswebframework.web.system.authorization.api.service.reactive.ReactiveUserService;
+import org.hswebframework.web.system.authorization.defaults.service.DefaultDimensionService;
 import org.hswebframework.web.system.authorization.defaults.service.DefaultReactiveAuthenticationInitializeService;
 import org.hswebframework.web.system.authorization.defaults.service.DefaultReactiveAuthenticationManager;
 import org.hswebframework.web.system.authorization.defaults.service.DefaultReactiveUserService;
@@ -39,6 +40,11 @@ public class AuthorizationServiceAutoConfiguration {
             return new DefaultReactiveAuthenticationInitializeService();
         }
 
+        @Bean
+        public DefaultDimensionService defaultDimensionService() {
+            return new DefaultDimensionService();
+        }
+
         @Bean
         public UserDimensionProvider userPermissionDimensionProvider(){
             return new UserDimensionProvider();