fastjson up2 2.0.4

NeoGitCrt1 · NeoGitCrt1 · commit 89accdacdc24 · 2022-05-29T11:20:48.000+08:00
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>apijson.orm</groupId>
 	<artifactId>apijson-orm</artifactId>
-	<version>5.1.0</version>
+	<version>5.1.0-F2</version>
 	<packaging>jar</packaging>
 
 	<name>APIJSONORM</name>
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.79</version>
+			<version>2.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.activation</groupId>
diff --git a/APIJSONORM/src/main/java/apijson/JSON.java b/APIJSONORM/src/main/java/apijson/JSON.java
@@ -64,18 +64,20 @@ public static String getCorrectJson(String s, boolean isArray) {
 	 * @param json
 	 * @return
 	 */
+	private static final Feature[] DEFAULT_FASTJSON_FEATURES = {Feature.OrderedField, Feature.AllowSingleQuotes, Feature.DisableCircularReferenceDetect, Feature.UseBigDecimal, Feature.UseObjectArray};
 	public static Object parse(Object obj) {
 		int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
 		features |= Feature.OrderedField.getMask();
 		try {
-			return com.alibaba.fastjson.JSON.parse(obj instanceof String ? (String) obj : toJSONString(obj), features);
+			return com.alibaba.fastjson.JSON.parse(obj instanceof String ? (String) obj : toJSONString(obj), DEFAULT_FASTJSON_FEATURES);
 		} catch (Exception e) {
 			Log.i(TAG, "parse  catch \n" + e.getMessage());
 		}
 		return null;
 	}
+
 	/**obj转JSONObject
-	 * @param json
+	 * @param obj
 	 * @return
 	 */
 	public static JSONObject parseObject(Object obj) {
@@ -89,16 +91,17 @@ public static JSONObject parseObject(Object obj) {
 	 * @return
 	 */
 	public static JSONObject parseObject(String json) {
-		int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
-		features |= Feature.OrderedField.getMask();
-		return parseObject(json, features);
+		return parseObject(json, DEFAULT_FASTJSON_FEATURES);
 	}
-	/**json转JSONObject
+
+	/**
+	 * json转JSONObject
+	 *
 	 * @param json
 	 * @param features
 	 * @return
 	 */
-	public static JSONObject parseObject(String json, int features) {
+	public static JSONObject parseObject(String json, Feature... features) {
 		try {
 			return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), JSONObject.class, features);
 		} catch (Exception e) {
@@ -127,7 +130,7 @@ public static <T> T parseObject(String json, Class<T> clazz) {
 			try {
 				int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
 				features |= Feature.OrderedField.getMask();
-				return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), clazz, features);
+				return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), clazz, DEFAULT_FASTJSON_FEATURES);
 			} catch (Exception e) {
 				Log.i(TAG, "parseObject  catch \n" + e.getMessage());
 			}
