woody 1 rok temu
rodzic
commit
1c3d0cc549

+ 1 - 1
framework-base/src/main/java/com/chelvc/framework/base/interceptor/GlobalExceptionInterceptor.java

@@ -99,7 +99,7 @@ public class GlobalExceptionInterceptor extends AbstractErrorController {
             return Collections.emptyMap();
         }
         return references.stream().collect(Collectors.toMap(
-                JsonMappingException.Reference::getFieldName, r -> "Invalid format"
+                JsonMappingException.Reference::getFieldName, r -> "Invalid value"
         ));
     }
 

+ 1 - 2
framework-common/src/main/java/com/chelvc/framework/common/util/JacksonUtils.java

@@ -470,8 +470,7 @@ public final class JacksonUtils {
         mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY)
                 .configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true)
                 .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
-                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                .configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
         // 注册基础模型
         mapper.registerModule(initializeBaseModule());

+ 0 - 22
framework-oauth/src/main/java/com/chelvc/framework/oauth/context/OauthContextHolder.java

@@ -16,8 +16,6 @@ import com.nimbusds.jwt.JWT;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.JWTParser;
 import lombok.NonNull;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-import org.springframework.security.oauth2.common.OAuth2RefreshToken;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver;
 import org.springframework.security.oauth2.server.resource.web.DefaultBearerTokenResolver;
@@ -205,26 +203,6 @@ public final class OAuthContextHolder {
         }), (String) null);
     }
 
-    /**
-     * 获取应用范围
-     *
-     * @param token 访问令牌
-     * @return 应用范围
-     */
-    public static String getScope(OAuth2AccessToken token) {
-        return getScope(parse(ObjectUtils.ifNull(token, OAuth2AccessToken::getValue)));
-    }
-
-    /**
-     * 获取应用范围
-     *
-     * @param token 刷新令牌
-     * @return 应用范围
-     */
-    public static String getScope(OAuth2RefreshToken token) {
-        return getScope(parse(ObjectUtils.ifNull(token, OAuth2RefreshToken::getValue)));
-    }
-
     /**
      * 是否是匿名用户
      *