1.2.66

alibaba · Mar 1, 2020 · f164d85 · f164d85
1 parent 1bdc999
commit f164d85
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java
@@ -1293,5 +1293,5 @@ public static Type getMixInAnnotations(Type target) {
  return null;
  }
 
- public final static String VERSION = "1.2.63";
+ public final static String VERSION = "1.2.66";
 }
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/MapDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/MapDeserializer.java
@@ -292,7 +292,18 @@ public static Object parseMap(DefaultJSONParser parser, Map<Object, Object> map,
  lexer.nextToken(keyDeserializer.getFastMatchToken());
  }
 
- Object key = keyDeserializer.deserialze(parser, keyType, null);
+ Object key;
+ if (lexer.token() == JSONToken.LITERAL_STRING
+ && keyDeserializer instanceof JavaBeanDeserializer
+ ) {
+ String keyStrValue = lexer.stringVal();
+ lexer.nextToken();
+ DefaultJSONParser keyParser = new DefaultJSONParser(keyStrValue, parser.getConfig(), parser.getLexer().getFeatures());
+ keyParser.setDateFormat(parser.getDateFomartPattern());
+ key = keyDeserializer.deserialze(keyParser, keyType, null);
+ } else {
+ key = keyDeserializer.deserialze(parser, keyType, null);
+ }
 
  if (lexer.token() != JSONToken.COLON) {
  throw new JSONException("syntax error, expect :, actual " + lexer.token());